morgand 2003/01/02 09:32:41
Modified: jelly/src/bin jelly jelly.bat
Log:
applied Mark Diggory patch for configurable forehead conf location
Revision Changes Path
1.3 +5 -1 jakarta-commons-sandbox/jelly/src/bin/jelly
Index: jelly
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/bin/jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jelly 2 Oct 2002 13:21:21 -0000 1.2
+++ jelly 2 Jan 2003 17:32:41 -0000 1.3
@@ -1,7 +1,11 @@
#!/bin/sh
+if [ -z "$FOREHEAD_CONF" ] ; then
+ FOREHEAD_CONF=${JELLY_HOME}/bin/forehead.conf
+fi
+
$JAVA_HOME/bin/java -classpath ${CLASSPATH}:${JELLY_HOME}/lib/forehead.jar \
- -Dforehead.conf.file=${JELLY_HOME}/bin/forehead.conf \
+ -Dforehead.conf.file=${FOREHEAD_CONF} \
-Dant.home=${ANT_HOME} -Djelly.home=${JELLY_HOME} \
-Dtools.jar=${JAVA_HOME}/lib/tools.jar \
${JELLY_OPTS} \
1.5 +3 -1 jakarta-commons-sandbox/jelly/src/bin/jelly.bat
Index: jelly.bat
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/bin/jelly.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jelly.bat 27 Dec 2002 21:12:36 -0000 1.4
+++ jelly.bat 2 Jan 2003 17:32:41 -0000 1.5
@@ -1,4 +1,6 @@
@echo off
-%JAVA_HOME%\bin\java -classpath %CLASSPATH%;%JELLY_HOME%\lib\forehead.jar
-Dforehead.conf.file=%JELLY_HOME%\bin\forehead.conf -Dant.home=%ANT_HOME%
-Djelly.home=%JELLY_HOME% -Dtools.jar=%JAVA_HOME%\lib\tools.jar %JELLY_OPTS%
com.werken.forehead.Forehead %*
+if "%FOREHEAD_CONF%"=="" set FOREHEAD_CONF=%JELLY_HOME%\bin\forehead.conf
+
+%JAVA_HOME%\bin\java -classpath %CLASSPATH%;%JELLY_HOME%\lib\forehead.jar
-Dforehead.conf.file=%FOREHEAD_CONF% -Dant.home=%ANT_HOME% -Djelly.home=%JELLY_HOME%
-Dtools.jar=%JAVA_HOME%\lib\tools.jar %JELLY_OPTS% com.werken.forehead.Forehead %*
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
