From 11391839c6adc7566dac1259c2451248e30a94d0 Mon Sep 17 00:00:00 2001
From: nobody
Date: Wed, 26 Apr 2006 19:54:08 +0000
Subject: This commit was manufactured by cvs2svn to create tag
'oci_wchar_refactor_branch_post_merge_in_4_26_06'.
---
ACE-INSTALL.html | 16 +-
ACEXML/common/HttpCharStream.cpp | 4 +-
ACEXML/common/URL_Addr.cpp | 6 +-
ACEXML/common/XML_Types.h | 8 +-
ACEXML/examples/SAXPrint/main.cpp | 2 +-
ASNMP/agent/main.cpp | 6 +-
ASNMP/agent/snmp_agent.cpp | 6 +-
ASNMP/asnmp/sagent.cpp | 2 +-
ASNMP/examples/get/get.cpp | 14 +-
ASNMP/examples/get/get_async.cpp | 14 +-
ASNMP/examples/next/next.cpp | 14 +-
ASNMP/examples/set/set.cpp | 20 +-
ASNMP/examples/trap/trap.cpp | 14 +-
ASNMP/examples/walk/walk.cpp | 14 +-
ASNMP/tests/test_config.h | 8 +-
ChangeLog | 103 -
Kokyu/tests/EDF/test.cpp | 2 +-
Kokyu/tests/FIFO/test.cpp | 2 +-
.../Example/CIDL/LocalExecutorMapping/cidlc.cpp | 2 +-
TAO/CIAO/CIDLC/cidlc.cpp | 2 +-
TAO/CIAO/ChangeLog | 1294 +-
.../DAnCE/ComponentPackager/Component_Packager.cpp | 154 +
.../DAnCE/ExecutionManager/Execution_Manager.cpp | 17 +-
TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp | 2 +-
TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc | 2 +-
.../DAnCE/NodeApplication/NodeApplication_Impl.cpp | 8 +-
.../DAnCE/NodeApplication/NodeApplication_Impl.h | 2 +-
.../NodeApplicationManager/Containers_Info_Map.cpp | 11 +-
.../NodeApplicationManager/Containers_Info_Map.h | 5 +-
TAO/CIAO/DAnCE/NodeManager/Monitor.mpc | 2 +-
TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc | 2 +-
TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp | 4 +-
TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp | 2 +-
.../DAnCE/RTNodeApplication/RTNodeApplication.cpp | 4 +-
.../DAnCE/RepositoryManager/Repository_Manager.cpp | 305 +
.../DAnCE/StaticConfigurator/StaticDAnCEParser.mpc | 2 +-
TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h | 7 +-
TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc | 4 +-
TAO/CIAO/DAnCE/spec_RepositoryManager/Options.cpp | 88 +
.../DAnCE/spec_RepositoryManager/URL_Parser.cpp | 107 +
.../DAnCE/tests/Config_Handlers/Handler_Test.cpp | 208 +
.../tests/NodeApplicationTest/NodeAppTest.mpc | 2 +-
.../NodeApplicationTest/NodeApp_test_client.cpp | 4 +-
.../NodeApplicationTest/NodeApp_test_client_ex.cpp | 4 +-
.../NodeApp_test_client_simple.cpp | 4 +-
TAO/CIAO/NEWS | 18 -
TAO/CIAO/ciao/Deployment_Core.idl | 2 +-
TAO/CIAO/ciaosvcs/Events/CIAO_Events.idl | 69 +
TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc | 5 +-
.../docs/tutorials/Quoter/Simple/Broker/Broker.cpp | 4 +-
.../docs/tutorials/Quoter/Simple/Broker/Broker.mpc | 4 -
.../Quoter/Simple/Distributor/Distributor.cpp | 4 +-
.../Quoter/Simple/Distributor/Distributor.mpc | 12 +-
.../examples/BasicSP/BMClosedED/BMClosedED.mpc | 16 +-
TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc | 2 -
TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc | 16 +-
TAO/CIAO/examples/BasicSP/EC/EC.mpc | 13 +-
TAO/CIAO/examples/BasicSP/EC/client.cpp | 2 +-
TAO/CIAO/examples/BasicSP/EC/controller.cpp | 4 +-
TAO/CIAO/examples/Display/GPS/GPS.mpc | 9 +-
.../examples/Display/NavDisplay/NavDisplay.mpc | 7 +-
TAO/CIAO/examples/Display/RateGen/RateGen.mpc | 24 +-
TAO/CIAO/examples/Display/RateGen/controller.cpp | 4 +-
TAO/CIAO/examples/Hello/Receiver/Receiver.mpc | 14 +-
TAO/CIAO/examples/Hello/Sender/Sender.mpc | 17 +-
TAO/CIAO/examples/Hello/Sender/starter.cpp | 4 +-
TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc | 6 +-
TAO/CIAO/examples/Swapping/Sender/Sender.mpc | 5 -
TAO/CIAO/examples/Swapping/Sender/starter.cpp | 4 +-
TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc | 4 +-
.../Benchmark/Multi_Threaded/client.cpp | 2 +-
.../Benchmark/RoundTrip/RoundTrip.mpc | 4 -
.../Benchmark/RoundTrip/client.cpp | 4 +-
.../Benchmark/RoundTripClient/client.cpp | 2 +-
.../Benchmark/RoundTripServer/server.cpp | 2 +-
TAO/CIAO/performance-tests/Benchmark/server.cpp | 2 +-
.../Protocols/Controller/Controller.cpp | 4 +-
.../SEC_CheckPoint/TSEC_CheckPoint.mpc | 4 -
TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc | 6 +-
TAO/CIAO/tests/Minimum/Receiver/Receiver.mpc | 3 -
TAO/CIAO/tests/Minimum/Sender/Sender.mpc | 3 -
TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp | 4 +-
TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp | 12 +-
TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp | 4 +-
TAO/CIAO/tools/Config_Handlers/CEPE_Handler.h | 76 +-
TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp | 2 +-
TAO/CIAO/tools/Config_Handlers/CPD_Handler.h | 76 +-
TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp | 8 +-
TAO/CIAO/tools/Config_Handlers/Deployment.hpp | 190 +-
.../DynAny_Handler/DynEnum_Handler.h | 1 -
TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp | 4 +-
TAO/CIAO/tools/Config_Handlers/ERE_Handler.h | 75 +-
TAO/CIAO/tools/Config_Handlers/IRDD_Handler.h | 1 -
TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp | 2 +-
TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp | 2 +-
TAO/CIAO/tools/Config_Handlers/PCD_Handler.h | 4 +-
.../Package_Handlers/CAD_Handler.cpp | 16 +-
.../Package_Handlers/CID_Handler.cpp | 14 +-
.../Package_Handlers/CPD_Handler.cpp | 8 +-
.../Config_Handlers/Package_Handlers/CPD_Handler.h | 8 +-
.../Package_Handlers/Comp_Intf_Descr_Handler.cpp | 4 +-
.../Config_Handlers/Package_Handlers/NIA_Handler.h | 5 +-
.../Package_Handlers/PCD_Handler.cpp | 31 +-
.../Config_Handlers/Package_Handlers/PC_Intf.cpp | 6 +
.../Config_Handlers/Package_Handlers/PC_Intf.h | 2 +-
.../Package_Handlers/SID_Handler.cpp | 4 +-
.../Config_Handlers/Package_Handlers/SID_Handler.h | 4 +-
.../tools/Config_Handlers/Property_Handler.cpp | 2 +-
TAO/CIAO/tools/Config_Handlers/Property_Handler.h | 81 +-
TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp | 4 +-
TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp | 4 +-
TAO/CIAO/tools/Config_Handlers/Req_Handler.h | 76 +-
.../Config_Handlers/SatisfierProperty_Handler.cpp | 2 +-
.../Config_Handlers/SatisfierProperty_Handler.h | 78 +-
TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp | 10 +
TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp | 6 +
TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp | 81 +
TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp | 10 +
TAO/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp | 10 +
TAO/CIAO/tools/Config_Handlers/cdp.hpp | 976 +-
TAO/CIAO/tools/Config_Handlers/test.cpp | 4 +-
TAO/CIAO/tools/Config_Handlers/toplevel.hpp | 193 +-
TAO/ChangeLog | 22309 +++++++++++++++++--
TAO/TAO_IDL/ast/ast_generator.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp | 2 -
TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp | 5 +-
TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp | 4 +-
TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp | 5 -
TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp | 10 -
TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp | 6 -
TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp | 14 +-
TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp | 4 +-
TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp | 85 +-
.../be/be_visitor_valuetype/valuetype_ch.cpp | 18 +-
.../be/be_visitor_valuetype/valuetype_ci.cpp | 23 +-
.../be/be_visitor_valuetype/valuetype_cs.cpp | 83 +-
.../be/be_visitor_valuetype/valuetype_obv_ch.cpp | 33 +-
.../be/be_visitor_valuetype/valuetype_obv_cs.cpp | 28 +-
.../be/be_visitor_valuetype_fwd/cdr_op_ch.cpp | 11 +-
TAO/TAO_IDL/fe/fe_init.cpp | 10 +-
TAO/TAO_IDL/fe/idl.yy | 22 +
TAO/TAO_IDL/fe/y.tab.cpp | 22 +
TAO/TAO_IDL/tao_idl.cpp | 2 +-
TAO/TAO_IDL/tao_idl.mpc | 1 +
TAO/WTAOACE.mwc | 25 +
TAO/docs/Options.html | 35 +-
TAO/docs/tutorials/Quoter/AMI/client.cpp | 2 +-
TAO/docs/tutorials/Quoter/AMI/server.cpp | 2 +-
TAO/docs/tutorials/Quoter/Event_Service/client.cpp | 2 +-
TAO/docs/tutorials/Quoter/Event_Service/server.cpp | 2 +-
.../tutorials/Quoter/Naming_Service/client.cpp | 2 +-
.../tutorials/Quoter/Naming_Service/server.cpp | 2 +-
.../Quoter/On_Demand_Activation/client.cpp | 2 +-
.../Quoter/On_Demand_Activation/server.cpp | 2 +-
.../tutorials/Quoter/RT_Event_Service/client.cpp | 2 +-
.../tutorials/Quoter/RT_Event_Service/server.cpp | 2 +-
TAO/docs/tutorials/Quoter/Simple/Client/client.cpp | 2 +-
.../tutorials/Quoter/Simple/Impl-Repo/client.cpp | 2 +-
.../tutorials/Quoter/Simple/Impl-Repo/server.cpp | 2 +-
.../Quoter/Simple/ImprovedServer/server.cpp | 2 +-
.../tutorials/Quoter/Simple/Persistent/client.cpp | 2 +-
.../tutorials/Quoter/Simple/Persistent/server.cpp | 2 +-
TAO/docs/tutorials/Quoter/Simple/Server/server.cpp | 2 +-
TAO/examples/AMH/Sink_Server/AMH_Servant.cpp | 2 +-
TAO/examples/AMH/Sink_Server/Base_Server.cpp | 4 +-
TAO/examples/AMH/Sink_Server/Client_Task.cpp | 2 +-
TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp | 2 +-
TAO/examples/AMH/Sink_Server/client.cpp | 6 +-
TAO/examples/AMH/Sink_Server/mt_server.cpp | 8 +-
TAO/examples/AMH/Sink_Server/st_server.cpp | 8 +-
TAO/examples/AMI/FL_Callback/peer.cpp | 10 +-
TAO/examples/AMI/FL_Callback/progress.cpp | 4 +-
TAO/examples/Advanced/ch_12/client.cpp | 2 +-
TAO/examples/Advanced/ch_12/server.cpp | 2 +-
TAO/examples/Advanced/ch_18/client.cpp | 2 +-
TAO/examples/Advanced/ch_18/server.cpp | 2 +-
TAO/examples/Advanced/ch_21/client.cpp | 2 +-
TAO/examples/Advanced/ch_21/server.cpp | 2 +-
TAO/examples/Advanced/ch_3/client.cpp | 22 +-
TAO/examples/Advanced/ch_3/server.cpp | 22 +-
TAO/examples/Advanced/ch_8_and_10/client.cpp | 2 +-
TAO/examples/Advanced/ch_8_and_10/server.cpp | 2 +-
TAO/examples/Buffered_AMI/client.cpp | 14 +-
TAO/examples/Buffered_AMI/server.cpp | 15 +-
TAO/examples/Buffered_Oneways/client.cpp | 11 +-
TAO/examples/Buffered_Oneways/server.cpp | 13 +-
.../CSD_Strategy/ThreadPool3/ClientApp.cpp | 7 +-
.../CSD_Strategy/ThreadPool4/ClientTask.cpp | 4 +-
.../CSD_Strategy/ThreadPool5/ClientTask.cpp | 4 +-
TAO/examples/Callback_Quoter/Consumer_Handler.cpp | 2 +-
.../Callback_Quoter/Notifier_Input_Handler.cpp | 4 +-
TAO/examples/Callback_Quoter/Supplier_i.cpp | 4 +-
TAO/examples/Callback_Quoter/consumer.cpp | 6 +-
TAO/examples/Callback_Quoter/notifier.cpp | 6 +-
TAO/examples/Callback_Quoter/supplier.cpp | 8 +-
.../AMI_Iterator/Content_Iterator_i.cpp | 2 +-
.../Content_Server/AMI_Iterator/client.cpp | 10 +-
.../Content_Server/AMI_Iterator/server.cpp | 7 +-
.../AMI_Observer/Callback_Handler.cpp | 2 +-
.../Content_Server/AMI_Observer/client.cpp | 10 +-
.../Content_Server/AMI_Observer/server.cpp | 7 +-
.../SMI_Iterator/Content_Iterator_i.cpp | 2 +-
.../Content_Server/SMI_Iterator/client.cpp | 12 +-
.../Content_Server/SMI_Iterator/server.cpp | 7 +-
TAO/examples/Event_Comm/consumer.cpp | 6 +-
TAO/examples/Event_Comm/notifier.cpp | 6 +-
TAO/examples/Event_Comm/supplier.cpp | 6 +-
TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp | 6 +-
TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h | 4 +-
.../Kokyu_dsrt_schedulers/fp_example/client.cpp | 10 +-
.../Kokyu_dsrt_schedulers/fp_example/server.cpp | 12 +-
.../Kokyu_dsrt_schedulers/mif_example/client.cpp | 10 +-
.../Kokyu_dsrt_schedulers/mif_example/server.cpp | 12 +-
.../Kokyu_dsrt_schedulers/muf_example/client.cpp | 10 +-
.../Kokyu_dsrt_schedulers/muf_example/server.cpp | 12 +-
TAO/examples/Load_Balancing/Identity_Client.cpp | 8 +-
TAO/examples/Load_Balancing/Identity_Server.cpp | 10 +-
.../Load_Balancing/Load_Balancing_Service.cpp | 10 +-
.../Load_Balancing_persistent/Identity_Client.cpp | 8 +-
.../Load_Balancing_persistent/Identity_Server.cpp | 12 +-
.../Load_Balancing_persistent/Load_Balancer_i.cpp | 4 +-
.../Load_Balancing_Service.cpp | 10 +-
TAO/examples/Logging/Logger_i.cpp | 8 +-
TAO/examples/Logging/Logging_Service.cpp | 6 +-
TAO/examples/Logging/Logging_Service_i.cpp | 2 +-
TAO/examples/Logging/Logging_Test.cpp | 6 +-
TAO/examples/Logging/Logging_Test_i.cpp | 2 +-
TAO/examples/OBV/Simple_util.cpp | 6 +-
TAO/examples/OBV/Typed_Events/Client_i.cpp | 2 +-
TAO/examples/OBV/Typed_Events/client.cpp | 8 +-
TAO/examples/OBV/Typed_Events/server.cpp | 8 +-
TAO/examples/POA/Adapter_Activator/server.cpp | 17 +-
TAO/examples/POA/DSI/client.cpp | 12 +-
TAO/examples/POA/DSI/server.cpp | 12 +-
TAO/examples/POA/Default_Servant/client.cpp | 10 +-
TAO/examples/POA/Default_Servant/server.cpp | 12 +-
TAO/examples/POA/Explicit_Activation/server.cpp | 17 +-
TAO/examples/POA/FindPOA/FindPOA.cpp | 6 +-
TAO/examples/POA/Forwarding/client.cpp | 10 +-
TAO/examples/POA/Forwarding/server.cpp | 15 +-
TAO/examples/POA/Generic_Servant/client.cpp | 11 +-
TAO/examples/POA/Loader/Servant_Activator.cpp | 6 +-
TAO/examples/POA/Loader/Servant_Locator.cpp | 6 +-
TAO/examples/POA/Loader/Server_Manager.cpp | 9 +-
TAO/examples/POA/Loader/server.cpp | 6 +-
TAO/examples/POA/NewPOA/NewPOA.cpp | 7 +-
TAO/examples/POA/On_Demand_Activation/server.cpp | 15 +-
.../POA/On_Demand_Loading/Servant_Manager.cpp | 4 +-
.../POA/On_Demand_Loading/Server_Manager.cpp | 9 +-
TAO/examples/POA/On_Demand_Loading/server.cpp | 6 +-
TAO/examples/POA/POA_BiDir/POA_BiDir.cpp | 8 +-
.../POA/Reference_Counted_Servant/server.cpp | 13 +-
TAO/examples/POA/RootPOA/RootPOA.cpp | 6 +-
TAO/examples/POA/TIE/client.cpp | 10 +-
TAO/examples/POA/TIE/server.cpp | 18 +-
TAO/examples/Persistent_Grid/Grid_Client_i.cpp | 2 +-
TAO/examples/Persistent_Grid/Grid_i.cpp | 2 +-
.../Persistent_Grid/Persistent_Client_i.cpp | 2 +-
TAO/examples/Persistent_Grid/Simple_util.cpp | 6 +-
TAO/examples/Persistent_Grid/client.cpp | 6 +-
TAO/examples/Persistent_Grid/persistent_client.cpp | 7 +-
TAO/examples/Persistent_Grid/server.cpp | 8 +-
.../PluggableUDP/tests/Basic/UDP_Client_i.cpp | 2 +-
TAO/examples/PluggableUDP/tests/Basic/client.cpp | 10 +-
TAO/examples/PluggableUDP/tests/Basic/server.cpp | 12 +-
.../tests/Performance/UDP_PerformanceClient.cpp | 2 +-
.../PluggableUDP/tests/Performance/client.cpp | 10 +-
.../PluggableUDP/tests/Performance/server.cpp | 12 +-
.../tests/SimplePerformance/client.cpp | 7 +-
.../tests/SimplePerformance/server.cpp | 9 +-
TAO/examples/Quoter/Factory_Finder.cpp | 8 +-
TAO/examples/Quoter/Generic_Factory.cpp | 10 +-
TAO/examples/Quoter/client.cpp | 12 +-
TAO/examples/Quoter/server.cpp | 8 +-
TAO/examples/RTCORBA/Activity/Activity.cpp | 22 +-
TAO/examples/RTCORBA/Activity/Builder.cpp | 4 +-
TAO/examples/RTCORBA/Activity/Builder.h | 5 +-
TAO/examples/RTCORBA/Activity/Job_i.cpp | 5 +-
TAO/examples/RTCORBA/Activity/Job_i.h | 5 +-
TAO/examples/RTCORBA/Activity/POA_Holder.cpp | 4 +-
TAO/examples/RTCORBA/Activity/POA_Holder.h | 5 +-
TAO/examples/RTCORBA/Activity/Periodic_Task.cpp | 6 +-
TAO/examples/RTCORBA/Activity/Periodic_Task.h | 6 +-
TAO/examples/RTCORBA/Activity/Task_Stats.cpp | 12 +-
TAO/examples/RTCORBA/Activity/Task_Stats.h | 4 +-
TAO/examples/RTScheduling/DT_Creator.cpp | 24 +-
TAO/examples/RTScheduling/DT_Creator.h | 2 +-
.../Fixed_Priority_Scheduler/FP_Scheduler.cpp | 2 +-
.../RTScheduling/Fixed_Priority_Scheduler/test.cpp | 6 +-
TAO/examples/RTScheduling/Job_i.cpp | 8 +-
TAO/examples/RTScheduling/Job_i.h | 6 +-
.../RTScheduling/MIF_Scheduler/MIF_Task.cpp | 2 +-
TAO/examples/RTScheduling/MIF_Scheduler/test.cpp | 6 +-
TAO/examples/RTScheduling/POA_Holder.cpp | 4 +-
TAO/examples/RTScheduling/POA_Holder.h | 7 +-
TAO/examples/RTScheduling/Starter.cpp | 8 +-
TAO/examples/RTScheduling/Task_Stats.cpp | 4 +-
TAO/examples/RTScheduling/Task_Stats.h | 4 +-
TAO/examples/RTScheduling/Thread_Task.cpp | 6 +-
TAO/examples/Simple/Simple_util.cpp | 6 +-
TAO/examples/Simple/bank/client.cpp | 7 +-
TAO/examples/Simple/bank/server.cpp | 7 +-
TAO/examples/Simple/chat/Client_i.cpp | 2 +-
TAO/examples/Simple/chat/Server_i.cpp | 4 +-
TAO/examples/Simple/chat/client.cpp | 6 +-
TAO/examples/Simple/chat/server.cpp | 7 +-
TAO/examples/Simple/echo/client.cpp | 9 +-
TAO/examples/Simple/echo/server.cpp | 8 +-
TAO/examples/Simple/grid/Grid_Client_i.cpp | 2 +-
TAO/examples/Simple/grid/client.cpp | 7 +-
TAO/examples/Simple/grid/server.cpp | 8 +-
TAO/examples/Simple/time-date/Time_Date.cpp | 4 +-
TAO/examples/Simple/time-date/client.cpp | 6 +-
TAO/examples/Simple/time-date/server.cpp | 7 +-
TAO/examples/Simple/time/Time_Client_i.cpp | 2 +-
TAO/examples/Simple/time/client.cpp | 7 +-
TAO/examples/Simple/time/server.cpp | 8 +-
.../Simulator/Event_Supplier/DualEC_Sup.cpp | 15 +-
.../Simulator/Event_Supplier/Event_Con.cpp | 11 +-
.../Simulator/Event_Supplier/Event_Sup.cpp | 15 +-
.../Simulator/Event_Supplier/Logging_Sup.cpp | 15 +-
TAO/examples/TypeCode_Creation/main.cpp | 9 +-
TAO/examples/ior_corbaloc/client.cpp | 7 +-
TAO/examples/ior_corbaloc/corbaname_client.cpp | 10 +-
TAO/examples/ior_corbaloc/server.cpp | 9 +-
TAO/examples/mfc/client.cpp | 9 +-
TAO/interop-tests/wchar/client.cpp | 6 +-
TAO/interop-tests/wchar/server.cpp | 2 +-
TAO/interop-tests/wchar/wchar_reference.cpp | 44 +-
TAO/interop-tests/wchar/wchar_reference.h | 26 +-
.../Concurrency_Service/Concurrency_Service.cpp | 22 +-
.../Concurrency_Service/Concurrency_Service.h | 6 +-
TAO/orbsvcs/Event_Service/Event_Service.cpp | 18 +-
.../Event_Service/FT_EventService.cpp | 2 +-
.../Factory_Service/EventChannelFactory_i.cpp | 10 +-
.../Factory_Service/FTRTEC_Factory_Service.cpp | 20 +-
.../Gateway_Service/FTRTEC_Gateway_Service.cpp | 17 +-
.../FT_DefaultFaultAnalyzer.cpp | 34 +-
.../FT_ReplicationManager/FT_FaultConsumer.cpp | 39 +-
.../FT_FaultEventDescriptor.cpp | 22 +-
.../FT_ReplicationManager.cpp | 30 +-
.../FT_ReplicationManagerFaultAnalyzer.cpp | 156 +-
.../Fault_Detector/FT_FaultDetectorFactory_i.cpp | 4 +-
TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp | 4 +-
TAO/orbsvcs/IFR_Service/IFR_Server.cpp | 2 +-
TAO/orbsvcs/IFR_Service/IFR_Service.mpc | 3 +
.../ImplRepo_Service/Activator_NT_Service.h | 6 +-
TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp | 117 +-
TAO/orbsvcs/ImplRepo_Service/Activator_Options.h | 8 +-
TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp | 15 +-
TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp | 167 +-
TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp | 4 +-
TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp | 74 +-
TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h | 6 +-
TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp | 131 +-
TAO/orbsvcs/ImplRepo_Service/Locator_Options.h | 8 +-
.../ImplRepo_Service/Locator_Repository.cpp | 286 +-
TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h | 4 +-
.../ImplRepo_Service/Locator_XMLHandler.cpp | 53 +-
TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h | 8 +-
TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp | 231 +-
TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h | 10 +-
.../LifeCycle_Service/Criteria_Evaluator.cpp | 2 +-
.../LifeCycle_Service/LifeCycle_Service.cpp | 4 +-
TAO/orbsvcs/LoadBalancer/LoadManager.cpp | 26 +-
TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp | 44 +-
.../Basic_Logging_Service.cpp | 37 +-
.../Basic_Logging_Service/Basic_Logging_Service.h | 13 +-
.../Event_Logging_Service.cpp | 37 +-
.../Event_Logging_Service/Event_Logging_Service.h | 12 +-
.../Notify_Logging_Service.cpp | 37 +-
.../Notify_Logging_Service.h | 12 +-
.../RTEvent_Logging_Service.cpp | 36 +-
.../RTEvent_Logging_Service.h | 12 +-
TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp | 22 +-
TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp | 16 +-
TAO/orbsvcs/Naming_Service/NT_Naming_Service.h | 4 +-
TAO/orbsvcs/Naming_Service/Naming_Service.cpp | 2 +-
TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp | 22 +-
TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp | 16 +-
TAO/orbsvcs/Notify_Service/NT_Notify_Service.h | 4 +-
TAO/orbsvcs/Notify_Service/Notify_Service.cpp | 14 +-
TAO/orbsvcs/Notify_Service/Notify_Service.h | 2 +-
TAO/orbsvcs/PSS/psdl_tao.cpp | 2 +-
.../Scheduling_Service/Scheduling_Service.cpp | 12 +-
TAO/orbsvcs/Time_Service/Clerk_i.cpp | 8 +-
TAO/orbsvcs/Time_Service/Server_i.cpp | 6 +-
.../examples/CosEC/Factory/FactoryClient.cpp | 12 +-
.../examples/CosEC/Factory/FactoryDriver.cpp | 6 +-
TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h | 4 +-
TAO/orbsvcs/examples/CosEC/Factory/main.cpp | 7 +-
.../CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp | 14 +-
.../CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h | 4 +-
.../CosEC/RtEC_Based/tests/Basic/Basic.cpp | 9 +-
.../CosEC/RtEC_Based/tests/Multiple/Consumer.cpp | 11 +-
.../CosEC/RtEC_Based/tests/Multiple/Consumer.h | 2 +-
.../CosEC/RtEC_Based/tests/Multiple/Multiple.cpp | 2 +-
.../CosEC/RtEC_Based/tests/Multiple/Multiple.h | 2 +-
.../CosEC/RtEC_Based/tests/Multiple/Supplier.cpp | 11 +-
.../CosEC/RtEC_Based/tests/Multiple/Supplier.h | 2 +-
TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp | 7 +-
TAO/orbsvcs/examples/CosEC/Simple/Service.cpp | 13 +-
TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp | 7 +-
.../examples/CosEC/TypedSimple/Consumer.cpp | 9 +-
.../examples/CosEC/TypedSimple/Supplier.cpp | 6 +-
.../examples/FaultTolerance/RolyPoly/client.cpp | 12 +-
.../examples/FaultTolerance/RolyPoly/server.cpp | 13 +-
TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp | 2 +-
TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp | 2 +-
TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp | 9 +-
TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp | 9 +-
TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp | 9 +-
.../examples/ImR/Combined_Service/combined.cpp | 10 +-
.../examples/ImR/Combined_Service/controller.cpp | 9 +-
.../examples/ImR/Combined_Service/dynserver.cpp | 2 +-
.../examples/ImR/Combined_Service/dynserver.h | 2 +-
TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp | 19 +-
.../examples/ImR/Combined_Service/test_server.cpp | 7 +-
TAO/orbsvcs/examples/LoadBalancing/client.cpp | 12 +-
TAO/orbsvcs/examples/LoadBalancing/server.cpp | 13 +-
TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp | 4 +-
TAO/orbsvcs/examples/Log/Basic/TLS_Client.h | 4 +-
TAO/orbsvcs/examples/Log/Basic/main.cpp | 5 +-
TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp | 5 +-
TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp | 5 +-
.../examples/Log/Notify/Notify_Consumer.cpp | 5 +-
.../examples/Log/Notify/Notify_Supplier.cpp | 5 +-
.../examples/Log/RTEvent/RTEvent_Consumer.cpp | 5 +-
.../examples/Log/RTEvent/RTEvent_Supplier.cpp | 5 +-
.../examples/Notify/Federation/Agent/Agent.cpp | 11 +-
.../Notify/Federation/SpaceCraft/SpaceCraft.cpp | 9 +-
TAO/orbsvcs/examples/Notify/Filter/Filter.cpp | 4 +-
TAO/orbsvcs/examples/Notify/Filter/Filter.h | 4 +-
TAO/orbsvcs/examples/Notify/Filter/main.cpp | 7 +-
.../examples/Notify/Lanes/Consumer_Client.cpp | 16 +-
.../examples/Notify/Lanes/Supplier_Client.cpp | 18 +-
.../examples/Notify/Subscribe/Subscribe.cpp | 7 +-
TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h | 4 +-
TAO/orbsvcs/examples/Notify/Subscribe/main.cpp | 7 +-
.../examples/Notify/ThreadPool/Consumer_Client.cpp | 20 +-
.../examples/Notify/ThreadPool/Supplier_Client.cpp | 24 +-
TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp | 2 +-
TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h | 2 +-
TAO/orbsvcs/examples/ORT/client.cpp | 12 +-
TAO/orbsvcs/examples/ORT/gateway_server.cpp | 14 +-
TAO/orbsvcs/examples/ORT/server.cpp | 14 +-
TAO/orbsvcs/examples/PSS/Simple_Naming.cpp | 4 +-
TAO/orbsvcs/examples/PSS/client.cpp | 2 +-
TAO/orbsvcs/examples/PSS/server.cpp | 2 +-
TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp | 9 +-
TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp | 9 +-
TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp | 9 +-
TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp | 9 +-
TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp | 13 +-
TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp | 11 +-
TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp | 11 +-
TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp | 7 +-
TAO/orbsvcs/examples/RtEC/Simple/Service.cpp | 11 +-
TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp | 7 +-
.../examples/Security/SecurityLevel1/client.cpp | 4 +-
.../examples/Security/SecurityLevel1/server.cpp | 2 +-
TAO/orbsvcs/examples/Security/Send_File/client.cpp | 11 +-
TAO/orbsvcs/examples/Security/Send_File/server.cpp | 13 +-
TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp | 18 +-
TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp | 4 +-
TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp | 23 +-
TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp | 48 +-
TAO/orbsvcs/orbsvcs/AV/TCP.cpp | 6 +-
TAO/orbsvcs/orbsvcs/AV/UDP.cpp | 19 +-
.../orbsvcs/Concurrency/Concurrency_Loader.cpp | 9 +-
.../orbsvcs/Concurrency/Concurrency_Loader.h | 10 +-
.../orbsvcs/CosEvent/CEC_Default_Factory.cpp | 2 +-
TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp | 10 +-
TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll | 2 +-
TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp | 10 +-
TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp | 26 +-
TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp | 6 +-
TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h | 2 +-
.../orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp | 8 +-
.../orbsvcs/Event/EC_Gateway_IIOP_Factory.h | 2 +-
TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp | 2 +-
TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h | 2 +-
TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp | 8 +-
TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h | 2 +-
.../FaultTolerance/FT_Service_Callbacks.cpp | 4 +-
.../FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp | 2 +-
.../AMI_Primary_Replication_Strategy.cpp | 4 +-
.../EventChannel/Basic_Replication_Strategy.cpp | 8 +-
.../FtRtEvent/EventChannel/FTEC_Group_Manager.cpp | 16 +-
.../FtRtEvent/EventChannel/Fault_Detector.cpp | 4 +-
.../FtRtEvent/EventChannel/Fault_Detector_T.cpp | 8 +-
.../EventChannel/ForwardCtrlServerInterceptor.cpp | 2 +-
.../EventChannel/FtEventServiceInterceptor.cpp | 2 +-
.../FtRtEvent/EventChannel/GroupInfoPublisher.cpp | 2 +-
.../EventChannel/Identification_Service.cpp | 2 +-
.../FtRtEvent/EventChannel/Replication_Service.cpp | 12 +-
TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp | 2 +-
TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl | 2 +-
TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp | 4 +-
.../orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp | 4 +-
TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp | 6 +-
TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp | 2 +-
TAO/orbsvcs/orbsvcs/IFRService/Options.cpp | 2 +-
TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp | 2 +-
TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp | 10 +-
.../orbsvcs/LoadBalancing/LB_IORInterceptor.cpp | 2 +-
.../orbsvcs/LoadBalancing/LB_IORInterceptor.h | 2 +-
TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp | 2 +-
.../orbsvcs/Naming/Flat_File_Persistence.cpp | 23 +-
TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp | 6 +-
.../orbsvcs/Naming/Storable_Naming_Context.cpp | 12 +-
.../Naming/Storable_Naming_Context_Activator.cpp | 4 +-
TAO/orbsvcs/orbsvcs/Notify/EventType.cpp | 18 +-
TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp | 2 +-
TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h | 1 +
TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp | 19 +-
TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp | 6 +-
.../orbsvcs/Notify/XML_Topology_Factory.cpp | 20 +-
TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp | 68 +-
TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h | 4 +-
.../orbsvcs/PortableGroup/PG_FactoryRegistry.cpp | 4 +-
.../PortableGroup/PG_Servant_Dispatcher.cpp | 2 +-
.../orbsvcs/PortableGroup/PG_Servant_Dispatcher.h | 2 +-
.../orbsvcs/PortableGroup/Portable_Group_Map.cpp | 2 +-
.../orbsvcs/PortableGroup/UIPMC_Factory.cpp | 2 +-
TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h | 2 +-
.../orbsvcs/Property/CosPropertyService_i.cpp | 4 +-
TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp | 2 +-
TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h | 2 +-
TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp | 26 +-
TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp | 2 +-
TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp | 4 +-
TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp | 44 +
TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h | 73 +-
TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp | 8 +-
TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h | 6 +-
.../orbsvcs/Trader/Service_Type_Repository.cpp | 26 +-
.../orbsvcs/Trader/Service_Type_Repository.h | 18 +-
TAO/orbsvcs/orbsvcs/Trader/Trader.h | 2 +-
.../orbsvcs/Trader/Trader_Constraint_Visitors.cpp | 6 +-
TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp | 10 +-
TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h | 6 +-
TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp | 63 +-
TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h | 9 +-
.../LoadBalancing/LBPerf/CPU/client.cpp | 4 +-
.../LoadBalancing/LBPerf/CPU/server.cpp | 4 +-
.../LoadBalancing/LBPerf/RPS/client.cpp | 4 +-
.../LoadBalancing/LBPerf/RPS/server.cpp | 4 +-
.../RTEvent/Colocated_Roundtrip/compare_histo.cpp | 2 +-
.../RTEvent/Colocated_Roundtrip/driver.cpp | 2 +-
.../RTEvent/Federated_Roundtrip/client.cpp | 4 +-
.../RTEvent/Federated_Roundtrip/server.cpp | 4 +-
.../RTEvent/RTCORBA_Baseline/client.cpp | 2 +-
.../RTEvent/RTCORBA_Baseline/server.cpp | 4 +-
.../RTEvent/RTCORBA_Callback/client.cpp | 2 +-
.../RTEvent/RTCORBA_Callback/server.cpp | 4 +-
.../performance-tests/RTEvent/Roundtrip/client.cpp | 2 +-
.../performance-tests/RTEvent/Roundtrip/server.cpp | 4 +-
.../RTEvent/TCP_Baseline/client.cpp | 4 +-
.../RTEvent/TCP_Baseline/server.cpp | 4 +-
.../RTEvent/lib/Client_Options.cpp | 6 +-
.../performance-tests/RTEvent/lib/Client_Options.h | 7 +-
TAO/orbsvcs/performance-tests/perf.mwc | 2 +
.../Asynch_Three_Stage/Connection_Manager.cpp | 2 +-
.../AVStreams/Asynch_Three_Stage/distributer.cpp | 18 +-
.../AVStreams/Asynch_Three_Stage/receiver.cpp | 23 +-
.../tests/AVStreams/Asynch_Three_Stage/sender.cpp | 20 +-
.../AVStreams/Bidirectional_Flows/receiver.cpp | 22 +-
.../tests/AVStreams/Bidirectional_Flows/sender.cpp | 22 +-
.../AVStreams/Component_Switching/distributer.cpp | 18 +-
.../AVStreams/Component_Switching/receiver.cpp | 23 +-
.../tests/AVStreams/Component_Switching/sender.cpp | 20 +-
TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp | 18 +-
TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h | 1 +
.../tests/AVStreams/Full_Profile/server.cpp | 18 +-
TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h | 1 +
TAO/orbsvcs/tests/AVStreams/Latency/control.cpp | 13 +-
TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp | 14 +-
TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp | 14 +-
.../tests/AVStreams/Modify_QoS/receiver.cpp | 24 +-
TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp | 20 +-
TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp | 20 +-
TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h | 1 +
TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp | 17 +-
TAO/orbsvcs/tests/AVStreams/Multicast/server.h | 1 +
.../tests/AVStreams/Multicast_Full_Profile/ftp.cpp | 17 +-
.../tests/AVStreams/Multicast_Full_Profile/ftp.h | 1 +
.../AVStreams/Multicast_Full_Profile/server.cpp | 16 +-
.../AVStreams/Multicast_Full_Profile/server.h | 1 +
.../tests/AVStreams/Multiple_Flows/receiver.cpp | 20 +-
.../tests/AVStreams/Multiple_Flows/sender.cpp | 20 +-
TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp | 22 +-
TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h | 1 +
TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp | 24 +-
.../AVStreams/Pluggable_Flow_Protocol/receiver.cpp | 24 +-
.../AVStreams/Pluggable_Flow_Protocol/sender.cpp | 20 +-
.../AVStreams/Simple_Three_Stage/distributer.cpp | 13 +-
.../AVStreams/Simple_Three_Stage/receiver.cpp | 24 +-
.../tests/AVStreams/Simple_Three_Stage/sender.cpp | 20 +-
.../tests/AVStreams/Simple_Two_Stage/receiver.cpp | 28 +-
.../tests/AVStreams/Simple_Two_Stage/sender.cpp | 20 +-
.../Simple_Two_Stage_With_QoS/receiver.cpp | 24 +-
.../AVStreams/Simple_Two_Stage_With_QoS/sender.cpp | 20 +-
TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp | 8 +-
TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp | 7 +-
TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp | 7 +-
TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp | 11 +-
TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp | 13 +-
.../tests/Bug_1630_Regression/testclient.cpp | 7 +-
TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp | 11 +-
TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp | 34 +-
TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp | 13 +-
.../Bug_2248_Regression/Bug_2248_Regression.mpc | 3 +
TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp | 28 +-
TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp | 13 +-
TAO/orbsvcs/tests/Concurrency/CC_client.cpp | 10 +-
TAO/orbsvcs/tests/Concurrency/CC_client.h | 1 +
TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp | 7 +-
TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp | 7 +-
.../tests/CosEvent/Basic/Pull_Push_Event.cpp | 7 +-
TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp | 7 +-
TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp | 9 +-
TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp | 7 +-
.../tests/EC_Custom_Marshal/ECM_Consumer.cpp | 13 +-
.../tests/EC_Custom_Marshal/ECM_Supplier.cpp | 13 +-
TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp | 1 +
TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp | 11 +-
TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp | 1 +
TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp | 15 +-
TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp | 13 +-
TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp | 1 +
.../tests/EC_Throughput/ECT_Consumer_Driver.cpp | 13 +-
TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp | 1 +
.../tests/EC_Throughput/ECT_Supplier_Driver.cpp | 13 +-
TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp | 13 +-
TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp | 7 +-
TAO/orbsvcs/tests/Event/Basic/BCast.cpp | 15 +-
TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp | 7 +-
TAO/orbsvcs/tests/Event/Basic/Complex.cpp | 7 +-
TAO/orbsvcs/tests/Event/Basic/Control.cpp | 7 +-
TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp | 7 +-
TAO/orbsvcs/tests/Event/Basic/Gateway.cpp | 7 +-
TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp | 7 +-
TAO/orbsvcs/tests/Event/Basic/Negation.cpp | 7 +-
TAO/orbsvcs/tests/Event/Basic/Observer.cpp | 11 +-
TAO/orbsvcs/tests/Event/Basic/Observer.h | 2 +-
TAO/orbsvcs/tests/Event/Basic/Random.cpp | 9 +-
TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp | 9 +-
TAO/orbsvcs/tests/Event/Basic/Schedule.cpp | 4 +-
TAO/orbsvcs/tests/Event/Basic/Schedule.h | 2 +-
TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp | 7 +-
TAO/orbsvcs/tests/Event/Basic/Timeout.cpp | 7 +-
TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp | 7 +-
.../tests/Event/Mcast/Common/Gateway_EC.cpp | 7 +-
TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp | 9 +-
.../tests/Event/Mcast/Complex/gateway-ec.cpp | 7 +-
TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp | 9 +-
TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp | 9 +-
.../tests/Event/Mcast/Simple/gateway-ec.cpp | 7 +-
TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp | 9 +-
.../tests/Event/Mcast/Two_Way/application.cpp | 11 +-
.../tests/Event/Mcast/Two_Way/gateway-ec.cpp | 7 +-
TAO/orbsvcs/tests/Event/Performance/Connect.cpp | 9 +-
TAO/orbsvcs/tests/Event/Performance/Inversion.cpp | 11 +-
TAO/orbsvcs/tests/Event/Performance/Latency.cpp | 13 +-
.../tests/Event/Performance/Latency_Server.cpp | 13 +-
TAO/orbsvcs/tests/Event/Performance/Throughput.cpp | 7 +-
TAO/orbsvcs/tests/Event/lib/Driver.cpp | 7 +-
TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp | 2 +
.../tests/FT_App/FTAPP_FactoryRegistry_Main.cpp | 2 +
.../tests/FT_App/FTAPP_FaultConsumer_Main.cpp | 2 +
TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp | 2 +
TAO/orbsvcs/tests/FT_App/FT_Client.cpp | 13 +-
TAO/orbsvcs/tests/FT_App/FT_Creator.cpp | 11 +-
TAO/orbsvcs/tests/FT_App/FT_Replica.cpp | 2 +
TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp | 5 +-
.../FT_App/FT_ReplicationManagerController.cpp | 14 +-
TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp | 4 +-
.../ReplicationManagerFaultConsumerAdapter.cpp | 5 +-
TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp | 1 +
TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp | 5 +-
TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp | 3 +-
TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp | 5 +-
.../tests/FT_App/TAO_Object_Group_Creator.cpp | 2 +-
.../GroupRef_Manipulation/client.cpp | 12 +-
.../GroupRef_Manipulation/server.cpp | 15 +-
TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp | 22 +-
TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp | 13 +-
.../FaultTolerance/IOGRManipulation/IOGRTest.cpp | 7 +-
TAO/orbsvcs/tests/FtRtEvent/consumer.cpp | 13 +-
TAO/orbsvcs/tests/FtRtEvent/supplier.cpp | 13 +-
TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp | 4 +-
TAO/orbsvcs/tests/HTIOP/AMI/client.cpp | 11 +-
TAO/orbsvcs/tests/HTIOP/AMI/server.cpp | 13 +-
TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp | 11 +-
.../tests/HTIOP/BiDirectional/Test_Output.cpp | 4 +-
TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp | 11 +-
TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp | 13 +-
TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp | 4 +-
TAO/orbsvcs/tests/HTIOP/Hello/client.cpp | 11 +-
TAO/orbsvcs/tests/HTIOP/Hello/server.cpp | 13 +-
TAO/orbsvcs/tests/HTIOP/test_config.h | 4 +-
TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc | 3 +
TAO/orbsvcs/tests/IOR_MCast/client.cpp | 6 +-
TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp | 4 +-
TAO/orbsvcs/tests/IOR_MCast/server.cpp | 6 +-
TAO/orbsvcs/tests/IOR_MCast/server_i.cpp | 5 +-
TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp | 7 +-
TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp | 7 +-
TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp | 3 +-
TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp | 7 +-
TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp | 5 +-
TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp | 7 +-
TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp | 3 +-
TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp | 4 +-
TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp | 7 +-
TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp | 5 +-
TAO/orbsvcs/tests/ImplRepo/scale/client.cpp | 7 +-
TAO/orbsvcs/tests/ImplRepo/scale/server.cpp | 7 +-
TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp | 3 +-
.../InterfaceRepo/Application_Test/client.cpp | 8 +-
.../Application_Test/ifr_dii_client.cpp | 9 +-
.../InterfaceRepo/Application_Test/server.cpp | 10 +-
.../tests/InterfaceRepo/IDL3_Test/client.cpp | 8 +-
.../tests/InterfaceRepo/IDL3_Test/idl3_client.cpp | 10 +-
.../tests/InterfaceRepo/IFR_Test/Admin_Client.cpp | 70 +-
.../tests/InterfaceRepo/IFR_Test/client.cpp | 8 +-
.../Latency_Test/Latency_Query_Client.cpp | 14 +-
.../tests/InterfaceRepo/Latency_Test/client.cpp | 8 +-
.../tests/InterfaceRepo/Persistence_Test/Ptest.cpp | 19 +-
.../tests/InterfaceRepo/Persistence_Test/test.cpp | 8 +-
TAO/orbsvcs/tests/Interoperable_Naming/client.cpp | 7 +-
.../Interoperable_Naming/ncontextext_client_i.cpp | 30 +-
.../Application_Controlled/LB_server.cpp | 2 +-
.../Application_Controlled/client.cpp | 11 +-
.../Application_Controlled/server.cpp | 7 +-
.../Infrastructure_Controlled/LB_server.cpp | 2 +-
.../Infrastructure_Controlled/client.cpp | 11 +-
.../Infrastructure_Controlled/server.cpp | 7 +-
.../GenericFactory/Manage_Object_Group/server.cpp | 7 +-
.../tests/LoadBalancing/LoadMonitor/CPU/client.cpp | 10 +-
.../tests/Log/Basic_Log_Test/Basic_Log_Test.cpp | 6 +-
TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp | 5 +-
TAO/orbsvcs/tests/Miop/McastHello/client.cpp | 11 +-
TAO/orbsvcs/tests/Miop/McastHello/server.cpp | 13 +-
TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp | 9 +-
.../tests/Notify/Basic/ConnectDisconnect.cpp | 11 +-
TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h | 2 +-
TAO/orbsvcs/tests/Notify/Basic/Events.cpp | 15 +-
TAO/orbsvcs/tests/Notify/Basic/Events.h | 2 +-
TAO/orbsvcs/tests/Notify/Basic/Filter.cpp | 10 +-
TAO/orbsvcs/tests/Notify/Basic/Filter.h | 2 +-
TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp | 19 +-
TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp | 19 +-
TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp | 10 +-
TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h | 2 +-
TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp | 15 +-
TAO/orbsvcs/tests/Notify/Basic/Sequence.h | 2 +-
TAO/orbsvcs/tests/Notify/Basic/Simple.cpp | 15 +-
TAO/orbsvcs/tests/Notify/Basic/Simple.h | 2 +-
TAO/orbsvcs/tests/Notify/Basic/Updates.cpp | 8 +-
TAO/orbsvcs/tests/Notify/Basic/Updates.h | 2 +-
.../Blocking/Notify_Structured_Push_Consumer.cpp | 4 +-
.../tests/Notify/Blocking/Structured_Consumer.cpp | 9 +-
.../tests/Notify/Blocking/Structured_Supplier.cpp | 11 +-
TAO/orbsvcs/tests/Notify/Destroy/main.cpp | 5 +-
.../Discarding/Notify_Structured_Push_Consumer.cpp | 4 +-
.../tests/Notify/Discarding/Sequence_Consumer.cpp | 9 +-
.../tests/Notify/Discarding/Sequence_Supplier.cpp | 11 +-
.../Notify/Discarding/Structured_Consumer.cpp | 9 +-
.../Notify/Discarding/Structured_Supplier.cpp | 11 +-
TAO/orbsvcs/tests/Notify/Driver/main.cpp | 5 +-
.../Notify/MT_Dispatching/Structured_Consumer.cpp | 9 +-
.../Notify/MT_Dispatching/Structured_Supplier.cpp | 11 +-
.../tests/Notify/Ordering/Sequence_Consumer.cpp | 9 +-
.../tests/Notify/Ordering/Sequence_Supplier.cpp | 11 +-
.../tests/Notify/Ordering/Structured_Consumer.cpp | 9 +-
.../tests/Notify/Ordering/Structured_Supplier.cpp | 11 +-
.../tests/Notify/PluggableTopology/main.cpp | 4 +-
TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp | 8 +-
TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h | 6 +-
TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp | 29 +-
TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp | 37 +-
.../Notify_Sequence_Push_Consumer.cpp | 22 +-
.../Sequence_Consumer.cpp | 9 +-
.../Sequence_Supplier.cpp | 11 +-
.../Notify_Sequence_Push_Consumer.cpp | 4 +-
.../Sequence_Multi_Filter/Sequence_Consumer.cpp | 14 +-
.../Sequence_Multi_Filter/Sequence_Supplier.cpp | 11 +-
.../Structured_Filter/Structured_Consumer.cpp | 9 +-
.../Structured_Filter/Structured_Supplier.cpp | 9 +-
.../Structured_Consumer.cpp | 9 +-
.../Structured_Supplier.cpp | 11 +-
.../tests/Notify/Test_Filter/RT_Test_Filter.cpp | 4 +-
TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp | 11 +-
.../tests/Notify/lib/Activation_Manager.cpp | 8 +-
TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h | 4 +-
.../tests/Notify/lib/Application_Command.cpp | 8 +-
TAO/orbsvcs/tests/Notify/lib/Application_Command.h | 6 +-
TAO/orbsvcs/tests/Notify/lib/Command.cpp | 2 +-
TAO/orbsvcs/tests/Notify/lib/Command.h | 7 +-
TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp | 9 +-
TAO/orbsvcs/tests/Notify/lib/Command_Builder.h | 6 +-
.../tests/Notify/lib/ConsumerAdmin_Command.cpp | 6 +-
.../tests/Notify/lib/ConsumerAdmin_Command.h | 6 +-
TAO/orbsvcs/tests/Notify/lib/Driver.cpp | 20 +-
TAO/orbsvcs/tests/Notify/lib/Driver.h | 2 +-
.../tests/Notify/lib/EventChannel_Command.cpp | 6 +-
.../tests/Notify/lib/EventChannel_Command.h | 6 +-
TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp | 6 +-
TAO/orbsvcs/tests/Notify/lib/Filter_Command.h | 6 +-
TAO/orbsvcs/tests/Notify/lib/Name.cpp | 45 +-
TAO/orbsvcs/tests/Notify/lib/Name.h | 34 +-
.../tests/Notify/lib/Notify_Test_Client.cpp | 7 +-
TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h | 4 +-
TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp | 8 +-
TAO/orbsvcs/tests/Notify/lib/Options_Parser.h | 8 +-
TAO/orbsvcs/tests/Notify/lib/Peer.cpp | 3 +-
TAO/orbsvcs/tests/Notify/lib/Peer.h | 6 +-
TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp | 1 +
TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp | 7 +-
TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h | 8 +-
.../tests/Notify/lib/Periodic_Consumer_Command.cpp | 6 +-
.../tests/Notify/lib/Periodic_Consumer_Command.h | 6 +-
TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp | 7 +-
TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h | 8 +-
.../tests/Notify/lib/Periodic_Supplier_Command.cpp | 6 +-
.../tests/Notify/lib/Periodic_Supplier_Command.h | 6 +-
.../tests/Notify/lib/SupplierAdmin_Command.cpp | 6 +-
.../tests/Notify/lib/SupplierAdmin_Command.h | 6 +-
TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp | 14 +-
TAO/orbsvcs/tests/Notify/lib/Task_Stats.h | 8 +-
.../performance-tests/Filter/Sequence_Consumer.cpp | 9 +-
.../performance-tests/Filter/Sequence_Supplier.cpp | 11 +-
.../Filter/Structured_Consumer.cpp | 9 +-
.../Filter/Structured_Supplier.cpp | 11 +-
.../performance-tests/RedGreen/RedGreen_Test.cpp | 10 +-
.../performance-tests/RedGreen/RedGreen_Test.h | 4 +-
.../Notify/performance-tests/RedGreen/main.cpp | 9 +-
.../performance-tests/Throughput/Throughput.cpp | 13 +-
.../performance-tests/Throughput/Throughput.h | 2 +-
TAO/orbsvcs/tests/Property/client.cpp | 7 +-
TAO/orbsvcs/tests/Property/client.h | 1 +
TAO/orbsvcs/tests/Property/main.cpp | 2 +-
TAO/orbsvcs/tests/Property/server.cpp | 8 +-
TAO/orbsvcs/tests/RTCosScheduling/client.cpp | 2 +-
TAO/orbsvcs/tests/RTCosScheduling/server.cpp | 2 +-
TAO/orbsvcs/tests/Redundant_Naming/client.cpp | 17 +-
TAO/orbsvcs/tests/Sched/DynSched_Test.cpp | 3 +-
TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp | 12 +-
.../tests/Sched_Conf/Sched_Conf_Anomalies.cpp | 6 +-
.../tests/Sched_Conf/Sched_Conf_Runtime.cpp | 2 +-
.../tests/Security/BiDirectional/client.cpp | 11 +-
.../tests/Security/BiDirectional/server.cpp | 13 +-
TAO/orbsvcs/tests/Security/Big_Request/client.cpp | 4 +-
TAO/orbsvcs/tests/Security/Big_Request/server.cpp | 4 +-
TAO/orbsvcs/tests/Security/Callback/client.cpp | 2 +-
TAO/orbsvcs/tests/Security/Callback/server.cpp | 2 +-
TAO/orbsvcs/tests/Security/Crash_Test/client.cpp | 4 +-
TAO/orbsvcs/tests/Security/Crash_Test/server.cpp | 4 +-
TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp | 11 +-
TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp | 4 +-
TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp | 4 +-
.../tests/Security/MT_SSLIOP/run_test_harsh.pl | 1 +
TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp | 4 +-
.../tests/Security/Secure_Invocation/client.cpp | 15 +-
.../tests/Security/Secure_Invocation/server.cpp | 4 +-
.../tests/Security/ssliop_corbaloc/client.cpp | 11 +-
TAO/orbsvcs/tests/Simple_Naming/client.cpp | 11 +-
TAO/orbsvcs/tests/Time/Client_i.cpp | 3 +-
TAO/orbsvcs/tests/Time/client.cpp | 7 +-
TAO/orbsvcs/tests/Trading/Offer_Importer.cpp | 2 +-
TAO/orbsvcs/tests/Trading/TT_Info.cpp | 6 +-
TAO/orbsvcs/tests/Trading/TT_Info.h | 1 +
TAO/orbsvcs/tests/Trading/TTest.idl | 19 +-
TAO/orbsvcs/tests/Trading/colocated_test.cpp | 11 +-
TAO/orbsvcs/tests/Trading/export_test.cpp | 12 +-
TAO/orbsvcs/tests/Trading/import_test.cpp | 8 +-
TAO/orbsvcs/tests/ior_corbaname/client.cpp | 6 +-
.../tests/ior_corbaname/ior_corbaname_client_i.cpp | 1 +
TAO/orbsvcs/tests/ior_corbaname/server.cpp | 7 +-
.../tests/tests_svc_loader/tests_svc_loader.cpp | 8 +-
TAO/performance-tests/Anyop/anyop.cpp | 4 +-
TAO/performance-tests/Callback/client.cpp | 4 +-
TAO/performance-tests/Callback/server.cpp | 4 +-
.../Cubit/TAO/DII_Cubit/client.cpp | 4 +-
.../Cubit/TAO/IDL_Cubit/Cubit_Client.cpp | 2 +-
.../Cubit/TAO/IDL_Cubit/Cubit_Server.cpp | 2 +-
.../Cubit/TAO/IDL_Cubit/client.cpp | 2 +-
.../Cubit/TAO/IDL_Cubit/collocation_test.cpp | 4 +-
.../Cubit/TAO/IDL_Cubit/server.cpp | 2 +-
.../Cubit/TAO/MT_Cubit/Globals.cpp | 2 +-
.../Cubit/TAO/MT_Cubit/Task_Client.cpp | 2 +-
.../Cubit/TAO/MT_Cubit/client.cpp | 2 +-
.../Cubit/TAO/MT_Cubit/server.cpp | 2 +-
.../Latency/AMH_Single_Threaded/client.cpp | 4 +-
.../Latency/AMH_Single_Threaded/server.cpp | 4 +-
TAO/performance-tests/Latency/AMI/client.cpp | 4 +-
TAO/performance-tests/Latency/AMI/server.cpp | 4 +-
.../Latency/Collocation/Collocated_Test.cpp | 4 +-
TAO/performance-tests/Latency/DII/client.cpp | 4 +-
TAO/performance-tests/Latency/DII/server.cpp | 4 +-
TAO/performance-tests/Latency/DSI/client.cpp | 4 +-
TAO/performance-tests/Latency/DSI/server.cpp | 4 +-
TAO/performance-tests/Latency/Deferred/client.cpp | 4 +-
TAO/performance-tests/Latency/Deferred/server.cpp | 4 +-
.../Latency/Single_Threaded/client.cpp | 4 +-
.../Latency/Single_Threaded/server.cpp | 4 +-
.../Latency/Thread_Per_Connection/client.cpp | 4 +-
.../Latency/Thread_Per_Connection/server.cpp | 4 +-
.../Latency/Thread_Pool/client.cpp | 4 +-
.../Latency/Thread_Pool/server.cpp | 4 +-
TAO/performance-tests/Memory/IORsize/client.cpp | 4 +-
TAO/performance-tests/Memory/IORsize/server.cpp | 4 +-
.../Memory/Single_Threaded/client.cpp | 4 +-
.../Memory/Single_Threaded/server.cpp | 4 +-
.../POA/Create_Reference/create_reference.cpp | 4 +-
TAO/performance-tests/POA/Demux/client.cpp | 2 +-
TAO/performance-tests/POA/Demux/demux_stats.cpp | 4 +-
.../POA/Demux/demux_test_client.cpp | 2 +-
.../POA/Demux/demux_test_server.cpp | 2 +-
TAO/performance-tests/POA/Demux/server.cpp | 2 +-
TAO/performance-tests/POA/Demux/write_names.cpp | 2 +-
.../POA/Implicit_Activation/client.cpp | 4 +-
.../POA/Implicit_Activation/collocated.cpp | 4 +-
.../POA/Implicit_Activation/server.cpp | 4 +-
.../registration.cpp | 4 +-
TAO/performance-tests/Pluggable/PP_Test_Client.cpp | 2 +-
TAO/performance-tests/Pluggable/PP_Test_Server.cpp | 2 +-
TAO/performance-tests/Pluggable/client.cpp | 2 +-
TAO/performance-tests/Pluggable/server.cpp | 2 +-
TAO/performance-tests/Protocols/distributor.cpp | 4 +-
TAO/performance-tests/Protocols/receiver.cpp | 4 +-
TAO/performance-tests/Protocols/sender.cpp | 4 +-
.../Multiple_Endpoints/Orb_Per_Priority/client.cpp | 4 +-
.../Multiple_Endpoints/Orb_Per_Priority/server.cpp | 4 +-
.../Multiple_Endpoints/Single_Endpoint/client.cpp | 4 +-
.../Multiple_Endpoints/Single_Endpoint/server.cpp | 4 +-
.../RTCorba/Oneways/Reliable/client.cpp | 4 +-
.../RTCorba/Oneways/Reliable/server.cpp | 4 +-
.../RTCorba/Thread_Pool/client.cpp | 4 +-
.../RTCorba/Thread_Pool/server.cpp | 4 +-
.../AMH_Single_Threaded/client.cpp | 4 +-
.../AMH_Single_Threaded/server.cpp | 4 +-
.../Sequence_Latency/AMI/client.cpp | 4 +-
.../Sequence_Latency/AMI/server.cpp | 4 +-
.../Sequence_Latency/DII/client.cpp | 4 +-
.../Sequence_Latency/DII/server.cpp | 4 +-
.../Sequence_Latency/DSI/client.cpp | 4 +-
.../Sequence_Latency/DSI/server.cpp | 4 +-
.../Sequence_Latency/Deferred/client.cpp | 4 +-
.../Sequence_Latency/Deferred/server.cpp | 4 +-
.../Sequence_Latency/Single_Threaded/client.cpp | 4 +-
.../Sequence_Latency/Single_Threaded/server.cpp | 4 +-
.../Thread_Per_Connection/client.cpp | 4 +-
.../Thread_Per_Connection/server.cpp | 4 +-
.../Sequence_Latency/Thread_Pool/client.cpp | 4 +-
.../Sequence_Latency/Thread_Pool/server.cpp | 4 +-
TAO/performance-tests/Throughput/client.cpp | 4 +-
TAO/performance-tests/Throughput/server.cpp | 4 +-
TAO/performance-tests/perf.mwc | 1 +
TAO/tao/Acceptor_Registry.cpp | 18 +-
TAO/tao/AnyTypeCode/Any.cpp | 2 +-
TAO/tao/AnyTypeCode/NVList.cpp | 4 +-
TAO/tao/AnyTypeCode/PI_ForwardA.h | 5 +-
TAO/tao/AnyTypeCode/skip.cpp | 6 +-
TAO/tao/Blocked_Connect_Strategy.cpp | 12 +-
TAO/tao/Blocked_Connect_Strategy.h | 6 +-
TAO/tao/Bounded_Sequence_CDR_T.h | 35 +-
TAO/tao/CORBALOC_Parser.cpp | 7 +-
.../CSD_Default_Servant_Dispatcher.cpp | 4 +-
.../CSD_Framework/CSD_Default_Servant_Dispatcher.h | 2 +-
TAO/tao/CSD_Framework/CSD_POA.cpp | 4 +-
TAO/tao/CSD_Framework/CSD_POA.h | 4 +-
TAO/tao/Client_Strategy_Factory.cpp | 6 -
TAO/tao/Client_Strategy_Factory.h | 9 -
TAO/tao/Codeset/Codeset_Descriptor.cpp | 4 +-
TAO/tao/Codeset/Codeset_Manager_i.cpp | 2 +-
TAO/tao/Connect_Strategy.cpp | 40 -
TAO/tao/Connect_Strategy.h | 20 +-
TAO/tao/Connector_Registry.cpp | 2 +-
TAO/tao/DLL_Parser.h | 2 +-
TAO/tao/DynamicAny/DynAny_i.cpp | 2 +-
TAO/tao/DynamicAny/DynCommon.cpp | 2 +-
TAO/tao/Endpoint.cpp | 9 -
TAO/tao/Endpoint.h | 21 +-
TAO/tao/EndpointPolicy.mpc | 35 -
TAO/tao/EndpointPolicy/EndpointPolicy.cpp | 61 -
TAO/tao/EndpointPolicy/EndpointPolicy.h | 50 -
TAO/tao/EndpointPolicy/EndpointPolicy.pidl | 55 -
TAO/tao/EndpointPolicy/EndpointPolicyA.cpp | 212 -
TAO/tao/EndpointPolicy/EndpointPolicyA.h | 84 -
TAO/tao/EndpointPolicy/EndpointPolicyC.cpp | 356 -
TAO/tao/EndpointPolicy/EndpointPolicyC.h | 393 -
TAO/tao/EndpointPolicy/EndpointPolicyC.inl | 28 -
TAO/tao/EndpointPolicy/EndpointPolicyType.pidl | 41 -
TAO/tao/EndpointPolicy/EndpointPolicyTypeA.cpp | 33 -
TAO/tao/EndpointPolicy/EndpointPolicyTypeA.h | 54 -
TAO/tao/EndpointPolicy/EndpointPolicyTypeC.cpp | 49 -
TAO/tao/EndpointPolicy/EndpointPolicyTypeC.h | 90 -
TAO/tao/EndpointPolicy/EndpointPolicy_Export.h | 58 -
TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp | 94 -
TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h | 67 -
.../EndpointPolicy_ORBInitializer.cpp | 86 -
.../EndpointPolicy/EndpointPolicy_ORBInitializer.h | 79 -
TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp | 84 -
TAO/tao/EndpointPolicy/EndpointPolicy_i.h | 93 -
.../EndpointPolicy/Endpoint_Acceptor_Filter.cpp | 132 -
TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.h | 70 -
.../Endpoint_Acceptor_Filter_Factory.cpp | 56 -
.../Endpoint_Acceptor_Filter_Factory.h | 56 -
TAO/tao/EndpointPolicy/Endpoint_Value_Impl.h | 59 -
TAO/tao/EndpointPolicy/IIOPEndpointValue.pidl | 49 -
TAO/tao/EndpointPolicy/IIOPEndpointValueA.cpp | 53 -
TAO/tao/EndpointPolicy/IIOPEndpointValueA.h | 59 -
TAO/tao/EndpointPolicy/IIOPEndpointValueC.cpp | 176 -
TAO/tao/EndpointPolicy/IIOPEndpointValueC.h | 230 -
TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp | 119 -
TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h | 115 -
TAO/tao/EndpointPolicy/TAO_EndpointPolicy.pc.in | 11 -
TAO/tao/Environment.cpp | 6 +-
TAO/tao/Exception.cpp | 10 +-
TAO/tao/Exception.h | 6 +-
TAO/tao/FILE_Parser.cpp | 2 +-
TAO/tao/GIOP_Message_Base.cpp | 4 +-
TAO/tao/GIOP_Message_Lite.cpp | 4 +-
TAO/tao/IIOP_Acceptor.cpp | 6 +-
TAO/tao/IIOP_Connection_Handler.cpp | 49 +-
TAO/tao/IIOP_Connection_Handler.h | 5 -
TAO/tao/IIOP_Connector.cpp | 309 +-
TAO/tao/IIOP_Connector.h | 33 +-
TAO/tao/IIOP_Endpoint.cpp | 80 -
TAO/tao/IIOP_Endpoint.h | 27 -
TAO/tao/IIOP_Profile.cpp | 75 +-
TAO/tao/IIOP_Profile.h | 12 -
TAO/tao/IORInterceptor/IORInfo.cpp | 6 +-
TAO/tao/IORInterceptor/IORInfo.h | 2 +-
TAO/tao/IORInterceptor/IORInfoC.h | 2 +-
TAO/tao/IORInterceptor/IORInterceptorC.h | 2 +-
.../IORInterceptor/IORInterceptor_Adapter_Impl.cpp | 4 +-
.../IORInterceptor/IORInterceptor_Adapter_Impl.h | 2 +-
TAO/tao/IORInterceptor_Adapter.h | 2 +-
TAO/tao/ImR_Client/ImR_Client.cpp | 2 +-
TAO/tao/Invocation_Endpoint_Selectors.cpp | 138 +-
TAO/tao/Invocation_Endpoint_Selectors.h | 1 -
TAO/tao/LF_CH_Event.h | 11 -
TAO/tao/LF_Connect_Strategy.cpp | 26 +-
TAO/tao/LF_Connect_Strategy.h | 10 +-
TAO/tao/LF_Event.h | 7 +-
TAO/tao/LF_Multi_Event.cpp | 118 -
TAO/tao/LF_Multi_Event.h | 97 -
TAO/tao/LF_Strategy_Complete.inl | 12 +
TAO/tao/MCAST_Parser.cpp | 6 +-
TAO/tao/MProfile.cpp | 15 -
TAO/tao/MProfile.h | 8 +-
TAO/tao/MProfile.i | 4 +-
TAO/tao/Makefile.am | 110 -
TAO/tao/Managed_Types.cpp | 73 +
TAO/tao/Managed_Types.h | 383 +
TAO/tao/Managed_Types.i | 407 +
TAO/tao/Messaging/ExceptionHolderC.cpp | 44 +-
TAO/tao/Messaging/ExceptionHolderC.h | 7 +-
TAO/tao/Messaging/OldExceptionHolderA.cpp | 194 +
TAO/tao/Messaging/OldExceptionHolderA.h | 88 +
TAO/tao/Messaging/OldExceptionHolderC.cpp | 344 +
TAO/tao/Messaging/OldExceptionHolderC.h | 305 +
TAO/tao/Messaging/OldExceptionHolderC.inl | 48 +
TAO/tao/ORB.cpp | 44 +-
TAO/tao/ORB_Core.cpp | 130 +-
TAO/tao/ORB_Core.h | 27 -
TAO/tao/ObjRefTemplate/Default_ORTC.cpp | 47 +-
TAO/tao/ObjRefTemplate/Default_ORTC.h | 69 +-
.../ObjRefTemplate/ObjectReferenceTemplateC.cpp | 70 +-
TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h | 9 +-
TAO/tao/Object.cpp | 2 +-
TAO/tao/Object.h | 4 +-
TAO/tao/Object_Ref_Table.cpp | 2 +-
TAO/tao/PI_Forward.pidl | 2 +-
TAO/tao/PI_ForwardC.h | 5 +-
TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp | 50 -
TAO/tao/PortableServer/Acceptor_Filter_Factory.h | 68 -
TAO/tao/PortableServer/Default_Acceptor_Filter.h | 2 +-
.../PortableServer/Default_Servant_Dispatcher.cpp | 2 +-
.../PortableServer/Default_Servant_Dispatcher.h | 2 +-
TAO/tao/PortableServer/Object_Adapter.cpp | 28 +-
TAO/tao/PortableServer/Object_Adapter.h | 4 -
.../Operation_Table_Perfect_Hash.cpp | 4 +-
TAO/tao/PortableServer/POAManager.cpp | 28 +-
TAO/tao/PortableServer/POAManager.h | 40 +-
TAO/tao/PortableServer/POAManager.i | 23 +-
TAO/tao/PortableServer/POAManager.pidl | 2 -
TAO/tao/PortableServer/POAManagerC.h | 7 -
TAO/tao/PortableServer/POAManagerFactory.cpp | 162 -
TAO/tao/PortableServer/POAManagerFactory.h | 80 -
TAO/tao/PortableServer/POAManagerFactory.pidl | 47 -
TAO/tao/PortableServer/POAManagerFactoryC.cpp | 423 -
TAO/tao/PortableServer/POAManagerFactoryC.h | 381 -
TAO/tao/PortableServer/PortableServer.h | 1 -
TAO/tao/PortableServer/PortableServer.pidl | 6 +-
TAO/tao/PortableServer/PortableServerC.h | 26 -
.../PortableServer/PortableServer_WFunctions.cpp | 2 +-
TAO/tao/PortableServer/Regular_POA.cpp | 2 +-
TAO/tao/PortableServer/Regular_POA.h | 2 +-
TAO/tao/PortableServer/Root_POA.cpp | 88 +-
TAO/tao/PortableServer/Root_POA.h | 21 +-
TAO/tao/PortableServer/Servant_Dispatcher.h | 8 +-
TAO/tao/Profile.cpp | 43 +-
TAO/tao/Profile.h | 35 +-
TAO/tao/Profile_Transport_Resolver.cpp | 62 +-
TAO/tao/Profile_Transport_Resolver.h | 22 +-
TAO/tao/RTCORBA/RT_ORBInitializer.cpp | 2 +-
TAO/tao/RTPortableServer/RT_POA.cpp | 4 +-
TAO/tao/RTPortableServer/RT_POA.h | 4 +-
TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp | 18 +-
TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h | 2 +-
TAO/tao/RTScheduling/Request_Interceptor.cpp | 2 +-
TAO/tao/Reactive_Connect_Strategy.cpp | 27 +-
TAO/tao/Reactive_Connect_Strategy.h | 10 +-
TAO/tao/Resume_Handle.cpp | 45 +-
TAO/tao/Sequence.cpp | 1116 +
TAO/tao/Sequence.h | 681 +
TAO/tao/Sequence.i | 303 +
TAO/tao/Sequence_T.cpp | 2161 ++
TAO/tao/Sequence_T.i | 607 +
TAO/tao/Strategies/DIOP_Acceptor.cpp | 6 +-
TAO/tao/Strategies/DIOP_Connection_Handler.cpp | 4 +-
TAO/tao/Strategies/DIOP_Transport.cpp | 2 +-
TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp | 17 +-
TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h | 7 +-
.../Optimized_Connection_Endpoint_Selector.cpp | 2 +-
TAO/tao/Strategies/SCIOP_Acceptor.cpp | 2 +-
TAO/tao/Strategies/SCIOP_Connection_Handler.cpp | 2 +-
TAO/tao/Strategies/SCIOP_Connector.cpp | 2 +-
TAO/tao/Strategies/SHMIOP_Acceptor.cpp | 10 +-
TAO/tao/Strategies/SHMIOP_Connector.cpp | 6 +-
TAO/tao/Strategies/advanced_resource.cpp | 12 +-
TAO/tao/Synch_Invocation.cpp | 2 +-
TAO/tao/SystemException.cpp | 2 +-
TAO/tao/TAO_Internal.cpp | 14 +-
TAO/tao/Transport.cpp | 14 +-
TAO/tao/Transport_Connector.cpp | 185 +-
TAO/tao/Transport_Connector.h | 31 -
TAO/tao/Transport_Descriptor_Interface.cpp | 2 +-
TAO/tao/Transport_Descriptor_Interface.h | 4 +-
TAO/tao/Transport_Descriptor_Interface.inl | 6 +-
TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp | 6 +-
TAO/tao/Unbounded_Sequence_CDR_T.h | 33 -
TAO/tao/Valuetype/AbstractBase.cpp | 6 -
TAO/tao/Valuetype/AbstractBase.h | 1 -
TAO/tao/Valuetype/Sequence_T.cpp | 504 +
TAO/tao/Valuetype/Sequence_T.inl | 171 +
TAO/tao/Valuetype/StringValueC.cpp | 16 +-
TAO/tao/Valuetype/StringValueC.h | 114 +-
TAO/tao/Valuetype/StringValueC.inl | 15 +-
TAO/tao/Valuetype/ValueBase.cpp | 619 +-
TAO/tao/Valuetype/ValueBase.h | 157 +-
TAO/tao/Valuetype/ValueBase.inl | 34 +-
TAO/tao/Valuetype/Value_CORBA_methods.h | 1 -
TAO/tao/default_client.cpp | 6 -
TAO/tao/default_client.h | 8 +-
TAO/tao/default_resource.cpp | 10 +-
TAO/tao/orbconf.h | 4 +-
TAO/tao/params.cpp | 6 +-
TAO/tao/params.h | 29 +-
TAO/tao/params.i | 36 -
TAO/tao/tao.mpc | 35 -
TAO/tests/AMH_Exceptions/client.cpp | 7 +-
TAO/tests/AMH_Exceptions/server.cpp | 10 +-
TAO/tests/AMH_Oneway/client.cpp | 12 +-
TAO/tests/AMH_Oneway/server.cpp | 15 +-
TAO/tests/AMI/ami_test.idl | 10 +-
TAO/tests/AMI/client.cpp | 12 +-
TAO/tests/AMI/server.cpp | 14 +-
TAO/tests/AMI/simple_client.cpp | 11 +-
TAO/tests/AMI_Buffering/admin.cpp | 14 +-
TAO/tests/AMI_Buffering/client.cpp | 12 +-
TAO/tests/AMI_Buffering/server.cpp | 14 +-
TAO/tests/AMI_Timeouts/client.cpp | 12 +-
TAO/tests/AMI_Timeouts/server.cpp | 14 +-
TAO/tests/Abstract_Interface/client.cpp | 14 +-
TAO/tests/Abstract_Interface/server.cpp | 16 +-
TAO/tests/Any/Recursive/client.cpp | 12 +-
TAO/tests/Any/Recursive/server.cpp | 13 +-
TAO/tests/BiDirectional/client.cpp | 11 +-
TAO/tests/BiDirectional/server.cpp | 13 +-
TAO/tests/BiDirectional_MultipleORB/destroy.cpp | 9 +-
TAO/tests/BiDirectional_NestedUpcall/client.cpp | 11 +-
TAO/tests/BiDirectional_NestedUpcall/server.cpp | 13 +-
TAO/tests/Big_AMI/client.cpp | 10 +-
TAO/tests/Big_AMI/server.cpp | 13 +-
TAO/tests/Big_Oneways/client.cpp | 11 +-
TAO/tests/Big_Oneways/server.cpp | 13 +-
TAO/tests/Big_Reply/client.cpp | 11 +-
TAO/tests/Big_Reply/server.cpp | 13 +-
TAO/tests/Big_Request_Muxing/client.cpp | 11 +-
TAO/tests/Big_Request_Muxing/server.cpp | 13 +-
TAO/tests/Big_Twoways/client.cpp | 11 +-
TAO/tests/Big_Twoways/server.cpp | 13 +-
TAO/tests/Blocking_Sync_None/client.cpp | 11 +-
TAO/tests/Blocking_Sync_None/server.cpp | 13 +-
TAO/tests/Bug_1020_Basic_Regression/client.cpp | 11 +-
TAO/tests/Bug_1020_Basic_Regression/server.cpp | 13 +-
TAO/tests/Bug_1020_Regression/client.cpp | 11 +-
TAO/tests/Bug_1020_Regression/server.cpp | 13 +-
TAO/tests/Bug_1269_Regression/client.cpp | 11 +-
TAO/tests/Bug_1269_Regression/server.cpp | 13 +-
TAO/tests/Bug_1269_Regression/shutdown.cpp | 11 +-
TAO/tests/Bug_1270_Regression/client.cpp | 11 +-
TAO/tests/Bug_1270_Regression/server.cpp | 13 +-
TAO/tests/Bug_1270_Regression/shutdown.cpp | 11 +-
TAO/tests/Bug_1330_Regression/client.cpp | 11 +-
TAO/tests/Bug_1330_Regression/server.cpp | 13 +-
TAO/tests/Bug_1361_Regression/client.cpp | 11 +-
TAO/tests/Bug_1361_Regression/server.cpp | 13 +-
TAO/tests/Bug_1361_Regression/shutdown.cpp | 11 +-
TAO/tests/Bug_1476_Regression/client.cpp | 11 +-
TAO/tests/Bug_1476_Regression/server.cpp | 13 +-
TAO/tests/Bug_1482_Regression/client.cpp | 11 +-
TAO/tests/Bug_1482_Regression/server.cpp | 13 +-
TAO/tests/Bug_1495_Regression/Server_Task.cpp | 2 +-
TAO/tests/Bug_1495_Regression/Threaded_Client.cpp | 20 +-
TAO/tests/Bug_1495_Regression/Threaded_Server.cpp | 13 +-
.../Bug_1535_Regression/bug_1535_regression.cpp | 9 +-
TAO/tests/Bug_1551_Regression/client.cpp | 11 +-
TAO/tests/Bug_1551_Regression/server.cpp | 13 +-
TAO/tests/Bug_1568_Regression/client.cpp | 11 +-
TAO/tests/Bug_1568_Regression/server.cpp | 13 +-
TAO/tests/Bug_1627_Regression/client.cpp | 11 +-
TAO/tests/Bug_1627_Regression/server.cpp | 13 +-
TAO/tests/Bug_1635_Regression/client.cpp | 7 +-
TAO/tests/Bug_1636_Regression/client.cpp | 7 +-
TAO/tests/Bug_1639_Regression/struct_client.cpp | 6 +-
TAO/tests/Bug_1670_Regression/client.cpp | 11 +-
TAO/tests/Bug_1670_Regression/server.cpp | 13 +-
TAO/tests/Bug_1676_Regression/client.cpp | 48 +-
TAO/tests/Bug_1693_Test/client.cpp | 8 +-
TAO/tests/Bug_1812_Regression/test.cpp | 2 +-
TAO/tests/Bug_1813_Regression/test.cpp | 2 +-
TAO/tests/Bug_2122_Regression/test.cpp | 2 +-
TAO/tests/Bug_2124_Regression/test.cpp | 2 +-
TAO/tests/Bug_2126_Regression/test.cpp | 2 +-
TAO/tests/Bug_2144_Regression/test.cpp | 2 +-
TAO/tests/Bug_2174_Regression/client.cpp | 11 +-
TAO/tests/Bug_2174_Regression/server.cpp | 13 +-
TAO/tests/Bug_2183_Regression/client.cpp | 11 +-
TAO/tests/Bug_2183_Regression/server.cpp | 13 +-
TAO/tests/Bug_2222_Regression/test.cpp | 2 +-
TAO/tests/Bug_2234_Regression/client.cpp | 17 +-
TAO/tests/Bug_2234_Regression/server.cpp | 7 +-
TAO/tests/CDR/alignment.cpp | 6 +-
TAO/tests/CDR/allocator.cpp | 9 +-
TAO/tests/CDR/basic_types.cpp | 11 +-
TAO/tests/CDR/growth.cpp | 7 +-
TAO/tests/CDR/octet_sequence.cpp | 2 +-
TAO/tests/CDR/tc.cpp | 9 +-
TAO/tests/Cache_Growth_Test/client.cpp | 11 +-
TAO/tests/Cache_Growth_Test/server.cpp | 13 +-
TAO/tests/CallbackTest/client.cpp | 11 +-
TAO/tests/CallbackTest/server.cpp | 13 +-
TAO/tests/Client_Leaks/Process_Factory.cpp | 8 +-
TAO/tests/Client_Leaks/child.cpp | 9 +-
TAO/tests/Client_Leaks/client.cpp | 11 +-
TAO/tests/Client_Leaks/server.cpp | 13 +-
TAO/tests/CodeSets/simple/client.cpp | 14 +-
TAO/tests/CodeSets/simple/server.cpp | 10 +-
TAO/tests/Codec/client.cpp | 15 +-
TAO/tests/Collocation/Collocation.cpp | 7 +-
.../Collocation_Exception_Test/Collocated_Test.cpp | 19 +-
.../Collocation_Exception_Test/Server_Task.cpp | 2 +-
.../Collocation_Oneway_Tests/Collocated_Test.cpp | 19 +-
TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp | 2 +-
.../Collocation_Opportunities.cpp | 9 +-
TAO/tests/Collocation_Tests/Collocated_Test.cpp | 19 +-
TAO/tests/Collocation_Tests/Server_Task.cpp | 2 +-
TAO/tests/Connect_Strategy_Test/client.cpp | 11 +-
TAO/tests/Connect_Strategy_Test/server.cpp | 13 +-
TAO/tests/Connection_Failure/client.cpp | 7 +-
TAO/tests/Connection_Purging/client.cpp | 11 +-
TAO/tests/Connection_Purging/server.cpp | 13 +-
TAO/tests/Connection_Timeout/client.cpp | 11 +-
TAO/tests/Crash_On_Write/client.cpp | 11 +-
TAO/tests/Crash_On_Write/server.cpp | 13 +-
TAO/tests/Crashed_Callback/client.cpp | 11 +-
TAO/tests/Crashed_Callback/server.cpp | 13 +-
TAO/tests/DLL_ORB/Test_Client_Module.cpp | 5 +-
TAO/tests/DLL_ORB/Test_Client_Module.h | 2 +-
TAO/tests/DLL_ORB/Test_Server_Module.cpp | 7 +-
TAO/tests/DLL_ORB/Test_Server_Module.h | 2 +-
TAO/tests/DLL_ORB/client.cpp | 2 +-
TAO/tests/DLL_ORB/server.cpp | 2 +-
TAO/tests/DSI_Gateway/client.cpp | 11 +-
TAO/tests/DSI_Gateway/gateway.cpp | 13 +-
TAO/tests/DSI_Gateway/server.cpp | 13 +-
TAO/tests/DynAny_Test/driver.cpp | 9 +-
TAO/tests/DynAny_Test/test_dynsequence.cpp | 2 +-
TAO/tests/DynAny_Test/test_dynstruct.cpp | 2 +-
TAO/tests/Explicit_Event_Loop/client.cpp | 11 +-
TAO/tests/Explicit_Event_Loop/server.cpp | 15 +-
TAO/tests/Exposed_Policies/Policy_Tester.cpp | 8 +-
TAO/tests/Exposed_Policies/Policy_Verifier.cpp | 4 +-
TAO/tests/Exposed_Policies/RT_Properties.cpp | 2 +-
TAO/tests/Exposed_Policies/client.cpp | 7 +-
TAO/tests/Exposed_Policies/server.cpp | 7 +-
TAO/tests/FL_Cube/client.cpp | 15 +-
TAO/tests/FL_Cube/server.cpp | 13 +-
TAO/tests/Faults/client.cpp | 11 +-
TAO/tests/Faults/middle.cpp | 13 +-
TAO/tests/Faults/ping.cpp | 13 +-
TAO/tests/Faults/pong.cpp | 11 +-
TAO/tests/Faults/server.cpp | 13 +-
TAO/tests/File_IO/client.cpp | 11 +-
TAO/tests/File_IO/server.cpp | 13 +-
TAO/tests/Forwarding/client.cpp | 11 +-
TAO/tests/Forwarding/server.cpp | 13 +-
TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp | 11 +-
.../GIOP_Fragments/Java_Big_Request/server.cpp | 13 +-
.../GIOP_Fragments/PMB_With_Fragments/server.cpp | 13 +-
TAO/tests/Hang_Shutdown/client.cpp | 45 +-
TAO/tests/Hang_Shutdown/server.cpp | 15 +-
TAO/tests/Hello/client.cpp | 11 +-
TAO/tests/Hello/server.cpp | 13 +-
TAO/tests/ICMG_Any_Bug/client.cpp | 11 +-
TAO/tests/ICMG_Any_Bug/server.cpp | 13 +-
TAO/tests/IDL_Test/main.cpp | 9 +-
TAO/tests/IORManipulation/IORTest.cpp | 9 +-
TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp | 7 +-
.../IOR_Endpoint_Hostnames/list_interfaces.cpp | 2 +-
TAO/tests/IPV6/client.cpp | 11 +-
TAO/tests/IPV6/server.cpp | 13 +-
TAO/tests/InterOp-Naming/INS_test_client.cpp | 13 +-
TAO/tests/InterOp-Naming/INS_test_server.cpp | 6 +-
TAO/tests/InterOp-Naming/Server_i.cpp | 4 +-
TAO/tests/InterOp-Naming/Server_i.h | 1 +
TAO/tests/Leader_Followers/client.cpp | 13 +-
TAO/tests/Leader_Followers/server.cpp | 15 +-
TAO/tests/LongUpcalls/ami_client.cpp | 11 +-
TAO/tests/LongUpcalls/ami_server.cpp | 13 +-
TAO/tests/LongUpcalls/blocking_client.cpp | 11 +-
TAO/tests/LongUpcalls/blocking_server.cpp | 13 +-
TAO/tests/MProfile/client.cpp | 11 +-
TAO/tests/MProfile/server.cpp | 13 +-
TAO/tests/MProfile_Connection_Timeout/client.cpp | 11 +-
TAO/tests/MProfile_Connection_Timeout/server.cpp | 15 +-
TAO/tests/MProfile_Forwarding/Manager.cpp | 16 +-
TAO/tests/MProfile_Forwarding/client.cpp | 11 +-
TAO/tests/MProfile_Forwarding/server.cpp | 13 +-
TAO/tests/MT_BiDir/client.cpp | 11 +-
TAO/tests/MT_BiDir/server.cpp | 13 +-
TAO/tests/MT_Client/client.cpp | 11 +-
TAO/tests/MT_Client/orb_creation.cpp | 13 +-
TAO/tests/MT_Client/server.cpp | 13 +-
TAO/tests/MT_Server/client.cpp | 11 +-
TAO/tests/MT_Server/server.cpp | 13 +-
TAO/tests/MT_Timeout/client.cpp | 11 +-
TAO/tests/MT_Timeout/server.cpp | 13 +-
TAO/tests/Multiple/client.cpp | 7 +-
TAO/tests/Multiple/server.cpp | 8 +-
TAO/tests/Multiple_Inheritance/client.cpp | 11 +-
TAO/tests/Multiple_Inheritance/server.cpp | 14 +-
TAO/tests/Muxed_GIOP_Versions/client.cpp | 11 +-
TAO/tests/Muxed_GIOP_Versions/server.cpp | 13 +-
TAO/tests/Muxing/client.cpp | 11 +-
TAO/tests/Muxing/server.cpp | 13 +-
TAO/tests/Native_Exceptions/client.cpp | 11 +-
TAO/tests/Native_Exceptions/server.cpp | 13 +-
TAO/tests/NestedUpcall/MT_Client_Test/client.cpp | 18 +-
TAO/tests/NestedUpcall/MT_Client_Test/client.h | 1 +
.../NestedUpcall/MT_Client_Test/local_server.cpp | 2 +-
.../NestedUpcall/MT_Client_Test/local_server.h | 1 +
TAO/tests/NestedUpcall/MT_Client_Test/server.cpp | 10 +-
TAO/tests/NestedUpcall/MT_Client_Test/server.h | 1 +
TAO/tests/NestedUpcall/Simple/client.cpp | 16 +-
TAO/tests/NestedUpcall/Simple/server.cpp | 18 +-
TAO/tests/NestedUpcall/Simple/simple-client.cpp | 14 +-
TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp | 8 +-
TAO/tests/NestedUpcall/Triangle_Test/initiator.h | 1 +
TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp | 10 +-
TAO/tests/NestedUpcall/Triangle_Test/server_A.h | 1 +
TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp | 10 +-
TAO/tests/NestedUpcall/Triangle_Test/server_B.h | 1 +
TAO/tests/Nested_Event_Loop/client.cpp | 13 +-
TAO/tests/Nested_Event_Loop/server.cpp | 15 +-
TAO/tests/Nested_Upcall_Crash/client.cpp | 11 +-
TAO/tests/Nested_Upcall_Crash/scavenger.cpp | 11 +-
TAO/tests/Nested_Upcall_Crash/server.cpp | 13 +-
TAO/tests/No_Server_MT_Connect_Test/client.cpp | 11 +-
TAO/tests/No_Server_MT_Connect_Test/server.cpp | 13 +-
TAO/tests/OBV/Any/client.cpp | 11 +-
TAO/tests/OBV/Any/server.cpp | 13 +-
.../OBV/Collocated/Forward/Collocated_Test.cpp | 19 +-
TAO/tests/OBV/Collocated/Forward/Server_Task.cpp | 2 +-
TAO/tests/OBV/Factory/client.cpp | 11 +-
TAO/tests/OBV/Factory/server.cpp | 13 +-
TAO/tests/OBV/Forward/client.cpp | 11 +-
TAO/tests/OBV/Forward/server.cpp | 13 +-
TAO/tests/OBV/Simple/Client_i.cpp | 69 -
TAO/tests/OBV/Simple/Client_i.h | 56 -
TAO/tests/OBV/Simple/OBV.idl | 16 -
TAO/tests/OBV/Simple/OBV_Simple.mpc | 37 -
TAO/tests/OBV/Simple/OBV_impl.cpp | 44 -
TAO/tests/OBV/Simple/OBV_impl.h | 39 -
TAO/tests/OBV/Simple/Server_i.cpp | 80 -
TAO/tests/OBV/Simple/Server_i.h | 60 -
TAO/tests/OBV/Simple/Simple_util.cpp | 317 -
TAO/tests/OBV/Simple/Simple_util.h | 170 -
TAO/tests/OBV/Simple/client.cpp | 23 -
TAO/tests/OBV/Simple/run_test.pl | 44 -
TAO/tests/OBV/Simple/server.cpp | 44 -
TAO/tests/OBV/Supports/Supports_Test_impl.h | 1 +
TAO/tests/OBV/Supports/client.cpp | 9 +-
TAO/tests/OBV/Supports/server.cpp | 8 +-
TAO/tests/OBV/TC_Alignment/client.cpp | 13 +-
TAO/tests/OBV/TC_Alignment/server.cpp | 11 +-
TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc | 18 -
TAO/tests/OBV/Truncatable/README | 20 -
TAO/tests/OBV/Truncatable/Truncatable.idl | 100 -
TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp | 140 -
TAO/tests/OBV/Truncatable/TruncatableS_impl.h | 89 -
TAO/tests/OBV/Truncatable/client.cpp | 453 -
TAO/tests/OBV/Truncatable/run_test.pl | 58 -
TAO/tests/OBV/Truncatable/server.cpp | 159 -
TAO/tests/OBV/ValueBox/client.cpp | 12 +-
TAO/tests/OBV/ValueBox/server.cpp | 13 +-
TAO/tests/ORB_destroy/ORB_destroy.cpp | 29 +-
TAO/tests/ORB_init/ORB_init.cpp | 15 +-
TAO/tests/ORB_init/Portspan/server.cpp | 7 +-
TAO/tests/ORB_shutdown/server.cpp | 7 +-
TAO/tests/ORT/ORT_test_IORInterceptor.cpp | 2 +-
TAO/tests/ORT/ORT_test_IORInterceptor.h | 2 +-
TAO/tests/ORT/ServerRequestInterceptor.cpp | 2 +-
TAO/tests/ORT/client.cpp | 11 +-
TAO/tests/ORT/server.cpp | 15 +-
TAO/tests/Object_Loader/Loader.cpp | 2 +-
TAO/tests/Object_Loader/Loader.h | 2 +-
TAO/tests/Object_Loader/driver.cpp | 2 +-
TAO/tests/Objref_Sequence_Test/client.cpp | 15 +-
TAO/tests/Objref_Sequence_Test/server.cpp | 15 +-
TAO/tests/OctetSeq/OctetSeq.cpp | 12 +-
TAO/tests/OctetSeq/client.cpp | 11 +-
TAO/tests/OctetSeq/server.cpp | 13 +-
TAO/tests/Oneway_Buffering/admin.cpp | 13 +-
TAO/tests/Oneway_Buffering/client.cpp | 11 +-
TAO/tests/Oneway_Buffering/server.cpp | 13 +-
TAO/tests/Oneways_Invoking_Twoways/client.cpp | 11 +-
TAO/tests/Oneways_Invoking_Twoways/server.cpp | 13 +-
.../Bug_2511_Regression/Bug_2511_Regression.mpc | 5 -
TAO/tests/POA/Bug_2511_Regression/run_test.pl | 25 -
TAO/tests/POA/Bug_2511_Regression/server.cpp | 286 -
TAO/tests/POA/Bug_2511_Regression/test.idl | 8 -
TAO/tests/POA/Current/Current.cpp | 9 +-
TAO/tests/POA/Deactivate_Object/server.cpp | 7 +-
TAO/tests/POA/Default_Servant/Default_Servant.cpp | 9 +-
TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc | 19 -
TAO/tests/POA/EndpointPolicy/Hello.cpp | 25 -
TAO/tests/POA/EndpointPolicy/Hello.h | 33 -
TAO/tests/POA/EndpointPolicy/README | 26 -
TAO/tests/POA/EndpointPolicy/Test.idl | 20 -
TAO/tests/POA/EndpointPolicy/client.cpp | 112 -
TAO/tests/POA/EndpointPolicy/run_test.pl | 107 -
TAO/tests/POA/EndpointPolicy/server.cpp | 345 -
TAO/tests/POA/Etherealization/Etherealization.cpp | 9 +-
.../Excessive_Object_Deactivations.cpp | 8 +-
TAO/tests/POA/Identity/Identity.cpp | 7 +-
.../POA/MT_Servant_Locator/MT_Servant_Locator.cpp | 9 +-
.../Nested_Non_Servant_Upcalls.cpp | 9 +-
.../Non_Servant_Upcalls/Non_Servant_Upcalls.cpp | 9 +-
.../Object_Reactivation/Object_Reactivation.cpp | 13 +-
.../POA/POAManagerFactory/POAManagerFactory.cpp | 306 -
.../POA/POAManagerFactory/POAManagerFactory.mpc | 5 -
TAO/tests/POA/POAManagerFactory/run_test.pl | 25 -
TAO/tests/POA/POA_Destruction/POA_Destruction.cpp | 8 +-
TAO/tests/POA/Persistent_ID/client.cpp | 13 +-
TAO/tests/POA/Persistent_ID/server.cpp | 15 +-
TAO/tests/POA/Policies/Policies.cpp | 10 +-
TAO/tests/POA/README | 14 -
TAO/tests/POA/Reference_Counting/test.cpp | 7 +-
.../Single_Threaded_POA/Single_Threaded_POA.cpp | 9 +-
.../wait_for_completion/wait_for_completion.cpp | 13 +-
.../Parallel_Connect_Strategy.mpc | 18 -
TAO/tests/Parallel_Connect_Strategy/README | 33 -
TAO/tests/Parallel_Connect_Strategy/Test.idl | 20 -
TAO/tests/Parallel_Connect_Strategy/Test_i.cpp | 23 -
TAO/tests/Parallel_Connect_Strategy/Test_i.h | 35 -
TAO/tests/Parallel_Connect_Strategy/blocked.conf | 3 -
TAO/tests/Parallel_Connect_Strategy/client.cpp | 121 -
TAO/tests/Parallel_Connect_Strategy/reactive.conf | 3 -
TAO/tests/Parallel_Connect_Strategy/run_test.pl | 97 -
TAO/tests/Parallel_Connect_Strategy/server.cpp | 136 -
TAO/tests/Param_Test/anyop.cpp | 11 +-
TAO/tests/Param_Test/bd_str_seq.cpp | 10 +-
TAO/tests/Param_Test/complex_any.cpp | 8 +-
TAO/tests/Param_Test/driver.cpp | 7 +-
TAO/tests/Param_Test/nested_struct.cpp | 8 +-
TAO/tests/Param_Test/objref_struct.cpp | 6 +-
TAO/tests/Param_Test/options.cpp | 3 +-
TAO/tests/Param_Test/server.cpp | 13 +-
TAO/tests/Param_Test/svc.conf | 2 +-
TAO/tests/Param_Test/ub_str_seq.cpp | 8 +-
TAO/tests/Param_Test/var_struct.cpp | 20 +-
TAO/tests/Policies/Manipulation.cpp | 11 +-
TAO/tests/Portable_Interceptors/AMI/client.cpp | 11 +-
TAO/tests/Portable_Interceptors/AMI/server.cpp | 13 +-
TAO/tests/Portable_Interceptors/AdvSlot/server.cpp | 1 +
.../Portable_Interceptors/AdvSlotDblCpy/server.cpp | 1 +
.../Portable_Interceptors/AdvSlotExt/server.cpp | 1 +
.../Benchmark/Interceptor_Type.cpp | 8 +-
.../Portable_Interceptors/Benchmark/client.cpp | 13 +-
.../Portable_Interceptors/Benchmark/marker.cpp | 6 +-
.../Portable_Interceptors/Benchmark/server.cpp | 15 +-
.../Portable_Interceptors/Bug_1559/client.cpp | 11 +-
.../Portable_Interceptors/Bug_1559/server.cpp | 13 +-
.../Portable_Interceptors/Bug_2088/client.cpp | 7 +-
.../Bug_2510_Regression/Bug_2510_Regression.mpc | 20 -
.../Bug_2510_Regression/Client_ORBInitializer.cpp | 49 -
.../Bug_2510_Regression/Client_ORBInitializer.h | 48 -
.../Bug_2510_Regression/client.cpp | 117 -
.../Bug_2510_Regression/client_interceptor.cpp | 116 -
.../Bug_2510_Regression/client_interceptor.h | 72 -
.../Bug_2510_Regression/run_test.pl | 50 -
.../Bug_2510_Regression/server.cpp | 127 -
.../Bug_2510_Regression/test.idl | 32 -
.../Bug_2510_Regression/test_i.cpp | 53 -
.../Bug_2510_Regression/test_i.h | 55 -
.../Collocated/Dynamic/Collocated_Test.cpp | 20 +-
.../Collocated/Dynamic/Server_Task.cpp | 2 +-
.../Collocated_Test.cpp | 21 +-
.../Service_Context_Manipulation/Server_Task.cpp | 2 +-
TAO/tests/Portable_Interceptors/Dynamic/client.cpp | 11 +-
TAO/tests/Portable_Interceptors/Dynamic/server.cpp | 13 +-
.../ForwardRequest/Client_ORBInitializer.cpp | 2 +-
.../ForwardRequest/client.cpp | 13 +-
.../ForwardRequest/server.cpp | 15 +-
.../IORInterceptor/FOO_IORInterceptor.cpp | 2 +-
.../IORInterceptor/FOO_IORInterceptor.h | 2 +-
.../IORInterceptor/client.cpp | 11 +-
.../IORInterceptor/server.cpp | 15 +-
.../Portable_Interceptors/ORB_Shutdown/client.cpp | 13 +-
.../Portable_Interceptors/ORB_Shutdown/server.cpp | 13 +-
.../Portable_Interceptors/PICurrent/client.cpp | 13 +-
.../Portable_Interceptors/PICurrent/server.cpp | 15 +-
.../Portable_Interceptors/PolicyFactory/server.cpp | 9 +-
.../Recursive_ORBInitializer/client.cpp | 9 +-
.../Register_Initial_References/server.cpp | 9 +-
.../Request_Interceptor_Flow/client.cpp | 13 +-
.../Request_Interceptor_Flow/server.cpp | 13 +-
.../Service_Context_Manipulation/client.cpp | 11 +-
.../Service_Context_Manipulation/server.cpp | 13 +-
TAO/tests/QtTests/client.cpp | 11 +-
TAO/tests/QtTests/client.h | 2 +-
TAO/tests/QtTests/server.cpp | 13 +-
.../Queued_Message_Test/Queued_Message_Test.cpp | 4 +-
.../RTCORBA/Activate_Object_Multiple_ORBs/test.cpp | 2 +-
TAO/tests/RTCORBA/Banded_Connections/client.cpp | 14 +-
TAO/tests/RTCORBA/Banded_Connections/server.cpp | 18 +-
TAO/tests/RTCORBA/Client_Propagated/client.cpp | 11 +-
TAO/tests/RTCORBA/Client_Propagated/server.cpp | 13 +-
TAO/tests/RTCORBA/Client_Protocol/client.cpp | 11 +-
TAO/tests/RTCORBA/Client_Protocol/server.cpp | 13 +-
TAO/tests/RTCORBA/Collocation/Collocation.cpp | 9 +-
.../Destroy_Thread_Pool/Destroy_Thread_Pool.cpp | 13 +-
TAO/tests/RTCORBA/Diffserv/client.cpp | 11 +-
TAO/tests/RTCORBA/Diffserv/server.cpp | 13 +-
TAO/tests/RTCORBA/Explicit_Binding/client.cpp | 11 +-
TAO/tests/RTCORBA/Explicit_Binding/server.cpp | 13 +-
TAO/tests/RTCORBA/Linear_Priority/client.cpp | 13 +-
TAO/tests/RTCORBA/Linear_Priority/server.cpp | 15 +-
.../RTCORBA/MT_Client_Protocol_Priority/client.cpp | 11 +-
.../RTCORBA/MT_Client_Protocol_Priority/server.cpp | 13 +-
TAO/tests/RTCORBA/ORB_init/ORB_init.cpp | 17 +-
TAO/tests/RTCORBA/Persistent_IOR/client.cpp | 13 +-
TAO/tests/RTCORBA/Persistent_IOR/server.cpp | 15 +-
TAO/tests/RTCORBA/Policies/Policies.cpp | 9 +-
TAO/tests/RTCORBA/Policy_Combinations/client.cpp | 13 +-
TAO/tests/RTCORBA/Policy_Combinations/server.cpp | 15 +-
.../Priority_Inversion_With_Bands/client.cpp | 11 +-
.../Priority_Inversion_With_Bands/server.cpp | 14 +-
TAO/tests/RTCORBA/Private_Connection/client.cpp | 11 +-
TAO/tests/RTCORBA/Private_Connection/server.cpp | 13 +-
.../Profile_And_Endpoint_Selection/client.cpp | 13 +-
.../Profile_And_Endpoint_Selection/server.cpp | 15 +-
TAO/tests/RTCORBA/RTMutex/server.cpp | 11 +-
TAO/tests/RTCORBA/Server_Declared/client.cpp | 11 +-
TAO/tests/RTCORBA/Server_Declared/server.cpp | 13 +-
TAO/tests/RTCORBA/Server_Protocol/client.cpp | 11 +-
TAO/tests/RTCORBA/Server_Protocol/server.cpp | 13 +-
TAO/tests/RTCORBA/Thread_Pool/client.cpp | 11 +-
TAO/tests/RTCORBA/Thread_Pool/server.cpp | 15 +-
TAO/tests/RTCORBA/common_args.cpp | 4 +-
TAO/tests/RTScheduling/Current/test.cpp | 9 +-
TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h | 2 +
TAO/tests/RTScheduling/DT_Spawn/test.cpp | 9 +-
TAO/tests/RTScheduling/Scheduler.cpp | 3 +
.../Scheduling_Interceptor/test_client.cpp | 17 +-
.../Scheduling_Interceptor/test_server.cpp | 18 +-
TAO/tests/RTScheduling/Thread_Cancel/test.cpp | 9 +-
TAO/tests/RTScheduling/VoidData/test_client.cpp | 9 +-
TAO/tests/Reliable_Oneways/client.cpp | 11 +-
TAO/tests/Reliable_Oneways/server.cpp | 13 +-
.../Sequence_Unit_Tests/Bounded_Simple_Types.cpp | 2 +-
TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp | 2 +-
.../Sequence_Unit_Tests/Sequence_Unit_Tests.mpc | 8 -
.../Sequence_Unit_Tests/Unbounded_Simple_Types.cpp | 2 +-
.../bounded_basic_string_sequence.hpp | 105 +
.../bounded_object_reference_sequence.hpp | 102 +
.../bounded_reference_allocation_traits.hpp | 64 +
.../bounded_string_sequence.hpp | 41 +
.../bounded_value_allocation_traits.hpp | 59 +
.../Sequence_Unit_Tests/bounded_value_sequence.hpp | 98 +
.../bounded_wstring_sequence.hpp | 42 +
TAO/tests/Sequence_Unit_Tests/generic_sequence.hpp | 263 +
TAO/tests/Sequence_Unit_Tests/mock_stream.cpp | 35 +
TAO/tests/Sequence_Unit_Tests/mock_stream.hpp | 40 +
.../object_reference_sequence_element.hpp | 126 +
.../object_reference_traits.hpp | 84 +
.../object_reference_traits_base.hpp | 55 +
TAO/tests/Sequence_Unit_Tests/range_checking.hpp | 149 +
.../string_sequence_element.hpp | 123 +
TAO/tests/Sequence_Unit_Tests/string_traits.hpp | 76 +
.../Sequence_Unit_Tests/string_traits_base.hpp | 80 +
.../unbounded_basic_string_sequence.hpp | 108 +
.../unbounded_object_reference_sequence.hpp | 105 +
.../unbounded_octet_sequence.hpp | 284 +
.../unbounded_reference_allocation_traits.hpp | 68 +
.../unbounded_string_sequence.hpp | 42 +
.../unbounded_value_allocation_traits.hpp | 53 +
.../unbounded_value_sequence.hpp | 98 +
.../unbounded_wstring_sequence.hpp | 42 +
TAO/tests/Sequence_Unit_Tests/value_traits.hpp | 54 +
TAO/tests/Servant_To_Reference_Test/server.cpp | 11 +-
TAO/tests/Server_Connection_Purging/client.cpp | 9 +-
TAO/tests/Server_Connection_Purging/server.cpp | 13 +-
TAO/tests/Server_Leaks/client.cpp | 11 +-
TAO/tests/Server_Leaks/server.cpp | 13 +-
TAO/tests/Server_Port_Zero/server.cpp | 13 +-
TAO/tests/Single_Read/client.cpp | 13 +-
TAO/tests/Single_Read/server.cpp | 15 +-
TAO/tests/Smart_Proxies/Benchmark/client.cpp | 17 +-
TAO/tests/Smart_Proxies/Benchmark/server.cpp | 15 +-
TAO/tests/Smart_Proxies/Collocation/main.cpp | 7 +-
TAO/tests/Smart_Proxies/On_Demand/client.cpp | 13 +-
TAO/tests/Smart_Proxies/On_Demand/server.cpp | 15 +-
TAO/tests/Smart_Proxies/Policy/client.cpp | 15 +-
TAO/tests/Smart_Proxies/Policy/server.cpp | 15 +-
TAO/tests/Smart_Proxies/client.cpp | 15 +-
TAO/tests/Smart_Proxies/dtor/client.cpp | 15 +-
TAO/tests/Smart_Proxies/dtor/server.cpp | 15 +-
TAO/tests/Smart_Proxies/server.cpp | 15 +-
TAO/tests/Stack_Recursion/client.cpp | 11 +-
TAO/tests/Stack_Recursion/server.cpp | 13 +-
TAO/tests/Strategies/client.cpp | 11 +-
TAO/tests/Strategies/server.cpp | 13 +-
TAO/tests/Timed_Buffered_Oneways/client.cpp | 13 +-
TAO/tests/Timed_Buffered_Oneways/server.cpp | 15 +-
TAO/tests/Timeout/client.cpp | 11 +-
TAO/tests/Timeout/server.cpp | 13 +-
TAO/tests/Two_Objects/client.cpp | 11 +-
TAO/tests/Two_Objects/server.cpp | 13 +-
TAO/tests/Typedef_String_Array/client.cpp | 11 +-
TAO/tests/Typedef_String_Array/server.cpp | 13 +-
TAO/tests/UNKNOWN_Exception/client.cpp | 13 +-
TAO/tests/UNKNOWN_Exception/server.cpp | 15 +-
TAO/tests/Xt_Stopwatch/Client.h | 2 +-
TAO/tests/Xt_Stopwatch/client.cpp | 11 +-
TAO/tests/Xt_Stopwatch/server.cpp | 13 +-
TAO/tools.mwc | 5 +
TAO/utils/NamingViewer/BindDialog.cpp | 12 +-
TAO/utils/NamingViewer/BindNewContext.cpp | 4 +-
TAO/utils/NamingViewer/NamingTreeCtrl.cpp | 18 +-
TAO/utils/NamingViewer/NamingViewer.cpp | 2 +-
TAO/utils/NamingViewer/NamingViewerDlg.cpp | 4 +-
TAO/utils/NamingViewer/ViewIORDialog.cpp | 4 +-
TAO/utils/catior/catior.cpp | 4 +-
TAO/utils/nslist/nsadd.cpp | 4 +-
TAO/utils/nslist/nsdel.cpp | 2 +-
TAO/utils/nslist/nslist.cpp | 2 +-
THANKS | 1 -
ace/ACE.cpp | 10 -
ace/ACE.h | 7 +-
ace/ACE.inl | 6 +-
ace/ARGV.cpp | 278 +-
ace/ARGV.h | 64 +-
ace/ARGV.inl | 315 +-
ace/Arg_Shifter.cpp | 214 +-
ace/Arg_Shifter.h | 40 +-
ace/Arg_Shifter.inl | 226 +
ace/Argv_Type_Converter.cpp | 69 +-
ace/Argv_Type_Converter.h | 20 +-
ace/Argv_Type_Converter.inl | 16 +-
ace/Auto_Event.cpp | 6 +-
ace/Auto_Event.h | 2 -
ace/Base_Thread_Adapter.h | 2 -
ace/Basic_Stats.cpp | 30 +-
ace/Basic_Stats.h | 5 +-
ace/Basic_Types.h | 51 +-
ace/CDR_Base.h | 13 +-
ace/CDR_Stream.cpp | 41 -
ace/CDR_Stream.h | 11 -
ace/CE_Screen_Output.cpp | 4 +-
ace/Cleanup.h | 3 +-
ace/Container_Instantiations.cpp | 28 +
ace/Default_Constants.h | 55 +-
ace/Dev_Poll_Reactor.cpp | 2 +-
ace/Dynamic_Service.h | 6 +-
ace/Dynamic_Service.inl | 4 +-
ace/Env_Value_T.inl | 7 +-
ace/FILE_Connector.cpp | 2 +-
ace/Functor.h | 7 +-
ace/Functor.inl | 8 +-
ace/Functor_String.h | 4 -
ace/Functor_String.inl | 2 -
ace/Get_Opt.cpp | 663 +-
ace/Get_Opt.h | 66 +-
ace/Get_Opt.inl | 726 +-
ace/Global_Macros.h | 2 +-
ace/High_Res_Timer.cpp | 4 +-
ace/High_Res_Timer.h | 3 +-
ace/INET_Addr.cpp | 22 +-
ace/INET_Addr.h | 12 -
ace/INET_Addr.inl | 17 +-
ace/Lib_Find.cpp | 10 +-
ace/Lib_Find.h | 2 -
ace/Local_Name_Space.cpp | 18 +-
ace/Local_Name_Space.h | 8 +-
ace/Local_Name_Space_T.cpp | 16 +-
ace/Log_Msg.cpp | 44 +-
ace/Log_Msg.h | 14 +-
ace/Log_Msg_UNIX_Syslog.cpp | 17 +-
ace/Log_Record.cpp | 2 +-
ace/Logging_Strategy.cpp | 10 +-
ace/MEM_Connector.cpp | 4 +-
ace/Makefile.am | 1 -
ace/Malloc_Instantiations.cpp | 41 +
ace/Malloc_T.cpp | 6 +-
ace/Malloc_T.h | 10 +-
ace/Manual_Event.cpp | 6 +-
ace/Manual_Event.h | 2 -
ace/Multihomed_INET_Addr.cpp | 8 +-
ace/Multihomed_INET_Addr.h | 3 -
ace/Mutex.h | 5 +-
ace/NT_Service.h | 2 +-
ace/Name_Request_Reply.cpp | 24 +-
ace/Name_Request_Reply.h | 18 +-
ace/Naming_Context.cpp | 2 +-
ace/OS_NS_Thread.cpp | 26 +-
ace/OS_NS_Thread.h | 14 +-
ace/OS_NS_Thread.inl | 24 +-
ace/OS_NS_ctype.h | 50 +-
ace/OS_NS_ctype.inl | 132 +-
ace/OS_NS_ctype_T.inl | 169 +
ace/OS_NS_dirent.inl | 4 +-
ace/OS_NS_dlfcn.inl | 31 +-
ace/OS_NS_fcntl.cpp | 6 +-
ace/OS_NS_fcntl.h | 4 +-
ace/OS_NS_stdio.cpp | 10 +-
ace/OS_NS_stdio.h | 25 +-
ace/OS_NS_stdio.inl | 102 +-
ace/OS_NS_stdlib.cpp | 4 +-
ace/OS_NS_stdlib.h | 35 +-
ace/OS_NS_stdlib.inl | 114 +-
ace/OS_NS_stdlib_base.cpp | 12 +
ace/OS_NS_stdlib_base.h | 40 +
ace/OS_NS_stdlib_base.inl | 90 +
ace/OS_NS_string.cpp | 65 +-
ace/OS_NS_string.h | 125 +-
ace/OS_NS_string.inl | 155 +-
ace/OS_NS_string_base.cpp | 12 +
ace/OS_NS_string_base.h | 89 +
ace/OS_NS_string_base.inl | 97 +
ace/OS_NS_strings.h | 4 -
ace/OS_NS_strings.inl | 6 -
ace/OS_NS_sys_mman.inl | 6 +-
ace/OS_NS_sys_stat.h | 6 -
ace/OS_NS_sys_stat.inl | 23 +-
ace/OS_NS_time.inl | 28 +-
ace/OS_NS_unistd.cpp | 153 +-
ace/OS_NS_unistd.h | 20 +-
ace/OS_NS_unistd.inl | 56 +-
ace/OS_NS_unistd_T.inl | 141 +
ace/OS_NS_wchar.cpp | 103 +-
ace/OS_NS_wchar.h | 105 +-
ace/OS_NS_wchar.inl | 25 +-
ace/OS_main.cpp | 2 +-
ace/Object_Manager.h | 2 +-
ace/Object_Manager_Base.cpp | 2 +-
ace/Obstack.cpp | 15 +
ace/Process.cpp | 15 +-
ace/Process.h | 6 +-
ace/Process.inl | 8 +-
ace/Process_Manager.cpp | 30 +-
ace/Process_Mutex.cpp | 13 +-
ace/Process_Mutex.h | 3 -
ace/Process_Semaphore.cpp | 2 +-
ace/QoS/SOCK_Dgram_Mcast_QoS.cpp | 3 +-
ace/Registry_Name_Space.cpp | 2 +-
ace/Remote_Name_Space.cpp | 66 +-
ace/SOCK_Dgram.cpp | 13 +-
ace/SOCK_Dgram_Bcast.cpp | 2 +-
ace/SOCK_Dgram_Mcast.cpp | 20 +-
ace/SOCK_Stream.h | 20 +-
ace/SSL/SSL_Asynch_Stream.cpp | 154 +-
ace/SSL/SSL_Asynch_Stream.h | 213 +-
ace/SSL/SSL_Context.cpp | 2 +-
ace/SSL/SSL_SOCK_Stream.cpp | 2 +-
ace/SString.cpp | 7 +-
ace/SStringfwd.h | 4 +-
ace/SV_Semaphore_Simple.cpp | 4 +-
ace/SV_Semaphore_Simple.h | 5 +-
ace/SV_Semaphore_Simple.inl | 4 +-
ace/Select_Reactor.cpp | 33 +
ace/Service_Config.cpp | 2 +-
ace/Service_Config.h | 12 +
ace/Service_Config.inl | 12 +-
ace/Service_Manager.cpp | 4 +-
ace/Service_Templates.cpp | 103 +
ace/Shared_Memory_Pool.cpp | 4 +-
ace/Singleton.cpp | 2 +-
ace/Sock_Connect.cpp | 2 +-
ace/Stats.cpp | 53 +-
ace/Stats.h | 13 +-
ace/String_Conversion_T.cpp | 17 +
ace/String_Conversion_T.h | 343 +
ace/String_Conversion_T.inl | 160 +
ace/Svc_Conf_y.cpp | 2 +-
ace/Synch.cpp | 40 +
ace/Template_Instantiations.cpp | 360 +
ace/UNIX_Addr.cpp | 2 +-
ace/UNIX_Addr.h | 2 -
ace/UNIX_Addr.inl | 7 +-
ace/ace_for_tao.mpc | 1 -
ace/ace_wchar.h | 305 +-
ace/ace_wchar.inl | 127 -
ace/ace_wchar_win32_defs.h | 100 +
ace/config-all.h | 3 +
ace/config-borland-common.h | 4 +-
ace/config-doxygen.h | 3 -
ace/config-freebsd.h | 1 -
ace/config-hpux-11.00.h | 2 -
ace/config-kcc-common.h | 73 +
ace/config-linux-common.h | 18 +-
ace/config-lynxos.h | 31 +
ace/config-macosx-panther.h | 3 +-
ace/config-macosx-tiger.h | 3 +-
ace/config-macosx.h | 3 +-
ace/config-netbsd.h | 7 +-
ace/config-pharlap.h | 1 -
ace/config-rtems.h | 2 -
ace/config-tandem-nsk-mips-v2.h | 3 +-
ace/config-vxworks5.x.h | 9 +
ace/config-win32-common.h | 13 +-
ace/config-win32-dmc.h | 2 -
ace/config-win32-ghs.h | 6 +-
ace/config-win32-mingw.h | 3 +-
ace/config-win32-msvc-6.h | 184 +
ace/config-win32-msvc-7.h | 3 +-
ace/config-win32-msvc-8.h | 3 +-
ace/config-win32-msvc.h | 2 +-
ace/config-win32-visualage.h | 3 +-
ace/os_include/os_stddef.h | 6 -
apps/FaCE/FaCE.cpp | 24 +-
apps/FaCE/FaCE.h | 2 +-
apps/Gateway/Gateway/Config_Files.cpp | 2 +-
apps/Gateway/Gateway/Options.cpp | 2 +-
apps/Gateway/Peer/Options.cpp | 2 +-
apps/JAWS/clients/Blobby/Blob_Handler.cpp | 2 +-
apps/JAWS/clients/Blobby/Options.cpp | 2 +-
apps/JAWS/clients/Caching/http_client.cpp | 2 +-
apps/JAWS/clients/Caching/http_handler.cpp | 4 +-
apps/JAWS/clients/Caching/test_URL.cpp | 2 +-
apps/JAWS/server/HTTP_Server.cpp | 2 +-
apps/JAWS/server/main.cpp | 2 +-
apps/JAWS/stress_testing/benchd.cpp | 6 +-
apps/JAWS/stress_testing/http_tester.cpp | 2 +-
apps/JAWS2/JAWS/Server.cpp | 2 +-
apps/JAWS2/main.cpp | 2 +-
apps/JAWS3/bench/mkfiles.cpp | 4 +-
apps/JAWS3/bench/rqfiles.cpp | 4 +-
apps/JAWS3/http/HTTP_Service_Handler.cpp | 2 +-
apps/JAWS3/jaws3/main.cpp | 2 +-
apps/JAWS3/small/SS_Service_Handler.cpp | 2 +-
apps/drwho/Options.cpp | 2 +-
apps/drwho/client.cpp | 2 +-
apps/drwho/server.cpp | 2 +-
apps/gperf/src/Options.cpp | 2 +-
apps/gperf/src/gperf.cpp | 4 +-
apps/gperf/tests/tests.mpc | 10 +
apps/mkcsregdb/mkcsregdb.cpp | 2 +-
apps/soreduce/Library.cpp | 6 +-
apps/soreduce/soreduce.cpp | 2 +-
bin/MakeProjectCreator/config/ciao_events_dnc.mpb | 2 +-
bin/MakeProjectCreator/config/endpointpolicy.mpb | 7 -
bin/MakeProjectCreator/config/no_wchar.mpb | 3 +
bin/sandbox.cpp | 2 +-
bin/tao_orb_tests.lst | 7 -
contrib/utility/Example/CommandLine/Foo/foo.cpp | 2 +-
examples/APG/Config/ARGV_Example.cpp | 2 +-
examples/APG/Config/Get_Opt.cpp | 4 +-
examples/APG/Config/Get_Opt_Long.cpp | 8 +-
examples/APG/Config/HA_Status.cpp | 6 +-
examples/APG/Logging/Callback-2.h | 6 +-
examples/APG/Svc_Config/HA_Status_Dynamic.cpp | 4 +-
examples/APG/Svc_Config/HA_Status_Static.cpp | 4 +-
examples/ASX/Event_Server/Event_Server/Options.cpp | 22 +-
.../ASX/Event_Server/Transceiver/transceiver.cpp | 2 +-
examples/ASX/Message_Queue/buffer_stream.cpp | 4 +-
examples/ASX/UPIPE_Event_Server/Options.cpp | 23 +-
examples/ASX/UPIPE_Event_Server/Peer_Router.cpp | 2 +-
examples/C++NPv1/Iterative_Logging_Server.cpp | 6 +-
examples/C++NPv1/Logging_Client.cpp | 13 +-
examples/C++NPv1/Logging_Handler.cpp | 6 +-
examples/C++NPv1/Logging_Server.cpp | 6 +-
.../Process_Per_Connection_Logging_Server.cpp | 7 +-
.../RT_Thread_Per_Connection_Logging_Server.cpp | 6 +-
examples/C++NPv1/Reactive_Logging_Server.cpp | 6 +-
examples/C++NPv1/Reactive_Logging_Server_Ex.cpp | 6 +-
.../Thread_Per_Connection_Logging_Server.cpp | 6 +-
examples/C++NPv2/AC_Client_Logging_Daemon.cpp | 8 +-
examples/C++NPv2/AIO_Client_Logging_Daemon.cpp | 8 +-
examples/C++NPv2/Client_Logging_Daemon.cpp | 8 +-
examples/C++NPv2/Logging_Event_Handler.cpp | 4 +-
examples/C++NPv2/Reactor_Logging_Server.cpp | 2 +-
.../C++NPv2/Reactor_Logging_Server_Adapter.cpp | 2 +-
examples/C++NPv2/Select_Reactor_Logging_Server.cpp | 2 +-
examples/C++NPv2/Service_Reporter.cpp | 4 +-
examples/C++NPv2/TP_Logging_Server.h | 2 +-
examples/C++NPv2/TP_Reactor_Logging_Server.cpp | 2 +-
examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp | 4 +-
examples/C++NPv2/display_logfile.cpp | 2 +-
examples/Connection/blocking/SPIPE-acceptor.cpp | 2 +-
examples/Connection/blocking/SPIPE-connector.cpp | 2 +-
.../Connection/blocking/test_spipe_acceptor.cpp | 2 +-
examples/Connection/misc/test_upipe.cpp | 2 +-
.../Connection/non_blocking/test_tli_acceptor.cpp | 2 +-
.../Connection/non_blocking/test_tli_connector.cpp | 2 +-
examples/IPC_SAP/SOCK_SAP/C-inclient.cpp | 2 +-
examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp | 2 +-
examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp | 2 +-
examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp | 4 +-
examples/IPC_SAP/SSL_SAP/SSL-client.cpp | 4 +-
examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp | 2 +-
examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp | 4 +-
examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp | 2 +-
examples/IPC_SAP/SSL_SAP/SSL-server.cpp | 2 +-
examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp | 2 +-
examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp | 2 +-
examples/IPC_SAP/TLI_SAP/CPP-client.cpp | 2 +-
examples/IPC_SAP/TLI_SAP/CPP-server.cpp | 2 +-
examples/IPC_SAP/TLI_SAP/db-client.cpp | 2 +-
examples/IPC_SAP/TLI_SAP/db-server.cpp | 2 +-
examples/IPC_SAP/TLI_SAP/ftp-client.cpp | 2 +-
examples/IPC_SAP/TLI_SAP/ftp-server.cpp | 2 +-
examples/Logger/Acceptor-server/server_loggerd.cpp | 6 +-
examples/Logger/simple-server/Logging_Handler.cpp | 2 +-
examples/Logger/simple-server/server_loggerd.cpp | 2 +-
examples/Mem_Map/IO-tests/test_io.cpp | 6 +-
examples/Misc/test_get_opt.cpp | 4 +-
examples/NT_Service/main.cpp | 2 +-
examples/OS/Process/imore.cpp | 2 +-
examples/OS/Process/process.cpp | 2 +-
examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp | 2 +-
examples/QOS/Change_Sender_TSpec/QoS_Util.cpp | 2 +-
examples/QOS/Simple/QoS_Util.cpp | 2 +-
examples/Reactor/Misc/notification.cpp | 2 +-
examples/Reactor/Misc/pingpong.cpp | 6 +-
examples/Reactor/Misc/test_reactors.cpp | 2 +-
examples/Reactor/Misc/test_signals_2.cpp | 2 +-
examples/Reactor/Misc/test_time_value.cpp | 2 +-
examples/Reactor/Multicast/Log_Wrapper.cpp | 2 +-
examples/Reactor/Multicast/client.cpp | 2 +-
examples/Reactor/Multicast/server.cpp | 2 +-
examples/Reactor/Ntalker/ntalker.cpp | 2 +-
examples/Reactor/Proactor/Aio_Platform_Test_C.cpp | 2 +-
examples/Reactor/Proactor/post_completions.cpp | 2 +-
examples/Reactor/Proactor/simple_test_proactor.cpp | 2 +-
examples/Reactor/Proactor/test_aiocb.cpp | 2 +-
examples/Reactor/Proactor/test_aiocb_ace.cpp | 2 +-
examples/Reactor/Proactor/test_aiosig.cpp | 2 +-
examples/Reactor/Proactor/test_aiosig_ace.cpp | 2 +-
examples/Reactor/Proactor/test_cancel.cpp | 2 +-
examples/Reactor/Proactor/test_end_event_loop.cpp | 2 +-
examples/Reactor/Proactor/test_multiple_loops.cpp | 2 +-
examples/Reactor/Proactor/test_proactor.cpp | 2 +-
examples/Reactor/Proactor/test_proactor2.cpp | 2 +-
examples/Reactor/Proactor/test_proactor3.cpp | 2 +-
examples/Reactor/Proactor/test_timeout.cpp | 2 +-
examples/Reactor/Proactor/test_udp_proactor.cpp | 2 +-
examples/Reactor/WFMO_Reactor/Handle_Close.cpp | 2 +-
examples/Reactor/WFMO_Reactor/Multithreading.cpp | 2 +-
examples/Reactor/WFMO_Reactor/Talker.cpp | 2 +-
.../IPC-tests/client/broadcast_client_test.cpp | 2 +-
.../IPC-tests/client/local_dgram_client_test.cpp | 2 +-
.../IPC-tests/client/local_fifo_client_test.cpp | 2 +-
.../IPC-tests/client/local_pipe_client_test.cpp | 2 +-
.../IPC-tests/client/local_spipe_client_test.cpp | 2 +-
.../IPC-tests/client/local_stream_client_test.cpp | 2 +-
.../IPC-tests/client/remote_dgram_client_test.cpp | 2 +-
.../client/remote_service_directory_test.cpp | 2 +-
.../IPC-tests/client/remote_stream_client_test.cpp | 2 +-
.../client/remote_thr_stream_client_test.cpp | 2 +-
.../IPC-tests/server/Handle_Broadcast.i | 2 +-
.../IPC-tests/server/Handle_L_CODgram.i | 4 +-
.../IPC-tests/server/Handle_L_Dgram.i | 4 +-
.../IPC-tests/server/Handle_L_FIFO.i | 2 +-
.../IPC-tests/server/Handle_L_Pipe.i | 4 +-
.../IPC-tests/server/Handle_L_SPIPE.i | 2 +-
.../IPC-tests/server/Handle_L_Stream.i | 6 +-
.../IPC-tests/server/Handle_R_Dgram.i | 2 +-
.../IPC-tests/server/Handle_R_Stream.i | 2 +-
.../IPC-tests/server/Handle_Thr_Stream.cpp | 4 +-
.../IPC-tests/server/Handle_Timeout.i | 2 +-
examples/Shared_Malloc/Options.cpp | 4 +-
examples/Shared_Malloc/test_malloc.cpp | 2 +-
.../test_position_independent_malloc.cpp | 2 +-
examples/Synch/proc_sema.cpp | 2 +-
.../System_V_IPC/SV_Message_Queues/MQ_Client.cpp | 2 +-
.../System_V_IPC/SV_Message_Queues/MQ_Server.cpp | 2 +-
.../System_V_IPC/SV_Message_Queues/TMQ_Server.cpp | 2 +-
.../System_V_IPC/SV_Semaphores/Semaphores_1.cpp | 2 +-
.../System_V_IPC/SV_Semaphores/Semaphores_2.cpp | 2 +-
examples/TMCast/Member/member.cpp | 2 +-
examples/Threads/process_manager.cpp | 2 +-
examples/Threads/reader_writer.cpp | 2 +-
examples/Threads/recursive_mutex.cpp | 2 +-
examples/Threads/task_one.cpp | 2 +-
examples/Web_Crawler/Command_Processor.cpp | 2 +-
examples/Web_Crawler/HTTP_URL.cpp | 2 +-
examples/Web_Crawler/Options.cpp | 2 +-
examples/Web_Crawler/URL_Addr.cpp | 4 +-
examples/Web_Crawler/URL_Visitor.cpp | 4 +-
include/makeinclude/platform_hpux_kcc.GNU | 123 +
include/makeinclude/platform_irix6.x_kcc.GNU | 41 +
include/makeinclude/platform_linux_kcc.GNU | 72 +
include/makeinclude/platform_osf1_4.x_kcc.GNU | 65 +
include/makeinclude/platform_sunos5_kcc.GNU | 111 +
include/makeinclude/platform_tru64_kcc.GNU | 35 +
include/makeinclude/platform_vxworks5.5.x.GNU | 2 +-
netsvcs/clients/Naming/Client/Client_Test.cpp | 2 +-
.../clients/Naming/Dump_Restore/Dump_Restore.cpp | 2 +-
netsvcs/clients/Naming/Dump_Restore/createfile.cpp | 2 +-
netsvcs/clients/Tokens/collection/collection.cpp | 6 +-
netsvcs/clients/Tokens/collection/rw_locks.cpp | 6 +-
.../Tokens/deadlock/deadlock_detection_test.cpp | 6 +-
netsvcs/clients/Tokens/invariant/invariant.cpp | 4 +-
netsvcs/clients/Tokens/manual/manual.cpp | 6 +-
netsvcs/clients/Tokens/mutex/test_mutex.cpp | 6 +-
netsvcs/clients/Tokens/rw_lock/rw_locks.cpp | 6 +-
netsvcs/lib/Client_Logging_Handler.cpp | 2 +-
netsvcs/lib/Name_Handler.cpp | 34 +-
netsvcs/lib/Server_Logging_Handler_T.cpp | 6 +-
netsvcs/lib/TS_Clerk_Handler.cpp | 2 +-
netsvcs/lib/TS_Server_Handler.cpp | 2 +-
netsvcs/lib/Token_Handler.cpp | 2 +-
performance-tests/Misc/basic_perf.cpp | 2 +-
performance-tests/Misc/childbirth_time.cpp | 2 +-
performance-tests/Misc/context_switch_time.cpp | 4 +-
performance-tests/Misc/preempt.cpp | 2 +-
performance-tests/Misc/test_guard.cpp | 6 +-
performance-tests/RPC/client.cpp | 4 +-
performance-tests/SCTP/Options_Manager.cpp | 46 +-
performance-tests/SCTP/SOCK_SEQPACK_clt.cpp | 2 +-
performance-tests/SCTP/SOCK_SEQPACK_srv.cpp | 2 +-
performance-tests/SCTP/SOCK_STREAM_clt.cpp | 2 +-
performance-tests/SCTP/SOCK_STREAM_srv.cpp | 2 +-
.../Leader_Follower/RT_CORBA_Leader_Follower.cpp | 2 +-
.../Leader_Follower/leader_follower.cpp | 2 +-
.../Queue_Based_Workers/RT_CORBA_Workers.cpp | 4 +-
.../Queue_Based_Workers/workers.cpp | 2 +-
.../Synch-Benchmarks/Base_Test/Baseline_Test.cpp | 4 +-
.../Perf_Test/Performance_Test_Options.cpp | 2 +-
.../Synch-Benchmarks/Perf_Test/guard_test.cpp | 2 +-
performance-tests/TCP/tcp_test.cpp | 4 +-
.../TTCP/ACE-C++/wrapper-new-ttcp.cpp | 2 +-
performance-tests/TTCP/C/new-ttcp.cpp | 2 +-
performance-tests/UDP/udp_test.cpp | 4 +-
protocols/ace/HTBP/HTBP_Addr.cpp | 2 +-
protocols/ace/HTBP/HTBP_ID_Requestor.cpp | 6 +-
protocols/ace/HTBP/HTBP_Session.cpp | 2 +-
protocols/ace/RMCast/Makefile.am | 3 +-
protocols/ace/RMCast/Template_Instantiations.cpp | 128 +
protocols/ace/TMCast/Group.cpp | 5 +
protocols/ace/TMCast/MTQueue.cpp | 17 +
protocols/ace/TMCast/Makefile.am | 3 +-
protocols/ace/TMCast/Template_Instantiations.cpp | 31 +
tests/ACE_Init_Test.cpp | 2 +-
tests/ACE_Init_Test.rc | 19 +-
tests/ARGV_Test.cpp | 2 +-
tests/Array_Map_Test.cpp | 16 +
tests/Atomic_Op_Test.cpp | 8 +
tests/Auto_Event_Test.cpp | 2 +-
tests/Auto_IncDec_Test.cpp | 16 +
tests/Based_Pointer_Test.cpp | 10 +
tests/Basic_Types_Test.cpp | 2 -
tests/Bound_Ptr_Test.cpp | 45 +-
tests/Bug_2368_Regression_Test.cpp | 123 -
tests/CDR_Array_Test.cpp | 25 +-
tests/CDR_File_Test.cpp | 16 +-
tests/CDR_Test.cpp | 21 +-
tests/Cache_Map_Manager_Test.cpp | 107 +-
tests/Cached_Accept_Conn_Test.cpp | 177 +-
tests/Cached_Allocator_Test.cpp | 19 +
tests/Cached_Conn_Test.cpp | 164 +-
tests/Codecs_Test.cpp | 5 +
tests/Collection_Test.cpp | 22 +
tests/Config_Test.cpp | 6 +-
tests/Conn_Test.cpp | 94 +-
tests/DLL_Test.cpp | 7 +
tests/DLList_Test.cpp | 12 +
tests/Dev_Poll_Reactor_Test.cpp | 19 +
tests/Dirent_Test.cpp | 2 +-
tests/Enum_Interfaces_Test.cpp | 2 +-
tests/Env_Value_Test.cpp | 24 +-
tests/FlReactor_Test.cpp | 11 +
tests/Framework_Component_DLL.cpp | 20 +-
tests/Future_Set_Test.cpp | 73 +
tests/Future_Test.cpp | 42 +
tests/Get_Opt_Test.cpp | 24 +-
tests/HTBP/Reactor_Tests/client.cpp | 4 +-
tests/HTBP/Reactor_Tests/test_config.h | 12 +-
tests/HTBP/Send_Large_Msg/client.cpp | 4 +-
tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp | 6 +-
tests/HTBP/ping/client.cpp | 4 +-
tests/Handle_Set_Test.cpp | 15 +
tests/Hash_Map_Bucket_Iterator_Test.cpp | 21 +-
tests/Hash_Map_Manager_Test.cpp | 20 +
tests/High_Res_Timer_Test.cpp | 2 +-
tests/INET_Addr_Test_IPV6.cpp | 2 +-
tests/IOStream_Test.cpp | 17 +-
tests/Lazy_Map_Manager_Test.cpp | 31 +
tests/Log_Msg_Test.cpp | 15 +-
tests/Logging_Strategy_Test.cpp | 2 +-
tests/MEM_Stream_Test.cpp | 36 +-
tests/MT_Reactor_Upcall_Test.cpp | 2 +-
tests/MT_Reference_Counted_Event_Handler_Test.cpp | 16 +-
tests/MT_Reference_Counted_Notify_Test.cpp | 16 +-
tests/MT_SOCK_Test.cpp | 5 +-
tests/Malloc_Test.cpp | 28 +
tests/Manual_Event_Test.cpp | 2 +-
tests/Map_Manager_Test.cpp | 68 +
tests/Map_Test.cpp | 113 +
tests/Message_Block_Test.cpp | 24 +-
tests/Message_Queue_Notifications_Test.cpp | 7 +
tests/Message_Queue_Test.cpp | 3 +
tests/Message_Queue_Test_Ex.cpp | 11 +
tests/Multicast_Test.cpp | 30 +-
tests/Multicast_Test_IPV6.cpp | 30 +-
tests/Multihomed_INET_Addr_Test_IPV6.cpp | 2 +-
tests/Network_Adapters_Test.cpp | 2 +-
tests/NonBlocking_Conn_Test.cpp | 15 +-
tests/Notify_Performance_Test.cpp | 14 +-
tests/OS_Test.cpp | 16 +-
tests/OrdMultiSet_Test.cpp | 13 +
tests/Pipe_Test.cpp | 2 +-
tests/Priority_Reactor_Test.cpp | 25 +-
tests/Proactor_Scatter_Gather_Test.cpp | 10 +-
tests/Proactor_Test.cpp | 26 +-
tests/Proactor_Test_IPV6.cpp | 26 +-
tests/Proactor_Timer_Test.cpp | 6 +-
tests/Process_Manager_Test.cpp | 2 +-
tests/Process_Manual_Event_Test.cpp | 2 +-
tests/Process_Mutex_Test.cpp | 2 +-
tests/Process_Semaphore_Test.cpp | 10 +-
tests/Process_Strategy_Test.cpp | 40 +-
tests/RB_Tree_Test.cpp | 68 +
tests/Reactor_Dispatch_Order_Test.cpp | 4 +-
tests/Reactor_Notify_Test.cpp | 15 +
tests/Reactor_Performance_Test.cpp | 30 +-
tests/Reactor_Timer_Test.cpp | 8 +-
tests/Reactors_Test.cpp | 8 +
tests/Reader_Writer_Test.cpp | 16 +-
tests/Recursive_Condition_Bug_Test.cpp | 5 +
tests/Recursive_Condition_Test.cpp | 5 +
tests/Refcounted_Auto_Ptr_Test.cpp | 65 +-
tests/Reference_Counted_Event_Handler_Test.cpp | 15 +-
tests/Reverse_Lock_Test.cpp | 11 +
tests/SOCK_Connector_Test.cpp | 8 +-
tests/SOCK_Dgram_Bcast_Test.cpp | 2 +-
tests/SOCK_Send_Recv_Test.cpp | 4 +-
tests/SOCK_Send_Recv_Test_IPV6.cpp | 4 +-
tests/SOCK_Test.cpp | 4 +-
tests/SOCK_Test_IPv6.cpp | 4 +-
tests/SSL/Makefile.am | 15 -
tests/SSL/SSL_Asynch_Stream_Test.cpp | 478 -
tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp | 18 +
tests/SSL/tests.mpc | 7 -
tests/SString_Test.cpp | 4 +-
tests/SV_Shared_Memory_Test.cpp | 15 +
tests/Semaphore_Test.cpp | 2 +-
tests/Signal_Test.cpp | 18 +-
tests/Simple_Message_Block_Test.cpp | 5 +
tests/Svc_Handler_Test.cpp | 25 +-
tests/TP_Reactor_Test.cpp | 20 +-
tests/TSS_Test.cpp | 11 +
tests/Task_Ex_Test.cpp | 9 +
tests/Test_Output.cpp | 15 +-
tests/Thread_Pool_Reactor_Resume_Test.cpp | 22 +-
tests/Thread_Pool_Reactor_Test.cpp | 20 +-
tests/Thread_Pool_Test.cpp | 6 +
tests/Timeprobe_Test.cpp | 10 +
tests/Timer_Queue_Reference_Counting_Test.cpp | 37 +-
tests/Timer_Queue_Test.cpp | 6 +
tests/TkReactor_Test.cpp | 8 +
tests/Token_Strategy_Test.cpp | 20 +
tests/Unbounded_Set_Test.cpp | 20 +
tests/Upgradable_RW_Test.cpp | 25 +-
tests/Vector_Test.cpp | 13 +
tests/WChar_Conversion.cpp | 291 +
tests/XtAthenaReactor_Test.cpp | 9 +
tests/XtMotifReactor_Test.cpp | 9 +
tests/run_test.lst | 2 -
tests/tests.mpc | 17 +-
websvcs/tests/Test_URL_Addr.cpp | 5 +-
2210 files changed, 50182 insertions(+), 25833 deletions(-)
create mode 100644 TAO/CIAO/DAnCE/ComponentPackager/Component_Packager.cpp
create mode 100644 TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp
create mode 100644 TAO/CIAO/DAnCE/spec_RepositoryManager/Options.cpp
create mode 100644 TAO/CIAO/DAnCE/spec_RepositoryManager/URL_Parser.cpp
create mode 100644 TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp
create mode 100644 TAO/CIAO/ciaosvcs/Events/CIAO_Events.idl
create mode 100644 TAO/WTAOACE.mwc
delete mode 100644 TAO/tao/EndpointPolicy.mpc
delete mode 100644 TAO/tao/EndpointPolicy/EndpointPolicy.cpp
delete mode 100644 TAO/tao/EndpointPolicy/EndpointPolicy.h
delete mode 100644 TAO/tao/EndpointPolicy/EndpointPolicy.pidl
delete mode 100644 TAO/tao/EndpointPolicy/EndpointPolicyA.cpp
delete mode 100644 TAO/tao/EndpointPolicy/EndpointPolicyA.h
delete mode 100644 TAO/tao/EndpointPolicy/EndpointPolicyC.cpp
delete mode 100644 TAO/tao/EndpointPolicy/EndpointPolicyC.h
delete mode 100644 TAO/tao/EndpointPolicy/EndpointPolicyC.inl
delete mode 100644 TAO/tao/EndpointPolicy/EndpointPolicyType.pidl
delete mode 100644 TAO/tao/EndpointPolicy/EndpointPolicyTypeA.cpp
delete mode 100644 TAO/tao/EndpointPolicy/EndpointPolicyTypeA.h
delete mode 100644 TAO/tao/EndpointPolicy/EndpointPolicyTypeC.cpp
delete mode 100644 TAO/tao/EndpointPolicy/EndpointPolicyTypeC.h
delete mode 100644 TAO/tao/EndpointPolicy/EndpointPolicy_Export.h
delete mode 100644 TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp
delete mode 100644 TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h
delete mode 100644 TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp
delete mode 100644 TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h
delete mode 100644 TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
delete mode 100644 TAO/tao/EndpointPolicy/EndpointPolicy_i.h
delete mode 100644 TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp
delete mode 100644 TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.h
delete mode 100644 TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp
delete mode 100644 TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h
delete mode 100644 TAO/tao/EndpointPolicy/Endpoint_Value_Impl.h
delete mode 100644 TAO/tao/EndpointPolicy/IIOPEndpointValue.pidl
delete mode 100644 TAO/tao/EndpointPolicy/IIOPEndpointValueA.cpp
delete mode 100644 TAO/tao/EndpointPolicy/IIOPEndpointValueA.h
delete mode 100644 TAO/tao/EndpointPolicy/IIOPEndpointValueC.cpp
delete mode 100644 TAO/tao/EndpointPolicy/IIOPEndpointValueC.h
delete mode 100644 TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
delete mode 100644 TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h
delete mode 100644 TAO/tao/EndpointPolicy/TAO_EndpointPolicy.pc.in
delete mode 100644 TAO/tao/LF_Multi_Event.cpp
delete mode 100644 TAO/tao/LF_Multi_Event.h
create mode 100644 TAO/tao/LF_Strategy_Complete.inl
create mode 100644 TAO/tao/Managed_Types.cpp
create mode 100644 TAO/tao/Managed_Types.h
create mode 100644 TAO/tao/Managed_Types.i
create mode 100644 TAO/tao/Messaging/OldExceptionHolderA.cpp
create mode 100644 TAO/tao/Messaging/OldExceptionHolderA.h
create mode 100644 TAO/tao/Messaging/OldExceptionHolderC.cpp
create mode 100644 TAO/tao/Messaging/OldExceptionHolderC.h
create mode 100644 TAO/tao/Messaging/OldExceptionHolderC.inl
delete mode 100644 TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
delete mode 100644 TAO/tao/PortableServer/Acceptor_Filter_Factory.h
delete mode 100644 TAO/tao/PortableServer/POAManagerFactory.cpp
delete mode 100644 TAO/tao/PortableServer/POAManagerFactory.h
delete mode 100644 TAO/tao/PortableServer/POAManagerFactory.pidl
delete mode 100644 TAO/tao/PortableServer/POAManagerFactoryC.cpp
delete mode 100644 TAO/tao/PortableServer/POAManagerFactoryC.h
create mode 100644 TAO/tao/Sequence.cpp
create mode 100644 TAO/tao/Sequence.h
create mode 100644 TAO/tao/Sequence.i
create mode 100644 TAO/tao/Sequence_T.cpp
create mode 100644 TAO/tao/Sequence_T.i
create mode 100644 TAO/tao/Valuetype/Sequence_T.cpp
create mode 100644 TAO/tao/Valuetype/Sequence_T.inl
delete mode 100644 TAO/tests/OBV/Simple/Client_i.cpp
delete mode 100644 TAO/tests/OBV/Simple/Client_i.h
delete mode 100644 TAO/tests/OBV/Simple/OBV.idl
delete mode 100644 TAO/tests/OBV/Simple/OBV_Simple.mpc
delete mode 100644 TAO/tests/OBV/Simple/OBV_impl.cpp
delete mode 100644 TAO/tests/OBV/Simple/OBV_impl.h
delete mode 100644 TAO/tests/OBV/Simple/Server_i.cpp
delete mode 100644 TAO/tests/OBV/Simple/Server_i.h
delete mode 100644 TAO/tests/OBV/Simple/Simple_util.cpp
delete mode 100644 TAO/tests/OBV/Simple/Simple_util.h
delete mode 100644 TAO/tests/OBV/Simple/client.cpp
delete mode 100755 TAO/tests/OBV/Simple/run_test.pl
delete mode 100644 TAO/tests/OBV/Simple/server.cpp
delete mode 100644 TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc
delete mode 100644 TAO/tests/OBV/Truncatable/README
delete mode 100644 TAO/tests/OBV/Truncatable/Truncatable.idl
delete mode 100644 TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
delete mode 100644 TAO/tests/OBV/Truncatable/TruncatableS_impl.h
delete mode 100644 TAO/tests/OBV/Truncatable/client.cpp
delete mode 100755 TAO/tests/OBV/Truncatable/run_test.pl
delete mode 100644 TAO/tests/OBV/Truncatable/server.cpp
delete mode 100644 TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc
delete mode 100755 TAO/tests/POA/Bug_2511_Regression/run_test.pl
delete mode 100644 TAO/tests/POA/Bug_2511_Regression/server.cpp
delete mode 100644 TAO/tests/POA/Bug_2511_Regression/test.idl
delete mode 100644 TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
delete mode 100644 TAO/tests/POA/EndpointPolicy/Hello.cpp
delete mode 100644 TAO/tests/POA/EndpointPolicy/Hello.h
delete mode 100644 TAO/tests/POA/EndpointPolicy/README
delete mode 100644 TAO/tests/POA/EndpointPolicy/Test.idl
delete mode 100644 TAO/tests/POA/EndpointPolicy/client.cpp
delete mode 100755 TAO/tests/POA/EndpointPolicy/run_test.pl
delete mode 100644 TAO/tests/POA/EndpointPolicy/server.cpp
delete mode 100644 TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp
delete mode 100644 TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc
delete mode 100755 TAO/tests/POA/POAManagerFactory/run_test.pl
delete mode 100644 TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc
delete mode 100644 TAO/tests/Parallel_Connect_Strategy/README
delete mode 100644 TAO/tests/Parallel_Connect_Strategy/Test.idl
delete mode 100644 TAO/tests/Parallel_Connect_Strategy/Test_i.cpp
delete mode 100644 TAO/tests/Parallel_Connect_Strategy/Test_i.h
delete mode 100644 TAO/tests/Parallel_Connect_Strategy/blocked.conf
delete mode 100644 TAO/tests/Parallel_Connect_Strategy/client.cpp
delete mode 100644 TAO/tests/Parallel_Connect_Strategy/reactive.conf
delete mode 100755 TAO/tests/Parallel_Connect_Strategy/run_test.pl
delete mode 100644 TAO/tests/Parallel_Connect_Strategy/server.cpp
delete mode 100644 TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc
delete mode 100644 TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
delete mode 100644 TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h
delete mode 100644 TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
delete mode 100644 TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
delete mode 100644 TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
delete mode 100755 TAO/tests/Portable_Interceptors/Bug_2510_Regression/run_test.pl
delete mode 100644 TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp
delete mode 100644 TAO/tests/Portable_Interceptors/Bug_2510_Regression/test.idl
delete mode 100644 TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
delete mode 100644 TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h
create mode 100644 TAO/tests/Sequence_Unit_Tests/bounded_basic_string_sequence.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/bounded_object_reference_sequence.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/bounded_reference_allocation_traits.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/bounded_string_sequence.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/bounded_value_allocation_traits.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/bounded_value_sequence.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/bounded_wstring_sequence.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/generic_sequence.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/mock_stream.cpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/mock_stream.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/object_reference_traits.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/object_reference_traits_base.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/range_checking.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/string_sequence_element.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/string_traits.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/string_traits_base.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/unbounded_basic_string_sequence.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/unbounded_object_reference_sequence.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/unbounded_reference_allocation_traits.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/unbounded_value_allocation_traits.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/unbounded_value_sequence.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/unbounded_wstring_sequence.hpp
create mode 100644 TAO/tests/Sequence_Unit_Tests/value_traits.hpp
create mode 100644 TAO/tools.mwc
create mode 100644 ace/Arg_Shifter.inl
create mode 100644 ace/Container_Instantiations.cpp
create mode 100644 ace/Malloc_Instantiations.cpp
create mode 100644 ace/OS_NS_ctype_T.inl
create mode 100644 ace/OS_NS_stdlib_base.cpp
create mode 100644 ace/OS_NS_stdlib_base.h
create mode 100644 ace/OS_NS_stdlib_base.inl
create mode 100644 ace/OS_NS_string_base.cpp
create mode 100644 ace/OS_NS_string_base.h
create mode 100644 ace/OS_NS_string_base.inl
create mode 100644 ace/OS_NS_unistd_T.inl
create mode 100644 ace/Obstack.cpp
create mode 100644 ace/Select_Reactor.cpp
create mode 100644 ace/Service_Templates.cpp
create mode 100644 ace/String_Conversion_T.cpp
create mode 100644 ace/String_Conversion_T.h
create mode 100644 ace/String_Conversion_T.inl
create mode 100644 ace/Synch.cpp
create mode 100644 ace/Template_Instantiations.cpp
delete mode 100644 ace/ace_wchar.inl
create mode 100644 ace/ace_wchar_win32_defs.h
create mode 100644 ace/config-kcc-common.h
create mode 100644 ace/config-win32-msvc-6.h
delete mode 100644 bin/MakeProjectCreator/config/endpointpolicy.mpb
create mode 100644 bin/MakeProjectCreator/config/no_wchar.mpb
create mode 100644 include/makeinclude/platform_hpux_kcc.GNU
create mode 100644 include/makeinclude/platform_irix6.x_kcc.GNU
create mode 100644 include/makeinclude/platform_linux_kcc.GNU
create mode 100644 include/makeinclude/platform_osf1_4.x_kcc.GNU
create mode 100644 include/makeinclude/platform_sunos5_kcc.GNU
create mode 100644 include/makeinclude/platform_tru64_kcc.GNU
create mode 100644 protocols/ace/RMCast/Template_Instantiations.cpp
create mode 100644 protocols/ace/TMCast/Template_Instantiations.cpp
delete mode 100644 tests/Bug_2368_Regression_Test.cpp
delete mode 100644 tests/SSL/SSL_Asynch_Stream_Test.cpp
create mode 100644 tests/WChar_Conversion.cpp
diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html
index af32d3517b3..c4f26ba777c 100644
--- a/ACE-INSTALL.html
+++ b/ACE-INSTALL.html
@@ -116,7 +116,7 @@ document.
DOC Group |
Solaris 7, 8, 9, and 10 (many compilers excluding SunC++ 4.x);
- Windows 2000, XP (MSVC++ 7.1, and 8);
+ Windows 2000, XP (MSVC++ 6, 7.1, and 8);
many versions of Linux/Intel (many compilers), Linux/IA64 (GCC).
|
DOC sites at ISIS,
@@ -147,7 +147,7 @@ document.
| Maintains ACE on many platforms required for their ACE and
TAO service offerings. Besides the standard DOC group platforms
we also support AIX, Borland C++ Builder 6/2006, CBuilderX 1.0, MinGW,
- Cygwin, VxWorks 5.5.1 & 6.2, OpenVMS 7.3-2 & 8.2-1,
+ Cygwin, VxWorks 5.5.1 & 6.x, OpenVMS 7.3-2 & 8.2-1,
Tru64, SuSE Linux on Alpha/IA32/EM64T,
HPUX 11i v2/v2 32/64 bit on PA-RISC, and
HPUX 11i v2 on Itanium. The Intel C++ compiler is supported on
@@ -177,7 +177,7 @@ document.
no longer maintained and may be removed from ACE at any time.
If you want to have support for these environments contact one
of the commercial support organisations. The platforms include:
- DG/UX, VxWorks 5.4, MSVC5/6/7.0, Borland C++ Builder 4 and 5.
+ DG/UX, VxWorks 5.4, MSVC5, Borland C++ Builder 4 and 5.
For up-to-date listings on platform that are deprecated and pending
removal from ACE, please see the NEWS file.
|
@@ -213,10 +213,10 @@ supported by the DOC group, Riverace, OCI or Remedy IT.
ACE (including TAO and CIAO) uses MPC (MakeProjectCreator) to generate
files useful for the build tools (such as GNUmakefiles for UNIX based
-platforms, sln and vcproj files for VC71/vc8 and borland makefiles) on various
+platforms, dsp and dsw files for VC6 and borland makefiles) on various
platforms. To help new users to bootstrap quickly the release bundles
-of ACE (TAO and CIAO) includes GNUmakefiles for UNIX platforms, and VC71/vc8
-solution files. If it is necessary to generate
+of ACE (TAO and CIAO) includes GNUmakefiles for UNIX platforms, VC6
+project files, and VC71 solution files. If it is necessary to generate
files for build tools for other compilers such as Visual Age for IBM,
and Windows CE users have to run MPC themselves to generate the
appropriate files. Please see USAGE, $ACE_ROOT to generate GNUmakefiles. Please use
- $ACE_ROOT/bin/mwc.pl -type vc8 ACE.mwc
+ $ACE_ROOT/bin/mwc.pl -type vc6 ACE.mwc
- to generate VC8 project and solution files. Please use -type
+ to generate VC6 project and workspace files. Please use -type
vc71
to generate VC71 project and solution files.
If you want to build TAO+CIAO and its associated libraries
diff --git a/ACEXML/common/HttpCharStream.cpp b/ACEXML/common/HttpCharStream.cpp
index b6f5e6aa423..731676d7f94 100644
--- a/ACEXML/common/HttpCharStream.cpp
+++ b/ACEXML/common/HttpCharStream.cpp
@@ -251,7 +251,7 @@ ACEXML_HttpCharStream::get_url (size_t& len)
int
ACEXML_HttpCharStream::send_request (void)
{
- char* path = ACE::strnew (ACE_TEXT_ALWAYS_CHAR (this->url_addr_->get_path_name()));
+ char* path = ACE::strnew (ACE_TEXT_TO_CHAR_IN (this->url_addr_->get_path_name()));
ACE_Auto_Basic_Array_Ptr path_ptr (path);
size_t commandsize = ACE_OS::strlen (path)
+ ACE_OS::strlen (this->url_addr_->get_host_name ())
@@ -382,7 +382,7 @@ ACEXML_HttpCharStream::read (ACEXML_Char *str,
return -1;
len = len * sizeof (ACEXML_Char);
char* temp = const_cast (this->stream_->recv (len));
- str = ACE_TEXT_CHAR_TO_TCHAR (temp);
+ ACE_OS::string_copy( str, temp, len );
if (str == 0)
return -1;
return static_cast (len);
diff --git a/ACEXML/common/URL_Addr.cpp b/ACEXML/common/URL_Addr.cpp
index b58c916c73f..3bec4ae6ec4 100644
--- a/ACEXML/common/URL_Addr.cpp
+++ b/ACEXML/common/URL_Addr.cpp
@@ -33,7 +33,7 @@ ACEXML_URL_Addr::addr_to_string (ACEXML_Char *s,
else
{
ACE_OS::sprintf (s, ACE_TEXT ("%s:%d/%s"),
- ACE_TEXT_CHAR_TO_TCHAR (ipaddr_format == 0
+ ACE_TEXT_TO_TCHAR_IN (ipaddr_format == 0
? this->get_host_name ()
: this->get_host_addr ()),
this->get_port_number (),
@@ -55,7 +55,7 @@ ACEXML_URL_Addr::addr_to_string (int ipaddr_format)
}
ACE_OS::sprintf (this->addr_string_,
ACE_TEXT ("%s:%d/%s"),
- ACE_TEXT_CHAR_TO_TCHAR (ipaddr_format == 0
+ ACE_TEXT_TO_TCHAR_IN (ipaddr_format == 0
? this->get_host_name ()
: this->get_host_addr ()),
this->get_port_number (),
@@ -67,7 +67,7 @@ ACEXML_URL_Addr::addr_to_string (int ipaddr_format)
int
ACEXML_URL_Addr::string_to_addr (const char* s)
{
- return this->string_to_addr (ACE_TEXT_CHAR_TO_TCHAR (s));
+ return this->string_to_addr (ACE_TEXT_TO_TCHAR_IN (s));
}
#endif /* ACE_USES_WCHAR */
diff --git a/ACEXML/common/XML_Types.h b/ACEXML/common/XML_Types.h
index 5a55d6b7754..ed8f170e290 100644
--- a/ACEXML/common/XML_Types.h
+++ b/ACEXML/common/XML_Types.h
@@ -27,17 +27,17 @@
#include "ace/SString.h"
#include "ace/Functor_String.h"
-# if defined (ACE_HAS_WCHAR) && (ACE_SIZEOF_WCHAR == 2)
+# if (ACE_SIZEOF_WCHAR == 2)
typedef wchar_t ACEXML_UTF16;
# else
typedef ACE_USHORT16 ACEXML_UTF16;
-# endif /* ACE_HAS_WCHAR && ACE_SIZEOF_WCHAR == 2 */
+# endif /* ACE_SIZEOF_WCHAR == 2 */
-# if defined (ACE_HAS_WCHAR) && (ACE_SIZEOF_WCHAR == 4)
+# if (ACE_SIZEOF_WCHAR == 4)
typedef wchar_t ACEXML_UCS4;
# else
typedef ACE_UINT32 ACEXML_UCS4;
-# endif /* ACE_HAS_WCHAR && ACE_SIZEOF_WCHAR == 4 */
+# endif /* ACE_SIZEOF_WCHAR == 4 */
typedef char ACEXML_UTF8;
diff --git a/ACEXML/examples/SAXPrint/main.cpp b/ACEXML/examples/SAXPrint/main.cpp
index f6f334cee0e..f5eb2625125 100644
--- a/ACEXML/examples/SAXPrint/main.cpp
+++ b/ACEXML/examples/SAXPrint/main.cpp
@@ -37,7 +37,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
int zip = 0;
ACEXML_Char* url = 0;
- ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("sf:lu:z"));
+ ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("sf:lu:z"));
int c;
while ((c = get_opt ()) != EOF)
diff --git a/ASNMP/agent/main.cpp b/ASNMP/agent/main.cpp
index ff0c9431518..c47d0da0ce9 100644
--- a/ASNMP/agent/main.cpp
+++ b/ASNMP/agent/main.cpp
@@ -9,13 +9,13 @@
ACE_RCSID(agent, main, "$Id$")
-int
-main (int argc, char *argv[])
+int
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
ACE::init ();
snmp_agent the_agent;
- if (the_agent.set_args(argc, argv))
+ if (the_agent.set_args(argc, argv))
return 1;
if (!the_agent.valid()) {
diff --git a/ASNMP/agent/snmp_agent.cpp b/ASNMP/agent/snmp_agent.cpp
index 520c58eaccf..0ed8285b373 100644
--- a/ASNMP/agent/snmp_agent.cpp
+++ b/ASNMP/agent/snmp_agent.cpp
@@ -41,7 +41,7 @@ int snmp_agent::set_args(int argc, char *argv[])
const ACE_TCHAR *wr = WR_COM;
ACE_Argv_Type_Converter to_tchar (argc, argv);
- ACE_Get_Opt get_opt
+ ACE_Get_Arg_Opt get_opt
(argc, to_tchar.get_TCHAR_argv (), ACE_TEXT ("p:w:r:hv"));
for (int c; (c = get_opt ()) != -1; ) {
switch (c)
@@ -71,8 +71,8 @@ int snmp_agent::set_args(int argc, char *argv[])
agent_ = new agent_impl(port,
- ACE_TEXT_ALWAYS_CHAR (rd),
- ACE_TEXT_ALWAYS_CHAR (wr)); // opens OS IO port
+ ACE_TEXT_TO_CHAR_IN (rd),
+ ACE_TEXT_TO_CHAR_IN (wr)); // opens OS IO port
return 0;
}
diff --git a/ASNMP/asnmp/sagent.cpp b/ASNMP/asnmp/sagent.cpp
index 8ee2fdb5b8d..70fef1fc5bd 100644
--- a/ASNMP/asnmp/sagent.cpp
+++ b/ASNMP/asnmp/sagent.cpp
@@ -55,7 +55,7 @@ int sagent::handle_input(ACE_HANDLE fd)
const ACE_INET_Addr &ta = tr.get_from_addr();
ACE_TCHAR buf_tmp[MAXHOSTNAMELEN + 1];
ta.addr_to_string (buf_tmp, MAXHOSTNAMELEN);
- UdpAddress ra (ACE_TEXT_ALWAYS_CHAR (buf_tmp));
+ UdpAddress ra (ACE_TEXT_TO_CHAR_IN (buf_tmp));
tgt_.set_address(ra);
diff --git a/ASNMP/examples/get/get.cpp b/ASNMP/examples/get/get.cpp
index ff6fcb9681f..a633059a08c 100644
--- a/ASNMP/examples/get/get.cpp
+++ b/ASNMP/examples/get/get.cpp
@@ -67,7 +67,7 @@ class getapp {
// main entry point
-int main( int argc, char *argv[])
+int ACE_TMAIN( int argc, ACE_TCHAR *argv[])
{
getapp get(argc, argv);
if (get.valid())
@@ -95,22 +95,22 @@ getapp::getapp(int argc, char *argv[]): valid_(0)
}
ACE_Argv_Type_Converter to_tchar (argc, argv);
- ACE_Get_Opt get_opt (argc,
- to_tchar.get_TCHAR_argv (),
- ACE_TEXT ("o:c:r:t:p:"));
+ ACE_Get_Arg_Opt get_opt (argc,
+ to_tchar.get_TCHAR_argv (),
+ ACE_TEXT ("o:c:r:t:p:"));
for (int c; (c = get_opt ()) != -1; )
switch (c)
{
case 'o':
- req = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+ req = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
if (req.valid() == 0)
cout << "ERROR: oid value: "
- << ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg())
+ << ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg())
<< "is not valid. using default.\n";
break;
case 'c':
- community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+ community_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
target_.set_read_community(community_);
break;
diff --git a/ASNMP/examples/get/get_async.cpp b/ASNMP/examples/get/get_async.cpp
index 8217ffabac1..ee9c9791d39 100644
--- a/ASNMP/examples/get/get_async.cpp
+++ b/ASNMP/examples/get/get_async.cpp
@@ -67,7 +67,7 @@ class getapp : public Snmp_Result {
// main entry point
-int main( int argc, char *argv[])
+int ACE_TMAIN( int argc, ACE_TCHAR *argv[])
{
getapp get(argc, argv);
if (get.valid())
@@ -95,22 +95,22 @@ getapp::getapp(int argc, char *argv[]): valid_(0)
}
ACE_Argv_Type_Converter to_tchar (argc, argv);
- ACE_Get_Opt get_opt (argc,
- to_tchar.get_TCHAR_argv (),
- ACE_TEXT ("o:c:r:t:p:"));
+ ACE_Get_Arg_Opt get_opt (argc,
+ to_tchar.get_TCHAR_argv (),
+ ACE_TEXT ("o:c:r:t:p:"));
for (int c; (c = get_opt ()) != -1; )
switch (c)
{
case 'o':
- req = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+ req = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
if (req.valid() == 0)
cout << "ERROR: oid value: "
- << ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg())
+ << ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg())
<< "is not valid. using default.\n";
break;
case 'c':
- community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+ community_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
target_.set_read_community(community_);
break;
diff --git a/ASNMP/examples/next/next.cpp b/ASNMP/examples/next/next.cpp
index 7a9a2208ca2..0ec2a7fc945 100644
--- a/ASNMP/examples/next/next.cpp
+++ b/ASNMP/examples/next/next.cpp
@@ -66,7 +66,7 @@ class nextapp {
// main entry point
-int main( int argc, char *argv[])
+int ACE_TMAIN( int argc, ACE_TCHAR *argv[])
{
nextapp get(argc, argv);
if (get.valid())
@@ -94,22 +94,22 @@ nextapp::nextapp(int argc, char *argv[]): valid_(0)
}
ACE_Argv_Type_Converter to_tchar (argc, argv);
- ACE_Get_Opt get_opt (argc,
- to_tchar.get_TCHAR_argv (),
- ACE_TEXT ("o:c:r:t:"));
+ ACE_Get_Arg_Opt get_opt (argc,
+ to_tchar.get_TCHAR_argv (),
+ ACE_TEXT ("o:c:r:t:"));
for (int c; (c = get_opt ()) != -1; )
switch (c)
{
case 'o':
- req = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+ req = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
if (req.valid() == 0)
cout << "ERROR: oid value: "
- << ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg())
+ << ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg())
<< "is not valid. using default.\n";
break;
case 'c':
- community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+ community_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
target_.set_read_community(community_);
break;
diff --git a/ASNMP/examples/set/set.cpp b/ASNMP/examples/set/set.cpp
index 39eb447f9a7..938a385c4e2 100644
--- a/ASNMP/examples/set/set.cpp
+++ b/ASNMP/examples/set/set.cpp
@@ -66,7 +66,7 @@ class set {
// main entry point
-int main( int argc, char *argv[])
+int ACE_TMAIN( int argc, ACE_TCHAR *argv[])
{
set get(argc, argv);
if (get.valid())
@@ -97,22 +97,22 @@ set::set(int argc, char *argv[]): valid_(0)
}
ACE_Argv_Type_Converter to_tchar (argc, argv);
- ACE_Get_Opt get_opt (argc,
- to_tchar.get_TCHAR_argv (),
- ACE_TEXT ("o:c:r:t:I:U:C:G:T:O:S:P:"));
+ ACE_Get_Arg_Opt get_opt (argc,
+ to_tchar.get_TCHAR_argv (),
+ ACE_TEXT ("o:c:r:t:I:U:C:G:T:O:S:P:"));
for (int c; (c = get_opt ()) != -1; )
switch (c)
{
case 'o':
- req = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+ req = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
if (req.valid() == 0)
cout << "ERROR: oid value: "
- << ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg())
+ << ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg())
<< "is not valid. using default.\n";
break;
case 'c':
- community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+ community_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
target_.set_write_community(community_);
break;
@@ -166,14 +166,14 @@ set::set(int argc, char *argv[]): valid_(0)
case 'O': // Oid as a variable identifier
{
- oid_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+ oid_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
vb.set_oid(oid_); // when value is set, pdu updated
}
break;
case 'S': // Octet String
{
- OctetStr o(ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()));
+ OctetStr o(ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()));
vb.set_value(o); // set the Oid portion of the Vb
pdu_ += vb;
}
@@ -181,7 +181,7 @@ set::set(int argc, char *argv[]): valid_(0)
case 'P': // Oid String as a value
{
- Oid o(ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()));
+ Oid o(ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()));
vb.set_value(o); // set the Oid portion of the Vb
pdu_ += vb;
}
diff --git a/ASNMP/examples/trap/trap.cpp b/ASNMP/examples/trap/trap.cpp
index 59d4f9f25bc..bfba5d3552e 100644
--- a/ASNMP/examples/trap/trap.cpp
+++ b/ASNMP/examples/trap/trap.cpp
@@ -68,7 +68,7 @@ class trapapp {
// main entry point
-int main( int argc, char *argv[])
+int ACE_TMAIN( int argc, ACE_TCHAR *argv[])
{
trapapp get(argc, argv);
if (get.valid())
@@ -98,23 +98,23 @@ trapapp::trapapp(int argc, char *argv[]): valid_(0)
}
ACE_Argv_Type_Converter to_tchar (argc, argv);
- ACE_Get_Opt get_opt (argc,
- to_tchar.get_TCHAR_argv (),
- ACE_TEXT ("c:e:t:"));
+ ACE_Get_Arg_Opt get_opt (argc,
+ to_tchar.get_TCHAR_argv (),
+ ACE_TEXT ("c:e:t:"));
for (int c; (c = get_opt ()) != -1; )
switch (c)
{
case 'c': // community string
- community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+ community_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
target_.set_read_community(community_);
break;
case 'e': // trap oid to send
- ent = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+ ent = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
break;
case 't': // trap oid
- trap = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+ trap = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
break;;
default:
diff --git a/ASNMP/examples/walk/walk.cpp b/ASNMP/examples/walk/walk.cpp
index 56fc112fd71..75d62fa66f7 100644
--- a/ASNMP/examples/walk/walk.cpp
+++ b/ASNMP/examples/walk/walk.cpp
@@ -65,7 +65,7 @@ class walkapp {
// main entry point
-int main( int argc, char *argv[])
+int ACE_TMAIN( int argc, ACE_TCHAR *argv[])
{
walkapp get(argc, argv);
if (get.valid())
@@ -94,22 +94,22 @@ walkapp::walkapp(int argc, char *argv[]): valid_(0)
}
ACE_Argv_Type_Converter to_tchar (argc, argv);
- ACE_Get_Opt get_opt (argc,
- to_tchar.get_TCHAR_argv (),
- ACE_TEXT ("o:c:r:t:"));
+ ACE_Get_Arg_Opt get_opt (argc,
+ to_tchar.get_TCHAR_argv (),
+ ACE_TEXT ("o:c:r:t:"));
for (int c; (c = get_opt ()) != -1; )
switch (c)
{
case 'o':
- req = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+ req = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
if (req.valid() == 0)
cout << "ERROR: oid value: "
- << ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg())
+ << ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg())
<< "is not valid. using default.\n";
break;
case 'c':
- community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+ community_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
target_.set_read_community(community_);
break;
diff --git a/ASNMP/tests/test_config.h b/ASNMP/tests/test_config.h
index 887fa5cec8a..cd416bafdff 100644
--- a/ASNMP/tests/test_config.h
+++ b/ASNMP/tests/test_config.h
@@ -99,8 +99,8 @@ do {\
#define ACE_INIT_LOG(NAME) \
char temp[BUFSIZ]; \
ACE_OS::sprintf (temp, "%s%s%s", \
- ACE_TEXT_ALWAYS_CHAR (ACE_LOG_DIRECTORY), \
- ACE_TEXT_ALWAYS_CHAR (ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR)), \
+ ACE_TEXT_TO_CHAR_IN (ACE_LOG_DIRECTORY), \
+ ACE_TEXT_TO_CHAR_IN (ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR)), \
".log"); \
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Deleting old log file %C (if any)\n\n"), temp)); \
ACE_OS::unlink (temp);
@@ -146,8 +146,8 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
// Ignore the error value since the directory may already exist.
ACE_OS::mkdir (ACE_LOG_DIRECTORY);
ACE_OS::sprintf (temp, "%s%s%s",
- ACE_TEXT_ALWAYS_CHAR (ACE_LOG_DIRECTORY),
- ACE_TEXT_ALWAYS_CHAR (ACE::basename (filename, ACE_DIRECTORY_SEPARATOR_CHAR)),
+ ACE_TEXT_TO_CHAR_IN (ACE_LOG_DIRECTORY),
+ ACE_TEXT_TO_CHAR_IN (ACE::basename (filename, ACE_DIRECTORY_SEPARATOR_CHAR)),
".log");
this->output_file_.open (temp, ios::out | (append ? ios::app : ios::trunc));
diff --git a/ChangeLog b/ChangeLog
index e70e1a75735..9c210d62fb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,106 +1,3 @@
-Wed Apr 26 17:13:57 UTC 2006 Phil Mesnier
-
- * bin/tao_orb_tests.lst:
- Added test for Parallel_Connect_Strategy. This test will take
- about 9 minutes to run to completion.
-
-Wed Apr 26 14:22:31 UTC 2006 Phil Mesnier
-
- * bin/tao_orb_tests.lst:
- Added tests for new POA features.
-
- * bin/MakeProjectCreator/config/endpointpolicy.mpb:
- Applications wishing to use the TAO EndpointPolicy should add
- this base project to their MPC files. This will include
- libTAO_EndpointPolicy in their link lines.
-
-Wed Apr 26 14:10:12 UTC 2006 Johnny Willemsen
-
- * include/makeinclude/platform_hpux_kcc.GNU:
- * include/makeinclude/platform_irix6.x_kcc.GNU:
- * include/makeinclude/platform_linux_kcc.GNU:
- * include/makeinclude/platform_osf1_4.x_kcc.GNU:
- * include/makeinclude/platform_sunos5_kcc.GNU:
- * include/makeinclude/platform_tru64_kcc.GNU:
- Removed these files which are for the KAI C++ compiler. This
- compiler doesn't exist anymore and full support for KAI C++
- has been removed now from ACE/TAO. See bugzilla bug 2007
-
-Wed Apr 26 13:03:12 UTC 2006 Johnny Willemsen
-
- * bin/tao_orb_tests.lst:
- Added TAO/tests/POA/Bug_2511_Regression
-
-Wed Apr 26 12:52:12 UTC 2006 Johnny Willemsen
-
- * ace/Process_Manager.cpp:
- Fixed fuzz errors and use const when possible
-
-Wed Apr 26 12:02:12 UTC 2006 Johnny Willemsen
-
- * tests/CDR_Test.cpp:
- Boolean is now size 1 or bigger, the marshaling code will take
- care that a Boolean is marshaled as octet of size 1
-
-Wed Apr 26 11:28:28 UTC 2006 Phil Mesnier
-
- * bin/tao_orb_tests.lst:
- Added TAO/tests/OBV/truncatable.
-
-Wed Apr 26 10:05:12 UTC 2006 Johnny Willemsen
-
- * bin/tao_orb_tests.lst:
- Added TAO/tests/OBV
-
-Wed Apr 26 09:56:12 UTC 2006 Johnny Willemsen
-
- * bin/tao_orb_tests.lst:
- Added TAO/tests/Portable_Interceptors/Bug_2510_Regression
-
-Wed Apr 26 07:21:12 UTC 2006 Johnny Willemsen
-
- * include/makeinclude/platform_vxworks5.5.x.GNU:
- Increased template-depth to 50, hopefully this is large enough to
- also build CIAO
-
-Tue Apr 25 16:44:04 UTC 2006 Phil Mesnier
-
- * ace/CDR_Stream.h:
- * ace/CDR_Stream.cpp:
- Added code to support rewinding the output CDR to some previous
- location and updating a value there. This is required to support
- marshaling offset values were the target of the offset is not
- known until the final offset target is actually reached.
-
-Tue Apr 25 13:50:12 UTC 2006 Martin Corino
-
- * tests/Signal_Test.cpp:
- Fixed this test for (modern) Linux and Solaris at least.
- The crux is blocking signals before calling sigwait() when doing
- synchronous signal handling.
-
-Tue Apr 25 09:35:12 UTC 2006 Johnny Willemsen
-
- * ace/Base_Thread_Adapter.h:
- * ace/Cleanup.h:
- Fixed some errors I made
-
-Tue Apr 25 09:23:12 UTC 2006 Johnny Willemsen
-
- * ACE-INSTALL.html:
- Updated supported platforms and use vc8 for the MPC examples
-
-Tue Apr 25 08:49:12 UTC 2006 Johnny Willemsen
-
- * ace/CDR_Base.h:
- Always use bool for Boolean, see bugzilla 2514 for more info
-
-Tue Apr 25 06:33:12 UTC 2006 Johnny Willemsen
-
- * ace/Log_Msg.h:
- Put back ACE_TSS_CLEANUP_NAME that got lost by accident with the
- vc6 cleanup. Thanks to Olli Savia for reporting this.
-
Mon Apr 24 17:39:12 UTC 2006 Johnny Willemsen
* tests/run_test.lst:
diff --git a/Kokyu/tests/EDF/test.cpp b/Kokyu/tests/EDF/test.cpp
index 0c6939ee613..b6bbe66a35c 100644
--- a/Kokyu/tests/EDF/test.cpp
+++ b/Kokyu/tests/EDF/test.cpp
@@ -145,7 +145,7 @@ int parse_args (int argc, ACE_TCHAR *argv[])
switch (c)
{
case 'p':
- sched_policy_str = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ());
+ sched_policy_str = ACE_TEXT_TO_CHAR_IN(get_opts.opt_arg ());
break;
case '?':
diff --git a/Kokyu/tests/FIFO/test.cpp b/Kokyu/tests/FIFO/test.cpp
index deb25823a3b..fcda380ded6 100644
--- a/Kokyu/tests/FIFO/test.cpp
+++ b/Kokyu/tests/FIFO/test.cpp
@@ -149,7 +149,7 @@ int parse_args (int argc, ACE_TCHAR *argv[])
switch (c)
{
case 'p':
- sched_policy_str = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ());
+ sched_policy_str = ACE_TEXT_TO_CHAR_IN(get_opts.opt_arg ());
break;
case '?':
diff --git a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp
index 633697c0641..73348aca4eb 100644
--- a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp
+++ b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp
@@ -30,7 +30,7 @@ using namespace CCF::CIDL;
using namespace CCF::CIDL::SemanticGraph;
int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
{
try
{
diff --git a/TAO/CIAO/CIDLC/cidlc.cpp b/TAO/CIAO/CIDLC/cidlc.cpp
index 1afeb08b859..d3a1ed91885 100644
--- a/TAO/CIAO/CIDLC/cidlc.cpp
+++ b/TAO/CIAO/CIDLC/cidlc.cpp
@@ -78,7 +78,7 @@ using namespace CCF::CIDL;
using namespace CCF::CIDL::SemanticGraph;
int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
{
try
{
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 14610139336..76e0c4ecf02 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,82 +1,1276 @@
-Wed Apr 26 13:10:12 UTC 2006 Johnny Willemsen
+Tue Apr 11 12:39:14 UTC 2006 Johnny Willemsen
- * tools/Config_Handlers/DP_Handler.cpp:
- * tools/Config_Handlers/XML_File_Intf.cpp:
- * tools/Config_Handlers/Package_Handlers/PC_Intf.cpp:
- * tools/Config_Handlers/XSCRT/XMLSchema.hpp:
- * tools/Config_Handlers/XSCRT/Elements.hpp:
- * tools/Config_Handlers/XSCRT/XML.hpp:
- Removed workarounds for vc6 again
+ * tools/Config_Handlers/Utils/Utils.mpc:
+ Use exceptions as base project
- * tools/Config_Handlers/Package_Handlers/NIA_Handler.h:
- Added missing post.h
+Tue Apr 11 12:43:14 UTC 2006 Johnny Willemsen
- * tools/Config_Handlers/Package_Handlers/CPD_Handler.h:
- * tools/Config_Handlers/Package_Handlers/PC_Intf.h:
- Fixed incorrect file tags
+ * ciao/Container_Base.cpp:
+ Small simplification
-Wed Apr 26 08:46:12 UTC 2006 Johnny Willemsen
+Tue Apr 11 12:22:14 UTC 2006 Johnny Willemsen
- * DAnCE/TargetManager/DomainDataManager.h:
- Fixed compile problem in gcc4 build
+ * tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc:
+ * tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc:
+ Updated base projects to get correct build order
-Tue Apr 25 21:27:05 UTC 2006 William R. Otte
+Tue Apr 11 08:43:14 UTC 2006 Johnny Willemsen
- * DAnCE/TargetManager/TargetManager.mpc
+ * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp:
+ Initialise pointers with 0
- Linking problems for Borland.
+Tue Apr 11 06:54:14 UTC 2006 Johnny Willemsen
- * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
- * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
+ * tests/Minimum/Minimum_Base/Minimum.mpc:
+ * tests/IDL3/Lookup/lookup_test.mpc:
+ * tests/IDL3/ImpliedIDL/Homes/Homes.mpc:
+ * tests/IDL3/ImpliedIDL/Events/Events.mpc:
+ * tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc:
+ * tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc:
+ * tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc:
+ * tests/IDL3/Homes/Inheritance/Inheritance.mpc:
+ * tests/IDL3/Homes/Finder/Finder.mpc:
+ * tests/IDL3/Homes/Factory/Factory.mpc:
+ * tests/IDL3/Homes/Basic/Basic.mpc:
+ * tests/IDL3/Homes/Attributes/HomeAttributes.mpc:
+ * tests/IDL3/Events/Regular/Regular.mpc:
+ * tests/IDL3/Events/Abstract/Abstract.mpc:
+ * tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc:
+ * tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc:
+ * tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc:
+ * tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc:
+ * tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc:
+ * tests/CIDL/CodeGen/CodeGen.mpc:
+ * tests/Bug_2130_Regression/interfaces/ENW.mpc:
+ * performance-tests/Protocols/common/Protocols.mpc:
+ * examples/Swapping/Hello_Base/Hello_Base.mpc:
+ * examples/Hello/Hello_Base/Hello_Base.mpc:
+ * examples/Display/HUDisplay.mpc:
+ * examples/BasicSP/BasicSP.mpc:
+ * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc:
+ Updated base projects to get correct build order
+
+Tue Apr 11 06:35:14 UTC 2006 Johnny Willemsen
+
+ * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc:
+ Use base projects to set dependencies
+
+Mon Apr 10 18:48:14 UTC 2006 Johnny Willemsen
+
+ * DAnCE/NodeApplication/NodeApplication.mpc:
+ Fixed base project
+
+Mon Apr 10 14:29:13 UTC 2006 Gan Deng
+
+ * TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
+
+ Modified to make _narrow to be called at the first step
+ when connecting supplier and config. Also modified to
+ make debug statements debug_level controlled.
+
+Mon Apr 10 12:31:14 UTC 2006 Johnny Willemsen
+
+ * ciao/CCM_Core.mpc:
+ Removed commented out line
+
+ * DAnCE/ExecutionManager/ExecutionManager.mpc:
+ * DAnCE/NodeApplication/NodeApplication.mpc:
+ * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc:
+ * DAnCE/NodeManager/NodeManager.mpc:
+ * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc:
+ Updated base projects
+
+Mon Apr 10 11:51:14 UTC 2006 Johnny Willemsen
+
+ * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc:
+ Readded ciao_container_dnc
+
+ * ciao/CCM_Core.mpc:
+ Use more base projects
+
+ * DAnCE/Interfaces/Interfaces.mpc:
+ * DAnCE/ExecutionManager/ExecutionManager.mpc:
+ Use other base projects to get correct build order
+
+Mon Apr 10 10:00:14 UTC 2006 Johnny Willemsen
+
+ * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc:
+ Removed ciao_container_dnc
+
+Mon Apr 10 09:38:14 UTC 2006 Johnny Willemsen
+
+ * ciaosvcs/Events/CIAO_Events.mpc:
+ Use ciao_rtevent_dnc as base
+
+Mon Apr 10 09:18:14 UTC 2006 Johnny Willemsen
+
+ * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc:
+ * ciaosvcs/Events/CIAO_Events.mpc:
+ Use ciao_events_base_dnc as base project
+
+Mon Apr 10 09:15:14 UTC 2006 Johnny Willemsen
+
+ * ciao/CCM_Core.mpc:
+ For Deployment_Stub use ciao_events_base_dnc and ciao_client_dnc
+ as base projects
+
+Mon Apr 10 08:50:14 UTC 2006 Johnny Willemsen
+
+ * ciaosvcs/Events/CIAO_Events.mpc:
+ Removed ciao_events_dnc as base project, we are building
+ this lib right now
+
+ * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc:
+ Use base projects instead of libs
+
+ * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc:
+ Remvoed ciao_events_dnc
+
+Sat Apr 8 15:39:14 UTC 2006 Gan Deng
+
+ * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
+
+ Fixed a linking error in SuSE_CP_Static build.
+
+Fri Apr 7 04:09:33 UTC 2006 Gan Deng
+
+ * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+ * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
+
+ Fixed a bug in detecting External connection and Internal
+ connections. Earlier when an external component is detected,
+ not *all* connections associated with this components are
+ purged from the to-be-removed connections list. Added another
+ helper method to accomplish this task.
+
+ Modified to enforce passivation occured on all components
+ before any connections are removed.
+
+Fri Apr 7 03:55:46 UTC 2006 Gan Deng
+
+ * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+
+ Fixed a bug when redeploying components using the same set
+ of NodeManagers. Earlier when destroying applications or
+ components, internal components and external/shared components
+ are not all unbinded from the map, which causes duplicate
+ instance exception thrown.
+
+Thu Apr 6 16:01:30 UTC 2006 Jeff Parsons
+
+ * CCF/CCF/CompilerElements/TokenStream.hpp:
+
+ Added empty virtual destructor to template base class, to
+ eliminate bogus GCC warnings.
- More compile fixes for Borland.
-Tue Apr 25 20:12:25 UTC 2006 William R. Otte
+Thu Apr 6 15:22:31 UTC 2006 Gan Deng
+ * ciaosvcs/Events/CIAO_Events.mpc
+
+ Fixed linking errors on WinXP_BCB6_Pro_Dynamic_Release build.
+
+ * examples/Hello/descriptors_shared_components/deploymentplan.cdp
+ * examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp
+
+ Modified to illustrate the shared components scenario.
+
+Thu Apr 6 14:54:59 UTC 2006 Gan Deng
+
+ * ciaosvcs/Events/CIAO_EventService_Factory_impl.h
+ * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h
+
+ Some cosmestic changes.
+
+Thu Apr 6 08:20:12 UTC 2006 Johnny Willemsen
+
+ * ciao/CCM_Component.idl:
+ Removed the forward declaration of IRObject and just include
+ ciao/CCM_Component.idl. The forward declaration is causing
+ problems with the versioned namespace support, will investigate
+ this later
+
+Wed Apr 5 20:57:32 UTC 2006 Gan Deng
+
+ * TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
+
+ Make debug statement debug_level controlled.
+
+Wed Apr 5 18:49:12 UTC 2006 Johnny Willemsen
+
+ * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp:
+ Fixed compile errors
+
+Wed Apr 5 13:18:12 UTC 2006 Johnny Willemsen
+
+ * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h:
+ Fixed pragma once warning
+
+ * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp:
+ Fixed conversion warning
+
+Wed Apr 5 12:24:12 UTC 2006 Johnny Willemsen
+
+ * tools/Config_Handlers/Basic_Deployment_Data.hpp:
+ Fixed compile errors
+
+Tue Apr 4 18:11:37 UTC 2006 Gan Deng
+
+ * ciaosvcs/Events/CIAO_EventService_Factory_impl.cpp
+ * ciaosvcs/Events/CIAO_EventService_Factory_impl.h
+
+ Fixed an warning in WinXP_BCB6_Pro_Dynamic_Debug build
+ by modifying the name of the original "init" method.
+
+Tue Apr 4 17:27:52 UTC 2006 xiong,ming
+
+ * tools/Config_Handlers/CIAO_Events/test.cpp
+
+ Fixed an warning.
+
+Mon Apr 3 20:00:11 UTC 2006 Jeff Parsons
+
+ * CIDLC/Literals.hpp:
+ * CIDLC/Literals.cpp:
+
+ Changed an enum value 'SIZE' to 'LIT_SIZE' to avoid an
+ apparent conflict with something in WinDef.h on
+ Windows.
+
+Thu Mar 30 18:28:32 UTC 2006 Gan Deng
+
+ * ciao/Deployment_Events.idl
+ * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp
+
+ Fixed fuzz errors.
+
+Thu Mar 30 17:16:17 UTC 2006 Gan Deng
+
+ * ciaosvcs/Events/CIAO_Direct/*
+
+ Removed all files under this directory since they are
+ no longer used.
+
+Thu Mar 30 17:23:12 UTC 2006 Gan Deng
+
+ * tools/Config_Handlers/Config_Handlers.mpc
+
+ Added link dependency to CIAO_Events_Handler project.
+
+Thu Mar 30 16:38:25 UTC 2006 Gan Deng
+
+ * CIAO_DAnCE.mwc
+ * CIAO_TAO.mwc
+ * CIAO_TAO_DAnCE.mwc
+
+ Added "ciaosvcs" into the workspace.
+
+ * ciao/CCM_Core.mpc
+ * ciao/CCM_Event.idl
+ * ciao/Container_Base.cpp
+ * ciao/Container_Base.h
+ * ciao/Deployment_Core.idl
+ * ciao/Deployment_Data.idl
+ * ciao/Deployment_Events.idl
+
+ Added an "CIAO_DnC_Events" project. Enhanced Deployment_Core.idl
+ to support configuring and deploying pub/sub services.
+
+ * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+ * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
+ * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
* DAnCE/NodeApplication/NodeApplication_Impl.cpp
* DAnCE/NodeApplication/NodeApplication_Impl.h
+ * DAnCE/NodeApplication/NodeApplication_Impl.inl
* DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
- * DAnCE/NodeApplicationManager/Containers_Info_Map.h
- * ciao/Deployment_Core.idl
+ * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+
+ Enhanced DAnCE to support pub/sub services integration.
+
+ * ciaosvcs/Events/CIAO_EventService_Factory_impl.cpp
+ * ciaosvcs/Events/CIAO_EventService_Factory_impl.h
+ * ciaosvcs/Events/CIAO_Events.idl
+ * ciaosvcs/Events/CIAO_Events.mpc
+ * ciaosvcs/Events/CIAO_Events_Export.h
+ * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.cpp
+ * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.h
+ * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.idl
+ * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent_Export.h
+ * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp
+ * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h
+ * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl
+ * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
+ * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Export.h
+ * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEVENT_Export.h
+ * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
+ * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h
+ * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.idl
+ * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc
+
+ Added CIAO_Event_Service support, which are some reusable
+ libraries and CORBA services that could be configured and
+ installed on demand through the DAnCE toolchain.
+
+ * docs/schema/Basic_Deployment_Data.xsd
+ * docs/schema/CIAOEvents.xsd
+ * docs/schema/cdp.xsd
+
+ Enhanced XML schema to capture metadata information for
+ configuring and deploying pub/sub services.
+
+ * tools/Config_Handlers/Basic_Deployment_Data.cpp
+ * tools/Config_Handlers/Basic_Deployment_Data.hpp
+ * tools/Config_Handlers/CPD_Handler.cpp
+ * tools/Config_Handlers/Config_Handlers.mpc
+ * tools/Config_Handlers/DP_Handler.cpp
+ * tools/Config_Handlers/ESD_Handler.cpp
+ * tools/Config_Handlers/ESD_Handler.h
+ * tools/Config_Handlers/PSPE_Handler.cpp
+ * tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp
+ * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
+ * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp
+ * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h
+ * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc
+ * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers_Export.h
+ * tools/Config_Handlers/CIAO_Events/test.cpp
+
+ Added config handler support to accomodate the above changes.
+
+ * examples/Hello/descriptors_events/ciao-events-example-with-filters.ced
+ * examples/Hello/descriptors_events/ciao-events-example.ced
+ * examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp
+ * examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp
+
+ Added several examples to showcase the capability of CIAO
+ pub/sub services.
+
+Thu Mar 30 14:43:46 UTC 2006 Jeff Parsons
+
+ * CIDLC/AttributeSourceEmitters_T.hpp:
+
+ Added 'using namespace StringLiterals;' to this file. Thanks
+ to Nanbor Wang for pointing out that
+ this line is also necessary on some platforms, in addition
+ to the change of
+
+ Wed Mar 29 20:29:40 UTC 2006 Jeff Parsons
+
+Wed Mar 29 20:29:40 UTC 2006 Jeff Parsons
+
+ * CIDLC/AttributeSourceEmitters_T.hpp:
+
+ Added #include of Literals.hpp. Some platforms are picking up
+ the declarations in this file without the explicit include,
+ others are not.
+
+Wed Mar 29 19:52:54 UTC 2006 Nanbor Wang
+
+ * examples/Hello/descriptors_RTCCM/rt-config-example.csr:
+ Updated and element with more realistic
+ values.
+
+Wed Mar 29 04:40:58 UTC 2006 Gan Deng
+
+ * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+
+ Added the functionality to honor command line arguments
+ and service configuration file options defined through
+ RT-CCM descriptors.
+
+Mon Mar 27 19:56:51 UTC 2006 Nanbor Wang
+
+ * DAnCE/NodeApplication/NodeApplication.cpp (main): Added code to
+ print out commandline options of the NodeApplicaion. The print
+ out is available for CIAO_DEBUG_LEVEL > 9.
+
+ * DAnCE/NodeApplication/Configuration_Factory.h:
+ * DAnCE/NodeApplication/Configuration_Factory.cpp: Changed
+ parse_args function to pass "argc" as reference to be consistent
+ with Arg_Shifter's signature.
+
+ Double-check the "-o" flag first with exact string comparison
+ before extracting the parameter to avoid mistaking any of the
+ "-ORBxxx" command line flags as the "-o" flag. Thanks to Sandro
+ Andrade for reporting the bug.
+
+Mon Mar 20 22:35:47 UTC 2006 Jeff Parsons
+
+ * ciao/Servant_Impl_Utils_T.cpp:
+
+ - Added 'typename' qualifier when declaring instances
+ of an iterator for a templatized hash map, since gcc
+ reminds us that leaving the compiler to implicitly
+ determine if the scoped name denotes a member or a
+ type is deprecated.
+
+ - Added an #include of Cookies.h, which is need by compilers
+ that don't require the template sourced to be included in
+ the header file.
+
+Sun Mar 19 20:37:47 UTC 2006 Jeff Parsons
+
+ * CIDLC/TypeNameEmitter.cpp:
+ * CIDLC/TypeNameEmitter.hpp:
+
+ Removed these files, their former contents are now divided
+ between CorbaTypenameEmitters.{hpp,cpp} and
+ UtilityTypeNameEmitters.{hpp,cpp}.
+
+Fri Mar 17 14:23:53 UTC 2006 Jeff Parsons
+
+ * ciao/CCM_Core.mpc:
+ * ciao/Servant_Impl_Base.cpp:
+ * ciao/Servant_Impl_Base.h
+
+ - Changed port table types from
+ ACE_Hash_Map_Manager_Ex<> to ACE_Array_Map<>,
+ which is more lightweight and makes no
+ allocations if no entries are added to
+ the table.
+
+ - Implemented spec-defined methods
+ get_all_receptacles(), get_all_publishers(),
+ and disconnect_consumer().
+
+ * ciao/Servant_Impl_Utils_T.cpp:
+
+ New file, containing implementations of new
+ static template methods added to class
+ Servant_Impl_Base, which are called in
+ generated code as part of the implementation
+ of the spec-defined methods mentioned above.
+
+ * CIDLC/AttributeHeaderEmitters.cpp:
+ * CIDLC/AttributeHeaderEmitters.hpp:
+ * CIDLC/AttributeSourceEmitters_T.hpp:
+ * CIDLC/CompositionEmitter.cpp:
+ * CIDLC/CompositionEmitter.hpp:
+ * CIDLC/CorbaTypeNameEmitters.cpp:
+ * CIDLC/CorbaTypeNameEmitters.hpp:
+ * CIDLC/EmitterBase.cpp:
+ * CIDLC/EmitterBase.hpp:
+ * CIDLC/EmitterContext.cpp:
+ * CIDLC/EmitterContext.hpp:
+ * CIDLC/InterfaceEmitter.cpp:
+ * CIDLC/InterfaceEmitter.hpp:
+ * CIDLC/ModuleEmitter.cpp:
+ * CIDLC/ModuleEmitter.hpp:
+ * CIDLC/OperationHeaderEmitters.cpp:
+ * CIDLC/OperationHeaderEmitters.hpp:
+ * CIDLC/ParameterEmitter_T.hpp:
+ * CIDLC/Upcase.hpp:
+ * CIDLC/UtilityTypeNameEmitters.cpp:
+ * CIDLC/UtilityTypeNameEmitters.hpp:
+
+ New files, containing common code factored
+ out of the C++ source files below.
+
+ * CIDLC/CIDLC.mpc:
+ * CIDLC/DescriptorGenerator.cpp:
+ * CIDLC/ExecImplHeaderGenerator.cpp:
+ * CIDLC/ExecImplSourceGenerator.cpp:
+ * CIDLC/ExecutorMappingGenerator.cpp:
+ * CIDLC/Literals.cpp:
+ * CIDLC/Literals.hpp:
+ * CIDLC/ServantHeaderGenerator.cpp:
+ * CIDLC/ServantSourceGenerator.cpp:
+
+ - Added new generated code as part of the
+ implementation of the spec-defined methods
+ mentioned above.
+
+ - Added support for attribute exceptions in
+ code optionally generated for the stencil
+ executor implementation classes.
+
+Thu Mar 16 16:31:51 UTC 2006 Jeff Parsons
+
+ * ciao/CCM_Component.idl:
+
+ Added "omg.org" prefix to the recently added opening of the
+ CORBA module in this file.
+
+Tue Mar 14 10:10:58 UTC 2006 Nilabja Roy
+
+ * DAnCE/NodeManager/MonitorController.h:
+ Reverting back to previous version to avoid conflicts
+
+Tue Mar 14 09:46:25 UTC 2006 Nilabja Roy
+
+ * DAnCE/NodeManager/MonitorController.cpp:
+ Reverting back to previous version. Mistakenly added conflicted version.
+
+Thu Mar 9 09:18:58 2006 Douglas C. Schmidt
+
+ * COPYING: Updated the date to include 2006.
+ Thanks to Alan Kierstead for
+ motivating the fix to this oversight.
+
+Thu Mar 09 08:55:12 UTC 2006 Johnny Willemsen
+
+ * DAnCE/Interfaces/ExecutionManagerDaemon.idl:
+ * DAnCE/Interfaces/NodeManagerDaemon.idl:
+ New idl files, these are the same as there are now in the directory
+ but then just renamed to match the interfaces in these files and
+ then don't conflict with the ones I created in ciao.
+
+ * DAnCE/Interfaces/ExecutionManager.idl:
+ * DAnCE/Interfaces/NodeManager.idl:
+ Removed, file names where not correct and now conflict with files in
+ the ciao directory
+
+ * DAnCE/Interfaces/Interfaces.mpc:
+ Updated because of file renames
+
+ * ciao/CCM_Base.idl:
+ Removed old comment
+
+ * ciao/CCM_Component.idl:
+ Forward declare CORBA::IRObject instead of including the IFR_Client
+ idl file
+
+ * ciao/Deployment_Base.idl:
+ Removed not needed include
+
+ * ciao/Dynamic_Component_Activator.h:
+ Reordered includes
+
+ * ciao/Swapping_Servant_Home_Impl_Base.h:
+ * ciao/Upgradeable_Context_Impl_T.h:
+ * ciao/Swapping_Servant_Home_Impl_T.h:
+ * ciao/Swapping_Servant_Home_Impl_T.cpp:
+ Added ciao/ as prefix for the includes
+
+ * ciao/Upgradeable_Context_Impl_T.h:
+ Added private default constructor
+
+ * ciao/Deployment.idl:
+ * ciao/DomainApplicationManager.idl:
+ * ciao/ExecutionManager.idl:
+ * ciao/NodeApplication_Callback.idl:
+ * ciao/NodeApplicationManager.idl:
+ * ciao/NodeManager.idl:
+ * ciao/RepositoryManager.idl:
+ * ciao/CCM_Core.mpc:
+ Splitted Deployment.idl in multiple files so that the linker
+ can decide not to link in a set of object files we don't need.
+ This will reduce footprint for several applications
+
+ * DAnCE/DomainApplicationManager/Deployment_Configuration.h:
+ * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h:
+ * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
+ * DAnCE/ExecutionManager/Execution_Manager_Impl.h:
+ * DAnCE/ExecutionManager/DAM_Map.cpp:
+ * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
+ * DAnCE/NodeManager/NodeManager_Impl.h:
+ * DAnCE/NodeManager/Node_Manager.cpp:
+ * DAnCE/NodeManager/NodeManager.mpc:
+ * DAnCE/Plan_Launcher/Plan_Launcher_Impl.{h.cpp}:
+ * DAnCE/TargetManager/Deployment_Configuration.h:
+ Updated for the idl subsetting of ciao/Deployment.idl. Also add ciao/
+ prefix to several includes and try to cleanup a little.
+
+ * DAnCE/RepositoryManager/RepositoryManager.idl:
+ * DAnCE/RepositoryManager/RepositoryManagerDaemon.idl:
+ Renamed the first file to the second, matches the interface name.
+
+ * DAnCE/RepositoryManager/RepositoryManager.mpc:
+ * DAnCE/RepositoryManager/RMadmin.cpp:
+ * DAnCE/RepositoryManager/PC_Updater.{h,cpp}:
+ * DAnCE/RepositoryManager/RepositoryManager_Impl.h:
+ * DAnCE/RepositoryManager/RepositoryManager.cpp:
+ Updated because of rename above
+
+ * DAnCE/RTNodeApplication/senv.sh:
+ Removed this file, no need here.
+
+ * DAnCE/RTNodeApplication/NodeApplication_Task.h:
+ No need for virtual inheritance, that consumes more footprint then
+ needed.
+
+ * DAnCE/RTNodeApplication/NodeApplication_Task.cpp:
+ Reordered includes
+
+Wed Mar 08 15:58:12 UTC 2006 Johnny Willemsen
+
+ * ciao/ServerResources.idl:
+ Fixed incorrect file header
+
+Wed Mar 08 14:01:12 UTC 2006 Johnny Willemsen
+
+ * rules.ciao.GNU:
+ Added $(CIAO_ROOT)/ciao to LDFLAGS and $(CIAO) to INCLDIRS
+ as we do in rules.tao.GNU, this improves the footprint stats
+
+Mon Mar 06 16:16:12 UTC 2006 Johnny Willemsen
+
+ * ciao/Swapping_Container.{h,cpp}:
+ Made serial_number_ unsigned and documented why it is static
+
+ * performance-tests/Benchmark/LatencyTest.h:
+ Removed not needed msvc pragma push/pop
+
+Sun Mar 05 11:16:46 2006 Wallace Zhang
+
+ * CIAO version 0.5 released.
+
+Thu Mar 2 17:50:36 UTC 2006 Boris Kolpackov
+
+ * CCF/CCF/IDL2/SemanticGraph/Struct.cpp:
+ * CCF/CCF/IDL2/SemanticGraph/Union.cpp:
+
+ Fixed a bug in the logic that determines completeness of recursive
+ structs and unions.
+
+Thu Mar 2 08:49:12 UTC 2006 Johnny Willemsen
+
+ * DAnCE/NodeApplication/Container_Impl.cpp:
+ Replaced NULL with 0
+
+Thu Mar 2 01:33:09 UTC 2006 Wallace Zhang
+
+ * NEWS:
+
+ Updated this file with info from Ming Xiong and Gan Deng.
+
+Wed Mar 1 22:34:52 UTC 2006 Wallace Zhang
+
+ * NEWS:
+
+ Updated the file with info from Ming Xiong.
+
+Wed Mar 1 19:34:12 UTC 2006 Johnny Willemsen
+
+ * CIAO-INSTALL.html:
+ Updated rename of CIAOTAO.mwc to CIAO_TAO.mwc
+
+Wed Mar 1 15:02:10 UTC 2006 xiong,ming
+
+ * DAnCE/NodeApplication/Container_Impl.h
+ * DAnCE/NodeApplication/Container_Impl.cpp
+
+ Added codes to unregister with naming service when removing
+ components
+
+Tue Feb 28 18:46:42 UTC 2006 William R. Otte
+
+ * DAnCE/Deployment.xsd
+ * DAnCE/Deployment.xsd.orig
+ * DAnCE/XMI.xsd
+ * DAnCE/XMI.xsd.orig
+
+ Removed these schema files. They were misleading and useless.
+
+Fri Feb 24 21:21:02 UTC 2006 xiong,ming
+
+ * tools/Config_Handlers/Config_Handlers.mpc
+
+ Added a verbatim to disable hidden_visibility for Config_Handlers
+
+Fri Feb 24 18:54:52 UTC 2006 Stoyan Paunov
+
+ * DAnCE/RepositoryManager/HTTP_Handler.cpp:
+ * DAnCE/RepositoryManager/RM_Helper.h:
+ * DAnCE/RepositoryManager/RM_Helper.cpp:
+ * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
+ some cosmetic changes
+
+ * DAnCE/RepositoryManager/URL_Parser.h:
+ made the constructor protected and made the ACE_Singleton a friend
+
+ * DAnCE/RepositoryManager/URL_Parser.cpp:
+ fixed a bug and improved the robustness of the code
+
+Fri Feb 24 09:38:12 UTC 2006 Johnny Willemsen
+
+ * CIAO-INSTALL.html:
+ Fixed typo
+
+Thu Feb 23 23:35:59 UTC 2006 Chad Elliott
+
+ * examples/Swapping/Receiver/Receiver.mpc:
+ * examples/Swapping/Sender/Sender.mpc:
+
+ I was over zealous in my previous change. I shortened too many
+ project names (those that are defined in projects outside of these
+ mpc files).
+
+Wed Feb 22 16:38:32 UTC 2006 Chad Elliott
+
+ * CIAO-INSTALL.html:
+
+ Updated the documentation on how to build cidlc on Windows.
+
+ * examples/Swapping/Receiver/Receiver.mpc:
+ * examples/Swapping/Sender/Sender.mpc:
+
+ Shortened the project names in these MPC files to avoid fuzz
+ warnings.
+
+Wed Feb 22 01:11:59 UTC 2006 Gan Deng
+
+ * DAnCE/NodeApplication/Container_Impl.cpp
+
+ Fixed a bug about naming service registration.
+ Thanks Sandro Andrade for reporting
+ a bug about removing component error.
+
+Tue Feb 21 23:59:05 UTC 2006 Gan Deng
+
+ * ciao/Deployment.idl
+
+ Added a parameter to the perform_redeployment() operation
+ to the NodeApplicationManager interface to separate the
+ "installation of new components" from the "removal of
+ existing components".
+
+ * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+
+ Modified the logic of perform_redeployment() functionality
+ to enforce correct order of ReDaC, which is:
+ (1) Install new components,
+ (2) Set up new connections,
+ (3) Remove old connections, and
+ (4) Remove old components.
+
+ * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+ * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
+
+ Fixed a bug about removing components when using ReDaC.
+ In NodeApplicationManager, after the perform_redeployment()
+ call calls the remove_components() method to actually
+ destroy components from the component server, DAnCE NAM doesn't
+ unbind those components from the cached component_map_, hence
+ when the create_connections() method is called afterwords,
+ NAM tries to access the destroyed components to get
+ their port information, which causes the Object_Not_Exist
+ exception thrown.
+
+ The fix will unbind the removed components from the
+ cached component map. However, the trick is that after
+ we unbind these components, the port iinformation of
+ these components are also lost, then the
+ DomainApplicaitonManager could not handle the
+ "removal" of connections correctly.
+
+ The Right Fix is to enforce correct call sequence, which
+ are illustrated above.
+ Thanks Sandro Andrade for reporting
+ a bug about removing component error.
+
+ * DAnCE/NodeApplication/NodeApplication_Impl.h
+ * DAnCE/NodeApplication/NodeApplication_Impl.cpp
+
+ Added a component state map to keep track of component state
+ information. With this map, components will be activated
+ only when they are newly created, and will be passivated
+ only when they are currently active. This will also fix
+ a bug about the component initialization sequence. Earlier,
+ when components are installed, they are immediately activated
+ by explicitly calling ciao_preactivate, ciao_activate, and
+ ciao_postactivate on the comopnent object reference,
+ which is not compliant to the Spec defined semantics.
+ This fix shall ensure that the components are activated AFTER
+ their connections have been setup.
+
+ * DAnCE/NodeApplication/Container_Impl.cpp
+
+ Fixed a bug when passing object reference to a local function.
+ Earlier the memory of the object reference is released by
+ the callee, which causes the object reference becomes invalid
+ after the function returns.
+
+Tue Feb 21 19:43:11 UTC 2006 William R. Otte
+
+ * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
+ * performance-tests/Protocols/Controller/Controller.mpc
+
+ Added avoids+= ace_for_tao to two additional projects.
+
+ * examples/Display/descriptors/EM.ior
+ * examples/Display/descriptors/GPS.ior
+ * examples/Display/descriptors/NavDisplay.ior
+ * examples/Display/descriptors/NavDisplayGUI.ior
+
+ Removed these ior files.
+
+Tue Feb 21 17:40:20 UTC 2006 Nishanth Shankaran
+
+ * DAnCE/NodeManager/MonitorController.cpp:
+
+ Fixed ACE_TRACE compilation error.
+
+Mon Feb 20 15:08:49 2006 Wallace Zhang
+
+ * CIAO version 0.4.10 released.
+
+Mon Feb 20 19:48:12 UTC 2006 xiong,ming
+
+ * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_Impl.ccd
+
+ Removed this file because it is generated
+
+Fri Feb 17 19:22:21 UTC 2006 Wallace Zhang
+
+ * NEWS:
+
+ Updated this file with more inputs.
+
+Thu Feb 16 15:04:12 UTC 2006 Johnny Willemsen
+
+ * CIAO_DAnCE.mwc:
+ Fixed typo in this file
+
+Thu Feb 16 04:14:15 UTC 2006 William R. Otte
+
+ * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
+ * performance-tests/Protocols/Receiver/Receiver.mpc
+ * performance-tests/Protocols/Sender/Sender.mpc
+
+ Disabled building some project when ace_for_tao is set.
+
+Wed Feb 15 19:24:31 UTC 2006 William R. Otte
+
+ * CIAO.mwc
+
+ This file now builds all of CIAO.
+
+ * CIAODAnCE.mwc
+ * CIAO_DAnCE.mwc
+
+ Renamed this file to CIAO_DAnCE.mwc
+
+ * CIAOTAO.mwc
+ * CIAO_TAO.mwc
+
+ Renamed this file to CIAO_TAO.mwc.
+
+ Thanks to Chad Elliott (elliott_c at ociweb dot com) for suggesting
+ these changes.
+
+ * CIAO_TAO_DAnCE.mwc
+
+ Removed the DAnCE/tests/Config_Handlers exclusion, as it no
+ longer exists.
+
+Wed Feb 15 07:35:12 UTC 2006 Johnny Willemsen
+
+ * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp:
+ Replaced ACE cast macros with their C++ versions
+
+Wed Feb 15 07:28:12 UTC 2006 Johnny Willemsen
+
+ * CIDLC/ServantSourceGenerator.cpp:
+ Fixed generation so that it compiles with Borland
+
+Tue Feb 14 23:01:46 UTC 2006 Gan Deng
+
+ * DAnCE/NodeApplication/NodeApplication_Impl.cpp
+
+ Fixed a bug when removing ReDaC components from the container.
+ This bug was caused by the container set indexing error when
+ handling newly installed components.
+ Thanks Sandro Andrade for reporting
+ this issue.
+
+ * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+ * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+
+ Some cosmetic changes.
+
+ * DAnCE/NodeApplicationManager/ImplementationInfo.cpp
+ * DAnCE/NodeApplicationManager/ImplementationInfo.h
+
+ Added a const modifier in the constructor to ensure safety.
+
+ * DAnCE/NodeManager/NodeManager_Impl.cpp
+
+ Fixed a bug when detecting whether a component is shared
+ by multiple assemblies. Earlier, when ReDaC is used, existing
+ components are wrongly treated as shared components.
+
+Tue Feb 14 22:02:59 UTC 2006 William R. Otte
+
+ * CIAO_TAO_DAnCE.mwc
+
+ Added naming service and Config_Handlers.
+
+ * DAnCE/NodeManager/NodeManager.mpc
+ * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
+
+ Fixed link time warnings on OS X.
+
+Tue Feb 14 19:57:32 UTC 2006 Gan Deng
+
+ * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
+
+ Fixed a bug about when a component has a name with "Exec"
+ string in it, the _stub library could be picked up
+ incorrectly.
+
+Mon Feb 13 20:53:58 UTC 2006 Gan Deng
+
+ * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+ * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
+
+ Fixed a bug about removing existing components. Earlier
+ the logic in detecting "to-be-removed" components has
+ a bug.
+
+Mon Feb 13 20:11:35 UTC 2006 Gan Deng
+
+ * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
+
+ Changed ACE_const_cast to c++ native const_cast since the
+ former one is deprecated. Also changed the implementation of
+ the acquireSession() logic, so the deadlock bug could
+ be reproduced.
+
+Mon Feb 13 20:01:38 UTC 2006 Gan Deng
+
+ * DAnCE/NodeApplication/NodeApplication_Impl.cpp
+
+ Cosmetics change.
+
+ * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+ * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
+
+ Enhanced to call ccm_activate, ciao_preactivate, and
+ ciao_postactivate when installing new components.
+ Thanks Sandro Andrade for reporting
+ this issue.
+
+ Also added the logic for remove_existing_components into
+ the class, which has not been integrated yet.
+
+ Refactor the code by putting these logics into separate
+ methods to enhance readability.
+
+Mon Feb 13 17:12:09 UTC 2006 Gan Deng
+
+ * DAnCE/ExecutionManager/Execution_Manager.cpp
+
+ Fixed a bug about registering EM with naming service, originally
+ an invalid naming context is specified. Also allowed EM to both
+ register to naming service AND dump and IOR file. Thanks Sandro
+ Andrade for reporting this bug.
+
+Mon Feb 13 15:41:21 UTC 2006 Gan Deng
+
+ * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
+
+ Fixed a warning about "deprecated conversion from string
+ constant to `char*' on RHEL_Static_GCC-3.4.2 build.
+
+Mon Feb 13 11:34:12 UTC 2006 Johnny Willemsen
+
+ * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h:
+ Removed not allowed semicolon
+
+Mon Feb 13 09:22:12 UTC 2006 Johnny Willemsen
+
+ * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h:
+ Fixed compile error in single threaded builds
+
+Mon Feb 13 08:32:12 UTC 2006 Johnny Willemsen
+
+ * ciao/Server_init.cpp:
+ * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp:
+ * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp:
+ Fixed conversion warnings
+
+Sat Feb 11 21:39:54 UTC 2006 Gan Deng
+
+ * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.h
+ * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent_Factory.h
+
+ Fixed fuzz build erros.
+
+Sat Feb 11 21:26:08 UTC 2006 Gan Deng
+
+ * tests/Bug_2130_Regression/descriptors/run_test.pl
+
+ Fixed the command line option to start the NodeApplication
+ to enable real-time support.
+ Thanks Roland Schimmack for
+ reporting this error.
+
+Sat Feb 11 21:00:00 UTC 2006 xiong,ming
+
+ * ciao/Server_init.cpp
+
+ Removed an extra explicit qualification
+
+Sat Feb 11 18:49:21 UTC 2006 Johnny Willemsen
+
+ * ciaosvcs/Events/CIAO_Events.mpc
+ * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.mpc
+ Removed these files to get at least our builds running again
+
+Fri Feb 10 16:11:35 UTC 2006 Gan Deng
+
+ * ciaosvcs/Events/CIAO_Events.mpc
+ * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.mpc
+
+ Temporarily disable the build of these projects before
+ the integration effort is complete to avoid pollute
+ the scoreboard.
+
+Fri Feb 10 14:28:14 UTC 2006 xiong,ming
+
+ * docs/tutorials/CoSMIC/01.html
+ * docs/tutorials/CoSMIC/02.html
+ * docs/tutorials/CoSMIC/index.html
+ * docs/tutorials/CoSMIC/Images/fig10.jpg
+ * docs/tutorials/CoSMIC/Images/fig11.jpg
+ * docs/tutorials/CoSMIC/Images/fig2.jpg
+ * docs/tutorials/CoSMIC/Images/fig4.jpg
+ * docs/tutorials/CoSMIC/Images/fig5.jpg
+ * docs/tutorials/CoSMIC/Images/fig6.jpg
+ * docs/tutorials/CoSMIC/Images/fig7.jpg
+ * docs/tutorials/CoSMIC/Images/fig8.jpg
+ * docs/tutorials/CoSMIC/Images/fig9.jpg
+ * docs/tutorials/CoSMIC/Model/Quoter.xme
+
+ Updated the CoSMIC tutorial so that it is consistent with
+ the latest GME and CoSMIC.
+
+Fri Feb 10 11:15:12 UTC 2006 Johnny Willemsen
+
+ * ciao/Port_Activator.h:
+ Doxygen improvements
+
+ * ciao/NodeApp_CB_Impl.h:
+ Made destructor protected
+
+ * ciao/Container_Base.{h,cpp}:
+ Made the refcount unsigned long, addressed several comments and
+ improved documentation
+
+Fri Feb 10 04:56:26 UTC 2006 Gan Deng
+
+ * DAnCE/NodeApplication/Container_Impl.cpp
+ * DAnCE/NodeApplication/Container_Impl.h
+ * ciao/Server_init.cpp
+ * ciao/Server_init.h
+
+ Added support for creating multicomponent naming context through
+ the deployment plan. Thanks Dipa Suri for
+ contributing a NameUtility class implementation.
+
+ * ciaosvcs/Events/CIAO_Events.idl
+ * ciaosvcs/Events/CIAO_Events.mpc
+ * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.cpp
+ * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.h
+ * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.idl
+ * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.mpc
+ * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent_Factory.cpp
+ * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent_Factory.h
+
+ Added some files for event channel integration for CIAO.
+ More file check-ins are on the way.
+
+Thu Feb 9 23:38:19 UTC 2006 xiong,ming
+
+ * TAO/CIAO/CIAOTAO.mwc
+
+ Updated mwc to include some dependencies required by tests
+ and examples.
+
+ * tests/Bug_2130_Regression/Logs/PROBLEM-REPORT-FORM
+ * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.cidl
+ * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl
+ * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
+ * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl
+ * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_Impl.ccd
+ * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
+ * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h
+ * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec_export.h
+ * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_stub_export.h
+ * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_svnt_export.h
+ * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
+ * tests/Bug_2130_Regression/descriptors/DeploymentPlan.cdp
+ * tests/Bug_2130_Regression/descriptors/TestNodeManagerMap.dat
+ * tests/Bug_2130_Regression/descriptors/rt-config-example.csr
+ * tests/Bug_2130_Regression/descriptors/run_test.pl
+ * tests/Bug_2130_Regression/interfaces/ENW.idl
+ * tests/Bug_2130_Regression/interfaces/ENW.mpc
+ * tests/Bug_2130_Regression/interfaces/ENW_stub_export.h
+ * tests/Bug_2130_Regression/interfaces/ENW_svnt_export.h
+
+ Added a new tests for Bug_2130.
+ Thanks Roland Schimmack for
+ providing this test case.
+
+Thu Feb 9 16:48:42 UTC 2006 Jeff Parsons
+
+ * tools/IDL3_to_IDL2/be_global.h:
+ * tools/IDL3_to_IDL2/be_init.cpp:
+ * tools/IDL3_to_IDL2/be_sunsoft.cpp:
+ * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp:
+ * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h:
+
+ Removed all usage of internal 'idl_bool' typedef in the
+ IDL3 to IDL2 converter, consistently with the changes to
+ the TAO IDL compiler front end, which is used by this
+ tool.
+
+Thu Feb 9 16:33:45 UTC 2006 William Otte
+
* tools/Config_Handlers/ADD_Handler.cpp
+ * tools/Config_Handlers/Any_Handler.cpp
* tools/Config_Handlers/CCD_Handler.cpp
* tools/Config_Handlers/CEPE_Handler.cpp
- * tools/Config_Handlers/CEPE_Handler.h
* tools/Config_Handlers/CPD_Handler.cpp
- * tools/Config_Handlers/CPD_Handler.h
+ * tools/Config_Handlers/CRDD_Handler.cpp
+ * tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
+ * tools/Config_Handlers/DD_Handler.cpp
* tools/Config_Handlers/DP_Handler.cpp
- * tools/Config_Handlers/Deployment.hpp
+ * tools/Config_Handlers/DP_PCD_Handler.cpp
+ * tools/Config_Handlers/DataType_Handler.cpp
* tools/Config_Handlers/ERE_Handler.cpp
- * tools/Config_Handlers/ERE_Handler.h
+ * tools/Config_Handlers/IDD_Handler.cpp
+ * tools/Config_Handlers/IDREF_Base.cpp
+ * tools/Config_Handlers/ID_Handler.cpp
+ * tools/Config_Handlers/IRDD_Handler.cpp
* tools/Config_Handlers/MDD_Handler.cpp
* tools/Config_Handlers/PCD_Handler.cpp
- * tools/Config_Handlers/PCD_Handler.h
+ * tools/Config_Handlers/PSPE_Handler.cpp
* tools/Config_Handlers/Property_Handler.cpp
- * tools/Config_Handlers/Property_Handler.h
+ * tools/Config_Handlers/RDD_Handler.cpp
* tools/Config_Handlers/Req_Handler.cpp
- * tools/Config_Handlers/Req_Handler.h
- * tools/Config_Handlers/SatisfierProperty_Handler.cpp
- * tools/Config_Handlers/SatisfierProperty_Handler.h
+ * tools/Config_Handlers/STD_PC_Intf.cpp
+ * tools/Config_Handlers/XML_File_Intf.cpp
+
+ Added CIAO_TRACE statements to aid in debugging.
+
+Wed Feb 08 15:53:31 2006 Wallace Zhang
+
+ * CIAO version 0.4.9 released.
+
+Tue Feb 7 16:10:10 UTC 2006 William Otte
+
+ * DAnCE/NodeManager/NodeManager.mpc
+
+ Fixed an ordering problem.
+
+Mon Feb 6 19:13:13 UTC 2006 William Otte
+
+ * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
+
+ Fixed an export problem manifesting in VC8.
+
+ * performance-tests/Benchmark/Benchmark.mpc
+
+ Added an empty IDL_Files section to the servant to prevent
+ nmake from regenerating from the IDL file.
+
+Mon Feb 6 13:54:39 UTC 2006 Ossama Othman
+
+ * ciao/ComponentsC.h:
+
+ Place TAO namespace in this pre-generated stub header within a
+ TAO versioned namespace, as TAO_IDL does for all stubs. Fixes
+ build errors in versioned-namespace enabled builds.
+
+Mon Feb 6 13:33:54 UTC 2006 William Otte
+
+ * DAnCE/NodeApplication/NoOp_Configurator.h
+
+ Case sensitivity error from previous commit.
+
+Mon Feb 6 00:39:41 UTC 2006 William Otte
+
+ * DAnCE/NodeApplication/Configurator_Factory.cpp
+ * DAnCE/NodeApplication/Configurator_Factory.h
+ * DAnCE/NodeApplication/NodeApplication.mpc
+ * DAnCE/NodeApplication/NodeApplication_Core.h
+ * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
+ * DAnCE/NodeManager/MonitorController.h
+ * DAnCE/NodeManager/NodeManager.mpc
+ * DAnCE/NodeApplication/NoOp_Configurator.cpp
+ * DAnCE/NodeApplication/NoOp_Configurator.h
+ * DAnCE/NodeApplication/NoOp_Configurator_export.h
+
+ Fixed linking errors on Borland 6. Mostly involved improper
+ symbol export control.
+
+ * tools/Config_Handlers/cdd.hpp
* tools/Config_Handlers/cdp.hpp
- * tools/Config_Handlers/toplevel.hpp
- * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
- * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
- * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
- * tools/Config_Handlers/Package_Handlers/CPD_Handler.h
- * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
- * tools/Config_Handlers/Package_Handlers/NIA_Handler.h
- * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
- * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
- * tools/Config_Handlers/Package_Handlers/SID_Handler.h
- Compilation fixes for borland, some cosmetic fixes as well.
+ Added a fix for a broken include in Borland 6.
+
+Fri Feb 3 24:30:19 UTC 2006 Ossama Othman
+
+ * ciao/CIAO_common.h:
+
+ Removed extraneous "#" in "# #error" preprocessor directive.
+
+ * ciao/Client_init.h:
+
+ Moved CIAO namespace out of TAO-versioned namespace block. It
+ shouldn't have been there. Fixes namespace clashes in versioned
+ namespace enabled builds.
+
+Thu Feb 2 23:55:01 UTC 2006 William Otte
+
+ * NEWS
+
+ Updated the release notes.
+
+Thu Feb 2 22:59:23 UTC 2006 William Otte
+
+ * DAnCE/RepositoryManager/ZIP_Wrapper.cpp
+
+ Updated include from zziplib.h to zzip/zzip.h, as the former
+ is deprecated and absent in the most recent release.
+
+Thu Feb 2 15:49:31 2006 Douglas C. Schmidt
+
+ * docs/tutorials/CoSMIC/01.html: Commited a fix for a typo detected by
+ Abdullah Sowayan and
+ fixed by Ming Xiong.
-Tue Apr 25 09:00:12 UTC 2006 Johnny Willemsen
+Thu Feb 2 16:58:15 UTC 2006 Johnny Willemsen
+
+ * CIAO_TAO_DAnCE.mwc:
+ * CIAODAnCE.mwc:
+ Removed Old_Config_Handlers and spec_RepositoryManager
+
+Thu Feb 2 16:31:15 UTC 2006 William Otte
+
+ * DAnCE/NodeManager/BaseMonitor.h
+ * DAnCE/NodeManager/CIAO_Monitor.h
+ * DAnCE/NodeManager/MonitorCB.h
+ * DAnCE/NodeManager/MonitorController.cpp
+ * DAnCE/NodeManager/MonitorController.h
+ * DAnCE/TargetManager/DomainDataManager.h
+
+ Removed extra ';' after closing braces on namespaces.
+ Was causing errors on GCC4 builds.
+
+ * DAnCE/NodeManager/MonitorController.inl
+
+ Removed this file, as it is no longer used.
+
+Wed Feb 1 21:21:35 UTC 2006 William Otte
+
+ * DAnCE/NodeManager/BaseMonitor.h
+ * DAnCE/NodeManager/CIAO_Monitor.cpp
+ * DAnCE/NodeManager/CIAO_Monitor.h
+ * DAnCE/NodeManager/MonitorCB.cpp
+ * DAnCE/NodeManager/MonitorCB.h
+ * DAnCE/NodeManager/MonitorController.cpp
+ * DAnCE/NodeManager/MonitorController.h
+ * DAnCE/TargetManager/DomainDataManager.cpp
+ * DAnCE/TargetManager/DomainDataManager.h
+ * DAnCE/TargetManager/TargetManager_exec.cpp
+ * DAnCE/TargetManager/TargetManager_exec.h
- * tools/Config_Handlers/CPD_Handler.h:
- ComponentPortDescription is a struct, so also forward declare it
- as a struct
+ Wraps the TargetManager/Monitors inside the CIAO namespace.
+ Thanks to Nilabja Roy (nilabjar@dre.vanderbilt.edu) for
+ making these changes and thanks to Johnny for noticing this!
-Mon Apr 24 18:53:22 UTC 2006 William R. Otte
+Wed Feb 1 20:42:42 UTC 2006 William Otte
* CIDLC/ServantSourceGenerator.cpp
diff --git a/TAO/CIAO/DAnCE/ComponentPackager/Component_Packager.cpp b/TAO/CIAO/DAnCE/ComponentPackager/Component_Packager.cpp
new file mode 100644
index 00000000000..8bcab6d6af8
--- /dev/null
+++ b/TAO/CIAO/DAnCE/ComponentPackager/Component_Packager.cpp
@@ -0,0 +1,154 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "ciao/DeploymentC.h"
+#include "ciao/CIAO_common.h"
+#include "CPK_Packager.h"
+#include "PDL_Handler.h"
+
+namespace CIAO
+{
+ namespace Component_Packager
+ {
+ // URL for flattened component deployment plan
+ const char* cdp_url = 0;
+ // URL for .cid file, which will help to archive
+ // the standard descriptors into package
+ const char* pdl_url = 0;
+ // URL for component package to be produced
+ const char* pkg_url = "ComponentPackage.cpk";
+ // Indicate whether to include standard descriptors
+ // in the package or not
+ bool include_std_desc = false;
+
+
+ static void
+ display_usage (const ACE_TCHAR* program)
+ {
+ ACE_ERROR ((LM_ERROR,
+ ACE_TEXT ("[CIAO::Component_Packager] Usage:\n")
+ ACE_TEXT (" -h Display usage information for commands\n")
+ ACE_TEXT (" -p flatplan(.cdp) Use 'flatplan'as the input to produce the package\n")
+ ACE_TEXT (" -i descriptor(.cid) Use 'descriptor' as addition input to archive all\n")
+ ACE_TEXT (" the standard descriptors\n")
+ ACE_TEXT (" -o package(.cpk) Set the output package name.Use 'ComponentPackage.cpk'\n")
+ ACE_TEXT (" if this option is not specified.\n")));
+ }
+
+
+ static bool
+ parse_args (int argc,
+ ACE_TCHAR *argv[])
+ {
+ ACE_Get_Arg_Opt get_opt (argc,
+ argv,
+ ACE_TEXT ("p:i:o:h"));
+ int c;
+
+ while ((c = get_opt ()) != EOF)
+ {
+ switch (c)
+ {
+ case 'p':
+ cdp_url = get_opt.opt_arg ();
+ break;
+ case 'i':
+ include_std_desc = true;
+ pdl_url = get_opt.opt_arg ();
+ break;
+ case 'o':
+ pkg_url = get_opt.opt_arg ();
+ break;
+ case 'h':
+ default:
+ display_usage (argv[0]);
+ return false;
+ }
+ }
+
+ if (cdp_url == 0)
+ {
+ display_usage (argv[0]);
+ return false;
+ }
+
+ if (pdl_url == 0 && include_std_desc)
+ {
+ display_usage (argv[0]);
+ return false;
+ }
+
+ if (pkg_url == 0)
+ {
+ display_usage (argv[0]);
+ return false;
+ }
+
+ return true;
+ }
+
+
+ static int
+ run_main (int argc, char *argv[])
+ {
+ ACE_DECLARE_NEW_CORBA_ENV;
+
+ ACE_TRY
+ {
+ if (parse_args (argc, argv) == false)
+ {
+ return -1;
+ }
+
+ CPK_Packager packager (pkg_url,
+ cdp_url,
+ pdl_url,
+ include_std_desc);
+
+ Component_Packager::Base_Packager::PACKAGE_PLAN pkg_plan;
+
+ if (-1 == packager.preparePackage (pkg_plan))
+ {
+ ACE_ERROR ((LM_ERROR,
+ "(%P|%t) Component_Packager: Error preparing package plan\n"));
+ throw;
+ };
+ if (-1 == packager.createPackage (pkg_plan))
+ {
+ ACE_ERROR ((LM_ERROR,
+ "(%P|%t) Component_Packager: Error creating package plan\n"));
+ throw;
+ };
+
+ ACE_DEBUG ((LM_INFO,
+ "(%P|%t)[success] The Component Package has been created!"));
+
+ }
+ ACE_CATCHANY
+ {
+ ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+ "(%P|%t) Component_Packager: ");
+ return -1;
+ }
+ ACE_CATCHALL
+ {
+ ACE_ERROR ((LM_ERROR,
+ "(%P|%t) Component_Packager: Unknown exception.\n"));
+ return -1;
+ }
+ ACE_ENDTRY;
+ ACE_CHECK_RETURN (-1);
+
+ return 0;
+ }
+ }
+}
+
+using namespace CIAO::Component_Packager;
+
+int
+ACE_TMAIN (int argc,
+ ACE_TCHAR *argv[])
+{
+ return run_main (argc, argv);
+}
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
index 9cf69544075..c3c675aaab6 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
+++ b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
@@ -26,20 +26,19 @@ namespace CIAO
bool
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "o:m:i:n:p");
+ ACE_Get_Arg_Opt get_opts (argc, argv, "o:m:i:n:p");
int c;
while ((c = get_opts ()) != -1)
switch (c)
{
case 'o':
- write_to_ior_ = true;
ior_file_name_ = get_opts.opt_arg ();
break;
case 'i':
init_file_name = get_opts.opt_arg ();
break;
case 'n':
- register_with_ns_ = true;
+ register_with_ns_ = 1;
break;
case 'p':
pid_file_name_ = get_opts.opt_arg ();
@@ -117,11 +116,12 @@ namespace CIAO
CosNaming::NamingContext::_narrow (naming_context_object.in ());
// Initialize the Naming Sequence
- CosNaming::Name name (1);
- name.length (1);
+ CosNaming::Name name (2);
+ name.length (2);
// String dup required for MSVC6
- name[0].id = CORBA::string_dup ("ExecutionManager");
+ name[0].id = CORBA::string_dup ("CIAO");
+ name[1].id = CORBA::string_dup ("ExecutionManager");
// Register the servant with the Naming Service
try
@@ -201,8 +201,7 @@ namespace CIAO
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
-
- if (write_to_ior_)
+ else
{
retval =
write_ior_file (orb.in (),
@@ -267,7 +266,7 @@ namespace CIAO
}
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
return CIAO::Execution_Manager::run_main (argc,
argv);
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
index 5629d1235a8..442581f0795 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
@@ -13,7 +13,7 @@ void print_arg (int argc, char *argv[])
}
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
int priority = 20;
// Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
index b87578e5a4e..5837ca5692d 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project(NodeApplication): ciao_server_dnc, ciao_events_dnc {
+project(NodeApplication): ciao_server_dnc {
after += NoOp_Configurator
libs += CIAO_NoOp_Configurator
exename = NodeApplication
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index 0cd1d7954b2..5edb7a51b3a 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -413,13 +413,13 @@ CIAO::NodeApplication_Impl::passivate_component (const char * name
"CIAO::NodeApplication_Impl::passivate_component, "
"invalid instance [%s] \n",
name));
- ACE_TRY_THROW (Components::RemoveFailure ());
+ ACE_TRY_THROW (Deployment::StartError ());
}
if (CORBA::is_nil (comp_state.objref_.in ()))
{
ACE_DEBUG ((LM_DEBUG, "comp is nil\n"));
- throw Components::RemoveFailure ();
+ throw Deployment::StartError ();
}
comp_state.objref_->ciao_passivate (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -430,7 +430,7 @@ void
CIAO::NodeApplication_Impl::activate_component (const char * name
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((::CORBA::SystemException,
- ::Deployment::StartError))
+ ::Components::RemoveFailure))
{
Component_State_Info comp_state;
@@ -438,7 +438,7 @@ CIAO::NodeApplication_Impl::activate_component (const char * name
{
ACE_ERROR ((LM_ERROR,
"CIAO (%P|%t) - NodeApplication_Impl.cpp, "
- "CIAO::NodeApplication_Impl::activate_component, "
+ "CIAO::NodeApplication_Impl::passivate_component, "
"invalid instance [%s] \n",
name));
ACE_TRY_THROW (Deployment::StartError ());
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
index ee1878ff07d..8a08e3456c5 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
@@ -183,7 +183,7 @@ namespace CIAO
virtual void activate_component (const char * name
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((::CORBA::SystemException,
- ::Deployment::StartError));
+ ::Components::RemoveFailure));
virtual void passivate_component (const char * name
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
index 352a005515a..df31c704651 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
@@ -272,11 +272,9 @@ namespace CIAO
// For svnt/exec artifacts
for (CORBA::ULong j = 0; j < artifact_num; ++j)
{
- Deployment::ArtifactDeploymentDescription arti =
+ const Deployment::ArtifactDeploymentDescription & arti =
this->plan_.artifact[ impl.artifactRef[j] ];
- // @Stoyan: Is there any particular reason the repository
- // manager should only work on Windows? -Will
#if defined (ACE_WIN32) || defined (ACE_WIN64)
for (size_t loc_num = 0;
loc_num < arti.location.length ();
@@ -294,11 +292,8 @@ namespace CIAO
"Containers_Info_Map::insert_instance_into_container -"
"ERROR: Unable to resolve HTTP ref to location[%d] of %s\n",
loc_num, arti.name.in ()));
-
- // @Stoyan: This is an inappropriate response to
- // this type of failure. Please throw an
- // exception, Deployment::UnknownImplId would be appropriate.
- arti.location[loc_num] = "HTTP_failure";
+
+ arti.location[loc_num] = CORBA::string_dup ("HTTP_failure");
}
else
{
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
index a60cbe662b3..4fb23a46f19 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
@@ -87,10 +87,7 @@ namespace CIAO
* any references to HTTP URLs
*/
protected:
-
- // @Stoyan - Please follow ACE coding guideines when naming your
- //member variables. In particular, please use lower case and
- //follow the name with a trailing underscore.
+
//directory in which to download the libraries obtained via HTTP
ACE_CString HTTP_DOWNLOAD_PATH;
diff --git a/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc b/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc
index b4f5f55cd31..d082a5ecd3c 100644
--- a/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc
+++ b/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc
@@ -3,7 +3,7 @@
// MPC file for the Monitor
-project(*monitorlib): ciao_client_dnc, ciao_events_base_dnc {
+project(*monitorlib): ciao_client_dnc{
after += CIAO_TargetManager_stub
includes += $(CIAO_ROOT)/DAnCE/TargetManager
sharedname = ciaomonlib
diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc b/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
index 01b11fa563a..d5338b6c140 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
@@ -2,7 +2,7 @@
// $Id$
//For static D&C, the NodeManager should be available as a linkable library
-project(NodeManager_svnt): ciao_component_dnc, ciao_deployment_svnt, iortable, ifr_client, dance_extension_stub, ciao_server_dnc {
+project(NodeManager_svnt): ciao_component_dnc, ciao_deployment_svnt, iortable, ifr_client, dance_extension_stub {
sharedname = NodeManager
after += NodeApplicationManager NodeManager_stub CIAO_TargetManager_stub NoOp_Configurator
libs += NodeManager_stub NodeApplicationManager TargetManager_stub CIAO_NoOp_Configurator
diff --git a/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp b/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp
index 5cad11e47b9..d835d8b9ba6 100644
--- a/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp
+++ b/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp
@@ -26,7 +26,7 @@ int spawn_delay = 1;
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "o:c:m:s:d:na:p:z:");
+ ACE_Get_Arg_Opt get_opts (argc, argv, "o:c:m:s:d:na:p:z:");
int c;
while ((c = get_opts ()) != -1)
@@ -158,7 +158,7 @@ register_with_ns (const char * name_context,
}
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
ACE_TRY_NEW_ENV
{
diff --git a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
index 141e1ff7e9a..faa2d6a8eb5 100644
--- a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
+++ b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
@@ -54,7 +54,7 @@ namespace CIAO
parse_args (int argc,
ACE_TCHAR *argv[])
{
- ACE_Get_Opt get_opt (argc,
+ ACE_Get_Arg_Opt get_opt (argc,
argv,
ACE_TEXT ("p:nk:t:o:i:r:h"));
int c;
diff --git a/TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp b/TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp
index 86e56f99cb3..2bdc40ffff1 100644
--- a/TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp
+++ b/TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp
@@ -10,7 +10,7 @@ parse_args (int argc,
char *argv[],
CIAO::NodeApplication_Task::Options &opts)
{
- ACE_Get_Opt get_opts (argc, argv, "nk:o:");
+ ACE_Get_Arg_Opt get_opts (argc, argv, "nk:o:");
int c;
while ((c = get_opts ()) != -1)
@@ -96,7 +96,7 @@ check_supported_priorities (CORBA::ORB_ptr orb)
int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
{
ACE_TRY_NEW_ENV
{
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp b/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp
new file mode 100644
index 00000000000..b04f594cc91
--- /dev/null
+++ b/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp
@@ -0,0 +1,305 @@
+// $Id$
+
+#include "RepositoryManager_Impl.h"
+#include "Update_Plan.h"
+#include "ExecutionManager/ExecutionManagerC.h"
+#include "Config_Handlers/DnC_Dump.h"
+#include "NodeManager/NodeManagerC.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/streams.h"
+#include "ace/Auto_Ptr.h"
+using namespace std;
+
+const char * exec_ior = "file://exec_mgr.ior";
+const char * node_daemon_ior = 0;
+
+static void
+usage (const ACE_TCHAR* program)
+{
+ ACE_ERROR ((LM_ERROR,
+ ACE_TEXT ("Usage: %s -p -d -k \
+ -t \n")
+ ACE_TEXT (" : URI identifying the package\n"),
+ program));
+}
+
+int
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
+{
+ // Initialize orb
+ CORBA::ORB_var orb =
+ CORBA::ORB_init (argc,
+ argv,
+ ""
+ ACE_ENV_ARG_PARAMETER);
+ ACE_CHECK_RETURN (-1);
+
+ // top level package URL
+ char* package_url = 0;
+
+ // deployment plan URL
+ char* plan_url = 0;
+
+ ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("p:d:k:t:"));
+ int c;
+
+ while ((c = get_opt ()) != EOF)
+ {
+ switch (c)
+ {
+ case 'p':
+ package_url = get_opt.opt_arg ();
+ break;
+ case 'd':
+ plan_url = get_opt.opt_arg ();
+ break;
+ case 'k':
+ exec_ior = get_opt.opt_arg ();
+ break;
+ case 't':
+ node_daemon_ior = get_opt.opt_arg ();
+ break;
+ default:
+ usage(argv[0]);
+ return -1;
+ }
+ }
+
+ if (package_url == 0) {
+ usage(argv[0]);
+ return -1;
+ }
+
+ if (plan_url == 0) {
+ usage(argv[0]);
+ return -1;
+ }
+
+ try
+ {
+ xercesc::XMLPlatformUtils::Initialize();
+ }
+
+ catch (const XMLException& xml_e)
+ {
+ char* message = XMLString::transcode (xml_e.getMessage());
+ ACE_Auto_Basic_Array_Ptr cleanup_message (message);
+ ACE_DEBUG ((LM_DEBUG, "Error during initialization : %s\n", message));
+ return 1;
+ }
+ try
+ {
+ // get a reference to the parser.
+ auto_ptr plan_parser (
+ CIAO::Config_Handler::Utils::create_parser ()
+ );
+
+ CIAO::Config_Handler::Config_Error_Handler handler;
+ plan_parser->setErrorHandler(&handler);
+
+ auto_ptr tpd_parser (
+ CIAO::Config_Handler::Utils::create_parser ()
+ );
+
+ CIAO::Config_Handler::Config_Error_Handler tpd_handler;
+ tpd_parser->setErrorHandler(&tpd_handler);
+
+ // use the parser to parse the deployment plan URL and create
+ // a DOM document.
+ DOMDocument* plan_doc = plan_parser->parseURI (plan_url);
+
+ if (handler.getErrors())
+ {
+ return 1;
+ }
+
+ //DOMDocument* tpd_doc = tpd_parser->parseURI (package_url);
+
+ //ACE_UNUSED_ARG (tpd_doc);
+
+ if (tpd_handler.getErrors())
+ {
+ return 1;
+ }
+
+ if (plan_doc == NULL)
+ {
+ ACE_DEBUG ((LM_DEBUG, "Null DOM Document obtained, \
+ May be the URL is wrong!!\n"));
+ throw CIAO::Null_Dom_Document ();
+ }
+
+ // free up DOMBuilder. DOMBuilder also deletes the DOMDocument memory.
+ //auto_ptr cleanup_parser (parser);
+
+ // call the Deployment Plan handler to parse the XML descriptor.
+ CIAO::Config_Handler::Plan_Handler plan_handler (
+ plan_doc,
+ DOMNodeFilter::SHOW_ELEMENT | DOMNodeFilter::SHOW_TEXT
+ );
+
+ Deployment::DeploymentPlan plan;
+ plan_handler.process_plan (plan);
+
+ // call the PackageConfiguration handler to parse the XML descriptor.
+ Deployment::PackageConfiguration* pc;
+
+ CIAO::RepositoryManager_Impl *rep_impl = 0;
+ ACE_NEW_RETURN (rep_impl,
+ CIAO::RepositoryManager_Impl (),
+ -1);
+ PortableServer::ServantBase_var owner_transfer (rep_impl);
+
+ rep_impl->installPackage ("PC", package_url);
+ pc = rep_impl->findPackageByName ("PC");
+ //Deployment::DnC_Dump::dump (*pc);
+
+ CIAO::REF_MAP ref_map;
+ CIAO::REF_MAP primary_ref_map;
+
+ // traverse the PackageConfiguration IDL data structure and
+ // update the deployment plan IDL data structure.
+ CIAO::traverse_package (pc, plan, ref_map, primary_ref_map);
+
+ //Deployment::DnC_Dump::dump (plan);
+
+ // Pass the parsed plan to the Execution Manager to start the
+ // Deployment Process.
+
+ CORBA::Object_var obj = orb->string_to_object (exec_ior
+ ACE_ENV_ARG_PARAMETER);
+ ACE_TRY_CHECK;
+
+ CIAO::ExecutionManagerDaemon_var exec_mgr =
+ CIAO::ExecutionManagerDaemon::_narrow (obj.in ()
+ ACE_ENV_ARG_PARAMETER);
+ ACE_TRY_CHECK;
+
+ if (CORBA::is_nil (exec_mgr.in ()))
+ {
+ ACE_DEBUG ((LM_DEBUG,
+ "Executor: nil Execution Manager reference, \
+ narrow failed\n"));
+ return 1;
+
+ }
+
+ CIAO::NodeManager_var node_mgr;
+ if (node_daemon_ior != 0)
+ {
+ CORBA::Object_var node_mgr_obj =
+ orb->string_to_object (node_daemon_ior
+ ACE_ENV_ARG_PARAMETER);
+ ACE_TRY_CHECK;
+
+ node_mgr =
+ CIAO::NodeManager::_narrow (node_mgr_obj.in ()
+ ACE_ENV_ARG_PARAMETER);
+ ACE_TRY_CHECK;
+
+ if (CORBA::is_nil (node_mgr.in ()))
+ {
+ ACE_DEBUG ((LM_DEBUG,
+ "Executor: nil Node Manager reference, \
+ narrow failed\n"));
+ return 1;
+ }
+ }
+
+ ACE_DEBUG ((LM_DEBUG, "Executor: Obtained Execution Manager ref \n"));
+ Deployment::DomainApplicationManager_var dapp_mgr =
+ exec_mgr->preparePlan (plan, 1);
+
+ if (CORBA::is_nil (dapp_mgr.in ()))
+ {
+ ACE_DEBUG ((LM_DEBUG,
+ "Executor:preparePlan call failed:nil \
+ DomainApplicationManager reference\n"));
+ return 1;
+ }
+ ACE_DEBUG ((LM_DEBUG,
+ "Executor: Obtained DomainApplication Manager ref \n"));
+
+ // Create a dummy set of properties and start the
+ // Launching of applications
+ Deployment::Properties_var properties;
+ ACE_NEW_RETURN (properties,
+ Deployment::Properties,
+ 1);
+ ACE_DEBUG ((LM_DEBUG, "Executor: start Launch application....."));
+
+ // Do not start the Application immediately
+ int start = 0;
+ dapp_mgr->startLaunch (properties.in (), start);
+ ACE_DEBUG ((LM_DEBUG, "[success]\n"));
+
+ // Call finish Launch to complete the connections
+ ACE_DEBUG ((LM_DEBUG, "Executor: finish Launch application....."));
+ dapp_mgr->finishLaunch (start);
+ ACE_DEBUG ((LM_DEBUG, "[success]\n"));
+
+ // Call start to activate components
+ ACE_DEBUG ((LM_DEBUG, "Executor: start activating components..."));
+ dapp_mgr->start ();
+ ACE_DEBUG ((LM_DEBUG, "[success]\n"));
+
+ ACE_DEBUG ((LM_DEBUG, "Executor: Application Deployed successfully \n"));
+ ACE_DEBUG ((LM_DEBUG, "Press to tear down application \n"));
+
+ char dummy [256];
+ cin.getline (dummy, 256);
+ // Tear down the assembly
+
+ ACE_DEBUG ((LM_DEBUG, "Executor: destroy the application....."));
+ dapp_mgr->destroyApplication ();
+ ACE_DEBUG ((LM_DEBUG, "[success]\n"));
+
+ ACE_DEBUG ((LM_DEBUG, "Executor: destroy the manager....."));
+ exec_mgr->destroyManager (dapp_mgr.in ());
+ ACE_DEBUG ((LM_DEBUG, "[success]\n"));
+
+ if (node_daemon_ior != 0)
+ {
+ ACE_DEBUG ((LM_DEBUG, "shutting down node manager \n"));
+ exec_mgr->shutdown (); // shut down execution manager.
+ ACE_DEBUG ((LM_DEBUG, "[success]\n"));
+
+ ACE_DEBUG ((LM_DEBUG, "shutting down node manager \n"));
+ node_mgr->shutdown (); // shut down the node manager.
+ ACE_DEBUG ((LM_DEBUG, "[success]\n"));
+ }
+
+ orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_TRY_CHECK;
+ }
+ catch (CORBA::Exception& ex)
+ {
+ ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: ");
+ return -1;
+ }
+ catch (const DOMException& e)
+ {
+ const unsigned int maxChars = 2047;
+ XMLCh errText[maxChars + 1];
+
+ ACE_ERROR ((LM_ERROR, "\nException occured while parsing %s: \
+ \n",plan_url));
+ ACE_ERROR ((LM_ERROR, "DOMException code: %d\n ", e.code));
+ if (DOMImplementation::loadDOMExceptionMsg (e.code, errText, maxChars))
+ {
+ char* message = XMLString::transcode (errText);
+ ACE_Auto_Basic_Array_Ptr cleanup_message (message);
+ ACE_ERROR ((LM_ERROR, "Message is: %s\n", message));
+ }
+ //ACE_PRINT_EXCEPTION ("Caught DOM Exception: ");
+ ACE_ERROR ((LM_ERROR, "Caught DOM exception\n"));
+ return -1;
+ }
+ catch (...)
+ {
+ ACE_ERROR ((LM_ERROR, "Caught unknown exception\n"));
+ return -1;
+ }
+
+ return 0;
+}
diff --git a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc b/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
index 6ff77c3e1fa..0a8a72fdb43 100644
--- a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
+++ b/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project(StaticDAnCEParser): ciao_component_dnc, taoexe, ciao_config_handlers, ciao_domainapplicationmanager_dnc, iortable, exceptions, ciao_server_dnc {
+project(StaticDAnCEParser): ciao_component_dnc, taoexe, ciao_config_handlers, ciao_domainapplicationmanager_dnc, iortable, exceptions {
exename = StaticDAnCEParser
includes += ..
libs += NodeApplicationManager
diff --git a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h b/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h
index ea704259a0e..84e50a5fabf 100644
--- a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h
+++ b/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h
@@ -201,9 +201,10 @@ namespace CIAO
* @param available The available Properties
*/
- void match_properties (
- ::Deployment::Properties deployed,
- ::Deployment::SatisfierProperties& available);
+ void CIAO::DomainDataManager::
+ match_properties (
+ ::Deployment::Properties deployed,
+ ::Deployment::SatisfierProperties& available);
/// The different actiona that can take place
diff --git a/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc b/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc
index 07200eb0eca..b5a7aaa5458 100644
--- a/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc
+++ b/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc
@@ -22,7 +22,7 @@ project(CIAO_TargetManager_stub): ciao_client_dnc, ciao_deployment_stub {
project(CIAO_TargetManager_svnt) : ciao_servant_dnc {
after += CIAO_TargetManager_stub
sharedname = TargetManager_svnt
- libs += TargetManager_stub NodeManager_stub
+ libs += TargetManager_stub
idlflags += -Wb,export_macro=TARGETMANAGER_SVNT_Export -Wb,export_include=TargetManager_svnt_export.h
dynamicflags = TARGETMANAGER_SVNT_BUILD_DLL
@@ -47,7 +47,7 @@ project(CIAO_TargetManager_svnt) : ciao_servant_dnc {
project(CIAO_TargetManager_exec) : ciao_servant_dnc, ciao_config_handlers, ciao_domainapplicationmanager_dnc {
after += CIAO_TargetManager_svnt
sharedname = TargetManager_exec
- libs += TargetManager_stub TargetManager_svnt NodeManager_stub
+ libs += TargetManager_stub TargetManager_svnt
idlflags += -Wb,export_macro=TARGETMANAGER_EXEC_Export -Wb,export_include=TargetManager_exec_export.h
dynamicflags = TARGETMANAGER_EXEC_BUILD_DLL
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/Options.cpp b/TAO/CIAO/DAnCE/spec_RepositoryManager/Options.cpp
new file mode 100644
index 00000000000..45227d1741b
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/Options.cpp
@@ -0,0 +1,88 @@
+// $Id$
+
+// Options.cpp,v Stoyan
+
+#include "ace/Get_Opt.h"
+#include "ace/ARGV.h"
+#include "Options.h"
+
+Options *Options::instance_ = 0;
+
+Options *
+Options::instance (void)
+{
+
+ if (Options::instance_ == 0)
+ Options::instance_ = new Options;
+
+ return Options::instance_;
+}
+
+void
+Options::parse_args (int argc, ACE_TCHAR *argv[])
+{
+ ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("n:l:u:ifds"));
+
+ int c;
+
+ while ((c = get_opt ()) != -1)
+ switch (c)
+ {
+ case 'i':
+ this->install_ = true;
+ break;
+ case 'd':
+ this->delete_ = true;
+ break;
+ case 'f':
+ this->find_ = true;
+ break;
+ case 's':
+ this->shutdown_ = true;
+ break;
+ case 'n':
+ this->name_ = get_opt.opt_arg ();
+ break;
+ case 'l':
+ this->path_ = get_opt.opt_arg ();
+ break;
+ case 'u':
+ this->uuid_ = get_opt.opt_arg ();
+ break;
+ // Usage fallthrough.
+ default:
+ this->usage ();
+
+ }
+
+ if ((this->name_ == "") && (this->shutdown_ == false) && (this->uuid_ == ""))
+ this->usage ();
+ else if (this->name_ != "")
+ {
+ if (!(this->install_ || this->find_ || this->delete_))
+ this->usage ();
+ else if (this->install_ && this->path_ == "")
+ this->usage ();
+ }
+ else if (this->uuid_ != "" && !this->find_)
+ this->usage ();
+}
+
+void Options::usage (void)
+{
+ ACE_DEBUG ((LM_DEBUG, "OPTIONS: -s -n <:name> [-i -l <:path>] \
+ [-d ] [-f ] [-u <:uuid>]\n"));
+ ACE_OS::exit (1);
+}
+
+
+Options::Options (void)
+ : name_ (""),
+ uuid_ (""),
+ path_ (""),
+ delete_ (false),
+ install_ (false),
+ find_ (false),
+ shutdown_ (false)
+{
+}
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/URL_Parser.cpp b/TAO/CIAO/DAnCE/spec_RepositoryManager/URL_Parser.cpp
new file mode 100644
index 00000000000..d9428e8f14e
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/URL_Parser.cpp
@@ -0,0 +1,107 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "ace/ARGV.h"
+#include "URL_Parser.h"
+
+#include "ace/OS_NS_string.h"
+
+URL_Parser* URL_Parser::instance_ = 0;
+
+URL_Parser*
+URL_Parser::instance (void)
+{
+
+ if (URL_Parser::instance_ == 0)
+ URL_Parser::instance_ = new URL_Parser ();
+
+ return URL_Parser::instance_;
+}
+
+bool
+URL_Parser::parse_args (int argc, ACE_TCHAR *argv[])
+{
+ ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("rwu:h:p:f:d"));
+
+ bool success = true;
+ int c;
+
+ while ((c = get_opt ()) != -1)
+ switch (c)
+ {
+ case 'd':
+ this->debug_ = 1;
+ break;
+ case 'u':
+ success = parseURL (get_opt.opt_arg ());
+ break;
+ // Usage fallthrough.
+ default:
+ success = false;
+ }
+ if (this->hostname_ == 0 || this->filename_ == 0)
+ success = false;
+
+ return success;
+}
+
+URL_Parser::URL_Parser (void)
+ : hostname_ ("127.0.0.1"),
+ port_ (ACE_DEFAULT_HTTP_SERVER_PORT),
+ filename_ (0),
+ debug_ (0)
+{
+}
+
+
+
+bool URL_Parser::parseURL (char* url)
+{
+ char* ptr;
+ bool success = true;
+
+ if (ptr = ACE_OS::strstr (url, "http://"))
+ url += ACE_OS::strlen ("http://");
+
+ if (url[0] == '/')
+ this->filename_ = url;
+ else
+ {
+ if (ptr = ACE_OS::strstr (url, ":"))
+ this->port_ = ACE_OS::atoi (ptr + 1);
+ else
+ ptr = ACE_OS::strstr (url, "/");
+
+ if(!ptr)
+ success = false;
+ else
+ {
+ size_t host_len = ptr - url;
+ this->hostname_ = new char [host_len];
+ ACE_OS::strncpy (this->hostname_, url, host_len);
+ this->hostname_ [host_len] = '\0';
+
+ if (ptr = ACE_OS::strstr (ptr, "/"))
+ {
+ this->filename_ = ptr;
+ }
+ else
+ success = false;
+ }
+ }
+ return success;
+}
+
+
+void URL_Parser::exitOnError (void)
+ {
+ ACE_DEBUG ((LM_DEBUG, "./http_client -u http://hostname:port/filename [-d]\n"));
+ ACE_OS::exit (1);
+ }
+
+
+ URL_Parser::~URL_Parser()
+ {
+ if(this->hostname_)
+ delete [] this->hostname_;
+ }
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp
new file mode 100644
index 00000000000..ec2bebd91e7
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp
@@ -0,0 +1,208 @@
+// $Id$
+#ifndef HANDLER_TEST_CPP
+#define HANDLER_TEST_CPP
+
+#include "Handler_Test.h"
+
+#include "ace/Get_Opt.h"
+#include "ace/Auto_Ptr.h"
+#include "ace/Log_Msg.h"
+#include "ace/OS_main.h"
+#include "ace/Auto_Ptr.h"
+#include "tao/Exception.h"
+#include "Old_Config_Handlers/XercesString.h"
+#include
+#include "Old_Config_Handlers/Config_Handler_export.h"
+#include "Old_Config_Handlers/DnC_Dump.h"
+#include "Old_Config_Handlers/Config_Error_Handler.h"
+
+using Config_Handler::XStr;
+using xercesc::XMLUni;
+using xercesc::XMLString;
+using xercesc::XMLException;
+using xercesc::DOMException;
+using xercesc::DOMBuilder;
+using xercesc::DOMImplementationRegistry;
+using xercesc::DOMImplementationLS;
+using xercesc::DOMImplementation;
+using xercesc::DOMAttr;
+using xercesc::DOMNamedNodeMap;
+using xercesc::DOMLocator;
+using xercesc::DOMError;
+using xercesc::DOMNodeList;
+using xercesc::DOMDocument;
+using xercesc::DOMDocumentTraversal;
+using xercesc::DOMNodeIterator;
+using xercesc::DOMNode;
+using xercesc::DOMNodeFilter;
+
+namespace Config_Handler_Test
+{
+ void
+ usage (const ACE_TCHAR* program)
+ {
+ ACE_ERROR ((LM_ERROR,
+ ACE_TEXT ("Usage: %s -u \n")
+ ACE_TEXT (" : URI identifying the resource\n"),
+ program));
+ }
+
+ template
+ int run_test (int argc, ACE_TCHAR *argv[], void (HANDLER::*func) (DATA&))
+ {
+ ACE_TCHAR* url = 0;
+
+ ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("u:"));
+ int c;
+
+ while ((c = get_opt ()) != EOF)
+ {
+ switch (c)
+ {
+ case 'u':
+ url = get_opt.opt_arg();
+ break;
+ default:
+ usage(argv[0]);
+ return -1;
+ }
+ }
+
+ if (url == 0) {
+ usage (argv[0]);
+ return -1;
+ }
+
+ // Initialize the ORB so that CORBA::Any will work
+ //
+ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
+
+ // Initialize the Xerces run-time
+ try
+ {
+ xercesc::XMLPlatformUtils::Initialize();
+ }
+
+ catch (const XMLException& e)
+ {
+ char* message = XMLString::transcode (e.getMessage());
+ ACE_Auto_Basic_Array_Ptr cleanup_message (message);
+ ACE_DEBUG ((LM_DEBUG, "Error during initialization : %s\n", message));
+ return 1;
+ }
+
+ try
+ {
+
+ // Instantiate the DOM parser.
+ static const XMLCh gLS[] = { xercesc::chLatin_L,
+ xercesc::chLatin_S,
+ xercesc::chNull };
+
+ // Get an implementation of the Load-Store (LS) interface
+ DOMImplementation* impl
+ = DOMImplementationRegistry::getDOMImplementation(gLS);
+
+ auto_ptr cleanup_impl (impl);
+
+ // Create a DOMBuilder
+ DOMBuilder* parser =
+ ((DOMImplementationLS*)impl)->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
+
+ auto_ptr cleanup_builder (parser);
+
+ // Discard comment nodes in the document
+ parser->setFeature (XMLUni::fgDOMComments, false);
+
+ // Disable datatype normalization. The XML 1.0 attribute value
+ // normalization always occurs though.
+ parser->setFeature (XMLUni::fgDOMDatatypeNormalization, true);
+
+ // Do not create EntityReference nodes in the DOM tree. No
+ // EntityReference nodes will be created, only the nodes
+ // corresponding to their fully expanded sustitution text will be
+ // created.
+ parser->setFeature (XMLUni::fgDOMEntities, false);
+
+ // Perform Namespace processing.
+ parser->setFeature (XMLUni::fgDOMNamespaces, true);
+
+ // Perform Validation
+ parser->setFeature (XMLUni::fgDOMValidation, true);
+
+ // Do not include ignorable whitespace in the DOM tree.
+ parser->setFeature (XMLUni::fgDOMWhitespaceInElementContent, false);
+
+ // Enable the parser schema support.
+ parser->setFeature (XMLUni::fgXercesSchema, true);
+
+ // Enable full schema constraint checking, including checking which
+ // may be time-consuming or memory intensive. Currently, particle
+ // unique attribution constraint checking and particle derivation
+ // restriction checking are controlled by this option.
+ parser->setFeature (XMLUni::fgXercesSchemaFullChecking, true);
+
+ // The parser will treat validation error as fatal and will exit.
+ parser->setFeature (XMLUni::fgXercesValidationErrorAsFatal, true);
+
+ CIAO::Config_Handler::Config_Error_Handler handler;
+ parser->setErrorHandler(&handler);
+
+ DOMDocument* doc = parser->parseURI(url);
+ auto_ptr cleanup_doc (doc);
+
+ if (handler.getErrors())
+ {
+ return 1;
+ }
+ HANDLER obj (doc, DOMNodeFilter::SHOW_ELEMENT |
+ DOMNodeFilter::SHOW_TEXT);
+
+ DATA data;
+ (obj.*func)(data);
+ Deployment::DnC_Dump::dump (data);
+ //domain_handler.dump(domain);
+
+ // parser->release ();
+ }
+ catch (const DOMException& e)
+ {
+ const unsigned int maxChars = 2047;
+ XMLCh errText[maxChars + 1];
+
+ ACE_ERROR ((LM_ERROR,
+ "\nException occured while parsing %s: \n", url));
+ ACE_ERROR ((LM_ERROR,
+ "DOMException code: %d\n ", e.code));
+ if (DOMImplementation::loadDOMExceptionMsg(e.code, errText, maxChars))
+ {
+ char* message = XMLString::transcode (errText);
+ ACE_Auto_Basic_Array_Ptr cleanup_message (message);
+ ACE_ERROR ((LM_ERROR, "Message is: %s\n", message));
+ }
+ return 1;
+ }
+ catch (const XMLException& e)
+ {
+ char* message = XMLString::transcode (e.getMessage());
+ ACE_Auto_Basic_Array_Ptr cleanup_message (message);
+ ACE_ERROR ((LM_ERROR, "\nException occured: %s\n ", message));
+ return 1;
+ }
+ catch (CORBA::Exception& ex)
+ {
+ ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: ");
+ return 1;
+ }
+ catch (...)
+ {
+ ACE_ERROR ((LM_ERROR, "Caught unknown exception\n"));
+ return 1;
+ }
+
+ xercesc::XMLPlatformUtils::Terminate();
+ return 0;
+ }
+}
+
+#endif /*HANDLER_TEST_CPP*/
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
index 2cc04a9a18a..81004d6b00d 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
@@ -62,7 +62,7 @@ project(NodeAppTest_RoundTrip_svnt) : ciao_servant_dnc {
}
}
-project(NodeAppTest_RoundTrip_exec) : ciao_component_dnc, ciao_events_dnc, ciao_server_dnc {
+project(NodeAppTest_RoundTrip_exec) : ciao_component_dnc {
after += NodeAppTest_RoundTrip_stub NodeAppTest_RoundTrip_svnt
sharedname = NodeAppTest_RoundTrip_exec
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
index 21502bb63a6..c371f277a43 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
@@ -18,7 +18,7 @@ int counter = 0;
int parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "k:n:");
+ ACE_Get_Arg_Opt get_opts (argc, argv, "k:n:");
int c;
while ((c = get_opts ()) != -1)
@@ -47,7 +47,7 @@ int parse_args (int argc, char *argv[])
}
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
std::vector comp_list;
//std::vector::const_iterator iter;
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
index d984de8860b..90cafe7eee5 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
@@ -11,7 +11,7 @@ const char *ior = "file://test.ior";
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "k:");
+ ACE_Get_Arg_Opt get_opts (argc, argv, "k:");
int c;
while ((c = get_opts ()) != -1)
@@ -35,7 +35,7 @@ parse_args (int argc, char *argv[])
}
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
ACE_TRY_NEW_ENV
{
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
index 8b6d23887fb..be98bf4ce1c 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
@@ -11,7 +11,7 @@ const char *ior = "file://test.ior";
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "k:");
+ ACE_Get_Arg_Opt get_opts (argc, argv, "k:");
int c;
while ((c = get_opts ()) != -1)
@@ -35,7 +35,7 @@ parse_args (int argc, char *argv[])
}
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
ACE_TRY_NEW_ENV
{
diff --git a/TAO/CIAO/NEWS b/TAO/CIAO/NEWS
index ab5537075ec..275c66d8c1b 100644
--- a/TAO/CIAO/NEWS
+++ b/TAO/CIAO/NEWS
@@ -70,24 +70,6 @@ PLANNED MAJOR CHANGES FOR THE NEXT RELEASE
USER VISIBLE CHANGES BETWEEN CIAO-0.5.0 and CIAO-0.5.1
====================================================
-. Added the support of integrating real-time event service into the
- CIAO core framework. Enhanced DAnCE to support declaratively configure
- and deploy real-time event channels to mediate event communication
- among components.
-
-. Fixed a bug in detecting External connection and Internal
- connections when components are shared across different
- deployment plans. Earlier when removing connections attached
- to an external/shared component, not *all* connections
- associated with this components are purged from the
- to-be-removed connections list.
-
-. Fixed a bug when redeploying components using the same set
- of NodeManagers, the destroy of applications results not
- all internal components and external/shared components
- are unbinded from the cached map, which sometimes causes
- duplicate instance exception thrown.
-
. Fixed bug in detecting name clashes between names of ports of the same
category (facet, event sink, etc.) in the same component.
diff --git a/TAO/CIAO/ciao/Deployment_Core.idl b/TAO/CIAO/ciao/Deployment_Core.idl
index 6f0a465f7e2..bfb58b6e2c8 100644
--- a/TAO/CIAO/ciao/Deployment_Core.idl
+++ b/TAO/CIAO/ciao/Deployment_Core.idl
@@ -284,7 +284,7 @@ module Deployment
/// CIAO specific extensions
/// Activate a component instance from the NodeApplication
void activate_component (in string inst_name)
- raises (::Deployment::StartError);
+ raises (::Components::RemoveFailure);
/// CIAO specific extensions
/// Passivate a component instance from the NodeApplication
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.idl b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.idl
new file mode 100644
index 00000000000..bcfcca9ef93
--- /dev/null
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.idl
@@ -0,0 +1,69 @@
+// $Id$
+
+/**
+ * @file CIAO_Events.idl
+ *
+ * @author George Edwards
+ * @author Gan Deng
+ *
+ * @brief Interfaces for configuring CIAO's event mechanism.
+ */
+
+#include "ciao/CCM_Event.idl"
+
+module CIAO
+{
+ /// A component's UUID + port name.
+ typedef string CONNECTION_ID;
+
+ enum EventServiceType
+ {
+ DIRECT,
+ EC,
+ RTEC,
+ NOTIFY,
+ RTNOTIFY
+ };
+
+ interface Supplier_Config
+ {
+ attribute CONNECTION_ID supplier_id;
+
+ readonly attribute EventServiceType service_type;
+
+ void destroy ();
+ };
+
+ interface Consumer_Config : Supplier_Config
+ {
+ attribute CONNECTION_ID consumer_id;
+ attribute Components::EventConsumerBase consumer;
+
+ void start_conjunction_group (in long size);
+
+ void start_disjunction_group (in long size);
+
+ void insert_source (in CONNECTION_ID source_id);
+
+ void insert_type (in long event_type);
+ };
+
+ interface CIAO_Event_Service : Components::EventConsumerBase
+ {
+ Supplier_Config create_supplier_config ();
+
+ Consumer_Config create_consumer_config ();
+
+ void connect_event_supplier (in Supplier_Config supplier_conf);
+
+ void connect_event_consumer (in Consumer_Config consumer_conf);
+
+ void disconnect_event_supplier (in CONNECTION_ID conn_id)
+ raises (Components::InvalidConnection);
+
+ void disconnect_event_consumer (in CONNECTION_ID conn_id)
+ raises (Components::InvalidConnection);
+
+ //void push_event (in Components::EventBase ev);
+ };
+};
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
index a5a1417673e..c4ba7145521 100644
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project (CIAO_DnC_Events) : orbsvcslib, ciao_rtevent_dnc {
+project (CIAO_DnC_Events) : orbsvcslib, ciao_rtevent_dnc, ciao_events_base_dnc {
sharedname = CIAO_DnC_Events
idlflags += -Wb,export_include=CIAO_Events_Export.h -Wb,export_macro=CIAO_EVENTS_Export
@@ -14,7 +14,4 @@ project (CIAO_DnC_Events) : orbsvcslib, ciao_rtevent_dnc {
Header_Files {
CIAO_EventService_Factory_impl.h
}
-
- IDL_Files {
- }
}
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp b/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp
index 330b4419477..4c284e26fb0 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp
@@ -17,7 +17,7 @@ const char *unsubscribe_name = 0;
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "k:s:u:");
+ ACE_Get_Arg_Opt get_opts (argc, argv, "k:s:u:");
int c;
while ((c = get_opts ()) != -1)
@@ -52,7 +52,7 @@ parse_args (int argc, char *argv[])
return 0;
}
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
{
ACE_TRY_NEW_ENV
{
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.mpc b/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.mpc
index 70d9efbce53..724277307ed 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.mpc
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.mpc
@@ -2,7 +2,6 @@
// This file is generated with "generate_component_mpc.pl -p Stock_Base Broker"
project(Stock_Base_Broker_stub): ciao_client_dnc {
- avoids += ace_for_tao
after += Stock_Base_stub
sharedname = Broker_stub
idlflags += -Wb,stub_export_macro=BROKER_STUB_Export -Wb,stub_export_include=Broker_stub_export.h -Wb,skel_export_macro=BROKER_SVNT_Export -Wb,skel_export_include=Broker_svnt_export.h
@@ -19,7 +18,6 @@ project(Stock_Base_Broker_stub): ciao_client_dnc {
}
project(Stock_Base_Broker_svnt) : ciao_servant_dnc {
- avoids += ace_for_tao
after += Stock_Base_svnt Stock_Base_Broker_stub
sharedname = Broker_svnt
libs += Broker_stub Stock_Base_stub Stock_Base_svnt
@@ -44,7 +42,6 @@ project(Stock_Base_Broker_svnt) : ciao_servant_dnc {
project(Stock_Base_Broker_exec) : ciao_component_dnc {
- avoids += ace_for_tao
after += Stock_Base_Broker_svnt
sharedname = Broker_exec
libs += Broker_stub Broker_svnt Stock_Base_stub Stock_Base_svnt
@@ -64,7 +61,6 @@ project(Stock_Base_Broker_exec) : ciao_component_dnc {
project (Stock_Broker) : ciao_client_dnc, valuetype{
- avoids += ace_for_tao
exename = Broker
after += Stock_Base_Broker_stub
libs += Broker_stub Stock_Base_stub
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp
index 9332d1a3e0c..3ba0c93cf81 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp
@@ -17,7 +17,7 @@ int turn_on = 1;
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "k:r:of");
+ ACE_Get_Arg_Opt get_opts (argc, argv, "k:r:of");
int c;
while ((c = get_opts ()) != -1)
@@ -58,7 +58,7 @@ parse_args (int argc, char *argv[])
}
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
{
ACE_TRY_NEW_ENV
{
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
index 73fd7a94ffe..a07e199285d 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
@@ -20,11 +20,10 @@ project(Stock_Base_Distributor_stub): ciao_events_base_dnc {
}
project(Stock_Base_Distributor_svnt) : ciao_servant_dnc {
- avoids += ace_for_tao
after += Stock_Base_svnt Stock_Base_Distributor_stub
sharedname = Distributor_svnt
libs += Distributor_stub Stock_Base_stub Stock_Base_svnt
-
+
idlflags += -Wb,export_macro=DISTRIBUTOR_SVNT_Export -Wb,export_include=Distributor_svnt_export.h
dynamicflags = DISTRIBUTOR_SVNT_BUILD_DLL
@@ -45,27 +44,25 @@ project(Stock_Base_Distributor_svnt) : ciao_servant_dnc {
project(Stock_Base_Distributor_exec) : ciao_component_dnc {
- avoids += ace_for_tao
after += Stock_Base_Distributor_svnt
sharedname = Distributor_exec
libs += Distributor_stub Distributor_svnt Stock_Base_stub Stock_Base_svnt
-
+
idlflags += -Wb,export_macro=DISTRIBUTOR_EXEC_Export -Wb,export_include=Distributor_exec_export.h
dynamicflags = DISTRIBUTOR_EXEC_BUILD_DLL
IDL_Files {
-
+
}
Source_Files {
-
+
Distributor_exec.cpp
}
}
project (Stock_Distributor) : ciao_client_dnc, valuetype{
- avoids += ace_for_tao
exename = Distributor
after += Stock_Base_Distributor_stub
libs += Distributor_stub Stock_Base_stub
@@ -77,4 +74,3 @@ project (Stock_Distributor) : ciao_client_dnc, valuetype{
Distributor.cpp
}
}
-
diff --git a/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc b/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
index 7eaa7d913a4..26aa8a8b939 100644
--- a/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
+++ b/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
@@ -7,9 +7,9 @@ project(BMClosedED_DnC_stub): ciao_events_base_dnc {
after += BasicSP_DnC_stub
sharedname = BMClosedED_stub
- idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export
- idlflags += -Wb,stub_export_include=BMClosedED_stub_export.h
- idlflags += -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export
+ idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export
+ idlflags += -Wb,stub_export_include=BMClosedED_stub_export.h
+ idlflags += -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export
idlflags += -Wb,skel_export_include=BMClosedED_svnt_export.h
libs += BasicSP_stub
@@ -26,17 +26,16 @@ project(BMClosedED_DnC_stub): ciao_events_base_dnc {
}
project(BMClosedED_DnC_svnt) : ciao_servant_dnc {
- avoids += ace_for_tao
after += BasicSP_DnC_svnt BMClosedED_DnC_stub
sharedname = BMClosedED_svnt
- libs += BMClosedED_stub BasicSP_stub
+ libs += BMClosedED_stub BasicSP_stub
libs += BasicSP_svnt
libpaths += ..
- idlflags += -Wb,export_macro=BMCLOSEDED_SVNT_Export
+ idlflags += -Wb,export_macro=BMCLOSEDED_SVNT_Export
idlflags += -Wb,export_include=BMClosedED_svnt_export.h
dynamicflags = BMCLOSEDED_SVNT_BUILD_DLL
@@ -58,16 +57,15 @@ project(BMClosedED_DnC_svnt) : ciao_servant_dnc {
project(BMClosedED_DnC_exec) : ciao_component_dnc {
- avoids += ace_for_tao
after += BMClosedED_DnC_svnt
sharedname = BMClosedED_exec
- libs += BMClosedED_stub BMClosedED_svnt
+ libs += BMClosedED_stub BMClosedED_svnt
libs += BasicSP_stub BasicSP_svnt
libpaths += ..
- idlflags += -Wb,export_macro=BMCLOSEDED_EXEC_Export
+ idlflags += -Wb,export_macro=BMCLOSEDED_EXEC_Export
idlflags += -Wb,export_include=BMClosedED_exec_export.h
dynamicflags = BMCLOSEDED_EXEC_BUILD_DLL
diff --git a/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc b/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
index 762fb25c8e8..18c801c9c9a 100644
--- a/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
+++ b/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
@@ -20,7 +20,6 @@ project(BMDevice_DnC_stub): ciao_events_base_dnc {
}
project(BMDevice_DnC_svnt) : ciao_servant_dnc {
- avoids += ace_for_tao
after += BMDevice_DnC_stub BasicSP_DnC_stub
sharedname = BMDevice_svnt
libs += BMDevice_stub BasicSP_stub BasicSP_svnt
@@ -45,7 +44,6 @@ project(BMDevice_DnC_svnt) : ciao_servant_dnc {
project(BMDevice_DnC_exec) : ciao_component_dnc {
- avoids += ace_for_tao
after += BMDevice_DnC_svnt
sharedname = BMDevice_exec
libs += BMDevice_stub BMDevice_svnt BasicSP_stub BasicSP_svnt
diff --git a/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc b/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
index 740c50abf8e..6a516f426d3 100644
--- a/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
+++ b/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
@@ -7,12 +7,12 @@ project(BMDisplay_DnC_stub): ciao_events_base_dnc {
sharedname = BMDisplay_stub
- idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export
- idlflags += -Wb,stub_export_include=BMDisplay_stub_export.h
- idlflags += -Wb,skel_export_macro=BMDISPLAY_SVNT_Export
+ idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export
+ idlflags += -Wb,stub_export_include=BMDisplay_stub_export.h
+ idlflags += -Wb,skel_export_macro=BMDISPLAY_SVNT_Export
idlflags += -Wb,skel_export_include=BMDisplay_svnt_export.h
dynamicflags = BMDISPLAY_STUB_BUILD_DLL
-
+
libs += BasicSP_stub
IDL_Files {
@@ -25,7 +25,6 @@ project(BMDisplay_DnC_stub): ciao_events_base_dnc {
}
project(BMDisplay_DnC_svnt) : ciao_servant_dnc {
- avoids += ace_for_tao
after += BasicSP_DnC_svnt BMDisplay_DnC_stub
sharedname = BMDisplay_svnt
@@ -34,7 +33,7 @@ project(BMDisplay_DnC_svnt) : ciao_servant_dnc {
libpaths += ..
- idlflags += -Wb,export_macro=BMDISPLAY_SVNT_Export
+ idlflags += -Wb,export_macro=BMDISPLAY_SVNT_Export
idlflags += -Wb,export_include=BMDisplay_svnt_export.h
dynamicflags = BMDISPLAY_SVNT_BUILD_DLL
@@ -56,17 +55,16 @@ project(BMDisplay_DnC_svnt) : ciao_servant_dnc {
project(BMDisplay_DnC_exec) : ciao_component_dnc {
- avoids += ace_for_tao
after += BMDisplay_DnC_svnt
sharedname = BMDisplay_exec
- libs += BMDisplay_stub BMDisplay_svnt
+ libs += BMDisplay_stub BMDisplay_svnt
libs += BasicSP_stub BasicSP_svnt
libpaths += ..
- idlflags += -Wb,export_macro=BMDISPLAY_EXEC_Export
+ idlflags += -Wb,export_macro=BMDISPLAY_EXEC_Export
idlflags += -Wb,export_include=BMDisplay_exec_export.h
dynamicflags = BMDISPLAY_EXEC_BUILD_DLL
diff --git a/TAO/CIAO/examples/BasicSP/EC/EC.mpc b/TAO/CIAO/examples/BasicSP/EC/EC.mpc
index d425aad92e3..314f7c62be4 100644
--- a/TAO/CIAO/examples/BasicSP/EC/EC.mpc
+++ b/TAO/CIAO/examples/BasicSP/EC/EC.mpc
@@ -7,9 +7,9 @@ project(EC_DnC_stub): ciao_events_base_dnc {
sharedname = EC_stub
- idlflags += -Wb,stub_export_macro=EC_STUB_Export
- idlflags += -Wb,stub_export_include=EC_stub_export.h
- idlflags += -Wb,skel_export_macro=EC_SVNT_Export
+ idlflags += -Wb,stub_export_macro=EC_STUB_Export
+ idlflags += -Wb,stub_export_include=EC_stub_export.h
+ idlflags += -Wb,skel_export_macro=EC_SVNT_Export
idlflags += -Wb,skel_export_include=EC_svnt_export.h
dynamicflags = EC_STUB_BUILD_DLL
@@ -26,13 +26,12 @@ project(EC_DnC_stub): ciao_events_base_dnc {
}
project(EC_DnC_svnt) : ciao_servant_dnc {
- avoids += ace_for_tao
after += BasicSP_DnC_svnt EC_DnC_stub
sharedname = EC_svnt
libpaths += ..
- idlflags += -Wb,export_macro=EC_SVNT_Export
+ idlflags += -Wb,export_macro=EC_SVNT_Export
idlflags += -Wb,export_include=EC_svnt_export.h
dynamicflags = EC_SVNT_BUILD_DLL
@@ -56,7 +55,6 @@ project(EC_DnC_svnt) : ciao_servant_dnc {
project(EC_DnC_exec) : ciao_component_dnc {
- avoids += ace_for_tao
after += EC_DnC_svnt
sharedname = EC_exec
@@ -64,7 +62,7 @@ project(EC_DnC_exec) : ciao_component_dnc {
libpaths += ..
- idlflags += -Wb,export_macro=EC_EXEC_Export
+ idlflags += -Wb,export_macro=EC_EXEC_Export
idlflags += -Wb,export_include=EC_exec_export.h
dynamicflags = EC_EXEC_BUILD_DLL
@@ -82,7 +80,6 @@ project(EC_DnC_exec) : ciao_component_dnc {
project (EC_DnC_client) : ciao_client_dnc, valuetype {
- avoids += ace_for_tao
exename = client
after += EC_DnC_stub
libs += EC_stub BasicSP_stub
diff --git a/TAO/CIAO/examples/BasicSP/EC/client.cpp b/TAO/CIAO/examples/BasicSP/EC/client.cpp
index 2c2f34118bc..7b3c62c776f 100644
--- a/TAO/CIAO/examples/BasicSP/EC/client.cpp
+++ b/TAO/CIAO/examples/BasicSP/EC/client.cpp
@@ -16,7 +16,7 @@
#include "ace/OS_NS_unistd.h"
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
ACE_TRY_NEW_ENV
{
diff --git a/TAO/CIAO/examples/BasicSP/EC/controller.cpp b/TAO/CIAO/examples/BasicSP/EC/controller.cpp
index d52ac54dba9..0bd9a112e7f 100644
--- a/TAO/CIAO/examples/BasicSP/EC/controller.cpp
+++ b/TAO/CIAO/examples/BasicSP/EC/controller.cpp
@@ -18,7 +18,7 @@ int turn_on = 1;
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "k:r:of");
+ ACE_Get_Arg_Opt get_opts (argc, argv, "k:r:of");
int c;
while ((c = get_opts ()) != -1)
@@ -70,7 +70,7 @@ parse_args (int argc, char *argv[])
}
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
ACE_TRY_NEW_ENV
{
diff --git a/TAO/CIAO/examples/Display/GPS/GPS.mpc b/TAO/CIAO/examples/Display/GPS/GPS.mpc
index b72c8b64f97..5d60b1dc6d0 100644
--- a/TAO/CIAO/examples/Display/GPS/GPS.mpc
+++ b/TAO/CIAO/examples/Display/GPS/GPS.mpc
@@ -9,7 +9,7 @@ project(GPS_DnC_stub): ciao_events_base_dnc {
libpaths+=..
libs += HUDisplay_DnC_stub
dynamicflags = GPS_STUB_BUILD_DLL
-
+
IDL_Files {
GPS.idl
}
@@ -20,7 +20,6 @@ project(GPS_DnC_stub): ciao_events_base_dnc {
}
project(GPS_DnC_svnt) : ciao_servant_dnc {
- avoids += ace_for_tao
after += GPS_DnC_svnt GPS_DnC_stub HUDisplay_DnC_svnt
sharedname = GPS_DnC_svnt
libs += GPS_DnC_stub HUDisplay_DnC_stub HUDisplay_DnC_svnt
@@ -45,7 +44,6 @@ project(GPS_DnC_svnt) : ciao_servant_dnc {
project(GPS_DnC_exec) : ciao_component_dnc {
- avoids += ace_for_tao
after += GPS_DnC_svnt
sharedname = GPS_DnC_exec
libs += GPS_DnC_stub GPS_DnC_svnt HUDisplay_DnC_stub HUDisplay_DnC_svnt
@@ -58,12 +56,9 @@ project(GPS_DnC_exec) : ciao_component_dnc {
}
Source_Files {
-
+
GPSEIC.cpp
GPS_exec.cpp
}
}
-
-
-
diff --git a/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc b/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
index 3addb40ebee..e4edcc630c5 100644
--- a/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
+++ b/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
@@ -18,11 +18,10 @@ project(NavDisplay_DnC_stub): ciao_events_base_dnc {
}
project(NavDisplay_DnC_svnt) : ciao_servant_dnc {
- avoids += ace_for_tao
after += HUDisplay_DnC_svnt NavDisplay_DnC_stub
sharedname = NavDisplay_DnC_svnt
libs += NavDisplay_DnC_stub HUDisplay_DnC_stub HUDisplay_DnC_svnt
-
+
idlflags += -Wb,export_macro=NAVDISPLAY_SVNT_Export -Wb,export_include=NavDisplay_svnt_export.h
dynamicflags = NAVDISPLAY_SVNT_BUILD_DLL
@@ -43,7 +42,6 @@ project(NavDisplay_DnC_svnt) : ciao_servant_dnc {
project(NavDisplay_DnC_exec) : ciao_component_dnc {
- avoids += ace_for_tao
after += NavDisplay_DnC_svnt
sharedname = NavDisplay_DnC_exec
libs += NavDisplay_DnC_stub NavDisplay_DnC_svnt HUDisplay_DnC_stub HUDisplay_DnC_svnt
@@ -60,6 +58,3 @@ project(NavDisplay_DnC_exec) : ciao_component_dnc {
NavDisplay_exec.cpp
}
}
-
-
-
diff --git a/TAO/CIAO/examples/Display/RateGen/RateGen.mpc b/TAO/CIAO/examples/Display/RateGen/RateGen.mpc
index e0cd424393e..71bdfe9297f 100644
--- a/TAO/CIAO/examples/Display/RateGen/RateGen.mpc
+++ b/TAO/CIAO/examples/Display/RateGen/RateGen.mpc
@@ -18,7 +18,6 @@ project(RateGen_DnC_stub): ciao_events_base_dnc {
}
project(RateGen_DnC_svnt) : ciao_servant_dnc {
- avoids += ace_for_tao
after += HUDisplay_DnC_svnt RateGen_DnC_stub
sharedname = RateGen_DnC_svnt
libs += RateGen_DnC_stub HUDisplay_DnC_stub HUDisplay_DnC_svnt
@@ -43,7 +42,6 @@ project(RateGen_DnC_svnt) : ciao_servant_dnc {
project(RateGen_DnC_exec) : ciao_component_dnc {
- avoids += ace_for_tao
after += RateGen_DnC_svnt
sharedname = RateGen_DnC_exec
libs += RateGen_DnC_stub RateGen_DnC_svnt HUDisplay_DnC_stub HUDisplay_DnC_svnt
@@ -63,20 +61,16 @@ project(RateGen_DnC_exec) : ciao_component_dnc {
-project (RateGen_DnC_controller) : ciao_client_dnc, valuetype {
- avoids += ace_for_tao
- exename = controller
- after += RateGen_DnC_stub
- libs += RateGen_DnC_stub HUDisplay_DnC_stub
- libpaths += ..
+ project (RateGen_DnC_controller) : ciao_client_dnc, valuetype {
+ exename = controller
+ after += RateGen_DnC_stub
+ libs += RateGen_DnC_stub HUDisplay_DnC_stub
+ libpaths += ..
- IDL_Files {
- }
+ IDL_Files {
+ }
Source_Files {
- controller.cpp
- }
+ controller.cpp
+ }
}
-
-
-
diff --git a/TAO/CIAO/examples/Display/RateGen/controller.cpp b/TAO/CIAO/examples/Display/RateGen/controller.cpp
index f90ee66e797..3f2fa87298f 100644
--- a/TAO/CIAO/examples/Display/RateGen/controller.cpp
+++ b/TAO/CIAO/examples/Display/RateGen/controller.cpp
@@ -19,7 +19,7 @@ int turn_on = 1;
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "k:r:of");
+ ACE_Get_Arg_Opt get_opts (argc, argv, "k:r:of");
int c;
while ((c = get_opts ()) != -1)
@@ -67,7 +67,7 @@ parse_args (int argc, char *argv[])
}
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
ACE_TRY_NEW_ENV
{
diff --git a/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc b/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc
index abde96ca404..3694a180d18 100644
--- a/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc
+++ b/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc
@@ -20,25 +20,24 @@ project(Hello_Base_Receiver_DnC_stub): ciao_events_base_dnc {
Source_Files {
ReceiverC.cpp
}
-
+
Header_Files {
ReceiverC.h
}
-
+
Inline_Files {
ReceiverC.inl
}
}
project(Hello_Base_Receiver_DnC_svnt) : ciao_servant_dnc {
- avoids += ace_for_tao
after += Hello_Base_DnC_svnt \
Hello_Base_Receiver_DnC_stub
sharedname = Receiver_DnC_svnt
libs += Receiver_DnC_stub \
Hello_Base_DnC_stub \
Hello_Base_DnC_svnt
-
+
idlflags += -Sc \
-Wb,export_macro=RECEIVER_SVNT_Export \
-Wb,export_include=Receiver_svnt_export.h
@@ -72,14 +71,13 @@ project(Hello_Base_Receiver_DnC_svnt) : ciao_servant_dnc {
project(Hello_Base_Receiver_DnC_exec) : ciao_component_dnc {
- avoids += ace_for_tao
after += Hello_Base_Receiver_DnC_svnt
sharedname = Receiver_DnC_exec
libs += Receiver_DnC_stub \
Receiver_DnC_svnt \
Hello_Base_DnC_stub \
Hello_Base_DnC_svnt
-
+
idlflags += -Sc \
-Wb,export_macro=RECEIVER_EXEC_Export \
-Wb,export_include=Receiver_exec_export.h
@@ -91,10 +89,10 @@ project(Hello_Base_Receiver_DnC_exec) : ciao_component_dnc {
Source_Files {
Receiver_exec.cpp
}
-
+
Header_Files {
}
-
+
Inline_Files {
}
}
diff --git a/TAO/CIAO/examples/Hello/Sender/Sender.mpc b/TAO/CIAO/examples/Hello/Sender/Sender.mpc
index 1363b6c0e71..9a903b00ee1 100644
--- a/TAO/CIAO/examples/Hello/Sender/Sender.mpc
+++ b/TAO/CIAO/examples/Hello/Sender/Sender.mpc
@@ -20,18 +20,17 @@ project(Hello_Base_Sender_DnC_stub): ciao_events_base_dnc {
Source_Files {
SenderC.cpp
}
-
+
Header_Files {
SenderC.h
}
-
+
Inline_Files {
SenderC.inl
}
}
project(Hello_Base_Sender_DnC_svnt) : ciao_servant_dnc {
- avoids += ace_for_tao
after += Hello_Base_DnC_svnt \
Hello_Base_Sender_DnC_stub
sharedname = Sender_DnC_svnt
@@ -57,13 +56,13 @@ project(Hello_Base_Sender_DnC_svnt) : ciao_servant_dnc {
SenderS.cpp
Sender_svnt.cpp
}
-
+
Header_Files {
SenderEC.h
SenderS.h
Sender_svnt.h
}
-
+
Inline_Files {
SenderEC.inl
SenderS.inl
@@ -71,7 +70,6 @@ project(Hello_Base_Sender_DnC_svnt) : ciao_servant_dnc {
}
project(Hello_Base_Sender_DnC_exec) : ciao_component_dnc {
- avoids += ace_for_tao
after += Hello_Base_Sender_DnC_svnt
sharedname = Sender_DnC_exec
libs += Sender_DnC_stub \
@@ -90,14 +88,13 @@ project(Hello_Base_Sender_DnC_exec) : ciao_component_dnc {
Source_Files {
Sender_exec.cpp
}
-
+
Header_Files {
Sender_exec.h
}
}
project (Hello_DnC_Starter) : ciao_client_dnc, valuetype {
- avoids += ace_for_tao
exename = starter
after += Hello_Base_Sender_DnC_stub
libs += Sender_DnC_stub Hello_Base_DnC_stub
@@ -108,10 +105,10 @@ project (Hello_DnC_Starter) : ciao_client_dnc, valuetype {
Source_Files {
starter.cpp
}
-
+
Header_Files {
}
-
+
Inline_Files {
}
}
diff --git a/TAO/CIAO/examples/Hello/Sender/starter.cpp b/TAO/CIAO/examples/Hello/Sender/starter.cpp
index 7c647ef01dd..3577fcee991 100644
--- a/TAO/CIAO/examples/Hello/Sender/starter.cpp
+++ b/TAO/CIAO/examples/Hello/Sender/starter.cpp
@@ -11,7 +11,7 @@ const char * message = 0;
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "k:m:");
+ ACE_Get_Arg_Opt get_opts (argc, argv, "k:m:");
int c = 0;
while ((c = get_opts ()) != -1)
@@ -47,7 +47,7 @@ parse_args (int argc, char *argv[])
}
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
ACE_TRY_NEW_ENV
{
diff --git a/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc b/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc
index 3a587791546..d8676fff50c 100644
--- a/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc
+++ b/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc
@@ -19,11 +19,10 @@ project(HelloB_Receiver_DnC_Upgradeable_stub): ciao_events_base_dnc {
}
project(HelloB_Receiver_DnC_Upgradeable_svnt) : ciao_servant_dnc {
- avoids += ace_for_tao
after += Hello_Base_DnC_Upgradeable_svnt HelloB_Receiver_DnC_Upgradeable_stub
sharedname = Receiver_DnC_Upgradeable_svnt
libs += Receiver_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_svnt
-
+
idlflags += -Wb,export_macro=RECEIVER_SVNT_Export -Wb,export_include=Receiver_svnt_export.h
dynamicflags = RECEIVER_SVNT_BUILD_DLL
cidlflags -= --
@@ -46,11 +45,10 @@ project(HelloB_Receiver_DnC_Upgradeable_svnt) : ciao_servant_dnc {
project(HelloB_Receiver_DnC_Upgradeable_exec) : ciao_component_dnc {
- avoids += ace_for_tao
after += HelloB_Receiver_DnC_Upgradeable_svnt
sharedname = Receiver_DnC_Upgradeable_exec
libs += Receiver_DnC_Upgradeable_stub Receiver_DnC_Upgradeable_svnt Hello_Base_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_svnt
-
+
idlflags += -Wb,export_macro=RECEIVER_EXEC_Export -Wb,export_include=Receiver_exec_export.h
dynamicflags = RECEIVER_EXEC_BUILD_DLL
diff --git a/TAO/CIAO/examples/Swapping/Sender/Sender.mpc b/TAO/CIAO/examples/Swapping/Sender/Sender.mpc
index f2490ad5976..4539e7d5b56 100644
--- a/TAO/CIAO/examples/Swapping/Sender/Sender.mpc
+++ b/TAO/CIAO/examples/Swapping/Sender/Sender.mpc
@@ -20,7 +20,6 @@ project(HelloB_Sender_DnC_Upgradeable_stub): ciao_events_base_dnc {
}
project(HelloB_Sender_DnC_Upgradeable_svnt) : ciao_servant_dnc {
- avoids += ace_for_tao
after += Hello_Base_DnC_Upgradeable_svnt \
HelloB_Sender_DnC_Upgradeable_stub
sharedname = Sender_DnC_Upgradeable_svnt
@@ -48,7 +47,6 @@ project(HelloB_Sender_DnC_Upgradeable_svnt) : ciao_servant_dnc {
}
project(HelloB_Sender_DnC_Upgradeable_exec) : ciao_component_dnc {
- avoids += ace_for_tao
after += HelloB_Sender_DnC_Upgradeable_svnt
sharedname = Sender_DnC_Upgradeable_exec
libs += Sender_DnC_Upgradeable_stub Sender_DnC_Upgradeable_svnt Hello_Base_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_svnt
@@ -65,7 +63,6 @@ project(HelloB_Sender_DnC_Upgradeable_exec) : ciao_component_dnc {
}
project(HelloB_Sender_DnC_Upgradeable_exec_1) : ciao_component_dnc {
- avoids += ace_for_tao
after += HelloB_Sender_DnC_Upgradeable_svnt \
HelloB_Sender_DnC_Upgradeable_exec
sharedname = Sender_DnC_Upgradeable_exec_1
@@ -86,7 +83,6 @@ project(HelloB_Sender_DnC_Upgradeable_exec_1) : ciao_component_dnc {
}
project(HelloB_Sender_DnC_Upgradeable_exec_2) : ciao_component_dnc {
- avoids += ace_for_tao
after += HelloB_Sender_DnC_Upgradeable_svnt \
HelloB_Sender_DnC_Upgradeable_exec
sharedname = Sender_DnC_Upgradeable_exec_2
@@ -107,7 +103,6 @@ project(HelloB_Sender_DnC_Upgradeable_exec_2) : ciao_component_dnc {
}
project (Hello_DnC_Upgradeable_Starter) : ciao_client_dnc, valuetype{
- avoids += ace_for_tao
exename = Upgradeable_starter
after += HelloB_Sender_DnC_Upgradeable_stub
libs += Sender_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_stub
diff --git a/TAO/CIAO/examples/Swapping/Sender/starter.cpp b/TAO/CIAO/examples/Swapping/Sender/starter.cpp
index c88771ea568..82005cfe9aa 100644
--- a/TAO/CIAO/examples/Swapping/Sender/starter.cpp
+++ b/TAO/CIAO/examples/Swapping/Sender/starter.cpp
@@ -11,7 +11,7 @@ const char * message = "starters message";
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "k:m");
+ ACE_Get_Arg_Opt get_opts (argc, argv, "k:m");
int c = 0;
while ((c = get_opts ()) != -1)
@@ -48,7 +48,7 @@ parse_args (int argc, char *argv[])
}
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
ACE_TRY_NEW_ENV
{
diff --git a/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc b/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
index 59cb34c414d..32f12acaa2e 100644
--- a/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
@@ -1,7 +1,7 @@
// $Id$
project(Benchmark_stub): ciao_client_dnc {
- avoids += ace_for_tao
+
sharedname = Benchmark_stub
idlflags += -Wb,stub_export_macro=BENCHMARK_STUB_Export -Wb,stub_export_include=Benchmark_stub_export.h -Wb,skel_export_macro=BENCHMARK_SVNT_Export -Wb,skel_export_include=Benchmark_svnt_export.h
dynamicflags = BENCHMARK_STUB_BUILD_DLL
@@ -16,7 +16,6 @@ project(Benchmark_stub): ciao_client_dnc {
}
project(Benchmark_svnt) : ciao_component_dnc {
- avoids += ace_for_tao
after += Benchmark_stub
sharedname = Benchmark_svnt
libs += Benchmark_stub
@@ -32,7 +31,6 @@ project(Benchmark_svnt) : ciao_component_dnc {
}
project (*server) : taoserver, strategies,ciao_component_dnc {
- avoids += ace_for_tao
after += Benchmark_svnt
libs += Benchmark_svnt Benchmark_stub
diff --git a/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp b/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
index 7eba8595527..4be012c571d 100644
--- a/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
@@ -25,7 +25,7 @@ const char *ior4 = "file://comp4.ior";
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
ACE_TRY_NEW_ENV
{
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
index 3a6e310d8ae..793f486cbbf 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
@@ -2,7 +2,6 @@
// This file is generated with "generate_component_mpc.pl -l .. -p Benchmark -i -c RoundTrip"
project(RoundTrip_stub): ciao_client_dnc {
- avoids += ace_for_tao
after += Benchmark_stub
sharedname = RoundTrip_stub
@@ -25,7 +24,6 @@ project(RoundTrip_stub): ciao_client_dnc {
}
project(RoundTrip_svnt) : ciao_servant_dnc {
- avoids += ace_for_tao
after += Benchmark_svnt RoundTrip_stub
sharedname = RoundTrip_svnt
@@ -55,7 +53,6 @@ project(RoundTrip_svnt) : ciao_servant_dnc {
project(RoundTrip_exec) : ciao_component_dnc {
- avoids += ace_for_tao
after += RoundTrip_svnt
sharedname = RoundTrip_exec
@@ -80,7 +77,6 @@ project(RoundTrip_exec) : ciao_component_dnc {
project (RoundTrip_client) : ciao_client_dnc, valuetype, strategies{
- avoids += ace_for_tao
exename = client
after += RoundTrip_stub
libs += RoundTrip_stub Benchmark_stub
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
index 08bd7c111d9..15dc1c5d5ed 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
@@ -30,7 +30,7 @@ int
parse_args (int argc, char *argv[])
{
//parse arguments
- ACE_Get_Opt get_opts (argc, argv, "hxk:i:");
+ ACE_Get_Arg_Opt get_opts (argc, argv, "hxk:i:");
char c;
while ((c = get_opts ()) != -1)
switch (c)
@@ -83,7 +83,7 @@ set_priority ()
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
ACE_TRY_NEW_ENV
{
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
index 2df894b41c1..b4b6d285e1b 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
@@ -18,7 +18,7 @@
const char *ior = "file://test.ior";
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
ACE_TRY_NEW_ENV
{
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
index c6f2f81ae0c..8e6b863386a 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
@@ -9,7 +9,7 @@
const char *ior_output_file = "rtserver.ior";
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
int priority =
(ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/CIAO/performance-tests/Benchmark/server.cpp b/TAO/CIAO/performance-tests/Benchmark/server.cpp
index 345610c1eb2..e76dc23daf9 100644
--- a/TAO/CIAO/performance-tests/Benchmark/server.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/server.cpp
@@ -10,7 +10,7 @@
const char *ior_output_file = "test.ior";
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
int priority =
(ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/CIAO/performance-tests/Protocols/Controller/Controller.cpp b/TAO/CIAO/performance-tests/Protocols/Controller/Controller.cpp
index 2ea3c57a1c3..f88e97c5fe5 100644
--- a/TAO/CIAO/performance-tests/Protocols/Controller/Controller.cpp
+++ b/TAO/CIAO/performance-tests/Protocols/Controller/Controller.cpp
@@ -29,7 +29,7 @@ static const char *test_type = "PACED";
static int
parse_args (int argc, char **argv)
{
- ACE_Get_Opt get_opts (argc, argv, "a:b:c:d:e:i:m:p:r:s:t:u:v:w:x:y:z:");
+ ACE_Get_Arg_Opt get_opts (argc, argv, "a:b:c:d:e:i:m:p:r:s:t:u:v:w:x:y:z:");
int c;
while ((c = get_opts ()) != -1)
@@ -150,7 +150,7 @@ parse_args (int argc, char **argv)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc b/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
index 41501f86b1e..d7202e70781 100644
--- a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
+++ b/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
@@ -1,7 +1,6 @@
//$Id$
project(TSEC_CheckPoint_stub): ciao_client_dnc, event {
- avoids += ace_for_tao
after += ENW_stub
libpaths += ../interfaces
libs += ENW_stub
@@ -19,7 +18,6 @@ project(TSEC_CheckPoint_stub): ciao_client_dnc, event {
}
project(TSEC_CheckPoint_svnt) : ciao_servant_dnc, event {
- avoids += ace_for_tao
after += TSEC_CheckPoint_stub
after += ENW_svnt ENW_stub
sharedname = TSEC_CheckPoint_svnt
@@ -47,7 +45,6 @@ project(TSEC_CheckPoint_svnt) : ciao_servant_dnc, event {
project(TSEC_CheckPoint_exec) : ciao_component_dnc, event {
- avoids += ace_for_tao
after += TSEC_CheckPoint_svnt
after += ENW_svnt ENW_stub
@@ -73,7 +70,6 @@ project(TSEC_CheckPoint_exec) : ciao_component_dnc, event {
project(TSEC_CheckPoint_controller) : ciao_client_dnc, valuetype, event {
- avoids += ace_for_tao
exename = controller
after += TSEC_CheckPoint_stub
libs += TSEC_CheckPoint_stub ENW_stub
diff --git a/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc b/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
index 46cd2ef5573..faf1f9917b2 100644
--- a/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
+++ b/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
@@ -1,7 +1,7 @@
// $Id$
project(CIDL_Basic_stub): ciao_component_dnc {
- avoids += ace_for_tao
+
sharedname = CIDL_Basic_stub
idlflags += -Wb,stub_export_macro=BASIC_STUB_Export -Wb,stub_export_include=Basic_stub_export.h -Wb,skel_export_macro=BASIC_SVNT_Export -Wb,skel_export_include=Basic_svnt_export.h
dynamicflags = BASIC_STUB_BUILD_DLL
@@ -21,7 +21,6 @@ project(CIDL_Basic_stub): ciao_component_dnc {
}
project(CIDL_Basic_svnt) : ciao_servant_dnc {
- avoids += ace_for_tao
after += CIDL_Basic_stub
sharedname = CIDL_Basic_svnt
libs += CIDL_Basic_stub
@@ -44,7 +43,6 @@ project(CIDL_Basic_svnt) : ciao_servant_dnc {
}
project(CodeGen_stub): ciao_client_dnc {
- avoids += ace_for_tao
after += CIDL_Basic_stub
libs += CIDL_Basic_stub
sharedname = CodeGen_stub
@@ -66,7 +64,6 @@ project(CodeGen_stub): ciao_client_dnc {
}
project(CodeGen_svnt) : ciao_servant_dnc {
- avoids += ace_for_tao
after += CIDL_Basic_svnt CodeGen_stub
sharedname = CodeGen_svnt
libs += CodeGen_stub CIDL_Basic_stub CIDL_Basic_svnt
@@ -99,7 +96,6 @@ project(CodeGen_svnt) : ciao_servant_dnc {
project(CodeGen_exec) : ciao_component_dnc {
- avoids += ace_for_tao
after += CodeGen_svnt CodeGen_stub
sharedname = CodeGen_exec
libs += CodeGen_stub CodeGen_svnt CIDL_Basic_stub CIDL_Basic_svnt
diff --git a/TAO/CIAO/tests/Minimum/Receiver/Receiver.mpc b/TAO/CIAO/tests/Minimum/Receiver/Receiver.mpc
index 0fc995db8e8..3b7d613143d 100644
--- a/TAO/CIAO/tests/Minimum/Receiver/Receiver.mpc
+++ b/TAO/CIAO/tests/Minimum/Receiver/Receiver.mpc
@@ -2,7 +2,6 @@
// This file is generated with "generate_component_mpc_extra.pl -p Minimum_Base Receiver"
project(Minimum_Base_Receiver_DnC_stub): ciao_client_dnc {
- avoids += ace_for_tao
after += Minimum_Base_DnC_stub
sharedname = Minimum_Receiver_DnC_stub
idlflags += -Sc \
@@ -31,7 +30,6 @@ project(Minimum_Base_Receiver_DnC_stub): ciao_client_dnc {
}
project(Minimum_Base_Receiver_DnC_svnt) : ciao_servant_dnc {
- avoids += ace_for_tao
after += Minimum_Base_DnC_svnt \
Minimum_Base_Receiver_DnC_stub
sharedname = Minimum_Receiver_DnC_svnt
@@ -72,7 +70,6 @@ project(Minimum_Base_Receiver_DnC_svnt) : ciao_servant_dnc {
project(Minimum_Base_Receiver_DnC_exec) : ciao_component_dnc {
- avoids += ace_for_tao
after += Minimum_Base_Receiver_DnC_svnt
sharedname = Minimum_Receiver_DnC_exec
libs += Minimum_Receiver_DnC_stub \
diff --git a/TAO/CIAO/tests/Minimum/Sender/Sender.mpc b/TAO/CIAO/tests/Minimum/Sender/Sender.mpc
index 583a980b793..d1a92577943 100644
--- a/TAO/CIAO/tests/Minimum/Sender/Sender.mpc
+++ b/TAO/CIAO/tests/Minimum/Sender/Sender.mpc
@@ -2,7 +2,6 @@
// This file is generated with "generate_component_mpc_extra.pl -p Minimum_Base Sender"
project(Minimum_Base_Sender_DnC_stub): ciao_client_dnc {
- avoids += ace_for_tao
after += Minimum_Base_DnC_stub
sharedname = Minimum_Sender_DnC_stub
idlflags += -Sc \
@@ -31,7 +30,6 @@ project(Minimum_Base_Sender_DnC_stub): ciao_client_dnc {
}
project(Minimum_Base_Sender_DnC_svnt) : ciao_servant_dnc {
- avoids += ace_for_tao
after += Minimum_Base_DnC_svnt \
Minimum_Base_Sender_DnC_stub
sharedname = Minimum_Sender_DnC_svnt
@@ -71,7 +69,6 @@ project(Minimum_Base_Sender_DnC_svnt) : ciao_servant_dnc {
}
project(Minimum_Base_Sender_DnC_exec) : ciao_component_dnc {
- avoids += ace_for_tao
after += Minimum_Base_Sender_DnC_svnt
sharedname = Minimum_Sender_DnC_exec
libs += Minimum_Sender_DnC_stub \
diff --git a/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp
index 0a81e4c4859..204bd665a70 100644
--- a/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp
@@ -84,8 +84,8 @@ namespace CIAO
adcb != adce;
++adcb)
{
- Property_Handler::handle_property ((*adcb),
- dest.execParameter[len++]);
+ Property_Handler::get_property ((*adcb),
+ dest.execParameter[len++]);
}
if (src.id_p ())
diff --git a/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp
index f7e4a7e82d3..70104131917 100644
--- a/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp
@@ -70,8 +70,8 @@ namespace CIAO
pstart != pend;
++pstart)
{
- Property_Handler::handle_property (*pstart,
- toconfig.configProperty [pos++]);
+ Property_Handler::get_property (*pstart,
+ toconfig.configProperty [pos++]);
}
pos = 0;
@@ -81,7 +81,8 @@ namespace CIAO
port != desc.end_port ();
++port)
{
- CPD_Handler::handle_component_port_description (*port,
+ CPD_Handler::component_port_description (
+ *port,
toconfig.port[pos++]);
}
@@ -104,8 +105,9 @@ namespace CIAO
infoProp != desc.end_infoProperty();
infoProp++)
{
- Property_Handler::handle_property (*infoProp,
- toconfig.infoProperty[pos]);
+ Property_Handler::get_property (
+ *infoProp,
+ toconfig.infoProperty[pos]);
}
}
diff --git a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
index 3131ce5735b..b061c426987 100644
--- a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
@@ -24,13 +24,13 @@ namespace CIAO
eeci_b != eeci_e;
++eeci_b)
{
- CEPE_Handler::handle_external_port_endpoint ((*eeci_b),
+ CEPE_Handler::external_port_endpoint ((*eeci_b),
dest[pos++]);
}
}
void
- CEPE_Handler::handle_external_port_endpoint (
+ CEPE_Handler::external_port_endpoint (
const ComponentExternalPortEndpoint &src,
::Deployment::ComponentExternalPortEndpoint &dest)
{
diff --git a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.h b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.h
index f0ba7f0d2fb..681fcb1ec43 100644
--- a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.h
@@ -1,11 +1,11 @@
//==============================================================
/**
- * @file CEPE_Handler.h
- *
- * $Id$
- *
- * @author Jules White
- */
+* @file CEPE_Handler.h
+*
+* $Id$
+*
+* @author Jules White
+*/
//================================================================
#ifndef CIAO_CONFIG_HANDLERS_CEPE_HANDLER_H
@@ -21,46 +21,48 @@
namespace Deployment
{
- class ComponentExternalPortEndpoints;
- struct ComponentExternalPortEndpoint;
+class ComponentExternalPortEndpoints;
+struct ComponentExternalPortEndpoint;
}
namespace CIAO
{
- namespace Config_Handlers
- {
- class PlanConnectionDescription;
- class ComponentExternalPortEndpoint;
+namespace Config_Handlers
+{
+class PlanConnectionDescription;
+class ComponentExternalPortEndpoint;
- /*
- * @class CEPE_Handler
- *
- * @brief Handler class for types.
- *
- * This class defines handler methods to map values from
- * XSC ComponentExternalPortEndpoint objects, parsed from
- * the descriptor files, to the corresponding CORBA IDL type.
- *
- */
+/*
+* @class CEPE_Handler
+*
+* @brief Handler class for types.
+*
+* This class defines handler methods to map values from
+* XSC ComponentExternalPortEndpoint objects, parsed from
+* the descriptor files, to the corresponding CORBA IDL type.
+*
+*/
- class Config_Handlers_Export CEPE_Handler
- {
- public:
- static void external_port_endpoints (const PlanConnectionDescription &src,
- ::Deployment::ComponentExternalPortEndpoints &dest);
+class Config_Handlers_Export CEPE_Handler
+{
+public:
+static void external_port_endpoints (
+const PlanConnectionDescription &src,
+::Deployment::ComponentExternalPortEndpoints &dest);
- static ComponentExternalPortEndpoint
- external_port_endpoint (const ::Deployment::ComponentExternalPortEndpoint &src);
+static ComponentExternalPortEndpoint
+external_port_endpoint (
+const ::Deployment::ComponentExternalPortEndpoint &src);
- static void handle_external_port_endpoint (const ComponentExternalPortEndpoint &src,
- ::Deployment::ComponentExternalPortEndpoint &dest);
- };
+static void external_port_endpoint (const ComponentExternalPortEndpoint &src,
+::Deployment::ComponentExternalPortEndpoint &dest);
+};
- typedef Sequence_Handler < ComponentExternalPortEndpoint,
- ::Deployment::ComponentExternalPortEndpoints,
- ::Deployment::ComponentExternalPortEndpoint,
- CEPE_Handler::handle_external_port_endpoint > CEPE_Functor;
- }
+typedef Sequence_Handler < ComponentExternalPortEndpoint,
+::Deployment::ComponentExternalPortEndpoints,
+::Deployment::ComponentExternalPortEndpoint,
+CEPE_Handler::external_port_endpoint > CEPE_Functor;
+}
}
#include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp
index 0b7b54d1adf..67fcc0901c6 100644
--- a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp
@@ -10,7 +10,7 @@ namespace CIAO
namespace Config_Handlers
{
void
- CPD_Handler::handle_component_port_description (
+ CPD_Handler::component_port_description (
const ComponentPortDescription& desc,
Deployment::ComponentPortDescription& toconfig)
{
diff --git a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.h b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.h
index 57c97bc5b60..31737241b51 100644
--- a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.h
@@ -1,11 +1,11 @@
//================================================
/**
- * @file CPD_Handler.h
- *
- * $Id$
- *
- * @author Jules White
- */
+* @file CPD_Handler.h
+*
+* $Id$
+*
+* @author Jules White
+*/
//================================================
#ifndef CIAO_CONFIG_HANDLERS_CPD_HANDLER_H
@@ -22,46 +22,48 @@
namespace Deployment
{
- struct ComponentPortDescription;
- class ComponentPortDescriptions;
+class ComponentPortDescription;
+class ComponentPortDescriptions;
}
namespace CIAO
{
- namespace Config_Handlers
- {
- class ComponentPortDescription;
- /*
- * @class CPD_Handler
- *
- * @brief Handler class for types.
- *
- * This class defines handler methods to map values from
- * XSC objects, parsed from the descriptor files, to the
- * corresponding CORBA IDL type for the schema element.
- *
- */
+namespace Config_Handlers
+{
+class ComponentPortDescription;
+/*
+* @class CPD_Handler
+*
+* @brief Handler class for types.
+*
+* This class defines handler methods to map values from
+* XSC objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL type for the schema element.
+*
+*/
- class Config_Handlers_Export CPD_Handler
- {
+class Config_Handlers_Export CPD_Handler
+{
- public:
- /// Maps the values from the XSC object
- /// to the CORBA IDL type
- /// .
- static void handle_component_port_description (const ComponentPortDescription &desc,
- ::Deployment::ComponentPortDescription &toconfig);
+public:
+/// Maps the values from the XSC object
+/// to the CORBA IDL type
+/// .
+static void component_port_description (
+const ComponentPortDescription &desc,
+::Deployment::ComponentPortDescription &toconfig);
- static ComponentPortDescription
- component_port_description (const Deployment::ComponentPortDescription& src);
- };
+static ComponentPortDescription
+component_port_description (
+const Deployment::ComponentPortDescription& src);
+};
- typedef Sequence_Handler < ComponentPortDescription,
- ::Deployment::ComponentPortDescriptions,
- ::Deployment::ComponentPortDescription,
- CPD_Handler::handle_component_port_description > CPD_Functor;
+typedef Sequence_Handler < ComponentPortDescription,
+::Deployment::ComponentPortDescriptions,
+::Deployment::ComponentPortDescription,
+CPD_Handler::component_port_description > CPD_Functor;
- }
+}
}
#include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp
index 0953c705cd5..fb66b16fa41 100644
--- a/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp
@@ -1,4 +1,8 @@
-// $Id$
+#if defined (_MSC_VER) && (_MSC_VER < 1300)
+#pragma warning (disable: 4018)
+#pragma warning (disable: 4284)
+#pragma warning (disable: 4146)
+#endif
#include "DP_Handler.h"
#include "ace/UUID.h"
@@ -171,7 +175,7 @@ ACE_RCSID (Config_Handlers,
}
else
{
- Property_Handler::handle_property (*pstart,
+ Property_Handler::get_property (*pstart,
this->idl_dp_->infoProperty [len]);
}
}
diff --git a/TAO/CIAO/tools/Config_Handlers/Deployment.hpp b/TAO/CIAO/tools/Config_Handlers/Deployment.hpp
index ca6cf839a75..6c6cea3596f 100644
--- a/TAO/CIAO/tools/Config_Handlers/Deployment.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/Deployment.hpp
@@ -1,13 +1,13 @@
/* $Id$
- * This code was generated by the XML Schema Compiler.
- *
- * Changes made to this code will most likely be overwritten
- * when the handlers are recompiled.
- *
- * If you find errors or feel that there are bugfixes to be made,
- * please contact the current XSC maintainer:
- * Will Otte
- */
+* This code was generated by the XML Schema Compiler.
+*
+* Changes made to this code will most likely be overwritten
+* when the handlers are recompiled.
+*
+* If you find errors or feel that there are bugfixes to be made,
+* please contact the current XSC maintainer:
+* Will Otte
+*/
// Fix for Borland compilers, which seem to have a broken
@@ -24,9 +24,9 @@
//
namespace CIAO
{
- namespace Config_Handlers
- {
- }
+namespace Config_Handlers
+{
+}
}
#include
@@ -45,109 +45,109 @@ namespace CIAO
namespace CIAO
{
- namespace Config_Handlers
- {
- }
+namespace Config_Handlers
+{
+}
}
namespace CIAO
{
- namespace Config_Handlers
- {
- XSC_XML_Handlers_Export
- ::CIAO::Config_Handlers::Domain
- domain (xercesc::DOMDocument const*);
-
- XSC_XML_Handlers_Export
- ::CIAO::Config_Handlers::DeploymentPlan
- deploymentPlan (xercesc::DOMDocument const*);
-
- XSC_XML_Handlers_Export
- ::CIAO::Config_Handlers::ImplementationArtifactDescription
- implementationArtifactDescription (xercesc::DOMDocument const*);
-
- XSC_XML_Handlers_Export
- ::CIAO::Config_Handlers::ComponentInterfaceDescription
- componentInterfaceDescription (xercesc::DOMDocument const*);
-
- XSC_XML_Handlers_Export
- ::CIAO::Config_Handlers::ComponentImplementationDescription
- componentImplementationDescription (xercesc::DOMDocument const*);
-
- XSC_XML_Handlers_Export
- ::CIAO::Config_Handlers::ComponentPackageDescription
- componentPackageDescription (xercesc::DOMDocument const*);
-
- XSC_XML_Handlers_Export
- ::CIAO::Config_Handlers::PackageConfiguration
- packageConfiguration (xercesc::DOMDocument const*);
-
- XSC_XML_Handlers_Export
- ::CIAO::Config_Handlers::TopLevelPackageDescription
- topLevelPackageDescription (xercesc::DOMDocument const*);
- }
+namespace Config_Handlers
+{
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::Domain
+domain (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::DeploymentPlan
+deploymentPlan (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::ImplementationArtifactDescription
+implementationArtifactDescription (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::ComponentInterfaceDescription
+componentInterfaceDescription (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::ComponentImplementationDescription
+componentImplementationDescription (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::ComponentPackageDescription
+componentPackageDescription (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::PackageConfiguration
+packageConfiguration (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::TopLevelPackageDescription
+topLevelPackageDescription (xercesc::DOMDocument const*);
+}
}
#include "XMLSchema/Traversal.hpp"
namespace CIAO
{
- namespace Config_Handlers
- {
- namespace Traversal
- {
- }
- }
+namespace Config_Handlers
+{
+namespace Traversal
+{
+}
+}
}
#include "XMLSchema/Writer.hpp"
namespace CIAO
{
- namespace Config_Handlers
- {
- namespace Writer
- {
- }
- }
+namespace Config_Handlers
+{
+namespace Writer
+{
+}
+}
}
namespace CIAO
{
- namespace Config_Handlers
- {
- XSC_XML_Handlers_Export
- void
- domain (::CIAO::Config_Handlers::Domain const&, xercesc::DOMDocument*);
-
- XSC_XML_Handlers_Export
- void
- deploymentPlan (::CIAO::Config_Handlers::DeploymentPlan const&, xercesc::DOMDocument*);
-
- XSC_XML_Handlers_Export
- void
- implementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const&, xercesc::DOMDocument*);
-
- XSC_XML_Handlers_Export
- void
- componentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const&, xercesc::DOMDocument*);
-
- XSC_XML_Handlers_Export
- void
- componentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const&, xercesc::DOMDocument*);
-
- XSC_XML_Handlers_Export
- void
- componentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const&, xercesc::DOMDocument*);
-
- XSC_XML_Handlers_Export
- void
- packageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const&, xercesc::DOMDocument*);
-
- XSC_XML_Handlers_Export
- void
- topLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const&, xercesc::DOMDocument*);
- }
+namespace Config_Handlers
+{
+XSC_XML_Handlers_Export
+void
+domain (::CIAO::Config_Handlers::Domain const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+deploymentPlan (::CIAO::Config_Handlers::DeploymentPlan const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+implementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+componentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+componentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+componentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+packageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+topLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const&, xercesc::DOMDocument*);
+}
}
#endif // DEPLOYMENT_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h
index 009b8b37659..f4cf96dfb3c 100644
--- a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h
@@ -46,4 +46,3 @@ namespace CIAO
#include /**/ "ace/post.h"
#endif /* CIAO_CONFIG_HANDLERS_DYNENUM_HANDLER_H*/
-
diff --git a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp
index d64528cfdeb..200282aa792 100644
--- a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp
@@ -24,13 +24,13 @@ namespace CIAO
erep_b != erep_e;
++erep_b)
{
- ERE_Handler::handle_external_ref_endpoint ((*erep_b),
+ ERE_Handler::external_ref_endpoint ((*erep_b),
dest[pos++]);
}
}
void
- ERE_Handler::handle_external_ref_endpoint (
+ ERE_Handler::external_ref_endpoint (
const ExternalReferenceEndpoint &src,
Deployment::ExternalReferenceEndpoint &dest)
{
diff --git a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.h b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.h
index c3bad772118..934e2273bf5 100644
--- a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.h
@@ -1,11 +1,11 @@
//==============================================================
/**
- * @file ERE_Handler.h
- *
- * $Id$
- *
- * @author Jules White
- */
+* @file ERE_Handler.h
+*
+* $Id$
+*
+* @author Jules White
+*/
//================================================================
#ifndef CIAO_CONFIG_HANDLERS_ERE_HANDLER_H
@@ -22,48 +22,49 @@
namespace Deployment
{
- class ExternalReferenceEndpoints;
- struct ExternalReferenceEndpoint;
+class ExternalReferenceEndpoints;
+struct ExternalReferenceEndpoint;
}
namespace CIAO
{
- namespace Config_Handlers
- {
- class PlanConnectionDescription;
- class ExternalReferenceEndpoint;
+namespace Config_Handlers
+{
+class PlanConnectionDescription;
+class ExternalReferenceEndpoint;
- /*
- * @class ERE_Handler
- *
- * @brief Handler class for types.
- *
- * This class defines handler methods to map values from
- * XSC ExternalReferenceEndpoint objects, parsed from
- * the descriptor files, to the corresponding CORBA IDL type.
- *
- */
+/*
+* @class ERE_Handler
+*
+* @brief Handler class for types.
+*
+* This class defines handler methods to map values from
+* XSC ExternalReferenceEndpoint objects, parsed from
+* the descriptor files, to the corresponding CORBA IDL type.
+*
+*/
- class Config_Handlers_Export ERE_Handler
- {
- public:
- static void external_ref_endpoints (const PlanConnectionDescription &src,
- ::Deployment::ExternalReferenceEndpoints &dest);
+class Config_Handlers_Export ERE_Handler
+{
+public:
+static void external_ref_endpoints (
+const PlanConnectionDescription &src,
+::Deployment::ExternalReferenceEndpoints &dest);
- static ExternalReferenceEndpoint external_ref_endpoint (
- const Deployment::ExternalReferenceEndpoint& src);
+static ExternalReferenceEndpoint external_ref_endpoint (
+const Deployment::ExternalReferenceEndpoint& src);
- static void handle_external_ref_endpoint (const ExternalReferenceEndpoint &src,
- Deployment::ExternalReferenceEndpoint &dest);
- };
+static void external_ref_endpoint (const ExternalReferenceEndpoint &src,
+Deployment::ExternalReferenceEndpoint &dest);
+};
- typedef Sequence_Handler < ExternalReferenceEndpoint,
- ::Deployment::ExternalReferenceEndpoints,
- ::Deployment::ExternalReferenceEndpoint,
- ERE_Handler::handle_external_ref_endpoint > ERE_Functor;
+typedef Sequence_Handler < ExternalReferenceEndpoint,
+::Deployment::ExternalReferenceEndpoints,
+::Deployment::ExternalReferenceEndpoint,
+ERE_Handler::external_ref_endpoint > ERE_Functor;
- }
+}
}
#include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.h b/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.h
index df30ed2e87f..c48c95b9eb5 100644
--- a/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.h
@@ -68,4 +68,3 @@ throw (Config_Error);
#include /**/ "ace/post.h"
#endif /* CIAO_CONFIG_HANDLERS_IRDD_Handler_H */
-
diff --git a/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp
index c86d6dc1da1..9006956d2de 100644
--- a/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp
@@ -87,7 +87,7 @@ namespace CIAO
epcb != epce;
++epcb)
{
- Property_Handler::handle_property ((*epcb),
+ Property_Handler::get_property ((*epcb),
toconfig.execParameter[len++]);
}
diff --git a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp
index 23b332d471e..bcb5e4d917c 100644
--- a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp
@@ -26,7 +26,7 @@ namespace CIAO
///This method takes a
///and maps the values from the passed in XSC
///PlanConnectionDescription to its members.
- void PCD_Handler::handle_PlanConnectionDescription (const PlanConnectionDescription& desc,
+ void PCD_Handler::get_PlanConnectionDescription (const PlanConnectionDescription& desc,
Deployment::PlanConnectionDescription& toconfig)
{
CIAO_TRACE("PCD_Handler::get_PlanConnectionDescription");
diff --git a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.h b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.h
index 7b852203f60..edac698d7b6 100644
--- a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.h
@@ -53,7 +53,7 @@ namespace CIAO
///This method takes a
///and maps the values from the passed in XSC
///PlanConnectionDescription to its members.
- static void handle_PlanConnectionDescription (const PlanConnectionDescription& desc,
+ static void get_PlanConnectionDescription (const PlanConnectionDescription& desc,
Deployment::PlanConnectionDescription& toconfig);
//This method takes a
@@ -66,7 +66,7 @@ namespace CIAO
typedef Sequence_Handler < PlanConnectionDescription,
::Deployment::PlanConnectionDescriptions,
::Deployment::PlanConnectionDescription,
- PCD_Handler::handle_PlanConnectionDescription > PCD_Functor;
+ PCD_Handler::get_PlanConnectionDescription > PCD_Functor;
}
}
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
index df3c0884b60..d9756f3c07f 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
@@ -21,7 +21,7 @@ namespace CIAO
{
struct SPE_Handler
{
- static void handle_spe (const SubcomponentPortEndpoint &desc,
+ static void get_spe (const SubcomponentPortEndpoint &desc,
::Deployment::SubcomponentPortEndpoint &toconfig)
{
CIAO_TRACE("SPE_Handler::get_spe");
@@ -50,11 +50,11 @@ namespace CIAO
typedef Sequence_Handler < SubcomponentPortEndpoint,
::Deployment::SubcomponentPortEndpoints,
::Deployment::SubcomponentPortEndpoint,
- SPE_Handler::handle_spe > SPE_Functor;
+ SPE_Handler::get_spe > SPE_Functor;
struct ACD_Handler
{
- static void handle_acd (const AssemblyConnectionDescription &desc,
+ static void get_acd (const AssemblyConnectionDescription &desc,
::Deployment::AssemblyConnectionDescription &toconfig)
{
CIAO_TRACE("ACD_Handler::get_acd");
@@ -113,12 +113,12 @@ namespace CIAO
typedef Sequence_Handler < AssemblyConnectionDescription,
::Deployment::AssemblyConnectionDescriptions,
::Deployment::AssemblyConnectionDescription,
- ACD_Handler::handle_acd > ACD_Functor;
+ ACD_Handler::get_acd > ACD_Functor;
struct SPR_Handler
{
- static void handle_spr (const SubcomponentPropertyReference &desc,
+ static void get_spr (const SubcomponentPropertyReference &desc,
::Deployment::SubcomponentPropertyReference &toconfig)
{
CIAO_TRACE("SPR_Handler::get_spr");
@@ -149,11 +149,11 @@ namespace CIAO
typedef Sequence_Handler < SubcomponentPropertyReference,
::Deployment::SubcomponentPropertyReferences,
::Deployment::SubcomponentPropertyReference,
- SPR_Handler::handle_spr > SPR_Functor;
+ SPR_Handler::get_spr > SPR_Functor;
struct APM_Handler
{
- static void handle_apm (const AssemblyPropertyMapping &desc,
+ static void get_apm (const AssemblyPropertyMapping &desc,
::Deployment::AssemblyPropertyMapping &toconfig)
{
CIAO_TRACE("APM_Handler::get_apm");
@@ -185,7 +185,7 @@ namespace CIAO
typedef Sequence_Handler < AssemblyPropertyMapping,
::Deployment::AssemblyPropertyMappings,
::Deployment::AssemblyPropertyMapping,
- APM_Handler::handle_apm > APM_Functor;
+ APM_Handler::get_apm > APM_Functor;
}
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
index 8818ff34518..782027a38fb 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
@@ -31,7 +31,7 @@ namespace CIAO
{
struct Capability_Handler
{
- static void handle_capability (const Capability &desc,
+ static void get_capability (const Capability &desc,
::Deployment::Capability &toconfig)
{
CIAO_TRACE ("Capability_Handler::get_capability");
@@ -68,11 +68,11 @@ namespace CIAO
typedef Sequence_Handler < Capability,
::Deployment::Capabilities,
::Deployment::Capability,
- Capability_Handler::handle_capability > Capability_Functor;
+ Capability_Handler::get_capability > Capability_Functor;
struct IR_Handler
{
- static void handle_ir (const ImplementationRequirement &desc,
+ static void get_ir (const ImplementationRequirement &desc,
::Deployment::ImplementationRequirement &toconfig)
{
CIAO_TRACE ("IR_Handler::get_ir");
@@ -173,13 +173,13 @@ namespace CIAO
typedef Sequence_Handler < ImplementationRequirement,
::Deployment::ImplementationRequirements,
::Deployment::ImplementationRequirement,
- IR_Handler::handle_ir > IR_Functor;
+ IR_Handler::get_ir > IR_Functor;
struct MID_Handler
{
- static void handle_mid (const MonolithicImplementationDescription &desc,
+ static void get_mid (const MonolithicImplementationDescription &desc,
::Deployment::MonolithicImplementationDescription &toconfig)
{
CIAO_TRACE ("MID_Handler::get_mid");
@@ -236,7 +236,7 @@ namespace CIAO
typedef Sequence_Handler < MonolithicImplementationDescription,
::Deployment::MonolithicImplementationDescriptions,
::Deployment::MonolithicImplementationDescription,
- MID_Handler::handle_mid > MID_Functor;
+ MID_Handler::get_mid > MID_Functor;
}
@@ -279,7 +279,7 @@ namespace CIAO
else if (cid->monolithicImpl_p ())
{
toconfig.monolithicImpl.length (1);
- MID_Handler::handle_mid (cid->monolithicImpl (),
+ MID_Handler::get_mid (cid->monolithicImpl (),
toconfig.monolithicImpl[0]);
}
else
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
index 09f02684a21..dc3976ce698 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
@@ -19,7 +19,7 @@ namespace CIAO
{
struct PCI_Handler
{
- static void handle_pci (const PackagedComponentImplementation &desc,
+ static void get_pci (const PackagedComponentImplementation &desc,
::Deployment::PackagedComponentImplementation &toconfig)
{
CIAO_TRACE ("PCI_Handler::get_pci");
@@ -41,11 +41,11 @@ namespace CIAO
typedef Sequence_Handler < PackagedComponentImplementation,
::Deployment::PackagedComponentImplementations,
::Deployment::PackagedComponentImplementation,
- PCI_Handler::handle_pci > PCI_Functor;
+ PCI_Handler::get_pci > PCI_Functor;
}
void
- CPD_Handler::handle_component_package_descr (const ComponentPackageDescription &desc,
+ CPD_Handler::component_package_descr (const ComponentPackageDescription &desc,
::Deployment::ComponentPackageDescription &toconfig)
{
CIAO_TRACE ("CPD_Handler::component_package_descr");
@@ -136,7 +136,7 @@ namespace CIAO
{
CIAO_TRACE ("CPD_Handler::resolve_cpd");
if (!XML_HELPER->is_initialized ())
- return 0;
+ return false;
xercesc::DOMDocument* dom =
XML_HELPER->create_dom (uri);
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h
index 9535d24eef2..92b05187fa8 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h
@@ -1,6 +1,6 @@
//================================================
/**
- * @file CPD_Handler.h
+ * @file STD_CPD_Handler.h
*
* $Id$
*
@@ -50,11 +50,11 @@ namespace CIAO
/// Maps the values from the XSC object
/// to the CORBA IDL type
/// .
- static void handle_component_package_descr (const ComponentPackageDescription &desc,
+ static void component_package_descr (const ComponentPackageDescription &desc,
::Deployment::ComponentPackageDescription &toconfig);
static ComponentPackageDescription
- component_package_descr (const Deployment::ComponentPackageDescription& src);
+ component_package_descr (const Deployment::ComponentPackageDescription& src);
private:
static ComponentPackageDescription * resolve_cpd (const char *uri);
@@ -63,7 +63,7 @@ namespace CIAO
typedef Sequence_Handler < ComponentPackageDescription,
::Deployment::ComponentPackageDescriptions,
::Deployment::ComponentPackageDescription,
- CPD_Handler::handle_component_package_descr > CPD_Functor;
+ CPD_Handler::component_package_descr > CPD_Functor;
}
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
index 74223c6b2d8..ea487980046 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
@@ -20,7 +20,7 @@ namespace CIAO
{
struct Comp_Prop_Handler
{
- static void handle_cpd (const ComponentPropertyDescription &desc,
+ static void get_cpd (const ComponentPropertyDescription &desc,
::Deployment::ComponentPropertyDescription &toconfig)
{
CIAO_TRACE ("Comp_Prop_Handler::get_cpd");
@@ -44,7 +44,7 @@ namespace CIAO
typedef Sequence_Handler < ComponentPropertyDescription,
::Deployment::ComponentPropertyDescriptions,
::Deployment::ComponentPropertyDescription,
- Comp_Prop_Handler::handle_cpd > Comp_Prop_Functor;
+ Comp_Prop_Handler::get_cpd > Comp_Prop_Functor;
}
void
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
index edc5fe7fa6c..6ad2767104b 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
@@ -34,7 +34,7 @@ namespace CIAO
class Packaging_Handlers_Export NIA_Handler
{
public:
- static void handle_nia (const NamedImplementationArtifact &desc,
+ static void get_nia (const NamedImplementationArtifact &desc,
::Deployment::NamedImplementationArtifact &toconfig)
{
toconfig.name = desc.name ().c_str ();
@@ -55,11 +55,10 @@ namespace CIAO
typedef Sequence_Handler < NamedImplementationArtifact,
::Deployment::NamedImplementationArtifacts,
::Deployment::NamedImplementationArtifact,
- NIA_Handler::handle_nia > NIA_Functor;
+ NIA_Handler::get_nia > NIA_Functor;
}
}
}
-#include /**/ "ace/post.h"
#endif /* CIAO_PACKAGING_NIA_HANDLER_H */
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
index 675060fd082..922c1fac252 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
@@ -1,19 +1,19 @@
// $Id$
#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
-#include "ciao/CIAO_common.h"
-#include "ciao/Packaging_DataC.h"
-#include "Utils/XML_Helper.h"
-#include "Utils/XercesString.h"
-#include "Utils/Exceptions.h"
#include "Package_Handlers/PCD_Handler.h"
#include "Package_Handlers/CPD_Handler.h"
+#include "Basic_Deployment_Data.hpp"
+#include "ciao/Packaging_DataC.h"
#include "Deployment.hpp"
#include "Property_Handler.h"
#include "Req_Handler.h"
-
-#include "Basic_Deployment_Data.hpp"
+#include "Utils/XercesString.h"
+#include "Utils/Exceptions.h"
#include
+#include "ciao/CIAO_common.h"
+
+#include
namespace CIAO
{
@@ -25,20 +25,13 @@ namespace CIAO
PCD_Handler::package_config (const ACE_TCHAR *uri,
::Deployment::PackageConfiguration &toconfig)
{
- const xercesc::DOMDocument *dom = XML_HELPER->create_dom (uri);
-
- if (dom == 0)
- {
- std::string error ("Unable to open file: ");
- error += uri;
- throw Parse_Error (error);
- }
+ xercesc::DOMDocument *dom = XML_HELPER->create_dom (uri);
- XStr root = dom->getDocumentElement ()->getTagName ();
+ XStr root = dom->getDocumentElement ()->getTagName ();
if (root == XStr ("Deployment:topLevelPackageDescription"))
{
- TopLevelPackageDescription tpd = topLevelPackageDescription (dom);
+ TopLevelPackageDescription tpd (topLevelPackageDescription (dom));
PCD_Handler::package_config (tpd.package (),
toconfig);
}
@@ -90,8 +83,8 @@ namespace CIAO
if (pcd->basePackage_p ())
{
toconfig.basePackage.length (1);
- CPD_Handler::handle_component_package_descr (pcd->basePackage (),
- toconfig.basePackage [0]);
+ CPD_Handler::component_package_descr (pcd->basePackage (),
+ toconfig.basePackage [0]);
}
// @@ MAJO: Support other elements present here.
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
index e265295d040..334245559fa 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
@@ -1,5 +1,11 @@
// $Id$
+#if defined (_MSC_VER) && (_MSC_VER < 1300)
+#pragma warning (disable: 4018)
+#pragma warning (disable: 4284)
+#pragma warning (disable: 4146)
+#endif
+
#include "STD_PC_Intf.h"
#include "Utils/XML_Helper.h"
#include "Deployment.hpp"
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h
index c15ae0389b9..d280fb5c655 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h
@@ -1,6 +1,6 @@
//==============================================================
/**
- * @file PC_Intf.h
+ * @file STD_PC_Intf.h
*
* $Id$
*
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
index 34eadf9ea32..4cca9747789 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
@@ -19,7 +19,7 @@ namespace CIAO
IDREF_Base SID_Handler::IDREF;
void
- SID_Handler::handle_sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc,
+ SID_Handler::sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc,
::Deployment::SubcomponentInstantiationDescription &toconfig)
{
CIAO_TRACE ("SID_Handler::sub_comp_inst_descr");
@@ -28,7 +28,7 @@ namespace CIAO
if (desc.basePackage_p ())
{
toconfig.basePackage.length (1);
- CPD_Handler::handle_component_package_descr (desc.basePackage (),
+ CPD_Handler::component_package_descr (desc.basePackage (),
toconfig.basePackage[0]);
}
else if (desc.specializedConfig_p ())
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h
index 1bcb73e751e..c166fcd6294 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h
@@ -43,7 +43,7 @@ namespace CIAO
}
public:
- static void handle_sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc,
+ static void sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc,
::Deployment::SubcomponentInstantiationDescription &toconfig);
static SubcomponentInstantiationDescription
@@ -61,7 +61,7 @@ namespace CIAO
typedef Sequence_Handler < SubcomponentInstantiationDescription,
::Deployment::SubcomponentInstantiationDescriptions,
::Deployment::SubcomponentInstantiationDescription,
- SID_Handler::handle_sub_comp_inst_descr > SID_Functor;
+ SID_Handler::sub_comp_inst_descr > SID_Functor;
}
}
diff --git a/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp
index 41129007618..273fe8c8e69 100644
--- a/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp
@@ -19,7 +19,7 @@ namespace CIAO
}
void
- Property_Handler::handle_property (
+ Property_Handler::get_property (
const Property& desc,
Deployment::Property& toconfig)
{
diff --git a/TAO/CIAO/tools/Config_Handlers/Property_Handler.h b/TAO/CIAO/tools/Config_Handlers/Property_Handler.h
index 9ef49062ecb..07044faed8e 100644
--- a/TAO/CIAO/tools/Config_Handlers/Property_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Property_Handler.h
@@ -1,11 +1,11 @@
//================================================
/**
- * @file Property_Handler.h
- *
- * $Id$
- *
- * @author Jules White
- */
+* @file Property_Handler.h
+*
+* $Id$
+*
+* @author Jules White
+*/
//================================================
#ifndef CIAO_CONFIG_HANDLERS_PROPERTY_HANDLER_H
@@ -22,51 +22,50 @@
namespace Deployment
{
- struct Property;
- class Properties;
+struct Property;
+class Properties;
}
namespace CIAO
{
- namespace Config_Handlers
- {
- class Property;
-
- /*
- * @class Property_Handler
- *
- * @brief Handler class for types.
- *
- * This class defines handler methods to map values from
- * XSC objects, parsed from the descriptor files, to the
- * corresponding CORBA IDL type for the schema element.
- *
- */
+namespace Config_Handlers
+{
+class Property;
- class Config_Handlers_Export Property_Handler
- {
- public:
- Property_Handler (void);
- virtual ~Property_Handler (void);
+/*
+* @class Property_Handler
+*
+* @brief Handler class for types.
+*
+* This class defines handler methods to map values from
+* XSC objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL type for the schema element.
+*
+*/
- typedef Sequence_Iterator< const ::Deployment::Properties, const ::Deployment::Property > prop_iter;
+class Config_Handlers_Export Property_Handler
+{
+public:
+Property_Handler (void);
+virtual ~Property_Handler (void);
- /// This method maps the values from the XSC object
- /// to the CORBA IDL type
- /// .
- static void handle_property (const Property& desc,
- ::Deployment::Property& toconfig);
- static Property get_property (
- const ::Deployment::Property& src);
- };
+typedef Sequence_Iterator< const ::Deployment::Properties, const ::Deployment::Property > prop_iter;
+/// This method maps the values from the XSC object
+/// to the CORBA IDL type
+/// .
+static void get_property (const Property& desc,
+::Deployment::Property& toconfig);
+static Property get_property (
+const ::Deployment::Property& src);
+};
- typedef Sequence_Handler < Property,
- ::Deployment::Properties,
- ::Deployment::Property,
- Property_Handler::handle_property > Property_Functor;
+typedef Sequence_Handler < Property,
+::Deployment::Properties,
+::Deployment::Property,
+Property_Handler::get_property> Property_Functor;
- }
+}
}
#include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
index 15fabe1f34a..cf31d9bb0b5 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
@@ -16,7 +16,7 @@ static const char *input_file = "BasicSP.cdp";
static int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "i:");
+ ACE_Get_Arg_Opt get_opts (argc, argv, "i:");
int c;
@@ -41,7 +41,7 @@ parse_args (int argc, char *argv[])
using namespace CIAO::Config_Handlers;
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
if (parse_args (argc, argv) != 0)
diff --git a/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp
index c20d5e428f2..37fd441ac92 100644
--- a/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp
@@ -18,8 +18,8 @@ namespace CIAO
}
void
- Req_Handler::handle_requirement (const Requirement& desc,
- Deployment::Requirement& toconfig)
+ Req_Handler::get_requirement (const Requirement& desc,
+ Deployment::Requirement& toconfig)
{
CIAO_TRACE("Req_Handler::get_Requirement");
diff --git a/TAO/CIAO/tools/Config_Handlers/Req_Handler.h b/TAO/CIAO/tools/Config_Handlers/Req_Handler.h
index be35f55e0a8..315eee76579 100644
--- a/TAO/CIAO/tools/Config_Handlers/Req_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Req_Handler.h
@@ -1,11 +1,11 @@
//==============================================================
/**
- * @file Req_Handler.h
- *
- * $Id$
- *
- * @author Jules White
- */
+* @file Req_Handler.h
+*
+* $Id$
+*
+* @author Jules White
+*/
//================================================================
#ifndef CIAO_CONFIG_HANDLERS_REQ_HANDLER_H
@@ -22,49 +22,49 @@
namespace Deployment
{
- struct Requirement;
- class Requirements;
+struct Requirement;
+class Requirements;
}
namespace CIAO
{
- namespace Config_Handlers
- {
- /*
- * @class REQ_Handler
- *
- * @brief Handler class for types.
- *
- * This class defines handler methods to map values from
- * XSC Requirement objects, parsed from
- * the descriptor files, to the corresponding CORBA IDL type.
- *
- */
+namespace Config_Handlers
+{
+/*
+* @class REQ_Handler
+*
+* @brief Handler class for types.
+*
+* This class defines handler methods to map values from
+* XSC Requirement objects, parsed from
+* the descriptor files, to the corresponding CORBA IDL type.
+*
+*/
- class Config_Handlers_Export Req_Handler
- {
- public:
+class Config_Handlers_Export Req_Handler
+{
+public:
- Req_Handler (void);
- virtual ~Req_Handler (void);
+Req_Handler (void);
+virtual ~Req_Handler (void);
- ///This method takes a
- ///and maps the values from the passed in XSC
- ///Requirement to its members.
- static void handle_requirement (const Requirement& desc,
- Deployment::Requirement& toconfig);
- static Requirement
- get_requirement (const Deployment::Requirement& src);
- };
+///This method takes a
+///and maps the values from the passed in XSC
+///Requirement to its members.
+static void get_requirement (const Requirement& desc,
+Deployment::Requirement& toconfig);
+static Requirement
+get_requirement (const Deployment::Requirement& src);
+};
- typedef Sequence_Handler < Requirement,
- ::Deployment::Requirements,
- ::Deployment::Requirement,
- Req_Handler::handle_requirement > Requirement_Functor;
+typedef Sequence_Handler < Requirement,
+::Deployment::Requirements,
+::Deployment::Requirement,
+Req_Handler::get_requirement > Requirement_Functor;
- }
+}
}
#include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
index 31f4d937a49..0a50d889b0b 100644
--- a/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
@@ -20,7 +20,7 @@ namespace CIAO
}
void
- SatisfierProperty_Handler::handle_sat_property (
+ SatisfierProperty_Handler::get_sat_property (
const SatisfierProperty& desc,
Deployment::SatisfierProperty& toconfig)
{
diff --git a/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h b/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h
index 4ee0b804b24..2c2f671cb02 100644
--- a/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h
@@ -1,11 +1,11 @@
//================================================
/**
- * @file SatisfierProperty_Handler.h
- *
- * $Id$
- *
- * @author Jules White