From 7fba52d361a4cff50d4a1181e8a503b5054935b5 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Thu, 31 Aug 2017 20:09:57 +0200
Subject: Cleanup empty commented out lines

---
 TAO/performance-tests/Callback/svc.conf.xml                           | 2 --
 TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf.xml    | 3 ---
 TAO/performance-tests/Cubit/TAO/IDL_Cubit/server_shmiop.conf.xml      | 3 ---
 TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.xml                | 3 ---
 TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf.xml      | 3 ---
 TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf.xml      | 3 ---
 TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf.xml      | 3 ---
 TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf.xml      | 3 ---
 TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml                 | 3 ---
 TAO/performance-tests/Latency/DII/svc.conf.xml                        | 3 ---
 TAO/performance-tests/Latency/DSI/svc.conf.xml                        | 3 ---
 TAO/performance-tests/Latency/Deferred/svc.conf.xml                   | 3 ---
 TAO/performance-tests/Latency/Single_Threaded/default.conf.xml        | 3 ---
 TAO/performance-tests/Latency/Single_Threaded/svc.conf.xml            | 3 ---
 TAO/performance-tests/Latency/Thread_Per_Connection/svc.conf.xml      | 3 ---
 TAO/performance-tests/Latency/Thread_Pool/svc.conf.xml                | 3 ---
 .../POA/Object_Creation_And_Registration/svc.conf.xml                 | 3 ---
 .../RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.conf.xml       | 2 --
 .../RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf.xml       | 2 --
 .../RTCorba/Multiple_Endpoints/Single_Endpoint/client.conf.xml        | 2 --
 .../RTCorba/Multiple_Endpoints/Single_Endpoint/server.conf.xml        | 2 --
 TAO/performance-tests/RTCorba/Thread_Pool/native-svc.conf.xml         | 3 ---
 TAO/performance-tests/RTCorba/Thread_Pool/svc.conf.xml                | 3 ---
 TAO/performance-tests/Sequence_Latency/DII/svc.conf.xml               | 3 ---
 TAO/performance-tests/Sequence_Latency/DSI/svc.conf.xml               | 3 ---
 TAO/performance-tests/Sequence_Latency/Deferred/svc.conf.xml          | 3 ---
 .../Sequence_Latency/Single_Threaded/default.conf.xml                 | 3 ---
 TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf.xml   | 3 ---
 .../Sequence_Latency/Thread_Per_Connection/svc.conf.xml               | 3 ---
 TAO/performance-tests/Sequence_Latency/Thread_Pool/svc.conf.xml       | 3 ---
 TAO/performance-tests/Throughput/svc.conf.xml                         | 4 ----
 31 files changed, 89 deletions(-)

(limited to 'TAO/performance-tests')

diff --git a/TAO/performance-tests/Callback/svc.conf.xml b/TAO/performance-tests/Callback/svc.conf.xml
index 1637f7881e2..a699ad7e7fe 100644
--- a/TAO/performance-tests/Callback/svc.conf.xml
+++ b/TAO/performance-tests/Callback/svc.conf.xml
@@ -1,8 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Callback/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--   -->
- <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_mt"/>
  <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf.xml b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf.xml
index 0b63c010b29..bc9b3809eb1 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--   -->
- <!--  -->
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
- <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st -ORBConnectionCacheLock null"/>
  <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler ST"/>
  <static id="Server_Strategy_Factory" params="-ORBConcurrency reactive"/>
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server_shmiop.conf.xml b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server_shmiop.conf.xml
index e01355b8299..82186b3a6b4 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server_shmiop.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server_shmiop.conf.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Cubit/TAO/IDL_Cubit/server_shmiop.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  -->
- <!--   -->
- <!--  -->
  <static id="SHMIOP_Factory" params="-MMAPFilePrefix server_shmiop -MMAPFileSize 1000000"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.xml b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.xml
index f011caf3c63..05453565d3b 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Cubit/TAO/IDL_Cubit/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--   -->
- <!--  -->
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
- <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null -ORBFlushingStrategy blocking"/>
  <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
  <static id="Server_Strategy_Factory" params="-ORBConcurrency thread-per-connection -ORBAllowReactivationOfSystemids 0"/>
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf.xml b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf.xml
index 029e8d045e6..5642d93d314 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--   -->
- <!--  -->
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
- <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_mt"/>
  <static id="Server_Strategy_Factory" params="-ORBConcurrency thread-per-connection -ORBAllowReactivationOfSystemids 0"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf.xml b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf.xml
index 99b960b249b..ceb3ace7968 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--   -->
- <!--  -->
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
- <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null"/>
  <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf.xml b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf.xml
