Index: /trunk/JavaCommons/build.xml
===================================================================
--- /trunk/JavaCommons/build.xml	(revision 271)
+++ /trunk/JavaCommons/build.xml	(revision 272)
@@ -1,52 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project basedir="." default="dist" name="EventBench">
+	<!-- General Properties -->
 	<property environment="env" />
 	<property name="build.location" value="bin" />
-	<property name="build.location.eventbenchconsole" value="${build.location}/eventbenchconsole" />
-	<property name="build.location.eventbenchcore" value="${build.location}/eventbenchcore" />
-	<property name="build.location.javahelperlib" value="${build.location}/javahelperlib" />
-	<property name="build.location.jfcmonitor" value="${build.location}/jfcmonitor" />
 	<property name="dist.location" value="dist" />
+	<property name="javadoc.location" value="javadoc" />
+	<property name="debuglevel" value="source,lines,vars" />
+	<property name="target" value="1.6" />
+	<property name="source" value="1.6" />
+
+	<!-- Distribution Properties -->
 	<property name="dist.location.main" value="${dist.location}/console" />
 	<property name="dist.location.jfcmonitor" value="${dist.location}/jfcmonitor" />
 	<property name="dist.location.javadoc" value="${dist.location}/javadoc" />
-	<property name="javadoc.location" value="javadoc" />
+
+	<!-- EventBenchConsole Properties -->
+	<property name="build.location.eventbenchconsole" value="${build.location}/eventbenchconsole" />
 	<property name="EventBenchConsole.jarname" value="eventbenchconsole.jar" />
-	<property name="EventBenchCore.jarname" value="eventbenchcore.jar" />
-	<property name="JavaHelperLib.jarname" value="javahelperlib.jar" />
-	<property name="JFCMonitor.jarname" value="jfcmonitor.jar" />
 	<property name="EventBenchConsole.location" value="../EventBenchConsole" />
-	<property name="JavaHelperLib.location" value="../JavaHelperLib" />
-	<property name="EventBenchCore.location" value="../EventBenchCore" />
-	<property name="JFCMonitor.location" value="../JFCMonitor" />
-	<property name="debuglevel" value="source,lines,vars" />
-	<property name="target" value="1.6" />
-	<property name="source" value="1.6" />
-	<path id="JavaHelperLib.classpath">
-		<pathelement location="${build.location.javahelperlib}" />
-	</path>
-	<path id="EventBenchCore.classpath">
-		<pathelement location="${build.location.eventbenchcore}" />
-		<pathelement location="lib/Jama-1.0.2.jar" />
-		<pathelement location="lib/colt-1.2.0.jar" />
-		<pathelement location="lib/concurrent-1.3.4.jar" />
-		<pathelement location="lib/j3d-core-1.3.1.jar" />
-		<pathelement location="lib/jung-3d-2.0.1.jar" />
-		<pathelement location="lib/jung-3d-demos-2.0.1.jar" />
-		<pathelement location="lib/jung-algorithms-2.0.1.jar" />
-		<pathelement location="lib/jung-api-2.0.1.jar" />
-		<pathelement location="lib/jung-graph-impl-2.0.1.jar" />
-		<pathelement location="lib/jung-io-2.0.1.jar" />
-		<pathelement location="lib/jung-jai-2.0.1.jar" />
-		<pathelement location="lib/jung-jai-samples-2.0.1.jar" />
-		<pathelement location="lib/jung-samples-2.0.1.jar" />
-		<pathelement location="lib/jung-visualization-2.0.1.jar" />
-		<pathelement location="lib/stax-api-1.0.1.jar" />
-		<pathelement location="lib/vecmath-1.3.1.jar" />
-		<pathelement location="lib/wstx-asl-3.2.6.jar" />
-		<pathelement location="lib/commons-codec-1.5.jar" />
-		<pathelement location="lib/collections-generic-4.01.jar" />
-		<path refid="JavaHelperLib.classpath" />
-	</path>
 	<path id="EventBenchConsole.classpath">
 		<pathelement location="${build.location.eventbenchconsole}" />
@@ -83,5 +53,48 @@
 		<path refid="EventBenchCore.classpath" />
 	</path>
+
+	<!-- EventBenchCore Properties -->
+	<property name="build.location.eventbenchcore" value="${build.location}/eventbenchcore" />
+	<property name="EventBenchCore.jarname" value="eventbenchcore.jar" />
+	<property name="EventBenchCore.location" value="../EventBenchCore" />
+	<path id="EventBenchCore.classpath">
+		<pathelement location="${build.location.eventbenchcore}" />
+		<pathelement location="lib/Jama-1.0.2.jar" />
+		<pathelement location="lib/colt-1.2.0.jar" />
+		<pathelement location="lib/concurrent-1.3.4.jar" />
+		<pathelement location="lib/j3d-core-1.3.1.jar" />
+		<pathelement location="lib/jung-3d-2.0.1.jar" />
+		<pathelement location="lib/jung-3d-demos-2.0.1.jar" />
+		<pathelement location="lib/jung-algorithms-2.0.1.jar" />
+		<pathelement location="lib/jung-api-2.0.1.jar" />
+		<pathelement location="lib/jung-graph-impl-2.0.1.jar" />
+		<pathelement location="lib/jung-io-2.0.1.jar" />
+		<pathelement location="lib/jung-jai-2.0.1.jar" />
+		<pathelement location="lib/jung-jai-samples-2.0.1.jar" />
+		<pathelement location="lib/jung-samples-2.0.1.jar" />
+		<pathelement location="lib/jung-visualization-2.0.1.jar" />
+		<pathelement location="lib/stax-api-1.0.1.jar" />
+		<pathelement location="lib/vecmath-1.3.1.jar" />
+		<pathelement location="lib/wstx-asl-3.2.6.jar" />
+		<pathelement location="lib/commons-codec-1.5.jar" />
+		<pathelement location="lib/collections-generic-4.01.jar" />
+		<path refid="JavaHelperLib.classpath" />
+	</path>
+
+	<!-- JavaHelperLib Properties -->
+	<property name="build.location.javahelperlib" value="${build.location}/javahelperlib" />
+	<property name="JavaHelperLib.jarname" value="javahelperlib.jar" />
+	<property name="JavaHelperLib.location" value="../JavaHelperLib" />
+	<path id="JavaHelperLib.classpath">
+		<pathelement location="${build.location.javahelperlib}" />
+	</path>
+
+	<!-- JFCMonitor Properties -->
+	<property name="build.location.jfcmonitor" value="${build.location}/jfcmonitor" />
+	<property name="JFCMonitor.jarname" value="jfcmonitor.jar" />
+	<property name="JFCMonitor.location" value="../JFCMonitor" />
 	<path id="JFCMonitor.classpath" />
