Fri Oct 7 07:55:46 UTC 2011 Marcel Smit <msmit@remedy.nl>

        * examples/PluggableUDP/tests/Performance/svc.conf.xml:
        * examples/PluggableUDP/tests/SimplePerformance/svc.conf.xml:
        * examples/Simple/time-date/client.conf.xml:
        * examples/Simple/time-date/svc.conf.xml:
        * interop-tests/wchar/build.xml:
        * orbsvcs/Concurrency_Service/svc.conf.xml:
        * orbsvcs/ImplRepo_Service/repository.xml:
        * orbsvcs/Notify_Service/svc.conf.xml:
        * orbsvcs/TAO_Service/svc.conf.xml:
        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf.xml:
        * orbsvcs/tests/CosEvent/Basic/svc.pull.conf.xml:
        * orbsvcs/tests/Event/Basic/control.conf.xml:
        * orbsvcs/tests/Event/UDP/svc.conf.xml:
        * orbsvcs/tests/FaultTolerance/IOGR/svc.conf.xml:
        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf.xml:
        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf.xml:
        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf.xml:
        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf.xml:
        * orbsvcs/tests/Miop/McastHello/client.conf.xml:
        * orbsvcs/tests/Miop/McastHello/server.conf.xml:
        * orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf.xml:
        * orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf.xml:
        * orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf.xml:
        * orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf.xml:
        * orbsvcs/tests/Security/MT_IIOP_SSL/client.conf.xml:
        * orbsvcs/tests/Security/MT_IIOP_SSL/server.conf.xml:
        * orbsvcs/tests/Security/MT_SSLIOP/client.conf.xml:
        * orbsvcs/tests/Security/MT_SSLIOP/server.conf.xml:
        * orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml:
        * orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml:
        * orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf.xml:
        * performance-tests/RTCorba/Thread_Pool/native-svc.conf.xml:
        * performance-tests/RTCorba/Thread_Pool/svc.conf.xml:
        * performance-tests/Throughput/svc.conf.xml:
        * tests/AMI/exclusive.conf.xml:
        * tests/AMI/muxed.conf.xml:
        * tests/AMI/server.conf.xml:
        * tests/AMI_Timeouts/svc.conf.xml:
        * tests/Bug_3251_Regression/Bug_3251.conf.xml:
        * tests/Bug_3801_Regression/exclusive.conf.xml:
        * tests/Bug_3801_Regression/muxed.conf.xml:
        * tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf.xml:
        * tests/POA/Explicit_Activation/alternate.conf.xml:
        * tests/RTCORBA/Banded_Connections/svc.conf.xml:
        * tests/RTCORBA/Client_Propagated/svc.conf.xml:
        * tests/RTCORBA/Client_Protocol/svc.conf.xml:
        * tests/RTCORBA/Collocation/continuous.conf.xml:
        * tests/RTCORBA/Collocation/svc.conf.xml:
        * tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml:
        * tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml:
        * tests/RTCORBA/Dynamic_Thread_Pool/svc.conf.xml:
        * tests/RTCORBA/Explicit_Binding/svc.conf.xml:
        * tests/RTCORBA/Linear_Priority/svc.conf.xml:
        * tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf.xml:
        * tests/RTCORBA/Persistent_IOR/continuous.conf.xml:
        * tests/RTCORBA/Policy_Combinations/svc.conf.xml:
        * tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml:
        * tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf.xml:
        * tests/RTCORBA/Server_Declared/continuous.conf.xml:
        * tests/RTCORBA/Server_Declared/svc.conf.xml:
        * tests/RTCORBA/Server_Protocol/server_iiop.conf.xml:
        * tests/RTCORBA/Server_Protocol/server_reverse.conf.xml:
        * tests/RTCORBA/Server_Protocol/server_reverse_nt.conf.xml:
        * tests/RTCORBA/Server_Protocol/server_shmiop.conf.xml:
        * tests/RTCORBA/Server_Protocol/server_uiop.conf.xml:
        * tests/RTCORBA/Thread_Pool/continuous.conf.xml:
        * tests/RTCORBA/Thread_Pool/svc.conf.xml:
          Fuzz: No Id-tags.

