From 3841e92d534ff3f19b378438283804b296ff37d8 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 6 Oct 2010 14:25:27 +0000
Subject: [PATCH] remove unused web-*.xml files from wars

---
 apps/i2ptunnel/java/build.xml     | 2 +-
 apps/routerconsole/java/build.xml | 2 +-
 apps/susidns/src/build.xml        | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml
index 7b66b6882e..b17e8d9f38 100644
--- a/apps/i2ptunnel/java/build.xml
+++ b/apps/i2ptunnel/java/build.xml
@@ -81,7 +81,7 @@
 
     <target name="war" depends="precompilejsp, bundle"> 
         <war destfile="build/i2ptunnel.war" webxml="../jsp/web-out.xml"
-             basedir="../jsp/" excludes="web.xml, **/*.java, *.jsp">
+             basedir="../jsp/" excludes="web.xml, web-fragment.xml, web-out.xml, **/*.java, *.jsp">
         </war>
     </target>
 
diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index 78384113f9..ae73734cd5 100644
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -113,7 +113,7 @@
     <target name="war" depends="precompilejsp">
         <!-- Don't include the css in the war, the main build.xml will copy it to docs/themes/console/ -->
         <war destfile="build/routerconsole.war" webxml="../jsp/web-out.xml"
-             basedir="../jsp/" excludes="web.xml, *.css, **/*.java, *.jsp, *.jsi, web-fragment.xml">
+             basedir="../jsp/" excludes="web.xml, *.css, **/*.java, *.jsp, *.jsi, web-fragment.xml, web-out.xml">
         </war>
     </target>
     <target name="precompilejsp" unless="precompilejsp.uptodate">
diff --git a/apps/susidns/src/build.xml b/apps/susidns/src/build.xml
index 55b662a9d3..8244d37cfb 100644
--- a/apps/susidns/src/build.xml
+++ b/apps/susidns/src/build.xml
@@ -72,7 +72,6 @@
         		<include name="images/*.png"/>
         		<include name="css.css"/>
         		<include name="index.html"/>
-        		<include name="WEB-INF/web-out.xml"/>
         		<include name="WEB-INF/classes/${project}.properties"/>
         	</fileset>
         </war>