Index: trunk/config/cad_server.properties
===================================================================
--- trunk/config/cad_simulator_config.properties	(revision 573)
+++ trunk/config/cad_server.properties	(revision 662)
@@ -1,15 +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
-AudioFileLocation      = Scenarios/Audio/
+
+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
-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
+