mcconnell 2004/04/16 06:54:08
Modified: merlin/platform/src/bin internal-cygwin.sh internal-unix.sh
merlin-server.sh merlin.sh merlinx.sh
Log:
Update the scripts so that they are not overriding the java.ext.dirs directory.
Revision Changes Path
1.5 +1 -1 avalon/merlin/platform/src/bin/internal-cygwin.sh
Index: internal-cygwin.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/internal-cygwin.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- internal-cygwin.sh 29 Dec 2003 02:24:44 -0000 1.4
+++ internal-cygwin.sh 16 Apr 2004 13:54:08 -0000 1.5
@@ -26,7 +26,7 @@
echo " Merlin Arguments: $MERLIN_ARGS $@"
echo ""
-ARGS="$MERLIN_JVM_OPTS \"-Djava.security.policy=$MERLIN_HOME/bin/security.policy\"
\"-Djava.ext.dirs=$MERLIN_HOME/ext\" -jar \"$MERLIN_BOOTSTRAP_JAR\" $MERLIN_ARGS
\"[EMAIL PROTECTED]""
+ARGS="$MERLIN_JVM_OPTS \"-Djava.security.policy=$MERLIN_HOME/bin/security.policy\"
-jar \"$MERLIN_BOOTSTRAP_JAR\" $MERLIN_ARGS \"[EMAIL PROTECTED]""
echo -n "$JAVA" >$MERLIN_HOME/command-line.log
echo "$ARGS" >>$MERLIN_HOME/command-line.log
1.5 +1 -1 avalon/merlin/platform/src/bin/internal-unix.sh
Index: internal-unix.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/internal-unix.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- internal-unix.sh 29 Dec 2003 02:24:44 -0000 1.4
+++ internal-unix.sh 16 Apr 2004 13:54:08 -0000 1.5
@@ -13,7 +13,7 @@
JAVA="$JAVA_HOME/bin/java"
-ARGS="$MERLIN_JVM_OPTS \"-Djava.security.policy=$MERLIN_HOME/bin/security.policy\"
\"-Djava.ext.dirs=$MERLIN_HOME/ext\" -jar \"$MERLIN_BOOTSTRAP_JAR\" $MERLIN_ARGS $@"
+ARGS="$MERLIN_JVM_OPTS \"-Djava.security.policy=$MERLIN_HOME/bin/security.policy\"
-jar \"$MERLIN_BOOTSTRAP_JAR\" $MERLIN_ARGS $@"
echo -n "$JAVA" >$MERLIN_HOME/command-line.log
echo "$ARGS" >>$MERLIN_HOME/command-line.log
1.11 +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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- merlin-server.sh 13 Jan 2004 11:41:28 -0000 1.10
+++ merlin-server.sh 16 Apr 2004 13:54:08 -0000 1.11
@@ -106,7 +106,7 @@
#
JVM_EXT_DIRS="$MERLIN_HOME/ext"
-JVM_OPTS="-Djava.security.policy=$MERLIN_HOME/bin/security.policy
-Djava.ext.dirs=$JVM_EXT_DIRS"
+JVM_OPTS="-Djava.security.policy=$MERLIN_HOME/bin/security.policy "
MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/@MERLIN_CLI_JAR@
# Get the run cmd
1.15 +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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- merlin.sh 13 Jan 2004 11:41:28 -0000 1.14
+++ merlin.sh 16 Apr 2004 13:54:08 -0000 1.15
@@ -51,4 +51,4 @@
echo " Bootstrap JAR: $MERLIN_BOOTSTRAP_JAR"
echo ""
-"$JAVA" $MERLIN_JVM_OPTS "-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"
-jar "$MERLIN_BOOTSTRAP_JAR" "$@"
1.14 +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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- merlinx.sh 13 Jan 2004 11:41:28 -0000 1.13
+++ merlinx.sh 16 Apr 2004 13:54:08 -0000 1.14
@@ -63,4 +63,4 @@
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" "$@"
+"$JAVA" $MERLIN_JVM_OPTS "-Djava.security.policy=$MERLIN_HOME/bin/security.policy"
-jar "$MERLIN_BOOTSTRAP_JAR" -system "$REPOSITORY" -repository "$REPOSITORY" "$@"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
