From 7f379027cacbe875e95f84a49a5683e67839ee01 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 15 Jun 2009 21:27:38 +0000
Subject: [PATCH]     * i2psnark build:       - Put the duplicate classes back
 in the war, because         the jar is not in the wrapper.config classpath in
 existing         installs. We could take them out of the jar, but then       
  they won't be available for standalone snark and future         updates via
 snark.       - Delete the dist/ dir in distclean

---
 apps/i2psnark/java/build.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/i2psnark/java/build.xml b/apps/i2psnark/java/build.xml
index 56ccb554d..59f0421e7 100644
--- a/apps/i2psnark/java/build.xml
+++ b/apps/i2psnark/java/build.xml
@@ -44,10 +44,16 @@
             </manifest>
         </jar>
     </target>    
-    <!-- only include the servlet, everything else is in the jar -->
+    <!-- Ideally we would include
+      -  only include the servlet, everything else is in the jar.
+      -  However, the wrapper.config classpath in existing installs
+      -  does not include i2psnark.jar.
+      -  So we must continue to duplicate everything in the war.
+          <classes dir="./build/obj" includes="**/I2PSnarkServlet*.class" />
+     -->
     <target name="war" depends="jar"> 
         <war destfile="../i2psnark.war" webxml="../web.xml">
-          <classes dir="./build/obj" includes="**/I2PSnarkServlet*.class" />
+          <classes dir="./build/obj" includes="**/*.class" excludes="**/RunStandalone.class" />
         </war>
     </target>
     
@@ -86,6 +92,7 @@
         <delete dir="./build" />
         <delete file="../i2psnark.war" />
         <delete file="./i2psnark-standalone.zip" />
+        <delete dir="./dist" />
     </target>
     <target name="cleandep" depends="clean">
         <ant dir="../../ministreaming/java/" target="distclean" />