stefano 2003/02/27 09:08:31
Modified: . cocoon.bat cocoon.sh
Log:
activating the cocoon cli
Revision Changes Path
1.3 +9 -4 xml-cocoon2/cocoon.bat
Index: cocoon.bat
===================================================================
RCS file: /home/cvs/xml-cocoon2/cocoon.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cocoon.bat 23 Feb 2003 16:39:46 -0000 1.2
+++ cocoon.bat 27 Feb 2003 17:08:31 -0000 1.3
@@ -14,11 +14,17 @@
:: ----- Set Up The Classpath --------------------------------------------------
-set CP=.\tools\lib\forehead-1.0-beta-4.jar
+set CP=.\tools\lib\forehead-1.0-beta-4-patched.jar
:: ----- Check System Properties -----------------------------------------------
+if not "%EXEC%" == "" goto gotExec
set EXEC=start "Cocoon" /D. /MAX
+:gotExec
+
+if not "%COCOON_LIB%" == "" goto gotLib
+set COCOON_LIB=build\webapp\WEB-INF\lib
+:gotLib
if not "%JETTY_PORT%" == "" goto gotPort
set JETTY_PORT=8888
@@ -54,8 +60,7 @@
:: ----- Cli -------------------------------------------------------------------
:doCli
-echo WARNING! DOESN'T WORK YET!
-::%JAVA_HOME%\bin\java.exe -classpath %CP% -Djava.endorsed.dirs=lib\endorsed
-Dforehead.conf.file=cocoon.env com.werken.forehead.Forehead %2 %3 %4 %5 %6 %7 %8 %9
+%JAVA_HOME%\bin\java.exe %JAVA_OPT% -classpath %CP%
-Djava.endorsed.dirs=lib\endorsed -Dcocoon.lib=%COCOON_LIB%
-Dforehead.conf.file=tools\cocoon.env com.werken.forehead.Forehead %2 %3 %4 %5 %6 %7
%8 %9
goto end
:: ----- Servlet ---------------------------------------------------------------
1.4 +10 -4 xml-cocoon2/cocoon.sh
Index: cocoon.sh
===================================================================
RCS file: /home/cvs/xml-cocoon2/cocoon.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cocoon.sh 25 Feb 2003 04:39:26 -0000 1.3
+++ cocoon.sh 27 Feb 2003 17:08:31 -0000 1.4
@@ -7,6 +7,9 @@
# Configuration variables
#
+# COCOON_LIB
+# Folder containing all the library files needed by the Cocoon CLI
+#
# JAVA_HOME
# Home of Java installation.
#
@@ -40,6 +43,10 @@
exit 1
fi
+if [ "$COCOON_LIB" = "" ] ; then
+ COCOON_LIB=build/webapp/WEB-INF/lib
+fi
+
if [ "$JETTY_PORT" = "" ] ; then
JETTY_PORT=8888
fi
@@ -58,14 +65,13 @@
# ----- Set Classpath ----------------------------------------------------------
-CP=./tools/lib/forehead-1.0-beta-4.jar
+CP=./tools/lib/forehead-1.0-beta-4-patched.jar
# ----- Do the action ----------------------------------------------------------
case "$ACTION" in
cli)
- echo "WARNING! DOESN'T WORK YET!"
- #$JAVA_HOME/bin/java -classpath %CP% -Djava.endorsed.dirs=lib/endorsed
-Dforehead.conf.file=cocoon.env com.werken.forehead.Forehead $ARGS
+ $JAVA_HOME/bin/java $JAVA_OPT -classpath %CP%
-Djava.endorsed.dirs=lib/endorsed -Dcocoon.lib=$COCOON_LIB
-Dforehead.conf.file=tools/cocoon.env com.werken.forehead.Forehead $ARGS
;;
servlet)
