TAO replacements

30 files changed, 30 insertions, 30 deletions

diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/default.conf.xml b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/default.conf.xml
index 03ac9dfa183..ecc80c20b90 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/default.conf.xml
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/default.conf.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Latency/Single_Threaded/default.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <!--  -->
  <!--  The file is empty, forcing the ORB to use its default configuration. -->
  <!--  -->
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/svc.conf.xml b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/svc.conf.xml
index 51612b28d17..69696c83a17 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/svc.conf.xml
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/svc.conf.xml
@@ -2,7 +2,7 @@
 <!-- Converted from ./performance-tests/Latency/Single_Threaded/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
  <!--  -->
- <!--  $Id$ -->
+ <!--   -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
  <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/default.conf.xml b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/default.conf.xml
index 03ac9dfa183..ecc80c20b90 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/default.conf.xml
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/default.conf.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Latency/Single_Threaded/default.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <!--  -->
  <!--  The file is empty, forcing the ORB to use its default configuration. -->
  <!--  -->
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf.xml b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf.xml
index 51612b28d17..69696c83a17 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf.xml
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf.xml
@@ -2,7 +2,7 @@
 <!-- Converted from ./performance-tests/Latency/Single_Threaded/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
  <!--  -->
- <!--  $Id$ -->
+ <!--   -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
  <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_reactive.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_reactive.conf.xml
index c696f84f7c1..c423959cc06 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_reactive.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_reactive.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_reactive.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECSupplierFilter null -ECDispatching reactive"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_rtcorba.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_rtcorba.conf.xml
index e50b5ee76a0..59724386db0 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_rtcorba.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_rtcorba.conf.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_rtcorba.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <static id="RT_ORB_Loader" params="-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping continuous"/>
  <static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECSupplierFilter null -ECDispatching reactive"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_threaded.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_threaded.conf.xml
index 3af46f8016d..561f347f8e3 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_threaded.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_threaded.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_threaded.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECSupplierFilter null -ECDispatching mt -ECDispatchingThreads 2"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_null.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_null.conf.xml
index 556a11f3e02..d3d7afdc4b5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_null.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_null.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_null.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECSupplierFilter null -ECDispatching reactive"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_per_supplier.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_per_supplier.conf.xml
index bc2303a1caf..d2585db2396 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_per_supplier.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_per_supplier.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_per_supplier.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECSupplierFilter per-supplier -ECDispatching reactive"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_read.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_read.conf.xml
index aad39607a11..39d7ce56b1e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_read.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_read.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_read.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:copy_on_read:list -ECProxyPushSupplierCollection mt:copy_on_read:list -ECSupplierFilter null"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_write.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_write.conf.xml
index ddb4ff44a7c..88d391fa4dd 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_write.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_write.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_write.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECSupplierFilter null"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_delayed.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_delayed.conf.xml
index a7abef8d899..1b9231f807c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_delayed.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_delayed.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_delayed.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:delayed:list -ECProxyPushSupplierCollection mt:delayed:list -ECSupplierFilter null"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_immediate.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_immediate.conf.xml
index ebe10379b5b..0b6104a08cb 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_immediate.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_immediate.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_immediate.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:immediate:list -ECProxyPushSupplierCollection mt:immediate:list -ECSupplierFilter null"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf.xml
index 3e71148d35b..e419fe86f4f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <static id="EC_Factory" params="-ECObserver basic -ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/realtime.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/realtime.conf.xml
index 86ba9fd5fbf..803b51fac1d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/realtime.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/realtime.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/realtime.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <static id="RT_ORB_Loader" params="-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping direct"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/realtime.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/realtime.conf.xml
index c10ec68a86d..009fd8b2c5c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/realtime.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/realtime.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/realtime.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <static id="RT_ORB_Loader" params="-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping continuous"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_reactive.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_reactive.conf.xml
index f74abe683cf..123297d1fc2 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_reactive.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_reactive.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_reactive.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <static id="EC_Factory" params="-ECDispatching reactive"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_rtcorba.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_rtcorba.conf.xml
index cad852179de..d46256bdc47 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_rtcorba.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_rtcorba.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_rtcorba.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <static id="RT_ORB_Loader" params="-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping continuous"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_threaded.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_threaded.conf.xml
index 2ad5c61621a..a8620197797 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_threaded.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_threaded.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_threaded.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <static id="EC_Factory" params="-ECDispatching mt -ECDispatchingThreads 2"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_read.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_read.conf.xml
index 72146ccc298..434202d9c59 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_read.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_read.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_read.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:copy_on_read:list -ECProxyPushSupplierCollection mt:copy_on_read:list -ECSupplierFilter null"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_write.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_write.conf.xml
index 73a63bf5ba9..dd8c64b6757 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_write.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_write.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_write.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECSupplierFilter null"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_delayed.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_delayed.conf.xml
index b2461181885..324d2af368c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_delayed.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_delayed.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_delayed.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:delayed:list -ECProxyPushSupplierCollection mt:delayed:list -ECSupplierFilter null"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_immediate.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_immediate.conf.xml
index 37ab7100c94..b77daa62b2d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_immediate.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_immediate.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_immediate.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:immediate:list -ECProxyPushSupplierCollection mt:immediate:list -ECSupplierFilter null"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_null.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_null.conf.xml
index 5d41dbe8e18..0f746aaafa9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_null.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_null.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_null.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <static id="EC_Factory" params="-ECSupplierFilter null"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_per_supplier.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_per_supplier.conf.xml
index 81245d1f970..089ed4650a6 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_per_supplier.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_per_supplier.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_per_supplier.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <static id="EC_Factory" params="-ECSupplierFilter per-supplier"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/roundtrip.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/roundtrip.conf.xml
index 3c6656cc873..2f528fa5b55 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/roundtrip.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/roundtrip.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/roundtrip.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id$ -->
+ <!--   -->
  <static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.inl
index 66344be0f08..674b092175f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.inl
@@ -1,7 +1,7 @@
 /**
  * @file ORB_Task.inl
  *
-` * $Id$
+` * 
  *
  * @author Carlos O'Ryan <coryan@uci.edu>
  */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.inl
index ac24f29094c..356038b93e7 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.inl
@@ -1,7 +1,7 @@
 /**
  * @file ORB_Task_Activator.inl
  *
-` * $Id$
+` * 
  *
  * @author Carlos O'Ryan <coryan@uci.edu>
  */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.inl
index b620c992a2d..8f21054cd43 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.inl
@@ -1,7 +1,7 @@
 /**
  * @file Send_Task_Stopper.inl
  *
-` * $Id$
+` * 
  *
  * @author Carlos O'Ryan <coryan@uci.edu>
  */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.inl
index 147a3e53769..5cfe99c9ef9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.inl
@@ -1,7 +1,7 @@
 /**
  * @file Task_Activator.inl
  *
-` * $Id$
+` * 
  *
  * @author Carlos O'Ryan <coryan@uci.edu>
  */