Index: /trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java =================================================================== --- /trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java (revision 658) +++ /trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java (revision 664) @@ -3,4 +3,5 @@ import java.awt.Component; import java.io.File; +import java.util.Arrays; import javax.swing.JButton; import static junit.framework.Assert.assertEquals; @@ -39,10 +40,10 @@ * Call constructors for both classes */ - public void testBothGUIs() throws ScriptException, SimulationException + public void testBothGUIs() throws ScriptException, SimulationException, InterruptedException { System.out.println("Smoke Test Sim Mgr & CADSimulator"); Window cadwindow = null; - System.setProperty("CAD_SIM_PROPERTIES", "config/cad_simulator_smoketest_config.properties"); + System.setProperty("CAD_SIM_PROPERTIES", "config/cad_server.properties"); if (System.getProperty("CAD_SIM_PROPERTIES") != null) { @@ -77,5 +78,5 @@ Window simMgrWindow = null; - System.setProperty("SIM_MGR_PROPERTIES", "config/sim_manager_smoketest_config.properties"); + System.setProperty("SIM_MGR_PROPERTIES", "config/sim_manager.properties"); if (System.getProperty("SIM_MGR_PROPERTIES") != null) { @@ -118,24 +119,46 @@ // Click "Start" win.getButton("Start").click(); - try - { - Thread.sleep(200); - } catch (Exception ex) - { - ex.printStackTrace(); - } + Thread.sleep(200); assertEquals("Running", txtSimStatus.getText()); - //List all available buttons - Component[] buttons = win.getSwingComponents(JButton.class); - for (Component comp : buttons) - { - System.out.println(comp); - } + java.util.ArrayList expectedButtons = new java.util.ArrayList(Arrays.asList("Load Script","Start","Pause","Reset","Connect to Paramics", + "Load Network","Reschedule","Trigger","Delete","Add New Incident","Divert Traffic")); + // Check for appearance of buttons in the GUI win.getButton("Load Script"); - win.getButton("Pause"); - win.getButton("Disconnect from Paramics"); win.getButton("Reset"); - win.getButton("Load Network"); + win.getButton("Add New Incident"); + win.getButton("Reschedule"); + win.getButton("Trigger"); + win.getButton("Delete"); + //Find all available buttons - obsolete, replaced by stmts above +// Component[] buttons = win.getSwingComponents(JButton.class); +// java.util.List actualButtons = Arrays.asList(buttons); +// for (Component actualBtn: actualButtons) +// { +// if (actualBtn instanceof JButton) +// { +// String btnName = ((JButton) actualBtn).getText(); +// if (btnName.length()>0) +// { +// if (expectedButtons.contains(btnName)) +// { +// expectedButtons.remove(btnName); +// } +// else +// { +// fail("GUI has an unexpected button: "+btnName); +// } +// } +// } +// } +// if (expectedButtons.size() > 0) +// { +// fail("GUI is missing a button: "+expectedButtons); +// } + + // Pause the simulation + win.getButton("Pause").click(); + Thread.sleep(200); + win.getButton("Resume"); // resume should appear when paused // Quit engine = null; Index: /trunk/test/tmcsim/highwaymodel/ConsoleTrafficDriver.java =================================================================== --- /trunk/test/tmcsim/highwaymodel/ConsoleTrafficDriver.java (revision 457) +++ /trunk/test/tmcsim/highwaymodel/ConsoleTrafficDriver.java (revision 664) @@ -19,5 +19,5 @@ /** - * A console application to drive the ATMS Server. + * A console application to drive the ATMS Server (is this really CPTMS now?). * Use for test driving the Highway Model. * Index: /trunk/test/tmcsim/highwaymodel/runtraffic.bash =================================================================== --- /trunk/test/tmcsim/highwaymodel/runtraffic.bash (revision 457) +++ /trunk/test/tmcsim/highwaymodel/runtraffic.bash (revision 664) @@ -1,5 +1,5 @@ #!/bin/bash -java -DATMSDRIVER_PROPERTIES=config/console_driver_config.properties -jar deploy/ConsoleTrafficDriver.jar << EOF +java -DATMSDRIVER_PROPERTIES=config/test_trafficdriver.properties -jar deploy/ConsoleTrafficDriver.jar << EOF 5 S 10 24.0 Y A Index: /trunk/test/tmcsim/paramicslog/ParamicsLogFileHandlerTest.java =================================================================== --- /trunk/test/tmcsim/paramicslog/ParamicsLogFileHandlerTest.java (revision 422) +++ /trunk/test/tmcsim/paramicslog/ParamicsLogFileHandlerTest.java (revision 664) @@ -33,5 +33,5 @@ super.setUp(); } - String propsfile = "config/paramics_communicator_logging.properties"; + String propsfile = "config/logging_paramics_communicator.properties"; /** @@ -43,5 +43,5 @@ try { - new CADServer("config/cad_simulator_console_config.properties"); + new CADServer("config/cad_server_console.properties"); } catch (Exception e) { Index: /trunk/test/tmcsim/paramicslog/ParamicsLogRMITestSkeleton.java =================================================================== --- /trunk/test/tmcsim/paramicslog/ParamicsLogRMITestSkeleton.java (revision 422) +++ /trunk/test/tmcsim/paramicslog/ParamicsLogRMITestSkeleton.java (revision 664) @@ -34,5 +34,5 @@ super.setUp(); } - String propsfile = "config/paramics_communicator_logging.properties"; + String propsfile = "config/logging_paramics_communicator.properties"; /** @@ -44,5 +44,5 @@ try { - CADServer engine = new CADServer("config/cad_simulator_console_config.properties"); + CADServer engine = new CADServer("config/cad_server_console.properties"); } catch (Exception e) { Index: /trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java =================================================================== --- /trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java (revision 658) +++ /trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java (revision 664) @@ -78,5 +78,5 @@ try { - app = new CADServer(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + "cad_simulator_config.properties"); + app = new CADServer(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + "cad_server.properties"); } catch (Exception e) Index: /trunk/test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java =================================================================== --- /trunk/test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java (revision 455) +++ /trunk/test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java (revision 664) @@ -30,5 +30,5 @@ { super.setUp(); - viewer = new CADServerViewer("config/cad_simulator_config.properties"); + viewer = new CADServerViewer("config/cad_server.properties"); cadwindow = new Window(viewer); model = new CADSimulatorState(); Index: /trunk/test/tmcsim/cadsimulator/viewer/CADConsoleViewerTest.java =================================================================== --- /trunk/test/tmcsim/cadsimulator/viewer/CADConsoleViewerTest.java (revision 657) +++ /trunk/test/tmcsim/cadsimulator/viewer/CADConsoleViewerTest.java (revision 664) @@ -28,5 +28,5 @@ { super.setUp(); - console = new CADConsoleViewer("config/cad_simulator_config.properties"); + console = new CADConsoleViewer("config/cad_server.properties"); cadmodel = new CADSimulatorState(); cadmodel.addObserver(console); Index: /trunk/test/tmcsim/cadsimulator/SystemTest.java =================================================================== --- /trunk/test/tmcsim/cadsimulator/SystemTest.java (revision 658) +++ /trunk/test/tmcsim/cadsimulator/SystemTest.java (revision 664) @@ -19,5 +19,5 @@ /** * System test (include CADSimulator) with emulated Paramics Modeler NO ATMS - * server captures GUI display using UISpec4J. + * server. Captures GUI display using UISpec4J. * * @author jdalbey @@ -54,5 +54,5 @@ try { - engine = new CADServer("config/cad_simulator_config.properties"); + engine = new CADServer("config/cad_server.properties"); } catch (Exception e) { @@ -82,5 +82,5 @@ try { - simMgrApp = new SimulationManager("config/sim_manager_systest_config.properties"); + simMgrApp = new SimulationManager("config/sim_manager.properties"); } catch (Exception ex) { Index: /trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java =================================================================== --- /trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java (revision 658) +++ /trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java (revision 664) @@ -31,5 +31,8 @@ + "ParamicsProperties = pconfig.txt\n" + "ATMSProperties = empty.txt\n" - + "MediaProperties = empty.txt\n"; + + "MediaProperties = empty.txt\n" + + "TrafficMgrProperties = config/traffic_model_config/traffic_model_config.properties\n" + + "ElapsedTimeFile = webapps/dynamicdata/sim_elapsedtime.json\n" + + "CADcommentsLog = webapps/dynamicdata/CADcomments.log\n"; static final String paramicsData = "ParamicsCommHost = 192.168.251.45\n" + "ParamicsCommPort = 4450\n" Index: /trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java =================================================================== --- /trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java (revision 658) +++ /trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java (revision 664) @@ -53,5 +53,5 @@ try { - engine = new CADServer("config/cad_simulator_console_config.properties"); + engine = new CADServer("config/cad_server_console.properties"); } catch (Exception e) { @@ -74,5 +74,5 @@ try { - simMgrApp = new SimulationManager("config/sim_manager_systest_config.properties"); + simMgrApp = new SimulationManager("config/sim_manager.properties"); } catch (Exception ex) { Index: unk/test/tmcsim/cadsimulator/VisibleSystemDemoDriver.java =================================================================== --- /trunk/test/tmcsim/cadsimulator/VisibleSystemDemoDriver.java (revision 658) +++ (revision ) @@ -1,203 +1,0 @@ -package tmcsim.cadsimulator; - -import java.io.File; -import java.io.FileWriter; -import java.io.PrintWriter; -import java.rmi.RemoteException; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.fail; -import org.uispec4j.*; -import org.uispec4j.interception.WindowInterceptor; -import tmcsim.common.ScriptException; -import tmcsim.common.SimulationException; -import tmcsim.paramicscommunicator.ParamicsCommunicator; -import tmcsim.paramicscommunicator.gui.ParamicsCommunicatorGUI; -import tmcsim.simulationmanager.SimulationManager; -import static tmcsim.simulationmanager.SimulationManager.SCENARIOS_DIR; - -/** - * Requires manual starting CADSimulator before running this test. System test - * with emulated Paramics Modeler NO ATMS server. - * - * @author jdalbey - */ -public class VisibleSystemDemoDriver extends UISpecTestCase -{ - - SimulationManager simMgrApp; - - public VisibleSystemDemoDriver(String testName) - { - super(testName); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - } - - /** - * Test of run method, of class ParamicsCommunicator. - */ - public void testRun() throws ScriptException, SimulationException, RemoteException - { - System.out.println("Visible System Test starting."); - // NOTE: CADSimulator must be started prior to running this test, - // because it displays a GUI, and if we try to do it inside this test, - // UISpec will complain about an uncaught window appearing. - - ParamicsCommunicator pc = null; - pc = new ParamicsCommunicator("config/paramics_communicator_config.properties"); - ParamicsCommunicatorGUI theGUI = new ParamicsCommunicatorGUI(); - pc.setGUI(theGUI); - // Note: Don't set visible ANY windows during UISpec test - - // expect pcomm to say "sleeping" - - Window simMgrWindow = null; - simMgrWindow = WindowInterceptor.run(new Trigger() - { - public void run() - { - try - { - simMgrApp = new SimulationManager("config/sim_manager_systest_config.properties"); - } catch (Exception ex) - { - fail("Couldn't launch Simulation Manager, perhaps CADSimulator isn't running."); - } - } - }); - - // Check that the Sim Mgr GUI appears without a script loaded yet - Panel contentPanel = simMgrWindow.getPanel("contentPane"); - TextBox txtSimStatus = contentPanel.getTextBox("simulationStatusText"); - assertEquals("No Script", txtSimStatus.getText()); - TextBox txtParamStatus = contentPanel.getTextBox("paramicsStatusInfoLabel"); - assertEquals("Unknown", txtParamStatus.getText()); - Button loadNetworkBtn = simMgrWindow.getButton("Load Network"); - assertFalse(loadNetworkBtn.isEnabled()); - // Begin actions - Button paramicsBtn = simMgrWindow.getButton("Connect to Paramics"); - paramicsBtn.click(); - try - { - Thread.sleep(200); - } catch (Exception ex) - { - } - assertEquals("Disconnect from Paramics", paramicsBtn.getLabel()); - - assertEquals("Connected", txtParamStatus.getText()); - pc.startReading(); - - loadNetworkBtn.click(); - try - { - Thread.sleep(200); - } catch (Exception ex) - { - } - assertEquals("Sending Network ID", txtParamStatus.getText()); - System.out.println("Sending Network ID"); - assertFalse(loadNetworkBtn.isEnabled()); - String warmingXML = "\n" - + "WARMING\n" - + "1\n" - + ""; - writedata("paramics_status.xml", warmingXML); - try - { - Thread.sleep(2100); - } catch (Exception ex) - { - } - assertEquals("Warming Up", txtParamStatus.getText()); - System.out.println("Warming Up Passed"); - - try - { - Thread.sleep(2100); - } catch (Exception ex) - { - } - String loadedXML = "\n" - + "LOADED" - + "1" - + ""; - writedata("paramics_status.xml", loadedXML); - try - { - Thread.sleep(2100); - } catch (Exception ex) - { - } - assertEquals("Network 1 Loaded", txtParamStatus.getText()); - System.out.println("Network Loaded Passed"); - - // Load a script file - String autoloadScriptname = SCENARIOS_DIR+"/audio_systest.xml"; - simMgrApp.loadScript(new File(autoloadScriptname)); - try - { - Thread.sleep(500); - } catch (Exception ex) - { - } - - // The status should now say Ready - assertEquals("Ready", txtSimStatus.getText()); - - // Click "Start" - simMgrWindow.getButton("Start").click(); - try - { - Thread.sleep(200); - } catch (Exception ex) - { - ex.printStackTrace(); - } - assertEquals("Running", txtSimStatus.getText()); - System.out.println("Running Passed"); - try - { - Thread.sleep(9000); - } catch (InterruptedException ex) - { - } - simMgrWindow.getButton("Pause").click(); - try - { - Thread.sleep(3000); - } catch (InterruptedException ex) - { - } - simMgrWindow.getButton("Start").click(); - try - { - Thread.sleep(3000); - } catch (InterruptedException ex) - { - } - simMgrWindow.getButton("Pause").click(); - simMgrWindow.getMenuBar().getMenu("File").getSubMenu("Exit").click(); - System.out.println("Exiting."); - } - - // Write the test data to a file - public static void writedata(String filename, String data) - { -// System.out.println("writedata called for " + filename); - PrintWriter writer = null; - try - { - writer = new PrintWriter(new FileWriter(filename)); - writer.println(data); - writer.close(); - } catch (Exception ex) - { - ex.printStackTrace(); - } - } -} Index: /trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/Sim_Mgr.properties =================================================================== --- /trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/Sim_Mgr.properties (revision 14) +++ /trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/Sim_Mgr.properties (revision 664) @@ -1,3 +1,3 @@ $label=Sim Mgr main.class=tmcsim.simulationmanager.SimulationManager -run.jvmargs=-DSIM_MGR_PROPERTIES=config/sim_manager_config.properties +run.jvmargs=-DSIM_MGR_PROPERTIES=config/sim_manager.properties Index: /trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/CADServer_Console.properties =================================================================== --- /trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/CADServer_Console.properties (revision 523) +++ /trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/CADServer_Console.properties (revision 664) @@ -1,3 +1,2 @@ $label=CADServer Console -main.class=tmcsim.cadsimulator.CADServer -run.jvmargs=-DPROP_FILE=cad_simulator_console_config.properties +run.jvmargs=-DPROP_FILE=cad_server_console.properties Index: /trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/CADClient.properties =================================================================== --- /trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/CADClient.properties (revision 384) +++ /trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/CADClient.properties (revision 664) @@ -1,2 +1,2 @@ main.class=tmcsim.client.CADClient -run.jvmargs=-Djava.util.logging.config.file=config/cad_client_logging.properties +run.jvmargs=-Djava.util.logging.config.file=config/logging_cad_client.properties Index: /trunk/src/tmcsim/cadsimulator/CADServer.java =================================================================== --- /trunk/src/tmcsim/cadsimulator/CADServer.java (revision 654) +++ /trunk/src/tmcsim/cadsimulator/CADServer.java (revision 664) @@ -27,41 +27,18 @@ /** - * CADSimulator is main class for the CAD Simulator application. At construction - * the Coordinator, CoordinatorViewer, and all CAD Simulator Managers are + * CADServer is main class for the CAD Simulator application. + * CADServer must be running before starting any other components of the TMCSim. + * At construction the Coordinator, CoordinatorViewer, and all CAD Simulator Managers are * initialized and data relationships are established. Simulation control is - * managed through the Coordinator and Managers. The CADSimulator contains the + * managed through the Coordinator and Managers. The CADServer contains the * instances of all Manager Objects that are used to control the Simulation flow * of data.
+ * There is a GUI (and for testing, a text-based UI) that displays the state + * of the server. *
+ * A properties file contains settings for many parameters of the CADServer
* - * The CADSimulator is initialized with a properties file containing the - * following data items:
- * - * -----------------------------------------------------------------------------
- * CADClientPort The port number to use for remote CAD Client connections.
- * CoordinatorRMIPort The port number to use for binding the Coordinator.
- * CMSDiversionXML The filepath for the xml file containing initialization data - * for the Diversion "database." AudioFileLocation The root directory path where - * audio files are referenced from.
- * ParamicsProperties The filepath for the properties file to initialize the - * ParamicsControlManager.
- * ATMSProperties The filepath for the properties file to initialize the - * ATMSManager.
- * MediaProperties The filepath for the properties file to initialize the - * MediaManager.
- * ErrorFile The filename of the error file used for logging errors.
- * ----------------------------------------------------------------------------
- * Example File:
- * CADClientPort = 4444
- * CoordinatorRMIPort = 4445
- * CMSDiversionXML = ../data/cmsdiversions.xml
- * AudioFileLocation = ../audio/
- * ParamicsProperties = ../config/paramics.properties
- * ATMSProperties = ../config/atms.properties
- * MediaProperties = ../config/media.properties
- * ErrorFile = cad_sim_error.xml
- * - * - * @author Matthew Cechini (mcechini@calpoly.edu) jdalbey + * @author Matthew Cechini (mcechini@calpoly.edu) + * @author John Dalbey (jdalbey@calpoly.edu) * @version $Date: 2009/04/17 16:27:46 $ $Revision: 1.5 $ */ @@ -69,5 +46,5 @@ { - private static String CONFIG_FILE_NAME = "cad_simulator_config.properties"; + private static String CONFIG_FILE_NAME = "cad_server.properties"; /** * Error logger. @@ -76,5 +53,5 @@ /** - * Enumeration containing properties name values. See CADSimulator class + * Enumeration containing properties name values. See CADServer class * description for more information. * @@ -149,5 +126,5 @@ /** NOTE: Protected fields are accessed by Coordinator */ /** - * CADSimulatorViewer instance. + * CADServerViewer instance. */ protected static CADViewer theViewer; @@ -189,5 +166,5 @@ /** - * Properties file for the CADSimulator. + * Properties file for the CADServer, read from CONFIG_FILE_NAME. */ private Properties cadServerProperties; @@ -211,9 +188,9 @@ cadServerProperties = new Properties(); cadServerProperties.load(new FileInputStream(propertiesFile)); - cadSimLogger.logp(Level.INFO, "CADSimulator", "Constructor", + cadSimLogger.logp(Level.INFO, "CADServer", "Constructor", "Properties loaded from " + propertiesFile); } catch (Exception e) { - cadSimLogger.logp(Level.SEVERE, "CADSimulator", "Constructor", + cadSimLogger.logp(Level.SEVERE, "CADServer", "Constructor", "Exception in reading properties file.", e); JOptionPane.showMessageDialog(new JWindow(), e.getMessage() + @@ -233,5 +210,5 @@ if (userInterfaceName == null) { - cadSimLogger.logp(Level.SEVERE, "CADSimulator", "Constructor", + cadSimLogger.logp(Level.SEVERE, "CADServer", "Constructor", propertiesFile + " missing property for user interface."); throw new SimulationException(SimulationException.PROPERTY_MISSING_ERROR); @@ -244,5 +221,5 @@ } catch (Exception exc) { - cadSimLogger.logp(Level.SEVERE, "CADSimulator", "Constructor", + cadSimLogger.logp(Level.SEVERE, "CADServer", "Constructor", "Unable to instantiate user interface: " + userInterfaceName + " " + exc); @@ -257,5 +234,5 @@ if (simTimeFilename == null) { - cadSimLogger.logp(Level.SEVERE, "CADSimulator", "Constructor", + cadSimLogger.logp(Level.SEVERE, "CADServer", "Constructor", propertiesFile + " missing property for " + CAD_PROPERTIES.ELAPSED_TIME_FILE.name); throw new SimulationException(SimulationException.PROPERTY_MISSING_ERROR); @@ -267,5 +244,5 @@ if (commentLogname == null) { - cadSimLogger.logp(Level.SEVERE, "CADSimulator", "Constructor", + cadSimLogger.logp(Level.SEVERE, "CADServer", "Constructor", propertiesFile + " missing property for " + CAD_PROPERTIES.CAD_COMMENTS_LOG.name); throw new SimulationException(SimulationException.PROPERTY_MISSING_ERROR); @@ -317,5 +294,5 @@ } catch (RemoteException e) { - cadSimLogger.logp(Level.SEVERE, "CADSimulator", "Constructor", + cadSimLogger.logp(Level.SEVERE, "CADServer", "Constructor", "Exception in starting Coordinator.", e); @@ -336,5 +313,5 @@ } catch (Exception e) { - cadSimLogger.logp(Level.SEVERE, "CADSimulator", "Constructor", + cadSimLogger.logp(Level.SEVERE, "CADServer", "Constructor", "Exception in parsing CMSDiversion xml file.", e); @@ -472,5 +449,5 @@ } catch (Exception e) { - cadSimLogger.logp(Level.SEVERE, "CADSimulator", "Main", + cadSimLogger.logp(Level.SEVERE, "CADServer", "Main", "Error initializing application.", e); Index: /trunk/src/tmcsim/cadsimulator/CADClientConnector.java =================================================================== --- /trunk/src/tmcsim/cadsimulator/CADClientConnector.java (revision 660) +++ /trunk/src/tmcsim/cadsimulator/CADClientConnector.java (revision 664) @@ -107,4 +107,9 @@ catch (ClassNotFoundException cnfe) { cnfe.printStackTrace(); + } + catch (java.io.EOFException except) + { + cadLogger.logp(Level.INFO, "CADClientConnector", "run", "Client appears to have shutdown, removing client.\n"); + disconnectClient(); } catch (SocketException except) Index: /trunk/src/tmcsim/cadsimulator/viewer/ConfigStatusTab.java =================================================================== --- /trunk/src/tmcsim/cadsimulator/viewer/ConfigStatusTab.java (revision 455) +++ /trunk/src/tmcsim/cadsimulator/viewer/ConfigStatusTab.java (revision 664) @@ -132,5 +132,5 @@ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); frame.setSize(1050, 450); - ConfigStatusTab pnl = new ConfigStatusTab("config/cad_simulator_config.properties"); + ConfigStatusTab pnl = new ConfigStatusTab("config/cad_server.properties"); frame.add(pnl); frame.setVisible(true); Index: /trunk/src/tmcsim/simulationmanager/SimulationManager.java =================================================================== --- /trunk/src/tmcsim/simulationmanager/SimulationManager.java (revision 658) +++ /trunk/src/tmcsim/simulationmanager/SimulationManager.java (revision 664) @@ -22,21 +22,10 @@ * communicator and applying diversions. A history of all events is shown as * well.
- * The SimulationManager may be started at any point before, during, or after a - * simulation has begun. The SimulationManager connects to the CADSimulator and + * The CADServer must be running before the SimulationManager is started. + * SimulationManager connects to the CADServer and * communicates through Java RMI methods. If two SimulationManagers are started, * the second one started, chronologically, will receive communication from the - * CADSimulator.

- * The properties file for the SimulationManager class contains the following - * data.
- * - * -----------------------------------------------------------------------------
- * Host Name The host name where the CADSimulator is located.
- * Error File The target file to use for error logging.
- * -----------------------------------------------------------------------------
- * Example File:
- * CADSimulatorHost = localhost
- * ErrorFile = sim_mgr_error.xml
- * -----------------------------------------------------------------------------
- * + * CADServer. (It's a bad idea to do this, there's no normal use case + * that requires it.)

* * @author Matthew Cechini (mcechini@calpoly.edu) @@ -46,5 +35,5 @@ { - private static final String CONFIG_FILE_NAME = "sim_manager_config.properties"; + private static final String CONFIG_FILE_NAME = "sim_manager.properties"; /* * Default name of folder that contains Scenario xml files. @@ -65,6 +54,6 @@ { - CAD_SIM_HOST("CADSimulatorHost"), - CAD_SIM_PORT("CADSimulatorRMIPort"), + CAD_SERVER_HOST("CADServerHost"), + CAD_SERVER_PORT("CADServerRMIPort"), SCENARIOS_DIR("ScenariosDir"), FAKE_PARAMICS("FakeParamicsConnection"); @@ -116,10 +105,10 @@ //make sure properties aren't null - if (simManagerProperties.getProperty(PROPERTIES.CAD_SIM_HOST.name) == null) + if (simManagerProperties.getProperty(PROPERTIES.CAD_SERVER_HOST.name) == null) { throw new Exception("CAD Simulator host property is null."); } - if (simManagerProperties.getProperty(PROPERTIES.CAD_SIM_PORT.name) == null) + if (simManagerProperties.getProperty(PROPERTIES.CAD_SERVER_PORT.name) == null) { throw new Exception("CAD Simulator port property is null."); @@ -138,6 +127,6 @@ { theSimManagerModel = new SimulationManagerModel( - simManagerProperties.getProperty(PROPERTIES.CAD_SIM_HOST.name).trim(), - simManagerProperties.getProperty(PROPERTIES.CAD_SIM_PORT.name).trim()); + simManagerProperties.getProperty(PROPERTIES.CAD_SERVER_HOST.name).trim(), + simManagerProperties.getProperty(PROPERTIES.CAD_SERVER_PORT.name).trim()); //Construct the SimulationManagerView and set up the Model-View references. Index: /trunk/src/tmcsim/paramicslog/ParamicsLogFileHandler.java =================================================================== --- /trunk/src/tmcsim/paramicslog/ParamicsLogFileHandler.java (revision 47) +++ /trunk/src/tmcsim/paramicslog/ParamicsLogFileHandler.java (revision 664) @@ -88,5 +88,5 @@ public static ParamicsLogFileHandler getInstance() throws IOException { - System.setProperty("PARAMICS_LOG_PROPERTIES", "config/paramics_communicator_logging.properties"); + System.setProperty("PARAMICS_LOG_PROPERTIES", "config/logging_paramics_communicator.properties"); // Has an instance been created yet? if (instance == null) Index: /trunk/src/tmcsim/paramicslog/ParamicsLog.java =================================================================== --- /trunk/src/tmcsim/paramicslog/ParamicsLog.java (revision 47) +++ /trunk/src/tmcsim/paramicslog/ParamicsLog.java (revision 664) @@ -56,5 +56,5 @@ } } - private static final String CONFIG_FILE_NAME = "paramics_communicator_logging.properties"; + private static final String CONFIG_FILE_NAME = "logging_paramics_communicator.properties"; /** * Error logger.