User: starksm
Date: 01/04/17 19:43:21
Modified: tomcat/src/build build.xml
Log:
Update the Ant build file to support building the JBoss/Tomcat prepackaged
bundle given jboss.dist and tomcat.dist locations.
Revision Changes Path
1.9 +77 -39 contrib/tomcat/src/build/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/contrib/tomcat/src/build/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 2001/03/15 06:35:56 1.8
+++ build.xml 2001/04/18 02:43:21 1.9
@@ -1,35 +1,47 @@
-<?xml version="1.0"?>
-<!-- $Id: build.xml,v 1.8 2001/03/15 06:35:56 stark Exp $ -->
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- $Id: build.xml,v 1.9 2001/04/18 02:43:21 starksm Exp $ -->
+<!-- An Ant build file for the tomcat-service jar and the
+ JBoss/Tomcat bundle. The buildfile requires a JBoss dist
+ be specified via the jboss.dist property as well as a
+ tomcat dist be specified via the tomcat.dist property.
+-->
-<!-- ======================================================================= -->
-<!-- tomcat contrib build file -->
-<!-- ======================================================================= -->
-
<project name="tomcat-service" default="jar" basedir="../..">
- <target name="init">
- <property name="Name" value="tomcat-service"/>
- <property name="name" value="tomcat-service"/>
- <property name="version" value="0.1"/>
-
- <property name="src.dir" value="${basedir}/src/main"/>
- <property name="lib.dir" value="${basedir}/lib"/>
- <property name="src.resources" value="${basedir}/src/resources"/>
- <property name="etc.dir" value="${basedir}/src/etc"/>
- <property name="build.dir" value="${basedir}/build"/>
- <property name="build.classes.dir" value="${build.dir}/classes"/>
-
- <property name="classpath"
value="${jboss.home}/client/jbosssx-client.jar;${jboss.home}/lib/jdbc2_0-stdext.jar;${jboss.home}/client/jta-spec1_0_1.jar;${jboss.home}/client/jnp-client.jar;${jboss.home}/lib/jmxri.jar;${jboss.home}/lib/ext/jboss.jar;${tomcat.home}/lib/jaxp.jar;${jboss.home}/lib/ext/ejb.jar;${build.classes.dir};${tomcat.home}/lib/webserver.jar;${tomcat.home}/lib/servlet.jar;${tomcat.home}/lib/parser.jar;${tomcat.home}/classes"/>
-
- <property name="jar.file" value="${name}.jar"/>
- <property name="test.client" value="tomcat-test"/>
-
- <property name="build.compiler" value="classic"/>
-
- <echo message="jboss.home=${jboss.home}" />
- <echo message="tomcat.home=${tomcat.home}" />
- <echo message="classpath=${classpath}" />
+ <property name="name" value="tomcat-service"/>
+ <property name="lib.dir" value="${basedir}/lib"/>
+ <property name="src.dir" value="${basedir}/src/main"/>
+ <property name="src.resources" value="${basedir}/src/resources"/>
+ <property name="etc.dir" value="${basedir}/src/etc"/>
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="build.classes.dir" value="${build.dir}/classes"/>
+ <property name="jar.file" value="${name}.jar"/>
+ <property name="test.client" value="tomcat-test"/>
+ <property name="bundle.name" value="jboss-tomcat" />
+ <property name="bundle.dir" value="bundle" />
+ <property name="bundle.root" value="${bundle.dir}/${bundle.name}" />
+ <path id="base.path">
+ <pathelement location="${jboss.dist}/client/jbosssx-client.jar"/>
+ <pathelement location="${jboss.dist}/client/jnp-client.jar"/>
+ <pathelement location="${jboss.dist}/client/jta-spec1_0_1.jar"/>
+ <pathelement location="${jboss.dist}/lib/jdbc2_0-stdext.jar"/>
+ <pathelement location="${jboss.dist}/lib/jaxp.jar"/>
+ <pathelement location="${jboss.dist}/lib/crimson.jar"/>
+ <pathelement location="${jboss.dist}/lib/jmxri.jar"/>
+ <pathelement location="${jboss.dist}/lib/ext/ejb.jar"/>
+ <pathelement location="${jboss.dist}/lib/ext/jboss.jar"/>
+ <pathelement location="${tomcat.dist}/lib/webserver.jar"/>
+ <pathelement location="${tomcat.dist}/lib/servlet.jar"/>
+ <pathelement location="${tomcat.dist}/lib/servlet.jar"/>
+ <pathelement location="${build.classes.dir}"/>
+ </path>
+ <property name="classpath" refid="base.path"/>
+
+ <target name="init">
+ <echo message="Using jboss.dist=${jboss.dist}" />
+ <echo message="Using tomcat.dist=${tomcat.dist}" />
+ <echo message="Using classpath=${classpath}" />
</target>
@@ -62,31 +74,49 @@
<!-- Creates the jar archive -->
<!-- =================================================================== -->
<target name="jar" depends="compile">
- <jar jarfile="${jar.file}"
+ <jar jarfile="${build.dir}/${jar.file}"
basedir="${build.classes.dir}"
includes="org/jboss/tomcat/**,*.dtd"
/>
</target>
<!-- =================================================================== -->
- <!-- Installs the jar archive to jboss -->
+ <!-- Installs the jar archive to ${jboss.dist}/lib/ext -->
<!-- =================================================================== -->
<target name="install" depends="jar">
- <copy file="${jar.file}"
- tofile="${jboss.home}/lib/ext/${jar.file}"
+ <copy file="${build.dir}/${jar.file}"
+ tofile="${jboss.dist}/lib/ext/${jar.file}"
/>
</target>
-
<!-- =================================================================== -->
- <!-- Cleans up generated stuff -->
+ <!-- Creates a jboss-tomcat bundle using the jboss.dist and tomcat.dist
+ contents and ${etc.dir}/conf/tomcat patch files -->
<!-- =================================================================== -->
- <target name="clean" depends="init">
- <delete dir="${build.dir}"/>
- <delete file="${jar.file}"/>
- <delete file="${test.client}.ear"/>
+ <target name="bundle" depends="jar">
+ <mkdir dir="${bundle.root}" />
+ <copy todir="${bundle.root}/tomcat">
+ <fileset dir="${tomcat.dist}" />
+ </copy>
+ <copy todir="${bundle.root}/jboss">
+ <fileset dir="${jboss.dist}" />
+ </copy>
+ <copy todir="${bundle.root}/jboss/conf/tomcat">
+ <fileset dir="${bundle.root}/jboss/conf/default" />
+ </copy>
+ <patch patchfile="${etc.dir}/conf/tomcat/jboss.conf.patch"
+ originalfile="${bundle.root}/jboss/conf/tomcat/jboss.conf" />
+ <patch patchfile="${etc.dir}/conf/tomcat/jboss.jcml.patch"
+ originalfile="${bundle.root}/jboss/conf/tomcat/jboss.jcml" />
+ <patch patchfile="${etc.dir}/conf/tomcat/server.xml.patch"
+ originalfile="${bundle.root}/tomcat/conf/server.xml" />
+ <fixcrlf srcdir="${bundle.root}/jboss/bin" cr="remove" eof="remove"
+ includes="*.sh" />
</target>
+ <target name="bundle.zip" depends="bundle">
+ <zip zipfile="${bundle.name}.zip" basedir="${bundle.dir}" />
+ </target>
<!-- =================================================================== -->
<!-- Creates the test client ear file -->
@@ -114,9 +144,17 @@
basedir="${build.classes.dir}"
includes="org/jboss/test/tomcat/ejb/interfaces/**"
/>
- <jar jarfile="${test.client}.ear"
+ <jar jarfile="${build.dir}/${test.client}.ear"
basedir="${build.classes.dir}"
includes="${test.client}.jar,${test.client}.war,client.jar,META-INF/application.xml"
/>
</target>
+
+ <!-- =================================================================== -->
+ <!-- Cleans up generated stuff -->
+ <!-- =================================================================== -->
+ <target name="clean">
+ <delete dir="${build.dir}"/>
+ </target>
+
</project>
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