index 90fff85098c..2a72615790e 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--   -->
- <!--  -->
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
- <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st  -ORBInputCDRAllocator null"/>
  <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf.xml b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf.xml
index 402875841e1..3e14388cefa 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf.xml
@@ -1,14 +1,11 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--   -->
- <!--  -->
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
  <!--  -->
  <!--  This configuration is almost safe for IDL_Cubit, it uses no locks -->
  <!--  but runs with thread-per-connection, since there is only one client -->
  <!--  the only problems are on shutdown. -->
- <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"/>
  <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
  <static id="Server_Strategy_Factory" params="-ORBConcurrency thread-per-connection -ORBAllowReactivationOfSystemids 0"/>
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml
index 2ad60dfbdf9..beee138bad3 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Cubit/TAO/MT_Cubit/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--   -->
- <!--  -->
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
- <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBInputCDRAllocator null -ORBConnectionCacheLock null"/>
  <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
  <static id="Server_Strategy_Factory" params="-ORBConcurrency thread-per-connection -ORBAllowReactivationOfSystemids 0"/>
diff --git a/TAO/performance-tests/Latency/DII/svc.conf.xml b/TAO/performance-tests/Latency/DII/svc.conf.xml
index 6e7e2085a4a..5f66ee0c9de 100644
--- a/TAO/performance-tests/Latency/DII/svc.conf.xml
+++ b/TAO/performance-tests/Latency/DII/svc.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Latency/DII/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  -->
- <!--   -->
- <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
  <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
  <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
diff --git a/TAO/performance-tests/Latency/DSI/svc.conf.xml b/TAO/performance-tests/Latency/DSI/svc.conf.xml
index 0b73e135ba7..8068cf8127f 100644
--- a/TAO/performance-tests/Latency/DSI/svc.conf.xml
+++ b/TAO/performance-tests/Latency/DSI/svc.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Latency/DSI/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  -->
- <!--   -->
- <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
  <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
  <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
diff --git a/TAO/performance-tests/Latency/Deferred/svc.conf.xml b/TAO/performance-tests/Latency/Deferred/svc.conf.xml
index 7e8ab0433b7..95715f81a65 100644
--- a/TAO/performance-tests/Latency/Deferred/svc.conf.xml
+++ b/TAO/performance-tests/Latency/Deferred/svc.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Latency/Deferred/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  -->
- <!--   -->
- <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
  <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Latency/Single_Threaded/default.conf.xml b/TAO/performance-tests/Latency/Single_Threaded/default.conf.xml
index ecc80c20b90..8672c3ee826 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/default.conf.xml
+++ b/TAO/performance-tests/Latency/Single_Threaded/default.conf.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Latency/Single_Threaded/default.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--   -->
- <!--  -->
  <!--  The file is empty, forcing the ORB to use its default configuration. -->
- <!--  -->
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Latency/Single_Threaded/svc.conf.xml b/TAO/performance-tests/Latency/Single_Threaded/svc.conf.xml
index 69696c83a17..35ef103dce8 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/svc.conf.xml
+++ b/TAO/performance-tests/Latency/Single_Threaded/svc.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Latency/Single_Threaded/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  -->
- <!--   -->
- <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
  <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
  <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"/>
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/svc.conf.xml b/TAO/performance-tests/Latency/Thread_Per_Connection/svc.conf.xml
index cc0abd141b3..f38184b5de9 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/svc.conf.xml
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/svc.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Latency/Thread_Per_Connection/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  -->
- <!--   -->
- <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_mt -ORBReactorMaskSignals 0 -ORBFlushingStrategy blocking"/>
  <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"/>
  <static id="Server_Strategy_Factory" params="-ORBConcurrency thread-per-connection"/>
diff --git a/TAO/performance-tests/Latency/Thread_Pool/svc.conf.xml b/TAO/performance-tests/Latency/Thread_Pool/svc.conf.xml
index 9c6bb47513c..09eacd70de0 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/svc.conf.xml
+++ b/TAO/performance-tests/Latency/Thread_Pool/svc.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Latency/Thread_Pool/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  -->
- <!--   -->
- <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBFlushingStrategy blocking"/>
  <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/svc.conf.xml b/TAO/performance-tests/POA/Object_Creation_And_Registration/svc.conf.xml
index b12356f618c..81296d8b3eb 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/svc.conf.xml
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/svc.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/POA/Object_Creation_And_Registration/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--   -->
- <!--  -->
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
- <!--  -->
  <static id="Server_Strategy_Factory" params="-ORBActiveObjectMapSize 1001"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.conf.xml b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.conf.xml
