remove JUnit from package, user must install

build.xml

@@ -1,8 +1,17 @@
 <?xml version="1.0"?>
-<!-- build file for wolfSSL Java interface -->
 <project name="wolfssl" default="build" basedir=".">
 
-    <!-- default value useful for dev environment-->
+    <description>
+     wolfSSL JNI is a Java wrapper for the CyaSSL lightweight SSL/TLS library.
+
+     This build file requires JUnit for running provided JUnit tests. JUnit can
+     be downloaded from: http:/www.junit.org/
+
+     When running JUnit tests, this package will look for JUnit at:
+     $JUNIT_HOME/junit.jar
+    </description>
+
+    <!-- set properties for this build -->
     <property name="src.dir" value="src/java/"/>
     <property name="native.dir" value="native"/>
     <property name="lib.dir" value="lib/"/>
@@ -12,15 +21,13 @@
     <property name="test.build.dir" value="build/test"/>
     <property name="examples.dir" value="examples/"/>
     <property name="examples.build.dir" value="examples/build"/>
+    <property name="reports.dir" value="build/reports"/>
 
+    <!-- classpath to compiled wolfssl.jar, for running tests -->
     <path id="classpath">
         <fileset dir="${lib.dir}" includes="*.jar">
             <include name="wolfssl.jar"/>
         </fileset>
-      <fileset dir="${test.dir}" includes="*.jar">
-        <include name="junit-4.10.jar"/>
-      </fileset>
-      <!--<fileset dir="/usr/share/java/" includes="ant-junit.jar" />-->
     </path>
 
     <target name="init" depends="clean, default-javac-flags">
@@ -28,15 +35,15 @@
         <mkdir dir="${lib.dir}"/>
         <mkdir dir="${examples.build.dir}"/>
         <mkdir dir="${test.build.dir}"/>
+        <mkdir dir="${reports.dir}"/>
     </target>
 
     <target name="clean">
         <delete dir="${test.build.dir}"/>
         <delete dir="${build.dir}"/>
-      <!-- <delete dir="${lib.dir}"/> -->
         <delete dir="${examples.build.dir}"/>
+        <delete dir="${reports.dir}"/>
         <delete>
-        <fileset dir="." includes="TEST-*" />
             <fileset dir="${lib.dir}" includes="wolfssl.jar" />
         </delete>
     </target>
@@ -62,8 +69,7 @@
     </target>
 
     <target name="compile">
-      <javac
+        <javac srcdir="${src.dir}"
-       srcdir="${src.dir}"
                destdir="${build.dir}"
                debug="${java.debug}"
                debuglevel="${java.debuglevel}"
@@ -87,8 +93,7 @@
     </target>
 
     <target name="jar">
-      <jar jarfile="${lib.dir}/wolfssl.jar" basedir="${build.dir}">
+        <jar jarfile="${lib.dir}/wolfssl.jar" basedir="${build.dir}"></jar>
-      </jar>
     </target>
 
     <target name="javadoc" description="generate documentation">
@@ -96,8 +101,7 @@
     </target>
 
     <target name="examples">
-      <javac
+        <javac srcdir="${examples.dir}"
-       srcdir="${examples.dir}"
                destdir="${examples.build.dir}"
                debug="${java.debug}"
                debuglevel="${java.debuglevel}"
@@ -110,8 +114,7 @@
     </target>
 
     <target name="build-test">
-      <javac
+        <javac srcdir="${test.dir}"
-       srcdir="${test.dir}"
                destdir="${test.build.dir}"
                debug="${java.debug}"
                debuglevel="${java.debuglevel}"
@@ -125,19 +128,24 @@
 
     <target name="test" depends="build-test">
         <junit printsummary="yes" showoutput="yes" haltonfailure="yes">
-        <formatter type="plain"/>
         <classpath>
-          <pathelement location="src/test/junit-4.10.jar" />
+            <pathelement location="${build.dir}"/>
-          <pathelement location="build/" />
+            <pathelement location="${test.build.dir}"/>
-          <pathelement location="build/test" />
+            <pathelement location="${java.class.path}"/>
         </classpath>
+
+        <formatter type="plain"/>
+        <formatter type="xml"/>
+
         <sysproperty key="sun.boot.library.path" value="$JAVA_HOME/bin:${lib.dir}" />
         <env key="LD_LIBRARY_PATH" path="$LD_LIBRARY_PATH:{lib.dir}:/usr/local/lib" />
-        <batchtest fork="yes">
+
+        <batchtest fork="yes" todir="${reports.dir}">
             <fileset dir="${test.dir}">
                 <include name="**/*Test*.java"/>
             </fileset>
         </batchtest>
+
         </junit>
     </target>