Index: trunk/IDE_metadata/NetBeans/TMCSim/nbproject/project.properties
===================================================================
--- trunk/IDE_metadata/NetBeans/TMCSim/nbproject/project.properties	(revision 51)
+++ trunk/IDE_metadata/NetBeans/TMCSim/nbproject/project.properties	(revision 59)
@@ -28,4 +28,5 @@
 endorsed.classpath=
 excludes=
+file.reference.commons-lang-2.4.jar=../../../lib/commons-lang-2.4.jar
 file.reference.jaco-mp3-player-0.9.3.jar=../../../lib/jaco-mp3-player-0.9.3.jar
 file.reference.mockito-1.10.19.jar=../../../lib/mockito-1.10.19.jar
@@ -33,13 +34,14 @@
 file.reference.tmc-simulator-test=../../../test
 file.reference.uispec4j-jdk17.jar=../../../lib/uispec4j-jdk17.jar
-file.reference.xercesImpl.jar=../../../src/tmcsim/cadsimulator/CADSimulator_lib/xercesImpl.jar
+file.reference.xercesImpl.jar=../../../lib/xercesImpl.jar
 includes=**
 jar.compress=false
 javac.classpath=\
+    ${file.reference.uispec4j-jdk17.jar}:\
     ${file.reference.xercesImpl.jar}:\
-    ${file.reference.uispec4j-jdk17.jar}:\
+    ${file.reference.jaco-mp3-player-0.9.3.jar}:\
     ${file.reference.mockito-1.10.19.jar}:\
