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

diff --git a/build.xml b/build.xml
index 0e6d4e6..ff36849 100644
--- a/build.xml
+++ b/build.xml
@@ -12,35 +12,30 @@
     
    <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/api" />
     </target>
 
     <target name="jsvc" depends="build-env">
-      <javac srcdir="src" destdir="build/classes" debug="on">
+      <javac srcdir="src" destdir="build/bin" debug="on" includeantruntime="true">
 	<!-- <classpath refid="classpath" /> -->
         <compilerarg value="-Xlint:unchecked" />
       </javac>
+      <copy todir="build/bin/dolda/jsvc/j2ee" file="etc/web.xml.template" />
+      <copy todir="build/bin/dolda/jsvc/next/catalog">
+	<fileset dir="etc/catalog" />
+      </copy>
     </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>
-
-    <target name="war" depends="build-env, jsvc-jar, webapp">
-       <war destfile="build/jsvc.war"
-	    basedir="build/webapp"
-	    webxml="www/web.xml"
-	    />
+    <target name="javadoc" depends="jsvc-jar">
+      <javadoc packagenames="dolda.jsvc.*"
+	       sourcepath="src"
+	       destdir="build/api" />
+      <zip destfile="build/jsvc-api.zip" basedir="build/api" />
     </target>
 
     <target name="clean">