Index: trunk/config/cad_server_defect118.properties
===================================================================
--- trunk/config/cad_simulator_defect118.properties	(revision 573)
+++ trunk/config/cad_server_defect118.properties	(revision 662)
@@ -1,2 +1,6 @@
+# CAD Server properties with a special traffic model for testing defect 118.
+
+TrafficMgrProperties   = config/traffic_model_config/defect118_config.properties
+
 CADClientPort          = 4444 
 CoordinatorRMIPort     = 4445 
@@ -4,8 +8,6 @@
 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
+MediaProperties        = config/cad_server_media.properties
+ParamicsProperties     = config/cad_server_paramics.properties
+ATMSProperties         = config/cad_server_atms.propertie