svn commit: r190201 - /jakarta/commons/proper/jelly/trunk/src/bin/jelly /jakarta/commons/proper/jelly/trunk/src/bin/jelly.bat

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r190201 - /jakarta/commons/proper/jelly/trunk/src/bin/jelly /jakarta/commons/proper/jelly/trunk/src/bin/jelly.bat

Brett Porter-2
Author: brett
Date: Sat Jun 11 19:55:31 2005
New Revision: 190201

URL: http://svn.apache.org/viewcvs?rev=190201&view=rev
Log:
set JELLY_HOME automatically

Modified:
    jakarta/commons/proper/jelly/trunk/src/bin/jelly
    jakarta/commons/proper/jelly/trunk/src/bin/jelly.bat

Modified: jakarta/commons/proper/jelly/trunk/src/bin/jelly
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/src/bin/jelly?rev=190201&r1=190200&r2=190201&view=diff
==============================================================================
--- jakarta/commons/proper/jelly/trunk/src/bin/jelly (original)
+++ jakarta/commons/proper/jelly/trunk/src/bin/jelly Sat Jun 11 19:55:31 2005
@@ -15,11 +15,21 @@
 #  limitations under the License.
 #
 
+if [ -z "$JELLY_HOME" ]; then
+  JELLY_HOME=`dirname $0`/..
+fi
+
+if [ -z "$CLASSPATH" ]; then
+  CLASSPATH=${JELLY_HOME}/lib/forehead-1.0-beta-5.jar
+else
+  CLASSPATH=${CLASSPATH}:${JELLY_HOME}/lib/forehead-1.0-beta-5.jar
+fi
+
 if [ -z "$FOREHEAD_CONF" ] ; then
   FOREHEAD_CONF=${JELLY_HOME}/bin/forehead.conf
 fi
 
-$JAVA_HOME/bin/java -classpath ${CLASSPATH}:${JELLY_HOME}/lib/forehead-1.0-beta-5.jar \
+$JAVA_HOME/bin/java -classpath ${CLASSPATH} \
   -Dforehead.conf.file=${FOREHEAD_CONF} \
   -Djelly.home=${JELLY_HOME} \
   -Dtools.jar=${JAVA_HOME}/lib/tools.jar \

Modified: jakarta/commons/proper/jelly/trunk/src/bin/jelly.bat
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/src/bin/jelly.bat?rev=190201&r1=190200&r2=190201&view=diff
==============================================================================
--- jakarta/commons/proper/jelly/trunk/src/bin/jelly.bat (original)
+++ jakarta/commons/proper/jelly/trunk/src/bin/jelly.bat Sat Jun 11 19:55:31 2005
@@ -15,7 +15,21 @@
 @REM limitations under the License.
 @REM
 
+if "%JELLY_HOME%"=="" goto jelly_home_err
+goto run
+
+:jelly_home_err
+if "%OS%"=="Windows_NT" SET JELLY_HOME=%~dps0\..
+if "%JELLY_HOME%"=="" goto jelly_home_err2
+goto run
+
+:jelly_home_err2
+echo JELLY_HOME must be specified
+goto end
+
+:run
 if "%FOREHEAD_CONF%"=="" set FOREHEAD_CONF=%JELLY_HOME%\bin\forehead.conf
 
 "%JAVA_HOME%"\bin\java -classpath "%CLASSPATH%;%JELLY_HOME%\lib\forehead-1.0-beta-5.jar" "-Dforehead.conf.file=%FOREHEAD_CONF%" "-Djelly.home=%JELLY_HOME%" "-Dtools.jar=%JAVA_HOME%\lib\tools.jar" %JELLY_OPTS% com.werken.forehead.Forehead %*
 
+:end



---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]