Changeset 382 in tmcsimulator for trunk/IDE_metadata/NetBeans/TMCSim

Timestamp:

04/17/2019 04:15:29 PM (7 years ago)

Author:

jdalbey

Message:

CADserver.java modified to look for a system property PROP_FILE provided at the command line so it's property file can be provided dynamically. SimulationManager?.java modified to accept an optional command line argument, the name of the script file to load when the pgm launches. Create a bin folder with shell scripts to start the complete system in different configurations.

Location:

trunk/IDE_metadata/NetBeans/TMCSim

Files:

• build.xml (modified) (4 diffs)
• nbproject/project.properties (modified) (1 diff)

trunk/IDE_metadata/NetBeans/TMCSim/build.xml

@@ -25 +25 @@
     </antcall>
     </target>
-    <target description="CAD Simulator - console" name="cadconsole">
+    <target description="CAD Server - console" name="cadconsole">
         <java jar="deploy/CADserver.jar"
            fork="true">
@@ -33 +33 @@
        </java>
     </target>
-    <target description="CAD Simulator - GUI" name="cadgui">
+    <target description="CAD Server - GUI" name="cadgui">
         <java jar="deploy/CADserver.jar"
            fork="true"><jvmarg value="-version"/>
@@ -201 +201 @@
 
       <!--                   *** Build CAD Client Only Jar ***         -->
-      <jar destfile="${deploy.dir}/CADClient_r${svna.version}.jar"
+      <jar destfile="${deploy.dir}/CADclient_r${svna.version}.jar"
        basedir="${build.dir}/classes"
        includes="tmcsim/client/**, tmcsim/common/**, tmcsim/interfaces/**,
@@ -238 +238 @@
       </jar>
       
-      <!--                   *** ATMS Batch Driver Only Jar ***         -->
-      <jar destfile="${deploy.dir}/ATMSBatchDriver.jar"
-       basedir="${build.dir}/classes"
-       includes="tmcsim/client/**, tmcsim/common/**, tmcsim/interfaces/**,
-                 tmcsim/client/cadclientgui/**, tmcsim/cadmodels/**,
-                 atmsdriver/**, atmsdriver/model/**"
-       excludes="**/Test.class">
-        <zipgroupfileset dir="dist/lib" includes="xercesImpl.jar"/>
-        <manifest>
-            <attribute name="Main-Class" value="tmcsim/client/ATMSBatchDriver"/>
-        </manifest>
-      </jar>
       <!--                   *** Console Traffic Driver Only Jar ***         -->
       <jar destfile="${deploy.dir}/ConsoleTrafficDriver.jar"

trunk/IDE_metadata/NetBeans/TMCSim/nbproject/project.properties

@@ -48 +48 @@
 debug.classpath=${run.classpath}
 file.reference.commons-lang-2.4.jar=../../../lib/commons-lang-2.4.jar
-run.jvmargs=-DCONFIG_DIR\=config/testConfig
 javac.test.classpath=\
     ${javac.classpath}:\