diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-08-31 20:09:57 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-08-31 20:09:57 +0200 |
| commit | 7fba52d361a4cff50d4a1181e8a503b5054935b5 (patch) | |
| tree | 4754552b71252c2645d68ee9147f6919856289d5 /TAO | |
| parent | f7f0bc6f04b897914563fc603e08287a99cb2667 (diff) | |
| download | ATCD-7fba52d361a4cff50d4a1181e8a503b5054935b5.tar.gz | |
Cleanup empty commented out lines
Diffstat (limited to 'TAO')
220 files changed, 11 insertions, 494 deletions
diff --git a/TAO/docs/tutorials/Quoter/AMI/svc.conf.xml b/TAO/docs/tutorials/Quoter/AMI/svc.conf.xml index abee5092d1b..db55a64fc80 100644 --- a/TAO/docs/tutorials/Quoter/AMI/svc.conf.xml +++ b/TAO/docs/tutorials/Quoter/AMI/svc.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./docs/tutorials/Quoter/AMI/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy MUXED"/> </ACE_Svc_Conf> diff --git a/TAO/docs/tutorials/Quoter/Event_Service/ec.conf.xml b/TAO/docs/tutorials/Quoter/Event_Service/ec.conf.xml index 8d1c03c91a5..ed2ca207ddb 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/ec.conf.xml +++ b/TAO/docs/tutorials/Quoter/Event_Service/ec.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./docs/tutorials/Quoter/Event_Service/ec.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <!-- static EC_Factory "-ECfiltering null" --> <!-- -ECproxyconsumerlock thread " #-ECproxysupplierlock thread" # -ECsupplierfiltering per-supplier" --> </ACE_Svc_Conf> diff --git a/TAO/examples/AMH/Sink_Server/st_server.conf.xml b/TAO/examples/AMH/Sink_Server/st_server.conf.xml index 6a9832db41f..e11edbfb81e 100644 --- a/TAO/examples/AMH/Sink_Server/st_server.conf.xml +++ b/TAO/examples/AMH/Sink_Server/st_server.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./examples/AMH/Sink_Server/st_server.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- We want an optimised single threaded Reactive server --> <!-- --> <!-- Configuration copied verbatim from : --> diff --git a/TAO/examples/AMI/FL_Callback/peer.conf.xml b/TAO/examples/AMI/FL_Callback/peer.conf.xml index bb4d8c3cf69..ea09459aa21 100644 --- a/TAO/examples/AMI/FL_Callback/peer.conf.xml +++ b/TAO/examples/AMI/FL_Callback/peer.conf.xml @@ -1,7 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./examples/AMI/FL_Callback/peer.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy MUXED"/> </ACE_Svc_Conf> diff --git a/TAO/examples/Buffered_AMI/svc.conf.xml b/TAO/examples/Buffered_AMI/svc.conf.xml index ada36791292..8868dae39b5 100644 --- a/TAO/examples/Buffered_AMI/svc.conf.xml +++ b/TAO/examples/Buffered_AMI/svc.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./examples/Buffered_AMI/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <!-- Please see $TAO_ROOT/docs/Options.html for details on these options. --> - <!-- --> <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy MUXED"/> </ACE_Svc_Conf> diff --git a/TAO/examples/PluggableUDP/tests/Performance/svc.conf.xml b/TAO/examples/PluggableUDP/tests/Performance/svc.conf.xml index abfe34f5702..63bbeb081b2 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/svc.conf.xml +++ b/TAO/examples/PluggableUDP/tests/Performance/svc.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./examples/PluggableUDP/tests/Performance/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <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 2363fe27eaa..92362bacdf0 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/svc.conf.xml +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/svc.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./examples/PluggableUDP/tests/SimplePerformance/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <static id="Advanced_Resource_Factory" params="-ORBProtocolFactory DIOP_Factory -ORBReactorType tp"/> </ACE_Svc_Conf> diff --git a/TAO/examples/Quoter/client.conf.xml b/TAO/examples/Quoter/client.conf.xml index ed46ef23f78..beab0145e6b 100644 --- a/TAO/examples/Quoter/client.conf.xml +++ b/TAO/examples/Quoter/client.conf.xml @@ -1,8 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./examples/Quoter/client.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <dynamic id="Resource_Factory" type="Service_Object"> <initializer path="TAO" init="_make_TAO_Default_Resource_Factory"/> </dynamic> diff --git a/TAO/examples/Quoter/server.conf.xml b/TAO/examples/Quoter/server.conf.xml index 1523d05ae80..e51f12fd1f9 100644 --- a/TAO/examples/Quoter/server.conf.xml +++ b/TAO/examples/Quoter/server.conf.xml @@ -1,8 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./examples/Quoter/server.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <dynamic id="Resource_Factory" type="Service_Object"> <initializer path="TAO" init="_make_TAO_Default_Resource_Factory"/> </dynamic> diff --git a/TAO/examples/Simple/time-date/client.conf.xml b/TAO/examples/Simple/time-date/client.conf.xml index d6d7ba1afe5..a55f74f44f9 100644 --- a/TAO/examples/Simple/time-date/client.conf.xml +++ b/TAO/examples/Simple/time-date/client.conf.xml @@ -1,10 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./examples/Simple/time-date/client.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> - <!-- --> <!-- Empty configuration file, the default configuration works just fine --> <!-- for the client, but the svc.conf file (or -ORBSkipServiceConfigOpen) --> <!-- breaks it. --> diff --git a/TAO/examples/Simple/time-date/svc.conf.xml b/TAO/examples/Simple/time-date/svc.conf.xml index 72e4b45f34d..fb826795643 100644 --- a/TAO/examples/Simple/time-date/svc.conf.xml +++ b/TAO/examples/Simple/time-date/svc.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./examples/Simple/time-date/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- Define a special Reactor for single-threaded configurations. Refer --> <!-- to README for details. --> <dynamic id="Resource_Factory" type="Service_Object"> diff --git a/TAO/examples/Simulator/Event_Supplier/svc.conf.xml b/TAO/examples/Simulator/Event_Supplier/svc.conf.xml index 66605c7158e..e4aa8e7af11 100644 --- a/TAO/examples/Simulator/Event_Supplier/svc.conf.xml +++ b/TAO/examples/Simulator/Event_Supplier/svc.conf.xml @@ -1,7 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./examples/Simulator/Event_Supplier/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <static id="Server_Strategy_Factory" params=" -ORBdemuxstrategy dynamic -ORBtablesize 128"/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/Concurrency_Service/svc.conf.xml b/TAO/orbsvcs/Concurrency_Service/svc.conf.xml index e93ba1c6842..ac491a2ce35 100644 --- a/TAO/orbsvcs/Concurrency_Service/svc.conf.xml +++ b/TAO/orbsvcs/Concurrency_Service/svc.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/Concurrency_Service/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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/Event_Service/svc.conf.xml b/TAO/orbsvcs/Event_Service/svc.conf.xml index ae0edbf70f7..db2280c56fa 100644 --- a/TAO/orbsvcs/Event_Service/svc.conf.xml +++ b/TAO/orbsvcs/Event_Service/svc.conf.xml @@ -1,6 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/Event_Service/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <static id="EC_Factory" params="-ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/ImplRepo_Service/repository.xml b/TAO/orbsvcs/ImplRepo_Service/repository.xml index 8d86b44b38e..d20ee07d71b 100644 --- a/TAO/orbsvcs/ImplRepo_Service/repository.xml +++ b/TAO/orbsvcs/ImplRepo_Service/repository.xml @@ -1,8 +1,5 @@ <?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=""> diff --git a/TAO/orbsvcs/Notify_Service/svc.conf.xml b/TAO/orbsvcs/Notify_Service/svc.conf.xml index 127e0b4ff85..237d7598804 100644 --- a/TAO/orbsvcs/Notify_Service/svc.conf.xml +++ b/TAO/orbsvcs/Notify_Service/svc.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/Notify_Service/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <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 c5ec0f9b706..6601b96b6ee 100644 --- a/TAO/orbsvcs/TAO_Service/svc.conf.xml +++ b/TAO/orbsvcs/TAO_Service/svc.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/TAO_Service/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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/examples/RtEC/IIOPGateway/ec.conf.xml b/TAO/orbsvcs/examples/RtEC/IIOPGateway/ec.conf.xml index bbe49a0a0b8..3b70c76cc9e 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/ec.conf.xml +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/ec.conf.xml @@ -1,5 +1,4 @@ <?xml version='1.0'?> <ACE_Svc_Conf> - <!-- --> <static id="static EC_Factory "-ECobserver basic ""/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/gateway.conf.xml b/TAO/orbsvcs/examples/RtEC/IIOPGateway/gateway.conf.xml index de04dda7001..0558401831b 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/gateway.conf.xml +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/gateway.conf.xml @@ -1,5 +1,4 @@ <?xml version='1.0'?> <ACE_Svc_Conf> - <!-- --> <static id="static EC_Gateway_IIOP_Factory "-ECGIIOPConsumerECControl reconnect -ECGIIOPConsumerECControlPeriod 1000000 -ECGIIOPConsumerECControlTimeout 500000 -ECGIIOPUseConsumerProxyMap 0"/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/svc.conf.xml b/TAO/orbsvcs/examples/RtEC/Kokyu/svc.conf.xml index a81eb81f47f..4d567c10be5 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/svc.conf.xml +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/svc.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <!-- change SCHED_OTHER to SCHED_FIFO or SCHED_RR to run in Real time class --> <static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:immediate:list -ECProxyPushSupplierCollection mt:immediate:list -ECdispatching kokyu SCHED_OTHER -ECscheduling kokyu -ECfiltering kokyu -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/examples/RtEC/MCast/svc.conf.xml b/TAO/orbsvcs/examples/RtEC/MCast/svc.conf.xml index 2210b9ed5fb..6fad18abb08 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/svc.conf.xml +++ b/TAO/orbsvcs/examples/RtEC/MCast/svc.conf.xml @@ -1,6 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/examples/RtEC/MCast/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <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/examples/RtEC/Schedule/svc.conf.xml b/TAO/orbsvcs/examples/RtEC/Schedule/svc.conf.xml index a43aac4f5ca..d8f8cc82eea 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/svc.conf.xml +++ b/TAO/orbsvcs/examples/RtEC/Schedule/svc.conf.xml @@ -1,6 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/examples/RtEC/Schedule/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:immediate:list -ECProxyPushSupplierCollection mt:immediate:list -ECdispatching priority -ECscheduling priority -ECfiltering priority -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/examples/RtEC/Simple/ec.conf.xml b/TAO/orbsvcs/examples/RtEC/Simple/ec.conf.xml index 36f9241e205..2154c6e4d46 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/ec.conf.xml +++ b/TAO/orbsvcs/examples/RtEC/Simple/ec.conf.xml @@ -1,6 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/examples/RtEC/Simple/ec.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <static id="EC_Factory" params="-ECDispatching reactive -ECFiltering basic -ECSupplierFiltering per-supplier -ECProxyConsumerLock thread -ECProxySupplierLock thread -ECConsumerControl reactive -ECSupplierControl reactive -ECConsumerControlPeriod 50000 -ECSupplierControlPeriod 50000"/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.conf.xml b/TAO/orbsvcs/examples/Security/Send_File/client.conf.xml index 243182b819f..4057257f7a7 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/client.conf.xml +++ b/TAO/orbsvcs/examples/Security/Send_File/client.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/examples/Security/Send_File/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="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"/> </dynamic> diff --git a/TAO/orbsvcs/examples/Security/Send_File/client_nopasswd.conf.xml b/TAO/orbsvcs/examples/Security/Send_File/client_nopasswd.conf.xml index 49d5ab1b3ca..5595d157c8f 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/client_nopasswd.conf.xml +++ b/TAO/orbsvcs/examples/Security/Send_File/client_nopasswd.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/examples/Security/Send_File/client_nopasswd.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="-SSLAuthenticate NONE -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"/> </dynamic> diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.conf.xml b/TAO/orbsvcs/examples/Security/Send_File/server.conf.xml index 45bb4f2ad53..299af3fef87 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/server.conf.xml +++ b/TAO/orbsvcs/examples/Security/Send_File/server.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/examples/Security/Send_File/server.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="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/> </dynamic> diff --git a/TAO/orbsvcs/examples/Security/Send_File/server_none.conf.xml b/TAO/orbsvcs/examples/Security/Send_File/server_none.conf.xml index 1e5ceb06bd9..8049a0d9363 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/server_none.conf.xml +++ b/TAO/orbsvcs/examples/Security/Send_File/server_none.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/examples/Security/Send_File/server_none.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="-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/> </dynamic> diff --git a/TAO/orbsvcs/examples/Security/Send_File/server_nopasswd.conf.xml b/TAO/orbsvcs/examples/Security/Send_File/server_nopasswd.conf.xml index 5388822f9fc..c32d79047e5 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/server_nopasswd.conf.xml +++ b/TAO/orbsvcs/examples/Security/Send_File/server_nopasswd.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/examples/Security/Send_File/server_nopasswd.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="-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/> </dynamic> 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 ecc80c20b90..8672c3ee826 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/default.conf.xml +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/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/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/svc.conf.xml b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/svc.conf.xml index 69696c83a17..35ef103dce8 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/svc.conf.xml +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/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/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/default.conf.xml b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/default.conf.xml index ecc80c20b90..8672c3ee826 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/default.conf.xml +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/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/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf.xml b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf.xml index 69696c83a17..35ef103dce8 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf.xml +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/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/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 c423959cc06..7c28057da9d 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,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_reactive.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <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 59724386db0..cfb34fada98 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,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_rtcorba.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <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 561f347f8e3..06541328eed 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,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_threaded.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <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 d3d7afdc4b5..159f1a26c16 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,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_null.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <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 d2585db2396..ce6c85266a6 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,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_per_supplier.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <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 39d7ce56b1e..c968f10e622 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,5 @@ <?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> - <!-- --> <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 88d391fa4dd..6af788cc957 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,5 @@ <?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> - <!-- --> <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 1b9231f807c..a31cd519622 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,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_delayed.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <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 0b6104a08cb..26fdedc7bb7 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,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_immediate.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <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 e419fe86f4f..80ff2289be3 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,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <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 803b51fac1d..d8250cb1ccf 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,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/realtime.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <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 009fd8b2c5c..0a8deec9b91 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,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/realtime.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <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 123297d1fc2..92dde92bb49 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,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_reactive.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <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 d46256bdc47..c088f231005 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,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_rtcorba.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <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 a8620197797..8624b47309b 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,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_threaded.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <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 434202d9c59..6f98b60030f 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,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_read.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <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 dd8c64b6757..59f024464bf 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,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_write.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <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 324d2af368c..cab678040b7 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,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_delayed.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <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 b77daa62b2d..166799900b4 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,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_immediate.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <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 0f746aaafa9..2b1409c407f 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,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_null.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <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 089ed4650a6..6a9e64ac2b1 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,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_per_supplier.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <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 2f528fa5b55..4d01232107b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/roundtrip.conf.xml +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/roundtrip.conf.xml @@ -1,6 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/roundtrip.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <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/tests/AVStreams/Component_Switching/components_svc.conf.xml b/TAO/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf.xml index c76f336f99d..ca56c60585e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf.xml +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf.xml @@ -1,8 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <!-- This configuration file is used to use only the default TAO --> <!-- strategies --> <static id="Advanced_Resource_Factory" params="-ORBReactorType select_mt"/> diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/svc.conf.xml b/TAO/orbsvcs/tests/AVStreams/Latency/svc.conf.xml index 86ec81dde62..dae2260dc20 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/svc.conf.xml +++ b/TAO/orbsvcs/tests/AVStreams/Latency/svc.conf.xml @@ -1,8 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/AVStreams/Latency/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null"/> <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/> <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler ST"/> diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf.xml b/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf.xml index 3b67a483991..494fa2522b7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf.xml +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf.xml @@ -1,8 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/AVStreams/Multicast/components_svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <!-- static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null" --> <!-- static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0" --> <!-- static Client_Strategy_Factory "-ORBClientConnectionHandler ST" --> 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 1c0bc4d4168..ef8e8645e5b 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf.xml +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <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 5a200c8d714..92b4b2aeb82 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/svc.pull.conf.xml +++ b/TAO/orbsvcs/tests/CosEvent/Basic/svc.pull.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/CosEvent/Basic/svc.pull.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <static id="CEC_Factory" params="-CECReactivePullingPeriod 10000"/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/tests/EC_Mcast/svc.conf.xml b/TAO/orbsvcs/tests/EC_Mcast/svc.conf.xml index a17a13927b1..ffbc7af57e7 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/svc.conf.xml +++ b/TAO/orbsvcs/tests/EC_Mcast/svc.conf.xml @@ -1,6 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/EC_Mcast/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <static id="EC_Factory" params="-ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier -ECObserver basic"/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/tests/EC_Throughput/ec.conf.xml b/TAO/orbsvcs/tests/EC_Throughput/ec.conf.xml index bced78baf64..78e58d1db98 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ec.conf.xml +++ b/TAO/orbsvcs/tests/EC_Throughput/ec.conf.xml @@ -1,6 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/EC_Throughput/ec.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <static id="EC_Factory" params="-ECdispatching reactive -ECfiltering basic -ECproxyconsumerlock thread -ECsupplierfiltering per-supplier"/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/tests/EC_Throughput/ec_mt.conf.xml b/TAO/orbsvcs/tests/EC_Throughput/ec_mt.conf.xml index 814fc4d5760..ad47b9fbdde 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ec_mt.conf.xml +++ b/TAO/orbsvcs/tests/EC_Throughput/ec_mt.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/EC_Throughput/ec_mt.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:immediate:list -ECProxyPushSupplierCollection mt:immediate:list -ECDispatching mt -ECDispatchingThreads 4 -ECFiltering basic -ECProxyConsumerLock thread -ECProxySupplierLock thread -ECSupplierFiltering per-supplier"/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/tests/EC_Throughput/ec_mt_overflow.conf.xml b/TAO/orbsvcs/tests/EC_Throughput/ec_mt_overflow.conf.xml index 514c159ad9c..9f35300401a 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ec_mt_overflow.conf.xml +++ b/TAO/orbsvcs/tests/EC_Throughput/ec_mt_overflow.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ec_mt_overflow.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <static id="EC_QueueFullSimpleActions" params="discard"/> <static id="EC_Factory" params="-ECDispatching mt -ECDispatchingThreads 4 -ECFiltering basic -ECProxyConsumerLock thread -ECProxySupplierLock thread -ECSupplierFiltering per-supplier"/> <static id="Client_Strategy_Factory" params="-ORBConnectStrategy blocked -ORBClientConnectionHandler RW -ORBTransportMuxStrategy exclusive" /> diff --git a/TAO/orbsvcs/tests/Event/Basic/control.conf.xml b/TAO/orbsvcs/tests/Event/Basic/control.conf.xml index 1df2cd96b60..1300ebd665b 100644 --- a/TAO/orbsvcs/tests/Event/Basic/control.conf.xml +++ b/TAO/orbsvcs/tests/Event/Basic/control.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Event/Basic/control.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <static id="EC_Factory" params="-ECConsumerControl reactive -ECSupplierControl reactive -ECConsumerControlPeriod 50000 -ECSupplierControlPeriod 50000"/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/tests/Event/Basic/mt.svc.conf.xml b/TAO/orbsvcs/tests/Event/Basic/mt.svc.conf.xml index eae68077083..7eedfceb903 100644 --- a/TAO/orbsvcs/tests/Event/Basic/mt.svc.conf.xml +++ b/TAO/orbsvcs/tests/Event/Basic/mt.svc.conf.xml @@ -1,6 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Event/Basic/mt.svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <static id="EC_Factory" params="-ECObserver null -ECProxyPushConsumerCollection mt:delayed:list -ECProxyPushSupplierCollection mt:delayed:list -ECdispatching reactive -ECscheduling null -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/tests/Event/Basic/observer.conf.xml b/TAO/orbsvcs/tests/Event/Basic/observer.conf.xml index e2122256623..fd3688880e8 100644 --- a/TAO/orbsvcs/tests/Event/Basic/observer.conf.xml +++ b/TAO/orbsvcs/tests/Event/Basic/observer.conf.xml @@ -1,6 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Event/Basic/observer.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <static id="EC_Factory" params="-ECObserver basic -ECProxyPushConsumerCollection mt:delayed:list -ECProxyPushSupplierCollection mt:delayed:list -ECDispatching reactive -ECscheduling null -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/tests/Event/Basic/sched.conf.xml b/TAO/orbsvcs/tests/Event/Basic/sched.conf.xml index c2894b983c2..2c69a01aea9 100644 --- a/TAO/orbsvcs/tests/Event/Basic/sched.conf.xml +++ b/TAO/orbsvcs/tests/Event/Basic/sched.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Event/Basic/sched.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <dynamic id="EC_Factory" type="Service_Object"> <initializer path="TAO_RTSchedEvent" init="_make_TAO_EC_Sched_Factory" params="-ECDispatching priority -ECScheduling priority -ECFiltering priority -ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECProxyConsumerLock thread -ECProxySupplierLock thread -ECSupplierFiltering per-supplier"/> </dynamic> diff --git a/TAO/orbsvcs/tests/Event/Basic/svc.complex.conf.xml b/TAO/orbsvcs/tests/Event/Basic/svc.complex.conf.xml index 0eef70d5f67..22be26379cb 100644 --- a/TAO/orbsvcs/tests/Event/Basic/svc.complex.conf.xml +++ b/TAO/orbsvcs/tests/Event/Basic/svc.complex.conf.xml @@ -1,6 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Event/Basic/svc.complex.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:delayed:list -ECProxyPushSupplierCollection mt:delayed:list -ECdispatching reactive -ECfiltering prefix -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/tests/Event/Basic/svc.conf.xml b/TAO/orbsvcs/tests/Event/Basic/svc.conf.xml index 9a11d290582..58a8a830f21 100644 --- a/TAO/orbsvcs/tests/Event/Basic/svc.conf.xml +++ b/TAO/orbsvcs/tests/Event/Basic/svc.conf.xml @@ -1,6 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Event/Basic/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECdispatching reactive -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/tests/Event/Performance/ec.list.conf.xml b/TAO/orbsvcs/tests/Event/Performance/ec.list.conf.xml index e8fc7b446ff..3cc52b61cbe 100644 --- a/TAO/orbsvcs/tests/Event/Performance/ec.list.conf.xml +++ b/TAO/orbsvcs/tests/Event/Performance/ec.list.conf.xml @@ -1,6 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Event/Performance/ec.list.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <static id="EC_Factory" params="-ECProxyPushConsumerCollection st:delayed:list -ECProxyPushSupplierCollection st:delayed:list -ECdispatching reactive -ECfiltering null -ECproxyconsumerlock null -ECproxysupplierlock null -ECsupplierfiltering null"/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/tests/Event/Performance/ec.mt.conf.xml b/TAO/orbsvcs/tests/Event/Performance/ec.mt.conf.xml index 5c91eccf859..4646616ffb5 100644 --- a/TAO/orbsvcs/tests/Event/Performance/ec.mt.conf.xml +++ b/TAO/orbsvcs/tests/Event/Performance/ec.mt.conf.xml @@ -1,6 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Event/Performance/ec.mt.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:immediate:list -ECProxyPushSupplierCollection mt:immediate:list -ECDispatching mt -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/tests/Event/Performance/ec.rb_tree.conf.xml b/TAO/orbsvcs/tests/Event/Performance/ec.rb_tree.conf.xml index ce571f163a4..6572df6fa3b 100644 --- a/TAO/orbsvcs/tests/Event/Performance/ec.rb_tree.conf.xml +++ b/TAO/orbsvcs/tests/Event/Performance/ec.rb_tree.conf.xml @@ -1,6 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Event/Performance/ec.rb_tree.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <static id="EC_Factory" params="-ECProxyPushConsumerCollection st:delayed:rb_tree -ECProxyPushSupplierCollection st:delayed:rb_tree -ECdispatching reactive -ECfiltering null -ECproxyconsumerlock null -ECproxysupplierlock null -ECsupplierfiltering null"/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/tests/Event/Performance/ec.st.conf.xml b/TAO/orbsvcs/tests/Event/Performance/ec.st.conf.xml index bd83ac59507..939e920d8e9 100644 --- a/TAO/orbsvcs/tests/Event/Performance/ec.st.conf.xml +++ b/TAO/orbsvcs/tests/Event/Performance/ec.st.conf.xml @@ -1,6 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Event/Performance/ec.st.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <static id="EC_Factory" params="-ECProxyPushConsumerCollection st:immediate:list -ECProxyPushSupplierCollection st:immediate:list -ECdispatching reactive -ECfiltering null -ECproxyconsumerlock null -ECproxysupplierlock null -ECsupplierfiltering null"/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/tests/Event/Performance/latency.conf.xml b/TAO/orbsvcs/tests/Event/Performance/latency.conf.xml index e3a45e8fa1f..331eb87478f 100644 --- a/TAO/orbsvcs/tests/Event/Performance/latency.conf.xml +++ b/TAO/orbsvcs/tests/Event/Performance/latency.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Event/Performance/latency.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <!-- tp is now the default reactor type --> <!-- static Resource_Factory "-ORBReactorType tp" --> <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/> diff --git a/TAO/orbsvcs/tests/Event/UDP/svc.conf.xml b/TAO/orbsvcs/tests/Event/UDP/svc.conf.xml index 04f32103189..6fad18abb08 100644 --- a/TAO/orbsvcs/tests/Event/UDP/svc.conf.xml +++ b/TAO/orbsvcs/tests/Event/UDP/svc.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/examples/RtEC/MCast/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <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/FT_Naming/Load_Balancing/windows.conf.xml b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/windows.conf.xml index 27161f70295..2cb298ea865 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/windows.conf.xml +++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/windows.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from windows.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <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/FaultTolerance/IOGR/svc.conf.xml b/TAO/orbsvcs/tests/FaultTolerance/IOGR/svc.conf.xml index f94bc835865..b26c9398b5b 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/svc.conf.xml +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/svc.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/FaultTolerance/IOGR/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <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 27161f70295..2cb298ea865 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf.xml +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from windows.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <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 31793b087ff..2cb298ea865 100644 --- 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,6 @@ <?xml version='1.0'?> <!-- Converted from windows.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <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 27161f70295..2cb298ea865 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf.xml +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from windows.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <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 27161f70295..2cb298ea865 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,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from windows.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <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 ce35abad91e..17625811005 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/client.conf.xml +++ b/TAO/orbsvcs/tests/Miop/McastHello/client.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Miop/McastHello/client.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <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 f103ffb4279..22bb269016c 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/server.conf.xml +++ b/TAO/orbsvcs/tests/Miop/McastHello/server.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Miop/McastHello/server.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <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 edb20f4cec0..686b6f6e4ba 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf.xml +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <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 8f5a97be5c5..f72d4165927 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf.xml +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <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 836b67a0e19..b8b7e4f8e71 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf.xml +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <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 28659f090de..0673554e968 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf.xml +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <static id="Resource_Factory" params="-ORBReactorMaskSignals 0"/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.conf.xml b/TAO/orbsvcs/tests/Security/Big_Request/client.conf.xml index 0efdff68187..8c9af94c0e4 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/client.conf.xml +++ b/TAO/orbsvcs/tests/Security/Big_Request/client.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Security/Big_Request/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="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"/> </dynamic> diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.conf.xml b/TAO/orbsvcs/tests/Security/Big_Request/server.conf.xml index 5d2d25e2eee..800bc06b563 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/server.conf.xml +++ b/TAO/orbsvcs/tests/Security/Big_Request/server.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Security/Big_Request/server.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="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/> </dynamic> diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.conf.xml b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.conf.xml index 774bb7d6832..35cd881f2af 100644 --- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.conf.xml +++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Security/Bug_1107_Regression/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="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"/> </dynamic> diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.conf.xml b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.conf.xml index ac78e1155f2..a438906f5a5 100644 --- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.conf.xml +++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Security/Bug_1107_Regression/server.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="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/> </dynamic> diff --git a/TAO/orbsvcs/tests/Security/Callback/client.conf.xml b/TAO/orbsvcs/tests/Security/Callback/client.conf.xml index 6fd2f1e3c2c..7a70b2251d0 100644 --- a/TAO/orbsvcs/tests/Security/Callback/client.conf.xml +++ b/TAO/orbsvcs/tests/Security/Callback/client.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Security/Callback/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="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"/> </dynamic> diff --git a/TAO/orbsvcs/tests/Security/Callback/server.conf.xml b/TAO/orbsvcs/tests/Security/Callback/server.conf.xml index e3350eb5147..80f8407e005 100644 --- a/TAO/orbsvcs/tests/Security/Callback/server.conf.xml +++ b/TAO/orbsvcs/tests/Security/Callback/server.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Security/Callback/server.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="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/> </dynamic> diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.conf.xml b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.conf.xml index bec74388c75..2d9850cb66a 100644 --- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.conf.xml +++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Security/MT_SSLIOP/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="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:ssl/client-key.pem -SSLCertificate PEM:ssl/client-cert.pem -SSLCAFile PEM:ssl/ca.pem"/> </dynamic> diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.conf.xml b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.conf.xml index a21343dd99a..4d3fb2da96b 100644 --- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.conf.xml +++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.conf.xml @@ -1,8 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./tests/MT_BiDir/server.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="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:ssl/server-key.pem -SSLCertificate PEM:ssl/server-cert.pem -SSLCAFile PEM:ssl/ca.pem"/> </dynamic> diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/README b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/README index fee8d663993..8d808c6ef34 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/README +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/README @@ -1,27 +1,25 @@ /** - - @page MT_IIOP_SSL Test README File - This is a stress test for the IIOP_SSL features. This test should +This is a stress test for the IIOP_SSL features. This test should serve as a stress test for -http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1421 +http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1421 - If SSL cannot be used (for whatever reason) we expect the +If SSL cannot be used (for whatever reason) we expect the communication to take place over an insecure TCP/IP port. This test just makes sure that the fallback port actually works! - To run the test use the run_test.pl script: +To run the test use the run_test.pl script: $ ./run_test.pl - the script returns 0 if the test was successful. +the script returns 0 if the test was successful. @NOTE: - This test links *and* loads the SSLIOP library. They are needed +This test links *and* loads the SSLIOP library. They are needed due to the way the test is setup. */ 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 cfa6247eaac..10bc7ebffa2 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf.xml +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf.xml @@ -1,11 +1,8 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Security/MT_SSLIOP/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="-SSLCertificate PEM:selfsigncert.pem"/> + <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLCertificate PEM:server_cert.pem"/> </dynamic> <static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/> </ACE_Svc_Conf> 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 c949c05b7ac..a6bbb2abec9 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf.xml +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf.xml @@ -1,11 +1,8 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Security/MT_SSLIOP/server.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.pem -SSLCertificate PEM:selfsigncert.pem"/> + <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/> </dynamic> <static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf.xml b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf.xml index 56095f01013..10bc7ebffa2 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf.xml +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Security/MT_SSLIOP/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="-SSLCertificate PEM:server_cert.pem"/> </dynamic> diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf index e53cbdca29c..bc1f0d3333e 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf @@ -1,7 +1,6 @@ - dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() - "-SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem" + "-SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem" static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory" diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/client.conf.xml b/TAO/orbsvcs/tests/Security/Null_Cipher/client.conf.xml index 300e8e84ece..0abbd708692 100644 --- a/TAO/orbsvcs/tests/Security/Null_Cipher/client.conf.xml +++ b/TAO/orbsvcs/tests/Security/Null_Cipher/client.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/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="-SSLNoProtection -SSLAuthenticate SERVER -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"/> </dynamic> diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/server.conf.xml b/TAO/orbsvcs/tests/Security/Null_Cipher/server.conf.xml index a213e58a24e..c9bcbb1adb8 100644 --- a/TAO/orbsvcs/tests/Security/Null_Cipher/server.conf.xml +++ b/TAO/orbsvcs/tests/Security/Null_Cipher/server.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/server.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="-SSLNoProtection -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/> </dynamic> diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf.xml b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf.xml index b1f940db934..6fc48c26cec 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf.xml +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/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="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"/> </dynamic> diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf.xml b/TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf.xml index 3913117f8bf..695834e9c9d 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf.xml +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.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="-SSLAuthenticate NONE -SSLPrivateKey PEM:client_key_nopasswd.pem -SSLCertificate PEM:client_cert.pem"/> </dynamic> diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf.xml b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf.xml index 2d4d881e278..02497f8058e 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf.xml +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/server.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="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/> </dynamic> diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf.xml b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf.xml index e4c872670cf..b8ad89f89ae 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf.xml +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/server_none.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="-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/> </dynamic> diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf.xml b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf.xml index f1c6ec341b3..17d6061b09f 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf.xml +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.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="-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key_nopasswd.pem -SSLCertificate PEM:server_cert.pem"/> </dynamic> diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/client.conf.xml b/TAO/orbsvcs/tests/Security/mixed_security_test/client.conf.xml index b1f940db934..6fc48c26cec 100644 --- a/TAO/orbsvcs/tests/Security/mixed_security_test/client.conf.xml +++ b/TAO/orbsvcs/tests/Security/mixed_security_test/client.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/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="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"/> </dynamic> diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/client_nopasswd.conf.xml b/TAO/orbsvcs/tests/Security/mixed_security_test/client_nopasswd.conf.xml index 3913117f8bf..695834e9c9d 100644 --- a/TAO/orbsvcs/tests/Security/mixed_security_test/client_nopasswd.conf.xml +++ b/TAO/orbsvcs/tests/Security/mixed_security_test/client_nopasswd.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.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="-SSLAuthenticate NONE -SSLPrivateKey PEM:client_key_nopasswd.pem -SSLCertificate PEM:client_cert.pem"/> </dynamic> diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/server.conf.xml b/TAO/orbsvcs/tests/Security/mixed_security_test/server.conf.xml index 2d4d881e278..02497f8058e 100644 --- a/TAO/orbsvcs/tests/Security/mixed_security_test/server.conf.xml +++ b/TAO/orbsvcs/tests/Security/mixed_security_test/server.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/server.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="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/> </dynamic> diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/server_none.conf.xml b/TAO/orbsvcs/tests/Security/mixed_security_test/server_none.conf.xml index e4c872670cf..b8ad89f89ae 100644 --- a/TAO/orbsvcs/tests/Security/mixed_security_test/server_none.conf.xml +++ b/TAO/orbsvcs/tests/Security/mixed_security_test/server_none.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/server_none.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="-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/> </dynamic> diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/server_nopasswd.conf.xml b/TAO/orbsvcs/tests/Security/mixed_security_test/server_nopasswd.conf.xml index f1c6ec341b3..17d6061b09f 100644 --- a/TAO/orbsvcs/tests/Security/mixed_security_test/server_nopasswd.conf.xml +++ b/TAO/orbsvcs/tests/Security/mixed_security_test/server_nopasswd.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.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="-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key_nopasswd.pem -SSLCertificate PEM:server_cert.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 07f30d2bf73..388ce2b122c 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml @@ -1,9 +1,6 @@ <?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> diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf index 31d7b2979b8..ccf92593f69 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf @@ -1,7 +1,6 @@ - dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() - "-SSLPrivateKey PEM:pvtkey.pem -SSLCertificate PEM:selfsigncert.pem" + "-SSLPrivateKey PEM:pvtkey.pem -SSLCertificate PEM:selfsigncert.pem" static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory" diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml index 57fcd5341f6..42d208bc1e8 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml @@ -1,11 +1,8 @@ <?xml version='1.0'?> <!-- Converted from server.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.pem -SSLCertificate PEM:selfsigncert.pem"/> + <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLPrivateKey PEM:pvtkey.pem -SSLCertificate PEM:selfsigncert.pem"/> </dynamic> <static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/> </ACE_Svc_Conf> 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 a0e36769ada..ebdd0a7de4f 100644 --- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf.xml +++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <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/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"/> diff --git a/TAO/tests/AMI/exclusive.conf.xml b/TAO/tests/AMI/exclusive.conf.xml index ce532bac57a..33db7f50d83 100644 --- a/TAO/tests/AMI/exclusive.conf.xml +++ b/TAO/tests/AMI/exclusive.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/AMI/exclusive.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler ST"/> </ACE_Svc_Conf> diff --git a/TAO/tests/AMI/exclusive_rw.conf.xml b/TAO/tests/AMI/exclusive_rw.conf.xml index 14c36b4eb50..15f9b88fe09 100644 --- a/TAO/tests/AMI/exclusive_rw.conf.xml +++ b/TAO/tests/AMI/exclusive_rw.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./tests/AMI/exclusive.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler RW -ORBConnectStrategy blocked"/> <static id="Resource_Factory" params="-ORBFlushingStrategy blocking"/> </ACE_Svc_Conf> diff --git a/TAO/tests/AMI/muxed.conf.xml b/TAO/tests/AMI/muxed.conf.xml index d292525af2c..cf063034ce0 100644 --- a/TAO/tests/AMI/muxed.conf.xml +++ b/TAO/tests/AMI/muxed.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/AMI/muxed.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <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 687c469e333..c662f0d1fab 100644 --- a/TAO/tests/AMI/server.conf.xml +++ b/TAO/tests/AMI/server.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/AMI/server.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <static id="Server_Strategy_Factory" params="-ORBconcurrency thread-per-connection"/> </ACE_Svc_Conf> diff --git a/TAO/tests/AMI_Timeouts/svc.conf.xml b/TAO/tests/AMI_Timeouts/svc.conf.xml index 19c57a13ad7..5b30b8bd1ad 100644 --- a/TAO/tests/AMI_Timeouts/svc.conf.xml +++ b/TAO/tests/AMI_Timeouts/svc.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/AMI_Timeouts/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler MT"/> </ACE_Svc_Conf> diff --git a/TAO/tests/Big_Request_Muxing/svc.conf.xml b/TAO/tests/Big_Request_Muxing/svc.conf.xml index 4ed37f36eb8..bd71e57309f 100644 --- a/TAO/tests/Big_Request_Muxing/svc.conf.xml +++ b/TAO/tests/Big_Request_Muxing/svc.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/Big_Request_Muxing/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy MUXED"/> </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 e7383ad814e..93fbabcd0aa 100644 --- a/TAO/tests/Bug_3251_Regression/Bug_3251.conf.xml +++ b/TAO/tests/Bug_3251_Regression/Bug_3251.conf.xml @@ -1,13 +1,9 @@ <?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.). --> - <!-- ORB --> <dynamic id="DllOrb" type="Service_Object"> <!-- specify TS_ORB_ENDPOINT like this @@ -22,12 +18,9 @@ </dynamic> <!-- ORB --> - <!-- persistent POA --> <dynamic id="PersistentPOA" type="Service_Object"> <initializer path="Bug_3251" init="_make_PersistentPoa" params="PersistentPOA DllOrb"/> </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 ce532bac57a..33db7f50d83 100644 --- a/TAO/tests/Bug_3801_Regression/exclusive.conf.xml +++ b/TAO/tests/Bug_3801_Regression/exclusive.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/AMI/exclusive.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <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 d292525af2c..cf063034ce0 100644 --- a/TAO/tests/Bug_3801_Regression/muxed.conf.xml +++ b/TAO/tests/Bug_3801_Regression/muxed.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/AMI/muxed.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy MUXED -ORBClientConnectionHandler ST"/> </ACE_Svc_Conf> diff --git a/TAO/tests/Bug_3801_Regression/server.conf.xml b/TAO/tests/Bug_3801_Regression/server.conf.xml index 828b3ba9349..c662f0d1fab 100644 --- a/TAO/tests/Bug_3801_Regression/server.conf.xml +++ b/TAO/tests/Bug_3801_Regression/server.conf.xml @@ -1,7 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/AMI/server.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <static id="Server_Strategy_Factory" params="-ORBconcurrency thread-per-connection"/> </ACE_Svc_Conf> diff --git a/TAO/tests/Bug_3953_Regression/svc.conf.xml b/TAO/tests/Bug_3953_Regression/svc.conf.xml index b8ed0bbe4c8..fe9af175625 100644 --- a/TAO/tests/Bug_3953_Regression/svc.conf.xml +++ b/TAO/tests/Bug_3953_Regression/svc.conf.xml @@ -1,5 +1,4 @@ <?xml version='1.0'?> <ACE_Svc_Conf> - <!-- --> <static Client_Strategy_Factory '-ORBWaitStrategy mt_noupcall'"> </ACE_Svc_Conf> diff --git a/TAO/tests/CSD_Collocation/svc.conf.xml b/TAO/tests/CSD_Collocation/svc.conf.xml index 5c37f064dda..dd3aa384192 100644 --- a/TAO/tests/CSD_Collocation/svc.conf.xml +++ b/TAO/tests/CSD_Collocation/svc.conf.xml @@ -1,8 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./tests/Collocation/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <!-- Please see $TAO_ROOT/docs/Options.html for details on these options. --> <!-- --> <!-- This is a single threaded "server." --> diff --git a/TAO/tests/Collocation/svc.conf.xml b/TAO/tests/Collocation/svc.conf.xml index 5c37f064dda..dd3aa384192 100644 --- a/TAO/tests/Collocation/svc.conf.xml +++ b/TAO/tests/Collocation/svc.conf.xml @@ -1,8 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./tests/Collocation/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <!-- Please see $TAO_ROOT/docs/Options.html for details on these options. --> <!-- --> <!-- This is a single threaded "server." --> diff --git a/TAO/tests/Connect_Strategy_Test/blocked.conf.xml b/TAO/tests/Connect_Strategy_Test/blocked.conf.xml index 53bbc2385c7..4a71c024dfa 100644 --- a/TAO/tests/Connect_Strategy_Test/blocked.conf.xml +++ b/TAO/tests/Connect_Strategy_Test/blocked.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/Connect_Strategy_Test/blocked.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <static id="Client_Strategy_Factory" params="-ORBConnectStrategy Blocked"/> </ACE_Svc_Conf> diff --git a/TAO/tests/Connect_Strategy_Test/reactor.conf.xml b/TAO/tests/Connect_Strategy_Test/reactor.conf.xml index d5da8974a4c..e27870eee26 100644 --- a/TAO/tests/Connect_Strategy_Test/reactor.conf.xml +++ b/TAO/tests/Connect_Strategy_Test/reactor.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/Connect_Strategy_Test/reactor.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <static id="Client_Strategy_Factory" params="-ORBConnectStrategy Reactive"/> </ACE_Svc_Conf> diff --git a/TAO/tests/Connection_Purging/client.fifo.conf.xml b/TAO/tests/Connection_Purging/client.fifo.conf.xml index 8a697a5dc49..bb202d39f5c 100644 --- a/TAO/tests/Connection_Purging/client.fifo.conf.xml +++ b/TAO/tests/Connection_Purging/client.fifo.conf.xml @@ -1,7 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/Connection_Purging/client.fifo.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <static id="Advanced_Resource_Factory" params="-ORBConnectionPurgingStrategy fifo -ORBConnectionCacheMax 10 -ORBConnectionCachePurgePercentage 30"/> </ACE_Svc_Conf> diff --git a/TAO/tests/Connection_Purging/client.lfu.conf.xml b/TAO/tests/Connection_Purging/client.lfu.conf.xml index 534c970400f..641ff5e2777 100644 --- a/TAO/tests/Connection_Purging/client.lfu.conf.xml +++ b/TAO/tests/Connection_Purging/client.lfu.conf.xml @@ -1,7 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/Connection_Purging/client.lfu.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <static id="Advanced_Resource_Factory" params="-ORBConnectionPurgingStrategy lfu -ORBConnectionCacheMax 10 -ORBConnectionCachePurgePercentage 30"/> </ACE_Svc_Conf> diff --git a/TAO/tests/Connection_Purging/client.lru.conf.xml b/TAO/tests/Connection_Purging/client.lru.conf.xml index 9dfbe298c56..5f497ccb6db 100644 --- a/TAO/tests/Connection_Purging/client.lru.conf.xml +++ b/TAO/tests/Connection_Purging/client.lru.conf.xml @@ -1,7 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/Connection_Purging/client.lru.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <static id="Advanced_Resource_Factory" params="-ORBConnectionPurgingStrategy lru -ORBConnectionCacheMax 10 -ORBConnectionCachePurgePercentage 30"/> </ACE_Svc_Conf> diff --git a/TAO/tests/Connection_Purging/client.null.conf.xml b/TAO/tests/Connection_Purging/client.null.conf.xml index 8f4aa4b28d3..f7460e5fb61 100644 --- a/TAO/tests/Connection_Purging/client.null.conf.xml +++ b/TAO/tests/Connection_Purging/client.null.conf.xml @@ -1,7 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/Connection_Purging/client.null.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <static id="Advanced_Resource_Factory" params="-ORBConnectionPurgingStrategy null"/> </ACE_Svc_Conf> diff --git a/TAO/tests/Connection_Purging/server_shmiop.conf.xml b/TAO/tests/Connection_Purging/server_shmiop.conf.xml index 41f5fcd045a..325cd5c1738 100644 --- a/TAO/tests/Connection_Purging/server_shmiop.conf.xml +++ b/TAO/tests/Connection_Purging/server_shmiop.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/Connection_Purging/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/tests/LongUpcalls/svc.conf.xml b/TAO/tests/LongUpcalls/svc.conf.xml index 5bc775cc477..cf238f07e6c 100644 --- a/TAO/tests/LongUpcalls/svc.conf.xml +++ b/TAO/tests/LongUpcalls/svc.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./tests/LongUpcalls/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <static id="Resource_Factory" params="-ORBFlushingStrategy blocking"/> <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler MT -ORBTransportMuxStrategy MUXED"/> </ACE_Svc_Conf> diff --git a/TAO/tests/MT_BiDir/server.conf.xml b/TAO/tests/MT_BiDir/server.conf.xml index d999f284589..6d0ca6068d1 100644 --- a/TAO/tests/MT_BiDir/server.conf.xml +++ b/TAO/tests/MT_BiDir/server.conf.xml @@ -1,7 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/MT_BiDir/server.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <static id="Resource_Factory" params="-ORBMuxedConnectionMax 1"/> </ACE_Svc_Conf> diff --git a/TAO/tests/MT_Client/client.conf.xml b/TAO/tests/MT_Client/client.conf.xml index 8b7a64f16fa..a4828e3fba8 100644 --- a/TAO/tests/MT_Client/client.conf.xml +++ b/TAO/tests/MT_Client/client.conf.xml @@ -1,6 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/MT_Client/client.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/> </ACE_Svc_Conf> diff --git a/TAO/tests/MT_Client/client_muxed.conf.xml b/TAO/tests/MT_Client/client_muxed.conf.xml index 2d3bed32590..3653cf63775 100644 --- a/TAO/tests/MT_Client/client_muxed.conf.xml +++ b/TAO/tests/MT_Client/client_muxed.conf.xml @@ -1,6 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/MT_Client/client_muxed.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler MT -ORBTransportMuxStrategy MUXED"/> </ACE_Svc_Conf> diff --git a/TAO/tests/MT_Client/server.conf.xml b/TAO/tests/MT_Client/server.conf.xml index f14289b0558..221fbe33609 100644 --- a/TAO/tests/MT_Client/server.conf.xml +++ b/TAO/tests/MT_Client/server.conf.xml @@ -1,7 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/MT_Client/server.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <static id="Server_Strategy_Factory" params="-ORBconcurrency thread-per-connection"/> </ACE_Svc_Conf> diff --git a/TAO/tests/MT_Server/server.conf.xml b/TAO/tests/MT_Server/server.conf.xml index bfcde8e9716..e6510503271 100644 --- a/TAO/tests/MT_Server/server.conf.xml +++ b/TAO/tests/MT_Server/server.conf.xml @@ -1,6 +1,4 @@ <?xml version='1.0'?> <!-- Converted from ./tests/MT_Server/server.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> </ACE_Svc_Conf> diff --git a/TAO/tests/Mixed_Sync_ASync_Events/exclusive_rw.conf.xml b/TAO/tests/Mixed_Sync_ASync_Events/exclusive_rw.conf.xml index 14c36b4eb50..15f9b88fe09 100644 --- a/TAO/tests/Mixed_Sync_ASync_Events/exclusive_rw.conf.xml +++ b/TAO/tests/Mixed_Sync_ASync_Events/exclusive_rw.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./tests/AMI/exclusive.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler RW -ORBConnectStrategy blocked"/> <static id="Resource_Factory" params="-ORBFlushingStrategy blocking"/> </ACE_Svc_Conf> diff --git a/TAO/tests/Muxing/svc.conf.xml b/TAO/tests/Muxing/svc.conf.xml index c2c612f4023..c28721a4752 100644 --- a/TAO/tests/Muxing/svc.conf.xml +++ b/TAO/tests/Muxing/svc.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/Muxing/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy MUXED"/> </ACE_Svc_Conf> diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.conf.xml b/TAO/tests/NestedUpcall/MT_Client_Test/client.conf.xml index 52907fac38e..defb3b2e0cc 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.conf.xml +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.conf.xml @@ -1,8 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./tests/NestedUpcall/MT_Client_Test/client.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <dynamic id="Client_Strategy_Factory" type="Service_Object"> <initializer path="TAO" init="_make_TAO_Default_Client_Strategy_Factory"/> </dynamic> diff --git a/TAO/tests/NestedUpcall/Simple/svc.conf.xml b/TAO/tests/NestedUpcall/Simple/svc.conf.xml index 1aff47aece0..6a37626d5ea 100644 --- a/TAO/tests/NestedUpcall/Simple/svc.conf.xml +++ b/TAO/tests/NestedUpcall/Simple/svc.conf.xml @@ -1,8 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./tests/NestedUpcall/Simple/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <!-- static Resource_Factory "-ORBReactorType tp" --> <!-- static Server_Strategy_Factory "-ORBConcurrency thread-per-connection" --> </ACE_Svc_Conf> diff --git a/TAO/tests/Nested_Event_Loop/svc.conf.xml b/TAO/tests/Nested_Event_Loop/svc.conf.xml index c3a37fde730..96b037665f4 100644 --- a/TAO/tests/Nested_Event_Loop/svc.conf.xml +++ b/TAO/tests/Nested_Event_Loop/svc.conf.xml @@ -1,7 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/Nested_Event_Loop/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <static id="Advanced_Resource_Factory" params="-ORBReactorType select_mt"/> </ACE_Svc_Conf> diff --git a/TAO/tests/No_Server_MT_Connect_Test/blocked.conf.xml b/TAO/tests/No_Server_MT_Connect_Test/blocked.conf.xml index 3906e7c0632..91f08e38e8a 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/blocked.conf.xml +++ b/TAO/tests/No_Server_MT_Connect_Test/blocked.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/No_Server_MT_Connect_Test/blocked.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <static id="Client_Strategy_Factory" params="-ORBConnectStrategy Blocked"/> </ACE_Svc_Conf> diff --git a/TAO/tests/No_Server_MT_Connect_Test/reactor.conf.xml b/TAO/tests/No_Server_MT_Connect_Test/reactor.conf.xml index d09d1c4be8a..819f6c3cbd5 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/reactor.conf.xml +++ b/TAO/tests/No_Server_MT_Connect_Test/reactor.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/No_Server_MT_Connect_Test/reactor.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <static id="Client_Strategy_Factory" params="-ORBConnectStrategy Reactive"/> </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 fc40ce45a8b..f3273f0cb93 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,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from Service_Config_Test.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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/Object_Loader/svc.conf.xml b/TAO/tests/Object_Loader/svc.conf.xml index 615a047a214..8484a8b8e98 100644 --- a/TAO/tests/Object_Loader/svc.conf.xml +++ b/TAO/tests/Object_Loader/svc.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./tests/Object_Loader/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <dynamic id="TAO_POA" type="Service_Object"> <initializer path="TAO_PortableServer" init="_make_TAO_Object_Adapter_Factory"/> </dynamic> diff --git a/TAO/tests/OctetSeq/svc1.conf.xml b/TAO/tests/OctetSeq/svc1.conf.xml index ec2ed6fa884..19970e07080 100644 --- a/TAO/tests/OctetSeq/svc1.conf.xml +++ b/TAO/tests/OctetSeq/svc1.conf.xml @@ -1,8 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./tests/OctetSeq/svc1.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <dynamic id="Advanced_Resource_Factory" type="Service_Object"> <initializer path="TAO_Strategies" init="_make_TAO_Advanced_Resource_Factory" params="-ORBInputCDRAllocator null"/> </dynamic> diff --git a/TAO/tests/OctetSeq/svc2.conf.xml b/TAO/tests/OctetSeq/svc2.conf.xml index db473a8b607..7634fdf7cd9 100644 --- a/TAO/tests/OctetSeq/svc2.conf.xml +++ b/TAO/tests/OctetSeq/svc2.conf.xml @@ -1,8 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./tests/OctetSeq/svc2.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <dynamic id="Advanced_Resource_Factory" type="Service_Object"> <initializer path="TAO_Strategies" init="_make_TAO_Advanced_Resource_Factory" params="-ORBInputCDRAllocator null"/> </dynamic> diff --git a/TAO/tests/POA/Explicit_Activation/alternate.conf.xml b/TAO/tests/POA/Explicit_Activation/alternate.conf.xml index 5038f3a18a0..35d76be275b 100644 --- a/TAO/tests/POA/Explicit_Activation/alternate.conf.xml +++ b/TAO/tests/POA/Explicit_Activation/alternate.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./examples/POA/Explicit_Activation/alternate.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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/POA/Identity/svc.conf.xml b/TAO/tests/POA/Identity/svc.conf.xml index cc01622f287..4cec43e55e7 100644 --- a/TAO/tests/POA/Identity/svc.conf.xml +++ b/TAO/tests/POA/Identity/svc.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./tests/POA/Identity/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="-ORBUseridPolicyDemuxStrategy dynamic -ORBSystemidPolicyDemuxStrategy active -ORBUniqueidPolicyReverseDemuxStrategy dynamic -ORBAllowReactivationOfSystemids 1 -ORBActiveHintInIds 1"/> </ACE_Svc_Conf> diff --git a/TAO/tests/POA/On_Demand_Loading/svc.conf.xml b/TAO/tests/POA/On_Demand_Loading/svc.conf.xml index 7cfdd9fbc1e..e61b0f07a76 100644 --- a/TAO/tests/POA/On_Demand_Loading/svc.conf.xml +++ b/TAO/tests/POA/On_Demand_Loading/svc.conf.xml @@ -1,7 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./examples/POA/On_Demand_Loading/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <static id="Server_Strategy_Factory" params="-ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"/> </ACE_Svc_Conf> diff --git a/TAO/tests/Param_Test/svc.conf.xml b/TAO/tests/Param_Test/svc.conf.xml index befa3aeb409..a97d4da3cfa 100644 --- a/TAO/tests/Param_Test/svc.conf.xml +++ b/TAO/tests/Param_Test/svc.conf.xml @@ -1,10 +1,7 @@ <?xml version='1.0'?> <!-- Converted from ./tests/Param_Test/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <!-- Please read $TAO_ROOT/docs/Options.html for details. --> - <!-- --> <static id="Resource_Factory" params="-ORBNativeWCharCodeset 0x00010001"/> <static id="Server_Strategy_Factory" params="-ORBtablesize 128"/> </ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Banded_Connections/svc.conf.xml b/TAO/tests/RTCORBA/Banded_Connections/svc.conf.xml index 2203ad24712..b589f90605b 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/svc.conf.xml +++ b/TAO/tests/RTCORBA/Banded_Connections/svc.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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 2203ad24712..b589f90605b 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/svc.conf.xml +++ b/TAO/tests/RTCORBA/Client_Propagated/svc.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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 ca2ecb635ea..0c3f02e1362 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/svc.conf.xml +++ b/TAO/tests/RTCORBA/Client_Protocol/svc.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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 db2f0e8b876..f297697bc7c 100644 --- a/TAO/tests/RTCORBA/Collocation/continuous.conf.xml +++ b/TAO/tests/RTCORBA/Collocation/continuous.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from continuous.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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 2203ad24712..b589f90605b 100644 --- a/TAO/tests/RTCORBA/Collocation/svc.conf.xml +++ b/TAO/tests/RTCORBA/Collocation/svc.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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 db2f0e8b876..f297697bc7c 100644 --- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml +++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from continuous.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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 38491e4b6f6..bbb864e64b0 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from continuous.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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 02746b14112..24f6033f25e 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf.xml +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf.xml @@ -1,8 +1,5 @@ <?xml version='1.0'?> <!-- Converted from svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <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 ca2ecb635ea..0c3f02e1362 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/svc.conf.xml +++ b/TAO/tests/RTCORBA/Explicit_Binding/svc.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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 9c5b7d4acf9..b798a25865d 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/svc.conf.xml +++ b/TAO/tests/RTCORBA/Linear_Priority/svc.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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/server.conf.xml b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.conf.xml index 44549173ab7..645f0a190ac 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.conf.xml +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.conf.xml @@ -1,8 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./tests/RTCORBA/MT_Client_Protocol_Priority/server.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <dynamic id="SHMIOP_Factory" type="Service_Object"> <initializer path="TAO_Strategies" init="_make_TAO_SHMIOP_Protocol_Factory" params="-MMAPFilePrefix server_shmiop "/> </dynamic> 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 741a9d5b6d2..20e6e885da4 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf.xml +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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 db2f0e8b876..f297697bc7c 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf.xml +++ b/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from continuous.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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 89ac8ba5155..575234501d6 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/svc.conf.xml +++ b/TAO/tests/RTCORBA/Policy_Combinations/svc.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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 db2f0e8b876..f297697bc7c 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from continuous.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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 2203ad24712..b589f90605b 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf.xml +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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/Profile_And_Endpoint_Selection/svc.conf.xml b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/svc.conf.xml index 6a092a1cd69..56637ae61ba 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/svc.conf.xml +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/svc.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- Options for SHMIOP protocol --> <static id="SHMIOP_Factory" params="-MMAPFilePrefix server_shmiop"/> <!-- Options required for regular testing --> diff --git a/TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml b/TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml index db2f0e8b876..f297697bc7c 100644 --- a/TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml +++ b/TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from continuous.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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 2203ad24712..b589f90605b 100644 --- a/TAO/tests/RTCORBA/Server_Declared/svc.conf.xml +++ b/TAO/tests/RTCORBA/Server_Declared/svc.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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 c8c62dd64bd..a4aed9ed5d7 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/server_iiop.conf.xml +++ b/TAO/tests/RTCORBA/Server_Protocol/server_iiop.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from server_iiop.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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 c7487a7d3b4..9154765d4dd 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/server_reverse.conf.xml +++ b/TAO/tests/RTCORBA/Server_Protocol/server_reverse.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from server_reverse.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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 00b954046a2..dc1e7f12579 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf.xml +++ b/TAO/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from server_reverse_nt.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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 6143c2528fa..9ffdb8c899f 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/server_shmiop.conf.xml +++ b/TAO/tests/RTCORBA/Server_Protocol/server_shmiop.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from server_shmiop.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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 41217cd50e9..911f616d4fa 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/server_uiop.conf.xml +++ b/TAO/tests/RTCORBA/Server_Protocol/server_uiop.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from server_uiop.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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 db2f0e8b876..f297697bc7c 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/continuous.conf.xml +++ b/TAO/tests/RTCORBA/Thread_Pool/continuous.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from continuous.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <!-- 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 2203ad24712..b589f90605b 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/svc.conf.xml +++ b/TAO/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> - <!-- --> - <!-- --> - <!-- --> <!-- 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/Smart_Proxies/Collocation/svc.conf.xml b/TAO/tests/Smart_Proxies/Collocation/svc.conf.xml index 78afddd1f72..ddf4ffe181a 100644 --- a/TAO/tests/Smart_Proxies/Collocation/svc.conf.xml +++ b/TAO/tests/Smart_Proxies/Collocation/svc.conf.xml @@ -1,8 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./tests/Smart_Proxies/Collocation/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <!-- Please see $TAO_ROOT/docs/Options.html for details on these options. --> <!-- --> <!-- This is a single threaded "server." --> diff --git a/TAO/tests/Strategies/advanced_svc.conf.xml b/TAO/tests/Strategies/advanced_svc.conf.xml index ee388bf5e37..0ed4490f30b 100644 --- a/TAO/tests/Strategies/advanced_svc.conf.xml +++ b/TAO/tests/Strategies/advanced_svc.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./tests/Strategies/advanced_svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <!-- This conf file is used to load the advanced strategies. --> <!-- dynamic UIOP_Factory Service_Object *TAO_Strategies:_make_TAO_UIOP_Protocol_Factory () "" --> <dynamic id="SHMIOP_Factory" type="Service_Object"> diff --git a/TAO/tests/Strategies/svc.conf.xml b/TAO/tests/Strategies/svc.conf.xml index 0c247adab1e..2adf95c6606 100644 --- a/TAO/tests/Strategies/svc.conf.xml +++ b/TAO/tests/Strategies/svc.conf.xml @@ -1,8 +1,6 @@ <?xml version='1.0'?> <!-- Converted from ./tests/Strategies/svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> <!-- This configuration file is used to use only the default TAO --> <!-- strategies --> <static id="Resource_Factory" params="-ORBProtocolFactory IIOP_Factory"/> diff --git a/TAO/tests/Time_Policy/hr_time.conf.xml b/TAO/tests/Time_Policy/hr_time.conf.xml index 8b9c12db924..6b52af97e79 100644 --- a/TAO/tests/Time_Policy/hr_time.conf.xml +++ b/TAO/tests/Time_Policy/hr_time.conf.xml @@ -1,6 +1,5 @@ <?xml version='1.0'?> <!-- Converted from hr_time.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <static id="Time_Policy_Manager" params="-ORBTimePolicyStrategy HR"/> </ACE_Svc_Conf> diff --git a/TAO/tests/Time_Policy_Custom/custom_time.conf.xml b/TAO/tests/Time_Policy_Custom/custom_time.conf.xml index 1107e1ac60e..6aab27b7820 100644 --- a/TAO/tests/Time_Policy_Custom/custom_time.conf.xml +++ b/TAO/tests/Time_Policy_Custom/custom_time.conf.xml @@ -1,7 +1,6 @@ <?xml version='1.0'?> <!-- Converted from custom_time.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> <dynamic id="CUSTOM_TIME_POLICY" type="Service_Object"> <initializer path="CustomTimePolicy" init="_make_Custom_Time_Policy_Strategy"/> </dynamic> diff --git a/TAO/utils/nsgroup/windows.conf.xml b/TAO/utils/nsgroup/windows.conf.xml index 27161f70295..2cb298ea865 100644 --- a/TAO/utils/nsgroup/windows.conf.xml +++ b/TAO/utils/nsgroup/windows.conf.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!-- Converted from windows.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <!-- --> - <!-- --> - <!-- --> <dynamic id="Advanced_Resource_Factory" type="Service_Object"> <initializer path="TAO_Strategies" init="_make_TAO_Advanced_Resource_Factory" params="-ORBReactorType select_mt"/> </dynamic> |