Accepting request 155580 from home:m407:branches:Java:packages

Init scripts generate malformed classpath. Occurs for example with youtrack issue tracker. Tomcat tries to launch two application instances.

OBS-URL: https://build.opensuse.org/request/show/155580
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=19
This commit is contained in:
Michal Vyskocil 2013-02-21 14:48:16 +00:00 committed by Git OBS Bridge
parent 7d0a23777c
commit 97133c31b7
3 changed files with 8 additions and 0 deletions

View File

@ -42,6 +42,7 @@ fi
CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar"
CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar"
CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)"
CLASSPATH="`echo ${CLASSPATH} | sed -r 's/::+/:/g; s/^:|:$//g'`"
# See how we were called.
function start() {

View File

@ -25,6 +25,7 @@ fi
CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar"
CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar"
CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)"
CLASSPATH="`echo ${CLASSPATH} | sed -r 's/::+/:/g; s/^:|:$//g'`"
if [ "$1" = "start" ]; then
${JAVACMD} $JAVA_OPTS $CATALINA_OPTS \

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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)
-------------------------------------------------------------------
Mon Jan 21 13:54:18 UTC 2013 - mvyskocil@suse.com