mcconnell 2004/04/18 05:59:48
Modified: merlin/api index.ent
merlin/cli index.ent
merlin external.xml maven.xml
merlin/impl index.ent
merlin/plugin index.ent
merlin/servlet index.ent
merlin/unit index.ent
Added: merlin/cli/src/bin README.TXT internal-cygwin.sh
internal-unix.sh merlin merlin-server.sh merlin.bat
merlin.sh merlinx merlinx.bat merlinx.sh
security.policy
merlin/cli/src/bin/nt InstallService-NT.bat
TANUKISOFTWARE_LICENSE.txt UninstallService-NT.bat
Wrapper.dll Wrapper.exe wrapper.conf wrapper.jar
Removed: merlin/plugin project.xml
merlin/site/src/bin README.TXT internal-cygwin.sh
internal-unix.sh merlin merlin-server.sh merlin.bat
merlin.sh merlinx merlinx.bat merlinx.sh
security.policy
merlin/site/src/bin/nt InstallService-NT.bat
TANUKISOFTWARE_LICENSE.txt UninstallService-NT.bat
Wrapper.dll Wrapper.exe wrapper.conf wrapper.jar
merlin/site/src/config debug.xml kernel.xml
Log:
Move cli related scripts from the platform subdirectory to the cli directory, update
a few ent descriptors, add activation to the list of external packages toi include in
merlin/system.
Revision Changes Path
1.6 +7 -5 avalon/merlin/api/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/api/index.ent,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- index.ent 9 Apr 2004 06:52:01 -0000 1.5
+++ index.ent 18 Apr 2004 12:59:46 -0000 1.6
@@ -1,5 +1,7 @@
-<!ENTITY % merlin-entities SYSTEM "file:../../../versioning/avalon-merlin.ent">
%merlin-entities;
-<!ENTITY % framework-entities SYSTEM
"file:../../../versioning/avalon-framework.ent"> %framework-entities;
-<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
-<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent">
%util-entities;
-<!ENTITY % repo-entities SYSTEM "file:../../../versioning/avalon-repository.ent">
%repo-entities;
+<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent">
%util-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../../versioning/avalon-merlin.ent">
%merlin-entities;
+<!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent">
%framework-entities;
+<!ENTITY % meta-entities SYSTEM "file:../../versioning/avalon-meta.ent">
%meta-entities;
+<!ENTITY % repo-entities SYSTEM "file:../../versioning/avalon-repository.ent">
%repo-entities;
+<!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent">
%logging-entities;
+<!ENTITY % logkit-entities SYSTEM "file:../../versioning/avalon-logkit.ent">
%logkit-entities;
1.5 +7 -5 avalon/merlin/cli/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/cli/index.ent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.ent 9 Apr 2004 06:52:01 -0000 1.4
+++ index.ent 18 Apr 2004 12:59:46 -0000 1.5
@@ -1,5 +1,7 @@
-<!ENTITY % merlin-entities SYSTEM "file:../../../versioning/avalon-merlin.ent">
%merlin-entities;
-<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent">
%util-entities;
-<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
-<!ENTITY % repo-entities SYSTEM "file:../../../versioning/avalon-repository.ent">
%repo-entities;
-<!ENTITY % repo-entities SYSTEM "file:../../../versioning/avalon-repository.ent">
%repo-entities;
+<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent">
%util-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../../versioning/avalon-merlin.ent">
%merlin-entities;
+<!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent">
%framework-entities;
+<!ENTITY % meta-entities SYSTEM "file:../../versioning/avalon-meta.ent">
%meta-entities;
+<!ENTITY % repo-entities SYSTEM "file:../../versioning/avalon-repository.ent">
%repo-entities;
+<!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent">
%logging-entities;
+<!ENTITY % logkit-entities SYSTEM "file:../../versioning/avalon-logkit.ent">
%logkit-entities;
1.12 +13 -0 avalon/merlin/external.xml
Index: external.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/external.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- external.xml 9 Apr 2004 12:19:30 -0000 1.11
+++ external.xml 18 Apr 2004 12:59:46 -0000 1.12
@@ -54,6 +54,19 @@
<artifactId>&avalon-logkit-id;</artifactId>
<version>&avalon-logkit-version;</version>
</dependency>
+
+ <dependency>
+ <groupId>&avalon-activation-id;</groupId>
+ <artifactId>&avalon-activation-api-id;</artifactId>
+ <version>&avalon-activation-api-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>&avalon-activation-id;</groupId>
+ <artifactId>&avalon-activation-impl-id;</artifactId>
+ <version>&avalon-activation-impl-version;</version>
+ </dependency>
+
+
</dependencies>
</project>
1.71 +15 -148 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- maven.xml 18 Apr 2004 02:16:26 -0000 1.70
+++ maven.xml 18 Apr 2004 12:59:46 -0000 1.71
@@ -85,7 +85,6 @@
<goal name="avalon:dist">
<attainGoal name="avalon:install"/>
<attainGoal name="avalon:site"/>
- <!-- <attainGoal name="avalon:tutorials"/> -->
<attainGoal name="avalon:package"/>
</goal>
@@ -107,27 +106,26 @@
-->
<goal name="avalon:build" description="Build Merlin."
-
prereqs="avalon:build-main,avalon:build-kernel,avalon:build-plugin,avalon:build-externals"/>
+ prereqs="avalon:build-main,avalon:build-kernel,avalon:build-externals"/>
<goal name="avalon:build-main" description="Build Merlin.">
+
<maven:reactor basedir="${basedir}"
-
includes="extension/**/project.xml,composition/**/project.xml,activation/**/project.xml,kernel/api/project.xml,kernel/impl/project.xml"
+ includes="api/project.xml,impl/project.xml"
banner="Installing:"
goals="jar:install"
ignoreFailures="false"
postProcessing="true" />
+
<j:forEach var="child" items="${reactorProjects}">
- <j:set var="dir"
- value="${maven.build.dir}/merlin/system"/>
+ <j:set var="dir" value="${maven.build.dir}/merlin/system"/>
<j:set var="path"
value="${dir}/${child.groupId}/jars/${child.artifactId}-${child.currentVersion}.jar"/>
<ant:copy todir="${dir}/${child.groupId}/jars"
preserveLastModified="true">
<ant:fileset dir="${child.file.parentFile}/target">
- <ant:include
- name="${child.artifactId}-${child.currentVersion}.jar"/>
- <ant:include
- name="${child.artifactId}-${child.currentVersion}.jar.meta"/>
+ <ant:include name="${child.artifactId}-${child.currentVersion}.jar"/>
+ <ant:include name="${child.artifactId}-${child.currentVersion}.jar.meta"/>
</ant:fileset>
</ant:copy>
<checksum file="${path}" fileext=".md5" />
@@ -153,7 +151,7 @@
<goal name="avalon:build-kernel">
<maven:reactor basedir="${basedir}"
- includes="kernel/unit/project.xml,kernel/cli/project.xml"
+ includes="unit/project.xml,cli/project.xml"
goals="jar:install"
banner="Installing:"
ignoreFailures="false"
@@ -194,50 +192,6 @@
</j:forEach>
</goal>
- <goal name="avalon:build-plugin">
- <maven:reactor basedir="${basedir}"
- includes="kernel/plugin/project.xml"
- goals="plugin:install"
- banner="Installing:"
- ignoreFailures="false"
- postProcessing="true" />
- <j:forEach var="child" items="${reactorProjects}">
- <j:set var="dir"
- value="${maven.build.dir}/merlin/system"/>
- <j:set var="path"
-
value="${dir}/${child.groupId}/jars/${child.artifactId}-${child.currentVersion}.jar"/>
- <ant:copy todir="${dir}/${child.groupId}/jars"
- preserveLastModified="true">
- <ant:fileset dir="${child.file.parentFile}/target">
- <ant:include
- name="${child.artifactId}-${child.currentVersion}.jar"/>
- <ant:include
- name="${child.artifactId}-${child.currentVersion}.jar.meta"/>
- </ant:fileset>
- </ant:copy>
- <checksum file="${path}" fileext=".md5" />
- <j:if test="${maven_gpg_exe != null}">
- <ant:exec executable="${maven_gpg_exe}">
- <ant:arg value="-a"/>
- <ant:arg value="--yes"/>
- <ant:arg value="-b"/>
- <ant:arg value="${path}"/>
- </ant:exec>
- </j:if>
- <ant:copy todir="${maven.build.dir}/merlin/plugins/"
- preserveLastModified="true">
- <ant:fileset dir="${child.file.parentFile}/target">
- <ant:include
- name="${child.artifactId}-${child.currentVersion}.jar"/>
- </ant:fileset>
- </ant:copy>
- </j:forEach>
- <ant:copy file="${maven.plugin.dir}/${meta.plugin.jar}"
- toDir="${maven.build.dir}/merlin/plugins"/>
- <ant:copy file="${maven.plugin.dir}/${avalon.plugin.jar}"
- toDir="${maven.build.dir}/merlin/plugins"/>
- </goal>
-
<goal name="avalon:build-externals" description="Build Externals.">
<maven:reactor basedir="${basedir}"
includes="external.xml"
@@ -283,13 +237,7 @@
</filterset>
</ant:copy>
<ant:copy toDir="${merlin.build.inst.dir}">
- <fileset dir="${basedir}/platform/src">
- <include name="bin/**/*"/>
- <exclude name="bin/**/*.jar"/>
- <exclude name="bin/**/*.exe"/>
- <exclude name="bin/**/*.dll"/>
- </fileset>
- <fileset dir="${basedir}/kernel/cli/src">
+ <fileset dir="${basedir}/cli/src">
<include name="bin/**/*"/>
<exclude name="bin/**/*.jar"/>
<exclude name="bin/**/*.exe"/>
@@ -306,10 +254,12 @@
</filterset>
</ant:copy>
<ant:copy toDir="${merlin.build.inst.dir}">
- <fileset dir="${basedir}/platform/src">
+ <fileset dir="${basedir}/cli/src">
<include name="bin/**/*.jar"/>
<include name="bin/**/*.exe"/>
<include name="bin/**/*.dll"/>
+ </fileset>
+ <fileset dir="${basedir}/cli/src">
<include name="config/**/*"/>
</fileset>
<fileset dir="${basedir}">
@@ -421,37 +371,6 @@
</ant:exec>
</j:if>
- <!--
- <ant:echo>Building tutorial kit: ${tutorial.name}</ant:echo>
- <ant:zip zipfile="${maven.build.dir}/${tutorial.name}.zip">
- <zipfileset dir="${basedir}/target/tutorials" prefix="tutorial"/>
- </ant:zip>
- <checksum file="${maven.build.dir}/${tutorial.name}.zip" fileext=".md5" />
- <j:if test="${maven_gpg_exe != null}">
- <ant:exec executable="${maven_gpg_exe}">
- <ant:arg value="-a"/>
- <ant:arg value="-b"/>
- <ant:arg value="${maven.build.dir}/${tutorial.name}.zip"/>
- </ant:exec>
- </j:if>
-
- <ant:tar longfile="gnu" tarfile="${maven.build.dir}/${tutorial.name}.tar">
- <tarfileset dir="${basedir}/target/tutorials" prefix="tutorial"/>
- </ant:tar>
- <ant:gzip
- zipfile="${maven.build.dir}/${tutorial.name}.tar.gz"
- src="${maven.build.dir}/${tutorial.name}.tar"/>
- <ant:delete file="${maven.build.dir}/${tutorial.name}.tar"/>
- <checksum file="${maven.build.dir}/${tutorial.name}.tar.gz" fileext=".md5" />
- <j:if test="${maven_gpg_exe != null}">
- <ant:exec executable="${maven_gpg_exe}">
- <ant:arg value="-a"/>
- <ant:arg value="-b"/>
- <ant:arg value="${maven.build.dir}/${tutorial.name}.tar.gz"/>
- </ant:exec>
- </j:if>
- -->
-
</goal>
<!--
@@ -467,7 +386,7 @@
<goal name="xavalon:css-copy">
<ant:mkdir dir="${merlin.build.inst.dir}/docs/style"/>
<ant:copy toDir="${merlin.build.inst.dir}/docs/style">
- <fileset dir="${basedir}/platform/etc">
+ <fileset dir="${basedir}/site/etc">
<include name="maven.css"/>
<include name="tigris.css"/>
</fileset>
@@ -483,8 +402,8 @@
<goal name="xjavadoc">
<maven:reactor basedir="${basedir}"
-
includes="activation/**/project.xml,composition/**/project.xml,kernel/**/project.xml"
- excludes="**/target/**,**/test/project.xml"
+ includes="**/project.xml"
+ excludes="**/target/**,**/test/project.xml,project.xml"
banner="Site Prep:"
ignoreFailures="false"
postProcessing="true" />
@@ -531,7 +450,6 @@
<link href="${avalon.util.link}" />
<link href="${avalon.logkit.link}" />
<link href="${avalon.logging.link}" />
- <!--<link href="${avalon.lifecycle.link}" />-->
<link href="${excalibur.configuration.link}" />
<util:tokenize
@@ -555,56 +473,6 @@
<!--
==============================================================================
- veriify the the tutorials are buildable and generate a clean build defintion
- (note: the xgen target is defined in the platform/tutorials/maven.xml file)
- ==============================================================================
- -->
- <!--
- <goal name="avalon:tutorials" prereqs="avalon:validate">
- <ant:copy todir="${basedir}/target/tutorials">
- <fileset dir="${basedir}/platform/tutorials">
- <include name="**/README.TXT"/>
- <include name="master.xml"/>
- <include name="**/maven.xml"/>
- <exclude name="maven.xml"/>
- </fileset>
- </ant:copy>
- <ant:copy toFile="${basedir}/target/tutorials/maven.xml"
- file="${basedir}/platform/tutorials/maven-template.xml"/>
- </goal>
- -->
-
- <goal name="avalon:validate"
- description="Generate a clean tutorial package." >
- <maven:reactor
- basedir="${basedir}"
- includes="platform/tutorials/**/project.xml"
- excludes="**/target/**,**/mixed/**,**/jmx/**,**/security/**"
- goals="xgen"
- banner="Generation:"
- ignoreFailures="false"
- postProcessing="true" />
-
- <!--
- copy the generated target/package directory to the
- local target/tutorials directory
- -->
-
- <j:set var="tutorialsDir" value="${basedir}/platform/tutorials"/>
- <j:set var="tutorialsLen" value="${tutorialsDir.length()}"/>
- <j:forEach var="child" items="${reactorProjects}">
- <j:set var="pkgPath" value="${child.file.parentFile.path}"/>
- <j:set var="pkgLen" value="${pkgPath.length()}"/>
- <j:set var="packageName" value="${pkgPath.substring( tutorialsLen )}"/>
- <ant:copy toDir="${basedir}/target/tutorials${packageName}">
- <fileset dir="${child.file.parentFile}/target/package"/>
- </ant:copy>
- </j:forEach>
-
- </goal>
-
- <!--
- ==============================================================================
update the runtime installation
==============================================================================
-->
@@ -621,7 +489,6 @@
-->
<goal name="avalon:replicate">
-<echo>1</echo>
<mkdir dir="${merlin.home}"/>
<copy toDir="${merlin.home}">
<fileset dir="${merlin.build.inst.dir}"/>
1.6 +7 -6 avalon/merlin/impl/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/impl/index.ent,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- index.ent 9 Apr 2004 12:11:49 -0000 1.5
+++ index.ent 18 Apr 2004 12:59:47 -0000 1.6
@@ -1,6 +1,7 @@
-<!ENTITY % merlin-entities SYSTEM "file:../../../versioning/avalon-merlin.ent">
%merlin-entities;
-<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent">
%util-entities;
-<!ENTITY % framework-entities SYSTEM
"file:../../../versioning/avalon-framework.ent"> %framework-entities;
-<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
-<!ENTITY % logging-entities SYSTEM "file:../../../versioning/avalon-logging.ent">
%logging-entities;
-<!ENTITY % repo-entities SYSTEM "file:../../../versioning/avalon-repository.ent">
%repo-entities;
+<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent">
%util-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../../versioning/avalon-merlin.ent">
%merlin-entities;
+<!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent">
%framework-entities;
+<!ENTITY % meta-entities SYSTEM "file:../../versioning/avalon-meta.ent">
%meta-entities;
+<!ENTITY % repo-entities SYSTEM "file:../../versioning/avalon-repository.ent">
%repo-entities;
+<!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent">
%logging-entities;
+<!ENTITY % logkit-entities SYSTEM "file:../../versioning/avalon-logkit.ent">
%logkit-entities;
1.6 +7 -5 avalon/merlin/plugin/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/plugin/index.ent,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- index.ent 12 Apr 2004 16:01:57 -0000 1.5
+++ index.ent 18 Apr 2004 12:59:47 -0000 1.6
@@ -1,5 +1,7 @@
-<!ENTITY % merlin-entities SYSTEM "file:../../../versioning/avalon-merlin.ent">
%merlin-entities;
-<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
-<!ENTITY % repo-entities SYSTEM "file:../../../versioning/avalon-repository.ent">
%repo-entities;
-<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent">
%util-entities;
-<!ENTITY % logging-entities SYSTEM "file:../../../versioning/avalon-logging.ent">
%logging-entities;
+<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent">
%util-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../../versioning/avalon-merlin.ent">
%merlin-entities;
+<!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent">
%framework-entities;
+<!ENTITY % meta-entities SYSTEM "file:../../versioning/avalon-meta.ent">
%meta-entities;
+<!ENTITY % repo-entities SYSTEM "file:../../versioning/avalon-repository.ent">
%repo-entities;
+<!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent">
%logging-entities;
+<!ENTITY % logkit-entities SYSTEM "file:../../versioning/avalon-logkit.ent">
%logkit-entities;
1.5 +7 -4 avalon/merlin/servlet/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/servlet/index.ent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.ent 9 Apr 2004 06:52:02 -0000 1.4
+++ index.ent 18 Apr 2004 12:59:47 -0000 1.5
@@ -1,4 +1,7 @@
-<!ENTITY % merlin-entities SYSTEM "file:../../../versioning/avalon-merlin.ent">
%merlin-entities;
-<!ENTITY % framework-entities SYSTEM
"file:../../../versioning/avalon-framework.ent"> %framework-entities;
-<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
-<!ENTITY % repo-entities SYSTEM "file:../../../versioning/avalon-repository.ent">
%repo-entities;
+<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent">
%util-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../../versioning/avalon-merlin.ent">
%merlin-entities;
+<!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent">
%framework-entities;
+<!ENTITY % meta-entities SYSTEM "file:../../versioning/avalon-meta.ent">
%meta-entities;
+<!ENTITY % repo-entities SYSTEM "file:../../versioning/avalon-repository.ent">
%repo-entities;
+<!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent">
%logging-entities;
+<!ENTITY % logkit-entities SYSTEM "file:../../versioning/avalon-logkit.ent">
%logkit-entities;
1.4 +7 -2 avalon/merlin/unit/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/unit/index.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.ent 9 Apr 2004 06:52:02 -0000 1.3
+++ index.ent 18 Apr 2004 12:59:47 -0000 1.4
@@ -1,2 +1,7 @@
-<!ENTITY % merlin-entities SYSTEM "file:../../../versioning/avalon-merlin.ent">
%merlin-entities;
-<!ENTITY % repo-entities SYSTEM "file:../../../versioning/avalon-repository.ent">
%repo-entities;
+<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent">
%util-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../../versioning/avalon-merlin.ent">
%merlin-entities;
+<!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent">
%framework-entities;
+<!ENTITY % meta-entities SYSTEM "file:../../versioning/avalon-meta.ent">
%meta-entities;
+<!ENTITY % repo-entities SYSTEM "file:../../versioning/avalon-repository.ent">
%repo-entities;
+<!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent">
%logging-entities;
+<!ENTITY % logkit-entities SYSTEM "file:../../versioning/avalon-logkit.ent">
%logkit-entities;
1.1 avalon/merlin/cli/src/bin/README.TXT
Index: README.TXT
===================================================================
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 -- 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/cli/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"`
MERLIN_BOOTSTRAP_JAR=`cygpath --windows "$MERLIN_BOOTSTRAP_JAR"`
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
echo "Starting Merlin $MERLIN_VERSION."
echo "===================="
echo " Platform: $PLATFORM"
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 ""
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
echo $ARGS | xargs "$JAVA"
1.1 avalon/merlin/cli/src/bin/internal-unix.sh
Index: internal-unix.sh
===================================================================
#! /bin/sh
#
echo "Starting Merlin $MERLIN_VERSION."
echo "===================="
echo " Platform: $PLATFORM"
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="$JAVA_HOME/bin/java"
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
echo $ARGS | xargs "$JAVA"
1.1 avalon/merlin/cli/src/bin/merlin
Index: merlin
===================================================================
#!/bin/sh
#
export MERLIN_VERSION="@MERLIN_CLI_VERSION@"
# 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
export PLATFORM=`uname`
#
# Compute the MERLIN_HOME if not already set.
#
if [ -z "$MERLIN_HOME" ] ; then
CWD=`pwd`
BIN_DIR=`dirname "$0"`
cd "$BIN_DIR"
ABSOLUTE_PATH=`pwd`
cd "$CWD"
export MERLIN_HOME="`dirname "$ABSOLUTE_PATH"`"
fi
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/cli/src/bin/merlin-server.sh
Index: merlin-server.sh
===================================================================
#! /bin/sh
#
# -----------------------------------------------------------------------------
# Merlin start script. Based on the Avalon-Phoenix start script.
#
# Author: Alexis Agahi <[EMAIL PROTECTED]>
# Peter Donald <peter at apache.org>
# Leo Simons <leosimons at apache.org>
#
# Environment Variable Prequisites
#
# MERLIN_OPTS (Optional) Java runtime options used when the command is
# executed.
#
# JAVA_HOME Must point at your Java Development Kit installation.
#
# MERLIN_JVM_OPTS (Optional) Java runtime options used when the command is
# executed.
#
# -----------------------------------------------------------------------------
usage()
{
echo "Usage: $0 {start|stop|run|restart|check}"
exit 1
}
[ $# -gt 0 ] || usage
##################################################
# Get the action & configs
##################################################
ACTION=$1
shift
ARGS="$@"
# OS specific support. $var _must_ be set to either true or false.
cygwin=false
case "`uname`" in
CYGWIN*) cygwin=true;;
esac
# resolve links - $0 may be a softlink
THIS_PROG="$0"
while [ -h "$THIS_PROG" ]; do
ls=`ls -ld "$THIS_PROG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '.*/.*' > /dev/null; then
THIS_PROG="$link"
else
THIS_PROG=`dirname "$THIS_PROG"`/"$link"
fi
done
# Get standard environment variables
PRGDIR=`dirname "$THIS_PROG"`
MERLIN_HOME=`cd "$PRGDIR/.." ; pwd`
unset THIS_PROG
# For Cygwin this script does not make too much sense, since there is
# no native JVM available.
if $cygwin; then
echo "This script is used to install Merlin as \*nix service."
echo "Please use $PRGDIR/nt/InstallService-NT.bat to do so for Windows."
exit 1
fi
if [ -r "$MERLIN_HOME"/bin/setenv.sh ]; then
. "$MERLIN_HOME"/bin/setenv.sh
fi
if [ -z "$MERLIN_TMPDIR" ] ; then
MERLIN_TMPDIR=$MERLIN_HOME/tmp
fi
if [ ! -d "$MERLIN_TMPDIR" ] ; then
mkdir "$MERLIN_TMPDIR"
fi
# 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
# ----- Execute The Requested Command -----------------------------------------
# Uncomment to get enable remote debugging
# DEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y"
#
# Command to overide JVM ext dir
#
# This is needed as some JVM vendors do foolish things
# like placing jaxp/jaas/xml-parser jars in ext dir
# thus breaking Merlin
#
JVM_EXT_DIRS="$MERLIN_HOME/ext"
JVM_OPTS="-Djava.security.policy=$MERLIN_HOME/bin/security.policy "
MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/@MERLIN_CLI_JAR@
# Get the run cmd
RUN_CMD="$JAVA_HOME/bin/java $JVM_OPTS $DEBUG $MERLIN_JVM_OPTS -jar
$MERLIN_BOOTSTRAP_JAR $ARGS"
echo "Using MERLIN_HOME: $MERLIN_HOME"
echo "Using JAVA_HOME: $JAVA_HOME"
echo "Using RUN_CMD: $RUN_CMD"
#####################################################
# Find a PID for the pid file
#####################################################
if [ -z "$MERLIN_PID" ]
then
MERLIN_PID="$MERLIN_TMPDIR/merlin.pid"
fi
#####################################################
# Find a location for the merlin console
#####################################################
MERLIN_CONSOLE="$MERLIN_TMPDIR/merlin.console"
if [ -z "$MERLIN_CONSOLE" ]
then
if [ -w /dev/console ]
then
MERLIN_CONSOLE=/dev/console
else
MERLIN_CONSOLE=/dev/tty
fi
fi
#####################################################
# Action!
#####################################################
case "$ACTION" in
start)
echo "Starting Merlin: "
if [ -f $MERLIN_PID ]
then
if ps -p `cat $MERLIN_PID` >/dev/null 2>/dev/null
then
echo "Already Running!!"
exit 1
fi
fi
echo "STARTED Merlin `date`" >> $MERLIN_CONSOLE
nohup sh -c "exec $RUN_CMD >>$MERLIN_CONSOLE 2>&1" >/dev/null &
echo $! > $MERLIN_PID
echo "Merlin running pid="`cat $MERLIN_PID`
;;
stop)
PID=`cat $MERLIN_PID 2>/dev/null`
echo "Shutting down Merlin: $PID"
kill $PID 2>/dev/null
sleep 2
kill -9 $PID 2>/dev/null
rm -f $MERLIN_PID
echo "STOPPED `date`" >>$MERLIN_CONSOLE
;;
restart)
$0 stop $ARGS
sleep 5
$0 start $ARGS
;;
supervise)
#
# Under control of daemontools supervise monitor which
# handles restarts and shutdowns via the svc program.
#
echo "This command is not implemented yet."
;;
run|demo)
echo "Running Merlin: "
echo " "
if [ -f $MERLIN_PID ]
then
echo "Already Running!!"
exit 1
fi
exec $RUN_CMD
;;
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
if [ -f $MERLIN_PID ]
then
echo "Merlin running pid="`cat $MERLIN_PID`
exit 0
fi
exit 1
;;
*)
usage
;;
esac
exit 0
1.1 avalon/merlin/cli/src/bin/merlin.bat
Index: merlin.bat
===================================================================
@echo off
rem set JAVA CMD
if not "%JAVA_HOME%" == "" goto USE_JAVA_HOME
set JAVA=java
goto SET_MERLIN
:USE_JAVA_HOME
set JAVA=%JAVA_HOME%\bin\java
:SET_MERLIN
if "%MERLIN_HOME%" == "" set MERLIN_HOME=%USERPROFILE%\.merlin
set MERLIN_CMD_LINE_ARGS=%*
set [EMAIL PROTECTED]@
set MERLIN_SECURITY_POLICY=-Djava.security.policy=%MERLIN_HOME%\bin\security.policy
:RUN_MERLIN
%JAVA% %MERLIN_SECURITY_POLICY% %MERLIN_JVM_OPTS% -jar %MERLIN_BOOTSTRAP_JAR%
%MERLIN_CMD_LINE_ARGS%
goto EndOfScript
:EndOfScript
1.1 avalon/merlin/cli/src/bin/merlin.sh
Index: merlin.sh
===================================================================
#! /bin/sh
#
# OS specific support. $var _must_ be set to either true or false.
cygwin=false
case "`uname`" in
CYGWIN*) cygwin=true;;
esac
# 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
# Checking for JAVA_HOME is required on *nix due
# to some distributions stupidly including kaffe in /usr/bin
if [ "$MERLIN_HOME" = "" ] ; then
echo "ERROR: MERLIN_HOME not found in your environment."
echo
echo "Please, set the MERLIN_HOME variable in your environment to match the"
echo "location of Merlin distribution."
exit 1
fi
# For Cygwin, ensure paths are in UNIX format before anything is touched
if $cygwin; then
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
MERLIN_HOME=`cygpath --unix "$MERLIN_HOME"`
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
fi
JAVA=$JAVA_HOME/bin/java
# switch necessary paths to Windows format before running java
if $cygwin; then
JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
MERLIN_HOME=`cygpath --windows "$MERLIN_HOME"`
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/@MERLIN_CLI_JAR@
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 ""
"$JAVA" $MERLIN_JVM_OPTS "-Djava.security.policy=$MERLIN_HOME/bin/security.policy"
-jar "$MERLIN_BOOTSTRAP_JAR" "$@"
1.1 avalon/merlin/cli/src/bin/merlinx
Index: merlinx
===================================================================
#!/bin/sh
#
# This extended Merlin command-line launch script is intended to be
# used during development, when Maven repository are used exclusively.
#
# For other deployments, please use "merlin" and specify the system
# and repository locations with the -system and -repository switch
# respectively.
#
#
# Compute the MERLIN_HOME if not already set.
#
if [ -z "$MERLIN_HOME" ] ; then
CWD=`pwd`
BIN_DIR=`dirname "$0"`
cd "$BIN_DIR"
ABSOLUTE_PATH=`pwd`
cd "$CWD"
export MERLIN_HOME="`dirname "$ABSOLUTE_PATH"`"
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\""
"$MERLIN_HOME/bin/merlin" "$@"
1.1 avalon/merlin/cli/src/bin/merlinx.bat
Index: merlinx.bat
===================================================================
@echo off
rem set JAVA CMD
if not "%JAVA_HOME%" == "" goto USE_JAVA_HOME
set JAVA=java
goto SET_MERLIN
:USE_JAVA_HOME
set JAVA=%JAVA_HOME%\bin\java
:SET_MERLIN
if "%MERLIN_HOME%" == "" set MERLIN_HOME=%USERPROFILE%\.merlin
set WORKING_REPOSITORY="%USERPROFILE%\.maven\repository"
if "%MAVEN_HOME_LOCAL%" == "" goto DoneMerlinSystem
set WORKING_REPOSITORY="%MAVEN_HOME_LOCAL%\repository"
:DoneMerlinSystem
set MERLIN_CMD_LINE_ARGS=%*
set [EMAIL PROTECTED]@
set MERLIN_SECURITY_POLICY=-Djava.security.policy=%MERLIN_HOME%\bin\security.policy
:RUN_MERLIN
%JAVA% %MERLIN_SECURITY_POLICY% %MERLIN_JVM_OPTS% -jar %MERLIN_BOOTSTRAP_JAR%
-system %WORKING_REPOSITORY% -repository %WORKING_REPOSITORY% %MERLIN_CMD_LINE_ARGS%
goto :EndOfScript
:EndOfScript
1.1 avalon/merlin/cli/src/bin/merlinx.sh
Index: merlinx.sh
===================================================================
#! /bin/sh
#
# OS specific support. $var _must_ be set to either true or false.
cygwin=false
case "`uname`" in
CYGWIN*) cygwin=true;;
esac
# 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
# Checking for JAVA_HOME is required on *nix due
# to some distributions stupidly including kaffe in /usr/bin
if [ "$MERLIN_HOME" = "" ] ; then
echo "ERROR: MERLIN_HOME not found in your environment."
echo
echo "Please, set the MERLIN_HOME variable in your environment to match the"
echo "location of Merlin distribution."
exit 1
fi
# For Cygwin, ensure paths are in UNIX format before anything is touched
if $cygwin; then
# HOME is always in Unix format
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
MERLIN_HOME=`cygpath --unix "$MERLIN_HOME"`
[ -n "$MERLIN_HOME_LOCAL" ] && MERLIN_HOME_LOCAL=`cygpath --unix
"$MERLIN_HOME_LOCAL"`
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
fi
# Checking for REPOSITORY
if [ "$MAVEN_HOME_LOCAL" = "" ]
then
REPOSITORY="$HOME/.maven/repository"
else
REPOSITORY="$MAVEN_HOME_LOCAL/repository"
fi
JAVA=$JAVA_HOME/bin/java
# switch necessary paths to Windows format before running java
if $cygwin; then
JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
MERLIN_HOME=`cygpath --windows "$MERLIN_HOME"`
REPOSITORY=`cygpath --windows "$REPOSITORY"`
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/@MERLIN_CLI_JAR@
echo "Starting Merlin."
echo "================"
echo " Security policy: $MERLIN_HOME/bin/security.policy"
echo " Bootstrap JAR: $MERLIN_BOOTSTRAP_JAR"
echo " System: $REPOSITORY"
echo " Repository: $REPOSITORY"
echo ""
"$JAVA" $MERLIN_JVM_OPTS "-Djava.security.policy=$MERLIN_HOME/bin/security.policy"
-jar "$MERLIN_BOOTSTRAP_JAR" -system "$REPOSITORY" -repository "$REPOSITORY" "$@"
1.1 avalon/merlin/cli/src/bin/security.policy
Index: security.policy
===================================================================
grant {
permission java.security.AllPermission;
};
1.1 avalon/merlin/cli/src/bin/nt/InstallService-NT.bat
Index: InstallService-NT.bat
===================================================================
@echo off
rem
rem Find the application home.
rem
if "%OS%"=="Windows_NT" goto nt
echo This is not NT, so please edit this script and set _APP_HOME manually
set _APP_HOME=..\..
goto conf
:nt
rem %~dp0 is name of current script under NT
set _APP_HOME=%~dp0
rem : operator works similar to make : operator
set _APP_HOME=%_APP_HOME:\bin\nt\=%
rem
rem Find the wrapper.conf
rem
:conf
set _WRAPPER_CONF="%~f1"
if not %_WRAPPER_CONF%=="" goto startup
set _WRAPPER_CONF="%_APP_HOME%\bin\nt\wrapper.conf"
rem
rem Run the application.
rem At runtime, the current directory will be that of Wrapper.exe
rem
:startup
"%_APP_HOME%\bin\nt\Wrapper.exe" -i %_WRAPPER_CONF%
if not errorlevel 1 goto end
pause
:end
set _APP_HOME=
set _WRAPPER_CONF=
1.1 avalon/merlin/cli/src/bin/nt/TANUKISOFTWARE_LICENSE.txt
Index: TANUKISOFTWARE_LICENSE.txt
===================================================================
Copyright (c) 1999, 2004 Tanuki Software
Permission is hereby granted, free of charge, to any person
obtaining a copy of the Java Service Wrapper and associated
documentation files (the "Software"), to deal in the Software
without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sub-license,
and/or sell copies of the Software, and to permit persons to
whom the Software is furnished to do so, subject to the
following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
Portions of the Software have been derived from source code
developed by Silver Egg Technology under the following license:
Copyright (c) 2001 Silver Egg Technology
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sub-license, and/or
sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
1.1 avalon/merlin/cli/src/bin/nt/UninstallService-NT.bat
Index: UninstallService-NT.bat
===================================================================
@echo off
rem
rem Find the application home.
rem
if "%OS%"=="Windows_NT" goto nt
echo This is not NT, so please edit this script and set _APP_HOME manually
set _APP_HOME=..\..
goto conf
:nt
rem %~dp0 is name of current script under NT
set _APP_HOME=%~dp0
rem : operator works similar to make : operator
set _APP_HOME=%_APP_HOME:\bin\nt\=%
rem
rem Find the wrapper.conf
rem
:conf
set _WRAPPER_CONF="%~f1"
if not %_WRAPPER_CONF%=="" goto startup
set _WRAPPER_CONF="%_APP_HOME%\bin\nt\wrapper.conf"
rem
rem Run the application.
rem At runtime, the current directory will be that of Wrapper.exe
rem
:startup
"%_APP_HOME%\bin\nt\Wrapper.exe" -r %_WRAPPER_CONF%
if not errorlevel 1 goto end
pause
:end
set _APP_HOME=
set _WRAPPER_CONF=
1.1 avalon/merlin/cli/src/bin/nt/Wrapper.dll
<<Binary file>>
1.1 avalon/merlin/cli/src/bin/nt/Wrapper.exe
<<Binary file>>
1.1 avalon/merlin/cli/src/bin/nt/wrapper.conf
Index: wrapper.conf
===================================================================
#********************************************************************
# Wrapper parameters
#********************************************************************
# Java Application
wrapper.java.command=java
# Java Main class
wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
# 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_CLI_JAR@
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=.
# Java Additional Parameters
wrapper.java.additional.1=-Djava.security.policy=../security.policy
# Initial Java Heap Size (in MB)
wrapper.java.initmemory=3
# Maximum Java Heap Size (in MB)
wrapper.java.maxmemory=64
#
# The following environment variables should be declared before
# using the service:
#
# MERLIN_DAEMON -- the home directory
#
# Application parameters. Add parameters as needed starting from 1
wrapper.app.parameter.1=org.apache.avalon.merlin.cli.Main
wrapper.app.parameter.2=-home
wrapper.app.parameter.3=%MERLIN_DAEMON%
# Port which the native wrapper code will attempt to connect to
wrapper.port=1777
#********************************************************************
# Wrapper Logging parameters
#********************************************************************
# Format of output for the console. (See docs for formats)
wrapper.console.format=PM
# Log Level for console output. (See docs for log levels)
wrapper.console.loglevel=INFO
# Log file to use for wrapper output logging.
wrapper.logfile=./logs/nt.log
# Format of output for the log file. (See docs for formats)
wrapper.logfile.format=LPTM
# Log Level for log file output. (See docs for log levels)
wrapper.logfile.loglevel=INFO
# Maximum size that the log file will be allowed to grow to before
# the log is rolled. Size is specified in bytes. The default value
# of 0, disables log rolling. May abbreviate with the 'k' (kb) or
# 'm' (mb) suffix. For example: 10m = 10 megabytes.
wrapper.logfile.maxsize=2m
# Maximum number of rolled log files which will be allowed before old
# files are deleted. The default value of 0 implies no limit.
wrapper.logfile.maxfiles=10
# Log Level for sys/event log output. (See docs for log levels)
wrapper.syslog.loglevel=NONE
#********************************************************************
# Wrapper NT Service parameters
#********************************************************************
# WARNING - Do not modify any of these parameters when an application
# using this configuration file has been installed as a service.
# Please uninstall the service before modifying this section. The
# service can then be reinstalled.
# Name of the service
wrapper.ntservice.name=merlin
# Display name of the service
wrapper.ntservice.displayname=Merlin SMP
# Description of the service
wrapper.ntservice.description=Avalon Merlin Service Management Platform.
# Service dependencies. Add dependencies as needed starting from 1
wrapper.ntservice.dependency.1=
# Mode in which the service is installed. AUTO_START or DEMAND_START
wrapper.ntservice.starttype=AUTO_START
# Priority at which the service is run. NORMAL, LOW, HIGH, or
# REALTIME
wrapper.ntservice.process_priority=NORMAL
# Allow the service to interact with the desktop.
wrapper.ntservice.interactive=false
1.1 avalon/merlin/cli/src/bin/nt/wrapper.jar
<<Binary file>>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
