mcconnell 2003/12/08 10:45:02
Modified: merlin/platform/src/bin merlin-server.sh merlin.bat
merlin.sh merlinx.bat merlinx.sh
merlin/platform/src/bin/nt wrapper.conf
Log:
Correct version references.
Revision Changes Path
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- merlin-server.sh 8 Dec 2003 15:54:36 -0000 1.3
+++ merlin-server.sh 8 Dec 2003 18:45:02 -0000 1.4
@@ -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.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-dev.jar $*"
echo "Using MERLIN_HOME: $MERLIN_HOME"
echo "Using JAVA_HOME: $JAVA_HOME"
1.4 +2 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- merlin.bat 8 Dec 2003 15:54:36 -0000 1.3
+++ merlin.bat 8 Dec 2003 18:45:02 -0000 1.4
@@ -3,9 +3,9 @@
:MerlinRuntime
set MERLIN_CMD_LINE_ARGS=%*
-set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-cli-3.2.jar
+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.home=%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
-Dmerlin.dir=%MERLIN_HOME% -Djava.ext.dirs=%MERLIN_EXT_DIR% -jar
%MERLIN_BOOTSTRAP_JAR% %MERLIN_CMD_LINE_ARGS%
goto EndOfScript
:EndOfScript
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- merlin.sh 8 Dec 2003 15:54:36 -0000 1.3
+++ merlin.sh 8 Dec 2003 18:45:02 -0000 1.4
@@ -20,6 +20,6 @@
exit 1
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.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-dev.jar $*"
echo "RUN CMD IS: $RUN_CMD"
exec $RUN_CMD
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- merlinx.bat 8 Dec 2003 15:54:36 -0000 1.3
+++ merlinx.bat 8 Dec 2003 18:45:02 -0000 1.4
@@ -13,7 +13,7 @@
:DoneMerlinUser
set MERLIN_CMD_LINE_ARGS=%*
-set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-cli-3.2.jar
+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.home=%MERLIN_HOME% -Dmerlin.system.repository=%MERLIN_SYSTEM_REPOSITORY%
-Dmerlin.local.repository=%MERLIN_USER_REPOSITORY% -Djava.ext.dirs=%MERLIN_EXT_DIR%
-jar %MERLIN_BOOTSTRAP_JAR% %MERLIN_CMD_LINE_ARGS%
goto :EndOfScript
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- merlinx.sh 8 Dec 2003 15:54:36 -0000 1.3
+++ merlinx.sh 8 Dec 2003 18:45:02 -0000 1.4
@@ -28,6 +28,6 @@
REPOSITORY="$MAVEN_HOME_LOCAL/repository"
fi
-RUN_CMD="$JAVA_HOME/bin/java
-Djava.security.policy=$MERLIN_HOME/bin/security.policy -Dmerlin.home=$MERLIN_HOME
-Dmerlin.system.repository=$REPOSITORY -Djava.ext.dirs=$MERLIN_HOME/ext -jar
$MERLIN_HOME/bin/lib/merlin-cli-3.2.jar $*"
+RUN_CMD="$JAVA_HOME/bin/java
-Djava.security.policy=$MERLIN_HOME/bin/security.policy -Dmerlin.home=$MERLIN_HOME
-Dmerlin.system.repository=$REPOSITORY -Djava.ext.dirs=$MERLIN_HOME/ext -jar
$MERLIN_HOME/bin/lib/merlin-cli-3.2-dev.jar $*"
echo "RUN CMD IS: $RUN_CMD"
exec $RUN_CMD
1.5 +3 -11 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wrapper.conf 8 Dec 2003 15:54:36 -0000 1.4
+++ wrapper.conf 8 Dec 2003 18:45:02 -0000 1.5
@@ -28,22 +28,14 @@
# The following environment variables should be declared before
# using the service:
#
-# MERLIN_DAEMON_KERNEL -- the kernel.xml file to use
# MERLIN_DAEMON_HOME -- the home directory
-# MERLIN_DAEMON_CONFIG -- the cofiguration file
-# MERLIN_DAEMON_PATH -- file name of a block or blocks (may include wildcards)
#
# Application parameters. Add parameters as needed starting from 1
-wrapper.app.parameter.1=Merlin
+wrapper.app.parameter.1=org.apache.avalon.merlin.cli.Main
wrapper.app.parameter.2=-info
-wrapper.app.parameter.3=-kernel
-wrapper.app.parameter.4=%MERLIN_DAEMON_KERNEL%
-wrapper.app.parameter.5=-home
-wrapper.app.parameter.6=%MERLIN_DAEMON_HOME%
-wrapper.app.parameter.7=-config
-wrapper.app.parameter.8=%MERLIN_DAEMON_CONFIG%
-wrapper.app.parameter.9=%MERLIN_DAEMON_PATH%
+wrapper.app.parameter.3=-home
+wrapper.app.parameter.4=%MERLIN_DAEMON_HOME%
# Port which the native wrapper code will attempt to connect to
wrapper.port=1777
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
