From 916dcca2b0deb18f92717b67f085f25580150e87 Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Mon, 18 Apr 2005 18:47:22 +0000
Subject: [PATCH] * 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                               | 13 +++++++++++--
 apps/q/java/src/net/i2p/aum/I2PSocketHelper.java    |  1 -
 apps/q/java/src/net/i2p/aum/I2PTunnelXMLObject.java |  3 +--
 apps/q/java/src/net/i2p/aum/I2PTunnelXMLServer.java |  1 -
 apps/q/java/src/net/i2p/aum/I2PXmlRpcClient.java    |  1 -
 .../src/net/i2p/aum/I2PXmlRpcClientFactory.java     |  1 -
 apps/q/java/src/net/i2p/aum/I2PXmlRpcDemoClass.java |  1 -
 apps/q/java/src/net/i2p/aum/I2PXmlRpcServer.java    |  1 -
 .../src/net/i2p/aum/I2PXmlRpcServerFactory.java     |  1 -
 apps/q/java/src/net/i2p/aum/PrivDestination.java    |  2 --
 10 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/apps/q/java/build.xml b/apps/q/java/build.xml
index 761fefc7f..f79680009 100644
--- a/apps/q/java/build.xml
+++ b/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: -->
diff --git a/apps/q/java/src/net/i2p/aum/I2PSocketHelper.java b/apps/q/java/src/net/i2p/aum/I2PSocketHelper.java
index 77b7b0e5b..90a73d5ee 100644
--- a/apps/q/java/src/net/i2p/aum/I2PSocketHelper.java
+++ b/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.
diff --git a/apps/q/java/src/net/i2p/aum/I2PTunnelXMLObject.java b/apps/q/java/src/net/i2p/aum/I2PTunnelXMLObject.java
index 7998f731a..0f92c8615 100644
--- a/apps/q/java/src/net/i2p/aum/I2PTunnelXMLObject.java
+++ b/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
diff --git a/apps/q/java/src/net/i2p/aum/I2PTunnelXMLServer.java b/apps/q/java/src/net/i2p/aum/I2PTunnelXMLServer.java
index e489b130a..2d9c54459 100644
--- a/apps/q/java/src/net/i2p/aum/I2PTunnelXMLServer.java
+++ b/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
diff --git a/apps/q/java/src/net/i2p/aum/I2PXmlRpcClient.java b/apps/q/java/src/net/i2p/aum/I2PXmlRpcClient.java
index ca59ea42c..2358afc10 100644
--- a/apps/q/java/src/net/i2p/aum/I2PXmlRpcClient.java
+++ b/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.*;
 
 
 /**
diff --git a/apps/q/java/src/net/i2p/aum/I2PXmlRpcClientFactory.java b/apps/q/java/src/net/i2p/aum/I2PXmlRpcClientFactory.java
index d925889b9..425ec02d1 100644
--- a/apps/q/java/src/net/i2p/aum/I2PXmlRpcClientFactory.java
+++ b/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.*;
 
 
 /**
diff --git a/apps/q/java/src/net/i2p/aum/I2PXmlRpcDemoClass.java b/apps/q/java/src/net/i2p/aum/I2PXmlRpcDemoClass.java
index d62b3ae39..e7909f459 100644
--- a/apps/q/java/src/net/i2p/aum/I2PXmlRpcDemoClass.java
+++ b/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
diff --git a/apps/q/java/src/net/i2p/aum/I2PXmlRpcServer.java b/apps/q/java/src/net/i2p/aum/I2PXmlRpcServer.java
index a64878706..1aca5fbaf 100644
--- a/apps/q/java/src/net/i2p/aum/I2PXmlRpcServer.java
+++ b/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.*;
 
 
 /**
diff --git a/apps/q/java/src/net/i2p/aum/I2PXmlRpcServerFactory.java b/apps/q/java/src/net/i2p/aum/I2PXmlRpcServerFactory.java
index f53554e3f..ef7ca42a8 100644
--- a/apps/q/java/src/net/i2p/aum/I2PXmlRpcServerFactory.java
+++ b/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.*;
 
 
 /**
diff --git a/apps/q/java/src/net/i2p/aum/PrivDestination.java b/apps/q/java/src/net/i2p/aum/PrivDestination.java
index 8c1386925..f54077416 100644
--- a/apps/q/java/src/net/i2p/aum/PrivDestination.java
+++ b/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