From c40e9717520bfb2c7631f9a04bf0dcd0feda9bdf Mon Sep 17 00:00:00 2001
From: Noa Resare <noa@spotify.com>
Date: Thu, 28 Feb 2013 13:16:16 +0000
Subject: [PATCH] Revert classpath.conf.in to before .deb packaing merge

This change is apparently incompatible with the centos packaging,
temporarily reverting until we have discussed a proper fix

CLOUDSTACK-1436: 4.1 management server fails to start from RPM...
CLOUDSTACK-1423: Unable to launch UI [HTTP Status 404 - ]

Signed-off-by: David Nalley <david@gnsa.us>
---
 client/tomcatconf/classpath.conf.in | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/client/tomcatconf/classpath.conf.in b/client/tomcatconf/classpath.conf.in
index 5625f69ed33..3ae0fb4d778 100644
--- a/client/tomcatconf/classpath.conf.in
+++ b/client/tomcatconf/classpath.conf.in
@@ -16,11 +16,23 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# We use WEB-INF/lib in the webapp for including things into
-# the classpath nowdays
-
-for jar in /usr/share/tomcat6/lib/*.jar; do
-    CLASSPATH=$jar:$CLASSPATH
+SYSTEMJARS="@SYSTEMJARS@"
+SCP=$(build-classpath $SYSTEMJARS 2>/dev/null) ; if [ $? != 0 ] ; then export SCP="@SYSTEMCLASSPATH@" ; fi
+MCP="@MSCLASSPATH@"
+DCP="@DEPSCLASSPATH@"
+CLASSPATH=$SCP:$DCP:$MCP:@MSCONF@:@SETUPDATADIR@
+for jarfile in "@PREMIUMJAVADIR@"/* ; do
+	if [ ! -e "$jarfile" ] ; then continue ; fi
+	CLASSPATH=$jarfile:$CLASSPATH
+done
+for plugin in "@PLUGINJAVADIR@"/* ; do
+	if [ ! -e "$plugin" ] ; then continue ; fi
+	CLASSPATH=$plugin:$CLASSPATH
+done
+for vendorconf in "@MSCONF@"/vendor/* ; do
+	if [ ! -d "$vendorconf" ] ; then continue ; fi
+	CLASSPATH=$vendorconf:$CLASSPATH
 done
-CLASSPATH=${CLASSPATH}/usr/share/cloudstack-management/webapps/client/WEB-INF/lib/mysql-connector-java-5.1.21.jar
 export CLASSPATH
+PATH=/sbin:/usr/sbin:$PATH
+export PATH