costin 2002/11/15 16:51:20 Modified: catalina/src/bin catalina.xml Log: Update the ant-based startup - instead of the custom ant tasks it now uses the JMX-based tasks ( that are now available in modeler ). I'm still investigating embed-startup and setting other properties as well as dynamic deployment ( based on JMX ), to give ant full control. Revision Changes Path 1.6 +36 -36 jakarta-tomcat-catalina/catalina/src/bin/catalina.xml Index: catalina.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- catalina.xml 24 Oct 2002 19:10:30 -0000 1.5 +++ catalina.xml 16 Nov 2002 00:51:20 -0000 1.6 @@ -169,55 +169,55 @@ </target> - <!-- ======================= Ant task based ================ --> + <!-- ======================= Ant/JMX based ================ --> + <target name="taskdef" > + <property name="tomcat.home" location="../../jakarta-tomcat-5/build" /> - <target name="run-wait" depends="echo-config" - description="Start tomcat as a task and wait for it to end"> - <taskdef name="tomcat5" - classname="org.apache.catalina.startup.CatalinaService" - classpathref="tomcatcp" /> - - <tomcat5 do="start" home="${catalina.home}" wait="true" compiler="jikes"/> - <!-- the task will not end until tomcat shutdown is received --> - - <echo message="==================== Tomcat5 stoped ==================== "/> + <path id="jmx.test.classpath"> + <pathelement location="target/classes" /> + <fileset dir="${tomcat.home}/common/lib" includes="*.jar"/> + <fileset dir="${tomcat.home}/server/lib" includes="*.jar"/> + <fileset dir="${tomcat.home}/bin" includes="*.jar"/> + </path> + + <!-- part of modeler --> + <taskdef resource="META-INF/ant.properties" + classpathref="jmx.test.classpath" /> </target> - <target name="run" depends="echo-config" + + <target name="run" depends="echo-config,taskdef" description="Start tomcat as a task and return"> - <taskdef name="tomcat5" - classname="org.apache.catalina.startup.CatalinaService" - classpathref="tomcatcp" /> - <tomcat5 do="start" home="${catalina.home}" wait="false" compiler="jikes"/> - - <!-- the task will end when tomcat is initialised. You can now use it in - other tasks --> + <MLET code="org.apache.commons.modeler.BaseModelMBean" + name="catalina:type=server" > + <arg value="org.apache.catalina.startup.Catalina" /> + </MLET> + + <jmxSet name="catalina:type=server" + attribute="catalinaHome" + value="${tomcat.home}"/> + + <!-- We could also call init and set other properties - + init should load the modules --> + + <jmx name="catalina:type=server" + method="start" /> + + <echo message="Tomcat5 running"/> - <echo message="==================== Tomcat5 running ==================== "/> </target> + <!-- ======================= Exec/java ================ --> <target name="java-start" depends="echo-config" description="Run tomcat in-process and wait for it to end, using java task" > - <java classname="org.apache.catalina.startup.CatalinaService" fork="false"> - <classpath refid="tomcatcp" /> - <arg value="start" /> - <sysproperty key="catalina.home" value="${catalina.home}"/> - <sysproperty key="build.compiler" value="jikes"/> - <sysproperty key="java.endorsed.dirs" value="${ant.home}/lib:${java.home}/lib"/> - </java> - - <echo message="==================== Tomcat5 up and running ==================== "/> - </target> - - <target name="java-fork" depends="echo-config" - description="Fork a tomcat java process and wait for it to end"> + <property name="tomcat.fork" value="false" /> - <java classname="org.apache.catalina.startup.CatalinaService" fork="true"> + <java classname="org.apache.catalina.startup.CatalinaService" fork="${tomcat.fork}"> <classpath refid="tomcatcp" /> <arg value="start" /> <sysproperty key="catalina.home" value="${catalina.home}"/> @@ -225,8 +225,8 @@ <sysproperty key="java.endorsed.dirs" value="${ant.home}/lib:${java.home}/lib"/> </java> - <echo message="==================== Tomcat5 up and running ==================== "/> - </target> + <echo message="Tomcat5 running"/> + </target> </project>
-- To unsubscribe, e-mail: <mailto:tomcat-dev-unsubscribe@;jakarta.apache.org> For additional commands, e-mail: <mailto:tomcat-dev-help@;jakarta.apache.org>