Author: tchemit Date: 2012-10-05 17:42:47 +0200 (Fri, 05 Oct 2012) New Revision: 718 Url: http://forge.codelutin.com/repositories/revision/echobase/718 Log: fixes #1569: Faire fonctionner l'application embarqu?\195?\169 juste avec une jre et non plus une jdk (scripts embedded) Modified: trunk/echobase-services/src/main/resources/embedded/startEchobase.bat trunk/echobase-services/src/main/resources/embedded/startEchobase.sh Modified: trunk/echobase-services/src/main/resources/embedded/startEchobase.bat =================================================================== --- trunk/echobase-services/src/main/resources/embedded/startEchobase.bat 2012-10-05 15:26:33 UTC (rev 717) +++ trunk/echobase-services/src/main/resources/embedded/startEchobase.bat 2012-10-05 15:42:47 UTC (rev 718) @@ -1,48 +1,32 @@ @REM ---------------------------------------------------------------------------- @REM EchoBase Start Up Batch script @REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir @REM ---------------------------------------------------------------------------- @echo off -if not "%JDK_HOME%" == "" goto OkJHome +java -version -echo. -echo ERROR: JDK_HOME not found in your environment. -echo Please set the JDK_HOME variable in your environment to match the -echo location of your Java installation -echo. -goto error +IF "%ERRORLEVEL%" == "0" GOTO launch -:OkJHome -echo JDK_HOME defined to %JDK_HOME% - -if exist "%JDK_HOME%\bin\java.exe" goto doit - echo. -echo ERROR: JDK_HOME is set to an invalid directory. -echo JDK_HOME = "%JDK_HOME%" -echo Please set the JDK_HOME variable in your environment to match the -echo location of your Java installation +echo ERROR: "java.exe" not found. +echo Please install java on your computer. echo. -goto error +GOTO error :error set ERROR_CODE=1 goto end -:doit -set JAVA_COMMAND="%JDK_HOME%\bin\java.exe" -echo java.exe defined to %JAVA_COMMAND% +:launch +SET JAVA_COMMAND="java.exe" -set ECHOBASE_OPTS="-Xms512m -Xmx1024m -Dechobase.log.dir=./logs" -echo java options used : %ECHOBASE_OPTS% +SET ECHOBASE_OPTS="-Xms512m -Xmx1024m -Dechobase.log.dir=./logs" +ECHO java options used : %ECHOBASE_OPTS% -%JAVA_COMMAND% "%ECHOBASE_OPTS%" -jar echobase-ui-${project.version}-embedded.war %1 %2 %3 %4 %5 %6 %7 %8 %9 -goto end +%JAVA_COMMAND% "%ECHOBASE_OPTS%" -jar echobase-ui-${project.version}-embedded.war +GOTO end :end - -pause -cmd /C exit /B %ERROR_CODE% +PAUSE +CMD /C exit /B %ERROR_CODE% Modified: trunk/echobase-services/src/main/resources/embedded/startEchobase.sh =================================================================== --- trunk/echobase-services/src/main/resources/embedded/startEchobase.sh 2012-10-05 15:26:33 UTC (rev 717) +++ trunk/echobase-services/src/main/resources/embedded/startEchobase.sh 2012-10-05 15:42:47 UTC (rev 718) @@ -1,16 +1,17 @@ #!/bin/sh -if [ ! -e $JDK_HOME/bin/java ]; then - echo "Do not find $JDK_HOME/bin/java, please add JDK_HOME environnement variable" +# Test if java exists +java -version + +if [ ! $? -eq 0 ]; then + echo "Do not find java, please install java on your computer" exit 1 fi -JAVA_EXEC=$JDK_HOME/bin/java - OLDPWD=`pwd` cd `dirname $0` CURRENTPWD=`pwd` ECHOBASE_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -Dechobase.log.dir=$CURRENTPWD/logs" -$JAVA_EXEC $ECHOBASE_OPTS -jar echobase-ui-${project.version}-embedded.war $* +java $ECHOBASE_OPTS -jar echobase-ui-${project.version}-embedded.war $* cd "$OLDPWD"