You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/12/20 00:40:04 UTC
cvs commit: avalon/merlin/platform/src/bin merlinx.bat merlinx.sh
mcconnell 2003/12/19 15:40:04
Modified: merlin/platform/src/bin merlinx.bat merlinx.sh
Log:
Corredct merlinx command line parmeters.
Revision Changes Path
1.7 +1 -8 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- merlinx.bat 19 Dec 2003 17:41:22 -0000 1.6
+++ merlinx.bat 19 Dec 2003 23:40:04 -0000 1.7
@@ -7,17 +7,10 @@
set MERLIN_SYSTEM_REPOSITORY=%MAVEN_HOME_LOCAL%\repository
:DoneMerlinSystem
-set MERLIN_USER_REPOSITORY=%USERPROFILE%\.maven\repository
-if "%MAVEN_HOME_LOCAL%" == "" goto DoneMerlinUser
-set MERLIN_USER_REPOSITORY=%MAVEN_HOME_LOCAL%\repository
-:DoneMerlinUser
-
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 -Davalon.repository.cache=%MERLIN_SYSTEM_REPOSITORY% -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% -system %MERLIN_SYSTEM_REPOSITORY%
goto :EndOfScript
:EndOfScript
-
-
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- merlinx.sh 19 Dec 2003 17:41:22 -0000 1.6
+++ merlinx.sh 19 Dec 2003 23:40:04 -0000 1.7
@@ -52,6 +52,6 @@
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
-RUN_CMD="\"$JAVA\" \"-Djava.security.policy=$MERLIN_HOME/bin/security.policy\" \"-Davalon.repository.cache=$REPOSITORY\" \"-Djava.ext.dirs=$MERLIN_HOME/ext\" -jar \"$MERLIN_HOME/bin/lib/merlin-cli-3.2.jar\" \"$@\""
+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\" \"$@\""
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