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, 23 Apr 2012 02:00:40 -0700
changeset 788 ab1a623335b6
parent 555 f8fe8d6e1917
child 1166 36691b5d318b
permissions -rw-r--r--
7155998 envvars wanted for Tomcat too
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
788
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
     1
 
--- apache-tomcat-6.0.35-src/bin/catalina.sh	Mon Nov 28 02:22:44 2011
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
     2
 
+++ apache-tomcat-6.0.35-src/bin/catalina.sh	Mon Apr 16 08:42:47 2012
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
788
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    11
 
@@ -120,8 +121,19 @@
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
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    16
 
-  . "$CATALINA_BASE/bin/setenv.sh"
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    17
 
+# On Solaris we want to allow running system Tomcat instance (where
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    18
 
+# setenv.sh file is located in /var/tomcat6/conf) in parallel to Tomcat
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    19
 
+# instances started by individual users. As it's expected that all will
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    20
 
+# use the same copy of catalina.sh some extra logic needs to be added
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    21
 
+# here:
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    22
 
+if [ "$CATALINA_BASE" = "/var/tomcat6" ]; then
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    23
 
+  SETENVDIR="conf"
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    24
 
+else
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    25
 
+  SETENVDIR="bin"
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    26
 
+fi
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    27
 
+
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    28
 
+if [ -r "$CATALINA_BASE/$SETENVDIR/setenv.sh" ]; then
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    29
 
+  . "$CATALINA_BASE/$SETENVDIR/setenv.sh"
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    30
 
 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 
    31
 
   . "$CATALINA_HOME/bin/setenv.sh"
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    32
 
 fi
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    33
 
@@ -147,6 +159,11 @@
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    34
 
   export QIBM_MULTI_THREADED=Y
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    35
 
 fi
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    36
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    37
 
+# For Solaris
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    38
 
+if $solaris; then
555
f8fe8d6e1917 7063435 tomcat package missing dependency on java
Rich Burridge <rich.burridge@oracle.com>
parents: 142
diff changeset 
    39
 
+  [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.6.0
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    40
 
+fi
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
 
 # Get standard Java environment variables
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    43
 
 if $os400; then
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    44
 
   # -r will Only work on the os400 if the files are:
788
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    45
 
--- apache-tomcat-6.0.35-src/bin/tool-wrapper.sh	Mon Nov 28 02:22:44 2011
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    46
 
+++ apache-tomcat-6.0.35-src/bin/tool-wrapper.sh	Mon Apr 16 08:42:57 2012
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    47
 
@@ -35,8 +35,10 @@
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    48
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    49
 
 # 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 
    50
 
 cygwin=false
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    51
 
+solaris=false
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    52
 
 case "`uname`" in
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    53
 
 CYGWIN*) cygwin=true;;
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    54
 
+SunOS*) solaris=true;;
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    55
 
 esac
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    56
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    57
 
 # resolve links - $0 may be a softlink
788
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    58
 
@@ -60,10 +62,23 @@
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    59
 
 # 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 
    60
 
 CLASSPATH=
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    61
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    62
 
-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 
    63
 
-  . "$CATALINA_HOME"/bin/setenv.sh
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    64
 
+# On Solaris we want to allow running system Tomcat instance (where
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    65
 
+# setenv.sh file is located in /var/tomcat6/conf) in parallel to Tomcat
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    66
 
+# instances started by individual users. As it's expected that all will
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    67
 
+# use the same copy of catalina.sh some extra logic needs to be added
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    68
 
+# here:
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    69
 
+if [ "$CATALINA_BASE" = "/var/tomcat6" ]; then
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    70
 
+  SETENVDIR="conf"
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    71
 
+else
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    72
 
+  SETENVDIR="bin"
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    73
 
 fi
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    74
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    75
 
+if [ -r "$CATALINA_BASE/$SETENVDIR/setenv.sh" ]; then
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    76
 
+  . "$CATALINA_BASE/$SETENVDIR/setenv.sh"
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    77
 
+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 
    78
 
+  . "$CATALINA_HOME/bin/setenv.sh"
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    79
 
+fi
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    80
 
+
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    81
 
 # For Cygwin, ensure paths are in UNIX format before anything is touched
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    82
 
 if $cygwin; then
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    83
 
   [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
ab1a623335b6 7155998 envvars wanted for Tomcat too
Petr Sumbera <petr.sumbera@oracle.com>
parents: 555
diff changeset 
    84
 
@@ -71,6 +86,11 @@
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    85
 
   [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    86
 
 fi
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    87
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    88
 
+# For Solaris
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    89
 
+if $solaris; then
555
f8fe8d6e1917 7063435 tomcat package missing dependency on java
Rich Burridge <rich.burridge@oracle.com>
parents: 142
diff changeset 
    90
 
+  [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.6.0
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    91
 
+fi
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    92
 
+
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    93
 
 # Get standard Java environment variables
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    94
 
 if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    95
 
   BASEDIR="$CATALINA_HOME"
upstream/oracle/userland-gate