Changeset 382 in tmcsimulator for trunk/src

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/src/tmcsim

Files:

• application.properties (modified) (1 diff)
• cadsimulator/CADServer.java (modified) (2 diffs)
• simulationmanager/SimulationManager.java (modified) (2 diffs)

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Tue, 16 Apr 2019 11:04:30 -0700
+#Wed, 17 Apr 2019 10:55:08 -0700
 
-Application.revision=372
+Application.revision=381
 
-Application.buildnumber=132
+Application.buildnumber=134

trunk/src/tmcsim/cadsimulator/CADServer.java

@@ -68 +68 @@
 {
 
-    private static final String CONFIG_FILE_NAME = "cad_simulator_config.properties";
+    private static String CONFIG_FILE_NAME = "cad_simulator_config.properties";
     /**
      * Error logger.
@@ -425 +425 @@
             System.setProperty("CONFIG_DIR", "config");
         }
+        if (System.getProperty("PROP_FILE") != null)
+        {
+            CONFIG_FILE_NAME = System.getProperty("PROP_FILE");
+        }
         try
         {

trunk/src/tmcsim/simulationmanager/SimulationManager.java

@@ -215 +215 @@
             System.setProperty("CONFIG_DIR", "config");
         }
-
+        SimulationManager app;
         try
         {
             UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-            new SimulationManager(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME);
+            app = new SimulationManager(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME);
+            // Check if a script filename has been given as an argument
+            String arg1;
+            if (args.length > 0)
+            {
+                arg1 = args[0];
+                File scriptFile = new File("scripts"+ System.getProperty("file.separator") + arg1);
+                if (scriptFile.exists())
+                {
+                    app.loadScript(scriptFile);
+                    simManLogger.logp(Level.INFO,"SimulationManager","Main",
+                            "Sim Mgr starting with script file: " + arg1 + ".");
+                }
+                else
+                {
+                    simManLogger.logp(Level.INFO,"SimulationManager","Main",
+                            "Script file not found: " + arg1 +
+                            ". Starting with no script.");
+                }
+            }
         } catch (Exception e)
         {
@@ -230 +249 @@
             System.exit(-1);
         }
-
     }
 }