[pkg-java] r2769 - branches/tomcat5.5/feature/debian/container/catalina/src/bin

[Marcus Better]

Author: marcusb-guest
Date: 2006-11-18 23:15:23 +0100 (Sat, 18 Nov 2006)
New Revision: 2769

Modified:
   branches/tomcat5.5/feature/debian/container/catalina/src/bin/catalina.sh
Log:
Fixes needed for running under gij. Fixes bug #395167.


Modified: branches/tomcat5.5/feature/debian/container/catalina/src/bin/catalina.sh
===================================================================
--- branches/tomcat5.5/feature/debian/container/catalina/src/bin/catalina.sh	2006-11-16 13:52:39 UTC (rev 2768)
+++ branches/tomcat5.5/feature/debian/container/catalina/src/bin/catalina.sh	2006-11-18 22:15:23 UTC (rev 2769)
@@ -116,8 +116,12 @@
   fi
 fi
 
+if [ $("$_RUNJAVA" -version | grep "^gij (GNU libgcj)" > /dev/null) ]; then
+  gcj=yes
+fi
+
 # Add on extra jar files to CLASSPATH
-if [ -n "$JSSE_HOME" ]; then
+if [ -n "$JSSE_HOME" -a "$gcj" -ne "yes" ]; then
   CLASSPATH="$CLASSPATH":"$JSSE_HOME"/lib/jcert.jar:"$JSSE_HOME"/lib/jnet.jar:"$JSSE_HOME"/lib/jsse.jar
 fi
 CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/commons-logging-api.jar
@@ -149,8 +153,8 @@
   JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
 fi
 
-# Set juli LogManager if it is present
-if [ -r "$CATALINA_HOME"/bin/tomcat-juli.jar ]; then
+# juli LogManager disabled if running under libgcj (see bug #395167)
+if [ -r "$CATALINA_HOME"/bin/tomcat-juli.jar -a "$gcj" -ne "yes" ]; then
   JAVA_OPTS="$JAVA_OPTS "-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" "-Djava.util.logging.config.file="$CATALINA_BASE/conf/logging.properties"
 fi