patrickl 2002/07/29 11:47:26
Modified: catalina build.xml
Added: catalina/src/bin catalina.properties launcher.properties
launcher.xml
Log:
Integrate Launcher from jakarta-commons-sandbox/daemon into the build. Also, made
jakarta-commons-sandbox/daemon a required component since the scripts will be
dependpent on the Launcher in the very near future.
Revision Changes Path
1.5 +17 -24 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 29 Jul 2002 15:54:38 -0000 1.4
+++ build.xml 29 Jul 2002 18:47:26 -0000 1.5
@@ -52,9 +52,9 @@
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-daemon.jar}"/>
- <pathelement location="${commons-daemon-launcher.jar}"/>
<pathelement location="${commons-dbcp.jar}"/>
<pathelement location="${commons-digester.jar}"/>
+ <pathelement location="${commons-daemon-launcher.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-modeler.jar}"/>
<pathelement location="${commons-pool.jar}"/>
@@ -88,6 +88,7 @@
<pathelement location="${commons-daemon.jar}"/>
<pathelement location="${commons-dbcp.jar}"/>
<pathelement location="${commons-digester.jar}"/>
+ <pathelement location="${commons-launcher.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-modeler.jar}"/>
<pathelement location="${commons-pool.jar}"/>
@@ -154,6 +155,12 @@
<available property="digester.present"
classname="org.apache.commons.digester.Digester"
classpath="${commons-digester.jar}"/>
+ <available property="launcher.present"
+ classname="org.apache.commons.launcher.Launcher"
+ classpath="${commons-daemon-launcher.jar}"/>
+ <available property="launcher.bootstrap.present"
+ classname="LauncherBootstrap"
+ classpath="${commons-daemon-launcher-bootstrap.class}"/>
<available property="logging.present"
classname="org.apache.commons.logging.Log"
classpath="${commons-logging.jar}"/>
@@ -226,7 +233,6 @@
classpath="${xerces.jar}:${xercesImpl.jar}" />
<!-- JAR files availability flags -->
- <available property="daemon.jar.present" file="${commons-daemon.jar}" />
<available property="dbcp.jar.present" file="${commons-dbcp.jar}" />
<available property="jaas.jar.present" file="${jaas.jar}" />
<condition property="javamail.jar.present">
@@ -262,12 +268,6 @@
</condition>
<!-- Conditional compilation flags (determined from the flags above) -->
- <condition property="compile.daemon">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${daemon.present}" arg2="true" />
- </or>
- </condition>
<condition property="compile.dbcp">
<or>
<equals arg1="${full.dist}" arg2="on" />
@@ -341,12 +341,6 @@
<!-- Conditional copy flags (determined from the flags above) -->
- <condition property="copy.daemon.jar">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${daemon.jar.present}" arg2="true" />
- </or>
- </condition>
<condition property="copy.dbcp.jar">
<and>
<not>
@@ -575,15 +569,17 @@
<echo message="--- Required Libraries ---" />
<echo message="beanutils.present=${beanutils.present}" />
<echo message="collections.present=${collections.present}" />
+ <echo message="daemon.present=${daemon.present}" />
<echo message="digester.present=${digester.present}" />
<echo message="jaxp.present=${jaxp.present}" />
<echo message="jndi.present=${jndi.present}" />
+ <echo message="launcher.present=${launcher.present}" />
+ <echo message="launcher.bootstrap.present=${launcher.bootstrap.present}" />
<echo message="logging.present=${logging.present}" />
<echo message="regexp.present=${regexp.present}" />
<echo message="servlet.present=${servlet.present}" />
<echo message="--- Optional Libraries ---" />
- <echo message="daemon.present=${daemon.present}" />
<echo message="dbcp.present=${dbcp.present}" />
<echo message="jaas.present=${jaas.present}" />
<echo message="javamail.present=${javamail.present}" />
@@ -604,7 +600,6 @@
<echo message="xerces2.jars.present(except JDK 1.4+ or
xerces1)=${xerces2.jars.present}" />
<echo message="--- Optional JARs ---" />
- <echo message="daemon.jar.present=${daemon.jar.present}" />
<echo message="dbcp.jar.present=${dbcp.jar.present}" />
<echo message="jaas.jar.present=${jaas.jar.present}" />
<echo message="javamail.jar.present=${javamail.jar.present}" />
@@ -618,7 +613,6 @@
<echo message="tyrex.jar.present=${tyrex.jar.present}" />
<echo message="--- Conditional compilation flags ---" />
- <echo message="compile.daemon=${compile.daemon}" />
<echo message="compile.dbcp=${compile.dbcp}" />
<echo message="compile.jaas=${compile.jaas}" />
<echo message="compile.javamail=${compile.javamail}" />
@@ -632,7 +626,6 @@
<echo message="compile.tyrex=${compile.tyrex}" />
<echo message="--- Distribution flags ---" />
- <echo message="copy.daemon.jar=${copy.daemon.jar}" />
<echo message="copy.dbcp.jar=${copy.dbcp.jar}" />
<echo message="copy.jaas.jar=${copy.jaas.jar}" />
<echo message="copy.jdbc20ext.jar=${copy.jdbc20ext.jar}" />
@@ -675,9 +668,6 @@
<copy todir="${catalina.build}/common/lib" file="${activation.jar}"/>
<copy todir="${catalina.build}/common/lib" file="${mail.jar}"/>
</target>
- <target name="copy-daemon.jar" if="copy.daemon.jar">
- <copy todir="${catalina.build}/bin" file="${commons-daemon.jar}"/>
- </target>
<target name="copy-dbcp.jar" if="copy.dbcp.jar">
<copy todir="${catalina.build}/common/lib" file="${commons-dbcp.jar}"/>
</target>
@@ -734,7 +724,12 @@
<!-- =================== BUILD: Copy Static Files ======================= -->
- <target name="build-static"
depends="flags,flags.display,build-prepare,copy-activation.jar,copy-daemon.jar,copy-dbcp.jar,copy-jaas.jar,copy-jdbc20ext.jar,copy-jmx.jar,copy-jndi.jar,copy-jsse.jar,copy-jta.jar,copy-ldap.jar,copy-modeler.jar,copy-pool.jar,copy-tyrex.jar,copy-xerces.jar,copy-xerces2.jars">
+ <target name="build-static"
depends="flags,flags.display,build-prepare,copy-activation.jar,copy-dbcp.jar,copy-jaas.jar,copy-jdbc20ext.jar,copy-jmx.jar,copy-jndi.jar,copy-jsse.jar,copy-jta.jar,copy-ldap.jar,copy-modeler.jar,copy-pool.jar,copy-tyrex.jar,copy-xerces.jar,copy-xerces2.jars">
+
+ <!-- Copy the launcher classes -->
+ <copy todir="${catalina.build}/bin" file="${commons-daemon.jar}"/>
+ <copy todir="${catalina.build}/bin" file="${commons-daemon-launcher.jar}"/>
+ <copy todir="${catalina.build}/bin"
file="${commons-daemon-launcher-bootstrap.class}"/>
<!-- Executable Commands -->
<copy todir="${catalina.build}/bin">
@@ -814,8 +809,6 @@
unless="compile.jsse"/>
<exclude name="org/apache/catalina/realm/JAAS**"
unless="compile.jaas"/>
- <exclude name="org/apache/catalina/startup/BootstrapService.java"
- unless="compile.daemon"/>
<exclude name="org/apache/catalina/ssi/**"
unless="compile.ssi"/>
<exclude name="org/apache/catalina/valves/CertificatesValve.java"
1.1 jakarta-tomcat-catalina/catalina/src/bin/catalina.properties
Index: catalina.properties
===================================================================
#
# Custom properties
#
1.1 jakarta-tomcat-catalina/catalina/src/bin/launcher.properties
Index: launcher.properties
===================================================================
#
# Properties for the LauncherBootstrap class
#
# This file contains the following configurable properties:
# - ant.class.path - This property is a ":" separated list of the URL file
# fragments where the Ant classes are located. The list must include a JAXP
# compliant XML parser if you are not using Java(TM) SE 1.4 or higher.
#
# Important notes:
# - Relative URL file fragments, such as "../lib", are supported and strongly
# encouraged as absolute files prevent cross platform distribution.
# - URL file fragments are the portions of a URL after the "file:" string.
# This means that you must use "/" characters as directory separators on
# all platforms. Also, ":" characters in a file fragment, such as in drive
# portion of absolute Windows files, must be URL encoded as "%3A". Lastly,
# directories must have a "/" character at the end.
# - All relative URL file fragments in the above properties will be resolved
# using the URL of the directory that the LauncherBootstrap class was
# loaded from, not the current working directory. This ensures that the
# LauncherBootstrap class can properly resolve the files without regard to
# the current working directory.
#
ant.class.path=../common/lib/ant.jar:../common/endorsed/xercesImpl.jar:../common/endorsed/xmlParserAPIs.jar
1.1 jakarta-tomcat-catalina/catalina/src/bin/launcher.xml
Index: launcher.xml
===================================================================
<!--
Sample XML file for launching a sample application - Ant - using the Launcher.
By default, the sample application will be launched in the background.
To run it in the foreground, execute the Launcher with a "-Dwait=true"
argument.
To run the sample application in the JDB debugger, execute the Launcher with
a "-Ddebug=true" argument.
To run the sample application in JPDA mode, execute the Launcher with a
"-Djpda=true" argument.
-->
<project name="Ant Launcher" default="ant" basedir=".">
<!-- Set the application home to the parent directory of this directory -->
<property name="app.home" location="${basedir}/.."/>
<!-- Build the classpath relative to the application home -->
<path id="base.class.path">
<fileset dir="${app.home}/common/lib" includes="ant.jar"/>
<fileset dir="${app.home}/common/endorsed" includes="*.jar"/>
</path>
<!-- Build the sysproperties relative to the application home -->
<syspropertyset id="base.sys.properties">
<sysproperty key="ant.home" file="${app.home}"/>
</syspropertyset>
<!-- Build the standard jvmargs -->
<jvmargset id="base.jvm.args">
<jvmarg value="-sourcepath" if="jdb"/>
<jvmarg path="${app.home}/../src/java" if="jdb"/>
<jvmarg value="-Xdebug" if="jpda.settings"/>
<jvmarg value="-Xrunjdwp:${jpda.settings}" if="jpda.settings"/>
</jvmargset>
<!-- Target that sets JDB properties when the "debug" property is set -->
<target name="setjdb" description="Set JDB properties" if="debug">
<property name="jdb" value="true"/>
</target>
<!-- Target that sets JPDA properties when the "jpda" property is set -->
<target name="setjpda" description="Set JPDA properties" if="jpda">
<condition property="jpda.transport" value="dt_shmem">
<os family="windows"/>
</condition>
<condition property="jpda.transport" value="dt_socket">
<not>
<os family="windows"/>
</not>
</condition>
<condition property="jpda.address" value="jdbconn">
<equals arg1="${jpda.transport}" arg2="dt_shmem"/>
</condition>
<condition property="jpda.address" value="8000">
<not>
<equals arg1="${jpda.transport}" arg2="dt_shmem"/>
</not>
</condition>
<property name="jpda.suspend" value="y"/>
<property name="jpda.settings"
value="transport=${jpda.transport},address=${jpda.address},server=y,suspend=${jpda.suspend}"/>
</target>
<!-- Target that executes Ant -->
<target name="ant" description="Execute Ant using the Launcher"
depends="setjdb,setjpda">
<!--
Execute Ant in a separate process. Note the use if "if" and "unless"
attributes to control the passing of arguments to Ant.
-->
<launch classname="org.apache.tools.ant.Main"
waitforchild="${wait}"
debug="${jdb}"
print="${print}"
requiretools="true"
redirectoutput="true"
output="${app.home}/logs/ant.log"
displayMinimizedWindow="true"
disposeMinimizedWindow="true"
minimizedWindowTitle="Ant">
<jvmargset refid="base.jvm.args"/>
<syspropertyset refid="base.sys.properties"/>
<classpath refid="base.class.path"/>
</launch>
</target>
</project>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