index 17556649207..a99bdf0c2a8 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.conf.xml
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.conf.xml
@@ -1,8 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--   -->
- <!--  -->
  <static id="RT_ORB_Loader" params="-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping direct"/>
  <static id="Client_Strategy_Factory" params="-ORBclientconnectionhandler RW"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf.xml b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf.xml
index a9522a46e66..309ce7fbf57 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf.xml
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf.xml
@@ -1,8 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--   -->
- <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st -ORBInputCDRAllocator null"/>
  <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
  <static id="RT_ORB_Loader" params="-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping direct"/>
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.conf.xml b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.conf.xml
index d38c169dbc6..c0308e5de97 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.conf.xml
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.conf.xml
@@ -1,8 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--   -->
- <!--  -->
  <static id="RT_ORB_Loader" params="-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping direct"/>
  <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.conf.xml b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.conf.xml
index 39f28fde3ab..8631eff227a 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.conf.xml
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.conf.xml
@@ -1,8 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--   -->
- <!--  -->
  <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
  <static id="RT_ORB_Loader"/>
 </ACE_Svc_Conf>
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 120f375b167..5be784bbb45 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/native-svc.conf.xml
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/native-svc.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from native-svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  -->
- <!--   -->
- <!--  -->
  <!--  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 7c583cc29ef..5a8fa8250ef 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/svc.conf.xml
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/svc.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  -->
- <!--   -->
- <!--  -->
  <!--  Options for exclusive transport strategy -->
  <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE"/>
  <!--  Options required for regular testing -->
diff --git a/TAO/performance-tests/Sequence_Latency/DII/svc.conf.xml b/TAO/performance-tests/Sequence_Latency/DII/svc.conf.xml
index 6e7e2085a4a..5f66ee0c9de 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/svc.conf.xml
+++ b/TAO/performance-tests/Sequence_Latency/DII/svc.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Latency/DII/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  -->
- <!--   -->
- <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
  <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
  <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/svc.conf.xml b/TAO/performance-tests/Sequence_Latency/DSI/svc.conf.xml
index 0b73e135ba7..8068cf8127f 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/svc.conf.xml
+++ b/TAO/performance-tests/Sequence_Latency/DSI/svc.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Latency/DSI/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  -->
- <!--   -->
- <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
  <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
  <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf.xml b/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf.xml
index 7e8ab0433b7..95715f81a65 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf.xml
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Latency/Deferred/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  -->
- <!--   -->
- <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
  <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/default.conf.xml b/TAO/performance-tests/Sequence_Latency/Single_Threaded/default.conf.xml
index ecc80c20b90..8672c3ee826 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/default.conf.xml
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/default.conf.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Latency/Single_Threaded/default.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--   -->
- <!--  -->
  <!--  The file is empty, forcing the ORB to use its default configuration. -->
- <!--  -->
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf.xml b/TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf.xml
index 69696c83a17..35ef103dce8 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf.xml
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Latency/Single_Threaded/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  -->
- <!--   -->
- <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
  <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
  <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"/>
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/svc.conf.xml b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/svc.conf.xml
index cc0abd141b3..f38184b5de9 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/svc.conf.xml
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/svc.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Latency/Thread_Per_Connection/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  -->
- <!--   -->
- <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_mt -ORBReactorMaskSignals 0 -ORBFlushingStrategy blocking"/>
  <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"/>
  <static id="Server_Strategy_Factory" params="-ORBConcurrency thread-per-connection"/>
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/svc.conf.xml b/TAO/performance-tests/Sequence_Latency/Thread_Pool/svc.conf.xml
index 9c6bb47513c..09eacd70de0 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/svc.conf.xml
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/svc.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Latency/Thread_Pool/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  -->
- <!--   -->
- <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBFlushingStrategy blocking"/>
  <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Throughput/svc.conf.xml b/TAO/performance-tests/Throughput/svc.conf.xml
index 681c74e31b3..1f052db20cc 100644
--- a/TAO/performance-tests/Throughput/svc.conf.xml
+++ b/TAO/performance-tests/Throughput/svc.conf.xml
@@ -1,11 +1,7 @@
 <?xml version='1.0'?>
 <!-- Converted from ./performance-tests/Throughput/svc.conf by svcconf-convert.pl -->
 <ACE_Svc_Conf>
- <!--  -->
- <!--   -->
- <!--  -->
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
- <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBInputCDRAllocator null -ORBReactorType select_st -ORBReactorMaskSignals 0 -ORBConnectionCacheLock null -ORBFlushingStrategy blocking"/>
  <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
  <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
-- 
cgit v1.2.1