mcconnell 2003/12/08 07:54:36
Modified: merlin platform.xml
merlin/platform/src/bin merlin-server.sh merlin.bat
merlin.sh merlinx.bat merlinx.sh
merlin/platform/src/bin/nt wrapper.conf
Log:
Update .bat and .sh files.
Revision Changes Path
1.15 +1 -1 avalon/merlin/platform.xml
Index: platform.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- platform.xml 8 Dec 2003 15:37:12 -0000 1.14
+++ platform.xml 8 Dec 2003 15:54:36 -0000 1.15
@@ -240,7 +240,7 @@
<packageGroup>
<title>Merlin Service Management Platform</title>
- <packages>org.apache.avalon.merlin.*</packages>
+ <packages>org.apache.avalon.merlin,org.apache.avalon.merlin.*</packages>
</packageGroup>
<packageGroup>
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- merlin-server.sh 3 Dec 2003 19:04:54 -0000 1.2
+++ merlin-server.sh 8 Dec 2003 15:54:36 -0000 1.3
@@ -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-bootstrap-1.1.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.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- merlin.bat 3 Dec 2003 19:04:54 -0000 1.2
+++ merlin.bat 8 Dec 2003 15:54:36 -0000 1.3
@@ -3,7 +3,7 @@
:MerlinRuntime
set MERLIN_CMD_LINE_ARGS=%*
-set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-bootstrap-1.1.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
-Dmerlin.home=%MERLIN_HOME% -Djava.ext.dirs=%MERLIN_EXT_DIR% -jar
%MERLIN_BOOTSTRAP_JAR% %MERLIN_CMD_LINE_ARGS%
goto EndOfScript
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- merlin.sh 3 Dec 2003 19:04:54 -0000 1.2
+++ merlin.sh 8 Dec 2003 15:54:36 -0000 1.3
@@ -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-bootstrap-1.1.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.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- merlinx.bat 3 Dec 2003 19:04:54 -0000 1.2
+++ merlinx.bat 8 Dec 2003 15:54:36 -0000 1.3
@@ -13,7 +13,7 @@
:DoneMerlinUser
set MERLIN_CMD_LINE_ARGS=%*
-set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-bootstrap-1.1.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
-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.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- merlinx.sh 3 Dec 2003 19:04:54 -0000 1.2
+++ merlinx.sh 8 Dec 2003 15:54:36 -0000 1.3
@@ -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-bootstrap-1.1.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.jar $*"
echo "RUN CMD IS: $RUN_CMD"
exec $RUN_CMD
1.4 +2 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wrapper.conf 3 Dec 2003 19:04:54 -0000 1.3
+++ wrapper.conf 8 Dec 2003 15:54:36 -0000 1.4
@@ -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-bootstrap-1.1.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=.
@@ -91,7 +91,7 @@
wrapper.ntservice.name=merlin
# Display name of the service
-wrapper.ntservice.displayname=Merlin SMP 3.0
+wrapper.ntservice.displayname=Merlin SMP
# Description of the service
wrapper.ntservice.description=Avalon Merlin Service Management Platform.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
