From 3fc3abe7a561da477211b8cd0152fda126854d58 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 8 Dec 2012 02:02:04 +0000
Subject: [PATCH] Moved susimail.properties out of the build path, and set
 build.xml to copy it in

---
 apps/susimail/build.xml                       |  7 +++----
 .../src/WEB-INF/classes/susimail.properties   | 20 -------------------
 apps/susimail/src/susimail.properties         |  2 +-
 3 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 apps/susimail/src/WEB-INF/classes/susimail.properties

diff --git a/apps/susimail/build.xml b/apps/susimail/build.xml
index 27a65e7c1..93022c20f 100644
--- a/apps/susimail/build.xml
+++ b/apps/susimail/build.xml
@@ -10,6 +10,7 @@
     <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" 
@@ -43,6 +44,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>
@@ -111,10 +113,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" />
diff --git a/apps/susimail/src/WEB-INF/classes/susimail.properties b/apps/susimail/src/WEB-INF/classes/susimail.properties
deleted file mode 100644
index a310bfb9c..000000000
--- a/apps/susimail/src/WEB-INF/classes/susimail.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-susimail.encodings=i2p.susi.webmail.encoding.HeaderLine;i2p.susi.webmail.encoding.QuotedPrintable;i2p.susi.webmail.encoding.Base64;i2p.susi.webmail.encoding.SevenBit;i2p.susi.webmail.encoding.EightBit;i2p.susi.webmail.encoding.HTML
-
-susimail.host=localhost
-
-susimail.ports.fixed=true
-susimail.ports.pop3=7660
-susimail.ports.smtp=7659
-
-susimail.fast.start=true
-
-susimail.sender.fixed=true
-susimail.sender.domain=mail.i2p
-
-susimail.pager.pagesize=10
-
-susimail.composer.cols=80
-susimail.composer.rows=15
-susimail.composer.bcc.to.self=true
-
-susimail.date.format=MM/dd/yyyy HH:mm:ss
\ No newline at end of file
diff --git a/apps/susimail/src/susimail.properties b/apps/susimail/src/susimail.properties
index 34646449f..a310bfb9c 100644
--- a/apps/susimail/src/susimail.properties
+++ b/apps/susimail/src/susimail.properties
@@ -11,7 +11,7 @@ susimail.fast.start=true
 susimail.sender.fixed=true
 susimail.sender.domain=mail.i2p
 
-susimail.pager.pagesize=20
+susimail.pager.pagesize=10
 
 susimail.composer.cols=80
 susimail.composer.rows=15