Index: trunk/config/cad_server_systest.properties
===================================================================
--- trunk/config/cad_simulator_systest.properties	(revision 573)
+++ trunk/config/cad_server_systest.properties	(revision 662)
@@ -1,15 +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
-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
+
+MediaProperties        = config/cad_server_media.properties
+ParamicsProperties     = config/cad_server_paramics.properties
+ATMSProperties         = config/cad_server_atms.properties
+