X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=build.xml;h=eda27f358200093c2849b6d47f98dc153d1a5842;hb=90ff4d14920f00dd28135ee115d8f88809e5812d;hp=b42373adae054bf58abfb96125eca2d9b77e1315;hpb=28aca7f5ccfb69b54ee60e68dbe0a590844b9e97;p=jsvc.git

diff --git a/build.xml b/build.xml
index b42373a..eda27f3 100644
--- a/build.xml
+++ b/build.xml
@@ -13,7 +13,6 @@
    <target name="build-env">
       <mkdir dir="build" />
       <mkdir dir="build/bin" />
-      <mkdir dir="build/test-bin" />
       <mkdir dir="build/api" />
     </target>
 
@@ -23,6 +22,9 @@
         <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">
@@ -36,23 +38,6 @@
       <zip destfile="build/jsvc-api.zip" basedir="build/api" />
     </target>
 
-    <target name="test-war" depends="build-env, jsvc-jar">
-      <taskdef name="jsvc-war" classname="dolda.jsvc.j2ee.Archive$AntTask" classpath="build/jsvc.jar" />
-      <copy todir="build/test-bin/dolda/jsvc/test">
-	<fileset dir="src/dolda/jsvc/test">
-	  <include name="static/**" />
-	</fileset>
-      </copy>
-      <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="clean">
        <delete dir="build" />
     </target>