stefano 2003/02/27 16:19:21
Modified: . cocoon.bat cocoon.sh
Log:
fixed wrong class for cli and made the bat script more NT-friendly
Revision Changes Path
1.5 +7 -2 xml-cocoon2/cocoon.bat
Index: cocoon.bat
===================================================================
RCS file: /home/cvs/xml-cocoon2/cocoon.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cocoon.bat 27 Feb 2003 22:42:28 -0000 1.4
+++ cocoon.bat 28 Feb 2003 00:19:21 -0000 1.5
@@ -84,7 +84,12 @@
:: ----- Cli -------------------------------------------------------------------
:doCli
-%JAVA_HOME%\bin\java.exe %JAVA_OPT% -classpath %CP%
-Djava.endorsed.dirs=lib\endorsed -Dloader.jar.repositories=%COCOON_LIB%
-Dloader.main.class=org.mortbay.jetty.Server Loader %2 %3 %4 %5 %6 %7 %8 %9
+if not "%OS%" == "Windows_NT" goto noNT
+shift
+%JAVA_HOME%\bin\java.exe %JAVA_OPT% -classpath %CP%
-Djava.endorsed.dirs=lib\endorsed -Dloader.jar.repositories=%COCOON_LIB%
-Dloader.main.class=org.apache.cocoon.Main Loader %*
+goto end
+:noNT
+%JAVA_HOME%\bin\java.exe %JAVA_OPT% -classpath %CP%
-Djava.endorsed.dirs=lib\endorsed -Dloader.jar.repositories=%COCOON_LIB%
-Dloader.main.class=org.apache.cocoon.Main Loader %2 %3 %4 %5 %6 %7 %8 %9
goto end
:: ----- Servlet ---------------------------------------------------------------
1.6 +2 -2 xml-cocoon2/cocoon.sh
Index: cocoon.sh
===================================================================
RCS file: /home/cvs/xml-cocoon2/cocoon.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cocoon.sh 27 Feb 2003 22:42:28 -0000 1.5
+++ cocoon.sh 28 Feb 2003 00:19:21 -0000 1.6
@@ -81,7 +81,7 @@
case "$ACTION" in
cli)
- $JAVA_HOME/bin/java $JAVA_OPT -classpath %CP%
-Djava.endorsed.dirs=lib/endorsed -Dloader.jar.repositories=%COCOON_LIB%
-Dloader.main.class=org.mortbay.jetty.Server Loader $ARGS
+ $JAVA_HOME/bin/java $JAVA_OPT -classpath %CP%
-Djava.endorsed.dirs=lib/endorsed -Dloader.jar.repositories=%COCOON_LIB%
-Dloader.main.class=org.apache.cocoon.Main Loader $ARGS
;;
servlet)