From 7f09206a47e2f9da37a0df32fa908c46a1f3413c Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Wed, 8 Aug 2012 00:07:17 +0000
Subject: [PATCH] Fixed jarScalaTest targets to actually package all classes

---
 core/java/build.xml   | 15 ++++++++++++++-
 router/java/build.xml | 15 ++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/core/java/build.xml b/core/java/build.xml
index 7f18a1bcc2..c52df80d31 100644
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -105,7 +105,20 @@
     </target>
     <!-- jars with tests -->
     <target name="jarScalaTest" depends="scalatest.compileTest">
-        <jar destfile="./build/i2pscalatest.jar" basedir="./build/obj" includes="**/*.class ../obj_scala/**/*.class" />
+        <mkdir dir="./build/obj_scala_jar" />
+        <copy todir="./build/obj_scala_jar">
+            <fileset dir="./build/">
+                <include name="obj/**/*.class"/>
+            </fileset>
+            <mapper type="glob" from="obj/*" to="*" />
+        </copy>
+        <copy todir="./build/obj_scala_jar">
+            <fileset dir="./build/">
+                <include name="obj_scala/**/*.class"/>
+            </fileset>
+            <mapper type="glob" from="obj_scala/*" to="*" />
+        </copy>
+        <jar destfile="./build/i2pscalatest.jar" basedir="./build/obj_scala_jar" includes="**/*.class" />
     </target>
     <target name="jarTest" depends="junit.compileTest">
         <jar destfile="./build/i2ptest.jar" basedir="./build/obj" includes="**/*.class" />
diff --git a/router/java/build.xml b/router/java/build.xml
index cbccfd1d1f..6b49c9530c 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -131,7 +131,20 @@
     </target>
     <!-- jars with tests -->
     <target name="jarScalaTest" depends="scalatest.compileTest">
-        <jar destfile="./build/routerscalatest.jar" basedir="./build/obj" includes="**/*.class ../obj_scala/**/*.class" />
+        <mkdir dir="./build/obj_scala_jar" />
+        <copy todir="./build/obj_scala_jar">
+            <fileset dir="./build/">
+                <include name="obj/**/*.class"/>
+            </fileset>
+            <mapper type="glob" from="obj/*" to="*" />
+        </copy>
+        <copy todir="./build/obj_scala_jar">
+            <fileset dir="./build/">
+                <include name="obj_scala/**/*.class"/>
+            </fileset>
+            <mapper type="glob" from="obj_scala/*" to="*" />
+        </copy>
+        <jar destfile="./build/routerscalatest.jar" basedir="./build/obj_scala_jar" includes="**/*.class" />
     </target>
     <target name="jarTest" depends="junit.compileTest">
         <jar destfile="./build/routertest.jar" basedir="./build/obj" includes="**/*.class" />