You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cr...@apache.org on 2003/10/19 02:47:05 UTC
cvs commit: cocoon-2.1 cocoon.sh cocoon.bat
crossley 2003/10/18 17:47:05
Modified: . cocoon.sh cocoon.bat
Log:
The CatalogManager.properties needs to be available on the classpath.
Revision Changes Path
1.9 +3 -3 cocoon-2.1/cocoon.sh
Index: cocoon.sh
===================================================================
RCS file: /home/cvs/cocoon-2.1/cocoon.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cocoon.sh 18 Oct 2003 18:52:19 -0000 1.8
+++ cocoon.sh 19 Oct 2003 00:47:05 -0000 1.9
@@ -82,7 +82,7 @@
echo "$0: using $COCOON_WEBAPP_HOME as the webapp directory"
if [ "$COCOON_LIB" = "" ] ; then
- COCOON_LIB="$COCOON_WEBAPP_HOME/WEB-INF/lib:$COCOON_WEBAPP_HOME/WEB-INF/classes"
+ COCOON_LIB="$COCOON_WEBAPP_HOME/WEB-INF/lib"
fi
if [ "$JETTY_PORT" = "" ] ; then
@@ -108,7 +108,7 @@
ENDORSED="-Djava.endorsed.dirs=$ENDORSED_LIBS"
PARSER=-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
LOADER=Loader
-LOADER_LIB="$COCOON_HOME/tools/loader"
+LOADER_LIB="$COCOON_HOME/tools/loader:$COCOON_WEBAPP_HOME/WEB-INF/classes"
CLI=-Dloader.main.class=org.apache.cocoon.Main
CLI_LIBRARIES="-Dloader.jar.repositories=$COCOON_LIB"
1.17 +3 -3 cocoon-2.1/cocoon.bat
Index: cocoon.bat
===================================================================
RCS file: /home/cvs/cocoon-2.1/cocoon.bat,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cocoon.bat 18 Oct 2003 18:52:18 -0000 1.16
+++ cocoon.bat 19 Oct 2003 00:47:05 -0000 1.17
@@ -54,7 +54,7 @@
:gotHome
if not "%COCOON_LIB%" == "" goto gotLib
-set COCOON_LIB=%COCOON_HOME%\build\webapp\WEB-INF\lib;%COCOON_HOME%\build\webapp\WEB-INF\classes
+set COCOON_LIB=%COCOON_HOME%\build\webapp\WEB-INF\lib
:gotLib
if not "%JETTY_PORT%" == "" goto gotJettyPort
@@ -81,7 +81,7 @@
:: ----- Set Up The Classpath --------------------------------------------------
-set CP=%COCOON_HOME%\tools\loader
+set CP=%COCOON_HOME%\tools\loader;%COCOON_HOME%\build\webapp\WEB-INF\classes
:: ----- Check action ----------------------------------------------------------