niclas 2003/12/20 01:07:15
Modified: merlin INSTALLATION.TXT
merlin/platform/src/bin merlin.sh
Log:
This is the only thing I believe will work on all platforms. The "exec $RUN_CMD"
does not work... Verified that the provided solution works both for spaces in the
Java command, as well as in the MERLIN_HOME. It is still important that the JAVA_HOME
and MERLIN_HOME is not set with the backslash-space "\\ " construct, used in "pwd",
but a plain space. Ex; JAVA_HOME="/java/jdk 1.4/"
Revision Changes Path
1.6 +86 -86 avalon/merlin/INSTALLATION.TXT
Index: INSTALLATION.TXT
===================================================================
RCS file: /home/cvs/avalon/merlin/INSTALLATION.TXT,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- INSTALLATION.TXT 11 Dec 2003 04:51:49 -0000 1.5
+++ INSTALLATION.TXT 20 Dec 2003 09:07:15 -0000 1.6
@@ -1,86 +1,86 @@
-
-PROJECT: Merlin 3.2-dev
-====================================================================
-
-DESCRIPTION:
-------------
-
-This directory contains the merlin system installation and related
-resources.
-
- /merlin
- /bin
- /config
- /ext
- /system
- README.TXT
- LICENSE.TXT
- INSTALLATION.TXT
- /plugins
- avalon-meta-plugin-1.2.jar
- merlin-plugin-3.2.1-dev.jar
-
-
-Installing Merlin.
-------------------
-
-To use Merlin command line support or the Merlin NT Service
-you will need to define the MERLIN_HOME environment
-variable for your system and include MERLIN_HOME/bin in
-your system path. The MERLIN_HOME environment variable
-should point to the merlin directory.
-
-Under Lunix you can do this as follows:
-
- $ echo '
- > # set location of merlin
- > export MERLIN_HOME=/opt/merlin
- > # include it in the path
- > export PATH=$PATH:$MERLIN_HOME/bin
- > ' >> ~/.bash_profile
- $ source ~/.bash_profile
-
-Under Windows you can set environment variables by selecting the
-Environment Tab from the System Control Panel.
-
-Versions of Merlin prior to the 3.2-dev 20031210 build maintained
-a local repository of jar files under the %MERLIN_HOME%/repository
-directory. As of the 20031210 build the repository is maintained
-under AVALON_HOME which defaults to ${user.home}/.avalon. To
-override this behaviour you can either define a AVALON_HOME
-environment variable or you can add a merlin.properties file to
-${user.home} containing the "merlin.repository" property key and
-a value point to you preferred repository location.
-
-To confirm that your environment variables are correct, you
-should open a new command window and invoke the Merlin
-CLI application.
-
-Under DOS:
-
- $ merlin -version
-
-Under Lunix:
-
- $ merlin.sh -version
-
-The installation of Merlin is now complete, however, two plugins are
-provided with the installation supporting merlin development under the
-Maven platform. These plugins should be placed in the Maven plugin
-directory (${maven.home.local}\plugins).
-
- [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-1.2.jar
- [YOUR-MAVEN-HOME]\plugins\merlin-plugin-3.2.1-dev.jar
-
-Please note that if you are upgrading an existing installation you must
-delete the following two directories:
-
- [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-*
- [YOUR-MAVEN-HOME]\plugins\merlin-plugin-*
-
-Replace the existing avalon-meta and merlin plugin jar files with the supplied
-versions. Finally, delete all *.cache files in the Maven plugin directory.
-
-You now have everything in place to start using the Merlin Tutorial or
-building you own components. If you have any problems, please subscribe
-and post a message to [EMAIL PROTECTED]
+
+PROJECT: Merlin 3.2-dev
+====================================================================
+
+DESCRIPTION:
+------------
+
+This directory contains the merlin system installation and related
+resources.
+
+ /merlin
+ /bin
+ /config
+ /ext
+ /system
+ README.TXT
+ LICENSE.TXT
+ INSTALLATION.TXT
+ /plugins
+ avalon-meta-plugin-1.2.jar
+ merlin-plugin-3.2.1-dev.jar
+
+
+Installing Merlin.
+------------------
+
+To use Merlin command line support or the Merlin NT Service
+you will need to define the MERLIN_HOME environment
+variable for your system and include MERLIN_HOME/bin in
+your system path. The MERLIN_HOME environment variable
+should point to the merlin directory.
+
+Under Lunix you can do this as follows:
+
+ $ echo '
+ > # set location of merlin
+ > export MERLIN_HOME=/opt/merlin
+ > # include it in the path
+ > export PATH=$PATH:$MERLIN_HOME/bin
+ > ' >> ~/.bash_profile
+ $ source ~/.bash_profile
+
+Under Windows you can set environment variables by selecting the
+Environment Tab from the System Control Panel.
+
+Versions of Merlin prior to the 3.2-dev 20031210 build maintained
+a local repository of jar files under the %MERLIN_HOME%/repository
+directory. As of the 20031210 build the repository is maintained
+under AVALON_HOME which defaults to ${user.home}/.avalon. To
+override this behaviour you can either define a AVALON_HOME
+environment variable or you can add a merlin.properties file to
+${user.home} containing the "merlin.repository" property key and
+a value point to you preferred repository location.
+
+To confirm that your environment variables are correct, you
+should open a new command window and invoke the Merlin
+CLI application.
+
+Under DOS:
+
+ $ merlin -version
+
+Under Lunix:
+
+ $ merlin.sh -version
+
+The installation of Merlin is now complete, however, two plugins are
+provided with the installation supporting merlin development under the
+Maven platform. These plugins should be placed in the Maven plugin
+directory (${maven.home.local}\plugins).
+
+ [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-1.2.jar
+ [YOUR-MAVEN-HOME]\plugins\merlin-plugin-3.2.1-dev.jar
+
+Please note that if you are upgrading an existing installation you must
+delete the following two directories:
+
+ [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-*
+ [YOUR-MAVEN-HOME]\plugins\merlin-plugin-*
+
+Replace the existing avalon-meta and merlin plugin jar files with the supplied
+versions. Finally, delete all *.cache files in the Maven plugin directory.
+
+You now have everything in place to start using the Merlin Tutorial or
+building you own components. If you have any problems, please subscribe
+and post a message to [EMAIL PROTECTED]
1.8 +8 -3 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- merlin.sh 19 Dec 2003 17:41:21 -0000 1.7
+++ merlin.sh 20 Dec 2003 09:07:15 -0000 1.8
@@ -34,6 +34,7 @@
fi
JAVA=$JAVA_HOME/bin/java
+MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.jar
# switch necessary paths to Windows format before running java
if $cygwin; then
@@ -42,7 +43,11 @@
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
-RUN_CMD="\"$JAVA\" \"-Djava.security.policy=$MERLIN_HOME/bin/security.policy\"
\"-Djava.ext.dirs=$MERLIN_HOME/ext\" -jar \"$MERLIN_HOME/bin/lib/merlin-cli-3.2.jar\"
\"[EMAIL PROTECTED]""
-echo "RUN CMD IS: $RUN_CMD"
-exec $RUN_CMD
+echo "Starting Merlin."
+echo "================"
+echo " Security policy: $MERLIN_HOME/bin/security.policy"
+echo " Extension directory: $MERLIN_HOME/ext"
+echo " Bootstrap JAR: $MERLIN_BOOTSTRAP_JAR"
+echo ""
+"$JAVA" "-Djava.security.policy=$MERLIN_HOME/bin/security.policy"
"-Djava.ext.dirs=$MERLIN_HOME/ext" -jar "$MERLIN_BOOTSTRAP_JAR" "$@"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
