mcconnell 2003/12/21 15:36:55 Modified: merlin/platform/src/bin merlin.bat merlinx.bat Log: Update the windows bat files to remove the java extensions directory override and add a generic MERLIN_JVMARGS value. Revision Changes Path 1.7 +2 -5 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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- merlin.bat 18 Dec 2003 01:33:52 -0000 1.6 +++ merlin.bat 21 Dec 2003 23:36:55 -0000 1.7 @@ -1,11 +1,8 @@ @echo off if "%MERLIN_HOME%" == "" set MERLIN_HOME=%USERPROFILE%\.merlin - -:MerlinRuntime set MERLIN_CMD_LINE_ARGS=%* set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-cli-3.2.jar -set MERLIN_EXT_DIR=%MERLIN_HOME%\ext -java -Djava.security.policy=%MERLIN_HOME%\bin\security.policy -Djava.ext.dirs=%MERLIN_EXT_DIR% -jar %MERLIN_BOOTSTRAP_JAR% %MERLIN_CMD_LINE_ARGS% +set MERLIN_SECURITY_POLICY=-Djava.security.policy=%MERLIN_HOME%\bin\security.policy +java %MERLIN_SECURITY_POLICY% %MERLIN_JVMARGS% -jar %MERLIN_BOOTSTRAP_JAR% %MERLIN_CMD_LINE_ARGS% goto EndOfScript - :EndOfScript 1.9 +2 -6 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.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- merlinx.bat 20 Dec 2003 00:16:00 -0000 1.8 +++ merlinx.bat 21 Dec 2003 23:36:55 -0000 1.9 @@ -1,16 +1,12 @@ @echo off - if "%MERLIN_HOME%" == "" set MERLIN_HOME=%USERPROFILE%\.merlin - set WORKING_REPOSITORY=%USERPROFILE%\.maven\repository if "%MAVEN_HOME_LOCAL%" == "" goto DoneMerlinSystem set WORKING_REPOSITORY=%MAVEN_HOME_LOCAL%\repository :DoneMerlinSystem - set MERLIN_CMD_LINE_ARGS=%* set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-cli-3.2.jar -set MERLIN_EXT_DIR=%MERLIN_HOME%\ext -java -Djava.security.policy=%MERLIN_HOME%\bin\security.policy -Djava.ext.dirs=%MERLIN_EXT_DIR% -jar %MERLIN_BOOTSTRAP_JAR% %MERLIN_CMD_LINE_ARGS% -system %WORKING_REPOSITORY% -repository %WORKING_REPOSITORY% +set MERLIN_SECURITY_POLICY=-Djava.security.policy=%MERLIN_HOME%\bin\security.policy +java %MERLIN_SECURITY_POLICY% %MERLIN_JVMARGS% -jar %MERLIN_BOOTSTRAP_JAR% -system %WORKING_REPOSITORY% -repository %WORKING_REPOSITORY% %MERLIN_CMD_LINE_ARGS% goto :EndOfScript - :EndOfScript
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
