Index: trunk/JavaCommons/build.xml
===================================================================
--- trunk/JavaCommons/build.xml	(revision 278)
+++ trunk/JavaCommons/build.xml	(revision 279)
@@ -140,4 +140,7 @@
 		<mkdir dir="${downloads.location}"/>
 	</target>
+	<target name="init.javadoc">
+		<mkdir dir="${javadoc.location}" />
+	</target>
 	<target depends="init.build" name="init.eventbenchconsole">
 		<mkdir dir="${build.location.eventbenchconsole}" />
@@ -151,4 +154,18 @@
 	<target depends="init.build" name="init.jfcmonitor">
 		<mkdir dir="${build.location.jfcmonitor}" />
+	</target>
+	<target depends="init.build" name="init.junit">
+		<mkdir dir="${test.location.results}" />
+		<mkdir dir="${test.location.data}" />
+		<mkdir dir="${test.location.output}" />
+	</target>
+	<target depends="init.junit" name="init.eventbenchcore-test">
+		<mkdir dir="${test.location.eventbenchcore}" />
+	</target>
+	<target depends="init.junit" name="init.javahelperlib-test">
+		<mkdir dir="${test.location.javahelperlib}" />
+		<copy includeemptydirs="true" todir="${test.location.data}">
+			<fileset dir="${JavaHelperLibTest.location}/testdata" />
+		</copy>
 	</target>
 
@@ -162,4 +179,9 @@
 	<target name="clean.javadoc">
 		<delete dir="${javadoc.location}" />
+	</target>
+	<target name="clean.junit">
+		<delete dir="${test.location.results}" />
+		<delete dir="${test.location.data}" />
+		<delete dir="${test.location.output}" />
 	</target>
 	<target depends="clean.build,clean.dist,clean.javadoc,clean.junit" name="clean.all" />
@@ -282,34 +304,15 @@
 
 	<!-- Javadoc Targets -->
-	<target name="javadoc" description="o Create Javadocs (Requires Javadoc 1.4+)">
-		<mkdir dir="${javadoc.location}/javahelperlib" />
-		<mkdir dir="${javadoc.location}/eventbenchcore" />
-		<mkdir dir="${javadoc.location}/eventbenchconsole" />
-		<mkdir dir="${javadoc.location}/jfcmonitor" />
-		<javadoc destdir="${javadoc.location}/javahelperlib"
+	<target depends="init.javadoc" name="javadoc" description="o Create Javadocs (Requires Javadoc 1.4+)">
+		<javadoc destdir="${javadoc.location}"
 			additionalparam="-J-Dorg.apache.commons.attributes.javadoc.CATaglet.sources=${basedir}">
 			<classpath refid="JavaHelperLib.classpath" />
+			<classpath refid="EventBenchCore.classpath" />
+			<classpath refid="EventBenchConsole.classpath" />
+			<classpath refid="JFCMonitor.classpath" />
 			<link href="http://download.oracle.com/javase/6/docs/api/" />
 			<fileset dir="${JavaHelperLib.location}/src" includes="**/*.java" />
-		</javadoc>
-		<javadoc destdir="${javadoc.location}/eventbenchcore"
-			additionalparam="-J-Dorg.apache.commons.attributes.javadoc.CATaglet.sources=${basedir}">
-			<classpath refid="EventBenchCore.classpath" />
-			<link resolveLink="true" href="${javadoc.location}/javahelperlib/" />
-			<link href="http://download.oracle.com/javase/6/docs/api/" />
 			<fileset dir="${EventBenchCore.location}/src" includes="**/*.java" />
-		</javadoc>
-		<javadoc destdir="${javadoc.location}/eventbenchconsole"
-			additionalparam="-J-Dorg.apache.commons.attributes.javadoc.CATaglet.sources=${basedir}">
-			<classpath refid="EventBenchConsole.classpath" />
-			<link resolveLink="true" href="${javadoc.location}/javahelperlib/" />
-			<link resolveLink="true" href="${javadoc.location}/eventbenchcore/" />
-			<link href="http://download.oracle.com/javase/6/docs/api/" />
 			<fileset dir="${EventBenchConsole.location}/src" includes="**/*.java" />
-		</javadoc>
-		<javadoc destdir="${javadoc.location}/jfcmonitor"
-			additionalparam="-J-Dorg.apache.commons.attributes.javadoc.CATaglet.sources=${basedir}">
-			<classpath refid="JFCMonitor.classpath" />
-			<link href="http://download.oracle.com/javase/6/docs/api/" />
 			<fileset dir="${JFCMonitor.location}/src" includes="**/*.java" />
 		</javadoc>
@@ -317,25 +320,4 @@
 
 	<!-- JUnit Targets -->
-	<target depends="init.build" name="init.junit">
-		<mkdir dir="${test.location.results}" />
-		<mkdir dir="${test.location.data}" />
-		<mkdir dir="${test.location.output}" />
-	</target>
-	<target depends="init.junit" name="init.eventbenchcore-test">
-		<mkdir dir="${test.location.eventbenchcore}" />
-	</target>
-	<target depends="init.junit" name="init.javahelperlib-test">
-		<mkdir dir="${test.location.javahelperlib}" />
-		<copy includeemptydirs="true" todir="${test.location.data}">
-			<fileset dir="${JavaHelperLibTest.location}/testdata" />
-		</copy>
-	</target>
-	
-	<target name="clean.junit">
-		<delete dir="${test.location.results}" />
-		<delete dir="${test.location.data}" />
-		<delete dir="${test.location.output}" />
-	</target>
-
 	<target depends="init.eventbenchcore-test" name="build.eventbenchcore-test">
 		<javac debug="true" debuglevel="${debuglevel}" destdir="${test.location.eventbenchcore}"