You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ni...@apache.org on 2003/12/22 14:57:54 UTC
cvs commit: avalon/merlin/platform/src/bin merlin-server.sh merlin.bat merlin.sh merlinx.bat merlinx.sh
niclas 2003/12/22 05:57:54
Modified: merlin/platform/src/bin merlin-server.sh merlin.bat
merlin.sh merlinx.bat merlinx.sh
Log:
Introduction of MERLIN_JVM_OPTS for users to be able to set any JVM options they like prior to invoking the command-line start.
Revision Changes Path
1.7 +8 -6 avalon/merlin/platform/src/bin/merlin-server.sh
Index: merlin-server.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin-server.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- merlin-server.sh 19 Dec 2003 17:41:21 -0000 1.6
+++ merlin-server.sh 22 Dec 2003 13:57:53 -0000 1.7
@@ -33,7 +33,7 @@
ACTION=$1
shift
-ARGS="$*"
+ARGS="$@"
@@ -104,15 +104,17 @@
# like placing jaxp/jaas/xml-parser jars in ext dir
# thus breaking Merlin
#
+
JVM_EXT_DIRS="$MERLIN_HOME/ext"
JVM_OPTS="-Djava.security.policy=$MERLIN_HOME/bin/security.policy -Djava.ext.dirs=$JVM_EXT_DIRS"
+MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.jar
# Get the run cmd
-RUN_CMD="$JAVA_HOME/bin/java $JVM_OPTS $DEBUG $MERLIN_JVM_OPTS -jar $MERLIN_HOME/bin/lib/merlin-cli-3.2.jar $*"
+RUN_CMD="$JAVA_HOME/bin/java $JVM_OPTS $DEBUG $MERLIN_JVM_OPTS -jar $MERLIN_BOOTSTRAP_JAR $ARGS"
echo "Using MERLIN_HOME: $MERLIN_HOME"
echo "Using JAVA_HOME: $JAVA_HOME"
-echo "USing RUN_CMD: $RUN_CMD"
+echo "Using RUN_CMD: $RUN_CMD"
#####################################################
# Find a PID for the pid file
@@ -173,9 +175,9 @@
;;
restart)
- $0 stop $*
+ $0 stop $ARGS
sleep 5
- $0 start $*
+ $0 start $ARGS
;;
supervise)
@@ -183,7 +185,7 @@
# Under control of daemontools supervise monitor which
# handles restarts and shutdowns via the svc program.
#
- exec $RUN_CMD
+ echo "This command is not implemented yet."
;;
run|demo)
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- merlin.bat 21 Dec 2003 23:36:55 -0000 1.7
+++ merlin.bat 22 Dec 2003 13:57:53 -0000 1.8
@@ -3,6 +3,6 @@
set MERLIN_CMD_LINE_ARGS=%*
set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-cli-3.2.jar
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%
+java %MERLIN_SECURITY_POLICY% %MERLIN_JVM_OPTS% -jar %MERLIN_BOOTSTRAP_JAR% %MERLIN_CMD_LINE_ARGS%
goto EndOfScript
:EndOfScript
1.10 +1 -1 avalon/merlin/platform/src/bin/merlin.sh
Index: merlin.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- merlin.sh 20 Dec 2003 18:41:18 -0000 1.9
+++ merlin.sh 22 Dec 2003 13:57:53 -0000 1.10
@@ -51,4 +51,4 @@
echo " Bootstrap JAR: $MERLIN_BOOTSTRAP_JAR"
echo ""
-"$JAVA" "-Djava.security.policy=$MERLIN_HOME/bin/security.policy" "-Djava.ext.dirs=$MERLIN_HOME/ext" -jar "$MERLIN_BOOTSTRAP_JAR" "$@"
+"$JAVA" $MERLIN_JVM_OPTS "-Djava.security.policy=$MERLIN_HOME/bin/security.policy" "-Djava.ext.dirs=$MERLIN_HOME/ext" -jar "$MERLIN_BOOTSTRAP_JAR" $@
1.10 +1 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- merlinx.bat 21 Dec 2003 23:36:55 -0000 1.9
+++ merlinx.bat 22 Dec 2003 13:57:53 -0000 1.10
@@ -7,6 +7,6 @@
set MERLIN_CMD_LINE_ARGS=%*
set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-cli-3.2.jar
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%
+java %MERLIN_SECURITY_POLICY% %MERLIN_JVM_OPTS% -jar %MERLIN_BOOTSTRAP_JAR% -system %WORKING_REPOSITORY% -repository %WORKING_REPOSITORY% %MERLIN_CMD_LINE_ARGS%
goto :EndOfScript
:EndOfScript
1.9 +13 -3 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- merlinx.sh 20 Dec 2003 00:16:00 -0000 1.8
+++ merlinx.sh 22 Dec 2003 13:57:53 -0000 1.9
@@ -35,6 +35,7 @@
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
fi
+
# Checking for REPOSITORY
if [ "$MAVEN_HOME_LOCAL" = "" ]
then
@@ -42,7 +43,9 @@
else
REPOSITORY="$MAVEN_HOME_LOCAL/repository"
fi
+
JAVA=$JAVA_HOME/bin/java
+MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.jar
# switch necessary paths to Windows format before running java
if $cygwin; then
@@ -52,6 +55,13 @@
[ -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\" \"-repository $REPOSITORY\" \"$@\""
-echo "RUN CMD IS: $RUN_CMD"
-exec $RUN_CMD
+echo "Starting Merlin."
+echo "================"
+echo " Security policy: $MERLIN_HOME/bin/security.policy"
+echo " Extension directory: $MERLIN_HOME/ext"
+echo " Bootstrap JAR: $MERLIN_BOOTSTRAP_JAR"
+echo " System: $REPOSITORY"
+echo " Repository: $REPOSITORY"
+echo ""
+
+"$JAVA" $MERLIN_JVM_OPTS "-Djava.security.policy=$MERLIN_HOME/bin/security.policy" "-Djava.ext.dirs=$MERLIN_HOME/ext" -jar "$MERLIN_BOOTSTRAP_JAR" -system "$REPOSITORY" -repository "$REPOSITORY" $@
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org