You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/07/11 18:19:21 UTC
svn commit: rev 22817 - avalon/trunk/runtime/merlin/cli/etc/deliverables/bin
Author: mcconnell
Date: Sun Jul 11 09:19:20 2004
New Revision: 22817
Modified:
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/internal-cygwin.sh
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/internal-unix.sh
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlin
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlin-server.sh
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlin.sh
Log:
Commit scripts for linux with updates to use classpath instead of -jar (avoiding the composite jar issue).
Modified: avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/internal-cygwin.sh
==============================================================================
--- avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/internal-cygwin.sh (original)
+++ avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/internal-cygwin.sh Sun Jul 11 09:19:20 2004
@@ -12,7 +12,7 @@
# switch necessary paths to Windows format before running java
JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
MERLIN_HOME=`cygpath --windows "$MERLIN_HOME"`
-MERLIN_BOOTSTRAP_JAR=`cygpath --windows "$MERLIN_BOOTSTRAP_JAR"`
+MERLIN_CLASSPATH=`cygpath --windows "$MERLIN_CLASSPATH"`
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
@@ -23,11 +23,12 @@
echo " Merlin Home: $MERLIN_HOME"
echo " Security policy: $MERLIN_HOME/bin/security.policy"
echo " JVM Options: $MERLIN_JVM_OPTS"
-echo " Bootstrap JAR: $MERLIN_BOOTSTRAP_JAR"
+echo " Merlin Classpath: $MERLIN_CLASSPATH"
echo " Merlin Arguments: $MERLIN_ARGS $@"
echo ""
+
+ARGS="$MERLIN_JVM_OPTS \"-Djava.security.policy=$MERLIN_HOME/bin/security.policy\" -classpath \"$MERLIN_CLASSPATH\" org.apache.avalon.merlin.cli.Main $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
Modified: avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/internal-unix.sh
==============================================================================
--- avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/internal-unix.sh (original)
+++ avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/internal-unix.sh Sun Jul 11 09:19:20 2004
@@ -8,13 +8,13 @@
echo " Merlin Home: $MERLIN_HOME"
echo " Security policy: $MERLIN_HOME/bin/security.policy"
echo " JVM Options: $MERLIN_JVM_OPTS"
-echo " Bootstrap JAR: $MERLIN_BOOTSTRAP_JAR"
+echo " Merlin CLasspath: $MERLIN_CLASSPATH"
echo " Merlin Arguments: $MERLIN_ARGS $@"
echo ""
JAVA="$JAVA_HOME/bin/java"
-ARGS="$MERLIN_JVM_OPTS \"-Djava.security.policy=$MERLIN_HOME/bin/security.policy\" -jar \"$MERLIN_BOOTSTRAP_JAR\" $MERLIN_ARGS $@"
+ARGS="$MERLIN_JVM_OPTS \"-Djava.security.policy=$MERLIN_HOME/bin/security.policy\" -classpath \"$MERLIN_CLASSPATH\" org.apache.avalon.merlin.cli.Main $MERLIN_ARGS $@"
echo -n "$JAVA" >$MERLIN_HOME/command-line.log
echo "$ARGS" >>$MERLIN_HOME/command-line.log
Modified: avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlin
==============================================================================
--- avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlin (original)
+++ avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlin Sun Jul 11 09:19:20 2004
@@ -2,7 +2,7 @@
#
-MERLIN_VERSION="3.3.0"
+MERLIN_VERSION="@@VERSION@@"
export MERLIN_VERSION
# Checking for JAVA_HOME is required on *nix due
@@ -29,9 +29,9 @@
cd "$CWD"
export MERLIN_HOME="`dirname "$ABSOLUTE_PATH"`"
fi
-
-MERLIN_BOOTSTRAP_JAR="$MERLIN_HOME/system/merlin/jars/merlin-cli-$MERLIN_VERSION.jar"
-export MERLIN_BOOTSTRAP_JAR
+
+MERLIN_CLASSPATH=@UNIX-CLI-CLASSPATH@:$MERLIN_HOME/system/@UNIX-CLI-MAIN-PATH@
+export MERLIN_CLASSPATH
if [ `echo $PLATFORM | grep "CYGWIN"` ] ; then
exec "$MERLIN_HOME/bin/internal-cygwin.sh" "$@"
Modified: avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlin-server.sh
==============================================================================
--- avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlin-server.sh (original)
+++ avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlin-server.sh Sun Jul 11 09:19:20 2004
@@ -107,11 +107,11 @@
#
JVM_EXT_DIRS="$MERLIN_HOME/ext"
-JVM_OPTS="-Djava.security.policy=$MERLIN_HOME/bin/security.policy "
-MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/system/merlin/jars/@MERLIN_CLI_JAR@
+JVM_OPTS="-Djava.security.policy=$MERLIN_HOME/bin/security.policy "
+MERLIN_CLASSPATH=@UNIX-CLI-CLASSPATH@:$MERLIN_HOME/system/@UNIX-CLI-MAIN-PATH@
# Get the run cmd
-RUN_CMD="$JAVA_HOME/bin/java $JVM_OPTS $DEBUG $MERLIN_JVM_OPTS -jar $MERLIN_BOOTSTRAP_JAR $ARGS"
+RUN_CMD="$JAVA_HOME/bin/java $JVM_OPTS $DEBUG $MERLIN_JVM_OPTS -classpath $MERLIN_CLASSPATH org.apache.avalon.merlin.cli.Main $ARGS"
echo "Using MERLIN_HOME: $MERLIN_HOME"
echo "Using JAVA_HOME: $JAVA_HOME"
@@ -204,13 +204,13 @@
check)
echo "Checking arguments to Merlin: "
- echo "MERLIN_HOME: $MERLIN_HOME"
- echo "MERLIN_TMPDIR: $MERLIN_TMPDIR"
- echo "MERLIN_JVM_OPTS: $MERLIN_JVM_OPTS"
- echo "JAVA_HOME: $JAVA_HOME"
- echo "JVM_OPTS: $JVM_OPTS"
- echo "CLASSPATH: $CLASSPATH"
- echo "RUN_CMD: $RUN_CMD"
+ echo "MERLIN_HOME: $MERLIN_HOME"
+ echo "MERLIN_TMPDIR: $MERLIN_TMPDIR"
+ echo "MERLIN_JVM_OPTS: $MERLIN_JVM_OPTS"
+ echo "JAVA_HOME: $JAVA_HOME"
+ echo "JVM_OPTS: $JVM_OPTS"
+ echo "MERLIN_CLASSPATH: $MERLIN_CLASSPATH"
+ echo "RUN_CMD: $RUN_CMD"
echo
if [ -f $MERLIN_PID ]
Modified: avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlin.sh
==============================================================================
--- avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlin.sh (original)
+++ avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlin.sh Sun Jul 11 09:19:20 2004
@@ -46,14 +46,14 @@
MERLIN_HOME=`cygpath --windows "$MERLIN_HOME"`
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
-
-MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/system/merlin/jars/@MERLIN_CLI_JAR@
+
+MERLIN_CLASSPATH=@UNIX-CLI-CLASSPATH@:$MERLIN_HOME/system/@UNIX-CLI-MAIN-PATH@
echo "Starting Merlin."
echo "================"
echo " Security policy: $MERLIN_HOME/bin/security.policy"
echo " JVM Options: $MERLIN_JVM_OPTS"
-echo " Bootstrap JAR: $MERLIN_BOOTSTRAP_JAR"
+echo " Bootstrap JAR: $MERLIN_CLASSPATH"
echo ""
-"$JAVA" $MERLIN_JVM_OPTS "-Djava.security.policy=$MERLIN_HOME/bin/security.policy" -jar "$MERLIN_BOOTSTRAP_JAR" "$@"
+"$JAVA" $MERLIN_JVM_OPTS "-Djava.security.policy=$MERLIN_HOME/bin/security.policy" -classpath "$MERLIN_CLASSPATH" org.apache.avalon.merlin.cli.Main "$@"
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org