equal
deleted
inserted
replaced
1 --- apache-tomcat-6.0.37-src/bin/catalina.sh Mon Apr 29 02:36:52 2013 |
1 Patch origin: in-house |
2 +++ apache-tomcat-6.0.37-src/bin/catalina.sh Thu Jun 13 05:37:46 2013 |
2 Patch status: Solaris-specific; not suitable for upstream |
3 @@ -92,6 +92,7 @@ |
3 |
|
4 Support for setenv.sh in $CATALINA_BASE/conf. |
|
5 Set default Java version (can be overwritten e.g. via setenv.sh). |
|
6 |
|
7 --- bin/catalina.sh |
|
8 +++ bin/catalina.sh |
|
9 @@ -90,6 +90,7 @@ |
4 CYGWIN*) cygwin=true;; |
10 CYGWIN*) cygwin=true;; |
5 OS400*) os400=true;; |
11 OS400*) os400=true;; |
6 Darwin*) darwin=true;; |
12 Darwin*) darwin=true;; |
7 +SunOS*) solaris=true;; |
13 +SunOS*) solaris=true;; |
8 esac |
14 esac |
9 |
15 |
10 # resolve links - $0 may be a softlink |
16 # resolve links - $0 may be a softlink |
11 @@ -120,7 +121,13 @@ |
17 @@ -118,7 +119,13 @@ |
12 # but allow them to be specified in setenv.sh, in rare case when it is needed. |
18 # but allow them to be specified in setenv.sh, in rare case when it is needed. |
13 CLASSPATH= |
19 CLASSPATH= |
14 |
20 |
15 -if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then |
21 -if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then |
16 +# On Solaris we install Tomcat into two different locations |
22 +# On Solaris we install Tomcat into two different locations |
21 + . "$CATALINA_BASE/conf/setenv.sh" |
27 + . "$CATALINA_BASE/conf/setenv.sh" |
22 +elif [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then |
28 +elif [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then |
23 . "$CATALINA_BASE/bin/setenv.sh" |
29 . "$CATALINA_BASE/bin/setenv.sh" |
24 elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then |
30 elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then |
25 . "$CATALINA_HOME/bin/setenv.sh" |
31 . "$CATALINA_HOME/bin/setenv.sh" |
26 @@ -147,6 +154,11 @@ |
32 @@ -145,6 +152,11 @@ |
27 export QIBM_MULTI_THREADED=Y |
33 export QIBM_MULTI_THREADED=Y |
28 fi |
34 fi |
29 |
35 |
30 +# For Solaris |
36 +# For Solaris |
31 +if $solaris; then |
37 +if $solaris; then |
33 +fi |
39 +fi |
34 + |
40 + |
35 # Get standard Java environment variables |
41 # Get standard Java environment variables |
36 if $os400; then |
42 if $os400; then |
37 # -r will Only work on the os400 if the files are: |
43 # -r will Only work on the os400 if the files are: |
38 --- apache-tomcat-6.0.37-src/bin/tool-wrapper.sh Mon Apr 29 02:36:52 2013 |
44 --- bin/tool-wrapper.sh |
39 +++ apache-tomcat-6.0.37-src/bin/tool-wrapper.sh Thu Jun 13 05:55:06 2013 |
45 +++ bin/tool-wrapper.sh |
40 @@ -35,8 +35,10 @@ |
46 @@ -33,8 +33,10 @@ |
41 |
47 |
42 # OS specific support. $var _must_ be set to either true or false. |
48 # OS specific support. $var _must_ be set to either true or false. |
43 cygwin=false |
49 cygwin=false |
44 +solaris=false |
50 +solaris=false |
45 case "`uname`" in |
51 case "`uname`" in |
46 CYGWIN*) cygwin=true;; |
52 CYGWIN*) cygwin=true;; |
47 +SunOS*) solaris=true;; |
53 +SunOS*) solaris=true;; |
48 esac |
54 esac |
49 |
55 |
50 # resolve links - $0 may be a softlink |
56 # resolve links - $0 may be a softlink |
51 @@ -60,8 +62,16 @@ |
57 @@ -58,8 +60,16 @@ |
52 # but allow them to be specified in setenv.sh, in rare case when it is needed. |
58 # but allow them to be specified in setenv.sh, in rare case when it is needed. |
53 CLASSPATH= |
59 CLASSPATH= |
54 |
60 |
55 -if [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then |
61 -if [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then |
56 - . "$CATALINA_HOME"/bin/setenv.sh |
62 - . "$CATALINA_HOME"/bin/setenv.sh |
65 +elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then |
71 +elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then |
66 + . "$CATALINA_HOME/bin/setenv.sh" |
72 + . "$CATALINA_HOME/bin/setenv.sh" |
67 fi |
73 fi |
68 |
74 |
69 # For Cygwin, ensure paths are in UNIX format before anything is touched |
75 # For Cygwin, ensure paths are in UNIX format before anything is touched |
70 @@ -71,6 +81,11 @@ |
76 @@ -69,6 +79,11 @@ |
71 [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` |
77 [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` |
72 fi |
78 fi |
73 |
79 |
74 +# For Solaris |
80 +# For Solaris |
75 +if $solaris; then |
81 +if $solaris; then |