[patch] 2013-02-24_tc6_54601.patch

2013-02-24_tc6_54601.patch (text/plain), 3.22 KB, created by Konstantin Kolinko on 2013-02-23 21:44:14 UTC

(hide)

Description: 2013-02-24_tc6_54601.patch

Filename:

MIME Type:

Creator: Konstantin Kolinko

Created: 2013-02-23 21:44:14 UTC

Size: 3.22 KB

patch

obsolete

>Index: bin/catalina.sh >=================================================================== >--- bin/catalina.sh (revision 1449392) >+++ bin/catalina.sh (working copy) >@@ -218,9 +218,7 @@ > 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 @@ > 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 @@ > -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 @@ > 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 @@ > -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 @@ > 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 @@ > >> "$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 @@ > 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" \ View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]