68 files changed, 290 insertions, 31 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c7fa1b581b3..df1eb0d8082 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,74 @@
+Fri Oct  7 07:55:46 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * examples/PluggableUDP/tests/Performance/svc.conf.xml:
+        * examples/PluggableUDP/tests/SimplePerformance/svc.conf.xml:
+        * examples/Simple/time-date/client.conf.xml:
+        * examples/Simple/time-date/svc.conf.xml:
+        * interop-tests/wchar/build.xml:
+        * orbsvcs/Concurrency_Service/svc.conf.xml:
+        * orbsvcs/ImplRepo_Service/repository.xml:
+        * orbsvcs/Notify_Service/svc.conf.xml:
+        * orbsvcs/TAO_Service/svc.conf.xml:
+        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf.xml:
+        * orbsvcs/tests/CosEvent/Basic/svc.pull.conf.xml:
+        * orbsvcs/tests/Event/Basic/control.conf.xml:
+        * orbsvcs/tests/Event/UDP/svc.conf.xml:
+        * orbsvcs/tests/FaultTolerance/IOGR/svc.conf.xml:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf.xml:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf.xml:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf.xml:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf.xml:
+        * orbsvcs/tests/Miop/McastHello/client.conf.xml:
+        * orbsvcs/tests/Miop/McastHello/server.conf.xml:
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf.xml:
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf.xml:
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf.xml:
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf.xml:
+        * orbsvcs/tests/Security/MT_IIOP_SSL/client.conf.xml:
+        * orbsvcs/tests/Security/MT_IIOP_SSL/server.conf.xml:
+        * orbsvcs/tests/Security/MT_SSLIOP/client.conf.xml:
+        * orbsvcs/tests/Security/MT_SSLIOP/server.conf.xml:
+        * orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml:
+        * orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml:
+        * orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf.xml:
+        * performance-tests/RTCorba/Thread_Pool/native-svc.conf.xml:
+        * performance-tests/RTCorba/Thread_Pool/svc.conf.xml:
+        * performance-tests/Throughput/svc.conf.xml:
+        * tests/AMI/exclusive.conf.xml:
+        * tests/AMI/muxed.conf.xml:
+        * tests/AMI/server.conf.xml:
+        * tests/AMI_Timeouts/svc.conf.xml:
+        * tests/Bug_3251_Regression/Bug_3251.conf.xml:
+        * tests/Bug_3801_Regression/exclusive.conf.xml:
+        * tests/Bug_3801_Regression/muxed.conf.xml:
+        * tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf.xml:
+        * tests/POA/Explicit_Activation/alternate.conf.xml:
+        * tests/RTCORBA/Banded_Connections/svc.conf.xml:
+        * tests/RTCORBA/Client_Propagated/svc.conf.xml:
+        * tests/RTCORBA/Client_Protocol/svc.conf.xml:
+        * tests/RTCORBA/Collocation/continuous.conf.xml:
+        * tests/RTCORBA/Collocation/svc.conf.xml:
+        * tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml:
+        * tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml:
+        * tests/RTCORBA/Dynamic_Thread_Pool/svc.conf.xml:
+        * tests/RTCORBA/Explicit_Binding/svc.conf.xml:
+        * tests/RTCORBA/Linear_Priority/svc.conf.xml:
+        * tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf.xml:
+        * tests/RTCORBA/Persistent_IOR/continuous.conf.xml:
+        * tests/RTCORBA/Policy_Combinations/svc.conf.xml:
+        * tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml:
+        * tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf.xml:
+        * tests/RTCORBA/Server_Declared/continuous.conf.xml:
+        * tests/RTCORBA/Server_Declared/svc.conf.xml:
+        * tests/RTCORBA/Server_Protocol/server_iiop.conf.xml:
+        * tests/RTCORBA/Server_Protocol/server_reverse.conf.xml:
+        * tests/RTCORBA/Server_Protocol/server_reverse_nt.conf.xml:
+        * tests/RTCORBA/Server_Protocol/server_shmiop.conf.xml:
+        * tests/RTCORBA/Server_Protocol/server_uiop.conf.xml:
+        * tests/RTCORBA/Thread_Pool/continuous.conf.xml:
+        * tests/RTCORBA/Thread_Pool/svc.conf.xml:
+          Fuzz: No Id-tags.
+
 Wed Sep 28 12:46:14 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/BiDir_GIOP/BiDir_GIOP.mpc:
diff --git a/TAO/examples/PluggableUDP/tests/Performance/svc.conf.xml b/TAO/examples/PluggableUDP/tests/Performance/svc.conf.xml
index 63bbeb081b2..aa5446671c3 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/svc.conf.xml
+++ b/TAO/examples/PluggableUDP/tests/Performance/svc.conf.xml
@@ -1,5 +1,8 @@
 <?xml version='1.0'?>
 <!-- Converted from ./examples/PluggableUDP/tests/Performance/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBProtocolFactory DIOP_Factory -ORBReactorType tp"/>
 </ACE_Svc_Conf>
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/svc.conf.xml b/TAO/examples/PluggableUDP/tests/SimplePerformance/svc.conf.xml
index 92362bacdf0..00ab337953a 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/svc.conf.xml
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/svc.conf.xml
@@ -1,5 +1,8 @@
 <?xml version='1.0'?>
 <!-- Converted from ./examples/PluggableUDP/tests/SimplePerformance/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBProtocolFactory DIOP_Factory -ORBReactorType tp"/>
 </ACE_Svc_Conf>
diff --git a/TAO/examples/Simple/time-date/client.conf.xml b/TAO/examples/Simple/time-date/client.conf.xml
index 7864e7bebae..313f97e2ebf 100644
--- a/TAO/examples/Simple/time-date/client.conf.xml
+++ b/TAO/examples/Simple/time-date/client.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from ./examples/Simple/time-date/client.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  $Id$ -->
  <!--  Empty configuration file, the default configuration works just fine -->
  <!--  for the client, but the svc.conf file (or -ORBSkipServiceConfigOpen) -->
