Index: unk/config/testConfig/stillimages.xml
===================================================================
--- /trunk/config/testConfig/stillimages.xml	(revision 32)
+++ 	(revision )
@@ -1,33 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> 
-<STILL_IMAGES>
-	<CCTV id="24" atms_id="1200079" dir="S">
-		<RANGE min_speed="0" max_speed="20" filename="CAM24_STOPPED"/>
-		<RANGE min_speed="20" max_speed="35" filename="CAM24_SLOW"/>
-		<RANGE min_speed="35" max_speed="1000" filename="CAM24_FREEFLOW"/>
-		<INCIDENT log_num="187" filename="CAM24_INCIDENT_187"/>
-	</CCTV>
-	<CCTV id="97" atms_id="1213015" dir="N">
-		<RANGE min_speed="0" max_speed="20" filename="CAM97_STOPPED"/>
-		<RANGE min_speed="20" max_speed="35" filename="CAM97_SLOW"/>
-		<RANGE min_speed="35" max_speed="1000" filename="CAM97_FREEFLOW"/>
-		<INCIDENT log_num="188" filename="CAM97_INCIDENT_188"/>
-	</CCTV>
-	<CCTV id="28" atms_id="1200083" dir="N">
-		<RANGE min_speed="0" max_speed="20" filename="CAM28_STOPPED"/>
-		<RANGE min_speed="20" max_speed="35" filename="CAM28_SLOW"/>
-		<RANGE min_speed="35" max_speed="1000" filename="CAM28_FREEFLOW"/>
-		<INCIDENT log_num="189" filename="CAM28_INCIDENT_189"/>
-	</CCTV>
-	<CCTV id="16" atms_id="1200061" dir="S">
-		<RANGE min_speed="0" max_speed="20" filename="CAM16_STOPPED"/>
-		<RANGE min_speed="20" max_speed="35" filename="CAM16_SLOW"/>
-		<RANGE min_speed="35" max_speed="1000" filename="CAM16_FREEFLOW"/>
-		<INCIDENT log_num="190" filename="CAM16_INCIDENT_190"/>
-	</CCTV>
-	<CCTV id="166" atms_id="1213007" dir="S">
-		<RANGE min_speed="0" max_speed="20" filename="CAM166_STOPPED"/>
-		<RANGE min_speed="20" max_speed="35" filename="CAM166_SLOW"/>
-		<RANGE min_speed="35" max_speed="1000" filename="CAM166_FREEFLOW"/>
-		<INCIDENT log_num="191" filename="CAM166_INCIDENT_191"/>
-	</CCTV>
-</STILL_IMAGES>
Index: unk/config/testConfig/dvdplayers.xml
===================================================================
--- /trunk/config/testConfig/dvdplayers.xml	(revision 32)
+++ 	(revision )
@@ -1,38 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> 
-<DVD_PLAYERS>
-     <DVD_PLAYER type="PioneerV5000" host="192.168.251.9" port="3001">
-     	<CCTV id="24" dir="S"/>
-        <INCIDENT log_num="187" title="4"/>
-        <RANGE min_speed="0" max_speed="20" title="3"/>
-        <RANGE min_speed="20" max_speed="35" title="2"/>
-        <RANGE min_speed="35" max_speed="1000" title="1"/>
-     </DVD_PLAYER>
-     <DVD_PLAYER type="PioneerV5000" host="192.168.251.9" port="3002">
-     	<CCTV id="97" dir="N"/>
-        <INCIDENT log_num="188" title="4"/>
-        <RANGE min_speed="0" max_speed="20" title="3"/>
-        <RANGE min_speed="20" max_speed="35" title="2"/>
-        <RANGE min_speed="35" max_speed="1000" title="1"/>
-     </DVD_PLAYER>
-     <DVD_PLAYER type="PioneerV5000" host="192.168.251.9" port="3003">
-     	<CCTV id="28" dir="S"/>
-        <INCIDENT log_num="189" title="4"/>
-        <RANGE min_speed="0" max_speed="20" title="3"/>
-        <RANGE min_speed="20" max_speed="35" title="2"/>
-        <RANGE min_speed="35" max_speed="1000" title="1"/>
-     </DVD_PLAYER>
-     <DVD_PLAYER type="PioneerV5000" host="192.168.251.9" port="3004">
-     	<CCTV id="16" dir="S"/>
-        <INCIDENT log_num="190" title="4"/>
-        <RANGE min_speed="0" max_speed="20" title="3"/>
-        <RANGE min_speed="20" max_speed="35" title="2"/>
-        <RANGE min_speed="35" max_speed="1000" title="1"/>
-     </DVD_PLAYER>
-     <DVD_PLAYER type="PioneerV5000" host="192.168.251.9" port="3005">
-     	<CCTV id="171" dir="S"/>
-        <INCIDENT log_num="191" title="4"/>
-        <RANGE min_speed="0" max_speed="20" title="3"/>
-        <RANGE min_speed="20" max_speed="35" title="2"/>
-        <RANGE min_speed="35" max_speed="1000" title="1"/>
-     </DVD_PLAYER>
-</DVD_PLAYERS>
Index: unk/config/testConfig/traffic_model_config.properties
===================================================================
--- /trunk/config/testConfig/traffic_model_config.properties	(revision 378)
+++ 	(revision )
@@ -1,8 +1,0 @@
-Highways_Map_File = config/vds_data/highways_triangle.txt
-#Highways_Map_File = config/vds_data/highways_fullmap.txt
-#Events_File = config/vds_data/single_event_55S.txt
-Events_File = config/vds_data/atmsBatchEvents.txt
-#FEPSim_IP_addr = 192.168.251.46
-FEPSim_IP_addr = localhost
-Output_Destination = FEP
-Json_Path = webapps/dynamicdata/highway_status.json
Index: unk/config/testConfig/paramics_simulator_config.properties
===================================================================
--- /trunk/config/testConfig/paramics_simulator_config.properties	(revision 32)
+++ 	(revision )
@@ -1,4 +1,0 @@
-WorkingDirectory    = C:/paramics/
-IncidentUpdateFile  = exchange.xml
-ParamicsStatusFile  = paramics_status.xml
-CameraStatusFile    = camera_status.xml
Index: unk/config/testConfig/paramics_communicator_logging.properties
===================================================================
--- /trunk/config/testConfig/paramics_communicator_logging.properties	(revision 32)
+++ 	(revision )
@@ -1,19 +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
-CADSimulatorHost = 127.0.0.1
-CADSimulatorRMIPort = 4450
Index: unk/config/testConfig/sim_manager_logging.properties
===================================================================
--- /trunk/config/testConfig/sim_manager_logging.properties	(revision 32)
+++ 	(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: unk/config/testConfig/cad_simulator_paramics_config.properties
===================================================================
--- /trunk/config/testConfig/cad_simulator_paramics_config.properties	(revision 48)
+++ 	(revision )
@@ -1,10 +1,0 @@
-#ParamicsCommHost       = 192.168.251.45
-# For development testing
-ParamicsCommHost       = 127.0.0.1
-ParamicsCommPort       = 4450
-IncidentUpdateInterval = 30
-IncidentUpdateFile     = exchange.xml
-ParamicsStatusInterval = 2
-ParamicsStatusFile     = paramics_status.xml
-CameraStatusInterval   = 30
-CameraStatusFile       = camera_status.xml
Index: unk/config/testConfig/cad_client_logging.properties
===================================================================
--- /trunk/config/testConfig/cad_client_logging.properties	(revision 32)
+++ 	(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: unk/config/testConfig/cmsdiversions.xml
===================================================================
--- /trunk/config/testConfig/cmsdiversions.xml	(revision 32)
+++ 	(revision )
@@ -1,499 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<DIVERSION_LIST>
-
-	<CMS>
-		<ID>95 - NB 5 @ El Toro</ID>
-		<POSTMILE>19.0</POSTMILE>
-		<INIT_ROUTE>NB 5</INIT_ROUTE>
-		<DIVERSION>
-			<ORIG_PATH>NB 5</ORIG_PATH>
-			<NEW_PATH>NB 405</NEW_PATH>
-			<DIV_PATH>N5_N5_N405</DIV_PATH>
-			<MAX_DIVERSION>50</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>NB 405</ORIG_PATH>
-			<NEW_PATH>NB 5</NEW_PATH>
-			<DIV_PATH>N5_N405_N5</DIV_PATH>
-			<MAX_DIVERSION>50</MAX_DIVERSION>
-		</DIVERSION>
-	</CMS>
-	
-	<CMS>
-		<ID>04 - NB 5 JSO Alton</ID>
-		<POSTMILE>22.0</POSTMILE>
-		<INIT_ROUTE>NB 5</INIT_ROUTE>
-		<DIVERSION>
-			<ORIG_PATH>NB 55</ORIG_PATH>
-			<NEW_PATH>NB 5</NEW_PATH>
-			<DIV_PATH>N5_N55_N5</DIV_PATH>
-			<MAX_DIVERSION>50</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>	
-			<ORIG_PATH>NB 5</ORIG_PATH>
-			<NEW_PATH>NB 55</NEW_PATH>
-			<DIV_PATH>N5_N5_N55</DIV_PATH>
-			<MAX_DIVERSION>5</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>	
-			<ORIG_PATH>NB 133</ORIG_PATH>
-			<NEW_PATH>NB 5</NEW_PATH>
-			<DIV_PATH>N5_N133_N5</DIV_PATH>
-			<MAX_DIVERSION>50</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>	
-			<ORIG_PATH>NB 5</ORIG_PATH>
-			<NEW_PATH>NB 133</NEW_PATH>
-			<DIV_PATH>N5_N5_N133</DIV_PATH>
-			<MAX_DIVERSION>5</MAX_DIVERSION>
-		</DIVERSION>
-	</CMS>
-	
-	<CMS>
-		<ID>75 - SB 5 @ Jeffery</ID>
-		<POSTMILE>24.99</POSTMILE>
-		<INIT_ROUTE>SB 5</INIT_ROUTE>
-		<DIVERSION>
-			<ORIG_PATH>SB 5</ORIG_PATH>
-			<NEW_PATH>SB 133</NEW_PATH>
-			<DIV_PATH>S5_S5_S133</DIV_PATH>
-			<MAX_DIVERSION>40</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>SB 5</ORIG_PATH>
-			<NEW_PATH>NB 133</NEW_PATH>
-			<DIV_PATH>S5_S5_N133</DIV_PATH>
-			<MAX_DIVERSION>10</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>NB 133</ORIG_PATH>
-			<NEW_PATH>SB 5</NEW_PATH>
-			<DIV_PATH>S5_N133_S5</DIV_PATH>
-			<MAX_DIVERSION>50</MAX_DIVERSION>
-		</DIVERSION>
-	</CMS>
-
-	<CMS>
-		<ID>65 - SB 55 @ Santa Clara</ID>
-		<POSTMILE>12.3</POSTMILE>
-		<INIT_ROUTE>SB 55</INIT_ROUTE>
-		<DIVERSION>
-			<ORIG_PATH>SB 405</ORIG_PATH>
-			<NEW_PATH>SB 55</NEW_PATH>
-			<DIV_PATH>S55_S405_S55</DIV_PATH>
-			<MAX_DIVERSION>50</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>SB 5</ORIG_PATH>
-			<NEW_PATH>SB 55</NEW_PATH>
-			<DIV_PATH>S55_S5_S55</DIV_PATH>
-			<MAX_DIVERSION>50</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>SB 55</ORIG_PATH>
-			<NEW_PATH>SB 405</NEW_PATH>
-			<DIV_PATH>S55_S55_S405</DIV_PATH>
-			<MAX_DIVERSION>40</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>SB 55</ORIG_PATH>
-			<NEW_PATH>SB 5</NEW_PATH>
-			<DIV_PATH>S55_S55_S5</DIV_PATH>
-			<MAX_DIVERSION>40</MAX_DIVERSION>
-		</DIVERSION>
-	</CMS>
-
-	<CMS>
-		<ID>92 - SB 5 @ 17th</ID>
-		<POSTMILE>32.4</POSTMILE>
-		<INIT_ROUTE>SB 5</INIT_ROUTE>
-		<DIVERSION>
-			<ORIG_PATH>SB 5</ORIG_PATH>
-			<NEW_PATH>SB 55</NEW_PATH>
-			<DIV_PATH>S5_S5_S55</DIV_PATH>
-			<MAX_DIVERSION>30</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>SB 55</ORIG_PATH>
-			<NEW_PATH>SB 5</NEW_PATH>
-			<DIV_PATH>S5_S55_S5</DIV_PATH>
-			<MAX_DIVERSION>50</MAX_DIVERSION>
-		</DIVERSION>
-	</CMS>
-	
-	<CMS>
-		<ID>72 - SB 55 @ Warner</ID>
-		<POSTMILE>8.6</POSTMILE>
-		<INIT_ROUTE>SB 55</INIT_ROUTE>
-		<DIVERSION>
-			<ORIG_PATH>SB 405</ORIG_PATH>
-			<NEW_PATH>SB 55</NEW_PATH>
-			<DIV_PATH>S55_S405_S55</DIV_PATH>
-			<MAX_DIVERSION>50</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>NB 405</ORIG_PATH>
-			<NEW_PATH>SB 55</NEW_PATH>
-			<DIV_PATH>S55_N405_S55</DIV_PATH>
-			<MAX_DIVERSION>50</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>SB 55</ORIG_PATH>
-			<NEW_PATH>SB 405</NEW_PATH>
-			<DIV_PATH>S55_S55_S405</DIV_PATH>
-			<MAX_DIVERSION>40</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>SB 55</ORIG_PATH>
-			<NEW_PATH>NB 405</NEW_PATH>
-			<DIV_PATH>S55_S55_N405</DIV_PATH>
-			<MAX_DIVERSION>40</MAX_DIVERSION>
-		</DIVERSION>
-	</CMS>
-	
-	<CMS>
-		<ID>94 - NB 55 @ Dyer</ID>
-		<POSTMILE>8.51</POSTMILE>
-		<INIT_ROUTE>NB 55</INIT_ROUTE>
-		<DIVERSION>
-			<ORIG_PATH>SB 5</ORIG_PATH>
-			<NEW_PATH>NB 55</NEW_PATH>
-			<DIV_PATH>N55_S5_N55</DIV_PATH>
-			<MAX_DIVERSION>50</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>NB 5</ORIG_PATH>
-			<NEW_PATH>NB 55</NEW_PATH>
-			<DIV_PATH>N55_N5_N55</DIV_PATH>
-			<MAX_DIVERSION>50</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>NB 55</ORIG_PATH>
-			<NEW_PATH>SB 5</NEW_PATH>
-			<DIV_PATH>N55_N55_S5</DIV_PATH>
-			<MAX_DIVERSION>30</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>NB 55</ORIG_PATH>
-			<NEW_PATH>NB 5</NEW_PATH>
-			<DIV_PATH>N55_N55_N5</DIV_PATH>
-			<MAX_DIVERSION>40</MAX_DIVERSION>
-		</DIVERSION>
-	</CMS>
-
-	<CMS>			
-		<ID>01 - SB 405 @ Harbor</ID>
-		<POSTMILE>11.92</POSTMILE>
-		<INIT_ROUTE>SB 405</INIT_ROUTE>
-		<DIVERSION>
-			<ORIG_PATH>SB 55</ORIG_PATH>
-			<NEW_PATH>SB 405</NEW_PATH>
-			<DIV_PATH>S405_S55_S405</DIV_PATH>
-			<MAX_DIVERSION>50</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>NB 55</ORIG_PATH>
-			<NEW_PATH>SB 405</NEW_PATH>
-			<DIV_PATH>S405_N55_S405</DIV_PATH>
-			<MAX_DIVERSION>50</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>SB 73</ORIG_PATH>
-			<NEW_PATH>SB 405</NEW_PATH>
-			<DIV_PATH>S405_S73_S405</DIV_PATH>
-			<MAX_DIVERSION>50</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>SB 405</ORIG_PATH>
-			<NEW_PATH>SB 73</NEW_PATH>
-			<DIV_PATH>S405_S405_S73</DIV_PATH>
-			<MAX_DIVERSION>20</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>SB 405</ORIG_PATH>
-			<NEW_PATH>SB 55</NEW_PATH>
-			<DIV_PATH>S405_S405_S55</DIV_PATH>
-			<MAX_DIVERSION>40</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>SB 405</ORIG_PATH>
-			<NEW_PATH>NB 55</NEW_PATH>
-			<DIV_PATH>S405_S405_N55</DIV_PATH>
-			<MAX_DIVERSION>40</MAX_DIVERSION>
-		</DIVERSION>
-	</CMS>
-	
-	
-	<CMS>
-		<ID>89 - SB 405 @ Von Karmen</ID>
-		<POSTMILE>7.4</POSTMILE>
-		<INIT_ROUTE>SB 405</INIT_ROUTE>
-		<DIVERSION>
-			<ORIG_PATH>SB 133</ORIG_PATH>
-			<NEW_PATH>SB 405</NEW_PATH>
-			<DIV_PATH>S405_S133_S405</DIV_PATH>
-			<MAX_DIVERSION>50</MAX_DIVERSION>    
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>NB 133</ORIG_PATH>
-			<NEW_PATH>SB 405</NEW_PATH>
-			<DIV_PATH>S405_N133_S405</DIV_PATH>
-			<MAX_DIVERSION>50</MAX_DIVERSION>   
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>SB 405</ORIG_PATH>
-			<NEW_PATH>SB 133</NEW_PATH>
-			<DIV_PATH>S405_S405_S133</DIV_PATH>
-			<MAX_DIVERSION>10</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>SB 405</ORIG_PATH>
-			<NEW_PATH>NB 133</NEW_PATH>
-			<DIV_PATH>S405_S405_N133</DIV_PATH>
-			<MAX_DIVERSION>10</MAX_DIVERSION>
-		</DIVERSION>
-	</CMS>
-
-	<CMS>
-		<ID>76 - SB 405 @ Jeffery</ID>
-		<POSTMILE>4.0</POSTMILE>
-		<INIT_ROUTE>SB 405</INIT_ROUTE>
-		<DIVERSION>
-			<ORIG_PATH>SB 405</ORIG_PATH>
-			<NEW_PATH>NB 133</NEW_PATH>
-			<DIV_PATH>S405_S405_N133</DIV_PATH>
-			<MAX_DIVERSION>20</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>SB 405</ORIG_PATH>
-			<NEW_PATH>SB 133</NEW_PATH>
-			<DIV_PATH>S405_S405_S133</DIV_PATH>
-			<MAX_DIVERSION>20</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>NB 133</ORIG_PATH>
-			<NEW_PATH>SB 405</NEW_PATH>
-			<DIV_PATH>S405_N133_S405</DIV_PATH>
-			<MAX_DIVERSION>50</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>SB 133</ORIG_PATH>
-			<NEW_PATH>SB 405</NEW_PATH>
-			<DIV_PATH>S405_S133_S405</DIV_PATH>
-			<MAX_DIVERSION>50</MAX_DIVERSION>
-		</DIVERSION>
-	</CMS>
-	
-	<CMS>
-		<ID>87 - NB 405 @ Harvard</ID>
-		<POSTMILE>7.3</POSTMILE>
-		<INIT_ROUTE>NB 405</INIT_ROUTE>
-		<DIVERSION>
-			<ORIG_PATH>SB 55</ORIG_PATH>
-			<NEW_PATH>NB 405</NEW_PATH>
-			<DIV_PATH>N405_S55_N405</DIV_PATH>
-			<MAX_DIVERSION>50</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>NB 55</ORIG_PATH>
-			<NEW_PATH>NB 405</NEW_PATH>
-			<DIV_PATH>N405_N55_N405</DIV_PATH>
-			<MAX_DIVERSION>50</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>NB 405</ORIG_PATH>
-			<NEW_PATH>SB 55</NEW_PATH>
-			<DIV_PATH>N405_N405_S55</DIV_PATH>
-			<MAX_DIVERSION>40</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>NB 405</ORIG_PATH>
-			<NEW_PATH>NB 55</NEW_PATH>
-			<DIV_PATH>N405_N405_N55</DIV_PATH>
-			<MAX_DIVERSION>40</MAX_DIVERSION>
-		</DIVERSION>
-	</CMS>
-
-
-	<CMS>
-		<ID>93 - NB 5 S/O Redhill</ID>
-		<POSTMILE>28.6</POSTMILE>
-		<INIT_ROUTE>NB 5</INIT_ROUTE>
-		<DIVERSION>
-			<ORIG_PATH>NB 5</ORIG_PATH>
-			<NEW_PATH>NB 55</NEW_PATH>
-			<DIV_PATH>N5_N5_N55</DIV_PATH>
-			<MAX_DIVERSION>30</MAX_DIVERSION>
-		</DIVERSION>	
-		<DIVERSION>
-			<ORIG_PATH>NB 5</ORIG_PATH>
-			<NEW_PATH>SB 55</NEW_PATH>
-			<DIV_PATH>N5_N5_S55</DIV_PATH>
-			<MAX_DIVERSION>20</MAX_DIVERSION>
-		</DIVERSION>	
-		<DIVERSION>
-			<ORIG_PATH>NB 55</ORIG_PATH>
-			<NEW_PATH>NB 5</NEW_PATH>
-			<DIV_PATH>N5_N55_N5</DIV_PATH>
-			<MAX_DIVERSION>20</MAX_DIVERSION>
-		</DIVERSION>	
-		<DIVERSION>
-			<ORIG_PATH>SB 5</ORIG_PATH>
-			<NEW_PATH>NB 5</NEW_PATH>
-			<DIV_PATH>N5_S55_N5</DIV_PATH>
-			<MAX_DIVERSION>20</MAX_DIVERSION>
-		</DIVERSION>
-	</CMS>
-
-	<CMS>
-		<ID>88 - NB 405 @ Irvine Center Drive</ID>
-		<POSTMILE>0.85</POSTMILE>
-		<INIT_ROUTE>NB 405</INIT_ROUTE>
-		<DIVERSION>
-			<ORIG_PATH>NB 405</ORIG_PATH>
-			<NEW_PATH>SB 133</NEW_PATH>
-			<DIV_PATH>N405_N405_S133</DIV_PATH>
-			<MAX_DIVERSION>20</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>SB 133</ORIG_PATH>
-			<NEW_PATH>NB 405</NEW_PATH>
-			<DIV_PATH>N405_S133_N405</DIV_PATH>
-			<MAX_DIVERSION>50</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>NB 405</ORIG_PATH>
-			<NEW_PATH>NB 55</NEW_PATH>
-			<DIV_PATH>N405_N405_N55</DIV_PATH>
-			<MAX_DIVERSION>20</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>NB 55</ORIG_PATH>
-			<NEW_PATH>NB 405</NEW_PATH>
-			<DIV_PATH>N405_N55_N405</DIV_PATH>
-			<MAX_DIVERSION>20</MAX_DIVERSION>
-		</DIVERSION>
-	</CMS>
-	
-	
-	<CMS>
-		<ID>86 - SB 405 @ New Hampshire</ID>
-		<POSTMILE>11.92</POSTMILE>
-		<INIT_ROUTE>SB 405</INIT_ROUTE>
-		<DIVERSION>
-			<ORIG_PATH>SB 405</ORIG_PATH>
-			<NEW_PATH>SB 55</NEW_PATH>
-			<DIV_PATH>S405_S405_S55</DIV_PATH>
-			<MAX_DIVERSION>40</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>SB 55</ORIG_PATH>
-			<NEW_PATH>SB 405</NEW_PATH>
-			<DIV_PATH>S405_S55_S405</DIV_PATH>
-			<MAX_DIVERSION>40</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>SB 405</ORIG_PATH>
-			<NEW_PATH>SB 73</NEW_PATH>
-			<DIV_PATH>S405_S405_S73</DIV_PATH>
-			<MAX_DIVERSION>40</MAX_DIVERSION>
-		</DIVERSION>
-	</CMS>
-	
-	<CMS>
-		<ID>97 - SB 55 @ Katella</ID>
-		<POSTMILE>14.73</POSTMILE>
-		<INIT_ROUTE>SB 55</INIT_ROUTE>
-		<DIVERSION>
-			<ORIG_PATH>SB 55</ORIG_PATH>
-			<NEW_PATH>SB 5</NEW_PATH>
-			<DIV_PATH>S55_S55_S5</DIV_PATH>
-			<MAX_DIVERSION>25</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>SB 55</ORIG_PATH>
-			<NEW_PATH>NB 5</NEW_PATH>
-			<DIV_PATH>S55_S55_N5</DIV_PATH>
-			<MAX_DIVERSION>5</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>SB 5</ORIG_PATH>
-			<NEW_PATH>SB 55</NEW_PATH>
-			<DIV_PATH>S55_S5_S55</DIV_PATH>
-			<MAX_DIVERSION>25</MAX_DIVERSION>
-		</DIVERSION>
-	</CMS>
-	
-	<CMS>
-		<ID>90 - SB 5 @ Broadway</ID>
-		<POSTMILE>38.68</POSTMILE>
-		<INIT_ROUTE>SB 5</INIT_ROUTE>
-		<DIVERSION>
-			<ORIG_PATH>SB 5</ORIG_PATH>
-			<NEW_PATH>SB 55</NEW_PATH>
-			<DIV_PATH>S5_S5_S55</DIV_PATH>
-			<MAX_DIVERSION>40</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>SB 55</ORIG_PATH>
-			<NEW_PATH>SB 5</NEW_PATH>
-			<DIV_PATH>S5_S55_S5</DIV_PATH>
-			<MAX_DIVERSION>40</MAX_DIVERSION>
-		</DIVERSION>
-	</CMS>
-	
-	<CMS>
-		<ID>44 - SB 5 @ Anaheim</ID>
-		<POSTMILE>35.6</POSTMILE>
-		<INIT_ROUTE>SB 5</INIT_ROUTE>
-		<DIVERSION>
-			<ORIG_PATH>SB 5</ORIG_PATH>
-			<NEW_PATH>SB 55</NEW_PATH>
-			<DIV_PATH>S5_S5_S55</DIV_PATH>
-			<MAX_DIVERSION>40</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>SB 55</ORIG_PATH>
-			<NEW_PATH>SB 5</NEW_PATH>
-			<DIV_PATH>S5_S55_S5</DIV_PATH>
-			<MAX_DIVERSION>40</MAX_DIVERSION>
-		</DIVERSION>
-	</CMS>
-	
-	<CMS>
-		<ID>31 - NB 5 @ Aeropuerto</ID>
-		<POSTMILE>7.84</POSTMILE>
-		<INIT_ROUTE>NB 5</INIT_ROUTE>
-		<DIVERSION>
-			<ORIG_PATH>NB 5</ORIG_PATH>
-			<NEW_PATH>NB 405</NEW_PATH>
-			<DIV_PATH>N5_N5_N405</DIV_PATH>
-			<MAX_DIVERSION>40</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>NB 405</ORIG_PATH>
-			<NEW_PATH>NB 5</NEW_PATH>
-			<DIV_PATH>N5_N405_N5</DIV_PATH>
-			<MAX_DIVERSION>40</MAX_DIVERSION>
-		</DIVERSION>
-	</CMS>
-	
-	<CMS>
-		<ID>74 - NB 5 @ Vista Hermosa</ID>
-		<POSTMILE>7.84</POSTMILE>
-		<INIT_ROUTE>NB 5</INIT_ROUTE>
-		<DIVERSION>
-			<ORIG_PATH>NB 5</ORIG_PATH>
-			<NEW_PATH>NB 405</NEW_PATH>
-			<DIV_PATH>N5_N5_N405</DIV_PATH>
-			<MAX_DIVERSION>20</MAX_DIVERSION>
-		</DIVERSION>
-		<DIVERSION>
-			<ORIG_PATH>NB 405</ORIG_PATH>
-			<NEW_PATH>NB 5</NEW_PATH>
-			<DIV_PATH>N5_N405_N5</DIV_PATH>
-			<MAX_DIVERSION>20</MAX_DIVERSION>
-		</DIVERSION>
-	</CMS>
-	
-</DIVERSION_LIST>
Index: unk/config/testConfig/cad_simulator_logging.properties
===================================================================
--- /trunk/config/testConfig/cad_simulator_logging.properties	(revision 54)
+++ 	(revision )
@@ -1,16 +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
-
Index: unk/config/testConfig/cad_simulator_console_config.properties
===================================================================
--- /trunk/config/testConfig/cad_simulator_console_config.properties	(revision 229)
+++ 	(revision )
@@ -1,11 +1,0 @@
-CADClientPort          = 4444 
-CoordinatorRMIPort     = 4445 
-CADRmiPort             = 4446
-CMSDiversionXML        = config/cmsdiversions.xml
-#UserInterface          = tmcsim.cadsimulator.viewer.CADSimulatorViewer
-UserInterface          = tmcsim.cadsimulator.viewer.CADConsoleViewer
-AudioFileLocation      = audio/
-ParamicsProperties     = config/testConfig/cad_simulator_paramics_config.properties
-ATMSProperties         = config/testConfig/cad_simulator_atms_config.properties
-TrafficMgrProperties   = config/testConfig/traffic_model_config.properties
-MediaProperties        = config/testConfig/cad_simulator_media_config.properties
Index: unk/config/testConfig/cad_simulator_atms_config.properties
===================================================================
--- /trunk/config/testConfig/cad_simulator_atms_config.properties	(revision 32)
+++ 	(revision )
@@ -1,4 +1,0 @@
-ATMSHost = 192.168.251.27
-Username = atms_mgr
-Password = atms_d12uci1
-ImageDir = /opt/d12uci/user_config/cctv
Index: unk/config/testConfig/paramics_communicator_config.properties
===================================================================
--- /trunk/config/testConfig/paramics_communicator_config.properties	(revision 48)
+++ 	(revision )
@@ -1,4 +1,0 @@
-#
-#Wed Jun 14 15:40:00 PDT 2006
-WorkingDirectory=./
-SocketPort=4450
Index: unk/config/testConfig/sim_manager_smoketest_config.properties
===================================================================
--- /trunk/config/testConfig/sim_manager_smoketest_config.properties	(revision 32)
+++ 	(revision )
@@ -1,4 +1,0 @@
-CADSimulatorHost       = 127.0.0.1
-CADSimulatorRMIPort    = 4445
-ScriptDir              = scripts
-FakeParamicsConnection = true
Index: unk/config/testConfig/sim_manager_config.properties
===================================================================
--- /trunk/config/testConfig/sim_manager_config.properties	(revision 32)
+++ 	(revision )
@@ -1,4 +1,0 @@
-CADSimulatorHost       = 127.0.0.1
-CADSimulatorRMIPort    = 4445
-ScriptDir              = scripts
-FakeParamicsConnection = true
Index: unk/config/testConfig/cad_simulator_smoketest_config.properties
===================================================================
--- /trunk/config/testConfig/cad_simulator_smoketest_config.properties	(revision 32)
+++ 	(revision )
@@ -1,8 +1,0 @@
-CADClientPort          = 4444 
-CoordinatorRMIPort     = 4445 
-CADRmiPort             = 4446
-CMSDiversionXML        = config/testConfig/cmsdiversions.xml
-AudioFileLocation      = audio/
-ParamicsProperties     = config/testConfig/cad_simulator_paramics_config.properties
-ATMSProperties         = config/testConfig/cad_simulator_atms_config.properties
-MediaProperties        = config/testConfig/cad_simulator_media_config.properties
Index: unk/config/testConfig/cad_client_config.properties
===================================================================
--- /trunk/config/testConfig/cad_client_config.properties	(revision 32)
+++ 	(revision )
@@ -1,11 +1,0 @@
-#
-#Wed Apr 05 13:48:05 PDT 2006
-CADPosition            = 2
-CADSimulatorHost       = 127.0.0.1
-CADUserID              = A1245
-CADSimulatorSocketPort = 4444
-CADRmiPort             = 4446
-#KeyboardType           = CAD
-#DisplayType            = FRAME
-DisplayType            = FULL_SCREEN
-KeyboardType           = STD
Index: unk/config/testConfig/cad_simulator_media_config.properties
===================================================================
--- /trunk/config/testConfig/cad_simulator_media_config.properties	(revision 32)
+++ 	(revision )
@@ -1,2 +1,0 @@
-#DVDPlayerXML           = config/dvdplayers.xml
-StillImagesXML         = config/testConfig/stillimages.xml
Index: unk/config/testConfig/cad_simulator_config.properties
===================================================================
--- /trunk/config/testConfig/cad_simulator_config.properties	(revision 189)
+++ 	(revision )
@@ -1,11 +1,0 @@
-CADClientPort          = 4444 
-CoordinatorRMIPort     = 4445 
-CADRmiPort             = 4446
-CMSDiversionXML        = config/testConfig/cmsdiversions.xml
-UserInterface          = tmcsim.cadsimulator.viewer.CADServerViewer
-#UserInterface          = tmcsim.cadsimulator.viewer.CADConsoleViewer
-AudioFileLocation      = audio/
-ParamicsProperties     = config/testConfig/cad_simulator_paramics_config.properties
-ATMSProperties         = config/testConfig/cad_simulator_atms_config.properties
-TrafficMgrProperties   = config/testConfig/traffic_model_config.properties
-MediaProperties        = config/testConfig/cad_simulator_media_config.properties
Index: unk/config/testConfig/svn-version.txt
===================================================================
--- /trunk/config/testConfig/svn-version.txt	(revision 32)
+++ 	(revision )
@@ -1,4 +1,0 @@
-18M
-
-        # Do not edit. This file is autogenerated by the Ant build script #
-    
Index: unk/config/testConfig/cadUsers.xml
===================================================================
--- /trunk/config/testConfig/cadUsers.xml	(revision 32)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> 
-<CAD_USERS>
-	<USER>
-		<ID>A12345</ID>
-		<PERMISSION_LEVEL>CHP</PERMISSION_LEVEL>
-	</USER>
-	<USER>
-		<ID>A11111</ID>
-		<PERMISSION_LEVEL>TMC</PERMISSION_LEVEL>
-	</USER>
-	<USER>
-		<ID>A22222</ID>
-		<PERMISSION_LEVEL>TMC</PERMISSION_LEVEL>
-	</USER>
-	<USER>
-		<ID>A33333</ID>
-		<PERMISSION_LEVEL>TMC</PERMISSION_LEVEL>
-	</USER>
-	<USER>
-		<ID>A44444</ID>
-		<PERMISSION_LEVEL>TMC</PERMISSION_LEVEL>
-	</USER>
-	<USER>
-		<ID>A55555</ID>
-		<PERMISSION_LEVEL>TMC</PERMISSION_LEVEL>
-	</USER>
-</CAD_USERS>
