rpm/tomcat
SHA256
1
0
Fork 0
forked from pool/tomcat
Code Pull Requests Activity

Accepting request 155984 from Java:packages

Browse Source 
- Fix tomcat init scripts generating malformed classpath
  (http://youtrack.jetbrains.com/issue/JT-18545)
  bnc#804992

OBS-URL: https://build.opensuse.org/request/show/155984
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tomcat?expand=0&rev=10
This commit is contained in:
Stephan Kulow 2013-02-22 18:35:37 +00:00 committed by Git OBS Bridge
commit ee84b20ade
5 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tomcat-7.0-digest.script
View File

@ -28,6 +28,9 @@ if [ -n "$JSSE_HOME" ]; then
fi fi
CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar" CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar"
CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar" CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar"
#sanitize the classpath - remove double and trailing colons
CLASSPATH="`echo ${CLASSPATH} | sed 's/::+/:/g; s/^://; s/:$//g'`"
export CLASSPATH export CLASSPATH
# Configuration # Configuration

4
tomcat-7.0-tomcat-sysd
View File

@ -34,7 +34,6 @@ else
fi fi
set_javacmd set_javacmd
# CLASSPATH munging # CLASSPATH munging
if [[ -n "$JSSE_HOME" ]]; then if [[ -n "$JSSE_HOME" ]]; then
CLASSPATH="${CLASSPATH}:$(build-classpath jcert jnet jsse 2>/dev/null)" CLASSPATH="${CLASSPATH}:$(build-classpath jcert jnet jsse 2>/dev/null)"
@ -43,6 +42,9 @@ CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar"
CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar" CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar"
CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)" CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)"
#sanitize the classpath - remove double and trailing colons
CLASSPATH="`echo ${CLASSPATH} | sed 's/::+/:/g; s/^://; s/:$//g'`"
# See how we were called. # See how we were called.
function start() { function start() {

4
tomcat-7.0-tool-wrapper.script
View File

@ -28,6 +28,10 @@ if [ -n "$JSSE_HOME" ]; then
fi fi
CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar" CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar"
CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar" CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar"
#sanitize the classpath - remove double and trailing colons
CLASSPATH="`echo ${CLASSPATH} | sed 's/::+/:/g; s/^://; s/:$//g'`"
export CLASSPATH export CLASSPATH
# Configuration # Configuration

3
tomcat-7.0.wrapper
View File

@ -26,6 +26,9 @@ CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar"
CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar" CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar"
CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)" CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)"
#sanitize the classpath - remove double and trailing colons
CLASSPATH="`echo ${CLASSPATH} | sed 's/::+/:/g; s/^://; s/:$//g'`"
if [ "$1" = "start" ]; then if [ "$1" = "start" ]; then
${JAVACMD} $JAVA_OPTS $CATALINA_OPTS \ ${JAVACMD} $JAVA_OPTS $CATALINA_OPTS \
-classpath "$CLASSPATH" \ -classpath "$CLASSPATH" \

7
tomcat.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Feb 16 07:29:52 UTC 2013 - m407@mail.ru
- Fix tomcat init scripts generating malformed classpath
(http://youtrack.jetbrains.com/issue/JT-18545)
bnc#804992
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 21 13:54:18 UTC 2013 - mvyskocil@suse.com Mon Jan 21 13:54:18 UTC 2013 - mvyskocil@suse.com