You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by fa...@apache.org on 2004/02/13 05:39:28 UTC
cvs commit: avalon/merlin/platform/src/bin merlin.bat merlinx.bat
farra 2004/02/12 20:39:28
Modified: merlin/platform/src/bin merlin.bat merlinx.bat
Log:
Fix for MERLIN-3 JIRA issue. Allows for java command to be set via JAVA_HOME variable.
Revision Changes Path
1.12 +15 -1 avalon/merlin/platform/src/bin/merlin.bat
Index: merlin.bat
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin.bat,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- merlin.bat 13 Jan 2004 11:41:28 -0000 1.11
+++ merlin.bat 13 Feb 2004 04:39:28 -0000 1.12
@@ -1,8 +1,22 @@
@echo off
+
+rem set JAVA CMD
+if not "%JAVA_HOME%" == "" goto USE_JAVA_HOME
+
+set JAVA=java
+
+goto SET_MERLIN
+
+:USE_JAVA_HOME
+set JAVA=%JAVA_HOME%\bin\java
+
+:SET_MERLIN
if "%MERLIN_HOME%" == "" set MERLIN_HOME=%USERPROFILE%\.merlin
set MERLIN_CMD_LINE_ARGS=%*
set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\@MERLIN_CLI_JAR@
set MERLIN_SECURITY_POLICY=-Djava.security.policy=%MERLIN_HOME%\bin\security.policy
-java %MERLIN_SECURITY_POLICY% %MERLIN_JVM_OPTS% -jar %MERLIN_BOOTSTRAP_JAR% %MERLIN_CMD_LINE_ARGS%
+
+:RUN_MERLIN
+%JAVA% %MERLIN_SECURITY_POLICY% %MERLIN_JVM_OPTS% -jar %MERLIN_BOOTSTRAP_JAR% %MERLIN_CMD_LINE_ARGS%
goto EndOfScript
:EndOfScript
1.14 +15 -1 avalon/merlin/platform/src/bin/merlinx.bat
Index: merlinx.bat
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlinx.bat,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- merlinx.bat 13 Jan 2004 11:41:28 -0000 1.13
+++ merlinx.bat 13 Feb 2004 04:39:28 -0000 1.14
@@ -1,4 +1,16 @@
@echo off
+
+rem set JAVA CMD
+if not "%JAVA_HOME%" == "" goto USE_JAVA_HOME
+
+set JAVA=java
+
+goto SET_MERLIN
+
+:USE_JAVA_HOME
+set JAVA=%JAVA_HOME%\bin\java
+
+:SET_MERLIN
if "%MERLIN_HOME%" == "" set MERLIN_HOME=%USERPROFILE%\.merlin
set WORKING_REPOSITORY=%USERPROFILE%\.maven\repository
if "%MAVEN_HOME_LOCAL%" == "" goto DoneMerlinSystem
@@ -7,6 +19,8 @@
set MERLIN_CMD_LINE_ARGS=%*
set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\@MERLIN_CLI_JAR@
set MERLIN_SECURITY_POLICY=-Djava.security.policy=%MERLIN_HOME%\bin\security.policy
-java %MERLIN_SECURITY_POLICY% %MERLIN_JVM_OPTS% -jar %MERLIN_BOOTSTRAP_JAR% -system %WORKING_REPOSITORY% -repository %WORKING_REPOSITORY% %MERLIN_CMD_LINE_ARGS%
+
+:RUN_MERLIN
+%JAVA% %MERLIN_SECURITY_POLICY% %MERLIN_JVM_OPTS% -jar %MERLIN_BOOTSTRAP_JAR% -system %WORKING_REPOSITORY% -repository %WORKING_REPOSITORY% %MERLIN_CMD_LINE_ARGS%
goto :EndOfScript
:EndOfScript
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org