avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/merlin/platform/src/bin merlinx.bat merlinx.sh
Date Sat, 20 Dec 2003 00:16:00 GMT
mcconnell    2003/12/19 16:16:00

  Modified:    merlin/platform/src/bin merlinx.bat merlinx.sh
  Log:
  Properly correct merlinx command line parmeters.
  
  Revision  Changes    Path
  1.8       +3 -3      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- merlinx.bat	19 Dec 2003 23:40:04 -0000	1.7
  +++ merlinx.bat	20 Dec 2003 00:16:00 -0000	1.8
  @@ -2,15 +2,15 @@
   
   if "%MERLIN_HOME%" == "" set MERLIN_HOME=%USERPROFILE%\.merlin
   
  -set MERLIN_SYSTEM_REPOSITORY=%USERPROFILE%\.maven\repository
  +set WORKING_REPOSITORY=%USERPROFILE%\.maven\repository
   if "%MAVEN_HOME_LOCAL%" == "" goto DoneMerlinSystem
  -set MERLIN_SYSTEM_REPOSITORY=%MAVEN_HOME_LOCAL%\repository
  +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 %MERLIN_SYSTEM_REPOSITORY% 
  +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% 
   goto :EndOfScript
   
   :EndOfScript
  
  
  
  1.8       +1 -1      avalon/merlin/platform/src/bin/merlinx.sh
  
  Index: merlinx.sh
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlinx.sh,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- merlinx.sh	19 Dec 2003 23:40:04 -0000	1.7
  +++ merlinx.sh	20 Dec 2003 00:16:00 -0000	1.8
  @@ -52,6 +52,6 @@
     [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
   fi
   
  -RUN_CMD="\"$JAVA\" \"-Djava.security.policy=$MERLIN_HOME/bin/security.policy\" \"-Djava.ext.dirs=$MERLIN_HOME/ext\"
-jar \"$MERLIN_HOME/bin/lib/merlin-cli-3.2.jar\" \"-system $REPOSITORY\" \"$@\""
  +RUN_CMD="\"$JAVA\" \"-Djava.security.policy=$MERLIN_HOME/bin/security.policy\" \"-Djava.ext.dirs=$MERLIN_HOME/ext\"
-jar \"$MERLIN_HOME/bin/lib/merlin-cli-3.2.jar\" \"-system $REPOSITORY\" \"-repository $REPOSITORY\"
\"$@\""
   echo "RUN CMD IS: $RUN_CMD"
   exec $RUN_CMD
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message