allow setting hamcrest and junit locations with properties

Defaults to the ant library path (the previously hardcoded path) if not set.

build.properties

@@ -18,7 +18,7 @@ wrapperdocs.url=http://wrapper.tanukisoftware.com/jdoc/
 i2pdocs.url=http://docs.i2p-projekt.de/javadoc/
 junitdocs.url=http://junit.org/apidocs/
 # This will go in the jar manifests
-build.built-by=unknown	
+build.built-by=unknown  
 
 # filename of the sloccount report
 sloccount.report.file=sloccount.sc
@@ -44,6 +44,7 @@ require.gettext=true
 # This one keeps gcj a lot quieter
 #javac.compilerargs=-warn:-unchecked,raw,unused,serial
 
+### UnitTests ##
 # Location of the libraries required for the ScalaTest tests.
 # Define this in override.properties or pass in on the command line.
 # The directory must contain the following library names:
@@ -53,6 +54,18 @@ require.gettext=true
 # scalatest.jar
 #scalatest.libs=/PATH/TO/SCALATEST/lib
 
+# Location of the junit libraries
+# Defaults to the ant library path if not set.
+# If set, this must point to a directory that contains the files
+#        junit.jar and junit4.jar
+#junit.home=
+
+# Location of the hamcrest libraries
+# Defaults to the ant library path if not set
+# If set, this must point to a directory containing the files
+#       hamcrest-core.jar, hamcrest-library.jar, and hamcrest-integration.jar
+#hamcrest.home=
+
 # Optional properties used in tests to enable additional tools.
 #with.cobertura=/PATH/TO/cobertura.jar
 #with.clover=/PATH/TO/clover.jar