Index: trunk/IDE_metadata/NetBeans/TMCSim/nbproject/project.properties
===================================================================
--- trunk/IDE_metadata/NetBeans/TMCSim/nbproject/project.properties	(revision 4)
+++ trunk/IDE_metadata/NetBeans/TMCSim/nbproject/project.properties	(revision 6)
@@ -49,5 +49,6 @@
     ${javac.classpath}:\
     ${build.classes.dir}:\
-    ${libs.junit.classpath}
+    ${libs.junit.classpath}:\
+    ${libs.junit_4.classpath}
 javac.test.processorpath=\
     ${javac.test.classpath}
Index: trunk/IDE_metadata/NetBeans/TMCSim/build.xml
===================================================================
--- trunk/IDE_metadata/NetBeans/TMCSim/build.xml	(revision 2)
+++ trunk/IDE_metadata/NetBeans/TMCSim/build.xml	(revision 6)
@@ -11,10 +11,19 @@
     <description>Builds, tests, and runs the project TMCSim.</description>
     <import file="nbproject/build-impl.xml"/>
-    <property name="workdir" value="../../.."/>    
-    <!--
+    <property name="workdir" value="../../.."/>
+<!--        STORE SUBVERSION BUILD STRING      -->
+<!-- Store the Subversion version string every time you do clean/build. -->
+<target name="-pre-compile">
+  <exec executable="svnversion"
+    output="${workdir}/config/svn-version.txt"/>
+    <echo file="${workdir}/config/svn-version.txt" append="true">
+        # Do not edit. This file is autogenerated by the Ant build script #
+    </echo>
+</target>
+<!--
                 =================
                 LOC counter 
                 =================
-     -->
+-->
 <target description="Count Lines of Code in src directory." name="loc">
         <java classname="textui.LOC"
@@ -42,9 +51,9 @@
                 PACKAGE JARS SECTION
                 =================
-     -->
+-->
 <target name="package-jars" depends="jar">
 
     <!--         *** Build a jar with everything ***            -->
-    <property name="deploy.jar.name" value="Sim305"/>
+    <property name="deploy.jar.name" value="TMCSimAll"/>
     <property name="deploy.dir" value="deploy"/>
     <property name="deploy.jar" value="${deploy.dir}/${deploy.jar.name}.jar"/>
@@ -75,5 +84,6 @@
       <jar destfile="${deploy.dir}/CADserver.jar"
        basedir="${build.dir}/classes"
-       includes="tmcsim/cadsimulator/**, tmcsim/common/**"
+       includes="tmcsim/cadsimulator/**, tmcsim/common/**, tmcsim/interfaces/**,
+                 tmcsim/client/cadclientgui/**, tmcsim/cadmodels/**"
        excludes="**/Test.class">
         <manifest>
@@ -85,5 +95,6 @@
       <jar destfile="${deploy.dir}/SimManager.jar"
        basedir="${build.dir}/classes"
-       includes="tmcsim/simulationmanager/**, tmcsim/common/**"
+       includes="tmcsim/simulationmanager/**, tmcsim/common/**, tmcsim/cadmodels/**,
+            tmcsim/client/cadclientgui/**, tmcsim/interfaces/**"
        excludes="**/Test.class">
         <manifest>
@@ -91,11 +102,24 @@
         </manifest>
       </jar>
-    
+
       <!--                   *** Build CAD Client Only Jar ***         -->
-      <jar destfile="${deploy.dir}/CADClient.jar" filesetmanifest="skip"
+      <jar destfile="${deploy.dir}/CADClient.jar"
        basedir="${build.dir}/classes"
-       includes="tmcsim/client/**, tmcsim/common/**, tmcsim/interfaces/**">
+       includes="tmcsim/client/**, tmcsim/common/**, tmcsim/interfaces/**, 
+            tmcsim/cadmodels/**">
         <manifest>
             <attribute name="Main-Class" value="tmcsim.client.CADClient"/>
+        </manifest>
+      </jar>
+      <!-- Remove the following line when we get CADClient to run 
+      <delete file="${deploy.dir}/CADClient.jar"/>-->
+      
+      <!--                   *** Build Paramics Communicator Only Jar ***         -->
+      <jar destfile="${deploy.dir}/ParamicsCommunicator.jar"
+       basedir="${build.dir}/classes"
+       includes="tmcsim/paramicscommunicator/**, tmcsim/common/**"
+       excludes="**/Test.class">
+        <manifest>
+            <attribute name="Main-Class" value="tmcsim.paramicscommunicator.ParamicsCommunicator"/>
         </manifest>
       </jar>