* build with reference to the i2p.jar/mstreaming.jar/i2ptunnel.jar inline (building as necessary)

* removed unnecessary references to i2ptunnel (though i2ptunnelxmlobject still references i2ptunnelxmlwrapper)

apps/q/java/build.xml

@@ -19,10 +19,19 @@
     <property location="${project.name}.jar" name="jar"/>
   </target>
 
-  <target depends="init" name="compile">
+  <target name="builddep">
+    <ant dir="../../i2ptunnel/java/" target="build" />
+    <!-- i2ptunnel builds ministreaming and core -->
+  </target>
+  
+  <target depends="init,builddep" name="compile">
     <!-- Both srcdir and destdir should be package roots. -->
     <mkdir dir="${classes.dir}"/>
-    <javac debug="true" deprecation="true" destdir="${classes.dir}" srcdir="${src.dir}">
+    <javac debug="true" 
+           deprecation="true" 
+           destdir="${classes.dir}" 
+           srcdir="${src.dir}"
+           classpath="xmlrpc.jar:../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar:../../i2ptunnel/java/build/i2ptunnel.jar" >
       <!-- To add something to the classpath: -->
       <!-- <classpath><pathelement location="${mylib}"/></classpath> -->
       <!-- To exclude some files: -->

apps/q/java/src/net/i2p/aum/I2PSocketHelper.java

@@ -11,7 +11,6 @@ import net.i2p.client.*;
 import net.i2p.client.streaming.*;
 import net.i2p.util.*;
 import net.i2p.data.*;
-import net.i2p.i2ptunnel.*;
 
 /**
  * Class which wraps an I2PSocket object with convenient methods.

apps/q/java/src/net/i2p/aum/I2PTunnelXMLObject.java

@@ -10,8 +10,7 @@ import net.i2p.client.*;
 import net.i2p.client.streaming.*;
 import net.i2p.util.*;
 import net.i2p.data.*;
-import net.i2p.i2ptunnel.*;
-
+import net.i2p.i2ptunnel.I2PTunnelXMLWrapper;
 
 /**
  * Defines the I2P tunnel management methods which will be

apps/q/java/src/net/i2p/aum/I2PTunnelXMLServer.java

@@ -10,7 +10,6 @@ import net.i2p.client.*;
 import net.i2p.client.streaming.*;
 import net.i2p.util.*;
 import net.i2p.data.*;
-import net.i2p.i2ptunnel.*;
 
 /**
  * Provides a means for programs in any language to dynamically manage

apps/q/java/src/net/i2p/aum/I2PXmlRpcClient.java

@@ -14,7 +14,6 @@ import net.i2p.client.streaming.*;
 import net.i2p.data.Base64;
 import net.i2p.util.*;
 import net.i2p.data.*;
-import net.i2p.i2ptunnel.*;
 
 
 /**

apps/q/java/src/net/i2p/aum/I2PXmlRpcClientFactory.java

@@ -14,7 +14,6 @@ import net.i2p.client.streaming.*;
 import net.i2p.data.Base64;
 import net.i2p.util.*;
 import net.i2p.data.*;
-import net.i2p.i2ptunnel.*;
 
 
 /**

apps/q/java/src/net/i2p/aum/I2PXmlRpcDemoClass.java

@@ -14,7 +14,6 @@ import net.i2p.client.streaming.*;
 import net.i2p.data.Base64;
 import net.i2p.util.*;
 import net.i2p.data.*;
-import net.i2p.i2ptunnel.*;
 
 /**
  * A simple class providing callable xmlrpc server methods, gets linked in to

apps/q/java/src/net/i2p/aum/I2PXmlRpcServer.java

@@ -13,7 +13,6 @@ import net.i2p.client.streaming.*;
 import net.i2p.data.Base64;
 import net.i2p.util.*;
 import net.i2p.data.*;
-import net.i2p.i2ptunnel.*;
 
 
 /**

apps/q/java/src/net/i2p/aum/I2PXmlRpcServerFactory.java

@@ -13,7 +13,6 @@ import net.i2p.client.streaming.*;
 import net.i2p.data.Base64;
 import net.i2p.util.*;
 import net.i2p.data.*;
-import net.i2p.i2ptunnel.*;
 
 
 /**

apps/q/java/src/net/i2p/aum/PrivDestination.java

@@ -14,8 +14,6 @@ import net.i2p.client.streaming.*;
 import net.i2p.data.Base64;
 import net.i2p.util.*;
 import net.i2p.data.*;
-import net.i2p.i2ptunnel.*;
-
 
 /**
  * A convenience class for encapsulating and manipulating I2P private keys