diff --git a/apps/addressbook/build.xml b/apps/addressbook/build.xml
index 6332c5bcc..30750a231 100644
--- a/apps/addressbook/build.xml
+++ b/apps/addressbook/build.xml
@@ -38,6 +38,7 @@
@@ -47,27 +48,52 @@
-
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/desktopgui/build.xml b/apps/desktopgui/build.xml
index f5de9ff4f..0d697c185 100644
--- a/apps/desktopgui/build.xml
+++ b/apps/desktopgui/build.xml
@@ -24,6 +24,7 @@
@@ -47,10 +48,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/i2psnark/java/build.xml b/apps/i2psnark/java/build.xml
index 2fbc2f507..b05b7339a 100644
--- a/apps/i2psnark/java/build.xml
+++ b/apps/i2psnark/java/build.xml
@@ -30,18 +30,41 @@
srcdir="./src"
debug="true" deprecation="on" source="1.5" target="1.5"
destdir="./build/obj"
+ includeAntRuntime="false"
classpath="../../../core/java/build/i2p.jar:../../jetty/jettylib/org.mortbay.jetty.jar:../../jetty/jettylib/javax.servlet.jar:../../ministreaming/java/build/mstreaming.jar" >
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml
index 6ff511100..7beebbb1b 100644
--- a/apps/i2ptunnel/java/build.xml
+++ b/apps/i2ptunnel/java/build.xml
@@ -28,6 +28,7 @@
srcdir="./src"
debug="true" deprecation="on" source="1.5" target="1.5"
destdir="./build/obj"
+ includeAntRuntime="false"
classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
@@ -36,15 +37,35 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -75,12 +96,34 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -108,6 +151,7 @@
@@ -143,7 +187,9 @@
-
+
diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index a45f9df62..a4ba71e07 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -96,14 +96,39 @@
srcdir="./java/src"
debug="true" source="1.5" target="1.5"
destdir="./build/obj"
+ includeAntRuntime="false"
classpath="./jettylib/commons-logging.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar" >
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml
index c22676d26..8fcd2d517 100644
--- a/apps/ministreaming/java/build.xml
+++ b/apps/ministreaming/java/build.xml
@@ -24,13 +24,40 @@
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index 413521586..adb625e47 100644
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -46,6 +46,7 @@
@@ -61,12 +62,27 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -93,6 +109,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -182,6 +229,7 @@
diff --git a/apps/sam/java/build.xml b/apps/sam/java/build.xml
index 57aeff994..7e62fd27c 100644
--- a/apps/sam/java/build.xml
+++ b/apps/sam/java/build.xml
@@ -28,6 +28,7 @@
@@ -37,19 +38,42 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
index dff6fbf1d..1351399b7 100644
--- a/apps/streaming/java/build.xml
+++ b/apps/streaming/java/build.xml
@@ -27,6 +27,7 @@
@@ -36,14 +37,40 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/susidns/src/build.xml b/apps/susidns/src/build.xml
index ad20ad49a..ea4dc5809 100644
--- a/apps/susidns/src/build.xml
+++ b/apps/susidns/src/build.xml
@@ -23,13 +23,16 @@
+
+
@@ -47,6 +50,7 @@
@@ -61,8 +65,20 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -74,9 +90,20 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/susimail/build.xml b/apps/susimail/build.xml
index 9ab38ce42..0f7aae9bc 100644
--- a/apps/susimail/build.xml
+++ b/apps/susimail/build.xml
@@ -10,6 +10,7 @@
@@ -20,11 +21,35 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/systray/java/build.xml b/apps/systray/java/build.xml
index 9d48f902c..dc8f08afb 100644
--- a/apps/systray/java/build.xml
+++ b/apps/systray/java/build.xml
@@ -16,28 +16,41 @@
source="1.5"
target="1.5"
destdir="./build/obj"
+ includeAntRuntime="false"
includes="**/*.java"
classpath="./lib/systray4j.jar:../../../core/java/build/i2p.jar" >
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
diff --git a/build.xml b/build.xml
index d95ad3765..f7f88e789 100644
--- a/build.xml
+++ b/build.xml
@@ -97,7 +97,9 @@
+
@@ -105,7 +107,7 @@
-
+
@@ -127,11 +129,21 @@
-
+
+
+
+
+
+
+
+
+
+
+
@@ -165,11 +177,13 @@
-
+
+
+
@@ -678,17 +692,43 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/router/java/build.xml b/router/java/build.xml
index 69f6b4109..2a173f846 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -35,20 +35,49 @@
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+