X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=build.xml;h=c7a306575b6f501b68457761ef10eadc56f73973;hb=b606e86e005c98e6b4039bf8e4541ed76273a0da;hp=0e6d4e69a62c443284b7c24287f0f2441119808a;hpb=78f5d1201f8d3aecb660b7877b08d9bfbe650911;p=jsvc.git

diff --git a/build.xml b/build.xml
index 0e6d4e6..c7a3065 100644
--- a/build.xml
+++ b/build.xml
@@ -12,37 +12,34 @@
     
    <target name="build-env">
       <mkdir dir="build" />
-      <mkdir dir="build/classes" />
-      <mkdir dir="build/webapp" />
-      <mkdir dir="build/webapp/WEB-INF/classes" />
+      <mkdir dir="build/bin" />
+      <mkdir dir="build/test-bin" />
     </target>
 
     <target name="jsvc" depends="build-env">
-      <javac srcdir="src" destdir="build/classes" debug="on">
+      <javac srcdir="src" destdir="build/bin" debug="on">
 	<!-- <classpath refid="classpath" /> -->
         <compilerarg value="-Xlint:unchecked" />
       </javac>
+      <copy todir="build/bin/dolda/jsvc/j2ee" file="etc/web.xml.template" />
     </target>
     
     <target name="jsvc-jar" depends="build-env, jsvc">
-        <jar destfile="build/jsvc.jar" basedir="build/classes" />
+        <jar destfile="build/jsvc.jar" basedir="build/bin" />
     </target>
     
-    <target name="webapp" depends="build-env">
-       <mkdir dir="build/webapp/WEB-INF/lib" />
-       <copy file="build/jsvc.jar" tofile="build/webapp/WEB-INF/lib/jsvc.jar" />
-       <copy todir="build/webapp/WEB-INF/lib">
-	  <fileset dir="lib" />
-       </copy>
+    <target name="test-war" depends="build-env, jsvc-jar">
+      <taskdef name="jsvc-war" classname="dolda.jsvc.j2ee.Archive$AntTask" classpath="build/jsvc.jar" />
+      <copy tofile="build/test-bin/jsvc.properties" file="etc/test.jsvc.properties" />
+      <jar destfile="build/jsvc-test.jar" basedir="build/test-bin" />
+      <jsvc-war destfile="build/jsvc-test.war">
+	<jars dir="build">
+	  <include name="jsvc.jar" />
+	  <include name="jsvc-test.jar" />
+	</jars>
+      </jsvc-war>
     </target>
-
-    <target name="war" depends="build-env, jsvc-jar, webapp">
-       <war destfile="build/jsvc.war"
-	    basedir="build/webapp"
-	    webxml="www/web.xml"
-	    />
-    </target>
-
+    
     <target name="clean">
        <delete dir="build" />
     </target>