tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r689613 - in /tomcat: container/tc5.5.x/catalina/src/bin/catalina.sh container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt
Date Wed, 27 Aug 2008 20:52:34 GMT
Author: markt
Date: Wed Aug 27 13:52:34 2008
New Revision: 689613

URL: http://svn.apache.org/viewvc?rev=689613&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43578 and https://issues.apache.org/bugzilla/show_bug.cgi?id=45585
Tomcat doesn't start if installation path contains a space
Patch provided by Ray Sauers with improvements by Ian Ward Comfort

Modified:
    tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml
    tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh?rev=689613&r1=689612&r2=689613&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh Wed Aug 27 13:52:34 2008
@@ -165,7 +165,11 @@
 
 # Set juli LogManager if it is present
 if [ -r "$CATALINA_HOME"/bin/tomcat-juli.jar ]; then
-  JAVA_OPTS="$JAVA_OPTS "-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
"-Djava.util.logging.config.file="$CATALINA_BASE/conf/logging.properties"
+  JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
+  LOGGING_CONFIG="-Djava.util.logging.config.file="$CATALINA_BASE/conf/logging.properties"
+else
+  # Bugzilla 45585
+  LOGGING_CONFIG="-Dnop"
 fi
 
 # ----- Execute The Requested Command -----------------------------------------
@@ -208,7 +212,7 @@
     if [ "$1" = "-security" ] ; then
       echo "Using Security Manager"
       shift
-      exec "$_RUNJDB" $JAVA_OPTS $CATALINA_OPTS \
+      exec "$_RUNJDB" "$LOGGING_CONFIG" $JAVA_OPTS  $CATALINA_OPTS \
         -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
         -sourcepath "$CATALINA_HOME"/../../jakarta-tomcat-catalina/catalina/src/share \
         -Djava.security.manager \
@@ -218,7 +222,7 @@
         -Djava.io.tmpdir="$CATALINA_TMPDIR" \
         org.apache.catalina.startup.Bootstrap "$@" start
     else
-      exec "$_RUNJDB" $JAVA_OPTS $CATALINA_OPTS \
+      exec "$_RUNJDB" "$LOGGING_CONFIG" $JAVA_OPTS  $CATALINA_OPTS \
         -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
         -sourcepath "$CATALINA_HOME"/../../jakarta-tomcat-catalina/catalina/src/share \
         -Dcatalina.base="$CATALINA_BASE" \
@@ -234,7 +238,7 @@
   if [ "$1" = "-security" ] ; then
     echo "Using Security Manager"
     shift
-    exec "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
+    exec "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS  $CATALINA_OPTS \
       -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
       -Djava.security.manager \
       -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
@@ -243,7 +247,7 @@
       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
       org.apache.catalina.startup.Bootstrap "$@" start
   else
-    exec "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
+    exec "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS  $CATALINA_OPTS \
       -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
       -Dcatalina.base="$CATALINA_BASE" \
       -Dcatalina.home="$CATALINA_HOME" \
@@ -258,7 +262,7 @@
   if [ "$1" = "-security" ] ; then
     echo "Using Security Manager"
     shift
-    "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
+    "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS  $CATALINA_OPTS \
       -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
       -Djava.security.manager \
       -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
@@ -272,7 +276,7 @@
         echo $! > $CATALINA_PID
       fi
   else
-    "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
+    "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS  $CATALINA_OPTS \
       -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
       -Dcatalina.base="$CATALINA_BASE" \
       -Dcatalina.home="$CATALINA_HOME" \

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=689613&r1=689612&r2=689613&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Aug 27 13:52:34 2008
@@ -79,7 +79,12 @@
       <fix>
         <bug>44529</bug>: No roles specified (deny all) should take precedence
         over no auth-constraint specified (allow-all). (markt)
-      </fix> 
+      </fix>
+      <fix>
+        <bug>43578</bug>: Enable start on Linux if $CATALINA_HOME contains a
+        space. Original patch provided by Ray Sauers with improvements by Ian
+        Ward Comfort. (markt)
+      </fix>
       <fix>
         <bug>44673</bug>: Throw IOE if ServletInputStream is closed and a call
         is made to any read(), ready(), mark(), reset(), or skip() method as per

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=689613&r1=689612&r2=689613&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Aug 27 13:52:34 2008
@@ -31,14 +31,6 @@
    0: fhanik - silently swallow an error, and default to the default config file, yoavs:
don't like silent swallowing
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43578
-  Will need fix for 45585 below too
-  http://svn.apache.org/viewvc?rev=651713&view=rev
-  Tomcat doesn't start if installation path contains a space
-  Patch provided by Ray Sauers
-  +1: markt, yoavs, fhanik
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45591
   NPE on shutdown failure in some cases. Based on a patch by Matt Passell
   http://svn.apache.org/viewvc?rev=683982&view=rev
@@ -52,14 +44,6 @@
   -1: 
   rjung: sudjucts -> subjects ;)
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45585
-  Tomcat failed to start if using $CATALINA_BASE but not JULI. Patch based on a
-  suggestion by Ian Ward Comfort
-  http://svn.apache.org/viewvc?rev=684001&view=rev
-  +1: markt, fhanik, rjung
-  -1: 
-  rjung: Only needed if r651713 above gets applied.
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45576
   Add support for DIGEST to the JAASRealm
   http://svn.apache.org/viewvc?rev=684234&view=rev



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message