svn commit: r378002 - /cocoon/branches/BRANCH_2_1_X/cocoon.sh

[jb...@apache.org]

Author: jbq
Date: Wed Feb 15 05:06:48 2006
New Revision: 378002

URL: http://svn.apache.org/viewcvs?rev=378002&view=rev
Log:
Allow to override LOADER_LIB and CLI_CLASSPATH

Reported by Guillaume Déflache <gu...@anyware-tech.com>

Modified:
    cocoon/branches/BRANCH_2_1_X/cocoon.sh

Modified: cocoon/branches/BRANCH_2_1_X/cocoon.sh
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/cocoon.sh?rev=378002&r1=378001&r2=378002&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/cocoon.sh (original)
+++ cocoon/branches/BRANCH_2_1_X/cocoon.sh Wed Feb 15 05:06:48 2006
@@ -44,10 +44,18 @@
 #
 # JETTY_PORT
 #   Override the default port for Jetty
-# 
+#
 # JETTY_ADMIN_PORT
 #   The port where the jetty web administration should bind
 #
+# LOADER_LIB
+#   The classpath where to lookup the Loader class, defaults to
+#   ${COCOON_HOME}/tools/loader
+#
+# CLI_CLASSPATH
+#   The additional classpath for cli and precompile, defaults to
+#   lib/core/servlet_2_2.jar:$COCOON_WEBAPP_HOME/WEB-INF/classes
+#
 
 
 usage()
@@ -137,13 +145,17 @@
 ENDORSED="-Djava.endorsed.dirs=$ENDORSED_LIBS"
 PARSER=-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
 LOADER=Loader
-LOADER_LIB="${COCOON_HOME}/tools/loader"
+if [ "$LOADER_LIB" = "" ] ; then
+	LOADER_LIB="${COCOON_HOME}/tools/loader"
+fi
 
 CLI="-Dloader.main.class=org.apache.cocoon.Main"
 CLI_LIBRARIES="-Dloader.jar.repositories=$COCOON_LIB"
-CLI_CLASSPATH="-Dloader.class.path=lib/core/servlet_2_2.jar:$COCOON_WEBAPP_HOME/WEB-INF/classes"
+if [ "$CLI_CLASSPATH" = "" ] ; then
+	CLI_CLASSPATH="lib/core/servlet_2_2.jar:$COCOON_WEBAPP_HOME/WEB-INF/classes"
+fi
 CLI_VERBOSE="-Dloader.verbose=false"
-CLI_PROPERTIES="$CLI_LIBRARIES $CLI_CLASSPATH $CLI_VERBOSE"
+CLI_PROPERTIES="$CLI_LIBRARIES -Dloader.class.path=$CLI_CLASSPATH $CLI_VERBOSE"
 
 PRECOMPILE=-Dloader.main.class=org.apache.cocoon.bean.XSPPrecompileWrapper