mcconnell 2003/12/17 17:33:53
Modified: merlin/platform/src/bin merlin-server.sh merlin.bat
merlin.sh
merlin/platform/src/bin/nt wrapper.conf
Removed: merlin/platform/src/bin merlinx.bat merlinx.sh
Log:
Remove merlinx as the merlin scripts make this easy.
Revision Changes Path
1.5 +1 -1 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- merlin-server.sh 8 Dec 2003 18:45:02 -0000 1.4
+++ merlin-server.sh 18 Dec 2003 01:33:52 -0000 1.5
@@ -113,7 +113,7 @@
JVM_OPTS="-Djava.security.policy=$MERLIN_HOME/bin/security.policy
-Djava.ext.dirs=$JVM_EXT_DIRS"
# Get the run cmd
-RUN_CMD="$JAVA_HOME/bin/java $JVM_OPTS $DEBUG $MERLIN_JVM_OPTS
-Dmerlin.home=$MERLIN_HOME -jar $MERLIN_HOME/bin/lib/merlin-cli-3.2-dev.jar $*"
+RUN_CMD="$JAVA_HOME/bin/java $JVM_OPTS $DEBUG $MERLIN_JVM_OPTS
-Dmerlin.home=$MERLIN_HOME -jar $MERLIN_HOME/bin/lib/merlin-cli-3.2.jar $*"
echo "Using MERLIN_HOME: $MERLIN_HOME"
echo "Using JAVA_HOME: $JAVA_HOME"
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- merlin.bat 12 Dec 2003 13:38:50 -0000 1.5
+++ merlin.bat 18 Dec 2003 01:33:52 -0000 1.6
@@ -3,7 +3,7 @@
:MerlinRuntime
set MERLIN_CMD_LINE_ARGS=%*
-set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-cli-3.2-dev.jar
+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%
goto EndOfScript
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- merlin.sh 12 Dec 2003 11:07:01 -0000 1.5
+++ merlin.sh 18 Dec 2003 01:33:52 -0000 1.6
@@ -33,6 +33,6 @@
MERLIN_HOME=`cygpath --path --windows "$MERLIN_HOME"`
fi
-RUN_CMD="$JAVA_HOME/bin/java
-Djava.security.policy=$MERLIN_HOME/bin/security.policy -Dmerlin.home=$MERLIN_HOME
-Djava.ext.dirs=$MERLIN_HOME/ext -jar $MERLIN_HOME/bin/lib/merlin-cli-3.2-dev.jar $*"
+RUN_CMD="$JAVA_HOME/bin/java
-Djava.security.policy=$MERLIN_HOME/bin/security.policy -Dmerlin.home=$MERLIN_HOME
-Djava.ext.dirs=$MERLIN_HOME/ext -jar $MERLIN_HOME/bin/lib/merlin-cli-3.2.jar $*"
echo "RUN CMD IS: $RUN_CMD"
exec $RUN_CMD
1.7 +1 -1 avalon/merlin/platform/src/bin/nt/wrapper.conf
Index: wrapper.conf
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/nt/wrapper.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wrapper.conf 9 Dec 2003 09:22:16 -0000 1.6
+++ wrapper.conf 18 Dec 2003 01:33:53 -0000 1.7
@@ -10,7 +10,7 @@
# Java Classpath (include wrapper.jar) Add class path elements as
# needed starting from 1
wrapper.java.classpath.1=wrapper.jar
-wrapper.java.classpath.2=../lib/merlin-cli-3.2-dev.jar
+wrapper.java.classpath.2=../lib/merlin-cli-3.2.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
