From 97133c31b7ec15d00817dbe3981fe7989a5de915c28ec63dadba73b8f4b1b4f5 Mon Sep 17 00:00:00 2001
From: Michal Vyskocil <michal.vyskocil@gmail.com>
Date: Thu, 21 Feb 2013 14:48:16 +0000
Subject: [PATCH] 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
---
 tomcat-7.0-tomcat-sysd | 1 +
 tomcat-7.0.wrapper     | 1 +
 tomcat.changes         | 6 ++++++
 3 files changed, 8 insertions(+)

diff --git a/tomcat-7.0-tomcat-sysd b/tomcat-7.0-tomcat-sysd
index 392e2df..457b979 100644
--- a/tomcat-7.0-tomcat-sysd
+++ b/tomcat-7.0-tomcat-sysd
@@ -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() {
diff --git a/tomcat-7.0.wrapper b/tomcat-7.0.wrapper
index 268fd35..c119560 100644
--- a/tomcat-7.0.wrapper
+++ b/tomcat-7.0.wrapper
@@ -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 \
diff --git a/tomcat.changes b/tomcat.changes
index 83e149c..046ba41 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -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