mcconnell    2003/12/12 05:38:50

  Modified:    merlin/platform/src/bin merlin.bat
  Log:
  Correct bug in bat file that was overriding the merlin.dir value.
  
  Revision  Changes    Path
  1.5       +1 -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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- merlin.bat        8 Dec 2003 18:45:02 -0000       1.4
  +++ merlin.bat        12 Dec 2003 13:38:50 -0000      1.5
  @@ -5,7 +5,7 @@
   set MERLIN_CMD_LINE_ARGS=%*
   set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-cli-3.2-dev.jar
   set MERLIN_EXT_DIR=%MERLIN_HOME%\ext
  -java -Djava.security.policy=%MERLIN_HOME%\bin\security.policy 
-Dmerlin.dir=%MERLIN_HOME% -Djava.ext.dirs=%MERLIN_EXT_DIR% -jar 
%MERLIN_BOOTSTRAP_JAR% %MERLIN_CMD_LINE_ARGS%
  +java -Djava.security.policy=%MERLIN_HOME%\bin\security.policy 
-Djava.ext.dirs=%MERLIN_EXT_DIR% -jar %MERLIN_BOOTSTRAP_JAR% %MERLIN_CMD_LINE_ARGS%
   goto EndOfScript
   
   :EndOfScript
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to