#349 fixed run.sh to include jar files for JBoss/Tomcat combo

[Dominik Kacprzak]

Apparently, the current run.sh does not include jar
files required by Tomcat code. I have fixed it by
adding additional classpath variable,
CATALINA_CLASSPATH, which is set only if tomcat-
directory exists in the distribution.

The fixed script was tested on RH Linux 8.0 with
jboss-3.0.4_tomcat-4.1.12.zip and
jboss-3.0.6_tomcat-4.1.18.zip.

- Dominik

[Dominik Kacprzak]

Logged In: YES
user_id=437617

forgot to include diff -u output and for some reason the
file was not attached with my post.

----------------------------- diff -u output
DIRNAME=`dirname $0`
PROGNAME=`basename $0`
@@ -94,34 +94,10 @@
fi
fi

-# Include classes required to start jboss/Tomcat
combo. Do it only if tomcat
-# directory exists in $JBOSS_HOME
-TOMCAT_HOME=`ls $JBOSS_HOME | $GREP tomcat-`
-if [ "x$TOMCAT_HOME" = "x" ]; then
- CATALINA_CLASSPATH=""
-else
- CCL="$JBOSS_HOME/lib/crimson.jar"
- CCL="$CCL:$JBOSS_HOME/server/default/lib/log4j.jar"
- CCL="$CCL:$JBOSS_HOME/$TOMCAT_HOME/bin/bootstrap.jar"
-
CCL="$CCL:$JBOSS_HOME/$TOMCAT_HOME/common/lib/commons-collections.jar"
-
CCL="$CCL:$JBOSS_HOME/$TOMCAT_HOME/common/lib/naming-common.jar"
-
CCL="$CCL:$JBOSS_HOME/$TOMCAT_HOME/common/lib/naming-resources.jar"
-
CCL="$CCL:$JBOSS_HOME/$TOMCAT_HOME/common/lib/servlet.jar"
-
CCL="$CCL:$JBOSS_HOME/$TOMCAT_HOME/server/lib/catalina.jar"
-
CCL="$CCL:$JBOSS_HOME/$TOMCAT_HOME/server/lib/commons-beanutils.jar"
-
CCL="$CCL:$JBOSS_HOME/$TOMCAT_HOME/server/lib/commons-digester.jar"
-
CCL="$CCL:$JBOSS_HOME/$TOMCAT_HOME/server/lib/commons-logging.jar"
-
CCL="$CCL:$JBOSS_HOME/$TOMCAT_HOME/server/lib/tomcat-coyote.jar"
-
CCL="$CCL:$JBOSS_HOME/$TOMCAT_HOME/server/lib/tomcat-http11.jar"
-
CCL="$CCL:$JBOSS_HOME/$TOMCAT_HOME/server/lib/tomcat-util.jar"
- CATALINA_CLASSPATH="$CCL"
- unset CCL
-fi
-
if [ "x$JBOSS_CLASSPATH" = "x" ]; then
-
JBOSS_CLASSPATH="$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR:$CATALINA_CLASSPATH"
+ JBOSS_CLASSPATH="$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR"
else
-
JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR:$CATALINA_CLASSPATH"
+
JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR"
fi

# Check for SUN(tm) JVM w/ HotSpot support
@@ -168,7 +144,7 @@
runProfiler
else
# Execute the JVM
- exec $JAVA $JAVA_OPTS \
+ exec "$JAVA" $JAVA_OPTS \
-classpath "$JBOSS_CLASSPATH" \
org.jboss.Main "$@"
fi

[Dominik Kacprzak]

this file should go to system/src/bin