diff --git a/TAO/examples/Simple/time-date/svc.conf.xml b/TAO/examples/Simple/time-date/svc.conf.xml
index 70390a8d042..977ebe28e49 100644
--- a/TAO/examples/Simple/time-date/svc.conf.xml
+++ b/TAO/examples/Simple/time-date/svc.conf.xml
@@ -1,7 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from ./examples/Simple/time-date/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
  <!--  $Id$ -->
+ <!--  -->
  <!--  Define a special Reactor for single-threaded configurations.  Refer -->
  <!--  to README for details.   -->
  <dynamic id="Resource_Factory" type="Service_Object">
diff --git a/TAO/interop-tests/wchar/build.xml b/TAO/interop-tests/wchar/build.xml
index f948d0a5939..ee57ed6e5ec 100644
--- a/TAO/interop-tests/wchar/build.xml
+++ b/TAO/interop-tests/wchar/build.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--  -->
+<!--  $Id$ -->
+<!--  -->
+
 <!--
 /*
  *
diff --git a/TAO/orbsvcs/Concurrency_Service/svc.conf.xml b/TAO/orbsvcs/Concurrency_Service/svc.conf.xml
index ac491a2ce35..8efd955f7c3 100644
--- a/TAO/orbsvcs/Concurrency_Service/svc.conf.xml
+++ b/TAO/orbsvcs/Concurrency_Service/svc.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/Concurrency_Service/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  This service must use a thread-per-connection model to enable the -->
  <!--  server to block in a dedicated thread, i.e., one for each client. -->
  <!--  The concurrency service will not run in the reactive model. -->
diff --git a/TAO/orbsvcs/ImplRepo_Service/repository.xml b/TAO/orbsvcs/ImplRepo_Service/repository.xml
index d6b5ab4638a..d30518f9236 100644
--- a/TAO/orbsvcs/ImplRepo_Service/repository.xml
+++ b/TAO/orbsvcs/ImplRepo_Service/repository.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0"?>
 <ImplementationRepository>
-	<Servers name="test" activator="MYHOST" command_line="mysrv" working_dir="mydir" activation_mode="NORMAL" start_limit="1" partial_ior="" ior="">
-	</Servers>
-	<Servers name="test2" activator="MYHOST" command_line="" working_dir="" activation_mode="NORMAL" start_limit="1" partial_ior="" ior="">
-	</Servers>
-	<Activators name="MYHOST" token="1610927480" ior="IOR:010000002b00000049444c3a496d706c656d656e746174696f6e5265706f7369746f72792f416374697661746f723a312e300000010000000000000090000000010102cd150000004a555354414c49454e2e6f63697765622e636f6d00cd1f083900000014010f004e555000000017000000000100000000496d525f416374697661746f7200000000000100000054414f496d52416374697661746f7200000002000000000000000800000001cdcdcd004f4154010000001400000001cdcdcd01000100000000000901010000000000"/>
+  <!--  -->
+  <!--  $Id$ -->
+  <!--  -->
+  <Servers name="test" activator="MYHOST" command_line="mysrv" working_dir="mydir" activation_mode="NORMAL" start_limit="1" partial_ior="" ior="">
+  </Servers>
+  <Servers name="test2" activator="MYHOST" command_line="" working_dir="" activation_mode="NORMAL" start_limit="1" partial_ior="" ior="">
+  </Servers>
+  <Activators name="MYHOST" token="1610927480" ior="IOR:010000002b00000049444c3a496d706c656d656e746174696f6e5265706f7369746f72792f416374697661746f723a312e300000010000000000000090000000010102cd150000004a555354414c49454e2e6f63697765622e636f6d00cd1f083900000014010f004e555000000017000000000100000000496d525f416374697661746f7200000000000100000054414f496d52416374697661746f7200000002000000000000000800000001cdcdcd004f4154010000001400000001cdcdcd01000100000000000901010000000000"/>
 </ImplementationRepository>
diff --git a/TAO/orbsvcs/Notify_Service/svc.conf.xml b/TAO/orbsvcs/Notify_Service/svc.conf.xml
index 237d7598804..32497124772 100644
--- a/TAO/orbsvcs/Notify_Service/svc.conf.xml
+++ b/TAO/orbsvcs/Notify_Service/svc.conf.xml
@@ -1,5 +1,8 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/Notify_Service/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <static id="Notify_Default_Event_Manager_Objects_Factory" params="-DispatchingThreads 1"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/TAO_Service/svc.conf.xml b/TAO/orbsvcs/TAO_Service/svc.conf.xml
index 6601b96b6ee..cc955f4885e 100644
--- a/TAO/orbsvcs/TAO_Service/svc.conf.xml
+++ b/TAO/orbsvcs/TAO_Service/svc.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/TAO_Service/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  Dynamically configure the naming service into the application process. -->
  <!-- dynamic TAO_Naming_Loader Service_Object * TAO_CosNaming:_make_TAO_Naming_Loader () "dummy -o ns.ior" -->
  <!--  Dynamically configure the default Event Service Factory -->
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf.xml b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf.xml
index ef8e8645e5b..4baaf351a7f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf.xml
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <dynamic id="AV_Default_Resource_Factory" type="Service_Object">
    <initializer path="TAO_AV" init="_make_TAO_AV_Default_Resource_Factory"/>
  </dynamic>
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/svc.pull.conf.xml b/TAO/orbsvcs/tests/CosEvent/Basic/svc.pull.conf.xml
index 14073ec2a16..79cf07751ca 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/svc.pull.conf.xml
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/svc.pull.conf.xml
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/tests/CosEvent/Basic/svc.pull.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
  <!--  $Id$ -->
+ <!--  -->
  <static id="CEC_Factory" params="-CECReactivePullingPeriod 10000"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Event/Basic/control.conf.xml b/TAO/orbsvcs/tests/Event/Basic/control.conf.xml
index 05dd8b01c20..555bb676ccd 100644
--- a/TAO/orbsvcs/tests/Event/Basic/control.conf.xml
+++ b/TAO/orbsvcs/tests/Event/Basic/control.conf.xml
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/tests/Event/Basic/control.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
  <!--  $Id$ -->
+ <!--  -->
  <static id="EC_Factory" params="-ECConsumerControl reactive -ECSupplierControl reactive -ECConsumerControlPeriod 50000 -ECSupplierControlPeriod 50000"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Event/UDP/svc.conf.xml b/TAO/orbsvcs/tests/Event/UDP/svc.conf.xml
index 159faa97abc..3e6b6eb22aa 100644
--- a/TAO/orbsvcs/tests/Event/UDP/svc.conf.xml
+++ b/TAO/orbsvcs/tests/Event/UDP/svc.conf.xml
@@ -1,6 +1,8 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/examples/RtEC/MCast/svc.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 -ECDispatching reactive -ECScheduling null -ECFiltering prefix -ECSupplierFilter per-supplier"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/svc.conf.xml b/TAO/orbsvcs/tests/FaultTolerance/IOGR/svc.conf.xml
index b26c9398b5b..be93f9abea5 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/svc.conf.xml
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/svc.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/tests/FaultTolerance/IOGR/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <dynamic id="FT_ClientService_Activate" type="Service_Object">
    <initializer path="TAO_FT_ClientORB" init="_make_TAO_FT_ClientService_Activate"/>
  </dynamic>
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf.xml b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf.xml
index 289810f7d22..37af1733d3b 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf.xml
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf.xml
@@ -1,7 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from windows.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id $ -->
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <dynamic id="Advanced_Resource_Factory" type="Service_Object">
    <initializer path="TAO_Strategies" init="_make_TAO_Advanced_Resource_Factory" params="-ORBReactorType select_mt"/>
  </dynamic>
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf.xml b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf.xml
index 289810f7d22..3f408177e69 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf.xml
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <!-- Converted from windows.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id $ -->
+ <!--  $Id$ -->
  <dynamic id="Advanced_Resource_Factory" type="Service_Object">
    <initializer path="TAO_Strategies" init="_make_TAO_Advanced_Resource_Factory" params="-ORBReactorType select_mt"/>
  </dynamic>
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf.xml b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf.xml
index 289810f7d22..37af1733d3b 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf.xml
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf.xml
@@ -1,7 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from windows.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id $ -->
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <dynamic id="Advanced_Resource_Factory" type="Service_Object">
    <initializer path="TAO_Strategies" init="_make_TAO_Advanced_Resource_Factory" params="-ORBReactorType select_mt"/>
  </dynamic>
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf.xml b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf.xml
index 289810f7d22..37af1733d3b 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf.xml
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf.xml
@@ -1,7 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from windows.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  $Id $ -->
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <dynamic id="Advanced_Resource_Factory" type="Service_Object">
    <initializer path="TAO_Strategies" init="_make_TAO_Advanced_Resource_Factory" params="-ORBReactorType select_mt"/>
  </dynamic>
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.conf.xml b/TAO/orbsvcs/tests/Miop/McastHello/client.conf.xml
index 17625811005..5e59695a48b 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/client.conf.xml
+++ b/TAO/orbsvcs/tests/Miop/McastHello/client.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/tests/Miop/McastHello/client.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <dynamic id="UIPMC_Factory" type="Service_Object">
    <initializer path="TAO_PortableGroup" init="_make_TAO_UIPMC_Protocol_Factory"/>
  </dynamic>
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.conf.xml b/TAO/orbsvcs/tests/Miop/McastHello/server.conf.xml
index 22bb269016c..a7375a33b72 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/server.conf.xml
+++ b/TAO/orbsvcs/tests/Miop/McastHello/server.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/tests/Miop/McastHello/server.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <dynamic id="UIPMC_Factory" type="Service_Object">
    <initializer path="TAO_PortableGroup" init="_make_TAO_UIPMC_Protocol_Factory"/>
  </dynamic>
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf.xml b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf.xml
index 686b6f6e4ba..721457a7d45 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf.xml
@@ -1,5 +1,8 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <static id="Notify_Default_Event_Manager_Objects_Factory" params="-DispatchingThreads 1"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf.xml b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf.xml
index f72d4165927..5e3a436e51a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf.xml
@@ -1,5 +1,8 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <static id="Notify_Default_Event_Manager_Objects_Factory" params="-AllocateTaskperProxy -SourceThreads 2"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf.xml b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf.xml
index b8b7e4f8e71..d2e20177daf 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf.xml
@@ -1,5 +1,8 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <static id="Notify_Default_Event_Manager_Objects_Factory"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf.xml b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf.xml
index 0673554e968..fb2f0477d6a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf.xml
@@ -1,5 +1,8 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <static id="Resource_Factory" params="-ORBReactorMaskSignals 0"/>
 </ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf.xml b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf.xml
index a39f09f3680..c8eebf9479a 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf.xml
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/tests/Security/MT_SSLIOP/client.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <dynamic id="SSLIOP_Factory" type="Service_Object">
    <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLCertificate PEM:selfsigncert.pem"/>
  </dynamic>
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf.xml b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf.xml
index abff554e12c..4bd4209ae7b 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf.xml
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/tests/Security/MT_SSLIOP/server.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <dynamic id="SSLIOP_Factory" type="Service_Object">
    <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLPrivateKey  PEM:pvtkey.pem -SSLCertificate PEM:selfsigncert.pem"/>
  </dynamic>
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf.xml b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf.xml
index a39f09f3680..c8eebf9479a 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf.xml
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/tests/Security/MT_SSLIOP/client.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <dynamic id="SSLIOP_Factory" type="Service_Object">
    <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLCertificate PEM:selfsigncert.pem"/>
  </dynamic>
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf.xml b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf.xml
index abff554e12c..4bd4209ae7b 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf.xml
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from ./orbsvcs/tests/Security/MT_SSLIOP/server.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <dynamic id="SSLIOP_Factory" type="Service_Object">
    <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLPrivateKey  PEM:pvtkey.pem -SSLCertificate PEM:selfsigncert.pem"/>
  </dynamic>
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml
index 50bb24f73ee..022434ab6bb 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml
@@ -1,9 +1,12 @@
 <?xml version='1.0'?>
 <!-- Converted from client.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
-   <dynamic id="SSLIOP_Factory" type="Service_Object">
-      <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLPrivateKey PEM:pvtkey-client.pem -SSLCertificate PEM:selfsigncert-client.pem"/>
-   </dynamic>
-   <static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/>
+  <!--  -->
+  <!--  $Id$ -->
+  <!--  -->
+  <dynamic id="SSLIOP_Factory" type="Service_Object">
+    <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLPrivateKey PEM:pvtkey-client.pem -SSLCertificate PEM:selfsigncert-client.pem"/>
+  </dynamic>
+  <static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/>
 </ACE_Svc_Conf>
 
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml
index 5aa645eb3bf..2a9f4817260 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from server.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <dynamic id="SSLIOP_Factory" type="Service_Object">
    <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLPrivateKey  PEM:pvtkey.pem -SSLCertificate PEM:selfsigncert.pem"/>
  </dynamic>
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf.xml b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf.xml
index ebdd0a7de4f..80eeb79c3b6 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf.xml
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <dynamic id="TAO_MonitorAndControl" type="Service_Object">
    <initializer path="TAO_CosNotification_MC" init="_make_TAO_MonitorAndControl" params="-NoNameSvc -ORBArg -ORBListenEndpoints -ORBArg iiop://127.0.0.1:32101"/>
  </dynamic>
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/native-svc.conf.xml b/TAO/performance-tests/RTCorba/Thread_Pool/native-svc.conf.xml
index 5be784bbb45..9ca2ca16aff 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/native-svc.conf.xml
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/native-svc.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from native-svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  For testing of RT threads (with native priority) -->
  <static id="RT_ORB_Loader" params="-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM"/>
  <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE"/>
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/svc.conf.xml b/TAO/performance-tests/RTCorba/Thread_Pool/svc.conf.xml
index 5a8fa8250ef..a26f8ec17a1 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/svc.conf.xml
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/svc.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  Options for exclusive transport strategy -->
  <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE"/>
  <!--  Options required for regular testing -->
diff --git a/TAO/performance-tests/Throughput/svc.conf.xml b/TAO/performance-tests/Throughput/svc.conf.xml
index e3cd786d2cc..ca9d6874ff5 100644
--- a/TAO/performance-tests/Throughput/svc.conf.xml
+++ b/TAO/performance-tests/Throughput/svc.conf.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Throughput/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
  <!--  $Id$ -->
  <!--  -->
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
diff --git a/TAO/tests/AMI/exclusive.conf.xml b/TAO/tests/AMI/exclusive.conf.xml
index 33db7f50d83..9cc9202775a 100644
--- a/TAO/tests/AMI/exclusive.conf.xml
+++ b/TAO/tests/AMI/exclusive.conf.xml
@@ -1,5 +1,8 @@
 <?xml version='1.0'?>
 <!-- Converted from ./tests/AMI/exclusive.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler ST"/>
 </ACE_Svc_Conf>
diff --git a/TAO/tests/AMI/muxed.conf.xml b/TAO/tests/AMI/muxed.conf.xml
index cf063034ce0..5700476defd 100644
--- a/TAO/tests/AMI/muxed.conf.xml
+++ b/TAO/tests/AMI/muxed.conf.xml
@@ -1,5 +1,8 @@
 <?xml version='1.0'?>
 <!-- Converted from ./tests/AMI/muxed.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy MUXED -ORBClientConnectionHandler ST"/>
 </ACE_Svc_Conf>
diff --git a/TAO/tests/AMI/server.conf.xml b/TAO/tests/AMI/server.conf.xml
index 8a4700799b4..413a4c4833b 100644
--- a/TAO/tests/AMI/server.conf.xml
+++ b/TAO/tests/AMI/server.conf.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0'?>
 <!-- Converted from ./tests/AMI/server.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
  <!--  $Id$ -->
  <!--  -->
  <static id="Server_Strategy_Factory" params="-ORBconcurrency thread-per-connection"/>
diff --git a/TAO/tests/AMI_Timeouts/svc.conf.xml b/TAO/tests/AMI_Timeouts/svc.conf.xml
index 5b30b8bd1ad..da7b72a0978 100644
--- a/TAO/tests/AMI_Timeouts/svc.conf.xml
+++ b/TAO/tests/AMI_Timeouts/svc.conf.xml
@@ -1,5 +1,8 @@
 <?xml version='1.0'?>
 <!-- Converted from ./tests/AMI_Timeouts/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler MT"/>
 </ACE_Svc_Conf>
diff --git a/TAO/tests/Bug_3251_Regression/Bug_3251.conf.xml b/TAO/tests/Bug_3251_Regression/Bug_3251.conf.xml
index 95a3df2a37f..0cece128ffe 100644
--- a/TAO/tests/Bug_3251_Regression/Bug_3251.conf.xml
+++ b/TAO/tests/Bug_3251_Regression/Bug_3251.conf.xml
@@ -1,30 +1,33 @@
 <?xml version='1.0'?>
 <ACE_Svc_Conf>
-	<!--  ACE will locate the libraries for you automatically by reading your LD -->
-	<!--  search path.  Moreover, ACE will automatically insert the correct suffix -->
-	<!--  (e.g., ".dll", ".so", etc.). -->
+  <!--  -->
+  <!--  $Id$ -->
+  <!--  -->
+  <!--  ACE will locate the libraries for you automatically by reading your LD -->
+  <!--  search path.  Moreover, ACE will automatically insert the correct suffix -->
+  <!--  (e.g., ".dll", ".so", etc.). -->
 
 
-	<!-- ORB -->
-	<dynamic id="DllOrb" type="Service_Object">
-		<!-- specify TS_ORB_ENDPOINT like this
-		  TS_ORB_ENDPOINT="-ORBEndpoint iiop://aaa.bbb.ccc.ddd:nnnn"
+  <!-- ORB -->
+  <dynamic id="DllOrb" type="Service_Object">
+    <!-- specify TS_ORB_ENDPOINT like this
+      TS_ORB_ENDPOINT="-ORBEndpoint iiop://aaa.bbb.ccc.ddd:nnnn"
 
-		  examples:
-		  TS_ORB_ENDPOINT"-ORBEndpoint iiop://127.0.0.0"
-		  TS_ORB_ENDPOINT"-ORBEndpoint iiop://:4200"
-		  TS_ORB_ENDPOINT"-ORBEndpoint iiop://127.0.0.0:4200"
-		-->
+      examples:
+      TS_ORB_ENDPOINT"-ORBEndpoint iiop://127.0.0.0"
+      TS_ORB_ENDPOINT"-ORBEndpoint iiop://:4200"
+      TS_ORB_ENDPOINT"-ORBEndpoint iiop://127.0.0.0:4200"
+    -->
     <initializer path="Bug_3251" init="_make_DllOrb" params="DllOrb -NumThreads 12 -ORBDebugLevel $TS_ORB_DEBUGLEVEL $TS_ORB_ENDPOINT -ORBDottedDecimalAddresses 1 -ORBCollocationStrategy thru_poa"/>
-	</dynamic>
-	<!-- ORB -->
+  </dynamic>
+  <!-- ORB -->
 
 
-	<!-- persistent POA -->
-	<dynamic id="PersistentPOA" type="Service_Object">
+  <!-- persistent POA -->
+  <dynamic id="PersistentPOA" type="Service_Object">
     <initializer path="Bug_3251" init="_make_PersistentPoa" params="PersistentPOA DllOrb"/>
-	</dynamic>
-	<!-- persistent POA -->
+  </dynamic>
+  <!-- persistent POA -->
 
 
 </ACE_Svc_Conf>
diff --git a/TAO/tests/Bug_3801_Regression/exclusive.conf.xml b/TAO/tests/Bug_3801_Regression/exclusive.conf.xml
index 33db7f50d83..9cc9202775a 100644
--- a/TAO/tests/Bug_3801_Regression/exclusive.conf.xml
+++ b/TAO/tests/Bug_3801_Regression/exclusive.conf.xml
@@ -1,5 +1,8 @@
 <?xml version='1.0'?>
 <!-- Converted from ./tests/AMI/exclusive.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler ST"/>
 </ACE_Svc_Conf>
diff --git a/TAO/tests/Bug_3801_Regression/muxed.conf.xml b/TAO/tests/Bug_3801_Regression/muxed.conf.xml
index cf063034ce0..5700476defd 100644
--- a/TAO/tests/Bug_3801_Regression/muxed.conf.xml
+++ b/TAO/tests/Bug_3801_Regression/muxed.conf.xml
@@ -1,5 +1,8 @@
 <?xml version='1.0'?>
 <!-- Converted from ./tests/AMI/muxed.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy MUXED -ORBClientConnectionHandler ST"/>
 </ACE_Svc_Conf>
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf.xml b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf.xml
index f3273f0cb93..a83de7d8053 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf.xml
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from Service_Config_Test.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  Dynamically loading each of the Service Objects below causes a -->
  <!--  number of threads to be spawned, each one invoking the Service -->
  <!--  Configurator (e.g. ACE_Service_Config::process_directive().  If the -->
diff --git a/TAO/tests/POA/Explicit_Activation/alternate.conf.xml b/TAO/tests/POA/Explicit_Activation/alternate.conf.xml
index 35d76be275b..66c5699e835 100644
--- a/TAO/tests/POA/Explicit_Activation/alternate.conf.xml
+++ b/TAO/tests/POA/Explicit_Activation/alternate.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from ./examples/POA/Explicit_Activation/alternate.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  Refer to Alternate_Resource_Factory/README for details -->
  <dynamic id="Resource_Factory" type="Service_Object">
    <initializer path="Alt_Resources/Alt_Resource_Factory" init="_make_My_Resource_Factory"/>
diff --git a/TAO/tests/RTCORBA/Banded_Connections/svc.conf.xml b/TAO/tests/RTCORBA/Banded_Connections/svc.conf.xml
index b589f90605b..311554c9baa 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Banded_Connections/svc.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  No options required for regular testing -->
  <!--  For real-time testing, uncomment the following line: -->
  <!--  static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM" -->
diff --git a/TAO/tests/RTCORBA/Client_Propagated/svc.conf.xml b/TAO/tests/RTCORBA/Client_Propagated/svc.conf.xml
index b589f90605b..311554c9baa 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Client_Propagated/svc.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  No options required for regular testing -->
  <!--  For real-time testing, uncomment the following line: -->
  <!--  static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM" -->
diff --git a/TAO/tests/RTCORBA/Client_Protocol/svc.conf.xml b/TAO/tests/RTCORBA/Client_Protocol/svc.conf.xml
index 0c3f02e1362..f94914a38d6 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Client_Protocol/svc.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  Options for SHMIOP protocol -->
  <static id="SHMIOP_Factory" params="-MMAPFilePrefix server_shmiop"/>
 </ACE_Svc_Conf>
diff --git a/TAO/tests/RTCORBA/Collocation/continuous.conf.xml b/TAO/tests/RTCORBA/Collocation/continuous.conf.xml
index f297697bc7c..6f522e75855 100644
--- a/TAO/tests/RTCORBA/Collocation/continuous.conf.xml
+++ b/TAO/tests/RTCORBA/Collocation/continuous.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from continuous.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  Option for platforms where direct mapping doesn't work -->
  <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/>
 </ACE_Svc_Conf>
diff --git a/TAO/tests/RTCORBA/Collocation/svc.conf.xml b/TAO/tests/RTCORBA/Collocation/svc.conf.xml
index b589f90605b..311554c9baa 100644
--- a/TAO/tests/RTCORBA/Collocation/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Collocation/svc.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  No options required for regular testing -->
  <!--  For real-time testing, uncomment the following line: -->
  <!--  static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM" -->
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml b/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml
index f297697bc7c..6f522e75855 100644
--- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from continuous.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  Option for platforms where direct mapping doesn't work -->
  <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/>
 </ACE_Svc_Conf>
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml
index bbb864e64b0..3ee25d061f6 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from continuous.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  Option for platforms where direct mapping doesn't work -->
  <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous -RTORBDynamicThreadIdleTimeout 1000000"/>
 </ACE_Svc_Conf>
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf.xml b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf.xml
index 24f6033f25e..e0ce22dfd3d 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf.xml
@@ -1,5 +1,8 @@
 <?xml version='1.0'?>
 <!-- Converted from svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <static RT_ORB_Loader "-RTORBDynamicThreadIdleTimeout 100000">
 </ACE_Svc_Conf>
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/svc.conf.xml b/TAO/tests/RTCORBA/Explicit_Binding/svc.conf.xml
index 0c3f02e1362..f94914a38d6 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Explicit_Binding/svc.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  Options for SHMIOP protocol -->
  <static id="SHMIOP_Factory" params="-MMAPFilePrefix server_shmiop"/>
 </ACE_Svc_Conf>
diff --git a/TAO/tests/RTCORBA/Linear_Priority/svc.conf.xml b/TAO/tests/RTCORBA/Linear_Priority/svc.conf.xml
index b798a25865d..85d3bad7468 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Linear_Priority/svc.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  Options required for regular testing -->
  <static id="RT_ORB_Loader" params="-ORBPriorityMapping linear"/>
  <!--  For real-time testing, uncomment the following line: -->
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf.xml b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf.xml
index 20e6e885da4..513ed1cd083 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf.xml
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  Options for SHMIOP protocol -->
  <static id="SHMIOP_Factory" params="-MMAPFilePrefix server_shmiop"/>
  <!--  No other options required for regular testing -->
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf.xml b/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf.xml
index f297697bc7c..6f522e75855 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf.xml
+++ b/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from continuous.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  Option for platforms where direct mapping doesn't work -->
  <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/>
 </ACE_Svc_Conf>
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/svc.conf.xml b/TAO/tests/RTCORBA/Policy_Combinations/svc.conf.xml
index 575234501d6..59a5887e4a7 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Policy_Combinations/svc.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  Options required for regular testing -->
  <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/>
  <!--  For real-time testing, uncomment the following line: -->
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml
index f297697bc7c..6f522e75855 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from continuous.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  Option for platforms where direct mapping doesn't work -->
  <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/>
 </ACE_Svc_Conf>
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf.xml b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf.xml
index b589f90605b..311554c9baa 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  No options required for regular testing -->
  <!--  For real-time testing, uncomment the following line: -->
  <!--  static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM" -->
diff --git a/TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml b/TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml
index f297697bc7c..6f522e75855 100644
--- a/TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml
+++ b/TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from continuous.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  Option for platforms where direct mapping doesn't work -->
  <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/>
 </ACE_Svc_Conf>
diff --git a/TAO/tests/RTCORBA/Server_Declared/svc.conf.xml b/TAO/tests/RTCORBA/Server_Declared/svc.conf.xml
index b589f90605b..311554c9baa 100644
--- a/TAO/tests/RTCORBA/Server_Declared/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Server_Declared/svc.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  No options required for regular testing -->
  <!--  For real-time testing, uncomment the following line: -->
  <!--  static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM" -->
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server_iiop.conf.xml b/TAO/tests/RTCORBA/Server_Protocol/server_iiop.conf.xml
index a4aed9ed5d7..fc93725bbdf 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server_iiop.conf.xml
+++ b/TAO/tests/RTCORBA/Server_Protocol/server_iiop.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from server_iiop.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  Protocol options -->
  <static id="Advanced_Resource_Factory" params="-ORBProtocolFactory IIOP_Factory"/>
 </ACE_Svc_Conf>
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server_reverse.conf.xml b/TAO/tests/RTCORBA/Server_Protocol/server_reverse.conf.xml
index 9154765d4dd..e739e797ddf 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server_reverse.conf.xml
+++ b/TAO/tests/RTCORBA/Server_Protocol/server_reverse.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from server_reverse.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  Options for SHMIOP protocol -->
  <static id="SHMIOP_Factory" params="-MMAPFilePrefix server_shmiop"/>
  <!--  Protocol options -->
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf.xml b/TAO/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf.xml
index dc1e7f12579..2e857d26d6c 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf.xml
+++ b/TAO/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from server_reverse_nt.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  Options for SHMIOP protocol -->
  <static id="SHMIOP_Factory" params="-MMAPFilePrefix server_shmiop"/>
  <!--  Protocol options -->
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server_shmiop.conf.xml b/TAO/tests/RTCORBA/Server_Protocol/server_shmiop.conf.xml
index 9ffdb8c899f..38ad1bef88e 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server_shmiop.conf.xml
+++ b/TAO/tests/RTCORBA/Server_Protocol/server_shmiop.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from server_shmiop.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  Options for SHMIOP protocol -->
  <static id="SHMIOP_Factory" params="-MMAPFilePrefix server_shmiop"/>
  <!--  Protocol options -->
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server_uiop.conf.xml b/TAO/tests/RTCORBA/Server_Protocol/server_uiop.conf.xml
index 911f616d4fa..20812d9f07f 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server_uiop.conf.xml
+++ b/TAO/tests/RTCORBA/Server_Protocol/server_uiop.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from server_uiop.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  Protocol options -->
  <static id="Advanced_Resource_Factory" params="-ORBProtocolFactory UIOP_Factory "/>
 </ACE_Svc_Conf>
diff --git a/TAO/tests/RTCORBA/Thread_Pool/continuous.conf.xml b/TAO/tests/RTCORBA/Thread_Pool/continuous.conf.xml
index f297697bc7c..6f522e75855 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/continuous.conf.xml
+++ b/TAO/tests/RTCORBA/Thread_Pool/continuous.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from continuous.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  Option for platforms where direct mapping doesn't work -->
  <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/>
 </ACE_Svc_Conf>
diff --git a/TAO/tests/RTCORBA/Thread_Pool/svc.conf.xml b/TAO/tests/RTCORBA/Thread_Pool/svc.conf.xml
index b589f90605b..311554c9baa 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Thread_Pool/svc.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?>
 <!-- Converted from svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
  <!--  No options required for regular testing -->
  <!--  For real-time testing, uncomment the following line: -->
  <!--  static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM" -->