Index: /trunk/config/application_properties.cfg =================================================================== --- /trunk/config/application_properties.cfg (revision 662) +++ /trunk/config/application_properties.cfg (revision 678) @@ -1,4 +1,4 @@ [Versions] -revision_number = 660 +revision_number = 676 Index: /trunk/config/cad_server_practice.properties =================================================================== --- /trunk/config/cad_server_practice.properties (revision 662) +++ /trunk/config/cad_server_practice.properties (revision 678) @@ -16,4 +16,4 @@ ATMSProperties = config/cad_server_atms.properties -ElapsedTimeFile = webapps/dynamicdata/sim_elapsedtime.json -CADcommentsLog = webapps/dynamicdata/CADcomments.log +ElapsedTimeFile = W:\\webapps\\dynamicdata\\sim_elapsedtime.json +CADcommentsLog = W:\\webapps\\dynamicdata\\CADcomments.log Index: /trunk/config/traffic_model_config/traffic_model_config.properties =================================================================== --- /trunk/config/traffic_model_config/traffic_model_config.properties (revision 561) +++ /trunk/config/traffic_model_config/traffic_model_config.properties (revision 678) @@ -6,3 +6,3 @@ FEPSim_IP_addr = localhost Output_Destination = FEP -Highway_Status_File = webapps/dynamicdata/highway_status.json +Highway_Status_File = W:\\webapps\\dynamicdata\\highway_status.json Index: /trunk/config/traffic_model_config/practice.properties =================================================================== --- /trunk/config/traffic_model_config/practice.properties (revision 427) +++ /trunk/config/traffic_model_config/practice.properties (revision 678) @@ -6,3 +6,3 @@ FEPSim_IP_addr = localhost Output_Destination = FEP -Highway_Status_File = webapps/dynamicdata/highway_status.json +Highway_Status_File = W:\\webapps\\dynamicdata\\highway_status.json Index: /trunk/config/cad_server.properties =================================================================== --- /trunk/config/cad_server.properties (revision 670) +++ /trunk/config/cad_server.properties (revision 678) @@ -30,6 +30,6 @@ CADRmiPort = 4446 AudioFileLocation = Scenarios/Audio/ -ElapsedTimeFile = webapps/dynamicdata/sim_elapsedtime.json -CADcommentsLog = webapps/dynamicdata/CADcomments.log +ElapsedTimeFile = W:\\webapps\\dynamicdata\\sim_elapsedtime.json +CADcommentsLog = W:\\webapps\\dynamicdata\\CADcomments.log CMSDiversionXML = config/cmsdiversions.xml Index: /trunk/config/devlinux/traffic_model_config.properties =================================================================== --- /trunk/config/devlinux/traffic_model_config.properties (revision 678) +++ /trunk/config/devlinux/traffic_model_config.properties (revision 678) @@ -0,0 +1,8 @@ +Highways_Map_File = config/vds_data/postmile_coordinates.txt +#Highways_Map_File = config/vds_data/highways_fullmap.txt +#Events_File = config/vds_data/sample_data/single_event_55S.txt +Events_File = config/vds_data/sample_data/atmsBatchEvents_production.txt +#FEPSim_IP_addr = 192.168.251.46 +FEPSim_IP_addr = localhost +Output_Destination = FEP +Highway_Status_File = webapps/dynamicdata/highway_status.json Index: /trunk/config/devlinux/cad_server_practice.properties =================================================================== --- /trunk/config/devlinux/cad_server_practice.properties (revision 678) +++ /trunk/config/devlinux/cad_server_practice.properties (revision 678) @@ -0,0 +1,15 @@ +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_server_paramics.properties +ATMSProperties = config/cad_server_atms.properties +MediaProperties = config/cad_server_media.properties +TrafficMgrProperties = config/devlinux/traffic_model_practice.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/devlinux/traffic_model_practice.properties =================================================================== --- /trunk/config/devlinux/traffic_model_practice.properties (revision 678) +++ /trunk/config/devlinux/traffic_model_practice.properties (revision 678) @@ -0,0 +1,10 @@ +Highways_Map_File = config/vds_data/postmile_coordinates.txt +Highway_Status_File = webapps/dynamicdata/highway_status.json +Events_File = config/vds_data/sample_data/atmsBatchEvents_practice.txt +FEPSim_IP_addr = localhost +Output_Destination = FEP + + +#Highways_Map_File = config/vds_data/highways_triangle.txt +#Events_File = config/vds_data/single_event_55S.txt + Index: /trunk/config/devlinux/cad_client_config.properties =================================================================== --- /trunk/config/devlinux/cad_client_config.properties (revision 678) +++ /trunk/config/devlinux/cad_client_config.properties (revision 678) @@ -0,0 +1,16 @@ +# Config settings for CAD Clients + +CADPosition = 2 +# Specify where CAD server is running: 192.168.251.116 for Production, 192.168.251.127 for Development workstation, 127.0.0.1 for local development +CADSimulatorHost = 127.0.0.1 +#CADSimulatorHost = 192.168.251.116 +#CADSimulatorHost = 192.168.251.127 +CADUserID = A1245 +CADSimulatorSocketPort = 4444 +CADRmiPort = 4446 +#KeyboardType = CAD +#DisplayType = FRAME +DisplayType = FULL_SCREEN +KeyboardType = STD +# File containing names of students to display in login screen +StudentNamesFile = config/student_names.txt Index: /trunk/config/devlinux/cad_server_systest.properties =================================================================== --- /trunk/config/devlinux/cad_server_systest.properties (revision 678) +++ /trunk/config/devlinux/cad_server_systest.properties (revision 678) @@ -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/devlinux/traffic_model_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/devlinux/cad_simulator_config.properties =================================================================== --- /trunk/config/devlinux/cad_simulator_config.properties (revision 651) +++ /trunk/config/devlinux/cad_simulator_config.properties (revision 651) @@ -0,0 +1,15 @@ +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/devlinux/traffic_model_systest.properties =================================================================== --- /trunk/config/devlinux/traffic_model_systest.properties (revision 678) +++ /trunk/config/devlinux/traffic_model_systest.properties (revision 678) @@ -0,0 +1,11 @@ +# 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/postmile_coordinates.txt +#Events_File = config/vds_data/single_event_55S.txt +Events_File = config/vds_data/sample_data/systemtest_events.txt +#FEPSim_IP_addr = 192.168.251.46 +FEPSim_IP_addr = localhost +Output_Destination = FEP +Highway_Status_File = webapps/dynamicdata/highway_status.json Index: /trunk/config/devlinux/cad_server.properties =================================================================== --- /trunk/config/devlinux/cad_server.properties (revision 678) +++ /trunk/config/devlinux/cad_server.properties (revision 678) @@ -0,0 +1,43 @@ +# 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. + +#https://stackoverflow.com/questions/31505644/file-separator-in-properties (from 2015) + +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/devlinux/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/logging_service.cfg =================================================================== --- /trunk/config/logging_service.cfg (revision 646) +++ /trunk/config/logging_service.cfg (revision 678) @@ -1,5 +1,9 @@ [Paths] +# for local development UnifiedLogPath = webapps/dynamicdata/ ActivityLogPath = webapps/dynamicdata/ +# for production system +#UnifiedLogPath = W:\\webapps\\dynamicdata\\ +#ActivityLogPath = W:\\webapps\\dynamicdata\\ [Files] ActivityLogDataFilename = data.json Index: /trunk/config/cad_client_config.properties =================================================================== --- /trunk/config/cad_client_config.properties (revision 662) +++ /trunk/config/cad_client_config.properties (revision 678) @@ -2,5 +2,7 @@ CADPosition = 2 -CADSimulatorHost = 127.0.0.1 +#CADSimulatorHost = 127.0.0.1 +# Specify where CAD server is running: 192.168.251.116 for Production, 192.168.251.127 for Development workstation +CADSimulatorHost = 192.168.251.116 #CADSimulatorHost = 192.168.1.208 CADUserID = A1245 @@ -12,3 +14,3 @@ KeyboardType = STD # File containing names of students to display in login screen -StudentNamesFile = config/student_names.txt +StudentNamesFile = \\\\web.tmcsim\\web\\config\\student_names.txt Index: /trunk/config/cad_server_systest.properties =================================================================== --- /trunk/config/cad_server_systest.properties (revision 662) +++ /trunk/config/cad_server_systest.properties (revision 678) @@ -11,6 +11,6 @@ CADRmiPort = 4446 AudioFileLocation = Scenarios/Audio/ -ElapsedTimeFile = webapps/dynamicdata/sim_elapsedtime.json -CADcommentsLog = webapps/dynamicdata/CADcomments.log +ElapsedTimeFile = W:\\webapps\\dynamicdata\\sim_elapsedtime.json +CADcommentsLog = W:\\webapps\\dynamicdata\\CADcomments.log CMSDiversionXML = config/cmsdiversions.xml