+
+	<!-- Initialization Targets -->
 	<target name="init.build">
 		<mkdir dir="bin" />
@@ -92,4 +105,18 @@
 		<mkdir dir="${dist.location.jfcmonitor}" />
 	</target>
+	<target depends="init.build" name="init.eventbenchconsole">
+		<mkdir dir="${build.location.eventbenchconsole}" />
+	</target>
+	<target depends="init.build" name="init.eventbenchcore">
+		<mkdir dir="${build.location.eventbenchcore}" />
+	</target>
+	<target depends="init.build" name="init.javahelperlib">
+		<mkdir dir="${build.location.javahelperlib}" />
+	</target>
+	<target depends="init.build" name="init.jfcmonitor">
+		<mkdir dir="${build.location.jfcmonitor}" />
+	</target>
+
+	<!-- Clean-up Targets -->
 	<target name="clean.build">
 		<delete dir="${build.location}" />
@@ -102,10 +129,9 @@
 	</target>
 	<target depends="clean.build,clean.dist,clean.javadoc" name="clean.all" />
+
+	<!-- Build Targets -->
 	<target
 		depends="build.javahelperlib,build.eventbenchcore,build.eventbenchconsole,build.jfcmonitor"
 		name="build" />
-	<target depends="init.build" name="init.eventbenchconsole">
-		<mkdir dir="${build.location.eventbenchconsole}" />
-	</target>
 	<target depends="init.eventbenchconsole" name="build.eventbenchconsole">
 		<javac debug="true" debuglevel="${debuglevel}"
@@ -116,7 +142,4 @@
 		</javac>
 	</target>
-	<target depends="init.build" name="init.eventbenchcore">
-		<mkdir dir="${build.location.eventbenchcore}" />
-	</target>
 	<target depends="init.eventbenchcore" name="build.eventbenchcore">
 		<javac debug="true" debuglevel="${debuglevel}"
@@ -127,7 +150,4 @@
 		</javac>
 	</target>
-	<target depends="init.build" name="init.javahelperlib">
-		<mkdir dir="${build.location.javahelperlib}" />
-	</target>
 	<target depends="init.javahelperlib" name="build.javahelperlib">
 		<javac debug="true" debuglevel="${debuglevel}" destdir="${build.location.javahelperlib}"
@@ -137,7 +157,4 @@
 		</javac>
 	</target>
-	<target depends="init.build" name="init.jfcmonitor">
-		<mkdir dir="${build.location.jfcmonitor}" />
-	</target>
 	<target depends="init.jfcmonitor" name="build.jfcmonitor">
 		<javac debug="true" debuglevel="${debuglevel}" destdir="${build.location.jfcmonitor}"
@@ -147,4 +164,6 @@
 		</javac>
 	</target>
+	
+	<!-- Distribution Targets -->
 	<target depends="build,init.dist,javadoc" name="dist">
 		<!-- dist of main components, i.e., the console -->
@@ -178,5 +197,6 @@
 			</manifest>
 		</jar>
-		<jar destfile="${dist.location.main}/${JavaHelperLib.jarname}" basedir="${build.location.javahelperlib}">
+		<jar destfile="${dist.location.main}/${JavaHelperLib.jarname}"
+			basedir="${build.location.javahelperlib}">
 			<manifest>
 				<attribute name="Built-By" value="${user.name}" />
@@ -193,7 +213,8 @@
 			<fileset dir="${EventBenchConsole.location}/rules" />
 		</copy>
-			
+
 		<!-- dist of JFCMonitor -->
-		<jar destfile="${dist.location.jfcmonitor}/${JFCMonitor.jarname}" basedir="${build.location.jfcmonitor}">
+		<jar destfile="${dist.location.jfcmonitor}/${JFCMonitor.jarname}"
+			basedir="${build.location.jfcmonitor}">
 			<manifest>
 				<attribute name="Built-By" value="${user.name}" />
@@ -202,5 +223,5 @@
 			</manifest>
 		</jar>
-		
+
 		<!-- copy Javadoc to dist -->
 		<copy includeemptydirs="false" todir="${dist.location.javadoc}">
@@ -208,6 +229,7 @@
 		</copy>
 	</target>
-	<target name="javadoc"
-		description="o Create Javadocs (Requires Javadoc 1.4+)">
+	
+	<!-- Javadoc Targets -->
+	<target name="javadoc" description="o Create Javadocs (Requires Javadoc 1.4+)">
 		<mkdir dir="${javadoc.location}/javahelperlib" />
 		<mkdir dir="${javadoc.location}/eventbenchcore" />