Index: trunk/config/cad_server_atms.properties =================================================================== --- trunk/config/cad_server_atms.properties (revision 662) +++ trunk/config/cad_server_atms.properties (revision 662) @@ -0,0 +1,5 @@ +# Referenced in cad_server.properties +ATMSHost = 192.168.251.27 +Username = atms_mgr +Password = atms_d12uci1 +ImageDir = /opt/d12uci/user_config/cctv Index: trunk/config/cad_client_config.properties =================================================================== --- trunk/config/cad_client_config.properties (revision 533) +++ trunk/config/cad_client_config.properties (revision 662) @@ -1,4 +1,4 @@ -# -#Wed Apr 05 13:48:05 PDT 2006 +# Config settings for CAD Clients + CADPosition = 2 CADSimulatorHost = 127.0.0.1 Index: trunk/config/cad_server_systest.properties =================================================================== --- trunk/config/cad_server_systest.properties (revision 662) +++ trunk/config/cad_server_systest.properties (revision 662) @@ -0,0 +1,20 @@ +# For system testing, this config specifies a special traffic model. +# Everything else is the same as the default config. +# Referenced by: bin/systemstart_systest.bat and .sh + +TrafficMgrProperties = config/traffic_model_config/systest.properties + +UserInterface = tmcsim.cadsimulator.viewer.CADServerViewer + +CADClientPort = 4444 +CoordinatorRMIPort = 4445 +CADRmiPort = 4446 +AudioFileLocation = Scenarios/Audio/ +ElapsedTimeFile = webapps/dynamicdata/sim_elapsedtime.json +CADcommentsLog = webapps/dynamicdata/CADcomments.log +CMSDiversionXML = config/cmsdiversions.xml + +MediaProperties = config/cad_server_media.properties +ParamicsProperties = config/cad_server_paramics.properties +ATMSProperties = config/cad_server_atms.properties + Index: trunk/config/cad_server_media.properties =================================================================== --- trunk/config/cad_server_media.properties (revision 662) +++ trunk/config/cad_server_media.properties (revision 662) @@ -0,0 +1,3 @@ +# Referenced in cad_server.properties +#DVDPlayerXML = config/dvdplayers.xml +StillImagesXML = config/stillimages.xml Index: trunk/config/00README.TXT =================================================================== --- trunk/config/00README.TXT (revision 662) +++ trunk/config/00README.TXT (revision 662) @@ -0,0 +1,39 @@ +Config folder README +2022.09.14 + +This folder contains configuration files for TMCSim. + +Files prefixed with "logging" are java.uti.logging properties, +but I think the only ones actually being used are: + logging_cad_client.properties + logging_paramics_communicator.properties + + +Config files for specific applications begin with the program name: + cad_server, cad_client, sim_mgr. + +Config files used during testing are prefixed with 'test'. + +Settings for subsystems: + cadUsers.xml + camera_control.txt + cmsdiversions.xml + dvdplayers.xml + stillimages.xml + +application_properties.cfg + Created during build, has the Subversion revision number. + +student_names.txt + Modify this each training, it contains the names of the participants + in the training. Used by Neil's Activity Log AND CAD Client. + + +ATMS config and Paramics config: These are no longer a visible part of + the simulation, but are still referenced. Should be removed, eventually. + atms_driver_config_local.properties + atms_driver_config.properties + paramics_communicator_config.properties + paramics_simulator_config.properties + + Index: trunk/config/cad_server_defect118.properties =================================================================== --- trunk/config/cad_server_defect118.properties (revision 662) +++ trunk/config/cad_server_defect118.properties (revision 662) @@ -0,0 +1,13 @@ +# CAD Server properties with a special traffic model for testing defect 118. + +TrafficMgrProperties = config/traffic_model_config/defect118_config.properties + +CADClientPort = 4444 +CoordinatorRMIPort = 4445 +CADRmiPort = 4446 +CMSDiversionXML = config/cmsdiversions.xml +AudioFileLocation = Scenarios/Audio/ +UserInterface = tmcsim.cadsimulator.viewer.CADServerViewer +MediaProperties = config/cad_server_media.properties +ParamicsProperties = config/cad_server_paramics.properties +ATMSProperties = config/cad_server_atms.propertie Index: trunk/config/application_properties.cfg =================================================================== --- trunk/config/application_properties.cfg (revision 651) +++ trunk/config/application_properties.cfg (revision 662) @@ -1,4 +1,4 @@ [Versions] -revision_number = 650 +revision_number = 660 Index: trunk/config/logging_cad_server.properties =================================================================== --- trunk/config/logging_cad_server.properties (revision 662) +++ trunk/config/logging_cad_server.properties (revision 662) @@ -0,0 +1,20 @@ +handlers = java.util.logging.FileHandler, java.util.logging.ConsoleHandler + +# Set the default logging level for the root logger +tmcsim.level = ALL + +# Set the default logging level for new FileHandler instances +java.util.logging.FileHandler.level = ALL +java.util.logging.FileHandler.pattern = logs/cad_simulator.log +java.util.logging.FileHandler.limit = 500000 +java.util.logging.FileHandler.count = 5 +java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter + + +# Set the default formatter for new ConsoleHandler instances +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter + +LogFile = paramics_communication_log.xml +CADSimulatorHost = 127.0.0.1 +CADSimulatorRMIPort = 4450 + Index: trunk/config/logging_paramics_communicator.properties =================================================================== --- trunk/config/logging_paramics_communicator.properties (revision 662) +++ trunk/config/logging_paramics_communicator.properties (revision 662) @@ -0,0 +1,31 @@ +handlers = java.util.logging.FileHandler, java.util.logging.ConsoleHandler + +# Set the default logging level for the root logger +tmcsim.level = ALL + +# Set the default logging level for new FileHandler instances +java.util.logging.FileHandler.level = ALL +java.util.logging.FileHandler.pattern = logs/paramics_communicator.log +java.util.logging.FileHandler.limit = 500000 +java.util.logging.FileHandler.count = 5 +java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter + + +# Set the default formatter for new ConsoleHandler instances +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter + +LogFile = paramics_communication_log.xml + +# Set properties for 2016 --jd +LogFile=paramics_communicator.log +# Ethernet cable in operator room +#CADSimulatorHost=192.168.251.119 +# PC1 in operator room (Service Tag BHLLD42) +CADSimulatorHost=192.168.251.116 +# Virtual Host: TMCSIM Manager +#CADSimulatorHost=192.168.251.88 +# For local testing +CADSimulatorHost = 127.0.0.1 + +CADSimulatorRMIPort=4445 +#CADSimulatorRMIPort = 4450 Index: trunk/config/cad_server_practice.properties =================================================================== --- trunk/config/cad_server_practice.properties (revision 662) +++ trunk/config/cad_server_practice.properties (revision 662) @@ -0,0 +1,19 @@ +# CAD Server properties for Practice Scenario Session +# This file is referenced by scripts in the bin folder. +# Only the Traffic Mgr Property is different, as it specifies +# the traffic events for the practice scenario + +TrafficMgrProperties = config/traffic_model_config/practice.properties + +CADClientPort = 4444 +CoordinatorRMIPort = 4445 +CADRmiPort = 4446 +CMSDiversionXML = config/cmsdiversions.xml +AudioFileLocation = Scenarios/Audio/ +UserInterface = tmcsim.cadsimulator.viewer.CADServerViewer +MediaProperties = config/cad_server_media.properties +ParamicsProperties = config/cad_server_paramics.properties +ATMSProperties = config/cad_server_atms.properties + +ElapsedTimeFile = webapps/dynamicdata/sim_elapsedtime.json +CADcommentsLog = webapps/dynamicdata/CADcomments.log Index: trunk/config/traffic_model_config/systest.properties =================================================================== --- trunk/config/traffic_model_config/systest.properties (revision 411) +++ trunk/config/traffic_model_config/systest.properties (revision 662) @@ -1,4 +1,7 @@ +# Referencd by: cad_server_systest.properties + #Highways_Map_File = config/vds_data/highways_triangle.txt -Highways_Map_File = config/vds_data/highways_fullmap.txt +#Highways_Map_File = config/vds_data/highways_fullmap.txt +Highways_Map_File = config/vds_data/postmile_coordinates.txt #Events_File = config/vds_data/single_event_55S.txt Events_File = config/vds_data/sample_data/systemtest_events.txt Index: trunk/config/logging_sim_manager.properties =================================================================== --- trunk/config/logging_sim_manager.properties (revision 662) +++ trunk/config/logging_sim_manager.properties (revision 662) @@ -0,0 +1,15 @@ +handlers = java.util.logging.FileHandler, java.util.logging.ConsoleHandler + +# Set the default logging level for the root logger +tmcsim.level = ALL + +# Set the default logging level for new FileHandler instances +java.util.logging.FileHandler.level = ALL +java.util.logging.FileHandler.pattern = logs/sim_manager.log +java.util.logging.FileHandler.limit = 500000 +java.util.logging.FileHandler.count = 5 +java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter + + +# Set the default formatter for new ConsoleHandler instances +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter Index: trunk/config/test_trafficdriver.properties =================================================================== --- trunk/config/test_trafficdriver.properties (revision 662) +++ trunk/config/test_trafficdriver.properties (revision 662) @@ -0,0 +1,14 @@ +# Properties for the ConsoleTrafficDriver application +# Was used during development of highway model, may be obsolete now. +# This file is referenced in tmcsim.highwaymodel.runtraffic.bash + +LDSFileName = config/vds_data/lds.txt +LoopsFileName = config/vds_data/loop.txt +HighwayMetaFileName = config/vds_data/highwaysMeta.txt +NetworkFileName = networkFile.txt +ExchangeFileName = exchange.xml +FEPWriterHost = 192.168.251.46 +FEPWriterPort = 8080 + +# Change to localhost for dev system +#FEPWriterHost = localhost Index: trunk/config/cad_server_console.properties =================================================================== --- trunk/config/cad_server_console.properties (revision 662) +++ trunk/config/cad_server_console.properties (revision 662) @@ -0,0 +1,17 @@ +# For testing, this config specifies the console (text-based) user interface +# for the CAD Server. Everything else is the same as the default config. + +UserInterface = tmcsim.cadsimulator.viewer.CADConsoleViewer + +CADClientPort = 4444 +CoordinatorRMIPort = 4445 +CADRmiPort = 4446 +AudioFileLocation = Scenarios/Audio/ +ElapsedTimeFile = webapps/dynamicdata/sim_elapsedtime.json +CADcommentsLog = webapps/dynamicdata/CADcomments.log +CMSDiversionXML = config/cmsdiversions.xml + +TrafficMgrProperties = config/traffic_model_config/traffic_model_config.properties +MediaProperties = config/cad_server_media.properties +ParamicsProperties = config/cad_server_paramics.properties +ATMSProperties = config/cad_server_atms.properties Index: trunk/config/cad_server.properties =================================================================== --- trunk/config/cad_server.properties (revision 662) +++ trunk/config/cad_server.properties (revision 662) @@ -0,0 +1,41 @@ +# Configuration settings for the CAD Server +# +# CAD Server is started before any other subsystem in the TMCSim. +# The filename of this file is specified as the default in CADServer.java. +# The default can be overriden by specifying -DPROP_FILE= on the java command, +# for example, by scripts in the bin folder. +# +# 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 accessed. +# 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. +# TrafficMgrProperties : The filepath for the properties file to initialize the Traffic Manager. +# ElapsedTimeFile : The location where the Coordinator writes the simulation time, where it is accessed by other subsystems. +# CADcommentsLog : The location where the Coordinator writes the CAD comments log, where it is accessed by the Unified Logging system. +# UserInterface : The class that serves as the UI for the Server. + +UserInterface = tmcsim.cadsimulator.viewer.CADServerViewer + +CADClientPort = 4444 +CoordinatorRMIPort = 4445 +CADRmiPort = 4446 +AudioFileLocation = Scenarios/Audio/ +ElapsedTimeFile = webapps/dynamicdata/sim_elapsedtime.json +CADcommentsLog = webapps/dynamicdata/CADcomments.log +CMSDiversionXML = config/cmsdiversions.xml + +TrafficMgrProperties = config/traffic_model_config/traffic_model_config.properties +MediaProperties = config/cad_server_media.properties +ParamicsProperties = config/cad_server_paramics.properties +ATMSProperties = config/cad_server_atms.properties + +#Alternate text user interface for the CADServer +#UserInterface = tmcsim.cadsimulator.viewer.CADConsoleViewer + Index: trunk/config/sim_manager.properties =================================================================== --- trunk/config/sim_manager.properties (revision 662) +++ trunk/config/sim_manager.properties (revision 662) @@ -0,0 +1,16 @@ +# Configuration settings for the Simulation Manager +# The properties file for the SimulationManager class contains the following +# data. +# +# CADServerHost : The IP address where the CAD Server is running. +# : CADServer must be running before starting Sim Mgr +# CADServerRMIPort : The port to use for RMI connection. This must match +# : the port specified in CAD Server config "CoordinatorRMIPort" +# ScenariosDir : The directory where Scenario xml files are located. +# FakeParamicsConnection: I don't know yet ... read the source code. + + +CADServerHost = 127.0.0.1 +CADServerRMIPort = 4445 +ScenariosDir = Scenarios +FakeParamicsConnection = false Index: trunk/config/logging_cad_client.properties =================================================================== --- trunk/config/logging_cad_client.properties (revision 662) +++ trunk/config/logging_cad_client.properties (revision 662) @@ -0,0 +1,15 @@ +handlers = java.util.logging.FileHandler, java.util.logging.ConsoleHandler + +# Set the default logging level for the root logger +tmcsim.level = ALL + +# Set the default logging level for new FileHandler instances +java.util.logging.FileHandler.level = ALL +java.util.logging.FileHandler.pattern = logs/cad_client.log +java.util.logging.FileHandler.limit = 500000 +java.util.logging.FileHandler.count = 5 +java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter + + +# Set the default formatter for new ConsoleHandler instances +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter Index: trunk/config/cad_server_paramics.properties =================================================================== --- trunk/config/cad_server_paramics.properties (revision 662) +++ trunk/config/cad_server_paramics.properties (revision 662) @@ -0,0 +1,13 @@ +# This is IP address of Paramics PC in the ATL lab +# Referenced in cad_server.properties + +#ParamicsCommHost = 192.168.251.45 +# For development testing +ParamicsCommHost = 127.0.0.1 +ParamicsCommPort = 4450 +IncidentUpdateInterval = 30 +IncidentUpdateFile = exchange.xml +ParamicsStatusInterval = 15 +ParamicsStatusFile = paramics_status.xml +CameraStatusInterval = 30 +CameraStatusFile = camera_status.xml Index: trunk/config/sim_manager_smoketest_config.properties =================================================================== --- trunk/config/sim_manager_smoketest_config.properties (revision 659) +++ (revision ) @@ -1,5 +1,0 @@ -CADSimulatorHost = 127.0.0.1 -CADSimulatorRMIPort = 4445 -#ScriptDir = c:\\program files -ScenariosDir = Scenarios -FakeParamicsConnection = true Index: trunk/config/sim_manager_config.properties =================================================================== --- trunk/config/sim_manager_config.properties (revision 659) +++ (revision ) @@ -1,4 +1,0 @@ -CADSimulatorHost = 127.0.0.1 -CADSimulatorRMIPort = 4445 -ScenariosDir = Scenarios -FakeParamicsConnection = false Index: trunk/config/cad_simulator_smoketest_config.properties =================================================================== --- trunk/config/cad_simulator_smoketest_config.properties (revision 573) +++ (revision ) @@ -1,14 +1,0 @@ -CADClientPort = 4444 -CoordinatorRMIPort = 4445 -CADRmiPort = 4446 -CMSDiversionXML = config/cmsdiversions.xml -AudioFileLocation = Scenarios/Audio/ -UserInterface = tmcsim.cadsimulator.viewer.CADServerViewer -#UserInterface = tmcsim.cadsimulator.viewer.CADConsoleViewer -ParamicsProperties = config/cad_simulator_paramics_config.properties -ATMSProperties = config/cad_simulator_atms_config.properties -TrafficMgrProperties = config/traffic_model_config/traffic_model_config.properties -MediaProperties = config/cad_simulator_media_config.properties -ElapsedTimeFile = webapps/dynamicdata/sim_elapsedtime.json -# The location where the Coordinator writes the CAD comments log -CADcommentsLog = CADcomments.log Index: trunk/config/cad_simulator_media_config.properties =================================================================== --- trunk/config/cad_simulator_media_config.properties (revision 6) +++ (revision ) @@ -1,2 +1,0 @@ -#DVDPlayerXML = config/dvdplayers.xml -StillImagesXML = config/stillimages.xml Index: trunk/config/cad_simulator_config.properties =================================================================== --- trunk/config/cad_simulator_config.properties (revision 573) +++ (revision ) @@ -1,15 +1,0 @@ -CADClientPort = 4444 -CoordinatorRMIPort = 4445 -CADRmiPort = 4446 -CMSDiversionXML = config/cmsdiversions.xml -AudioFileLocation = Scenarios/Audio/ -#UserInterface = tmcsim.cadsimulator.viewer.CADConsoleViewer -UserInterface = tmcsim.cadsimulator.viewer.CADServerViewer -ParamicsProperties = config/cad_simulator_paramics_config.properties -ATMSProperties = config/cad_simulator_atms_config.properties -MediaProperties = config/cad_simulator_media_config.properties -TrafficMgrProperties = config/traffic_model_config/traffic_model_config.properties -# The location where the Coordinator writes the simulation time -ElapsedTimeFile = webapps/dynamicdata/sim_elapsedtime.json -# The location where the Coordinator writes the CAD comments log -CADcommentsLog = webapps/dynamicdata/CADcomments.log Index: trunk/config/console_driver_config_local.properties =================================================================== --- trunk/config/console_driver_config_local.properties (revision 125) +++ (revision ) @@ -1,7 +1,0 @@ -LDSFileName = config/vds_data/lds.txt -LoopsFileName = config/vds_data/loop.txt -HighwayMetaFileName = config/vds_data/highwaysMeta.txt -NetworkFileName = networkFile.txt -ExchangeFileName = exchange.xml -FEPWriterHost = localhost -FEPWriterPort = 8080 Index: trunk/config/cad_simulator_guitest_config.properties =================================================================== --- trunk/config/cad_simulator_guitest_config.properties (revision 573) +++ (revision ) @@ -1,10 +1,0 @@ -CADClientPort = 4444 -CoordinatorRMIPort = 4445 -CADRmiPort = 4446 -CMSDiversionXML = config/cmsdiversions.xml -AudioFileLocation = Scenarios/Audio/ -UserInterface = tmcsim.cadsimulator.viewer.CADSimulatorViewer -#UserInterface = tmcsim.cadsimulator.viewer.CADConsoleViewer -ParamicsProperties = config/cad_simulator_paramics_config.properties -ATMSProperties = config/cad_simulator_atms_config.properties -MediaProperties = config/cad_simulator_media_config.properties Index: trunk/config/cad_simulator_consoletest_config.properties =================================================================== --- trunk/config/cad_simulator_consoletest_config.properties (revision 573) +++ (revision ) @@ -1,10 +1,0 @@ -CADClientPort = 4444 -CoordinatorRMIPort = 4445 -CADRmiPort = 4446 -CMSDiversionXML = config/cmsdiversions.xml -AudioFileLocation = Scenarios/Audio/ -#UserInterface = tmcsim.cadsimulator.viewer.CADSimulatorViewer -UserInterface = tmcsim.cadsimulator.viewer.CADConsoleViewer -ParamicsProperties = config/cad_simulator_paramics_config.properties -ATMSProperties = config/cad_simulator_atms_config.properties -MediaProperties = config/cad_simulator_media_config.properties Index: trunk/config/cad_simulator_atms_config.properties =================================================================== --- trunk/config/cad_simulator_atms_config.properties (revision 2) +++ (revision ) @@ -1,4 +1,0 @@ -ATMSHost = 192.168.251.27 -Username = atms_mgr -Password = atms_d12uci1 -ImageDir = /opt/d12uci/user_config/cctv Index: trunk/config/sim_manager_systest_config.properties =================================================================== --- trunk/config/sim_manager_systest_config.properties (revision 659) +++ (revision ) @@ -1,5 +1,0 @@ -CADSimulatorHost = 127.0.0.1 -CADSimulatorRMIPort = 4445 -#ScriptDir = c:\\program files -ScenariosDir = Scenarios -FakeParamicsConnection = false Index: trunk/config/cad_simulator_systest.properties =================================================================== --- trunk/config/cad_simulator_systest.properties (revision 573) +++ (revision ) @@ -1,15 +1,0 @@ -CADClientPort = 4444 -CoordinatorRMIPort = 4445 -CADRmiPort = 4446 -CMSDiversionXML = config/cmsdiversions.xml -AudioFileLocation = Scenarios/Audio/ -#UserInterface = tmcsim.cadsimulator.viewer.CADConsoleViewer -UserInterface = tmcsim.cadsimulator.viewer.CADServerViewer -ParamicsProperties = config/cad_simulator_paramics_config.properties -ATMSProperties = config/cad_simulator_atms_config.properties -TrafficMgrProperties = config/traffic_model_config/systest.properties -MediaProperties = config/cad_simulator_media_config.properties -# The location where the Coordinator writes the simulation time -ElapsedTimeFile = webapps/dynamicdata/sim_elapsedtime.json -# The location where the Coordinator writes the CAD comments log -CADcommentsLog = CADcomments.log Index: trunk/config/paramics_communicator_logging.properties =================================================================== --- trunk/config/paramics_communicator_logging.properties (revision 52) +++ (revision ) @@ -1,31 +1,0 @@ -handlers = java.util.logging.FileHandler, java.util.logging.ConsoleHandler - -# Set the default logging level for the root logger -tmcsim.level = ALL - -# Set the default logging level for new FileHandler instances -java.util.logging.FileHandler.level = ALL -java.util.logging.FileHandler.pattern = logs/paramics_communicator.log -java.util.logging.FileHandler.limit = 500000 -java.util.logging.FileHandler.count = 5 -java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter - - -# Set the default formatter for new ConsoleHandler instances -java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter - -LogFile = paramics_communication_log.xml - -# Set properties for 2016 --jd -LogFile=paramics_communicator.log -# Ethernet cable in operator room -#CADSimulatorHost=192.168.251.119 -# PC1 in operator room (Service Tag BHLLD42) -CADSimulatorHost=192.168.251.116 -# Virtual Host: TMCSIM Manager -#CADSimulatorHost=192.168.251.88 -# For local testing -CADSimulatorHost = 127.0.0.1 - -CADSimulatorRMIPort=4445 -#CADSimulatorRMIPort = 4450 Index: trunk/config/sim_manager_logging.properties =================================================================== --- trunk/config/sim_manager_logging.properties (revision 2) +++ (revision ) @@ -1,15 +1,0 @@ -handlers = java.util.logging.FileHandler, java.util.logging.ConsoleHandler - -# Set the default logging level for the root logger -tmcsim.level = ALL - -# Set the default logging level for new FileHandler instances -java.util.logging.FileHandler.level = ALL -java.util.logging.FileHandler.pattern = logs/sim_manager.log -java.util.logging.FileHandler.limit = 500000 -java.util.logging.FileHandler.count = 5 -java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter - - -# Set the default formatter for new ConsoleHandler instances -java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter Index: trunk/config/cad_simulator_paramics_config.properties =================================================================== --- trunk/config/cad_simulator_paramics_config.properties (revision 60) +++ (revision ) @@ -1,11 +1,0 @@ -# This is IP address of Paramics PC in the ATL lab -#ParamicsCommHost = 192.168.251.45 -# For development testing -ParamicsCommHost = 127.0.0.1 -ParamicsCommPort = 4450 -IncidentUpdateInterval = 30 -IncidentUpdateFile = exchange.xml -ParamicsStatusInterval = 15 -ParamicsStatusFile = paramics_status.xml -CameraStatusInterval = 30 -CameraStatusFile = camera_status.xml Index: trunk/config/cad_simulator_defect118.properties =================================================================== --- trunk/config/cad_simulator_defect118.properties (revision 573) +++ (revision ) @@ -1,11 +1,0 @@ -CADClientPort = 4444 -CoordinatorRMIPort = 4445 -CADRmiPort = 4446 -CMSDiversionXML = config/cmsdiversions.xml -AudioFileLocation = Scenarios/Audio/ -#UserInterface = tmcsim.cadsimulator.viewer.CADConsoleViewer -UserInterface = tmcsim.cadsimulator.viewer.CADServerViewer -ParamicsProperties = config/cad_simulator_paramics_config.properties -ATMSProperties = config/cad_simulator_atms_config.properties -TrafficMgrProperties = config/traffic_model_config/defect118_config.properties -MediaProperties = config/cad_simulator_media_config.properties Index: trunk/config/cad_client_logging.properties =================================================================== --- trunk/config/cad_client_logging.properties (revision 2) +++ (revision ) @@ -1,15 +1,0 @@ -handlers = java.util.logging.FileHandler, java.util.logging.ConsoleHandler - -# Set the default logging level for the root logger -tmcsim.level = ALL - -# Set the default logging level for new FileHandler instances -java.util.logging.FileHandler.level = ALL -java.util.logging.FileHandler.pattern = logs/cad_client.log -java.util.logging.FileHandler.limit = 500000 -java.util.logging.FileHandler.count = 5 -java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter - - -# Set the default formatter for new ConsoleHandler instances -java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter Index: trunk/config/cad_simulator_logging.properties =================================================================== --- trunk/config/cad_simulator_logging.properties (revision 40) +++ (revision ) @@ -1,20 +1,0 @@ -handlers = java.util.logging.FileHandler, java.util.logging.ConsoleHandler - -# Set the default logging level for the root logger -tmcsim.level = ALL - -# Set the default logging level for new FileHandler instances -java.util.logging.FileHandler.level = ALL -java.util.logging.FileHandler.pattern = logs/cad_simulator.log -java.util.logging.FileHandler.limit = 500000 -java.util.logging.FileHandler.count = 5 -java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter - - -# Set the default formatter for new ConsoleHandler instances -java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter - -LogFile = paramics_communication_log.xml -CADSimulatorHost = 127.0.0.1 -CADSimulatorRMIPort = 4450 - Index: trunk/config/cad_simulator_console_config.properties =================================================================== --- trunk/config/cad_simulator_console_config.properties (revision 573) +++ (revision ) @@ -1,15 +1,0 @@ -CADClientPort = 4444 -CoordinatorRMIPort = 4445 -CADRmiPort = 4446 -CMSDiversionXML = config/cmsdiversions.xml -AudioFileLocation = Scenarios/Audio/ -#UserInterface = tmcsim.cadsimulator.viewer.CADSimulatorViewer -UserInterface = tmcsim.cadsimulator.viewer.CADConsoleViewer -ParamicsProperties = config/cad_simulator_paramics_config.properties -ATMSProperties = config/cad_simulator_atms_config.properties -MediaProperties = config/cad_simulator_media_config.properties -TrafficMgrProperties = config/traffic_model_config/traffic_model_config.properties -# The location where the Coordinator writes the simulation time -ElapsedTimeFile = webapps/dynamicdata/sim_elapsedtime.json -# The location where the Coordinator writes the CAD comments log -CADcommentsLog = CADcomments.log Index: trunk/config/cad_simulator_practice.properties =================================================================== --- trunk/config/cad_simulator_practice.properties (revision 573) +++ (revision ) @@ -1,16 +1,0 @@ -# CAD Server properties for Practice Session -CADClientPort = 4444 -CoordinatorRMIPort = 4445 -CADRmiPort = 4446 -CMSDiversionXML = config/cmsdiversions.xml -AudioFileLocation = Scenarios/Audio/ -#UserInterface = tmcsim.cadsimulator.viewer.CADConsoleViewer -UserInterface = tmcsim.cadsimulator.viewer.CADServerViewer -ParamicsProperties = config/cad_simulator_paramics_config.properties -ATMSProperties = config/cad_simulator_atms_config.properties -TrafficMgrProperties = config/traffic_model_config/practice.properties -MediaProperties = config/cad_simulator_media_config.properties -# The location where the Coordinator writes the simulation time -ElapsedTimeFile = webapps/dynamicdata/sim_elapsedtime.json -# The location where the Coordinator writes the CAD comments log -CADcommentsLog = webapps/dynamicdata/CADcomments.log Index: trunk/config/console_driver_config.properties =================================================================== --- trunk/config/console_driver_config.properties (revision 196) +++ (revision ) @@ -1,7 +1,0 @@ -LDSFileName = config/vds_data/lds.txt -LoopsFileName = config/vds_data/loop.txt -HighwayMetaFileName = config/vds_data/highwaysMeta.txt -NetworkFileName = networkFile.txt -ExchangeFileName = exchange.xml -FEPWriterHost = 192.168.251.46 -FEPWriterPort = 8080 Index: trunk/config/cad_simulator_systemconsoletest_config.properties =================================================================== --- trunk/config/cad_simulator_systemconsoletest_config.properties (revision 573) +++ (revision ) @@ -1,10 +1,0 @@ -CADClientPort = 4444 -CoordinatorRMIPort = 4445 -CADRmiPort = 4446 -CMSDiversionXML = config/cmsdiversions.xml -AudioFileLocation = Scenarios/Audio/ -#UserInterface = tmcsim.cadsimulator.viewer.CADSimulatorViewer -UserInterface = tmcsim.cadsimulator.viewer.CADConsoleViewer -ParamicsProperties = config/cad_simulator_paramics_config.properties -ATMSProperties = config/cad_simulator_atms_config.properties -MediaProperties = config/cad_simulator_media_config.properties