Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/tomcat/patches/env.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Mon, 12 Aug 2013 07:34:07 -0700
branchs11-update
changeset 2726 2582b1cfd19c
parent 2602 5caab247ea3d
child 3959 0de894549bd0
child 4146 097063f324c0
permissions -rw-r--r--
16990382 allow multiple Tomcat instances to be run
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2726
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
     1
 
--- apache-tomcat-6.0.37-src/bin/catalina.sh	Mon Apr 29 02:36:52 2013
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
     2
 
+++ apache-tomcat-6.0.37-src/bin/catalina.sh	Thu Jun 13 05:37:46 2013
788
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
     3
 
@@ -92,6 +92,7 @@
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     4
 
 CYGWIN*) cygwin=true;;
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     5
 
 OS400*) os400=true;;
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     6
 
 Darwin*) darwin=true;;
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     7
 
+SunOS*) solaris=true;;
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     8
 
 esac
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     9
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    10
 
 # resolve links - $0 may be a softlink
2726
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    11
 
@@ -120,7 +121,13 @@
788
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    12
 
 # but allow them to be specified in setenv.sh, in rare case when it is needed.
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    13
 
 CLASSPATH=
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    14
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    15
 
-if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then
2726
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    16
 
+# On Solaris we install Tomcat into two different locations
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    17
 
+# (CATALINA_HOME, CATALINA_BASE). CATALINA_HOME can be on read only
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    18
 
+# location and CATALINA_BASE doesn't contain bin directory. Therefore we
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    19
 
+# will look for setenv.sh file in CATALINA_BASE/conf directory first.
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    20
 
+if [ -r "$CATALINA_BASE/conf/setenv.sh" ]; then
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    21
 
+  . "$CATALINA_BASE/conf/setenv.sh"
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    22
 
+elif [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    23
 
   . "$CATALINA_BASE/bin/setenv.sh"
788
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    24
 
 elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    25
 
   . "$CATALINA_HOME/bin/setenv.sh"
2726
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    26
 
@@ -147,6 +154,11 @@
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    27
 
   export QIBM_MULTI_THREADED=Y
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    28
 
 fi
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    29
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    30
 
+# For Solaris
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    31
 
+if $solaris; then
2602
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 788
diff changeset 
    32
 
+  [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.7.0
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    33
 
+fi
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    34
 
+
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    35
 
 # Get standard Java environment variables
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    36
 
 if $os400; then
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    37
 
   # -r will Only work on the os400 if the files are:
2726
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    38
 
--- apache-tomcat-6.0.37-src/bin/tool-wrapper.sh	Mon Apr 29 02:36:52 2013
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    39
 
+++ apache-tomcat-6.0.37-src/bin/tool-wrapper.sh	Thu Jun 13 05:55:06 2013
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    40
 
@@ -35,8 +35,10 @@
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    41
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    42
 
 # OS specific support.  $var _must_ be set to either true or false.
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    43
 
 cygwin=false
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    44
 
+solaris=false
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    45
 
 case "`uname`" in
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    46
 
 CYGWIN*) cygwin=true;;
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    47
 
+SunOS*) solaris=true;;
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    48
 
 esac
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    49
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    50
 
 # resolve links - $0 may be a softlink
2726
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    51
 
@@ -60,8 +62,16 @@
788
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    52
 
 # but allow them to be specified in setenv.sh, in rare case when it is needed.
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    53
 
 CLASSPATH=
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    54
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    55
 
-if [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    56
 
-  . "$CATALINA_HOME"/bin/setenv.sh
2726
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    57
 
+# On Solaris we install Tomcat into two different locations
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    58
 
+# (CATALINA_HOME, CATALINA_BASE). CATALINA_HOME can be on read only
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    59
 
+# location and CATALINA_BASE doesn't contain bin directory. Therefore we
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    60
 
+# will look for setenv.sh file in CATALINA_BASE/conf directory first.
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    61
 
+if [ -r "$CATALINA_BASE/conf/setenv.sh" ]; then
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    62
 
+  . "$CATALINA_BASE/conf/setenv.sh"
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    63
 
+elif [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    64
 
+  . "$CATALINA_BASE/bin/setenv.sh"
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    65
 
+elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    66
 
+  . "$CATALINA_HOME/bin/setenv.sh"
788
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    67
 
 fi
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    68
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    69
 
 # For Cygwin, ensure paths are in UNIX format before anything is touched
2726
2582b1cfd19c 16990382 allow multiple Tomcat instances to be run
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset 
    70
 
@@ -71,6 +81,11 @@
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    71
 
   [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    72
 
 fi
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    73
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    74
 
+# For Solaris
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    75
 
+if $solaris; then
2602
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 788
diff changeset 
    76
 
+  [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.7.0
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    77
 
+fi
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    78
 
+
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    79
 
 # Get standard Java environment variables
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    80
 
 if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    81
 
   BASEDIR="$CATALINA_HOME"
upstream/oracle/userland-gate