User: starksm
Date: 01/09/26 18:55:45
Modified: catalina/src/build build.xml
Log:
Update the bundle version
Revision Changes Path
1.4 +5 -39 contrib/catalina/src/build/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/contrib/catalina/src/build/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 2001/09/27 01:07:05 1.3
+++ build.xml 2001/09/27 01:55:45 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!-- $Id: build.xml,v 1.3 2001/09/27 01:07:05 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.4 2001/09/27 01:55:45 starksm Exp $ -->
<!-- An Ant build file for the catalina-service jar and the
JBoss/Tomcat bundle. The buildfile requires a JBoss dist
@@ -21,8 +21,7 @@
<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-2.4.1_Tomcat-4.0" />
+ <property name="bundle.name" value="JBoss-2.4.2_Tomcat-4.0" />
<property name="bundle.dir" value="bundle" />
<property name="bundle.root" value="${bundle.dir}/${bundle.name}" />
<path id="base.path_24">
@@ -38,6 +37,7 @@
<pathelement location="${jboss.dist}/lib/ext/jboss-j2ee.jar"/>
<pathelement location="${jboss.dist}/lib/ext/jboss.jar"/>
<pathelement location="${jboss.dist}/lib/ext/jbosssx.jar"/>
+ <pathelement location="${jboss.dist}/lib/ext/jnet.jar"/>
<pathelement location="${jboss.dist}/lib/ext/log4j.jar"/>
<pathelement location="${catalina.dist}/server/lib/catalina.jar"/>
<pathelement location="${catalina.dist}/common/lib/servlet.jar"/>
@@ -105,7 +105,7 @@
<!-- Creates a jboss-catalina bundle using the jboss.dist and catalina.dist
contents and ${etc.dir}/conf/catalina patch files -->
<!-- =================================================================== -->
- <target name="bundle" depends="jar,client">
+ <target name="bundle" depends="jar">
<mkdir dir="${bundle.root}" />
<copy todir="${bundle.root}/catalina">
<fileset dir="${catalina.dist}" />
@@ -135,49 +135,15 @@
<chmod dir="${bundle.root}/jboss/bin" perm="ugo+rx" includes="*.sh" />
<fixcrlf srcdir="${bundle.root}/jboss/bin" cr="add" eof="remove"
includes="*.bat" />
- <copy file="${build.dir}/${test.client}.ear"
- tofile="${bundle.root}/jboss/deploy/${test.client}.ear" />
</target>
<target name="bundle.zip" depends="bundle">
<zip zipfile="${bundle.name}.zip" basedir="${bundle.dir}" />
</target>
- <target name="bundle.tgz" depends="bundle,client">
+ <target name="bundle.tgz" depends="bundle">
<tar tarfile="${bundle.name}.tar" basedir="${bundle.dir}" />
<gzip src="${bundle.name}.tar" zipfile="${bundle.name}.tgz" />
- </target>
-
- <!-- =================================================================== -->
- <!-- Creates the test client ear file -->
- <!-- =================================================================== -->
- <target name="client" depends="compile">
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.resources}/test" />
- </copy>
- <jar jarfile="${build.classes.dir}/${test.client}.jar"
- basedir="${build.classes.dir}"
-
includes="org/jboss/test/tomcat/ejb/**,META-INF/ejb-jar.xml,META-INF/jboss.xml"
- />
- <copy
todir="${build.classes.dir}/WEB-INF/classes/org/jboss/test/tomcat/servlet" >
- <fileset dir="${build.classes.dir}/org/jboss/test/tomcat/servlet" />
- </copy>
- <!-- copy
todir="${build.classes.dir}/WEB-INF/classes/org/jboss/test/tomcat/ejb/interfaces" >
- <fileset dir="${build.classes.dir}/org/jboss/test/tomcat/ejb/interfaces" />
- </copy -->
- <jar jarfile="${build.classes.dir}/${test.client}.war"
- basedir="${build.classes.dir}"
- manifest="${src.resources}/web.mf"
- includes="WEB-INF/**,index.html"
- />
- <jar jarfile="${build.classes.dir}/client.jar"
- basedir="${build.classes.dir}"
- includes="org/jboss/test/tomcat/ejb/interfaces/**"
- />
- <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>
<!-- =================================================================== -->
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