-    ${libs.junit_4.classpath}:\
-    ${file.reference.jaco-mp3-player-0.9.3.jar}
+    ${file.reference.commons-lang-2.4.jar}:\
+    ${libs.junit_4.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=
@@ -56,5 +58,5 @@
     ${javac.test.classpath}
 javadoc.additionalparam=
-javadoc.author=false
+javadoc.author=true
 javadoc.encoding=${source.encoding}
 javadoc.noindex=false
@@ -64,5 +66,5 @@
 javadoc.splitindex=true
 javadoc.use=true
-javadoc.version=false
+javadoc.version=true
 javadoc.windowtitle=
 main.class=tmcsim.cadsimulator.CADSimulator
Index: trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/Console.properties
===================================================================
--- trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/Console.properties	(revision 59)
+++ trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/Console.properties	(revision 59)
@@ -0,0 +1,1 @@
+run.jvmargs=-DCAD_SIM_PROPERTIES=config/cad_simulator_consoletest_config.properties
Index: trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/CADClient.properties
===================================================================
--- trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/CADClient.properties	(revision 59)
+++ trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/CADClient.properties	(revision 59)
@@ -0,0 +1,1 @@
+main.class=tmcsim.client.CADClient
Index: trunk/IDE_metadata/NetBeans/TMCSim/build.xml
===================================================================
--- trunk/IDE_metadata/NetBeans/TMCSim/build.xml	(revision 56)
+++ trunk/IDE_metadata/NetBeans/TMCSim/build.xml	(revision 59)
@@ -12,4 +12,55 @@
     <import file="nbproject/build-impl.xml"/>
     <property name="workdir" value="../../.."/>
+<!--        SYSTEM TEST SECTION      -->
+    <target description="CAD Simulator" name="cadsimulator">
+    <antcall target="run-single">
+       <param name="javac.includes" value="tmcsim/cadsimulator/CADSimulator.java"/>
+       <param name="run.class" value="tmcsim/cadsimulator/CADSimulator"/>
+    </antcall>
+    </target>
+    <target description="Visible System Test of CADSimulator"  name="VisibleSystemTest">
+    <antcall target="test-single">
+       <param name="javac.includes" value="tmcsim/cadsimulator/VisibleSystemTest.java"/>
+       <param name="test.includes" value="tmcsim/cadsimulator/VisibleSystemTest.java"/>
+    </antcall>
+    </target>
+    <target description="CAD Simulator - console" name="cadconsole">
+        <java jar="deploy/CADserver.jar"
+           fork="true">
+         <classpath>
+           <pathelement location="deploy/CADserver.jar"/>
+         </classpath>
+       </java>
+    </target>
+    <target description="CAD Simulator - GUI" name="cadgui">
+        <java jar="deploy/CADserver.jar"
+           fork="true"><jvmarg value="-version"/>
+         <classpath>
+           <pathelement location="deploy/CADserver.jar"/>
+         </classpath>
+       </java>
+    </target>
+    <target description="Run Paramics Communicator" name="pcomm">
+    <antcall target="run-single">
+       <param name="javac.includes" value="tmcsim/paramicscommunicator/PComm.java"/>
+       <param name="run.class" value="tmcsim/paramicscommunicator/PComm"/>
+    </antcall>
+    </target>
+    <target description="Run Simulation Manager" name="simmgr">
+    <antcall target="run-single">
+       <param name="javac.includes" value="tmcsim/simulationmanager/SimulationManager.java"/>
+       <param name="run.class" value="tmcsim/simulationmanager/SimulationManager"/>
+    </antcall>
+    </target>
+    <target description="Emulate Paramics Modeler" name="emulate">
+        <echo file="${workdir}/paramics_status.xml" append="false">
+            &lt;Paramics&gt; &lt;Network_Status&gt;WARMING&lt;/Network_Status&gt; &lt;Network_ID&gt;1&lt;/Network_ID&gt; &lt;/Paramics&gt;
+        </echo>
+        <sleep seconds="5"/>
+        <echo file="${workdir}/paramics_status.xml" append="false">
+            &lt;Paramics&gt; &lt;Network_Status&gt;LOADED&lt;/Network_Status&gt; &lt;Network_ID&gt;1&lt;/Network_ID&gt; &lt;/Paramics&gt;
+        </echo>
+    </target>
+
 <!--        STORE SUBVERSION BUILD STRING      -->
 <target name="-post-init" description="Sets the buildversion for the current build">
@@ -60,6 +111,31 @@
             />
 </checkstyle>
-</target>     
-   
+</target>
+<!--
+                =================
+                ZIP for Web-CAT SECTION for CPE 305 assignments
+                =================
+Create a zip file of source to CADSimulator for submission to Web-CAT grader.
+-->
+<target name="webcat-zip" depends="jar">
+
+    <zip destfile="${workdir}/webcatsubmit.zip">
+        <fileset dir="${workdir}/src/">
+                 <include name="tmcsim/cadsimulator/viewer/**/*.java" />
+                 <include name="tmcsim/cadsimulator/viewer/model/**/*.java" />
+                 <include name="tmcsim/cadsimulator/viewer/actions/**/*.java" />
+                 <include name="tmcsim/cadsimulator/videocontrol/**/*.java" />
+                 <exclude name="tmcsim/paramics*/**"/>
+                 <exclude name="tmcsim/simulationmanager/**"/>
+                 <exclude name="tmcsim/cadsimulator/MP3Driver.java"/>
+        </fileset>
+        <!--
+        <fileset dir="${workdir}"  includes="scripts/Cardfile.xml"/>
+        -->
+        <fileset dir="${workdir}/test/">
+                 <include name="tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java" />
+        </fileset>
+    </zip>
+</target>
 <!--
                 =================
@@ -79,5 +155,7 @@
     <delete dir="${deploy.dir}"/>
     <mkdir dir="${deploy.dir}"/>
-
+    <tstamp>
+        <format property="TODAY" pattern="yyyy.MM.dd HH:mm" />
+    </tstamp>
     <jar destfile="${deploy.dir}/temp_final.jar" filesetmanifest="skip">
         <zipgroupfileset dir="dist" includes="*.jar"/>
@@ -125,9 +203,10 @@
       <jar destfile="${deploy.dir}/CADClient.jar"
        basedir="${build.dir}/classes"
-       includes="tmcsim/client/**, tmcsim/common/**, tmcsim/interfaces/**, 
-            tmcsim/cadmodels/**">
-        <zipgroupfileset dir="dist/lib" includes="xercesImpl.jar"/>
+       includes="tmcsim/client/**, tmcsim/common/**, tmcsim/interfaces/**,
+            tmcsim/cadmodels/**, tmcsim/simulationmanager/model/LogEntryCellRenderer.class">
+      <zipgroupfileset dir="dist/lib" includes="xercesImpl.jar"/>
         <manifest>
             <attribute name="Main-Class" value="tmcsim.client.CADClient"/>
+            <attribute name="Implementation-Version" value="${TODAY}"/>
         </manifest>
       </jar>