You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ni...@apache.org on 2003/12/23 22:46:33 UTC
cvs commit: avalon/merlin/platform/src/bin internal-cygwin.sh internal-unix.sh merlin merlinx README.TXT
niclas 2003/12/23 13:46:33
Modified: merlin INSTALL.TXT maven.xml
merlin/platform/src/bin README.TXT
Added: merlin/platform/src/bin internal-cygwin.sh internal-unix.sh
merlin merlinx
Log:
A new launch system for Linux/Unix/CygWin...
Revision Changes Path
1.2 +99 -99 avalon/merlin/INSTALL.TXT
Index: INSTALL.TXT
===================================================================
RCS file: /home/cvs/avalon/merlin/INSTALL.TXT,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- INSTALL.TXT 23 Dec 2003 17:12:54 -0000 1.1
+++ INSTALL.TXT 23 Dec 2003 21:46:33 -0000 1.2
@@ -1,99 +1,99 @@
-
-PROJECT: Merlin 3.2-dev
-====================================================================
-
-DESCRIPTION:
-------------
-
-This directory contains the merlin system installation and related
-resources.
-
- /merlin
- /bin
- /config
- /system
- README.TXT
- LICENSE.TXT
- INSTALL.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 Windows you can set environment variables by selecting the
-Environment Tab from the System Control Panel.
-
-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
-
-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 users@avalon.apache.org.
-
-Special Note for JRE 1.3 and earlier.
--------------------------------------
-
-Some applications assume that XML parsing classes are available withing
-the JRE. This is not the case with JDK 1.3 and earlier. To resolve this
-you can copy the following files to the JAVAHOME/lib/ext directory or
-declare an alternative directory as a JMV argument under the
-MERLIN_JVM_OPTS environment variable.
-
- system/xml-apis/jars/xml-apis-2.0.2.jar
- system/xml-apis/jars/xmlParserAPIs-2.0.2.jar
- system/xerces/jars/xerces-2.4.0.jar
-
+
+PROJECT: Merlin 3.2-dev
+====================================================================
+
+DESCRIPTION:
+------------
+
+This directory contains the merlin system installation and related
+resources.
+
+ /merlin
+ /bin
+ /config
+ /system
+ README.TXT
+ LICENSE.TXT
+ INSTALL.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 Windows you can set environment variables by selecting the
+Environment Tab from the System Control Panel.
+
+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
+
+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 users@avalon.apache.org.
+
+Special Note for JRE 1.3 and earlier.
+-------------------------------------
+
+Some applications assume that XML parsing classes are available withing
+the JRE. This is not the case with JDK 1.3 and earlier. To resolve this
+you can copy the following files to the JAVAHOME/lib/ext directory or
+declare an alternative directory as a JVM argument under the
+MERLIN_JVM_OPTS environment variable, i.e. -Djava.ext.dir=someDirectory
+
+ system/xml-apis/jars/xml-apis-2.0.2.jar
+ system/xml-apis/jars/xmlParserAPIs-2.0.2.jar
+ system/xerces/jars/xerces-2.4.0.jar
+
1.27 +4 -0 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- maven.xml 23 Dec 2003 17:12:55 -0000 1.26
+++ maven.xml 23 Dec 2003 21:46:33 -0000 1.27
@@ -148,6 +148,10 @@
</fileset>
</ant:copy>
+ <ant:chmod file="${merlin.build.inst.dir}/bin/merlin" perm="u=rwx,go=rx"/>
+ <ant:chmod file="${merlin.build.inst.dir}/bin/merlinx" perm="u=rwx,go=rx"/>
+ <ant:chmod file="${merlin.build.inst.dir}/bin/internal-cygwin.sh" perm="u=rwx,go=rx"/>
+ <ant:chmod file="${merlin.build.inst.dir}/bin/internal-unix.sh" perm="u=rwx,go=rx"/>
<ant:chmod file="${merlin.build.inst.dir}/bin/merlin.sh" perm="u=rwx,go=rx"/>
<ant:chmod file="${merlin.build.inst.dir}/bin/merlinx.sh" perm="u=rwx,go=rx"/>
<ant:chmod file="${merlin.build.inst.dir}/bin/merlin-server.sh" perm="u=rwx,go=rx"/>
1.2 +8 -4 avalon/merlin/platform/src/bin/README.TXT
Index: README.TXT
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/README.TXT,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.TXT 24 Sep 2003 09:33:23 -0000 1.1
+++ README.TXT 23 Dec 2003 21:46:33 -0000 1.2
@@ -1,11 +1,15 @@
-
+For Windows
+===========
merlin.bat -- classic merlin command line exeuction
merlinx.bat -- launch merlin using the Maven repository for resolvution
of internal Merlin jar files (handly if your developing
with merlin)
-
+For Unix/Linux
+==============
merlin-server.sh -- equivalent to the merlin NT service
-merlin.sh -- same as merlin.bat
-merlinx.sh -- same as merlinx.bat
+merlin -- same as merlin.bat
+merlinx -- same as merlinx.bat
+merlin.sh -- (deprecated, use merlin) same as merlin.bat
+merlinx.sh -- (deprecated, use merlinx) same as merlinx.bat
1.1 avalon/merlin/platform/src/bin/internal-cygwin.sh
Index: internal-cygwin.sh
===================================================================
#! /bin/sh
#
# For Cygwin, ensure paths are in UNIX format before anything is touched
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
MERLIN_HOME=`cygpath --unix "$MERLIN_HOME"`
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
JAVA="$JAVA_HOME/bin/java"
# switch necessary paths to Windows format before running java
JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
MERLIN_HOME=`cygpath --windows "$MERLIN_HOME"`
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
echo "Starting Merlin $MERLIN_VERSION."
echo "===================="
echo " Java Home: $JAVA_HOME"
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 Arguments: $MERLIN_ARGS $@"
echo ""
"$JAVA" $MERLIN_JVM_OPTS "-Djava.security.policy=$MERLIN_HOME/bin/security.policy" "-Djava.ext.dirs=$MERLIN_HOME/ext" -jar "$MERLIN_BOOTSTRAP_JAR" $MERLIN_ARGS "$@"
1.1 avalon/merlin/platform/src/bin/internal-unix.sh
Index: internal-unix.sh
===================================================================
#! /bin/sh
echo "Starting Merlin $MERLIN_VERSION."
echo "===================="
echo " Java Home: $JAVA_HOME"
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 Arguments: $MERLIN_ARGS $@"
echo ""
"$JAVA_HOME/bin/java" $MERLIN_JVM_OPTS "-Djava.security.policy=$MERLIN_HOME/bin/security.policy" "-Djava.ext.dirs=$MERLIN_HOME/ext" -jar "$MERLIN_BOOTSTRAP_JAR" $MERLIN_ARGS "$@"
1.1 avalon/merlin/platform/src/bin/merlin
Index: merlin
===================================================================
#!/bin/sh
#
export MERLIN_VERSION="3.2"
# Checking for JAVA_HOME is required on *nix due
# to some distributions stupidly including kaffe in /usr/bin
if [ "$JAVA_HOME" = "" ] ; then
echo "ERROR: JAVA_HOME not found in your environment."
echo
echo "Please, set the JAVA_HOME variable in your environment to match the"
echo "location of the Java Virtual Machine you want to use."
exit 1
fi
PLATFORM=`uname`
CWD=`pwd`
BIN_DIR=`dirname "$0"`
cd "$BIN_DIR"
ABSOLUTE_PATH=`pwd`
cd "$CWD"
export MERLIN_HOME=`dirname "$ABSOLUTE_PATH"`
export MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-$MERLIN_VERSION.jar
if [ `echo $PLATFORM | grep "CYGWIN"` ] ; then
exec "$MERLIN_HOME/bin/internal-cygwin.sh" "$@"
elif [ `echo $PLATFORM | grep "Linux"` ] ; then
exec "$MERLIN_HOME/bin/internal-unix.sh" "$@"
else
echo "Starting Default Unix script"
exec "$MERLIN_HOME/bin/internal-unix.sh" "$@"
fi
1.1 avalon/merlin/platform/src/bin/merlinx
Index: merlinx
===================================================================
#!/bin/sh
#
#
if [ -z $MERLIN_HOME ] ; then
BIN_DIR=`dirname "$0"`
export MERLIN_HOME=`dirname "$BIN_DIR"`
fi
# Checking for REPOSITORY
if [ "$MAVEN_HOME_LOCAL" = "" ] ; then
REPOSITORY="$HOME/.maven/repository"
else
REPOSITORY="$MAVEN_HOME_LOCAL/repository"
fi
export MERLIN_ARGS="$MERLIN_ARGS -system $REPOSITORY -repository $REPOSITORY"
exec "$MERLIN_HOME/bin/merlin" "$@"
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org