Author: jfclere
Date: Sun Apr 28 09:13:33 2013
New Revision: 1476739
URL: http://svn.apache.org/r1476739
Log:
commit accepted patch for BZ 54601.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/bin/catalina.sh
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1476739&r1=1476738&r2=1476739&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Apr 28 09:13:33 2013
@@ -38,14 +38,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, schultz
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54601
- Change catalina.sh to consistently use LOGGING_MANAGER variable to
- configure logging, instead of modifying JAVA_OPTS one.
- https://issues.apache.org/bugzilla/attachment.cgi?id=29985
- (backport of r1449406; r1449412 in tc7)
- +1: kkolinko, rjung, jfclere
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54615
Update to Eclipse JDT Compiler 4.2.2
http://people.apache.org/~kkolinko/patches/2013-03-26_tc6_eclipse422.patch
Modified: tomcat/tc6.0.x/trunk/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.sh?rev=1476739&r1=1476738&r2=1476739&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/catalina.sh (original)
+++ tomcat/tc6.0.x/trunk/bin/catalina.sh Sun Apr 28 09:13:33 2013
@@ -218,9 +218,7 @@ if [ -z "$LOGGING_CONFIG" ]; then
fi
if [ -z "$LOGGING_MANAGER" ]; then
- JAVA_OPTS="$JAVA_OPTS
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
-else
- JAVA_OPTS="$JAVA_OPTS $LOGGING_MANAGER"
+
LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
fi
# ----- Execute The Requested Command -----------------------------------------
@@ -269,7 +267,7 @@ if [ "$1" = "debug" ] ; then
echo "Using Security Manager"
fi
shift
- exec "$_RUNJDB" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
+ exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS
$CATALINA_OPTS \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
-sourcepath "$CATALINA_HOME"/../../java \
-Djava.security.manager \
@@ -279,7 +277,7 @@ if [ "$1" = "debug" ] ; then
-Djava.io.tmpdir="$CATALINA_TMPDIR" \
org.apache.catalina.startup.Bootstrap "$@" start
else
- exec "$_RUNJDB" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
+ exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS
$CATALINA_OPTS \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
-sourcepath "$CATALINA_HOME"/../../java \
-Dcatalina.base="$CATALINA_BASE" \
@@ -297,7 +295,7 @@ elif [ "$1" = "run" ]; then
echo "Using Security Manager"
fi
shift
- exec "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
+ exec "$_RUNJAVA" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS
$CATALINA_OPTS \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
-Djava.security.manager \
-Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
@@ -306,7 +304,7 @@ elif [ "$1" = "run" ]; then
-Djava.io.tmpdir="$CATALINA_TMPDIR" \
org.apache.catalina.startup.Bootstrap "$@" start
else
- exec "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
+ exec "$_RUNJAVA" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS
$CATALINA_OPTS \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
-Dcatalina.base="$CATALINA_BASE" \
-Dcatalina.home="$CATALINA_HOME" \
@@ -361,7 +359,7 @@ elif [ "$1" = "start" ] ; then
echo "Using Security Manager"
fi
shift
- "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
+ "$_RUNJAVA" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
-Djava.security.manager \
-Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
@@ -372,7 +370,7 @@ elif [ "$1" = "start" ] ; then
>> "$CATALINA_OUT" 2>&1 &
else
- "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
+ "$_RUNJAVA" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
-Dcatalina.base="$CATALINA_BASE" \
-Dcatalina.home="$CATALINA_HOME" \
@@ -422,7 +420,7 @@ elif [ "$1" = "stop" ] ; then
fi
fi
- "$_RUNJAVA" $JAVA_OPTS \
+ "$_RUNJAVA" $LOGGING_MANAGER $JAVA_OPTS \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
-Dcatalina.base="$CATALINA_BASE" \
-Dcatalina.home="$CATALINA_HOME" \
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1476739&r1=1476738&r2=1476739&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Apr 28 09:13:33 2013
@@ -168,6 +168,11 @@
(schultz)
</fix>
<update>
+ <bug>54601</bug>: Change catalina.sh to consistently use
LOGGING_MANAGER
+ variable to configure logging, instead of modifying JAVA_OPTS one.
+ (kkolinko)
+ </update>
+ <update>
<bug>54890</bug>: Update to Apache Commons Daemon 1.0.15. (mturk)
</update>
</changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
