propagate from branch 'i2p.i2p' (head f33e0980fd48ba4acda12d2079f2a4834a710ae4)

to branch 'i2p.i2p.zzz.jetty7' (head bd1a64f7262ad5bbea3529675f1f055b9ad257a8)

apps/susimail/build.xml

@@ -7,9 +7,14 @@
     </target>
 
     <property name="javac.compilerargs" value="" />
+    <condition property="no.bundle">
+        <isfalse value="${require.gettext}" />
+    </condition>
+
     <property name="require.gettext" value="true" />
 
     <target name="compile">
+        <mkdir dir="./src/WEB-INF/classes" />
         <javac 
             srcdir="./src/src"
             debug="true" deprecation="off" source="1.5" target="1.5" 
@@ -44,6 +49,7 @@
     <target name="war" depends="compile, bundle, warUpToDate, listChangedFiles" unless="war.uptodate" >
         <!-- set if unset -->
         <property name="workspace.changes.tr" value="" />
+        <copy file="src/susimail.properties" todir="src/WEB-INF/classes" />
         <war destfile="susimail.war" webxml="src/WEB-INF/web.xml"
              basedir="src/" excludes="WEB-INF/web.xml LICENSE src/**/*">
             <manifest>
@@ -70,7 +76,7 @@
         </condition>
     </target>
 
-    <target name="bundle" depends="compile">
+    <target name="bundle" depends="compile" unless="no.bundle">
         <!-- Update the messages_*.po files.
              We need to supply the bat file for windows, and then change the fail property to true -->
         <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
@@ -112,10 +118,7 @@
             windowtitle="susimail" />
     </target>
     <target name="clean">
-        <delete>
-            <fileset dir="src/WEB-INF/classes/" includes="**/*.class" />
-        </delete>
-    	<delete dir="src/WEB-INF/classes/i2p"/>
+    	<delete dir="src/WEB-INF/classes"/>
     	<delete file="susimail.war"/>
     </target>
     <target name="cleandep" depends="clean" />