User: jules
Date: 00/11/11 02:56:00
Modified: jetty/src/build build.xml
Log:
Fix 'client' target to build tomcat-test.ear from ../tomcat !
Revision Changes Path
1.2 +18 -4 contrib/jetty/src/build/build.xml
Index: build.xml
===================================================================
RCS file: /products/cvs/ejboss/contrib/jetty/src/build/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2000/11/10 01:10:13 1.1
+++ build.xml 2000/11/11 10:55:59 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: build.xml,v 1.1 2000/11/10 01:10:13 jules Exp $ -->
+<!-- $Id: build.xml,v 1.2 2000/11/11 10:55:59 jules Exp $ -->
<!-- ======================================================================= -->
@@ -34,6 +34,7 @@
<!-- =================================================================== -->
<target name="prepare" depends="init">
<mkdir dir="${build.dir}"/>
+ <copyfile src="${src.resources}/jboss-web.dtd"
dest="${build.classes.dir}/jboss-web.dtd"/>
</target>
@@ -59,7 +60,7 @@
<target name="jar" depends="compile">
<jar jarfile="${jar.file}"
basedir="${build.classes.dir}"
- includes="org/jboss/jetty/**"
+ includes="org/jboss/jetty/**,*.dtd"
/>
</target>
@@ -87,22 +88,35 @@
<!-- Creates the test client ear file -->
<!-- =================================================================== -->
<target name="client" depends="compile">
+ <javac srcdir="${basedir}/../tomcat/src/main/"
+ destdir="${build.classes.dir}"
+ classpath="${classpath}"
+ debug="on"
+ deprecation="on"
+ optimize="off"
+ includes="org/jboss/test/**"
+ />
<copydir src="${src.resources}/test" dest="${build.classes.dir}"/>
<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"
/>
- <copydir src="${build.classes.dir}/org/jboss/test/tomcat/servlet"
+ <copydir src="${build.classes.dir}/org/jboss/test/tomcat/servlet"
dest="${build.classes.dir}/WEB-INF/classes/org/jboss/test/tomcat/servlet"/>
<copydir src="${build.classes.dir}/org/jboss/test/tomcat/ejb/interfaces"
dest="${build.classes.dir}/WEB-INF/classes/org/jboss/test/tomcat/ejb/interfaces"/>
<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="${test.client}.ear"
basedir="${build.classes.dir}"
- includes="${test.client}.jar,${test.client}.war,META-INF/application.xml"
+
includes="${test.client}.jar,${test.client}.war,client.jar,META-INF/application.xml"
/>
</target>
</project>
