- s/classpath/javac.classpath/ I'm fairly sure that this must have been added

in error.
- add jenkins.cobertura.report target. The jenkins plugin couldn't find the
  sources, so I'm hoping this helps it out.
- add debug lines cobertura needs

build.xml

@@ -1319,6 +1319,20 @@
         <ant dir="core/java/" target="fulltest" />
         <ant dir="router/java/" target="fulltest" />
     </target>
+    <target name="jenkins.cobertura.report" depends="cobertura.report">
+        <!--
+             The jenkins cobertura plugin couldn't find the source files.
+             Let's see if these changes help it out.
+         -->
+        <replaceregexp byline="true" file="reports/core/cobertura/coverage.xml"
+            match='filename="net' replace='filename="core/java/src/net'/>
+        <replaceregexp byline="true" file="reports/core/cobertura/coverage.xml"
+            match="&lt;source&gt;./src" replace='&lt;source&gt;./core/java/src'/>
+        <replaceregexp byline="true" file="reports/router/cobertura/coverage.xml"
+            match='filename="net' replace='filename="router/java/src/net'/>
+        <replaceregexp byline="true" file="reports/router/cobertura/coverage.xml"
+            match="&lt;source&gt;./src" replace="&lt;source&gt;router/java/src"/>
+    </target>
     <!-- end unit tests -->
 
     <target name="testscripts" >

core/java/build.xml

@@ -22,6 +22,7 @@
         <mkdir dir="./build" />
         <mkdir dir="./build/obj" />
         <javac srcdir="./src" debug="true" source="1.5" target="1.5" deprecation="on"
+               debuglevel="lines,vars,source"
                includeAntRuntime="false"
                destdir="./build/obj" classpath="${javac.classpath}" >
             <compilerarg line="${javac.compilerargs}" />
@@ -82,13 +83,11 @@
 
     <!-- unit tests -->
     <target name="scalatest.compileTest" depends="compile, scala.init">
-        <!-- set classpath property if not set elsewhere first.-->
-        <property name="classpath" value="" />
         <mkdir dir="./build" />
         <mkdir dir="./build/obj_scala" />
         <scalac srcdir="./test/scalatest" destdir="./build/obj_scala" deprecation="on" >
             <classpath>
-                <pathelement location="${classpath}" />
+                <pathelement location="${javac.classpath}" />
                 <pathelement location="${scala-library.jar}" />
                 <pathelement location="${scalatest.jar}" />
                 <pathelement location="./build/obj" />
@@ -102,10 +101,11 @@
         <property name="hamcrest.home" value="${ant.home}/lib/" />
         <property name="junit.home" value="${ant.home}/lib/" />
         <javac srcdir="./test/junit" debug="true" source="1.5" target="1.5" deprecation="on"
+               debuglevel="lines,vars,source"
                includeAntRuntime="true"
                destdir="./build/obj" >
             <classpath>
-                <pathelement path="${classpath}" />
+                <pathelement path="${javac.classpath}" />
                 <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
                 <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
                 <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
@@ -213,8 +213,8 @@
         <junit printsummary="withOutAndErr" fork="yes" maxmemory="384m" showoutput="yes" >
             <sysproperty key="net.sourceforge.cobertura.datafile" file="./cobertura.ser" />
             <classpath>
-		<pathelement location="../../installer/resources/" />
+                <pathelement location="../../installer/resources/" />
-                <pathelement path="${classpath}" />
+                <pathelement path="${javac.classpath}" />
                 <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
                 <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
                 <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
@@ -230,14 +230,8 @@
                     <include name="**/*Test.java" />
                     <exclude name="**/ElGamalAESEngineTest.java" />
                     <exclude name="**/StructureTest.java" />
-                    <!-- temporarily  exclude slow tests -->
+                    <!-- DataHelperTest is *very* slow with cobertura -->
-                    <!-- let's now temporarily exclude the exclusions
-                    <exclude name="**/HMACSHA256Test.java" />
-                    <exclude name="**/SHA1HashTest.java" />
-                    <exclude name="**/SHA256Test.java" />
                     <exclude name="**/DataHelperTest.java" />
-                    -->
-                    <!-- end of slow tests -->
                 </fileset>
             </batchtest>
             <formatter type="xml"/>

router/java/build.xml

@@ -33,6 +33,7 @@
         <mkdir dir="./build" />
         <mkdir dir="./build/obj" />
         <javac srcdir="./src" debug="true" source="1.5" target="1.5" deprecation="on"
+               debuglevel="lines,vars,source"
                includeAntRuntime="false"
                destdir="./build/obj" classpath="../../core/java/build/obj:../../core/java/build/i2p.jar" >
             <compilerarg line="${javac.compilerargs}" />
@@ -111,7 +112,7 @@
         <mkdir dir="./build/obj_scala" />
         <scalac srcdir="./test/scalatest" destdir="./build/obj_scala" deprecation="on" >
             <classpath>
-                <pathelement location="${classpath}" />
+                <pathelement location="${javac.classpath}" />
                 <pathelement location="${scala-library.jar}" />
                 <pathelement location="${scalatest.jar}" />
                 <pathelement location="../../core/java/build/i2pscalatest.jar" />
@@ -127,6 +128,7 @@
         <property name="hamcrest.home" value="${ant.home}/lib/" />
         <property name="junit.home" value="${ant.home}/lib/" />
         <javac srcdir="./test/junit" debug="true" source="1.5" target="1.5" deprecation="on"
+            debuglevel="lines,vars,source"
             includeAntRuntime="true"
             destdir="./build/obj">
             <classpath>
@@ -228,7 +230,7 @@
         <junit printsummary="withOutAndErr" fork="yes" showoutput="yes" >
             <sysproperty key="net.sourceforge.cobertura.datafile" file="./cobertura.ser" />
             <classpath>
-                <pathelement path="${classpath}" />
+                <pathelement path="${javac.classpath}" />
                 <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
                 <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
                 <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />