diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-12-22 09:34:06 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-12-22 09:34:06 +0000 |
commit | e2d4cb1a5a796e33b229d0c2dc15862d76d83c1f (patch) | |
tree | 6bd5bdcae9f02981235ff07d4f1b12ad0a7cbbda | |
parent | 28282e44a12150fd5c8699e2abfe5b234195df01 (diff) | |
download | ATCD-e2d4cb1a5a796e33b229d0c2dc15862d76d83c1f.tar.gz |
Tue Dec 22 09:32:04 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ciao/Logger/File_Logger_Backend.h
* DAnCE/Config_Handlers
* DAnCE/Config_Handlers/ADD_Handler.cpp
* DAnCE/Config_Handlers/Any_Handler.cpp
* DAnCE/Config_Handlers/CCD_Handler.cpp
* DAnCE/Config_Handlers/CEPE_Handler.cpp
* DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp
* DAnCE/Config_Handlers/Config_Handlers.mpc
* DAnCE/Config_Handlers/CPD_Handler.cpp
* DAnCE/Config_Handlers/CRDD_Handler.cpp
* DAnCE/Config_Handlers/DataType_Handler.cpp
* DAnCE/Config_Handlers/DD_Handler.cpp
* DAnCE/Config_Handlers/DP_Handler.cpp
* DAnCE/Config_Handlers/DP_PCD_Handler.cpp
* DAnCE/Config_Handlers/ERE_Handler.cpp
* DAnCE/Config_Handlers/ESD_Handler.cpp
* DAnCE/Config_Handlers/ID_Handler.cpp
* DAnCE/Config_Handlers/IDD_Handler.cpp
* DAnCE/Config_Handlers/IDREF_Base.cpp
* DAnCE/Config_Handlers/IRDD_Handler.cpp
* DAnCE/Config_Handlers/IRDD_Handler.h
* DAnCE/Config_Handlers/MDD_Handler.cpp
* DAnCE/Config_Handlers/Package_Handlers/CAD_Handler.cpp
* DAnCE/Config_Handlers/Package_Handlers/CID_Handler.cpp
* DAnCE/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
* DAnCE/Config_Handlers/Package_Handlers/CPD_Handler.cpp
* DAnCE/Config_Handlers/Package_Handlers/IAD_Handler.cpp
* DAnCE/Config_Handlers/Package_Handlers/PC_Intf.cpp
* DAnCE/Config_Handlers/Package_Handlers/PCD_Handler.cpp
* DAnCE/Config_Handlers/Package_Handlers/SID_Handler.cpp
* DAnCE/Config_Handlers/PCD_Handler.cpp
* DAnCE/Config_Handlers/PL_Handler.cpp
* DAnCE/Config_Handlers/Property_Handler.cpp
* DAnCE/Config_Handlers/PSPE_Handler.cpp
* DAnCE/Config_Handlers/RDD_Handler.cpp
* DAnCE/Config_Handlers/Req_Handler.cpp
* DAnCE/Config_Handlers/SatisfierProperty_Handler.cpp
* DAnCE/Config_Handlers/STD_PC_Intf.cpp
* DAnCE/Config_Handlers/XML_File_Intf.cpp
* DAnCE/docs/schema
* DAnCE/ExecutionManager/ExecutionManager_Impl.cpp
* DAnCE/MPC/config/ciao_config_handlers.mpb
* DAnCE/MPC/config/ciao_config_handlers_base.mpb
* DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
* DAnCE/TargetManager/CmpClient.cpp
* DAnCE/TargetManager/DomainDataManager.cpp
* DAnCE/TargetManager/TargetManager_exec.cpp
* DAnCE/tests/CIAO/CommandlinePassage/CommandlinePassage_exec.cpp
* DAnCE/tests/CIAO/Components/ProcessColocation_exec.cpp
* DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp
* DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp
* DAnCE/tests/CIAO/Components/SimpleEmitter_exec.cpp
* DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp
* DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.cpp
* DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.cpp
* DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp
* DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp
* DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp
* DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp
* DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc
* DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp
* DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp
* DAnCE/tests/DeploymentPlanDump/test.cpp
* DAnCE/tests/DeploymentPlanTestReferences/test.cpp
* DAnCE/tests/DeploymentTest1/test.cpp
* docs/schema
* docs/schema/06-04-02.xsd
* docs/schema/Basic_Deployment_Data.xsd
* docs/schema/ccd.xsd
* docs/schema/cdd.xsd
* docs/schema/cdp.xsd
* docs/schema/CIAOEvents.xsd
* docs/schema/ciaopolicy.xsd
* docs/schema/CIAOServerResources.xsd
* docs/schema/cid.xsd
* docs/schema/cpd.xsd
* docs/schema/Deployment.xsd
* docs/schema/iad.xsd
* docs/schema/Modified_Deployment.xsd
* docs/schema/pcd.xsd
* docs/schema/README.html
* docs/schema/SANet_Network.xsd
* docs/schema/ServerResourceUsage.txt
* docs/schema/Spec_Defined_Deployment.xsd
* docs/schema/Spec_Defined_XMI.xsd
* docs/schema/Task_Map.xsd
* docs/schema/toplevel.xsd
* docs/schema/unused_06-04-02.xsd
* docs/schema/unused_elements.xsd
* docs/schema/XMI.xsd
* docs/schema/xsc-banner.cpp
* docs/schema/xsc-banner.h
* MPC/config/ciao_config_handlers.mpb
* MPC/config/ciao_config_handlers_base.mpb
* tools/Config_Handlers
* tools/Config_Handlers/ADD_Handler.cpp
* tools/Config_Handlers/ADD_Handler.h
* tools/Config_Handlers/Any_Handler.cpp
* tools/Config_Handlers/Any_Handler.h
* tools/Config_Handlers/Basic_Deployment_Data.cpp
* tools/Config_Handlers/Basic_Deployment_Data.hpp
* tools/Config_Handlers/ccd.cpp
* tools/Config_Handlers/ccd.hpp
* tools/Config_Handlers/CCD_Handler.cpp
* tools/Config_Handlers/CCD_Handler.h
* tools/Config_Handlers/cdd.cpp
* tools/Config_Handlers/cdd.hpp
* tools/Config_Handlers/cdp.cpp
* tools/Config_Handlers/cdp.hpp
* tools/Config_Handlers/CEPE_Handler.cpp
* tools/Config_Handlers/CEPE_Handler.h
* tools/Config_Handlers/cid.cpp
* tools/Config_Handlers/cid.hpp
* tools/Config_Handlers/Common.h
* tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
* tools/Config_Handlers/ComponentPropertyDescription_Handler.h
* tools/Config_Handlers/Config_Handlers.mpc
* tools/Config_Handlers/Config_Handlers_Common_Export.h
* tools/Config_Handlers/Config_Handlers_Export.h
* tools/Config_Handlers/cpd.cpp
* tools/Config_Handlers/cpd.hpp
* tools/Config_Handlers/CPD_Handler.cpp
* tools/Config_Handlers/CPD_Handler.h
* tools/Config_Handlers/CRDD_Handler.cpp
* tools/Config_Handlers/CRDD_Handler.h
* tools/Config_Handlers/DataType_Handler.cpp
* tools/Config_Handlers/DataType_Handler.h
* tools/Config_Handlers/DD_Handler.cpp
* tools/Config_Handlers/DD_Handler.h
* tools/Config_Handlers/Deployment.cpp
* tools/Config_Handlers/Deployment.hpp
* tools/Config_Handlers/DnC_Dump.cpp
* tools/Config_Handlers/DnC_Dump.h
* tools/Config_Handlers/DnC_Dump_T.cpp
* tools/Config_Handlers/DnC_Dump_T.h
* tools/Config_Handlers/DP_Handler.cpp
* tools/Config_Handlers/DP_Handler.h
* tools/Config_Handlers/DP_PCD_Handler.cpp
* tools/Config_Handlers/DP_PCD_Handler.h
* tools/Config_Handlers/Dump_Obj.cpp
* tools/Config_Handlers/Dump_Obj.h
* tools/Config_Handlers/DynAny_Handler
* tools/Config_Handlers/DynAny_Handler.mpc
* tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp
* tools/Config_Handlers/DynAny_Handler/DataType_Handler.h
* tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp
* tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.h
* tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
* tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h
* tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h
* tools/Config_Handlers/DynAny_Handler/dynany_test.idl
* tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
* tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h
* tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp
* tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.h
* tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp
* tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.h
* tools/Config_Handlers/DynAny_Handler/test.cpp
* tools/Config_Handlers/DynAny_Handler/test.mpc
* tools/Config_Handlers/ERE_Handler.cpp
* tools/Config_Handlers/ERE_Handler.h
* tools/Config_Handlers/ESD_Handler.cpp
* tools/Config_Handlers/ESD_Handler.h
* tools/Config_Handlers/iad.cpp
* tools/Config_Handlers/iad.hpp
* tools/Config_Handlers/ID_Handler.cpp
* tools/Config_Handlers/ID_Handler.h
* tools/Config_Handlers/IDD_Handler.cpp
* tools/Config_Handlers/IDD_Handler.h
* tools/Config_Handlers/IDREF_Base.cpp
* tools/Config_Handlers/IDREF_Base.h
* tools/Config_Handlers/IRDD_Handler.cpp
* tools/Config_Handlers/IRDD_Handler.h
* tools/Config_Handlers/MDD_Handler.cpp
* tools/Config_Handlers/MDD_Handler.h
* tools/Config_Handlers/Package_Handlers
* tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
* tools/Config_Handlers/Package_Handlers/CAD_Handler.h
* tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
* tools/Config_Handlers/Package_Handlers/CID_Handler.h
* tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
* tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h
* tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
* tools/Config_Handlers/Package_Handlers/CPD_Handler.h
* tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
* tools/Config_Handlers/Package_Handlers/IAD_Handler.h
* tools/Config_Handlers/Package_Handlers/NIA_Handler.h
* tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
* tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h
* tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
* tools/Config_Handlers/Package_Handlers/PC_Intf.h
* tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
* tools/Config_Handlers/Package_Handlers/PCD_Handler.h
* tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
* tools/Config_Handlers/Package_Handlers/SID_Handler.h
* tools/Config_Handlers/Package_Handlers/test.cpp
* tools/Config_Handlers/pcd.cpp
* tools/Config_Handlers/pcd.hpp
* tools/Config_Handlers/PCD_Handler.cpp
* tools/Config_Handlers/PCD_Handler.h
* tools/Config_Handlers/PL_Handler.cpp
* tools/Config_Handlers/PL_Handler.h
* tools/Config_Handlers/Property_Handler.cpp
* tools/Config_Handlers/Property_Handler.h
* tools/Config_Handlers/PSPE_Handler.cpp
* tools/Config_Handlers/PSPE_Handler.h
* tools/Config_Handlers/RDD_Handler.cpp
* tools/Config_Handlers/RDD_Handler.h
* 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_CID_Handler.cpp
* tools/Config_Handlers/STD_CID_Handler.h
* tools/Config_Handlers/STD_CPD_Handler.cpp
* tools/Config_Handlers/STD_CPD_Handler.h
* tools/Config_Handlers/STD_IAD_Handler.cpp
* tools/Config_Handlers/STD_IAD_Handler.h
* tools/Config_Handlers/STD_PC_Intf.cpp
* tools/Config_Handlers/STD_PC_Intf.h
* tools/Config_Handlers/STD_PCD_Handler.cpp
* tools/Config_Handlers/STD_PCD_Handler.h
* tools/Config_Handlers/test.cdp
* tools/Config_Handlers/test.cpp
* tools/Config_Handlers/toplevel.cpp
* tools/Config_Handlers/toplevel.hpp
* tools/Config_Handlers/Utils
* tools/Config_Handlers/Utils/Exceptions.h
* tools/Config_Handlers/Utils/Functors.h
* tools/Config_Handlers/XMI.cpp
* tools/Config_Handlers/XMI.hpp
* tools/Config_Handlers/XML_File_Intf.cpp
* tools/Config_Handlers/XML_File_Intf.h
* tools/Config_Handlers/XML_Typedefs.cpp
* tools/Config_Handlers/XML_Typedefs.h
* tools/Config_Handlers/XMLSchema
* tools/Config_Handlers/XMLSchema/id_map.hpp
* tools/Config_Handlers/XMLSchema/Traversal.hpp
* tools/Config_Handlers/XMLSchema/Traversal.ipp
* tools/Config_Handlers/XMLSchema/Traversal.tpp
* tools/Config_Handlers/XMLSchema/TypeInfo.hpp
* tools/Config_Handlers/XMLSchema/TypeInfo.ipp
* tools/Config_Handlers/XMLSchema/TypeInfo.tpp
* tools/Config_Handlers/XMLSchema/Types.hpp
* tools/Config_Handlers/XMLSchema/Types.ipp
* tools/Config_Handlers/XMLSchema/Types.tpp
* tools/Config_Handlers/XMLSchema/Writer.hpp
* tools/Config_Handlers/XMLSchema/Writer.ipp
* tools/Config_Handlers/XMLSchema/Writer.tpp
* tools/Config_Handlers/XSC_XML_Handlers_Export.h
* tools/Config_Handlers/XSCRT
* tools/Config_Handlers/XSCRT/Elements.hpp
* tools/Config_Handlers/XSCRT/Elements.ipp
* tools/Config_Handlers/XSCRT/Elements.tpp
* tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp
* tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp
* tools/Config_Handlers/XSCRT/Parser.hpp
* tools/Config_Handlers/XSCRT/Parser.ipp
* tools/Config_Handlers/XSCRT/Parser.tpp
* tools/Config_Handlers/XSCRT/Traversal.hpp
* tools/Config_Handlers/XSCRT/Traversal.ipp
* tools/Config_Handlers/XSCRT/Traversal.tpp
* tools/Config_Handlers/XSCRT/Writer.hpp
* tools/Config_Handlers/XSCRT/Writer.ipp
* tools/Config_Handlers/XSCRT/Writer.tpp
* tools/Config_Handlers/XSCRT/XML.hpp
* tools/Config_Handlers/XSCRT/XML.ipp
* tools/Config_Handlers/XSCRT/XML.tpp
* tools/Config_Handlers/XSCRT/XMLSchema.hpp
Moved Config_Handlers and schema to DAnCE
-rw-r--r-- | CIAO/ChangeLog | 273 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp (renamed from CIAO/tools/Config_Handlers/ADD_Handler.cpp) | 6 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/ADD_Handler.h (renamed from CIAO/tools/Config_Handlers/ADD_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Any_Handler.cpp (renamed from CIAO/tools/Config_Handlers/Any_Handler.cpp) | 6 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Any_Handler.h (renamed from CIAO/tools/Config_Handlers/Any_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.cpp (renamed from CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp (renamed from CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/CCD_Handler.cpp (renamed from CIAO/tools/Config_Handlers/CCD_Handler.cpp) | 6 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/CCD_Handler.h (renamed from CIAO/tools/Config_Handlers/CCD_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/CEPE_Handler.cpp (renamed from CIAO/tools/Config_Handlers/CEPE_Handler.cpp) | 8 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/CEPE_Handler.h (renamed from CIAO/tools/Config_Handlers/CEPE_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/CPD_Handler.cpp (renamed from CIAO/tools/Config_Handlers/CPD_Handler.cpp) | 6 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/CPD_Handler.h (renamed from CIAO/tools/Config_Handlers/CPD_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/CRDD_Handler.cpp (renamed from CIAO/tools/Config_Handlers/CRDD_Handler.cpp) | 6 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/CRDD_Handler.h (renamed from CIAO/tools/Config_Handlers/CRDD_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Common.h (renamed from CIAO/tools/Config_Handlers/Common.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp (renamed from CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp) | 6 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.h (renamed from CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc (renamed from CIAO/tools/Config_Handlers/Config_Handlers.mpc) | 14 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Config_Handlers_Common_Export.h (renamed from CIAO/tools/Config_Handlers/Config_Handlers_Common_Export.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Config_Handlers_Export.h (renamed from CIAO/tools/Config_Handlers/Config_Handlers_Export.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DD_Handler.cpp (renamed from CIAO/tools/Config_Handlers/DD_Handler.cpp) | 8 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DD_Handler.h (renamed from CIAO/tools/Config_Handlers/DD_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DP_Handler.cpp (renamed from CIAO/tools/Config_Handlers/DP_Handler.cpp) | 10 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DP_Handler.h (renamed from CIAO/tools/Config_Handlers/DP_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DP_PCD_Handler.cpp (renamed from CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp) | 8 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DP_PCD_Handler.h (renamed from CIAO/tools/Config_Handlers/DP_PCD_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DataType_Handler.cpp (renamed from CIAO/tools/Config_Handlers/DataType_Handler.cpp) | 6 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DataType_Handler.h (renamed from CIAO/tools/Config_Handlers/DataType_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Deployment.cpp (renamed from CIAO/tools/Config_Handlers/Deployment.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Deployment.hpp (renamed from CIAO/tools/Config_Handlers/Deployment.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DnC_Dump.cpp (renamed from CIAO/tools/Config_Handlers/DnC_Dump.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DnC_Dump.h (renamed from CIAO/tools/Config_Handlers/DnC_Dump.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DnC_Dump_T.cpp (renamed from CIAO/tools/Config_Handlers/DnC_Dump_T.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DnC_Dump_T.h (renamed from CIAO/tools/Config_Handlers/DnC_Dump_T.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Dump_Obj.cpp (renamed from CIAO/tools/Config_Handlers/Dump_Obj.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Dump_Obj.h (renamed from CIAO/tools/Config_Handlers/Dump_Obj.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DynAny_Handler.mpc (renamed from CIAO/tools/Config_Handlers/DynAny_Handler.mpc) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DynAny_Handler/DataType_Handler.cpp (renamed from CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DynAny_Handler/DataType_Handler.h (renamed from CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp (renamed from CIAO/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAlias_Handler.h (renamed from CIAO/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp (renamed from CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.h (renamed from CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h (renamed from CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp (renamed from CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynEnum_Handler.h (renamed from CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp (renamed from CIAO/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynSequence_Handler.h (renamed from CIAO/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp (renamed from CIAO/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynStruct_Handler.h (renamed from CIAO/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DynAny_Handler/dynany_test.idl (renamed from CIAO/tools/Config_Handlers/DynAny_Handler/dynany_test.idl) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DynAny_Handler/test.cpp (renamed from CIAO/tools/Config_Handlers/DynAny_Handler/test.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/DynAny_Handler/test.mpc (renamed from CIAO/tools/Config_Handlers/DynAny_Handler/test.mpc) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/ERE_Handler.cpp (renamed from CIAO/tools/Config_Handlers/ERE_Handler.cpp) | 8 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/ERE_Handler.h (renamed from CIAO/tools/Config_Handlers/ERE_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/ESD_Handler.cpp (renamed from CIAO/tools/Config_Handlers/ESD_Handler.cpp) | 6 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/ESD_Handler.h (renamed from CIAO/tools/Config_Handlers/ESD_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/IDD_Handler.cpp (renamed from CIAO/tools/Config_Handlers/IDD_Handler.cpp) | 6 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/IDD_Handler.h (renamed from CIAO/tools/Config_Handlers/IDD_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/IDREF_Base.cpp (renamed from CIAO/tools/Config_Handlers/IDREF_Base.cpp) | 12 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/IDREF_Base.h (renamed from CIAO/tools/Config_Handlers/IDREF_Base.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/ID_Handler.cpp (renamed from CIAO/tools/Config_Handlers/ID_Handler.cpp) | 6 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/ID_Handler.h (renamed from CIAO/tools/Config_Handlers/ID_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/IRDD_Handler.cpp (renamed from CIAO/tools/Config_Handlers/IRDD_Handler.cpp) | 6 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/IRDD_Handler.h (renamed from CIAO/tools/Config_Handlers/IRDD_Handler.h) | 5 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/MDD_Handler.cpp (renamed from CIAO/tools/Config_Handlers/MDD_Handler.cpp) | 4 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/MDD_Handler.h (renamed from CIAO/tools/Config_Handlers/MDD_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/PCD_Handler.cpp (renamed from CIAO/tools/Config_Handlers/PCD_Handler.cpp) | 6 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/PCD_Handler.h (renamed from CIAO/tools/Config_Handlers/PCD_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/PL_Handler.cpp (renamed from CIAO/tools/Config_Handlers/PL_Handler.cpp) | 4 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/PL_Handler.h (renamed from CIAO/tools/Config_Handlers/PL_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/PSPE_Handler.cpp (renamed from CIAO/tools/Config_Handlers/PSPE_Handler.cpp) | 6 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/PSPE_Handler.h (renamed from CIAO/tools/Config_Handlers/PSPE_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Package_Handlers/CAD_Handler.cpp (renamed from CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp) | 24 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Package_Handlers/CAD_Handler.h (renamed from CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Package_Handlers/CID_Handler.cpp (renamed from CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp) | 20 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Package_Handlers/CID_Handler.h (renamed from CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Package_Handlers/CPD_Handler.cpp (renamed from CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp) | 12 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Package_Handlers/CPD_Handler.h (renamed from CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp (renamed from CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp) | 14 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h (renamed from CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Package_Handlers/IAD_Handler.cpp (renamed from CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp) | 8 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Package_Handlers/IAD_Handler.h (renamed from CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Package_Handlers/NIA_Handler.h (renamed from CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Package_Handlers/PCD_Handler.cpp (renamed from CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp) | 6 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Package_Handlers/PCD_Handler.h (renamed from CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Package_Handlers/PC_Intf.cpp (renamed from CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp) | 4 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Package_Handlers/PC_Intf.h (renamed from CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Package_Handlers/Package_Handlers.mpc (renamed from CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h (renamed from CIAO/tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Package_Handlers/SID_Handler.cpp (renamed from CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp) | 8 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Package_Handlers/SID_Handler.h (renamed from CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Package_Handlers/test.cpp (renamed from CIAO/tools/Config_Handlers/Package_Handlers/test.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Property_Handler.cpp (renamed from CIAO/tools/Config_Handlers/Property_Handler.cpp) | 6 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Property_Handler.h (renamed from CIAO/tools/Config_Handlers/Property_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/RDD_Handler.cpp (renamed from CIAO/tools/Config_Handlers/RDD_Handler.cpp) | 6 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/RDD_Handler.h (renamed from CIAO/tools/Config_Handlers/RDD_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Req_Handler.cpp (renamed from CIAO/tools/Config_Handlers/Req_Handler.cpp) | 6 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Req_Handler.h (renamed from CIAO/tools/Config_Handlers/Req_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/STD_CID_Handler.cpp (renamed from CIAO/tools/Config_Handlers/STD_CID_Handler.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/STD_CID_Handler.h (renamed from CIAO/tools/Config_Handlers/STD_CID_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/STD_CPD_Handler.cpp (renamed from CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/STD_CPD_Handler.h (renamed from CIAO/tools/Config_Handlers/STD_CPD_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/STD_IAD_Handler.cpp (renamed from CIAO/tools/Config_Handlers/STD_IAD_Handler.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/STD_IAD_Handler.h (renamed from CIAO/tools/Config_Handlers/STD_IAD_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/STD_PCD_Handler.cpp (renamed from CIAO/tools/Config_Handlers/STD_PCD_Handler.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/STD_PCD_Handler.h (renamed from CIAO/tools/Config_Handlers/STD_PCD_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/STD_PC_Intf.cpp (renamed from CIAO/tools/Config_Handlers/STD_PC_Intf.cpp) | 4 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/STD_PC_Intf.h (renamed from CIAO/tools/Config_Handlers/STD_PC_Intf.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/SatisfierProperty_Handler.cpp (renamed from CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp) | 6 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/SatisfierProperty_Handler.h (renamed from CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Utils/Exceptions.h (renamed from CIAO/tools/Config_Handlers/Utils/Exceptions.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/Utils/Functors.h (renamed from CIAO/tools/Config_Handlers/Utils/Functors.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XMI.cpp (renamed from CIAO/tools/Config_Handlers/XMI.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XMI.hpp (renamed from CIAO/tools/Config_Handlers/XMI.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XMLSchema/Traversal.hpp (renamed from CIAO/tools/Config_Handlers/XMLSchema/Traversal.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XMLSchema/Traversal.ipp (renamed from CIAO/tools/Config_Handlers/XMLSchema/Traversal.ipp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XMLSchema/Traversal.tpp (renamed from CIAO/tools/Config_Handlers/XMLSchema/Traversal.tpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XMLSchema/TypeInfo.hpp (renamed from CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XMLSchema/TypeInfo.ipp (renamed from CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.ipp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XMLSchema/TypeInfo.tpp (renamed from CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.tpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XMLSchema/Types.hpp (renamed from CIAO/tools/Config_Handlers/XMLSchema/Types.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XMLSchema/Types.ipp (renamed from CIAO/tools/Config_Handlers/XMLSchema/Types.ipp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XMLSchema/Types.tpp (renamed from CIAO/tools/Config_Handlers/XMLSchema/Types.tpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XMLSchema/Writer.hpp (renamed from CIAO/tools/Config_Handlers/XMLSchema/Writer.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XMLSchema/Writer.ipp (renamed from CIAO/tools/Config_Handlers/XMLSchema/Writer.ipp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XMLSchema/Writer.tpp (renamed from CIAO/tools/Config_Handlers/XMLSchema/Writer.tpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XMLSchema/id_map.hpp (renamed from CIAO/tools/Config_Handlers/XMLSchema/id_map.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XML_File_Intf.cpp (renamed from CIAO/tools/Config_Handlers/XML_File_Intf.cpp) | 22 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XML_File_Intf.h (renamed from CIAO/tools/Config_Handlers/XML_File_Intf.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XML_Typedefs.cpp (renamed from CIAO/tools/Config_Handlers/XML_Typedefs.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XML_Typedefs.h (renamed from CIAO/tools/Config_Handlers/XML_Typedefs.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XSCRT/Elements.hpp (renamed from CIAO/tools/Config_Handlers/XSCRT/Elements.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XSCRT/Elements.ipp (renamed from CIAO/tools/Config_Handlers/XSCRT/Elements.ipp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XSCRT/Elements.tpp (renamed from CIAO/tools/Config_Handlers/XSCRT/Elements.tpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp (renamed from CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp (renamed from CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XSCRT/Parser.hpp (renamed from CIAO/tools/Config_Handlers/XSCRT/Parser.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XSCRT/Parser.ipp (renamed from CIAO/tools/Config_Handlers/XSCRT/Parser.ipp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XSCRT/Parser.tpp (renamed from CIAO/tools/Config_Handlers/XSCRT/Parser.tpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XSCRT/Traversal.hpp (renamed from CIAO/tools/Config_Handlers/XSCRT/Traversal.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XSCRT/Traversal.ipp (renamed from CIAO/tools/Config_Handlers/XSCRT/Traversal.ipp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XSCRT/Traversal.tpp (renamed from CIAO/tools/Config_Handlers/XSCRT/Traversal.tpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XSCRT/Writer.hpp (renamed from CIAO/tools/Config_Handlers/XSCRT/Writer.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XSCRT/Writer.ipp (renamed from CIAO/tools/Config_Handlers/XSCRT/Writer.ipp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XSCRT/Writer.tpp (renamed from CIAO/tools/Config_Handlers/XSCRT/Writer.tpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XSCRT/XML.hpp (renamed from CIAO/tools/Config_Handlers/XSCRT/XML.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XSCRT/XML.ipp (renamed from CIAO/tools/Config_Handlers/XSCRT/XML.ipp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XSCRT/XML.tpp (renamed from CIAO/tools/Config_Handlers/XSCRT/XML.tpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XSCRT/XMLSchema.hpp (renamed from CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/XSC_XML_Handlers_Export.h (renamed from CIAO/tools/Config_Handlers/XSC_XML_Handlers_Export.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/ccd.cpp (renamed from CIAO/tools/Config_Handlers/ccd.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/ccd.hpp (renamed from CIAO/tools/Config_Handlers/ccd.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/cdd.cpp (renamed from CIAO/tools/Config_Handlers/cdd.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/cdd.hpp (renamed from CIAO/tools/Config_Handlers/cdd.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/cdp.cpp (renamed from CIAO/tools/Config_Handlers/cdp.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/cdp.hpp (renamed from CIAO/tools/Config_Handlers/cdp.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/cid.cpp (renamed from CIAO/tools/Config_Handlers/cid.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/cid.hpp (renamed from CIAO/tools/Config_Handlers/cid.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/cpd.cpp (renamed from CIAO/tools/Config_Handlers/cpd.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/cpd.hpp (renamed from CIAO/tools/Config_Handlers/cpd.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/iad.cpp (renamed from CIAO/tools/Config_Handlers/iad.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/iad.hpp (renamed from CIAO/tools/Config_Handlers/iad.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/pcd.cpp (renamed from CIAO/tools/Config_Handlers/pcd.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/pcd.hpp (renamed from CIAO/tools/Config_Handlers/pcd.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/test.cdp (renamed from CIAO/tools/Config_Handlers/test.cdp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/test.cpp (renamed from CIAO/tools/Config_Handlers/test.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/toplevel.cpp (renamed from CIAO/tools/Config_Handlers/toplevel.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/Config_Handlers/toplevel.hpp (renamed from CIAO/tools/Config_Handlers/toplevel.hpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp | 2 | ||||
-rw-r--r-- | CIAO/DAnCE/MPC/config/ciao_config_handlers.mpb (renamed from CIAO/MPC/config/ciao_config_handlers.mpb) | 2 | ||||
-rw-r--r-- | CIAO/DAnCE/MPC/config/ciao_config_handlers_base.mpb (renamed from CIAO/MPC/config/ciao_config_handlers_base.mpb) | 2 | ||||
-rw-r--r-- | CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp | 4 | ||||
-rw-r--r-- | CIAO/DAnCE/TargetManager/CmpClient.cpp | 2 | ||||
-rw-r--r-- | CIAO/DAnCE/TargetManager/DomainDataManager.cpp | 4 | ||||
-rw-r--r-- | CIAO/DAnCE/TargetManager/TargetManager_exec.cpp | 4 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/06-04-02.xsd (renamed from CIAO/docs/schema/06-04-02.xsd) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/Basic_Deployment_Data.xsd (renamed from CIAO/docs/schema/Basic_Deployment_Data.xsd) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/CIAOEvents.xsd (renamed from CIAO/docs/schema/CIAOEvents.xsd) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/CIAOServerResources.xsd (renamed from CIAO/docs/schema/CIAOServerResources.xsd) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/Deployment.xsd (renamed from CIAO/docs/schema/Deployment.xsd) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/Modified_Deployment.xsd (renamed from CIAO/docs/schema/Modified_Deployment.xsd) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/README.html (renamed from CIAO/docs/schema/README.html) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/SANet_Network.xsd (renamed from CIAO/docs/schema/SANet_Network.xsd) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/ServerResourceUsage.txt (renamed from CIAO/docs/schema/ServerResourceUsage.txt) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/Spec_Defined_Deployment.xsd (renamed from CIAO/docs/schema/Spec_Defined_Deployment.xsd) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/Spec_Defined_XMI.xsd (renamed from CIAO/docs/schema/Spec_Defined_XMI.xsd) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/Task_Map.xsd (renamed from CIAO/docs/schema/Task_Map.xsd) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/XMI.xsd (renamed from CIAO/docs/schema/XMI.xsd) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/ccd.xsd (renamed from CIAO/docs/schema/ccd.xsd) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/cdd.xsd (renamed from CIAO/docs/schema/cdd.xsd) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/cdp.xsd (renamed from CIAO/docs/schema/cdp.xsd) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/ciaopolicy.xsd (renamed from CIAO/docs/schema/ciaopolicy.xsd) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/cid.xsd (renamed from CIAO/docs/schema/cid.xsd) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/cpd.xsd (renamed from CIAO/docs/schema/cpd.xsd) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/iad.xsd (renamed from CIAO/docs/schema/iad.xsd) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/pcd.xsd (renamed from CIAO/docs/schema/pcd.xsd) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/toplevel.xsd (renamed from CIAO/docs/schema/toplevel.xsd) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/unused_06-04-02.xsd (renamed from CIAO/docs/schema/unused_06-04-02.xsd) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/unused_elements.xsd (renamed from CIAO/docs/schema/unused_elements.xsd) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/xsc-banner.cpp (renamed from CIAO/docs/schema/xsc-banner.cpp) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/docs/schema/xsc-banner.h (renamed from CIAO/docs/schema/xsc-banner.h) | 0 | ||||
-rw-r--r-- | CIAO/DAnCE/tests/CIAO/CommandlinePassage/CommandlinePassage_exec.cpp | 2 | ||||
-rw-r--r-- | CIAO/DAnCE/tests/CIAO/Components/ProcessColocation_exec.cpp | 2 | ||||
-rw-r--r-- | CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp | 18 | ||||
-rw-r--r-- | CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp | 26 | ||||
-rw-r--r-- | CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_exec.cpp | 24 | ||||
-rw-r--r-- | CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp | 24 | ||||
-rw-r--r-- | CIAO/DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.cpp | 32 | ||||
-rw-r--r-- | CIAO/DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.cpp | 24 | ||||
-rw-r--r-- | CIAO/DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp | 24 | ||||
-rw-r--r-- | CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp | 32 | ||||
-rw-r--r-- | CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp | 24 | ||||
-rw-r--r-- | CIAO/DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp | 24 | ||||
-rw-r--r-- | CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc | 2 | ||||
-rw-r--r-- | CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp | 14 | ||||
-rw-r--r-- | CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp | 2 | ||||
-rw-r--r-- | CIAO/DAnCE/tests/DeploymentPlanDump/test.cpp | 4 | ||||
-rw-r--r-- | CIAO/DAnCE/tests/DeploymentPlanTestReferences/test.cpp | 4 | ||||
-rw-r--r-- | CIAO/DAnCE/tests/DeploymentTest1/test.cpp | 4 | ||||
-rw-r--r-- | CIAO/ciao/Logger/File_Logger_Backend.h | 1 |
222 files changed, 574 insertions, 311 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index c627b61d1c2..463eb18ee1f 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,276 @@ +Tue Dec 22 09:32:04 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * ciao/Logger/File_Logger_Backend.h + * DAnCE/Config_Handlers + * DAnCE/Config_Handlers/ADD_Handler.cpp + * DAnCE/Config_Handlers/Any_Handler.cpp + * DAnCE/Config_Handlers/CCD_Handler.cpp + * DAnCE/Config_Handlers/CEPE_Handler.cpp + * DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp + * DAnCE/Config_Handlers/Config_Handlers.mpc + * DAnCE/Config_Handlers/CPD_Handler.cpp + * DAnCE/Config_Handlers/CRDD_Handler.cpp + * DAnCE/Config_Handlers/DataType_Handler.cpp + * DAnCE/Config_Handlers/DD_Handler.cpp + * DAnCE/Config_Handlers/DP_Handler.cpp + * DAnCE/Config_Handlers/DP_PCD_Handler.cpp + * DAnCE/Config_Handlers/ERE_Handler.cpp + * DAnCE/Config_Handlers/ESD_Handler.cpp + * DAnCE/Config_Handlers/ID_Handler.cpp + * DAnCE/Config_Handlers/IDD_Handler.cpp + * DAnCE/Config_Handlers/IDREF_Base.cpp + * DAnCE/Config_Handlers/IRDD_Handler.cpp + * DAnCE/Config_Handlers/IRDD_Handler.h + * DAnCE/Config_Handlers/MDD_Handler.cpp + * DAnCE/Config_Handlers/Package_Handlers/CAD_Handler.cpp + * DAnCE/Config_Handlers/Package_Handlers/CID_Handler.cpp + * DAnCE/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp + * DAnCE/Config_Handlers/Package_Handlers/CPD_Handler.cpp + * DAnCE/Config_Handlers/Package_Handlers/IAD_Handler.cpp + * DAnCE/Config_Handlers/Package_Handlers/PC_Intf.cpp + * DAnCE/Config_Handlers/Package_Handlers/PCD_Handler.cpp + * DAnCE/Config_Handlers/Package_Handlers/SID_Handler.cpp + * DAnCE/Config_Handlers/PCD_Handler.cpp + * DAnCE/Config_Handlers/PL_Handler.cpp + * DAnCE/Config_Handlers/Property_Handler.cpp + * DAnCE/Config_Handlers/PSPE_Handler.cpp + * DAnCE/Config_Handlers/RDD_Handler.cpp + * DAnCE/Config_Handlers/Req_Handler.cpp + * DAnCE/Config_Handlers/SatisfierProperty_Handler.cpp + * DAnCE/Config_Handlers/STD_PC_Intf.cpp + * DAnCE/Config_Handlers/XML_File_Intf.cpp + * DAnCE/docs/schema + * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp + * DAnCE/MPC/config/ciao_config_handlers.mpb + * DAnCE/MPC/config/ciao_config_handlers_base.mpb + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp + * DAnCE/TargetManager/CmpClient.cpp + * DAnCE/TargetManager/DomainDataManager.cpp + * DAnCE/TargetManager/TargetManager_exec.cpp + * DAnCE/tests/CIAO/CommandlinePassage/CommandlinePassage_exec.cpp + * DAnCE/tests/CIAO/Components/ProcessColocation_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp + * DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp + * DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc + * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp + * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp + * DAnCE/tests/DeploymentPlanDump/test.cpp + * DAnCE/tests/DeploymentPlanTestReferences/test.cpp + * DAnCE/tests/DeploymentTest1/test.cpp + * docs/schema + * docs/schema/06-04-02.xsd + * docs/schema/Basic_Deployment_Data.xsd + * docs/schema/ccd.xsd + * docs/schema/cdd.xsd + * docs/schema/cdp.xsd + * docs/schema/CIAOEvents.xsd + * docs/schema/ciaopolicy.xsd + * docs/schema/CIAOServerResources.xsd + * docs/schema/cid.xsd + * docs/schema/cpd.xsd + * docs/schema/Deployment.xsd + * docs/schema/iad.xsd + * docs/schema/Modified_Deployment.xsd + * docs/schema/pcd.xsd + * docs/schema/README.html + * docs/schema/SANet_Network.xsd + * docs/schema/ServerResourceUsage.txt + * docs/schema/Spec_Defined_Deployment.xsd + * docs/schema/Spec_Defined_XMI.xsd + * docs/schema/Task_Map.xsd + * docs/schema/toplevel.xsd + * docs/schema/unused_06-04-02.xsd + * docs/schema/unused_elements.xsd + * docs/schema/XMI.xsd + * docs/schema/xsc-banner.cpp + * docs/schema/xsc-banner.h + * MPC/config/ciao_config_handlers.mpb + * MPC/config/ciao_config_handlers_base.mpb + * tools/Config_Handlers + * tools/Config_Handlers/ADD_Handler.cpp + * tools/Config_Handlers/ADD_Handler.h + * tools/Config_Handlers/Any_Handler.cpp + * tools/Config_Handlers/Any_Handler.h + * tools/Config_Handlers/Basic_Deployment_Data.cpp + * tools/Config_Handlers/Basic_Deployment_Data.hpp + * tools/Config_Handlers/ccd.cpp + * tools/Config_Handlers/ccd.hpp + * tools/Config_Handlers/CCD_Handler.cpp + * tools/Config_Handlers/CCD_Handler.h + * tools/Config_Handlers/cdd.cpp + * tools/Config_Handlers/cdd.hpp + * tools/Config_Handlers/cdp.cpp + * tools/Config_Handlers/cdp.hpp + * tools/Config_Handlers/CEPE_Handler.cpp + * tools/Config_Handlers/CEPE_Handler.h + * tools/Config_Handlers/cid.cpp + * tools/Config_Handlers/cid.hpp + * tools/Config_Handlers/Common.h + * tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp + * tools/Config_Handlers/ComponentPropertyDescription_Handler.h + * tools/Config_Handlers/Config_Handlers.mpc + * tools/Config_Handlers/Config_Handlers_Common_Export.h + * tools/Config_Handlers/Config_Handlers_Export.h + * tools/Config_Handlers/cpd.cpp + * tools/Config_Handlers/cpd.hpp + * tools/Config_Handlers/CPD_Handler.cpp + * tools/Config_Handlers/CPD_Handler.h + * tools/Config_Handlers/CRDD_Handler.cpp + * tools/Config_Handlers/CRDD_Handler.h + * tools/Config_Handlers/DataType_Handler.cpp + * tools/Config_Handlers/DataType_Handler.h + * tools/Config_Handlers/DD_Handler.cpp + * tools/Config_Handlers/DD_Handler.h + * tools/Config_Handlers/Deployment.cpp + * tools/Config_Handlers/Deployment.hpp + * tools/Config_Handlers/DnC_Dump.cpp + * tools/Config_Handlers/DnC_Dump.h + * tools/Config_Handlers/DnC_Dump_T.cpp + * tools/Config_Handlers/DnC_Dump_T.h + * tools/Config_Handlers/DP_Handler.cpp + * tools/Config_Handlers/DP_Handler.h + * tools/Config_Handlers/DP_PCD_Handler.cpp + * tools/Config_Handlers/DP_PCD_Handler.h + * tools/Config_Handlers/Dump_Obj.cpp + * tools/Config_Handlers/Dump_Obj.h + * tools/Config_Handlers/DynAny_Handler + * tools/Config_Handlers/DynAny_Handler.mpc + * tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp + * tools/Config_Handlers/DynAny_Handler/DataType_Handler.h + * tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp + * tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.h + * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp + * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h + * tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h + * tools/Config_Handlers/DynAny_Handler/dynany_test.idl + * tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp + * tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h + * tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp + * tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.h + * tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp + * tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.h + * tools/Config_Handlers/DynAny_Handler/test.cpp + * tools/Config_Handlers/DynAny_Handler/test.mpc + * tools/Config_Handlers/ERE_Handler.cpp + * tools/Config_Handlers/ERE_Handler.h + * tools/Config_Handlers/ESD_Handler.cpp + * tools/Config_Handlers/ESD_Handler.h + * tools/Config_Handlers/iad.cpp + * tools/Config_Handlers/iad.hpp + * tools/Config_Handlers/ID_Handler.cpp + * tools/Config_Handlers/ID_Handler.h + * tools/Config_Handlers/IDD_Handler.cpp + * tools/Config_Handlers/IDD_Handler.h + * tools/Config_Handlers/IDREF_Base.cpp + * tools/Config_Handlers/IDREF_Base.h + * tools/Config_Handlers/IRDD_Handler.cpp + * tools/Config_Handlers/IRDD_Handler.h + * tools/Config_Handlers/MDD_Handler.cpp + * tools/Config_Handlers/MDD_Handler.h + * tools/Config_Handlers/Package_Handlers + * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/CAD_Handler.h + * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp + * tools/Config_Handlers/Package_Handlers/CID_Handler.h + * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp + * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h + * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/CPD_Handler.h + * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/IAD_Handler.h + * tools/Config_Handlers/Package_Handlers/NIA_Handler.h + * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc + * tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h + * tools/Config_Handlers/Package_Handlers/PC_Intf.cpp + * tools/Config_Handlers/Package_Handlers/PC_Intf.h + * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/PCD_Handler.h + * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp + * tools/Config_Handlers/Package_Handlers/SID_Handler.h + * tools/Config_Handlers/Package_Handlers/test.cpp + * tools/Config_Handlers/pcd.cpp + * tools/Config_Handlers/pcd.hpp + * tools/Config_Handlers/PCD_Handler.cpp + * tools/Config_Handlers/PCD_Handler.h + * tools/Config_Handlers/PL_Handler.cpp + * tools/Config_Handlers/PL_Handler.h + * tools/Config_Handlers/Property_Handler.cpp + * tools/Config_Handlers/Property_Handler.h + * tools/Config_Handlers/PSPE_Handler.cpp + * tools/Config_Handlers/PSPE_Handler.h + * tools/Config_Handlers/RDD_Handler.cpp + * tools/Config_Handlers/RDD_Handler.h + * 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_CID_Handler.cpp + * tools/Config_Handlers/STD_CID_Handler.h + * tools/Config_Handlers/STD_CPD_Handler.cpp + * tools/Config_Handlers/STD_CPD_Handler.h + * tools/Config_Handlers/STD_IAD_Handler.cpp + * tools/Config_Handlers/STD_IAD_Handler.h + * tools/Config_Handlers/STD_PC_Intf.cpp + * tools/Config_Handlers/STD_PC_Intf.h + * tools/Config_Handlers/STD_PCD_Handler.cpp + * tools/Config_Handlers/STD_PCD_Handler.h + * tools/Config_Handlers/test.cdp + * tools/Config_Handlers/test.cpp + * tools/Config_Handlers/toplevel.cpp + * tools/Config_Handlers/toplevel.hpp + * tools/Config_Handlers/Utils + * tools/Config_Handlers/Utils/Exceptions.h + * tools/Config_Handlers/Utils/Functors.h + * tools/Config_Handlers/XMI.cpp + * tools/Config_Handlers/XMI.hpp + * tools/Config_Handlers/XML_File_Intf.cpp + * tools/Config_Handlers/XML_File_Intf.h + * tools/Config_Handlers/XML_Typedefs.cpp + * tools/Config_Handlers/XML_Typedefs.h + * tools/Config_Handlers/XMLSchema + * tools/Config_Handlers/XMLSchema/id_map.hpp + * tools/Config_Handlers/XMLSchema/Traversal.hpp + * tools/Config_Handlers/XMLSchema/Traversal.ipp + * tools/Config_Handlers/XMLSchema/Traversal.tpp + * tools/Config_Handlers/XMLSchema/TypeInfo.hpp + * tools/Config_Handlers/XMLSchema/TypeInfo.ipp + * tools/Config_Handlers/XMLSchema/TypeInfo.tpp + * tools/Config_Handlers/XMLSchema/Types.hpp + * tools/Config_Handlers/XMLSchema/Types.ipp + * tools/Config_Handlers/XMLSchema/Types.tpp + * tools/Config_Handlers/XMLSchema/Writer.hpp + * tools/Config_Handlers/XMLSchema/Writer.ipp + * tools/Config_Handlers/XMLSchema/Writer.tpp + * tools/Config_Handlers/XSC_XML_Handlers_Export.h + * tools/Config_Handlers/XSCRT + * tools/Config_Handlers/XSCRT/Elements.hpp + * tools/Config_Handlers/XSCRT/Elements.ipp + * tools/Config_Handlers/XSCRT/Elements.tpp + * tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp + * tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp + * tools/Config_Handlers/XSCRT/Parser.hpp + * tools/Config_Handlers/XSCRT/Parser.ipp + * tools/Config_Handlers/XSCRT/Parser.tpp + * tools/Config_Handlers/XSCRT/Traversal.hpp + * tools/Config_Handlers/XSCRT/Traversal.ipp + * tools/Config_Handlers/XSCRT/Traversal.tpp + * tools/Config_Handlers/XSCRT/Writer.hpp + * tools/Config_Handlers/XSCRT/Writer.ipp + * tools/Config_Handlers/XSCRT/Writer.tpp + * tools/Config_Handlers/XSCRT/XML.hpp + * tools/Config_Handlers/XSCRT/XML.ipp + * tools/Config_Handlers/XSCRT/XML.tpp + * tools/Config_Handlers/XSCRT/XMLSchema.hpp + Moved Config_Handlers and schema to DAnCE + Mon Dec 21 18:26:04 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ciao/ComponentServer/CIAO_ComponentInstallation_Impl.cpp diff --git a/CIAO/tools/Config_Handlers/ADD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp index e4106b4b70f..614a20190c0 100644 --- a/CIAO/tools/Config_Handlers/ADD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp @@ -19,7 +19,7 @@ namespace CIAO ADD_Handler::artifact_deployment_descrs (const deploymentPlan &src, ::Deployment::ArtifactDeploymentDescriptions &dest) { - CIAO_TRACE("ADD_Handler::atrifact_deployment_descrs"); + DANCE_TRACE("ADD_Handler::atrifact_deployment_descrs"); deploymentPlan::artifact_const_iterator aci_e = src.end_artifact (); dest.length (src.count_artifact ()); @@ -42,7 +42,7 @@ namespace CIAO Deployment::ArtifactDeploymentDescription &dest, CORBA::ULong pos) { - CIAO_TRACE("ADD_Handler::atrifact_deployment_descr"); + DANCE_TRACE("ADD_Handler::atrifact_deployment_descr"); dest.name = ACE_TEXT_ALWAYS_CHAR ( src.name ().c_str ()); @@ -128,7 +128,7 @@ namespace CIAO ADD_Handler::artifact_deployment_descr ( const Deployment::ArtifactDeploymentDescription &src) { - CIAO_TRACE("ADD_Handler::atrifact_deployment_descr - reverse"); + DANCE_TRACE("ADD_Handler::atrifact_deployment_descr - reverse"); //Get the name and node and store them in the add XMLSchema::string< ACE_TCHAR > name (ACE_TEXT_CHAR_TO_TCHAR (src.name)); XMLSchema::string< ACE_TCHAR > node (ACE_TEXT_CHAR_TO_TCHAR (src.node)); diff --git a/CIAO/tools/Config_Handlers/ADD_Handler.h b/CIAO/DAnCE/Config_Handlers/ADD_Handler.h index 063093a7038..063093a7038 100644 --- a/CIAO/tools/Config_Handlers/ADD_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/ADD_Handler.h diff --git a/CIAO/tools/Config_Handlers/Any_Handler.cpp b/CIAO/DAnCE/Config_Handlers/Any_Handler.cpp index e1b2bc4d0ec..cadcd1163f1 100644 --- a/CIAO/tools/Config_Handlers/Any_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/Any_Handler.cpp @@ -6,7 +6,7 @@ #include "DataType_Handler.h" #include "Basic_Deployment_Data.hpp" #include "tao/AnyTypeCode/Any.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" #include "DynAny_Handler/DynAny_Handler.h" #include "ace/Null_Mutex.h" @@ -28,7 +28,7 @@ namespace CIAO Any_Handler::extract_into_any (const Any& desc, CORBA::Any& toconfig) { - CIAO_TRACE("Any_Handler::extract_into_any"); + DANCE_TRACE("Any_Handler::extract_into_any"); try { DynamicAny::DynAny_var dyn = DYNANY_HANDLER->extract_into_dynany (desc.type (), @@ -50,7 +50,7 @@ namespace CIAO Any Any_Handler::get_any (const ::CORBA::Any& src) { - CIAO_TRACE("Any_Handler::extract_into_any - reverse"); + DANCE_TRACE("Any_Handler::extract_into_any - reverse"); return DYNANY_HANDLER->extract_from_dynany (src); } diff --git a/CIAO/tools/Config_Handlers/Any_Handler.h b/CIAO/DAnCE/Config_Handlers/Any_Handler.h index 03f99722034..03f99722034 100644 --- a/CIAO/tools/Config_Handlers/Any_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/Any_Handler.h diff --git a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp b/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.cpp index fa2ac5d3a16..fa2ac5d3a16 100644 --- a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp +++ b/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.cpp diff --git a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp b/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp index b393929cf10..b393929cf10 100644 --- a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp +++ b/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp diff --git a/CIAO/tools/Config_Handlers/CCD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/CCD_Handler.cpp index 9f596cdcdeb..686a5e143d0 100644 --- a/CIAO/tools/Config_Handlers/CCD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/CCD_Handler.cpp @@ -2,7 +2,7 @@ #include "tao/AnyTypeCode/AnyTypeCode_methods.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" #include "CCD_Handler.h" #include "ccd.hpp" #include "Property_Handler.h" @@ -19,7 +19,7 @@ namespace CIAO const ComponentInterfaceDescription &desc, Deployment::ComponentInterfaceDescription& toconfig) { - CIAO_TRACE("CCD_Handler::component_interface_descr"); + DANCE_TRACE("CCD_Handler::component_interface_descr"); if (desc.UUID_p ()) toconfig.UUID = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (desc.UUID ().c_str ())); @@ -113,7 +113,7 @@ namespace CIAO CCD_Handler::component_interface_descr ( const ::Deployment::ComponentInterfaceDescription& src) { - CIAO_TRACE("CCD_Handler::component_interface_descr - reverse"); + DANCE_TRACE("CCD_Handler::component_interface_descr - reverse"); ComponentInterfaceDescription cid; //Load up the basic string members diff --git a/CIAO/tools/Config_Handlers/CCD_Handler.h b/CIAO/DAnCE/Config_Handlers/CCD_Handler.h index b3e8292f038..b3e8292f038 100644 --- a/CIAO/tools/Config_Handlers/CCD_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/CCD_Handler.h diff --git a/CIAO/tools/Config_Handlers/CEPE_Handler.cpp b/CIAO/DAnCE/Config_Handlers/CEPE_Handler.cpp index a3d76c50ef0..bd29956181d 100644 --- a/CIAO/tools/Config_Handlers/CEPE_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/CEPE_Handler.cpp @@ -3,7 +3,7 @@ #include "CEPE_Handler.h" #include "Basic_Deployment_Data.hpp" #include "DAnCE/Deployment/Deployment_DataC.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO { namespace Config_Handlers @@ -13,7 +13,7 @@ namespace CIAO const PlanConnectionDescription &src, ::Deployment::ComponentExternalPortEndpoints &dest) { - CIAO_TRACE("CEOE_Handler::external_port_endpoints"); + DANCE_TRACE("CEOE_Handler::external_port_endpoints"); PlanConnectionDescription::externalEndpoint_const_iterator eeci_e = src.end_externalEndpoint (); @@ -34,7 +34,7 @@ namespace CIAO const ComponentExternalPortEndpoint &src, ::Deployment::ComponentExternalPortEndpoint &dest) { - CIAO_TRACE("CEOE_Handler::external_port_endpoint"); + DANCE_TRACE("CEOE_Handler::external_port_endpoint"); dest.portName = ACE_TEXT_ALWAYS_CHAR (src.portName ().c_str ()); } @@ -42,7 +42,7 @@ namespace CIAO CEPE_Handler::external_port_endpoint ( const ::Deployment::ComponentExternalPortEndpoint &src) { - CIAO_TRACE("CEOE_Handler::external_port_endpoint - reverse"); + DANCE_TRACE("CEOE_Handler::external_port_endpoint - reverse"); //MAJO Unfinished XMLSchema::string< ACE_TCHAR > portname (ACE_TEXT_CHAR_TO_TCHAR (src.portName)); return ComponentExternalPortEndpoint (portname); diff --git a/CIAO/tools/Config_Handlers/CEPE_Handler.h b/CIAO/DAnCE/Config_Handlers/CEPE_Handler.h index b3b0938b8c2..b3b0938b8c2 100644 --- a/CIAO/tools/Config_Handlers/CEPE_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/CEPE_Handler.h diff --git a/CIAO/tools/Config_Handlers/CPD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/CPD_Handler.cpp index afad9712eed..70fbd104390 100644 --- a/CIAO/tools/Config_Handlers/CPD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/CPD_Handler.cpp @@ -3,7 +3,7 @@ #include "CPD_Handler.h" #include "Basic_Deployment_Data.hpp" #include "DAnCE/Deployment/Deployment_DataC.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO { @@ -14,7 +14,7 @@ namespace CIAO const ComponentPortDescription& desc, Deployment::ComponentPortDescription& toconfig) { - CIAO_TRACE("CPD_Handler::component_port_description"); + DANCE_TRACE("CPD_Handler::component_port_description"); toconfig.name = ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ()); @@ -71,7 +71,7 @@ namespace CIAO CPD_Handler::component_port_description ( const Deployment::ComponentPortDescription& src) { - CIAO_TRACE("CPD_Handler::component_port_description - reverse"); + DANCE_TRACE("CPD_Handler::component_port_description - reverse"); ::XMLSchema::string< ACE_TCHAR > name (ACE_TEXT_CHAR_TO_TCHAR (src.name)); ::XMLSchema::string< ACE_TCHAR > stype (ACE_TEXT_CHAR_TO_TCHAR (src.specificType)); diff --git a/CIAO/tools/Config_Handlers/CPD_Handler.h b/CIAO/DAnCE/Config_Handlers/CPD_Handler.h index 445d2c5f329..445d2c5f329 100644 --- a/CIAO/tools/Config_Handlers/CPD_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/CPD_Handler.h diff --git a/CIAO/tools/Config_Handlers/CRDD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/CRDD_Handler.cpp index 226ab86d70e..180213a21d5 100644 --- a/CIAO/tools/Config_Handlers/CRDD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/CRDD_Handler.cpp @@ -6,7 +6,7 @@ #include "DAnCE/Deployment/Deployment_DataC.h" #include "Property_Handler.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO { @@ -27,7 +27,7 @@ namespace CIAO void CRDD_Handler::get_ConnectionResourceDeploymentDescription (Deployment::ConnectionResourceDeploymentDescription& toconfig, const ConnectionResourceDeploymentDescription& desc) { - CIAO_TRACE("CRDD_Handler::get_ConnectionResourceDD"); + DANCE_TRACE("CRDD_Handler::get_ConnectionResourceDD"); toconfig.targetName = ACE_TEXT_ALWAYS_CHAR ( desc.targetName ().c_str ()); toconfig.requirementName = ACE_TEXT_ALWAYS_CHAR ( desc.requirementName ().c_str ()); @@ -42,7 +42,7 @@ namespace CIAO CRDD_Handler::connection_resource_depl_desc ( const ::Deployment::ConnectionResourceDeploymentDescription& src) { - CIAO_TRACE("CRDD_Handler::get_ConnectionResourceDeploymentDescription- reverse"); + DANCE_TRACE("CRDD_Handler::get_ConnectionResourceDeploymentDescription- reverse"); XMLSchema::string< ACE_TCHAR > tname (ACE_TEXT_CHAR_TO_TCHAR (src.targetName)); XMLSchema::string< ACE_TCHAR > reqname (ACE_TEXT_CHAR_TO_TCHAR(src.requirementName)); XMLSchema::string <ACE_TCHAR> resname (ACE_TEXT_CHAR_TO_TCHAR (src.resourceName)); diff --git a/CIAO/tools/Config_Handlers/CRDD_Handler.h b/CIAO/DAnCE/Config_Handlers/CRDD_Handler.h index 8f5c964aab4..8f5c964aab4 100644 --- a/CIAO/tools/Config_Handlers/CRDD_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/CRDD_Handler.h diff --git a/CIAO/tools/Config_Handlers/Common.h b/CIAO/DAnCE/Config_Handlers/Common.h index dec8f4b497a..dec8f4b497a 100644 --- a/CIAO/tools/Config_Handlers/Common.h +++ b/CIAO/DAnCE/Config_Handlers/Common.h diff --git a/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp b/CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp index e9941254093..236f3de946b 100644 --- a/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp @@ -3,7 +3,7 @@ #include "ComponentPropertyDescription_Handler.h" #include "DataType_Handler.h" #include "DAnCE/Deployment/Deployment_DataC.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO { namespace Config_Handlers @@ -13,7 +13,7 @@ namespace CIAO const ComponentPropertyDescription& desc, ::Deployment::ComponentPropertyDescription& toconfig) { - CIAO_TRACE("ComponentPropertyDescription_Handler::component_property_description"); + DANCE_TRACE("ComponentPropertyDescription_Handler::component_property_description"); toconfig.name = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ())); // Delegate the DataType to the @@ -30,7 +30,7 @@ namespace CIAO ComponentPropertyDescription_Handler::component_property_description ( const ::Deployment::ComponentPropertyDescription &src) { - CIAO_TRACE("ComponentPropertyDescription_Handler::component_property_description - reverse"); + DANCE_TRACE("ComponentPropertyDescription_Handler::component_property_description - reverse"); XMLSchema::string< ACE_TCHAR > name (ACE_TEXT_CHAR_TO_TCHAR (src.name)); DataType dt (DataType_Handler::data_type (src.type)); ComponentPropertyDescription cpd (name,dt); diff --git a/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.h b/CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.h index f87edc7fcea..f87edc7fcea 100644 --- a/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.h diff --git a/CIAO/tools/Config_Handlers/Config_Handlers.mpc b/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc index 03ad9ffae78..096c0dce4e8 100644 --- a/CIAO/tools/Config_Handlers/Config_Handlers.mpc +++ b/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc @@ -3,12 +3,12 @@ project (XSC_XML_Generation) : xscdefaults { requires += xsc - xscflags += --cxx-banner-file $(CIAO_ROOT)/docs/schema/xsc-banner.cpp - xscflags += --cxx-header-banner-file $(CIAO_ROOT)/docs/schema/xsc-banner.h + xscflags += --cxx-banner-file $(DANCE_ROOT)/docs/schema/xsc-banner.cpp + xscflags += --cxx-header-banner-file $(DANCE_ROOT)/docs/schema/xsc-banner.h xscflags += --cxx-export-symbol XSC_XML_Handlers_Export xscflags += --cxx-namespace-regex "%.*Deployment.*%CIAO/Config_Handlers%" //<%quote%> xscflags += --cxx-export-header XSC_XML_Handlers_Export.h - xscflags += --search-path "$(CIAO_ROOT)/docs/schema" + xscflags += --search-path "$(DANCE_ROOT)/docs/schema" custom_only = 1 @@ -35,7 +35,7 @@ project (XSC_XML_Handlers) : acelib, xerces, ciao_lib, ciao_xml_utils { sharedname += XSC_XML_Handlers dynamicflags = XSC_XML_HANDLERS_BUILD_DLL macros += XML_USE_PTHREADS - includes += $(CIAO_ROOT)/tools/Config_Handlers $(CIAO_ROOT)/tools + includes += $(DANCE_ROOT)/Config_Handlers $(CIAO_ROOT)/tools after += XSC_XML_Generation Source_Files { @@ -64,7 +64,7 @@ project (XSC_XML_Handlers) : acelib, xerces, ciao_lib, ciao_xml_utils { } -project (XSC_Config_Handlers) : dance_deployment_stub, ciao_config_handlers_base, ciao_lib, dance { +project (XSC_Config_Handlers) : dance_deployment_stub, ciao_config_handlers_base, ciao_lib, dance, dance_logger { after += XSC_DynAny_Handler \ XSC_Config_Handlers_Common @@ -75,8 +75,6 @@ project (XSC_Config_Handlers) : dance_deployment_stub, ciao_config_handlers_base XSC_DynAny_Handler \ XSC_Config_Handlers_Common - includes += $(CIAO_ROOT)/ciao - Source_Files { DP_Handler.cpp CCD_Handler.cpp @@ -127,7 +125,7 @@ project (XSC_Config_Handlers_Common) : dance_deployment_stub, ciao_config_handle } project (XSC_Config_Handlers_Tests) : dance_deployment_stub, ciao_config_handlers, ifr_client { requires += dummy_label - includes += $(CIAO_ROOT)/tools/Config_Handlers + includes += $(DANCE_ROOT)/Config_Handlers exename = test macros += XML_USE_PTHREADS diff --git a/CIAO/tools/Config_Handlers/Config_Handlers_Common_Export.h b/CIAO/DAnCE/Config_Handlers/Config_Handlers_Common_Export.h index f1583c7e71d..f1583c7e71d 100644 --- a/CIAO/tools/Config_Handlers/Config_Handlers_Common_Export.h +++ b/CIAO/DAnCE/Config_Handlers/Config_Handlers_Common_Export.h diff --git a/CIAO/tools/Config_Handlers/Config_Handlers_Export.h b/CIAO/DAnCE/Config_Handlers/Config_Handlers_Export.h index 64dec8bdfa5..64dec8bdfa5 100644 --- a/CIAO/tools/Config_Handlers/Config_Handlers_Export.h +++ b/CIAO/DAnCE/Config_Handlers/Config_Handlers_Export.h diff --git a/CIAO/tools/Config_Handlers/DD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/DD_Handler.cpp index 41c6db742c7..81ec2526fc1 100644 --- a/CIAO/tools/Config_Handlers/DD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/DD_Handler.cpp @@ -6,7 +6,7 @@ #include "Any_Handler.h" #include "Deployment.hpp" #include "DAnCE/Deployment/Deployment_TargetDataC.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" using namespace std; @@ -19,7 +19,7 @@ namespace CIAO domain_ (0), retval_ (false) { - CIAO_TRACE("DP_PCD_Handler::constructor"); + DANCE_TRACE("DP_PCD_Handler::constructor"); XERCES_CPP_NAMESPACE::DOMDocument *dom = XML_Helper::XML_HELPER.create_dom (file); @@ -43,7 +43,7 @@ namespace CIAO domain_(dmn), retval_(false) { - CIAO_TRACE("DP_PCD_Handler::constructor - Domain"); + DANCE_TRACE("DP_PCD_Handler::constructor - Domain"); if(!this->build_domain ()) throw NoDomain (); } @@ -64,7 +64,7 @@ namespace CIAO bool DD_Handler::build_domain () { - CIAO_TRACE("DP_PCD_Handler::build_domain"); + DANCE_TRACE("DP_PCD_Handler::build_domain"); this->idl_domain_.reset ( new ::Deployment::Domain ); // Read in the name diff --git a/CIAO/tools/Config_Handlers/DD_Handler.h b/CIAO/DAnCE/Config_Handlers/DD_Handler.h index f3a9e0c60c9..f3a9e0c60c9 100644 --- a/CIAO/tools/Config_Handlers/DD_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/DD_Handler.h diff --git a/CIAO/tools/Config_Handlers/DP_Handler.cpp b/CIAO/DAnCE/Config_Handlers/DP_Handler.cpp index d649e6ee06a..c045e15c17c 100644 --- a/CIAO/tools/Config_Handlers/DP_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/DP_Handler.cpp @@ -85,7 +85,7 @@ ACE_RCSID (Config_Handlers, bool DP_Handler::resolve_plan (deploymentPlan &xsc_dp) { - CIAO_TRACE ("DP_Handler::resolve_plan"); + DANCE_TRACE ("DP_Handler::resolve_plan"); ::Deployment::DeploymentPlan *tmp = new Deployment::DeploymentPlan; @@ -153,13 +153,13 @@ ACE_RCSID (Config_Handlers, std::for_each (xsc_dp.begin_connection (), xsc_dp.end_connection (), PCD_Functor (this->idl_dp_->connection)); - + this->idl_dp_->localityConstraint.length (xsc_dp.count_localityConstraint ()); - + std::for_each (xsc_dp.begin_localityConstraint (), xsc_dp.end_localityConstraint (), PL_Functor (this->idl_dp_->localityConstraint)); - + //PCD_Handler::get_PlanConnectionDescription (xsc_dp, this->idl_dp_->connection); return true; @@ -168,7 +168,7 @@ ACE_RCSID (Config_Handlers, bool DP_Handler::build_xsc (const ::Deployment::DeploymentPlan &plan) { - CIAO_TRACE ("DP_Handler::build_xsc"); + DANCE_TRACE ("DP_Handler::build_xsc"); // Initialize the UUID generator. ACE_Utils::UUID_GENERATOR::instance ()->init (); diff --git a/CIAO/tools/Config_Handlers/DP_Handler.h b/CIAO/DAnCE/Config_Handlers/DP_Handler.h index 82d93aaa62f..82d93aaa62f 100644 --- a/CIAO/tools/Config_Handlers/DP_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/DP_Handler.h diff --git a/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/DP_PCD_Handler.cpp index ba0b88a2bf7..d69f6035897 100644 --- a/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/DP_PCD_Handler.cpp @@ -9,7 +9,7 @@ #include "Basic_Deployment_Data.hpp" #include "cdp.hpp" #include "DAnCE/Deployment/Deployment_DataC.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO { namespace Config_Handlers @@ -19,7 +19,7 @@ namespace CIAO const DeploymentPlan &src, Deployment::PlanConnectionDescriptions& dest) { - CIAO_TRACE("DP_PCD_Handler::plan_connection_descrs"); + DANCE_TRACE("DP_PCD_Handler::plan_connection_descrs"); DeploymentPlan::connection_const_iterator cci_e = src.end_connection (); @@ -39,7 +39,7 @@ namespace CIAO DP_PCD_Handler::plan_connection_descr ( const Deployment::PlanConnectionDescription &src) { - CIAO_TRACE("DP_PCD_Handler::plan_connection_descr"); + DANCE_TRACE("DP_PCD_Handler::plan_connection_descr"); PlanConnectionDescription pcd = PCD_Handler::get_PlanConnectionDescription(src); return pcd; } @@ -49,7 +49,7 @@ namespace CIAO const PlanConnectionDescription &src, Deployment::PlanConnectionDescription &dest) { - CIAO_TRACE("DP_PCD_Handler::plan_connection_descr - reverse"); + DANCE_TRACE("DP_PCD_Handler::plan_connection_descr - reverse"); dest.name = src.name ().c_str (); diff --git a/CIAO/tools/Config_Handlers/DP_PCD_Handler.h b/CIAO/DAnCE/Config_Handlers/DP_PCD_Handler.h index eceb6f03bb6..eceb6f03bb6 100644 --- a/CIAO/tools/Config_Handlers/DP_PCD_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/DP_PCD_Handler.h diff --git a/CIAO/tools/Config_Handlers/DataType_Handler.cpp b/CIAO/DAnCE/Config_Handlers/DataType_Handler.cpp index 6020c40727f..57318d35a4a 100644 --- a/CIAO/tools/Config_Handlers/DataType_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/DataType_Handler.cpp @@ -3,7 +3,7 @@ #include "DataType_Handler.h" #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO { namespace Config_Handlers @@ -22,7 +22,7 @@ namespace CIAO DataType_Handler::data_type (const DataType& desc, CORBA::TypeCode_ptr& type) { - CIAO_TRACE("DataType_Handler::data_type"); + DANCE_TRACE("DataType_Handler::data_type"); TCKind kind (desc.kind ()); switch (kind.integral ()) @@ -113,7 +113,7 @@ namespace CIAO DataType DataType_Handler::data_type (const CORBA::TypeCode_ptr& src) { - CIAO_TRACE("DataType_Handler::data_type - reverse"); + DANCE_TRACE("DataType_Handler::data_type - reverse"); switch (src->kind ()) { case ::CORBA::tk_null: diff --git a/CIAO/tools/Config_Handlers/DataType_Handler.h b/CIAO/DAnCE/Config_Handlers/DataType_Handler.h index b2a3240fbec..b2a3240fbec 100644 --- a/CIAO/tools/Config_Handlers/DataType_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/DataType_Handler.h diff --git a/CIAO/tools/Config_Handlers/Deployment.cpp b/CIAO/DAnCE/Config_Handlers/Deployment.cpp index cce77ace34b..cce77ace34b 100644 --- a/CIAO/tools/Config_Handlers/Deployment.cpp +++ b/CIAO/DAnCE/Config_Handlers/Deployment.cpp diff --git a/CIAO/tools/Config_Handlers/Deployment.hpp b/CIAO/DAnCE/Config_Handlers/Deployment.hpp index 2a039912b19..2a039912b19 100644 --- a/CIAO/tools/Config_Handlers/Deployment.hpp +++ b/CIAO/DAnCE/Config_Handlers/Deployment.hpp diff --git a/CIAO/tools/Config_Handlers/DnC_Dump.cpp b/CIAO/DAnCE/Config_Handlers/DnC_Dump.cpp index 3bee947afd3..3bee947afd3 100644 --- a/CIAO/tools/Config_Handlers/DnC_Dump.cpp +++ b/CIAO/DAnCE/Config_Handlers/DnC_Dump.cpp diff --git a/CIAO/tools/Config_Handlers/DnC_Dump.h b/CIAO/DAnCE/Config_Handlers/DnC_Dump.h index 4cddf38cc31..4cddf38cc31 100644 --- a/CIAO/tools/Config_Handlers/DnC_Dump.h +++ b/CIAO/DAnCE/Config_Handlers/DnC_Dump.h diff --git a/CIAO/tools/Config_Handlers/DnC_Dump_T.cpp b/CIAO/DAnCE/Config_Handlers/DnC_Dump_T.cpp index 0f95945fb0f..0f95945fb0f 100644 --- a/CIAO/tools/Config_Handlers/DnC_Dump_T.cpp +++ b/CIAO/DAnCE/Config_Handlers/DnC_Dump_T.cpp diff --git a/CIAO/tools/Config_Handlers/DnC_Dump_T.h b/CIAO/DAnCE/Config_Handlers/DnC_Dump_T.h index 88a5c55f3cd..88a5c55f3cd 100644 --- a/CIAO/tools/Config_Handlers/DnC_Dump_T.h +++ b/CIAO/DAnCE/Config_Handlers/DnC_Dump_T.h diff --git a/CIAO/tools/Config_Handlers/Dump_Obj.cpp b/CIAO/DAnCE/Config_Handlers/Dump_Obj.cpp index b2cc34fd089..b2cc34fd089 100644 --- a/CIAO/tools/Config_Handlers/Dump_Obj.cpp +++ b/CIAO/DAnCE/Config_Handlers/Dump_Obj.cpp diff --git a/CIAO/tools/Config_Handlers/Dump_Obj.h b/CIAO/DAnCE/Config_Handlers/Dump_Obj.h index babffe43bac..babffe43bac 100644 --- a/CIAO/tools/Config_Handlers/Dump_Obj.h +++ b/CIAO/DAnCE/Config_Handlers/Dump_Obj.h diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler.mpc b/CIAO/DAnCE/Config_Handlers/DynAny_Handler.mpc index c5cc64b7a34..c5cc64b7a34 100644 --- a/CIAO/tools/Config_Handlers/DynAny_Handler.mpc +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler.mpc diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DataType_Handler.cpp index 0e2bfe0e411..0e2bfe0e411 100644 --- a/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DataType_Handler.cpp diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.h b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DataType_Handler.h index c16b4b21fe3..c16b4b21fe3 100644 --- a/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DataType_Handler.h diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp index a16e5c882c1..a16e5c882c1 100644 --- a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.h b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAlias_Handler.h index b5bca3c7377..b5bca3c7377 100644 --- a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAlias_Handler.h diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp index 0998d5c5cca..0998d5c5cca 100644 --- a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.h index d0cf66e9c32..d0cf66e9c32 100644 --- a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.h diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h index 78a3ee57b77..78a3ee57b77 100644 --- a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp index 2b01a870ba6..2b01a870ba6 100644 --- a/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynEnum_Handler.h index 8eaa1f11897..8eaa1f11897 100644 --- a/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynEnum_Handler.h diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp index 6da77d30e75..6da77d30e75 100644 --- a/CIAO/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.h b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynSequence_Handler.h index 7d6a5b6ba6c..7d6a5b6ba6c 100644 --- a/CIAO/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynSequence_Handler.h diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp index b075d418e7b..b075d418e7b 100644 --- a/CIAO/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.h b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynStruct_Handler.h index 554912378c6..554912378c6 100644 --- a/CIAO/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynStruct_Handler.h diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/dynany_test.idl b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/dynany_test.idl index 0ffecc5c757..0ffecc5c757 100644 --- a/CIAO/tools/Config_Handlers/DynAny_Handler/dynany_test.idl +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/dynany_test.idl diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/test.cpp b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/test.cpp index e03f21236b1..e03f21236b1 100644 --- a/CIAO/tools/Config_Handlers/DynAny_Handler/test.cpp +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/test.cpp diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/test.mpc b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/test.mpc index 55ce7ca31ec..55ce7ca31ec 100644 --- a/CIAO/tools/Config_Handlers/DynAny_Handler/test.mpc +++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/test.mpc diff --git a/CIAO/tools/Config_Handlers/ERE_Handler.cpp b/CIAO/DAnCE/Config_Handlers/ERE_Handler.cpp index 916601b7052..eece0a3f09a 100644 --- a/CIAO/tools/Config_Handlers/ERE_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/ERE_Handler.cpp @@ -3,7 +3,7 @@ #include "ERE_Handler.h" #include "Basic_Deployment_Data.hpp" #include "DAnCE/Deployment/Deployment_DataC.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO { namespace Config_Handlers @@ -13,7 +13,7 @@ namespace CIAO const PlanConnectionDescription &src, Deployment::ExternalReferenceEndpoints &dest) { - CIAO_TRACE("ERE_Handler::external_ref_endpoints"); + DANCE_TRACE("ERE_Handler::external_ref_endpoints"); PlanConnectionDescription::externalReference_const_iterator erep_e = src.end_externalReference (); @@ -34,7 +34,7 @@ namespace CIAO const ExternalReferenceEndpoint &src, Deployment::ExternalReferenceEndpoint &dest) { - CIAO_TRACE("ERE_Handler::external_ref_endpoint"); + DANCE_TRACE("ERE_Handler::external_ref_endpoint"); dest.location = ACE_TEXT_ALWAYS_CHAR ( src.location ().c_str ()); dest.provider = src.provider (); if (src.portName_p ()) @@ -49,7 +49,7 @@ namespace CIAO ERE_Handler::external_ref_endpoint ( const Deployment::ExternalReferenceEndpoint& src) { - CIAO_TRACE("ERE_Handler::external_ref_endpoint - reverse"); + DANCE_TRACE("ERE_Handler::external_ref_endpoint - reverse"); XMLSchema::string< ACE_TCHAR > loc (ACE_TEXT_CHAR_TO_TCHAR (src.location)); // XMLSchema::string< char > provider ((src.provider)); XMLSchema::string< ACE_TCHAR > pn (ACE_TEXT_CHAR_TO_TCHAR (src.portName)); diff --git a/CIAO/tools/Config_Handlers/ERE_Handler.h b/CIAO/DAnCE/Config_Handlers/ERE_Handler.h index 5e4d1e1054e..5e4d1e1054e 100644 --- a/CIAO/tools/Config_Handlers/ERE_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/ERE_Handler.h diff --git a/CIAO/tools/Config_Handlers/ESD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/ESD_Handler.cpp index 5e1647f93b9..8cfb39ae871 100644 --- a/CIAO/tools/Config_Handlers/ESD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/ESD_Handler.cpp @@ -14,7 +14,7 @@ namespace CIAO const DeploymentPlan &src, Deployment::EventServiceDeploymentDescriptions& dest) { - CIAO_TRACE("ESD_Handler::instance_deployment_descrs"); + DANCE_TRACE("ESD_Handler::instance_deployment_descrs"); DeploymentPlan::es_const_iterator esd_e = src.end_instance (); CORBA::ULong pos = 0; @@ -37,7 +37,7 @@ namespace CIAO Deployment::EventServiceDeploymentDescription& dest, CORBA::ULong pos) { - CIAO_TRACE("IDD_Handler::es_deployment_descr"); + DANCE_TRACE("IDD_Handler::es_deployment_descr"); try { dest.name = src.name ().c_str (); @@ -80,7 +80,7 @@ namespace CIAO ESD_Handler::es_deployment_descr ( const Deployment::EventServiceDeploymentDescription& src) { - CIAO_TRACE("ESD_Handler::es_deployment_descr - reverse"); + DANCE_TRACE("ESD_Handler::es_deployment_descr - reverse"); //Get all the string XMLSchema::string < ACE_TCHAR > name ((src.name)); XMLSchema::string < ACE_TCHAR > node ((src.node)); diff --git a/CIAO/tools/Config_Handlers/ESD_Handler.h b/CIAO/DAnCE/Config_Handlers/ESD_Handler.h index b20828a9713..b20828a9713 100644 --- a/CIAO/tools/Config_Handlers/ESD_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/ESD_Handler.h diff --git a/CIAO/tools/Config_Handlers/IDD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/IDD_Handler.cpp index 152dee8c078..905b202b081 100644 --- a/CIAO/tools/Config_Handlers/IDD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/IDD_Handler.cpp @@ -20,7 +20,7 @@ namespace CIAO IDD_Handler::instance_deployment_descrs (const deploymentPlan &src, Deployment::InstanceDeploymentDescriptions& dest) { - CIAO_TRACE("IDD_Handler::instance_deployment_descrs"); + DANCE_TRACE("IDD_Handler::instance_deployment_descrs"); deploymentPlan::instance_const_iterator idd_e = src.end_instance (); @@ -43,7 +43,7 @@ namespace CIAO Deployment::InstanceDeploymentDescription& dest, CORBA::ULong pos) { - CIAO_TRACE("IDD_Handler::instance_deployment_descr"); + DANCE_TRACE("IDD_Handler::instance_deployment_descr"); try { dest.name = ACE_TEXT_ALWAYS_CHAR ( src.name ().c_str ()); @@ -108,7 +108,7 @@ namespace CIAO IDD_Handler::instance_deployment_descr ( const Deployment::InstanceDeploymentDescription& src) { - CIAO_TRACE("IDD_Handler::instance_deployment_descr - reverse"); + DANCE_TRACE("IDD_Handler::instance_deployment_descr - reverse"); //Get all the string/IDREFs XMLSchema::string < ACE_TCHAR > name (ACE_TEXT_CHAR_TO_TCHAR (src.name)); XMLSchema::string < ACE_TCHAR > node (ACE_TEXT_CHAR_TO_TCHAR (src.node)); diff --git a/CIAO/tools/Config_Handlers/IDD_Handler.h b/CIAO/DAnCE/Config_Handlers/IDD_Handler.h index 313b7d9e6b2..313b7d9e6b2 100644 --- a/CIAO/tools/Config_Handlers/IDD_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/IDD_Handler.h diff --git a/CIAO/tools/Config_Handlers/IDREF_Base.cpp b/CIAO/DAnCE/Config_Handlers/IDREF_Base.cpp index 4df3c5863c7..9f11efb7535 100644 --- a/CIAO/tools/Config_Handlers/IDREF_Base.cpp +++ b/CIAO/DAnCE/Config_Handlers/IDREF_Base.cpp @@ -3,7 +3,7 @@ #ifndef IDREF_BASE_CPP #define IDREF_BASE_CPP -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" #include "IDREF_Base.h" #include <iostream> @@ -20,7 +20,7 @@ namespace CIAO void IDREF_Base<T>::bind_ref (ACE_TString& id, T value) { - CIAO_TRACE("IDREF_Base<T>::bind_ref"); + DANCE_TRACE("IDREF_Base<T>::bind_ref"); int retval = idref_map_.bind (id, value); @@ -38,7 +38,7 @@ namespace CIAO { // Note: For this function to compile and work properly, // T must have the postincrement operator defined. - CIAO_TRACE ("IDREF_Base<T>::bind_next_available"); + DANCE_TRACE ("IDREF_Base<T>::bind_next_available"); // ACE_DEBUG ((LM_DEBUG, "**** Binding %s to %i\n", // id.c_str (), // this->next_)); @@ -59,7 +59,7 @@ namespace CIAO void IDREF_Base<T>::find_ref (const ACE_TString& id, T& val) { - CIAO_TRACE("IDREF_Base<T>::find_ref(C_String, T)"); + DANCE_TRACE("IDREF_Base<T>::find_ref(C_String, T)"); int retval = idref_map_.find (id, val); @@ -73,7 +73,7 @@ namespace CIAO void IDREF_Base<T>::find_ref (const T& value, ACE_TString& id) { - CIAO_TRACE("IDREF_Base<T>::find_ref (T, CString)"); + DANCE_TRACE("IDREF_Base<T>::find_ref (T, CString)"); int retval = pos_map_.find (value, id); @@ -90,7 +90,7 @@ namespace CIAO bool IDREF_Base<T>::unbind_refs (void) { - CIAO_TRACE("IDREF_Base<T>::unbind_refs"); + DANCE_TRACE("IDREF_Base<T>::unbind_refs"); int retval = idref_map_.unbind_all (); diff --git a/CIAO/tools/Config_Handlers/IDREF_Base.h b/CIAO/DAnCE/Config_Handlers/IDREF_Base.h index 3707f66142d..3707f66142d 100644 --- a/CIAO/tools/Config_Handlers/IDREF_Base.h +++ b/CIAO/DAnCE/Config_Handlers/IDREF_Base.h diff --git a/CIAO/tools/Config_Handlers/ID_Handler.cpp b/CIAO/DAnCE/Config_Handlers/ID_Handler.cpp index 463aa2e7bcc..f4e361e0d5d 100644 --- a/CIAO/tools/Config_Handlers/ID_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/ID_Handler.cpp @@ -3,7 +3,7 @@ #include "ID_Handler.h" #include "Basic_Deployment_Data.hpp" #include "DAnCE/Deployment/Deployment_DataC.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO { namespace Config_Handlers @@ -22,7 +22,7 @@ namespace CIAO Deployment::ImplementationDependency& toconfig) { - CIAO_TRACE("ID_Handler::get_ImplementationDependency"); + DANCE_TRACE("ID_Handler::get_ImplementationDependency"); toconfig.requiredType= CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (desc.requiredType ().c_str ())); @@ -32,7 +32,7 @@ namespace CIAO ID_Handler::impl_dependency ( const ::Deployment::ImplementationDependency& src) { - CIAO_TRACE("ID_Handler::get_ImplementationDependency - reverse"); + DANCE_TRACE("ID_Handler::get_ImplementationDependency - reverse"); XMLSchema::string< ACE_TCHAR > reqtype (ACE_TEXT_CHAR_TO_TCHAR (src.requiredType)); ImplementationDependency id (reqtype); diff --git a/CIAO/tools/Config_Handlers/ID_Handler.h b/CIAO/DAnCE/Config_Handlers/ID_Handler.h index bea6ec2b1a6..bea6ec2b1a6 100644 --- a/CIAO/tools/Config_Handlers/ID_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/ID_Handler.h diff --git a/CIAO/tools/Config_Handlers/IRDD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/IRDD_Handler.cpp index 6b3fe17d249..5f98bd0fbb0 100644 --- a/CIAO/tools/Config_Handlers/IRDD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/IRDD_Handler.cpp @@ -4,7 +4,7 @@ #include "Basic_Deployment_Data.hpp" #include "DAnCE/Deployment/Deployment_DataC.h" #include "Property_Handler.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO @@ -25,7 +25,7 @@ namespace CIAO IRDD_Handler::handle_irdd (const InstanceResourceDeploymentDescription& desc, Deployment::InstanceResourceDeploymentDescription& toconfig) { - CIAO_TRACE("IRDD_Handler::instance_resource_deployment_descr"); + DANCE_TRACE("IRDD_Handler::instance_resource_deployment_descr"); switch (desc.resourceUsage ().integral ()) { @@ -68,7 +68,7 @@ namespace CIAO InstanceResourceDeploymentDescription IRDD_Handler::instance_resource_deployment_descr (const Deployment::InstanceResourceDeploymentDescription& src) { - CIAO_TRACE("IRDD_Handler::instance_resource_deployment_descr - reverse"); + DANCE_TRACE("IRDD_Handler::instance_resource_deployment_descr - reverse"); XMLSchema::string< ACE_TCHAR > reqname (ACE_TEXT_CHAR_TO_TCHAR (src.requirementName)); XMLSchema::string< ACE_TCHAR > resname (ACE_TEXT_CHAR_TO_TCHAR (src.resourceName)); diff --git a/CIAO/tools/Config_Handlers/IRDD_Handler.h b/CIAO/DAnCE/Config_Handlers/IRDD_Handler.h index dc4955988ee..afebf61cc24 100644 --- a/CIAO/tools/Config_Handlers/IRDD_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/IRDD_Handler.h @@ -21,23 +21,18 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - - namespace Deployment { struct InstanceResourceDeploymentDescription; class InstanceResourceDeploymentDescriptions; } - namespace CIAO { namespace Config_Handlers { - class InstanceResourceDeploymentDescription; - /* * @class IRDD_Handler * diff --git a/CIAO/tools/Config_Handlers/MDD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/MDD_Handler.cpp index 5e3466351a9..7bf2d6ea121 100644 --- a/CIAO/tools/Config_Handlers/MDD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/MDD_Handler.cpp @@ -19,7 +19,7 @@ namespace CIAO MDD_Handler::mono_deployment_descriptions (const deploymentPlan& src, Deployment::MonolithicDeploymentDescriptions& dest) { - CIAO_TRACE("MDD_Handler::mono_deployment_descriptions"); + DANCE_TRACE("MDD_Handler::mono_deployment_descriptions"); deploymentPlan::implementation_const_iterator imp_e = src.end_implementation (); @@ -114,7 +114,7 @@ namespace CIAO MDD_Handler::mono_deployment_description( const Deployment::MonolithicDeploymentDescription &src) { - CIAO_TRACE("mono_deployment_description - reverse"); + DANCE_TRACE("mono_deployment_description - reverse"); //Get the name and instantiate the mdd XMLSchema::string < ACE_TCHAR > name (ACE_TEXT_CHAR_TO_TCHAR (src.name)); diff --git a/CIAO/tools/Config_Handlers/MDD_Handler.h b/CIAO/DAnCE/Config_Handlers/MDD_Handler.h index c36efe6885b..c36efe6885b 100644 --- a/CIAO/tools/Config_Handlers/MDD_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/MDD_Handler.h diff --git a/CIAO/tools/Config_Handlers/PCD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/PCD_Handler.cpp index 899b388211e..d7136389160 100644 --- a/CIAO/tools/Config_Handlers/PCD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/PCD_Handler.cpp @@ -8,7 +8,7 @@ #include "CRDD_Handler.h" #include "Basic_Deployment_Data.hpp" #include "DAnCE/Deployment/Deployment_DataC.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO { @@ -29,7 +29,7 @@ namespace CIAO void PCD_Handler::handle_PlanConnectionDescription (const PlanConnectionDescription& desc, Deployment::PlanConnectionDescription& toconfig) { - CIAO_TRACE("PCD_Handler::get_PlanConnectionDescription"); + DANCE_TRACE("PCD_Handler::get_PlanConnectionDescription"); toconfig.name =( CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ()))); @@ -81,7 +81,7 @@ namespace CIAO PlanConnectionDescription PCD_Handler::get_PlanConnectionDescription (const Deployment::PlanConnectionDescription &src) { - CIAO_TRACE("PCD_Handler::get_PlanConnectionDescription"); + DANCE_TRACE("PCD_Handler::get_PlanConnectionDescription"); XMLSchema::string< ACE_TCHAR > name (ACE_TEXT_CHAR_TO_TCHAR (src.name)); diff --git a/CIAO/tools/Config_Handlers/PCD_Handler.h b/CIAO/DAnCE/Config_Handlers/PCD_Handler.h index 3813fa2badc..3813fa2badc 100644 --- a/CIAO/tools/Config_Handlers/PCD_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/PCD_Handler.h diff --git a/CIAO/tools/Config_Handlers/PL_Handler.cpp b/CIAO/DAnCE/Config_Handlers/PL_Handler.cpp index d7258893f30..856a7d51983 100644 --- a/CIAO/tools/Config_Handlers/PL_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/PL_Handler.cpp @@ -4,7 +4,7 @@ #include "IDD_Handler.h" #include "Basic_Deployment_Data.hpp" #include "DAnCE/Deployment/Deployment_DataC.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO { @@ -14,7 +14,7 @@ namespace CIAO PL_Handler::get_PlanLocality (const PlanLocality &desc, Deployment::PlanLocality &toconfig) { - CIAO_TRACE ("PL_Handler::get_PlanLocality"); + DANCE_TRACE ("PL_Handler::get_PlanLocality"); switch (desc.constraint ().integral ()) { diff --git a/CIAO/tools/Config_Handlers/PL_Handler.h b/CIAO/DAnCE/Config_Handlers/PL_Handler.h index 0511b81be48..0511b81be48 100644 --- a/CIAO/tools/Config_Handlers/PL_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/PL_Handler.h diff --git a/CIAO/tools/Config_Handlers/PSPE_Handler.cpp b/CIAO/DAnCE/Config_Handlers/PSPE_Handler.cpp index 4fcff56261a..486bf060381 100644 --- a/CIAO/tools/Config_Handlers/PSPE_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/PSPE_Handler.cpp @@ -14,7 +14,7 @@ namespace CIAO const PlanConnectionDescription &src, ::Deployment::PlanSubcomponentPortEndpoints &dest) { - CIAO_TRACE("PSPE_Handler::sub_component_port_endpoints"); + DANCE_TRACE("PSPE_Handler::sub_component_port_endpoints"); PlanConnectionDescription::internalEndpoint_const_iterator iei_e = src.end_internalEndpoint (); @@ -36,7 +36,7 @@ namespace CIAO const PlanSubcomponentPortEndpoint &src, ::Deployment::PlanSubcomponentPortEndpoint &dest) { - CIAO_TRACE("PSPE_Handler::sub_component_port_endpoint"); + DANCE_TRACE("PSPE_Handler::sub_component_port_endpoint"); dest.portName = ACE_TEXT_ALWAYS_CHAR (src.portName ().c_str ()); @@ -92,7 +92,7 @@ namespace CIAO PSPE_Handler::sub_component_port_endpoint ( const Deployment::PlanSubcomponentPortEndpoint &src) { // @@MAJO - CIAO_TRACE("PSPE_Handler::sub_component_port_endpoint - reverse"); + DANCE_TRACE("PSPE_Handler::sub_component_port_endpoint - reverse"); XMLSchema::string< ACE_TCHAR > pname (ACE_TEXT_CHAR_TO_TCHAR (src.portName)); XMLSchema::string< ACE_TCHAR > tval (ACE_TEXT ("true")); XMLSchema::string< ACE_TCHAR > prov (ACE_TEXT ("")); diff --git a/CIAO/tools/Config_Handlers/PSPE_Handler.h b/CIAO/DAnCE/Config_Handlers/PSPE_Handler.h index aeb92da9eb0..aeb92da9eb0 100644 --- a/CIAO/tools/Config_Handlers/PSPE_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/PSPE_Handler.h diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/Package_Handlers/CAD_Handler.cpp index 28df2abe65f..cd58f3e08bb 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/CAD_Handler.cpp @@ -23,7 +23,7 @@ namespace CIAO static void handle_spe (const SubcomponentPortEndpoint &desc, ::Deployment::SubcomponentPortEndpoint &toconfig) { - CIAO_TRACE("SPE_Handler::get_spe"); + DANCE_TRACE("SPE_Handler::get_spe"); toconfig.portName = ACE_TEXT_ALWAYS_CHAR ( desc.portName ().c_str ()); @@ -37,10 +37,10 @@ namespace CIAO static SubcomponentPortEndpoint get_spe (const ::Deployment::SubcomponentPortEndpoint &src) { - CIAO_TRACE("SPE_Handler::get_spe - reverse"); + DANCE_TRACE("SPE_Handler::get_spe - reverse"); ACE_TString str; SID_Handler::IDREF.find_ref (src.instanceRef, str); - + IdRef xid; xid.idref (str.c_str ()); @@ -59,7 +59,7 @@ namespace CIAO static void handle_acd (const AssemblyConnectionDescription &desc, ::Deployment::AssemblyConnectionDescription &toconfig) { - CIAO_TRACE("ACD_Handler::get_acd"); + DANCE_TRACE("ACD_Handler::get_acd"); toconfig.name = ACE_TEXT_ALWAYS_CHAR ( desc.name ().c_str ()); @@ -91,7 +91,7 @@ namespace CIAO static AssemblyConnectionDescription get_acd (const ::Deployment::AssemblyConnectionDescription &src) { - CIAO_TRACE("ACD_Handler::get_acd - reverse"); + DANCE_TRACE("ACD_Handler::get_acd - reverse"); AssemblyConnectionDescription retval (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ())); #if 0 @@ -125,7 +125,7 @@ namespace CIAO static void handle_spr (const SubcomponentPropertyReference &desc, ::Deployment::SubcomponentPropertyReference &toconfig) { - CIAO_TRACE("SPR_Handler::get_spr"); + DANCE_TRACE("SPR_Handler::get_spr"); toconfig.propertyName = ACE_TEXT_ALWAYS_CHAR ( desc.propertyName ().c_str ()); @@ -140,10 +140,10 @@ namespace CIAO static SubcomponentPropertyReference get_spr (const ::Deployment::SubcomponentPropertyReference &src) { - CIAO_TRACE("SPR_HAndler::get_spr - reverse"); + DANCE_TRACE("SPR_HAndler::get_spr - reverse"); ACE_TString str; SID_Handler::IDREF.find_ref (src.instanceRef, str); - + IdRef xid; xid.idref (str.c_str ()); return SubcomponentPropertyReference (ACE_TEXT_CHAR_TO_TCHAR (src.propertyName.in ()), @@ -162,7 +162,7 @@ namespace CIAO static void handle_apm (const AssemblyPropertyMapping &desc, ::Deployment::AssemblyPropertyMapping &toconfig) { - CIAO_TRACE("APM_Handler::get_apm"); + DANCE_TRACE("APM_Handler::get_apm"); toconfig.name = ACE_TEXT_ALWAYS_CHAR ( desc.name ().c_str ()); toconfig.externalName = ACE_TEXT_ALWAYS_CHAR ( desc.externalName ().c_str ()); @@ -179,7 +179,7 @@ namespace CIAO static AssemblyPropertyMapping get_apm (const ::Deployment::AssemblyPropertyMapping &src) { - CIAO_TRACE("APM_Handler::get_apm - reverse"); + DANCE_TRACE("APM_Handler::get_apm - reverse"); AssemblyPropertyMapping retval (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()), ACE_TEXT_CHAR_TO_TCHAR (src.externalName.in ())); @@ -200,7 +200,7 @@ namespace CIAO CAD_Handler::component_assem_descr (const ComponentAssemblyDescription &desc, ::Deployment::ComponentAssemblyDescription &toconfig) { - CIAO_TRACE("CAD_Handler::component_assem_descr"); + DANCE_TRACE("CAD_Handler::component_assem_descr"); toconfig.instance.length (desc.count_instance ()); std::for_each (desc.begin_instance (), @@ -229,7 +229,7 @@ namespace CIAO ComponentAssemblyDescription CAD_Handler::component_assem_descr (const ::Deployment::ComponentAssemblyDescription &/*src*/) { - CIAO_TRACE("CAD_Handler::component_assem_descr - reverse"); + DANCE_TRACE("CAD_Handler::component_assem_descr - reverse"); ComponentAssemblyDescription retval; #if 0 diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.h b/CIAO/DAnCE/Config_Handlers/Package_Handlers/CAD_Handler.h index b42f13dcdc3..b42f13dcdc3 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/CAD_Handler.h diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp b/CIAO/DAnCE/Config_Handlers/Package_Handlers/CID_Handler.cpp index c30ac8e0ae7..4be49ae2bcb 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/CID_Handler.cpp @@ -32,7 +32,7 @@ namespace CIAO static void handle_capability (const Capability &desc, ::Deployment::Capability &toconfig) { - CIAO_TRACE ("Capability_Handler::get_capability"); + DANCE_TRACE ("Capability_Handler::get_capability"); toconfig.name = ACE_TEXT_ALWAYS_CHAR ( desc.name ().c_str ()); @@ -49,7 +49,7 @@ namespace CIAO static Capability get_capability (const ::Deployment::Capability &src) { - CIAO_TRACE ("Capability_Handler::get_capability - reverse"); + DANCE_TRACE ("Capability_Handler::get_capability - reverse"); Capability retval (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ())); #if 0 @@ -73,7 +73,7 @@ namespace CIAO static void handle_ir (const ImplementationRequirement &desc, ::Deployment::ImplementationRequirement &toconfig) { - CIAO_TRACE ("IR_Handler::get_ir"); + DANCE_TRACE ("IR_Handler::get_ir"); if (desc.resourceUsage_p ()) { @@ -123,7 +123,7 @@ namespace CIAO static ImplementationRequirement get_ir (const ::Deployment::ImplementationRequirement &src) { - CIAO_TRACE ("IR_Handler::get_ir - reverse"); + DANCE_TRACE ("IR_Handler::get_ir - reverse"); ImplementationRequirement retval (ACE_TEXT_CHAR_TO_TCHAR (src.resourceType.in ()), ACE_TEXT_CHAR_TO_TCHAR (src.name.in ())); @@ -178,7 +178,7 @@ namespace CIAO static void handle_mid (const MonolithicImplementationDescription &desc, ::Deployment::MonolithicImplementationDescription &toconfig) { - CIAO_TRACE ("MID_Handler::get_mid"); + DANCE_TRACE ("MID_Handler::get_mid"); toconfig.nodeExecParameter.length (desc.count_nodeExecParameter ()); std::for_each (desc.begin_nodeExecParameter (), @@ -212,7 +212,7 @@ namespace CIAO static MonolithicImplementationDescription get_mid (const ::Deployment::MonolithicImplementationDescription &/*src*/) { - CIAO_TRACE ("MID_Handler::get_mid - reverse"); + DANCE_TRACE ("MID_Handler::get_mid - reverse"); MonolithicImplementationDescription retval; #if 0 @@ -242,14 +242,14 @@ namespace CIAO ::Deployment::MonolithicImplementationDescription, MID_Handler::handle_mid > MID_Functor; - + void CID_Handler::component_impl_descr ( const ComponentImplementationDescription &desc, ::Deployment::ComponentImplementationDescription &toconfig) { - CIAO_TRACE ("CID_Handler::component_impl_descr"); + DANCE_TRACE ("CID_Handler::component_impl_descr"); const ComponentImplementationDescription *cid = 0; std::auto_ptr <ComponentImplementationDescription> xsc_cid; @@ -323,7 +323,7 @@ namespace CIAO ComponentImplementationDescription CID_Handler::component_impl_descr (const Deployment::ComponentImplementationDescription& src) { - CIAO_TRACE ("CID_Handler::component_impl_descr - reverse"); + DANCE_TRACE ("CID_Handler::component_impl_descr - reverse"); ComponentImplementationDescription retval; @@ -369,7 +369,7 @@ namespace CIAO ComponentImplementationDescription * CID_Handler::resolve_cid (const ACE_TCHAR *uri) { - CIAO_TRACE ("CID_Handler::resolve_cid"); + DANCE_TRACE ("CID_Handler::resolve_cid"); xercesc::DOMDocument *dom = XML_Helper::XML_HELPER.create_dom (uri); diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.h b/CIAO/DAnCE/Config_Handlers/Package_Handlers/CID_Handler.h index d00304d8cfe..d00304d8cfe 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/CID_Handler.h diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/Package_Handlers/CPD_Handler.cpp index 885e76b005a..ba2c14309b2 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/CPD_Handler.cpp @@ -20,7 +20,7 @@ namespace CIAO static void handle_pci (const PackagedComponentImplementation &desc, ::Deployment::PackagedComponentImplementation &toconfig) { - CIAO_TRACE ("PCI_Handler::get_pci"); + DANCE_TRACE ("PCI_Handler::get_pci"); toconfig.name = ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ()); CID_Handler::component_impl_descr (desc.referencedImplementation (), @@ -30,7 +30,7 @@ namespace CIAO static PackagedComponentImplementation get_pci (const ::Deployment::PackagedComponentImplementation &src) { - CIAO_TRACE ("PCI_Handler::get_pci - reverse"); + DANCE_TRACE ("PCI_Handler::get_pci - reverse"); return PackagedComponentImplementation (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()), CID_Handler::component_impl_descr (src.referencedImplementation)); } @@ -40,13 +40,13 @@ namespace CIAO ::Deployment::PackagedComponentImplementations, ::Deployment::PackagedComponentImplementation, PCI_Handler::handle_pci > PCI_Functor; - + void CPD_Handler::handle_component_package_descr (const ComponentPackageDescription &desc, ::Deployment::ComponentPackageDescription &toconfig) { - CIAO_TRACE ("CPD_Handler::component_package_descr"); + DANCE_TRACE ("CPD_Handler::component_package_descr"); auto_ptr < ComponentPackageDescription > xsc_cpd; const ComponentPackageDescription *cpd = 0; @@ -98,7 +98,7 @@ namespace CIAO ComponentPackageDescription CPD_Handler::component_package_descr (const Deployment::ComponentPackageDescription& src) { - CIAO_TRACE ("CPD_Handler::component_package_descr - reverse"); + DANCE_TRACE ("CPD_Handler::component_package_descr - reverse"); ComponentPackageDescription toconfig; if (src.label.in () != 0) @@ -135,7 +135,7 @@ namespace CIAO ComponentPackageDescription * CPD_Handler::resolve_cpd (const ACE_TCHAR *uri) { - CIAO_TRACE ("CPD_Handler::resolve_cpd"); + DANCE_TRACE ("CPD_Handler::resolve_cpd"); if (!XML_Helper::XML_HELPER.is_initialized ()) return 0; diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h b/CIAO/DAnCE/Config_Handlers/Package_Handlers/CPD_Handler.h index 049b2a72cb2..049b2a72cb2 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/CPD_Handler.h diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp b/CIAO/DAnCE/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp index 424985705d8..c4f6058505e 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp @@ -8,8 +8,8 @@ #include "Property_Handler.h" #include "Deployment.hpp" #include "Package_Handlers/CPD_Handler.h" -#include "tools/Config_Handlers/CPD_Handler.h" -#include "ciao/Logger/Log_Macros.h" +#include "Config_Handlers/CPD_Handler.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO { namespace Config_Handlers @@ -21,7 +21,7 @@ namespace CIAO static void handle_cpd (const ComponentPropertyDescription &desc, ::Deployment::ComponentPropertyDescription &toconfig) { - CIAO_TRACE ("Comp_Prop_Handler::get_cpd"); + DANCE_TRACE ("Comp_Prop_Handler::get_cpd"); toconfig.name = ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ()); DataType_Handler::data_type (desc.type (), @@ -31,7 +31,7 @@ namespace CIAO static ComponentPropertyDescription get_cpd (const ::Deployment::ComponentPropertyDescription &src) { - CIAO_TRACE ("Comp_Prop_Handler::get_cpd - reverse"); + DANCE_TRACE ("Comp_Prop_Handler::get_cpd - reverse"); return ComponentPropertyDescription (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()), DataType_Handler::data_type (src.type)); @@ -50,7 +50,7 @@ namespace CIAO const ComponentInterfaceDescription &desc, ::Deployment::ComponentInterfaceDescription &toconfig) { - CIAO_TRACE ("Comp_Intf_Descr_Handler::comp_intf_descr"); + DANCE_TRACE ("Comp_Intf_Descr_Handler::comp_intf_descr"); const ComponentInterfaceDescription *cid = 0; std::auto_ptr <ComponentInterfaceDescription> safe_cid; @@ -112,7 +112,7 @@ namespace CIAO Comp_Intf_Descr_Handler::comp_intf_descr ( const ::Deployment::ComponentInterfaceDescription &src) { - CIAO_TRACE ("Comp_Intf_Descr_Handler::comp_intf_descr - reverse"); + DANCE_TRACE ("Comp_Intf_Descr_Handler::comp_intf_descr - reverse"); ComponentInterfaceDescription retval; retval.label (ACE_TEXT_CHAR_TO_TCHAR (src.label.in ())); @@ -146,7 +146,7 @@ namespace CIAO ComponentInterfaceDescription * Comp_Intf_Descr_Handler::resolve_cid (const ACE_TCHAR *uri) { - CIAO_TRACE ("Comp_Intf_Descr_Handler::resolve_cid"); + DANCE_TRACE ("Comp_Intf_Descr_Handler::resolve_cid"); xercesc::DOMDocument *dom = XML_Helper::XML_HELPER.create_dom (uri); diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h b/CIAO/DAnCE/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h index 4655edfa97b..4655edfa97b 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/Package_Handlers/IAD_Handler.cpp index 0ef8e6bda5f..99fe7fe2ade 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/IAD_Handler.cpp @@ -9,7 +9,7 @@ #include "XML_Typedefs.h" #include "Deployment.hpp" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO { @@ -22,7 +22,7 @@ namespace CIAO IAD_Handler::impl_artifact_descr (const ImplementationArtifactDescription &desc, ::Deployment::ImplementationArtifactDescription &toconfig) { - CIAO_TRACE ("IAD_Handler::impl_artifact_descr"); + DANCE_TRACE ("IAD_Handler::impl_artifact_descr"); const ImplementationArtifactDescription *iad = 0; std::auto_ptr <ImplementationArtifactDescription> safe_iad; @@ -74,7 +74,7 @@ namespace CIAO ImplementationArtifactDescription IAD_Handler::impl_artifact_descr (const ::Deployment::ImplementationArtifactDescription &src) { - CIAO_TRACE ("IAD_Handler::impl_artifact_descr - reverse"); + DANCE_TRACE ("IAD_Handler::impl_artifact_descr - reverse"); ImplementationArtifactDescription retval; retval.label (ACE_TEXT_CHAR_TO_TCHAR (src.label.in ())); @@ -103,7 +103,7 @@ namespace CIAO ImplementationArtifactDescription * IAD_Handler::resolve_iad (const ACE_TCHAR *uri) { - CIAO_TRACE ("IAD_Handler::resolve_iad"); + DANCE_TRACE ("IAD_Handler::resolve_iad"); xercesc::DOMDocument *dom = XML_Helper::XML_HELPER.create_dom (uri); diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.h b/CIAO/DAnCE/Config_Handlers/Package_Handlers/IAD_Handler.h index 89fdab073bf..89fdab073bf 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/IAD_Handler.h diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h b/CIAO/DAnCE/Config_Handlers/Package_Handlers/NIA_Handler.h index 923104dc27b..923104dc27b 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/NIA_Handler.h diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/Package_Handlers/PCD_Handler.cpp index f1faaf68295..791f153d126 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/PCD_Handler.cpp @@ -1,6 +1,6 @@ // $Id$ #include "tao/AnyTypeCode/AnyTypeCode_methods.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" #include "DAnCE/Deployment/Deployment_Packaging_DataC.h" #include "XML_Typedefs.h" #include "XML/XercesString.h" @@ -70,7 +70,7 @@ namespace CIAO PCD_Handler::package_config (const PackageConfiguration &desc, ::Deployment::PackageConfiguration &toconfig) { - CIAO_TRACE ("PCD_Handler::package_config"); + DANCE_TRACE ("PCD_Handler::package_config"); std::auto_ptr < PackageConfiguration > xsc_pcd; const PackageConfiguration *pcd; @@ -116,7 +116,7 @@ namespace CIAO PackageConfiguration PCD_Handler::package_config (const Deployment::PackageConfiguration& src) { - CIAO_TRACE ("PCD_Handler::package_config - reverse"); + DANCE_TRACE ("PCD_Handler::package_config - reverse"); PackageConfiguration pcd = PackageConfiguration (); if (src.label.in () != 0) diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.h b/CIAO/DAnCE/Config_Handlers/Package_Handlers/PCD_Handler.h index b1a0c377d9d..b1a0c377d9d 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/PCD_Handler.h diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp b/CIAO/DAnCE/Config_Handlers/Package_Handlers/PC_Intf.cpp index 19125aebb92..5bddb09af60 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/PC_Intf.cpp @@ -5,7 +5,7 @@ #include "Deployment.hpp" #include "STD_PCD_Handler.h" #include "ciao/Packaging_DataC.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO { @@ -20,7 +20,7 @@ namespace CIAO bool STD_PC_Intf::prepare_PC (const char *file) { - CIAO_TRACE("STD_PC_Intf::prepare_PC"); + DANCE_TRACE("STD_PC_Intf::prepare_PC"); ACE_Auto_Ptr<XML_Helper> helper (new XML_Helper); diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h b/CIAO/DAnCE/Config_Handlers/Package_Handlers/PC_Intf.h index c15ae0389b9..c15ae0389b9 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/PC_Intf.h diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc b/CIAO/DAnCE/Config_Handlers/Package_Handlers/Package_Handlers.mpc index 0f898981ef3..0f898981ef3 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/Package_Handlers.mpc diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h b/CIAO/DAnCE/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h index 86193a1a664..86193a1a664 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp b/CIAO/DAnCE/Config_Handlers/Package_Handlers/SID_Handler.cpp index a9947281202..f19aa3ef4bb 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/SID_Handler.cpp @@ -23,7 +23,7 @@ namespace CIAO SID_Handler::handle_sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc, ::Deployment::SubcomponentInstantiationDescription &toconfig) { - CIAO_TRACE ("SID_Handler::sub_comp_inst_descr"); + DANCE_TRACE ("SID_Handler::sub_comp_inst_descr"); toconfig.name = ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ()); if (desc.basePackage_p ()) @@ -58,10 +58,10 @@ namespace CIAO if (desc.referencedPackage ().requiredName_p ()) toconfig.referencedPackage[0].requiredName = ACE_TEXT_ALWAYS_CHAR (desc.referencedPackage ().requiredName ().c_str ()); - + Comp_Intf_Descr_Handler::comp_intf_descr (desc.referencedPackage ().requiredType (), toconfig.referencedPackage[0].requiredType); - + } toconfig.selectRequirement.length (desc.count_selectRequirement ()); @@ -88,7 +88,7 @@ namespace CIAO SubcomponentInstantiationDescription SID_Handler::sub_comp_inst_descr (const Deployment::SubcomponentInstantiationDescription &src) { - CIAO_TRACE ("SID_Handler::sub_comp_inst_descr - reverse"); + DANCE_TRACE ("SID_Handler::sub_comp_inst_descr - reverse"); SubcomponentInstantiationDescription retval (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ())); if (src.basePackage.length () == 1) diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h b/CIAO/DAnCE/Config_Handlers/Package_Handlers/SID_Handler.h index 2083b91b9b6..2083b91b9b6 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/SID_Handler.h diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp b/CIAO/DAnCE/Config_Handlers/Package_Handlers/test.cpp index c107fed4a77..c107fed4a77 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp +++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/test.cpp diff --git a/CIAO/tools/Config_Handlers/Property_Handler.cpp b/CIAO/DAnCE/Config_Handlers/Property_Handler.cpp index 0f81f8c6d82..ab4289637e1 100644 --- a/CIAO/tools/Config_Handlers/Property_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/Property_Handler.cpp @@ -4,7 +4,7 @@ #include "Any_Handler.h" #include "Basic_Deployment_Data.hpp" #include "DAnCE/Deployment/Deployment_DataC.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO { namespace Config_Handlers @@ -22,7 +22,7 @@ namespace CIAO Property_Handler::handle_property (const Property& desc, Deployment::Property& toconfig) { - CIAO_TRACE("Property_Handler::get_property"); + DANCE_TRACE("Property_Handler::get_property"); try { @@ -42,7 +42,7 @@ namespace CIAO Property Property_Handler::get_property (const Deployment::Property& src) { - CIAO_TRACE("Property_Handler::get_property - reverse"); + DANCE_TRACE("Property_Handler::get_property - reverse"); ::XMLSchema::string< ACE_TCHAR > name (ACE_TEXT_CHAR_TO_TCHAR(src.name)); Any value (Any_Handler::get_any (src.value)); diff --git a/CIAO/tools/Config_Handlers/Property_Handler.h b/CIAO/DAnCE/Config_Handlers/Property_Handler.h index 422aa1d4a44..422aa1d4a44 100644 --- a/CIAO/tools/Config_Handlers/Property_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/Property_Handler.h diff --git a/CIAO/tools/Config_Handlers/RDD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/RDD_Handler.cpp index de4c06368d1..f2bf466d78e 100644 --- a/CIAO/tools/Config_Handlers/RDD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/RDD_Handler.cpp @@ -4,7 +4,7 @@ #include "Basic_Deployment_Data.hpp" #include "DAnCE/Deployment/Deployment_DataC.h" #include "Any_Handler.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" #include "Property_Handler.h" namespace CIAO @@ -16,7 +16,7 @@ namespace CIAO const ResourceDeploymentDescription &src, ::Deployment::ResourceDeploymentDescription &dest) { - CIAO_TRACE("RDD_Handler::resource_deployment_descr"); + DANCE_TRACE("RDD_Handler::resource_deployment_descr"); dest.requirementName = ACE_TEXT_ALWAYS_CHAR ( src.requirementName ().c_str ()); @@ -32,7 +32,7 @@ namespace CIAO RDD_Handler::resource_deployment_descr ( const ::Deployment::ResourceDeploymentDescription &src) { - CIAO_TRACE("RDD_Handler::resource_deployment_descr - reverse"); + DANCE_TRACE("RDD_Handler::resource_deployment_descr - reverse"); XMLSchema::string< ACE_TCHAR > reqname (ACE_TEXT_CHAR_TO_TCHAR (src.requirementName)); XMLSchema::string< ACE_TCHAR > resname (ACE_TEXT_CHAR_TO_TCHAR (src.resourceName.in ())); diff --git a/CIAO/tools/Config_Handlers/RDD_Handler.h b/CIAO/DAnCE/Config_Handlers/RDD_Handler.h index e0d19c58ee2..e0d19c58ee2 100644 --- a/CIAO/tools/Config_Handlers/RDD_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/RDD_Handler.h diff --git a/CIAO/tools/Config_Handlers/Req_Handler.cpp b/CIAO/DAnCE/Config_Handlers/Req_Handler.cpp index 3d0b4f47ea5..4a40afc1647 100644 --- a/CIAO/tools/Config_Handlers/Req_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/Req_Handler.cpp @@ -3,7 +3,7 @@ #include "Req_Handler.h" #include "Property_Handler.h" #include "DAnCE/Deployment/Deployment_BaseC.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO { namespace Config_Handlers @@ -21,7 +21,7 @@ namespace CIAO Req_Handler::handle_requirement (const Requirement& desc, Deployment::Requirement& toconfig) { - CIAO_TRACE("Req_Handler::get_Requirement"); + DANCE_TRACE("Req_Handler::get_Requirement"); //Map the basic string types to their Deployment::Req //counterparts. @@ -37,7 +37,7 @@ namespace CIAO Requirement Req_Handler::get_requirement (const Deployment::Requirement& src) { - CIAO_TRACE("Req_Handler::get_requirement - reverse"); + DANCE_TRACE("Req_Handler::get_requirement - reverse"); //Get the values for name and res XMLSchema::string< ACE_TCHAR > name (ACE_TEXT_CHAR_TO_TCHAR (src.name)); diff --git a/CIAO/tools/Config_Handlers/Req_Handler.h b/CIAO/DAnCE/Config_Handlers/Req_Handler.h index 3955b85a55f..3955b85a55f 100644 --- a/CIAO/tools/Config_Handlers/Req_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/Req_Handler.h diff --git a/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp b/CIAO/DAnCE/Config_Handlers/STD_CID_Handler.cpp index d0bd4e92904..d0bd4e92904 100644 --- a/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/STD_CID_Handler.cpp diff --git a/CIAO/tools/Config_Handlers/STD_CID_Handler.h b/CIAO/DAnCE/Config_Handlers/STD_CID_Handler.h index c875d05edba..c875d05edba 100644 --- a/CIAO/tools/Config_Handlers/STD_CID_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/STD_CID_Handler.h diff --git a/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/STD_CPD_Handler.cpp index c9fa40f0258..c9fa40f0258 100644 --- a/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/STD_CPD_Handler.cpp diff --git a/CIAO/tools/Config_Handlers/STD_CPD_Handler.h b/CIAO/DAnCE/Config_Handlers/STD_CPD_Handler.h index 654fb0155ca..654fb0155ca 100644 --- a/CIAO/tools/Config_Handlers/STD_CPD_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/STD_CPD_Handler.h diff --git a/CIAO/tools/Config_Handlers/STD_IAD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/STD_IAD_Handler.cpp index 020396582d3..020396582d3 100644 --- a/CIAO/tools/Config_Handlers/STD_IAD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/STD_IAD_Handler.cpp diff --git a/CIAO/tools/Config_Handlers/STD_IAD_Handler.h b/CIAO/DAnCE/Config_Handlers/STD_IAD_Handler.h index 3523526f5be..3523526f5be 100644 --- a/CIAO/tools/Config_Handlers/STD_IAD_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/STD_IAD_Handler.h diff --git a/CIAO/tools/Config_Handlers/STD_PCD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/STD_PCD_Handler.cpp index 5a65826f340..5a65826f340 100644 --- a/CIAO/tools/Config_Handlers/STD_PCD_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/STD_PCD_Handler.cpp diff --git a/CIAO/tools/Config_Handlers/STD_PCD_Handler.h b/CIAO/DAnCE/Config_Handlers/STD_PCD_Handler.h index 8c65f6eb6f3..8c65f6eb6f3 100644 --- a/CIAO/tools/Config_Handlers/STD_PCD_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/STD_PCD_Handler.h diff --git a/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp b/CIAO/DAnCE/Config_Handlers/STD_PC_Intf.cpp index 4a865f19603..01fa67f23ad 100644 --- a/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp +++ b/CIAO/DAnCE/Config_Handlers/STD_PC_Intf.cpp @@ -5,7 +5,7 @@ #include "Deployment.hpp" #include "STD_PCD_Handler.h" #include "ciao/Packaging_DataC.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO { @@ -20,7 +20,7 @@ namespace CIAO bool STD_PC_Intf::prepare_PC (const char *file) { - CIAO_TRACE("STD_PC_Intf::prepare_PC"); + DANCE_TRACE("STD_PC_Intf::prepare_PC"); // parse the .pcd (PackageConfigurationDescription) file diff --git a/CIAO/tools/Config_Handlers/STD_PC_Intf.h b/CIAO/DAnCE/Config_Handlers/STD_PC_Intf.h index 2e07e1922eb..2e07e1922eb 100644 --- a/CIAO/tools/Config_Handlers/STD_PC_Intf.h +++ b/CIAO/DAnCE/Config_Handlers/STD_PC_Intf.h diff --git a/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp b/CIAO/DAnCE/Config_Handlers/SatisfierProperty_Handler.cpp index 7cac0b919ea..a0951505138 100644 --- a/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp +++ b/CIAO/DAnCE/Config_Handlers/SatisfierProperty_Handler.cpp @@ -4,7 +4,7 @@ #include "Any_Handler.h" #include "Basic_Deployment_Data.hpp" #include "DAnCE/Deployment/Deployment_DataC.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" #include "Utils/Exceptions.h" namespace CIAO { @@ -24,7 +24,7 @@ namespace CIAO const SatisfierProperty& desc, Deployment::SatisfierProperty& toconfig) { - CIAO_TRACE("SatisfierProperty_Handler::get_sat_property"); + DANCE_TRACE("SatisfierProperty_Handler::get_sat_property"); toconfig.name = ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ()); @@ -78,7 +78,7 @@ namespace CIAO SatisfierProperty_Handler::get_sat_property ( const Deployment::SatisfierProperty& src) { - CIAO_TRACE("SatisfierProperty_Handler::get_sat_property - reverse"); + DANCE_TRACE("SatisfierProperty_Handler::get_sat_property - reverse"); ::XMLSchema::string< ACE_TCHAR > name (ACE_TEXT_CHAR_TO_TCHAR ((src.name))); SatisfierPropertyKind::Value kind; diff --git a/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h b/CIAO/DAnCE/Config_Handlers/SatisfierProperty_Handler.h index e166b341d9f..e166b341d9f 100644 --- a/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h +++ b/CIAO/DAnCE/Config_Handlers/SatisfierProperty_Handler.h diff --git a/CIAO/tools/Config_Handlers/Utils/Exceptions.h b/CIAO/DAnCE/Config_Handlers/Utils/Exceptions.h index 63b3563c879..63b3563c879 100644 --- a/CIAO/tools/Config_Handlers/Utils/Exceptions.h +++ b/CIAO/DAnCE/Config_Handlers/Utils/Exceptions.h diff --git a/CIAO/tools/Config_Handlers/Utils/Functors.h b/CIAO/DAnCE/Config_Handlers/Utils/Functors.h index 41121241572..41121241572 100644 --- a/CIAO/tools/Config_Handlers/Utils/Functors.h +++ b/CIAO/DAnCE/Config_Handlers/Utils/Functors.h diff --git a/CIAO/tools/Config_Handlers/XMI.cpp b/CIAO/DAnCE/Config_Handlers/XMI.cpp index 66c0ee02f0e..66c0ee02f0e 100644 --- a/CIAO/tools/Config_Handlers/XMI.cpp +++ b/CIAO/DAnCE/Config_Handlers/XMI.cpp diff --git a/CIAO/tools/Config_Handlers/XMI.hpp b/CIAO/DAnCE/Config_Handlers/XMI.hpp index 143691b8d4a..143691b8d4a 100644 --- a/CIAO/tools/Config_Handlers/XMI.hpp +++ b/CIAO/DAnCE/Config_Handlers/XMI.hpp diff --git a/CIAO/tools/Config_Handlers/XMLSchema/Traversal.hpp b/CIAO/DAnCE/Config_Handlers/XMLSchema/Traversal.hpp index 24fa7a9eb6e..24fa7a9eb6e 100644 --- a/CIAO/tools/Config_Handlers/XMLSchema/Traversal.hpp +++ b/CIAO/DAnCE/Config_Handlers/XMLSchema/Traversal.hpp diff --git a/CIAO/tools/Config_Handlers/XMLSchema/Traversal.ipp b/CIAO/DAnCE/Config_Handlers/XMLSchema/Traversal.ipp index a5c614182a3..a5c614182a3 100644 --- a/CIAO/tools/Config_Handlers/XMLSchema/Traversal.ipp +++ b/CIAO/DAnCE/Config_Handlers/XMLSchema/Traversal.ipp diff --git a/CIAO/tools/Config_Handlers/XMLSchema/Traversal.tpp b/CIAO/DAnCE/Config_Handlers/XMLSchema/Traversal.tpp index d79c13630fb..d79c13630fb 100644 --- a/CIAO/tools/Config_Handlers/XMLSchema/Traversal.tpp +++ b/CIAO/DAnCE/Config_Handlers/XMLSchema/Traversal.tpp diff --git a/CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.hpp b/CIAO/DAnCE/Config_Handlers/XMLSchema/TypeInfo.hpp index e4fa52dbb9c..e4fa52dbb9c 100644 --- a/CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.hpp +++ b/CIAO/DAnCE/Config_Handlers/XMLSchema/TypeInfo.hpp diff --git a/CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.ipp b/CIAO/DAnCE/Config_Handlers/XMLSchema/TypeInfo.ipp index 5b9422f38c8..5b9422f38c8 100644 --- a/CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.ipp +++ b/CIAO/DAnCE/Config_Handlers/XMLSchema/TypeInfo.ipp diff --git a/CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.tpp b/CIAO/DAnCE/Config_Handlers/XMLSchema/TypeInfo.tpp index 918197937b7..918197937b7 100644 --- a/CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.tpp +++ b/CIAO/DAnCE/Config_Handlers/XMLSchema/TypeInfo.tpp diff --git a/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp b/CIAO/DAnCE/Config_Handlers/XMLSchema/Types.hpp index 9f4ea91f3c4..9f4ea91f3c4 100644 --- a/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp +++ b/CIAO/DAnCE/Config_Handlers/XMLSchema/Types.hpp diff --git a/CIAO/tools/Config_Handlers/XMLSchema/Types.ipp b/CIAO/DAnCE/Config_Handlers/XMLSchema/Types.ipp index 6b749260f55..6b749260f55 100644 --- a/CIAO/tools/Config_Handlers/XMLSchema/Types.ipp +++ b/CIAO/DAnCE/Config_Handlers/XMLSchema/Types.ipp diff --git a/CIAO/tools/Config_Handlers/XMLSchema/Types.tpp b/CIAO/DAnCE/Config_Handlers/XMLSchema/Types.tpp index 4a8bddcf597..4a8bddcf597 100644 --- a/CIAO/tools/Config_Handlers/XMLSchema/Types.tpp +++ b/CIAO/DAnCE/Config_Handlers/XMLSchema/Types.tpp diff --git a/CIAO/tools/Config_Handlers/XMLSchema/Writer.hpp b/CIAO/DAnCE/Config_Handlers/XMLSchema/Writer.hpp index 4a0c1603efa..4a0c1603efa 100644 --- a/CIAO/tools/Config_Handlers/XMLSchema/Writer.hpp +++ b/CIAO/DAnCE/Config_Handlers/XMLSchema/Writer.hpp diff --git a/CIAO/tools/Config_Handlers/XMLSchema/Writer.ipp b/CIAO/DAnCE/Config_Handlers/XMLSchema/Writer.ipp index 2b7c9a4b939..2b7c9a4b939 100644 --- a/CIAO/tools/Config_Handlers/XMLSchema/Writer.ipp +++ b/CIAO/DAnCE/Config_Handlers/XMLSchema/Writer.ipp diff --git a/CIAO/tools/Config_Handlers/XMLSchema/Writer.tpp b/CIAO/DAnCE/Config_Handlers/XMLSchema/Writer.tpp index 6c57de04d81..6c57de04d81 100644 --- a/CIAO/tools/Config_Handlers/XMLSchema/Writer.tpp +++ b/CIAO/DAnCE/Config_Handlers/XMLSchema/Writer.tpp diff --git a/CIAO/tools/Config_Handlers/XMLSchema/id_map.hpp b/CIAO/DAnCE/Config_Handlers/XMLSchema/id_map.hpp index a2843d44693..a2843d44693 100644 --- a/CIAO/tools/Config_Handlers/XMLSchema/id_map.hpp +++ b/CIAO/DAnCE/Config_Handlers/XMLSchema/id_map.hpp diff --git a/CIAO/tools/Config_Handlers/XML_File_Intf.cpp b/CIAO/DAnCE/Config_Handlers/XML_File_Intf.cpp index 5275dbb33bc..b44f31c452a 100644 --- a/CIAO/tools/Config_Handlers/XML_File_Intf.cpp +++ b/CIAO/DAnCE/Config_Handlers/XML_File_Intf.cpp @@ -7,7 +7,7 @@ #include "Common.h" #include "DAnCE/Deployment/Deployment_DataC.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO { @@ -22,35 +22,35 @@ namespace CIAO bool XML_File_Intf::read_process_file (const ACE_TCHAR *file) { - CIAO_TRACE("XML_File_Intf::read_process_file"); + DANCE_TRACE("XML_File_Intf::read_process_file"); try { if (!XML_Helper::XML_HELPER.is_initialized ()) return false; - CIAO_DEBUG (6, (LM_TRACE, CLINFO "XML_File_Intf::read_process_file - " + DANCE_DEBUG (6, (LM_TRACE, DLINFO "XML_File_Intf::read_process_file - " "Constructing DOM\n")); XERCES_CPP_NAMESPACE::DOMDocument *dom = XML_Helper::XML_HELPER.create_dom ((file)); if (dom == 0) { - CIAO_ERROR (1, (LM_ERROR, CLINFO "XML_File_Intf::read_process_file - " + DANCE_ERROR (1, (LM_ERROR, DLINFO "XML_File_Intf::read_process_file - " "Failed to open file %s\n", file)); return false; } XERCES_CPP_NAMESPACE::DOMElement *foo = dom->getDocumentElement (); - CIAO_DEBUG (6, (LM_TRACE, CLINFO "XML_File_Intf::read_process_file - " + DANCE_DEBUG (6, (LM_TRACE, DLINFO "XML_File_Intf::read_process_file - " "DOMElement pointer: %u\n", foo)); - CIAO_DEBUG (6, (LM_TRACE, CLINFO "XML_File_Intf::read_process_file - " + DANCE_DEBUG (6, (LM_TRACE, DLINFO "XML_File_Intf::read_process_file - " "Parsing XML file with XSC\n")); deploymentPlan dp = CIAO::Config_Handlers::reader::DeploymentPlan (dom); - CIAO_DEBUG (6, (LM_TRACE, CLINFO "XML_File_Intf::read_process_file - " + DANCE_DEBUG (6, (LM_TRACE, DLINFO "XML_File_Intf::read_process_file - " "Processing using config handlers\n")); DP_Handler dp_handler (dp); @@ -61,12 +61,12 @@ namespace CIAO } catch (const Config_Error &ex) { - CIAO_ERROR (1, (LM_ERROR, CLINFO "XML_File_Intf::error at %C: %C\n", + DANCE_ERROR (1, (LM_ERROR, DLINFO "XML_File_Intf::error at %C: %C\n", ex.name_.c_str (), ex.error_.c_str ())); } catch (...) { - CIAO_ERROR (1, (LM_ERROR, CLINFO "XML_File_Intf::caught - " + DANCE_ERROR (1, (LM_ERROR, DLINFO "XML_File_Intf::caught - " "Unexpected exception whilst parsing XML into IDL.\n")); } @@ -76,7 +76,7 @@ namespace CIAO ::Deployment::DeploymentPlan const * XML_File_Intf::get_plan (void) { - CIAO_TRACE("get_plan"); + DANCE_TRACE("get_plan"); if (this->idl_dp_.get () == 0 && !this->read_process_file (this->file_.c_str ())) return 0; @@ -86,7 +86,7 @@ namespace CIAO ::Deployment::DeploymentPlan * XML_File_Intf::release_plan (void) { - CIAO_TRACE("XML_File_Intf::get_plan"); + DANCE_TRACE("XML_File_Intf::get_plan"); if (this->idl_dp_.get () == 0 && !this->read_process_file (this->file_.c_str ())) return 0; return this->idl_dp_.release (); diff --git a/CIAO/tools/Config_Handlers/XML_File_Intf.h b/CIAO/DAnCE/Config_Handlers/XML_File_Intf.h index fd086836b78..fd086836b78 100644 --- a/CIAO/tools/Config_Handlers/XML_File_Intf.h +++ b/CIAO/DAnCE/Config_Handlers/XML_File_Intf.h diff --git a/CIAO/tools/Config_Handlers/XML_Typedefs.cpp b/CIAO/DAnCE/Config_Handlers/XML_Typedefs.cpp index 9d57ac17e92..9d57ac17e92 100644 --- a/CIAO/tools/Config_Handlers/XML_Typedefs.cpp +++ b/CIAO/DAnCE/Config_Handlers/XML_Typedefs.cpp diff --git a/CIAO/tools/Config_Handlers/XML_Typedefs.h b/CIAO/DAnCE/Config_Handlers/XML_Typedefs.h index f0054df2e57..f0054df2e57 100644 --- a/CIAO/tools/Config_Handlers/XML_Typedefs.h +++ b/CIAO/DAnCE/Config_Handlers/XML_Typedefs.h diff --git a/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp b/CIAO/DAnCE/Config_Handlers/XSCRT/Elements.hpp index 0c8b6979282..0c8b6979282 100644 --- a/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp +++ b/CIAO/DAnCE/Config_Handlers/XSCRT/Elements.hpp diff --git a/CIAO/tools/Config_Handlers/XSCRT/Elements.ipp b/CIAO/DAnCE/Config_Handlers/XSCRT/Elements.ipp index 414f03eb031..414f03eb031 100644 --- a/CIAO/tools/Config_Handlers/XSCRT/Elements.ipp +++ b/CIAO/DAnCE/Config_Handlers/XSCRT/Elements.ipp diff --git a/CIAO/tools/Config_Handlers/XSCRT/Elements.tpp b/CIAO/DAnCE/Config_Handlers/XSCRT/Elements.tpp index 7539a36d75f..7539a36d75f 100644 --- a/CIAO/tools/Config_Handlers/XSCRT/Elements.tpp +++ b/CIAO/DAnCE/Config_Handlers/XSCRT/Elements.tpp diff --git a/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp b/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp index e2ab4b64956..e2ab4b64956 100644 --- a/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp +++ b/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp diff --git a/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp b/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp index 6c4fba2cf88..6c4fba2cf88 100644 --- a/CIAO/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp +++ b/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp diff --git a/CIAO/tools/Config_Handlers/XSCRT/Parser.hpp b/CIAO/DAnCE/Config_Handlers/XSCRT/Parser.hpp index 5fa1e827f8d..5fa1e827f8d 100644 --- a/CIAO/tools/Config_Handlers/XSCRT/Parser.hpp +++ b/CIAO/DAnCE/Config_Handlers/XSCRT/Parser.hpp diff --git a/CIAO/tools/Config_Handlers/XSCRT/Parser.ipp b/CIAO/DAnCE/Config_Handlers/XSCRT/Parser.ipp index f7de09602ae..f7de09602ae 100644 --- a/CIAO/tools/Config_Handlers/XSCRT/Parser.ipp +++ b/CIAO/DAnCE/Config_Handlers/XSCRT/Parser.ipp diff --git a/CIAO/tools/Config_Handlers/XSCRT/Parser.tpp b/CIAO/DAnCE/Config_Handlers/XSCRT/Parser.tpp index 75b9f48eb1f..75b9f48eb1f 100644 --- a/CIAO/tools/Config_Handlers/XSCRT/Parser.tpp +++ b/CIAO/DAnCE/Config_Handlers/XSCRT/Parser.tpp diff --git a/CIAO/tools/Config_Handlers/XSCRT/Traversal.hpp b/CIAO/DAnCE/Config_Handlers/XSCRT/Traversal.hpp index 482d5fc77e1..482d5fc77e1 100644 --- a/CIAO/tools/Config_Handlers/XSCRT/Traversal.hpp +++ b/CIAO/DAnCE/Config_Handlers/XSCRT/Traversal.hpp diff --git a/CIAO/tools/Config_Handlers/XSCRT/Traversal.ipp b/CIAO/DAnCE/Config_Handlers/XSCRT/Traversal.ipp index bc2a462334a..bc2a462334a 100644 --- a/CIAO/tools/Config_Handlers/XSCRT/Traversal.ipp +++ b/CIAO/DAnCE/Config_Handlers/XSCRT/Traversal.ipp diff --git a/CIAO/tools/Config_Handlers/XSCRT/Traversal.tpp b/CIAO/DAnCE/Config_Handlers/XSCRT/Traversal.tpp index 51889c0fb9b..51889c0fb9b 100644 --- a/CIAO/tools/Config_Handlers/XSCRT/Traversal.tpp +++ b/CIAO/DAnCE/Config_Handlers/XSCRT/Traversal.tpp diff --git a/CIAO/tools/Config_Handlers/XSCRT/Writer.hpp b/CIAO/DAnCE/Config_Handlers/XSCRT/Writer.hpp index 6fdd82f6f3e..6fdd82f6f3e 100644 --- a/CIAO/tools/Config_Handlers/XSCRT/Writer.hpp +++ b/CIAO/DAnCE/Config_Handlers/XSCRT/Writer.hpp diff --git a/CIAO/tools/Config_Handlers/XSCRT/Writer.ipp b/CIAO/DAnCE/Config_Handlers/XSCRT/Writer.ipp index caa9fc99235..caa9fc99235 100644 --- a/CIAO/tools/Config_Handlers/XSCRT/Writer.ipp +++ b/CIAO/DAnCE/Config_Handlers/XSCRT/Writer.ipp diff --git a/CIAO/tools/Config_Handlers/XSCRT/Writer.tpp b/CIAO/DAnCE/Config_Handlers/XSCRT/Writer.tpp index 8593004687f..8593004687f 100644 --- a/CIAO/tools/Config_Handlers/XSCRT/Writer.tpp +++ b/CIAO/DAnCE/Config_Handlers/XSCRT/Writer.tpp diff --git a/CIAO/tools/Config_Handlers/XSCRT/XML.hpp b/CIAO/DAnCE/Config_Handlers/XSCRT/XML.hpp index d0fdd30affe..d0fdd30affe 100644 --- a/CIAO/tools/Config_Handlers/XSCRT/XML.hpp +++ b/CIAO/DAnCE/Config_Handlers/XSCRT/XML.hpp diff --git a/CIAO/tools/Config_Handlers/XSCRT/XML.ipp b/CIAO/DAnCE/Config_Handlers/XSCRT/XML.ipp index 4a7b83efd1c..4a7b83efd1c 100644 --- a/CIAO/tools/Config_Handlers/XSCRT/XML.ipp +++ b/CIAO/DAnCE/Config_Handlers/XSCRT/XML.ipp diff --git a/CIAO/tools/Config_Handlers/XSCRT/XML.tpp b/CIAO/DAnCE/Config_Handlers/XSCRT/XML.tpp index 63023a05d28..63023a05d28 100644 --- a/CIAO/tools/Config_Handlers/XSCRT/XML.tpp +++ b/CIAO/DAnCE/Config_Handlers/XSCRT/XML.tpp diff --git a/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp b/CIAO/DAnCE/Config_Handlers/XSCRT/XMLSchema.hpp index 95575267eee..95575267eee 100644 --- a/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp +++ b/CIAO/DAnCE/Config_Handlers/XSCRT/XMLSchema.hpp diff --git a/CIAO/tools/Config_Handlers/XSC_XML_Handlers_Export.h b/CIAO/DAnCE/Config_Handlers/XSC_XML_Handlers_Export.h index 82272eb6c05..82272eb6c05 100644 --- a/CIAO/tools/Config_Handlers/XSC_XML_Handlers_Export.h +++ b/CIAO/DAnCE/Config_Handlers/XSC_XML_Handlers_Export.h diff --git a/CIAO/tools/Config_Handlers/ccd.cpp b/CIAO/DAnCE/Config_Handlers/ccd.cpp index 8ed4163970b..8ed4163970b 100644 --- a/CIAO/tools/Config_Handlers/ccd.cpp +++ b/CIAO/DAnCE/Config_Handlers/ccd.cpp diff --git a/CIAO/tools/Config_Handlers/ccd.hpp b/CIAO/DAnCE/Config_Handlers/ccd.hpp index 7bb0245ead6..7bb0245ead6 100644 --- a/CIAO/tools/Config_Handlers/ccd.hpp +++ b/CIAO/DAnCE/Config_Handlers/ccd.hpp diff --git a/CIAO/tools/Config_Handlers/cdd.cpp b/CIAO/DAnCE/Config_Handlers/cdd.cpp index 4dc1a9d9915..4dc1a9d9915 100644 --- a/CIAO/tools/Config_Handlers/cdd.cpp +++ b/CIAO/DAnCE/Config_Handlers/cdd.cpp diff --git a/CIAO/tools/Config_Handlers/cdd.hpp b/CIAO/DAnCE/Config_Handlers/cdd.hpp index 37cf50be3db..37cf50be3db 100644 --- a/CIAO/tools/Config_Handlers/cdd.hpp +++ b/CIAO/DAnCE/Config_Handlers/cdd.hpp diff --git a/CIAO/tools/Config_Handlers/cdp.cpp b/CIAO/DAnCE/Config_Handlers/cdp.cpp index f1e8538a788..f1e8538a788 100644 --- a/CIAO/tools/Config_Handlers/cdp.cpp +++ b/CIAO/DAnCE/Config_Handlers/cdp.cpp diff --git a/CIAO/tools/Config_Handlers/cdp.hpp b/CIAO/DAnCE/Config_Handlers/cdp.hpp index 9b1e5f0bc9e..9b1e5f0bc9e 100644 --- a/CIAO/tools/Config_Handlers/cdp.hpp +++ b/CIAO/DAnCE/Config_Handlers/cdp.hpp diff --git a/CIAO/tools/Config_Handlers/cid.cpp b/CIAO/DAnCE/Config_Handlers/cid.cpp index 32e9bb6b924..32e9bb6b924 100644 --- a/CIAO/tools/Config_Handlers/cid.cpp +++ b/CIAO/DAnCE/Config_Handlers/cid.cpp diff --git a/CIAO/tools/Config_Handlers/cid.hpp b/CIAO/DAnCE/Config_Handlers/cid.hpp index dbf48c94913..dbf48c94913 100644 --- a/CIAO/tools/Config_Handlers/cid.hpp +++ b/CIAO/DAnCE/Config_Handlers/cid.hpp diff --git a/CIAO/tools/Config_Handlers/cpd.cpp b/CIAO/DAnCE/Config_Handlers/cpd.cpp index 14774d2a6f0..14774d2a6f0 100644 --- a/CIAO/tools/Config_Handlers/cpd.cpp +++ b/CIAO/DAnCE/Config_Handlers/cpd.cpp diff --git a/CIAO/tools/Config_Handlers/cpd.hpp b/CIAO/DAnCE/Config_Handlers/cpd.hpp index a6a295393bb..a6a295393bb 100644 --- a/CIAO/tools/Config_Handlers/cpd.hpp +++ b/CIAO/DAnCE/Config_Handlers/cpd.hpp diff --git a/CIAO/tools/Config_Handlers/iad.cpp b/CIAO/DAnCE/Config_Handlers/iad.cpp index a3fbba62363..a3fbba62363 100644 --- a/CIAO/tools/Config_Handlers/iad.cpp +++ b/CIAO/DAnCE/Config_Handlers/iad.cpp diff --git a/CIAO/tools/Config_Handlers/iad.hpp b/CIAO/DAnCE/Config_Handlers/iad.hpp index e26a5a4e1fb..e26a5a4e1fb 100644 --- a/CIAO/tools/Config_Handlers/iad.hpp +++ b/CIAO/DAnCE/Config_Handlers/iad.hpp diff --git a/CIAO/tools/Config_Handlers/pcd.cpp b/CIAO/DAnCE/Config_Handlers/pcd.cpp index 6418d0172dc..6418d0172dc 100644 --- a/CIAO/tools/Config_Handlers/pcd.cpp +++ b/CIAO/DAnCE/Config_Handlers/pcd.cpp diff --git a/CIAO/tools/Config_Handlers/pcd.hpp b/CIAO/DAnCE/Config_Handlers/pcd.hpp index 8d8d6828bab..8d8d6828bab 100644 --- a/CIAO/tools/Config_Handlers/pcd.hpp +++ b/CIAO/DAnCE/Config_Handlers/pcd.hpp diff --git a/CIAO/tools/Config_Handlers/test.cdp b/CIAO/DAnCE/Config_Handlers/test.cdp index 2430859601b..2430859601b 100644 --- a/CIAO/tools/Config_Handlers/test.cdp +++ b/CIAO/DAnCE/Config_Handlers/test.cdp diff --git a/CIAO/tools/Config_Handlers/test.cpp b/CIAO/DAnCE/Config_Handlers/test.cpp index fd50374aa7e..fd50374aa7e 100644 --- a/CIAO/tools/Config_Handlers/test.cpp +++ b/CIAO/DAnCE/Config_Handlers/test.cpp diff --git a/CIAO/tools/Config_Handlers/toplevel.cpp b/CIAO/DAnCE/Config_Handlers/toplevel.cpp index a59893146bb..a59893146bb 100644 --- a/CIAO/tools/Config_Handlers/toplevel.cpp +++ b/CIAO/DAnCE/Config_Handlers/toplevel.cpp diff --git a/CIAO/tools/Config_Handlers/toplevel.hpp b/CIAO/DAnCE/Config_Handlers/toplevel.hpp index e88d2625e26..e88d2625e26 100644 --- a/CIAO/tools/Config_Handlers/toplevel.hpp +++ b/CIAO/DAnCE/Config_Handlers/toplevel.hpp diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp index 5fce4f140cb..1df8c9bb820 100644 --- a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp +++ b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp @@ -3,7 +3,7 @@ #include "ExecutionManager_Impl.h" -#include "tools/Config_Handlers/DnC_Dump.h" +#include "Config_Handlers/DnC_Dump.h" #include "DAnCE/Logger/Log_Macros.h" diff --git a/CIAO/MPC/config/ciao_config_handlers.mpb b/CIAO/DAnCE/MPC/config/ciao_config_handlers.mpb index bf31a961446..4bf1751fbcd 100644 --- a/CIAO/MPC/config/ciao_config_handlers.mpb +++ b/CIAO/DAnCE/MPC/config/ciao_config_handlers.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : ciao_config_handlers_base, dynamicany, typecodefactory, dance_deployment_stub, ciao_logger { +project : ciao_config_handlers_base, dynamicany, typecodefactory, dance_deployment_stub, dance_logger { verbatim(gnuace, macros) { override no_hidden_visibility = 1 } diff --git a/CIAO/MPC/config/ciao_config_handlers_base.mpb b/CIAO/DAnCE/MPC/config/ciao_config_handlers_base.mpb index 9d36eda836b..51a99714ae1 100644 --- a/CIAO/MPC/config/ciao_config_handlers_base.mpb +++ b/CIAO/DAnCE/MPC/config/ciao_config_handlers_base.mpb @@ -4,7 +4,7 @@ project : ciao_xml_utils, dynamicany, typecodefactory, exceptions { after += XSC_XML_Handlers libs += XSC_XML_Handlers macros += XML_USE_PTHREADS - includes += $(CIAO_ROOT)/tools/Config_Handlers + includes += $(DANCE_ROOT)/Config_Handlers verbatim(gnuace, macros) { override no_hidden_visibility = 1 diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp index 0aeb0553711..8cd5a4abe52 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp @@ -1,8 +1,8 @@ // $Id$ #include "Plan_Launcher_Impl.h" #include "orbsvcs/CosNamingC.h" -#include "tools/Config_Handlers/XML_File_Intf.h" -#include "tools/Config_Handlers/DnC_Dump.h" +#include "Config_Handlers/XML_File_Intf.h" +#include "Config_Handlers/DnC_Dump.h" #include "ace/Sched_Params.h" #include "ccm/CCM_ObjectC.h" diff --git a/CIAO/DAnCE/TargetManager/CmpClient.cpp b/CIAO/DAnCE/TargetManager/CmpClient.cpp index 3594f300187..9d42e928a53 100644 --- a/CIAO/DAnCE/TargetManager/CmpClient.cpp +++ b/CIAO/DAnCE/TargetManager/CmpClient.cpp @@ -17,7 +17,7 @@ #include "ace/FILE_Connector.h" #include "ace/FILE_Addr.h" #include "ace/Get_Opt.h" -#include "tools/Config_Handlers/DnC_Dump.h" +#include "Config_Handlers/DnC_Dump.h" /** * TM_Tester contains the code to test the TM Component diff --git a/CIAO/DAnCE/TargetManager/DomainDataManager.cpp b/CIAO/DAnCE/TargetManager/DomainDataManager.cpp index 632819020e6..570db1911d9 100644 --- a/CIAO/DAnCE/TargetManager/DomainDataManager.cpp +++ b/CIAO/DAnCE/TargetManager/DomainDataManager.cpp @@ -1,8 +1,8 @@ // $Id$ #include "DomainDataManager.h" -#include "tools/Config_Handlers/DD_Handler.h" -#include "tools/Config_Handlers/DnC_Dump.h" +#include "Config_Handlers/DD_Handler.h" +#include "Config_Handlers/DnC_Dump.h" #include "DAnCE/Logger/Log_Macros.h" #ifdef GEN_OSTREAM_OPS diff --git a/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp b/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp index 59b6e9453c2..728bbfb3744 100644 --- a/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp +++ b/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp @@ -1,7 +1,7 @@ // $Id$ #include "TargetManager_exec.h" -#include "tools/Config_Handlers/DD_Handler.h" -#include "tools/Config_Handlers/DnC_Dump.h" +#include "Config_Handlers/DD_Handler.h" +#include "Config_Handlers/DnC_Dump.h" #include "DomainEventsC.h" diff --git a/CIAO/docs/schema/06-04-02.xsd b/CIAO/DAnCE/docs/schema/06-04-02.xsd index 60b5c0ce54c..60b5c0ce54c 100644 --- a/CIAO/docs/schema/06-04-02.xsd +++ b/CIAO/DAnCE/docs/schema/06-04-02.xsd diff --git a/CIAO/docs/schema/Basic_Deployment_Data.xsd b/CIAO/DAnCE/docs/schema/Basic_Deployment_Data.xsd index 2a6715e642b..2a6715e642b 100644 --- a/CIAO/docs/schema/Basic_Deployment_Data.xsd +++ b/CIAO/DAnCE/docs/schema/Basic_Deployment_Data.xsd diff --git a/CIAO/docs/schema/CIAOEvents.xsd b/CIAO/DAnCE/docs/schema/CIAOEvents.xsd index 645d7a6e530..645d7a6e530 100644 --- a/CIAO/docs/schema/CIAOEvents.xsd +++ b/CIAO/DAnCE/docs/schema/CIAOEvents.xsd diff --git a/CIAO/docs/schema/CIAOServerResources.xsd b/CIAO/DAnCE/docs/schema/CIAOServerResources.xsd index 7a62a0e6eab..7a62a0e6eab 100644 --- a/CIAO/docs/schema/CIAOServerResources.xsd +++ b/CIAO/DAnCE/docs/schema/CIAOServerResources.xsd diff --git a/CIAO/docs/schema/Deployment.xsd b/CIAO/DAnCE/docs/schema/Deployment.xsd index 591aa588d74..591aa588d74 100644 --- a/CIAO/docs/schema/Deployment.xsd +++ b/CIAO/DAnCE/docs/schema/Deployment.xsd diff --git a/CIAO/docs/schema/Modified_Deployment.xsd b/CIAO/DAnCE/docs/schema/Modified_Deployment.xsd index 65f5eb81d1e..65f5eb81d1e 100644 --- a/CIAO/docs/schema/Modified_Deployment.xsd +++ b/CIAO/DAnCE/docs/schema/Modified_Deployment.xsd diff --git a/CIAO/docs/schema/README.html b/CIAO/DAnCE/docs/schema/README.html index d810c8a6065..d810c8a6065 100644 --- a/CIAO/docs/schema/README.html +++ b/CIAO/DAnCE/docs/schema/README.html diff --git a/CIAO/docs/schema/SANet_Network.xsd b/CIAO/DAnCE/docs/schema/SANet_Network.xsd index d614528b481..d614528b481 100644 --- a/CIAO/docs/schema/SANet_Network.xsd +++ b/CIAO/DAnCE/docs/schema/SANet_Network.xsd diff --git a/CIAO/docs/schema/ServerResourceUsage.txt b/CIAO/DAnCE/docs/schema/ServerResourceUsage.txt index d8fc47ca7b3..d8fc47ca7b3 100644 --- a/CIAO/docs/schema/ServerResourceUsage.txt +++ b/CIAO/DAnCE/docs/schema/ServerResourceUsage.txt diff --git a/CIAO/docs/schema/Spec_Defined_Deployment.xsd b/CIAO/DAnCE/docs/schema/Spec_Defined_Deployment.xsd index a59a47f1360..a59a47f1360 100644 --- a/CIAO/docs/schema/Spec_Defined_Deployment.xsd +++ b/CIAO/DAnCE/docs/schema/Spec_Defined_Deployment.xsd diff --git a/CIAO/docs/schema/Spec_Defined_XMI.xsd b/CIAO/DAnCE/docs/schema/Spec_Defined_XMI.xsd index eac893f37c8..eac893f37c8 100644 --- a/CIAO/docs/schema/Spec_Defined_XMI.xsd +++ b/CIAO/DAnCE/docs/schema/Spec_Defined_XMI.xsd diff --git a/CIAO/docs/schema/Task_Map.xsd b/CIAO/DAnCE/docs/schema/Task_Map.xsd index 2138f082d48..2138f082d48 100644 --- a/CIAO/docs/schema/Task_Map.xsd +++ b/CIAO/DAnCE/docs/schema/Task_Map.xsd diff --git a/CIAO/docs/schema/XMI.xsd b/CIAO/DAnCE/docs/schema/XMI.xsd index afb17f9d3b5..afb17f9d3b5 100644 --- a/CIAO/docs/schema/XMI.xsd +++ b/CIAO/DAnCE/docs/schema/XMI.xsd diff --git a/CIAO/docs/schema/ccd.xsd b/CIAO/DAnCE/docs/schema/ccd.xsd index fcdac711b5a..fcdac711b5a 100644 --- a/CIAO/docs/schema/ccd.xsd +++ b/CIAO/DAnCE/docs/schema/ccd.xsd diff --git a/CIAO/docs/schema/cdd.xsd b/CIAO/DAnCE/docs/schema/cdd.xsd index 3fe64120bfd..3fe64120bfd 100644 --- a/CIAO/docs/schema/cdd.xsd +++ b/CIAO/DAnCE/docs/schema/cdd.xsd diff --git a/CIAO/docs/schema/cdp.xsd b/CIAO/DAnCE/docs/schema/cdp.xsd index 882d460736c..882d460736c 100644 --- a/CIAO/docs/schema/cdp.xsd +++ b/CIAO/DAnCE/docs/schema/cdp.xsd diff --git a/CIAO/docs/schema/ciaopolicy.xsd b/CIAO/DAnCE/docs/schema/ciaopolicy.xsd index 93a7415c4b4..93a7415c4b4 100644 --- a/CIAO/docs/schema/ciaopolicy.xsd +++ b/CIAO/DAnCE/docs/schema/ciaopolicy.xsd diff --git a/CIAO/docs/schema/cid.xsd b/CIAO/DAnCE/docs/schema/cid.xsd index 62cdc75e7c5..62cdc75e7c5 100644 --- a/CIAO/docs/schema/cid.xsd +++ b/CIAO/DAnCE/docs/schema/cid.xsd diff --git a/CIAO/docs/schema/cpd.xsd b/CIAO/DAnCE/docs/schema/cpd.xsd index b4313af65bf..b4313af65bf 100644 --- a/CIAO/docs/schema/cpd.xsd +++ b/CIAO/DAnCE/docs/schema/cpd.xsd diff --git a/CIAO/docs/schema/iad.xsd b/CIAO/DAnCE/docs/schema/iad.xsd index 2f910b5d333..2f910b5d333 100644 --- a/CIAO/docs/schema/iad.xsd +++ b/CIAO/DAnCE/docs/schema/iad.xsd diff --git a/CIAO/docs/schema/pcd.xsd b/CIAO/DAnCE/docs/schema/pcd.xsd index 5c7772f7d85..5c7772f7d85 100644 --- a/CIAO/docs/schema/pcd.xsd +++ b/CIAO/DAnCE/docs/schema/pcd.xsd diff --git a/CIAO/docs/schema/toplevel.xsd b/CIAO/DAnCE/docs/schema/toplevel.xsd index 83e2feb999d..83e2feb999d 100644 --- a/CIAO/docs/schema/toplevel.xsd +++ b/CIAO/DAnCE/docs/schema/toplevel.xsd diff --git a/CIAO/docs/schema/unused_06-04-02.xsd b/CIAO/DAnCE/docs/schema/unused_06-04-02.xsd index 7d379ee7561..7d379ee7561 100644 --- a/CIAO/docs/schema/unused_06-04-02.xsd +++ b/CIAO/DAnCE/docs/schema/unused_06-04-02.xsd diff --git a/CIAO/docs/schema/unused_elements.xsd b/CIAO/DAnCE/docs/schema/unused_elements.xsd index c1200b088e9..c1200b088e9 100644 --- a/CIAO/docs/schema/unused_elements.xsd +++ b/CIAO/DAnCE/docs/schema/unused_elements.xsd diff --git a/CIAO/docs/schema/xsc-banner.cpp b/CIAO/DAnCE/docs/schema/xsc-banner.cpp index ecd90a877a6..ecd90a877a6 100644 --- a/CIAO/docs/schema/xsc-banner.cpp +++ b/CIAO/DAnCE/docs/schema/xsc-banner.cpp diff --git a/CIAO/docs/schema/xsc-banner.h b/CIAO/DAnCE/docs/schema/xsc-banner.h index 30370e90f40..30370e90f40 100644 --- a/CIAO/docs/schema/xsc-banner.h +++ b/CIAO/DAnCE/docs/schema/xsc-banner.h diff --git a/CIAO/DAnCE/tests/CIAO/CommandlinePassage/CommandlinePassage_exec.cpp b/CIAO/DAnCE/tests/CIAO/CommandlinePassage/CommandlinePassage_exec.cpp index ad064523288..bb39ab4e3a3 100644 --- a/CIAO/DAnCE/tests/CIAO/CommandlinePassage/CommandlinePassage_exec.cpp +++ b/CIAO/DAnCE/tests/CIAO/CommandlinePassage/CommandlinePassage_exec.cpp @@ -2,7 +2,7 @@ // $Id$ #include "CommandlinePassage_exec.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" #include "tao/ORB_Core.h" #include "tao/Transport_Cache_Manager.h" #include "tao/Thread_Lane_Resources.h" diff --git a/CIAO/DAnCE/tests/CIAO/Components/ProcessColocation_exec.cpp b/CIAO/DAnCE/tests/CIAO/Components/ProcessColocation_exec.cpp index d88f66c9fab..2783374c1a5 100644 --- a/CIAO/DAnCE/tests/CIAO/Components/ProcessColocation_exec.cpp +++ b/CIAO/DAnCE/tests/CIAO/Components/ProcessColocation_exec.cpp @@ -2,7 +2,7 @@ // $Id$ #include "ProcessColocation_exec.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" #include "ace/Singleton.h" namespace diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp b/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp index fc11b1eed2a..caa0415af75 100644 --- a/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp +++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp @@ -1,7 +1,7 @@ // $Id$ #include "SimpleAttribute_exec.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO_Simple_SimpleAttribute_Impl { @@ -34,7 +34,7 @@ namespace CIAO_Simple_SimpleAttribute_Impl void SimpleAttribute_exec_i::str_attr (const char * str) { - CIAO_TRACE ("SimpleAttribute_exec_i::str_attr"); + DANCE_TRACE ("SimpleAttribute_exec_i::str_attr"); // Your code here. this->str_ = str; } @@ -42,7 +42,7 @@ namespace CIAO_Simple_SimpleAttribute_Impl ::CORBA::Long SimpleAttribute_exec_i::long_attr () { - CIAO_TRACE ("SimpleAttribute_exec_i::long_attr"); + DANCE_TRACE ("SimpleAttribute_exec_i::long_attr"); // Your code here. return long_; } @@ -50,7 +50,7 @@ namespace CIAO_Simple_SimpleAttribute_Impl void SimpleAttribute_exec_i::long_attr (::CORBA::Long long_attr ) { - CIAO_TRACE ("SimpleAttribute_exec_i::long_attr"); + DANCE_TRACE ("SimpleAttribute_exec_i::long_attr"); // Your code here. this->long_ = long_attr; } @@ -65,7 +65,7 @@ namespace CIAO_Simple_SimpleAttribute_Impl void SimpleAttribute_exec_i::short_attr (::CORBA::Short short_attr ) { - CIAO_TRACE ("SimpleAttribute_exec_i::short_attr"); + DANCE_TRACE ("SimpleAttribute_exec_i::short_attr"); // Your code here. this->short_ = short_attr; } @@ -159,7 +159,7 @@ namespace CIAO_Simple_SimpleAttribute_Impl void SimpleAttributeHome_exec_i::str_attr (const char * str) { - CIAO_TRACE ("SimpleAttributeHome_exec_i::str_attr"); + DANCE_TRACE ("SimpleAttributeHome_exec_i::str_attr"); // Your code here. this->str_ = str; } @@ -167,7 +167,7 @@ namespace CIAO_Simple_SimpleAttribute_Impl ::CORBA::Long SimpleAttributeHome_exec_i::long_attr () { - CIAO_TRACE ("SimpleAttributeHome_exec_i::long_attr"); + DANCE_TRACE ("SimpleAttributeHome_exec_i::long_attr"); // Your code here. return long_; } @@ -175,7 +175,7 @@ namespace CIAO_Simple_SimpleAttribute_Impl void SimpleAttributeHome_exec_i::long_attr (::CORBA::Long long_attr ) { - CIAO_TRACE ("SimpleAttributeHome_exec_i::long_attr"); + DANCE_TRACE ("SimpleAttributeHome_exec_i::long_attr"); // Your code here. this->long_ = long_attr; } @@ -190,7 +190,7 @@ namespace CIAO_Simple_SimpleAttribute_Impl void SimpleAttributeHome_exec_i::short_attr (::CORBA::Short short_attr ) { - CIAO_TRACE ("SimpleAttributeHome_exec_i::short_attr"); + DANCE_TRACE ("SimpleAttributeHome_exec_i::short_attr"); // Your code here. this->short_ = short_attr; } diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp b/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp index f9c44ae380f..7d090ea568c 100644 --- a/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp +++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp @@ -1,7 +1,7 @@ // $Id$ #include "SimpleConsumer_exec.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO_Simple_SimpleConsumer_Impl { @@ -11,12 +11,12 @@ namespace CIAO_Simple_SimpleConsumer_Impl SimpleConsumer_exec_i::SimpleConsumer_exec_i (void) { - CIAO_TRACE ("SimpleConsumer_exec_i::SimpleConsumer_exec_i (void)"); + DANCE_TRACE ("SimpleConsumer_exec_i::SimpleConsumer_exec_i (void)"); } SimpleConsumer_exec_i::~SimpleConsumer_exec_i (void) { - CIAO_TRACE ("SimpleConsumer_exec_i::~SimpleConsumer_exec_i (void)"); + DANCE_TRACE ("SimpleConsumer_exec_i::~SimpleConsumer_exec_i (void)"); } // Supported or inherited operations. @@ -29,7 +29,7 @@ namespace CIAO_Simple_SimpleConsumer_Impl SimpleConsumer_exec_i::push_hello_ ( ::Simple::Hello * ev ) { - CIAO_TRACE ("SimpleConsumer_exec_i::push_hello_ ()"); + DANCE_TRACE ("SimpleConsumer_exec_i::push_hello_ ()"); // Your code here. ACE_DEBUG ((LM_EMERGENCY, "SimpleConsumer_exec_i::push_hello_ - " @@ -42,7 +42,7 @@ namespace CIAO_Simple_SimpleConsumer_Impl SimpleConsumer_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { - CIAO_TRACE ("SimpleConsumer_exec_i::set_session_context ()"); + DANCE_TRACE ("SimpleConsumer_exec_i::set_session_context ()"); this->context_ = ::Simple::CCM_SimpleConsumer_Context::_narrow (ctx); @@ -56,28 +56,28 @@ namespace CIAO_Simple_SimpleConsumer_Impl void SimpleConsumer_exec_i::configuration_complete () { - CIAO_TRACE ("SimpleConsumer_exec_i::configuration_complete ()"); + DANCE_TRACE ("SimpleConsumer_exec_i::configuration_complete ()"); // Your code here. } void SimpleConsumer_exec_i::ccm_activate () { - CIAO_TRACE ("SimpleConsumer_exec_i::ccm_activate ()"); + DANCE_TRACE ("SimpleConsumer_exec_i::ccm_activate ()"); // Your code here. } void SimpleConsumer_exec_i::ccm_passivate () { - CIAO_TRACE ("SimpleConsumer_exec_i::ccm_passivate ()"); + DANCE_TRACE ("SimpleConsumer_exec_i::ccm_passivate ()"); // Your code here. } void SimpleConsumer_exec_i::ccm_remove () { - CIAO_TRACE ("SimpleConsumer_exec_i::ccm_remove ()"); + DANCE_TRACE ("SimpleConsumer_exec_i::ccm_remove ()"); // Your code here. } @@ -87,12 +87,12 @@ namespace CIAO_Simple_SimpleConsumer_Impl SimpleConsumerHome_exec_i::SimpleConsumerHome_exec_i (void) { - CIAO_TRACE ("SimpleConsumerHome_exec_i::SimpleConsumerHome_exec_i (void)"); + DANCE_TRACE ("SimpleConsumerHome_exec_i::SimpleConsumerHome_exec_i (void)"); } SimpleConsumerHome_exec_i::~SimpleConsumerHome_exec_i (void) { - CIAO_TRACE ("SimpleConsumerHome_exec_i::~SimpleConsumerHome_exec_i (void)"); + DANCE_TRACE ("SimpleConsumerHome_exec_i::~SimpleConsumerHome_exec_i (void)"); } // Supported or inherited operations. @@ -108,7 +108,7 @@ namespace CIAO_Simple_SimpleConsumer_Impl ::Components::EnterpriseComponent_ptr SimpleConsumerHome_exec_i::create () { - CIAO_TRACE ("SimpleConsumerHome_exec_i::create ()"); + DANCE_TRACE ("SimpleConsumerHome_exec_i::create ()"); ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); @@ -123,7 +123,7 @@ namespace CIAO_Simple_SimpleConsumer_Impl extern "C" SIMPLECONSUMER_EXEC_Export ::Components::HomeExecutorBase_ptr create_Simple_SimpleConsumerHome_Impl (void) { - CIAO_TRACE ("create_Simple_SimpleConsumerHome_Impl (void)"); + DANCE_TRACE ("create_Simple_SimpleConsumerHome_Impl (void)"); ::Components::HomeExecutorBase_ptr retval = ::Components::HomeExecutorBase::_nil (); diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_exec.cpp b/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_exec.cpp index c21ea4e97fb..a650d1f3d19 100644 --- a/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_exec.cpp +++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_exec.cpp @@ -1,7 +1,7 @@ // $Id$ #include "SimpleEmitter_exec.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO_Simple_SimpleEmitter_Impl { @@ -11,12 +11,12 @@ namespace CIAO_Simple_SimpleEmitter_Impl SimpleEmitter_exec_i::SimpleEmitter_exec_i (void) { - CIAO_TRACE ("SimpleEmitter_exec_i::SimpleEmitter_exec_i (void)"); + DANCE_TRACE ("SimpleEmitter_exec_i::SimpleEmitter_exec_i (void)"); } SimpleEmitter_exec_i::~SimpleEmitter_exec_i (void) { - CIAO_TRACE ("SimpleEmitter_exec_i::~SimpleEmitter_exec_i (void)"); + DANCE_TRACE ("SimpleEmitter_exec_i::~SimpleEmitter_exec_i (void)"); } // Supported or inherited operations. @@ -31,7 +31,7 @@ namespace CIAO_Simple_SimpleEmitter_Impl SimpleEmitter_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { - CIAO_TRACE ("SimpleEmitter_exec_i::set_session_context ()"); + DANCE_TRACE ("SimpleEmitter_exec_i::set_session_context ()"); this->context_ = ::Simple::CCM_SimpleEmitter_Context::_narrow (ctx); @@ -44,14 +44,14 @@ namespace CIAO_Simple_SimpleEmitter_Impl void SimpleEmitter_exec_i::configuration_complete () { - CIAO_TRACE ("SimpleEmitter_exec_i::configuration_complete ()"); + DANCE_TRACE ("SimpleEmitter_exec_i::configuration_complete ()"); // Your code here. } void SimpleEmitter_exec_i::ccm_activate () { - CIAO_TRACE ("SimpleEmitter_exec_i::ccm_activate ()"); + DANCE_TRACE ("SimpleEmitter_exec_i::ccm_activate ()"); // Your code here. ::Simple::Hello_var hello = new OBV_Simple::Hello ("Test successful, hello from SimpleEmitter_exec_i"); @@ -62,14 +62,14 @@ namespace CIAO_Simple_SimpleEmitter_Impl void SimpleEmitter_exec_i::ccm_passivate () { - CIAO_TRACE ("SimpleEmitter_exec_i::ccm_passivate ()"); + DANCE_TRACE ("SimpleEmitter_exec_i::ccm_passivate ()"); // Your code here. } void SimpleEmitter_exec_i::ccm_remove () { - CIAO_TRACE ("SimpleEmitter_exec_i::ccm_remove ()"); + DANCE_TRACE ("SimpleEmitter_exec_i::ccm_remove ()"); // Your code here. } @@ -79,12 +79,12 @@ namespace CIAO_Simple_SimpleEmitter_Impl SimpleEmitterHome_exec_i::SimpleEmitterHome_exec_i (void) { - CIAO_TRACE ("SimpleEmitterHome_exec_i::SimpleEmitterHome_exec_i (void)"); + DANCE_TRACE ("SimpleEmitterHome_exec_i::SimpleEmitterHome_exec_i (void)"); } SimpleEmitterHome_exec_i::~SimpleEmitterHome_exec_i (void) { - CIAO_TRACE ("SimpleEmitterHome_exec_i::~SimpleEmitterHome_exec_i (void)"); + DANCE_TRACE ("SimpleEmitterHome_exec_i::~SimpleEmitterHome_exec_i (void)"); } // Supported or inherited operations. @@ -100,7 +100,7 @@ namespace CIAO_Simple_SimpleEmitter_Impl ::Components::EnterpriseComponent_ptr SimpleEmitterHome_exec_i::create () { - CIAO_TRACE ("SimpleEmitterHome_exec_i::create ()"); + DANCE_TRACE ("SimpleEmitterHome_exec_i::create ()"); ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); @@ -116,7 +116,7 @@ namespace CIAO_Simple_SimpleEmitter_Impl extern "C" SIMPLEEMITTER_EXEC_Export ::Components::HomeExecutorBase_ptr create_Simple_SimpleEmitterHome_Impl (void) { - CIAO_TRACE ("create_Simple_SimpleEmitterHome_Impl (void)"); + DANCE_TRACE ("create_Simple_SimpleEmitterHome_Impl (void)"); ::Components::HomeExecutorBase_ptr retval = ::Components::HomeExecutorBase::_nil (); diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp b/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp index 15183eaaf0e..a61b791df5b 100644 --- a/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp +++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp @@ -1,7 +1,7 @@ // $Id$ #include "SimpleMultipleUser_exec.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO_Simple_SimpleMultipleUser_Impl { @@ -11,12 +11,12 @@ namespace CIAO_Simple_SimpleMultipleUser_Impl SimpleMultipleUser_exec_i::SimpleMultipleUser_exec_i (void) { - CIAO_TRACE ("SimpleMultipleUser_exec_i::SimpleMultipleUser_exec_i (void)"); + DANCE_TRACE ("SimpleMultipleUser_exec_i::SimpleMultipleUser_exec_i (void)"); } SimpleMultipleUser_exec_i::~SimpleMultipleUser_exec_i (void) { - CIAO_TRACE ("SimpleMultipleUser_exec_i::~SimpleMultipleUser_exec_i (void)"); + DANCE_TRACE ("SimpleMultipleUser_exec_i::~SimpleMultipleUser_exec_i (void)"); } // Supported or inherited operations. @@ -31,7 +31,7 @@ namespace CIAO_Simple_SimpleMultipleUser_Impl SimpleMultipleUser_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { - CIAO_TRACE ("SimpleMultipleUser_exec_i::set_session_context ()"); + DANCE_TRACE ("SimpleMultipleUser_exec_i::set_session_context ()"); this->context_ = ::Simple::CCM_SimpleMultipleUser_Context::_narrow (ctx); @@ -44,14 +44,14 @@ namespace CIAO_Simple_SimpleMultipleUser_Impl void SimpleMultipleUser_exec_i::configuration_complete () { - CIAO_TRACE ("SimpleMultipleUser_exec_i::configuration_complete ()"); + DANCE_TRACE ("SimpleMultipleUser_exec_i::configuration_complete ()"); // Your code here. } void SimpleMultipleUser_exec_i::ccm_activate () { - CIAO_TRACE ("SimpleMultipleUser_exec_i::ccm_activate ()"); + DANCE_TRACE ("SimpleMultipleUser_exec_i::ccm_activate ()"); ::Simple::SimpleMultipleUser::trigConnections_var conns = this->context_->get_connections_trig (); @@ -90,14 +90,14 @@ namespace CIAO_Simple_SimpleMultipleUser_Impl void SimpleMultipleUser_exec_i::ccm_passivate () { - CIAO_TRACE ("SimpleMultipleUser_exec_i::ccm_passivate ()"); + DANCE_TRACE ("SimpleMultipleUser_exec_i::ccm_passivate ()"); // Your code here. } void SimpleMultipleUser_exec_i::ccm_remove () { - CIAO_TRACE ("SimpleMultipleUser_exec_i::ccm_remove ()"); + DANCE_TRACE ("SimpleMultipleUser_exec_i::ccm_remove ()"); // Your code here. } @@ -107,12 +107,12 @@ namespace CIAO_Simple_SimpleMultipleUser_Impl SimpleMultipleUserHome_exec_i::SimpleMultipleUserHome_exec_i (void) { - CIAO_TRACE ("SimpleMultipleUserHome_exec_i::SimpleMultipleUserHome_exec_i (void)"); + DANCE_TRACE ("SimpleMultipleUserHome_exec_i::SimpleMultipleUserHome_exec_i (void)"); } SimpleMultipleUserHome_exec_i::~SimpleMultipleUserHome_exec_i (void) { - CIAO_TRACE ("SimpleMultipleUserHome_exec_i::~SimpleMultipleUserHome_exec_i (void)"); + DANCE_TRACE ("SimpleMultipleUserHome_exec_i::~SimpleMultipleUserHome_exec_i (void)"); } // Supported or inherited operations. @@ -128,7 +128,7 @@ namespace CIAO_Simple_SimpleMultipleUser_Impl ::Components::EnterpriseComponent_ptr SimpleMultipleUserHome_exec_i::create () { - CIAO_TRACE ("SimpleMultipleUserHome_exec_i::create ()"); + DANCE_TRACE ("SimpleMultipleUserHome_exec_i::create ()"); ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); @@ -143,7 +143,7 @@ namespace CIAO_Simple_SimpleMultipleUser_Impl extern "C" SIMPLEMULTIPLEUSER_EXEC_Export ::Components::HomeExecutorBase_ptr create_Simple_SimpleMultipleUserHome_Impl (void) { - CIAO_TRACE ("create_Simple_SimpleMultipleUserHome_Impl (void)"); + DANCE_TRACE ("create_Simple_SimpleMultipleUserHome_Impl (void)"); ::Components::HomeExecutorBase_ptr retval = ::Components::HomeExecutorBase::_nil (); diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.cpp b/CIAO/DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.cpp index 4b25efb5b6f..5ddbb6691ba 100644 --- a/CIAO/DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.cpp +++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.cpp @@ -1,7 +1,7 @@ // $Id$ #include "SimpleNilFacetProvider_exec.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO_Simple_SimpleNilFacetProvider_Impl { @@ -11,12 +11,12 @@ namespace CIAO_Simple_SimpleNilFacetProvider_Impl Trigger_exec_i::Trigger_exec_i (void) { - CIAO_TRACE ("Trigger_exec_i::Trigger_exec_i (void)"); + DANCE_TRACE ("Trigger_exec_i::Trigger_exec_i (void)"); } Trigger_exec_i::~Trigger_exec_i (void) { - CIAO_TRACE ("Trigger_exec_i::~Trigger_exec_i (void)"); + DANCE_TRACE ("Trigger_exec_i::~Trigger_exec_i (void)"); } // Operations from ::Simple::Trigger @@ -25,7 +25,7 @@ namespace CIAO_Simple_SimpleNilFacetProvider_Impl Trigger_exec_i::hello ( const char * hello ) { - CIAO_TRACE ("Trigger_exec_i::hello ()"); + DANCE_TRACE ("Trigger_exec_i::hello ()"); // Your code here. ACE_DEBUG ((LM_EMERGENCY, "Trigger_exec_i::hello - " "Got the following information from trig port: %C\n", @@ -38,12 +38,12 @@ namespace CIAO_Simple_SimpleNilFacetProvider_Impl SimpleNilFacetProvider_exec_i::SimpleNilFacetProvider_exec_i (void) { - CIAO_TRACE ("SimpleNilFacetProvider_exec_i::SimpleNilFacetProvider_exec_i (void)"); + DANCE_TRACE ("SimpleNilFacetProvider_exec_i::SimpleNilFacetProvider_exec_i (void)"); } SimpleNilFacetProvider_exec_i::~SimpleNilFacetProvider_exec_i (void) { - CIAO_TRACE ("SimpleNilFacetProvider_exec_i::~SimpleNilFacetProvider_exec_i (void)"); + DANCE_TRACE ("SimpleNilFacetProvider_exec_i::~SimpleNilFacetProvider_exec_i (void)"); } // Supported or inherited operations. @@ -55,7 +55,7 @@ namespace CIAO_Simple_SimpleNilFacetProvider_Impl ::Simple::CCM_Trigger_ptr SimpleNilFacetProvider_exec_i::get_trig () { - CIAO_TRACE ("SimpleNilFacetProvider_exec_i::get_trig ()"); + DANCE_TRACE ("SimpleNilFacetProvider_exec_i::get_trig ()"); return ::Simple::CCM_Trigger::_nil (); } @@ -65,7 +65,7 @@ namespace CIAO_Simple_SimpleNilFacetProvider_Impl SimpleNilFacetProvider_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { - CIAO_TRACE ("SimpleNilFacetProvider_exec_i::set_session_context ()"); + DANCE_TRACE ("SimpleNilFacetProvider_exec_i::set_session_context ()"); this->context_ = ::Simple::CCM_SimpleNilFacetProvider_Context::_narrow (ctx); @@ -78,28 +78,28 @@ namespace CIAO_Simple_SimpleNilFacetProvider_Impl void SimpleNilFacetProvider_exec_i::configuration_complete () { - CIAO_TRACE ("SimpleNilFacetProvider_exec_i::configuration_complete ()"); + DANCE_TRACE ("SimpleNilFacetProvider_exec_i::configuration_complete ()"); // Your code here. } void SimpleNilFacetProvider_exec_i::ccm_activate () { - CIAO_TRACE ("SimpleNilFacetProvider_exec_i::ccm_activate ()"); + DANCE_TRACE ("SimpleNilFacetProvider_exec_i::ccm_activate ()"); // Your code here. } void SimpleNilFacetProvider_exec_i::ccm_passivate () { - CIAO_TRACE ("SimpleNilFacetProvider_exec_i::ccm_passivate ()"); + DANCE_TRACE ("SimpleNilFacetProvider_exec_i::ccm_passivate ()"); // Your code here. } void SimpleNilFacetProvider_exec_i::ccm_remove () { - CIAO_TRACE ("SimpleNilFacetProvider_exec_i::ccm_remove ()"); + DANCE_TRACE ("SimpleNilFacetProvider_exec_i::ccm_remove ()"); // Your code here. } @@ -109,12 +109,12 @@ namespace CIAO_Simple_SimpleNilFacetProvider_Impl SimpleNilFacetProviderHome_exec_i::SimpleNilFacetProviderHome_exec_i (void) { - CIAO_TRACE ("SimpleNilFacetProviderHome_exec_i::SimpleNilFacetProviderHome_exec_i (void)"); + DANCE_TRACE ("SimpleNilFacetProviderHome_exec_i::SimpleNilFacetProviderHome_exec_i (void)"); } SimpleNilFacetProviderHome_exec_i::~SimpleNilFacetProviderHome_exec_i (void) { - CIAO_TRACE ("SimpleNilFacetProviderHome_exec_i::~SimpleNilFacetProviderHome_exec_i (void)"); + DANCE_TRACE ("SimpleNilFacetProviderHome_exec_i::~SimpleNilFacetProviderHome_exec_i (void)"); } // Supported or inherited operations. @@ -130,7 +130,7 @@ namespace CIAO_Simple_SimpleNilFacetProvider_Impl ::Components::EnterpriseComponent_ptr SimpleNilFacetProviderHome_exec_i::create () { - CIAO_TRACE ("SimpleNilFacetProviderHome_exec_i::create ()"); + DANCE_TRACE ("SimpleNilFacetProviderHome_exec_i::create ()"); ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); @@ -145,7 +145,7 @@ namespace CIAO_Simple_SimpleNilFacetProvider_Impl extern "C" SIMPLENILFACETPROVIDER_EXEC_Export ::Components::HomeExecutorBase_ptr create_Simple_SimpleNilFacetProviderHome_Impl (void) { - CIAO_TRACE ("create_Simple_SimpleNilFacetProviderHome_Impl (void)"); + DANCE_TRACE ("create_Simple_SimpleNilFacetProviderHome_Impl (void)"); ::Components::HomeExecutorBase_ptr retval = ::Components::HomeExecutorBase::_nil (); diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.cpp b/CIAO/DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.cpp index 16279eb9110..ea8382a6323 100644 --- a/CIAO/DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.cpp +++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" #include "SimpleNilFacetUser_exec.h" namespace CIAO_Simple_SimpleNilFacetUser_Impl @@ -11,12 +11,12 @@ namespace CIAO_Simple_SimpleNilFacetUser_Impl SimpleNilFacetUser_exec_i::SimpleNilFacetUser_exec_i (void) { - CIAO_TRACE ("SimpleNilFacetUser_exec_i::SimpleNilFacetUser_exec_i (void)"); + DANCE_TRACE ("SimpleNilFacetUser_exec_i::SimpleNilFacetUser_exec_i (void)"); } SimpleNilFacetUser_exec_i::~SimpleNilFacetUser_exec_i (void) { - CIAO_TRACE ("SimpleNilFacetUser_exec_i::~SimpleNilFacetUser_exec_i (void)"); + DANCE_TRACE ("SimpleNilFacetUser_exec_i::~SimpleNilFacetUser_exec_i (void)"); } // Supported or inherited operations. @@ -31,7 +31,7 @@ namespace CIAO_Simple_SimpleNilFacetUser_Impl SimpleNilFacetUser_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { - CIAO_TRACE ("SimpleNilFacetUser_exec_i::set_session_context ()"); + DANCE_TRACE ("SimpleNilFacetUser_exec_i::set_session_context ()"); this->context_ = ::Simple::CCM_SimpleNilFacetUser_Context::_narrow (ctx); @@ -44,14 +44,14 @@ namespace CIAO_Simple_SimpleNilFacetUser_Impl void SimpleNilFacetUser_exec_i::configuration_complete () { - CIAO_TRACE ("SimpleNilFacetUser_exec_i::configuration_complete ()"); + DANCE_TRACE ("SimpleNilFacetUser_exec_i::configuration_complete ()"); // Your code here. } void SimpleNilFacetUser_exec_i::ccm_activate () { - CIAO_TRACE ("SimpleNilFacetUser_exec_i::ccm_activate ()"); + DANCE_TRACE ("SimpleNilFacetUser_exec_i::ccm_activate ()"); bool caught_exception = false; ::Simple::Trigger_var trig (this->context_->get_connection_trig ()); @@ -93,13 +93,13 @@ namespace CIAO_Simple_SimpleNilFacetUser_Impl void SimpleNilFacetUser_exec_i::ccm_passivate () { - CIAO_TRACE ("SimpleNilFacetUser_exec_i::ccm_passivate ()"); + DANCE_TRACE ("SimpleNilFacetUser_exec_i::ccm_passivate ()"); } void SimpleNilFacetUser_exec_i::ccm_remove () { - CIAO_TRACE ("SimpleNilFacetUser_exec_i::ccm_remove ()"); + DANCE_TRACE ("SimpleNilFacetUser_exec_i::ccm_remove ()"); } //================================================================== @@ -108,12 +108,12 @@ namespace CIAO_Simple_SimpleNilFacetUser_Impl SimpleNilFacetUserHome_exec_i::SimpleNilFacetUserHome_exec_i (void) { - CIAO_TRACE ("SimpleNilFacetUserHome_exec_i::SimpleNilFacetUserHome_exec_i (void)"); + DANCE_TRACE ("SimpleNilFacetUserHome_exec_i::SimpleNilFacetUserHome_exec_i (void)"); } SimpleNilFacetUserHome_exec_i::~SimpleNilFacetUserHome_exec_i (void) { - CIAO_TRACE ("SimpleNilFacetUserHome_exec_i::~SimpleNilFacetUserHome_exec_i (void)"); + DANCE_TRACE ("SimpleNilFacetUserHome_exec_i::~SimpleNilFacetUserHome_exec_i (void)"); } // Supported or inherited operations. @@ -129,7 +129,7 @@ namespace CIAO_Simple_SimpleNilFacetUser_Impl ::Components::EnterpriseComponent_ptr SimpleNilFacetUserHome_exec_i::create () { - CIAO_TRACE ("SimpleNilFacetUserHome_exec_i::create ()"); + DANCE_TRACE ("SimpleNilFacetUserHome_exec_i::create ()"); ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); @@ -144,7 +144,7 @@ namespace CIAO_Simple_SimpleNilFacetUser_Impl extern "C" SIMPLENILFACETUSER_EXEC_Export ::Components::HomeExecutorBase_ptr create_Simple_SimpleNilFacetUserHome_Impl (void) { - CIAO_TRACE ("create_Simple_SimpleNilFacetUserHome_Impl (void)"); + DANCE_TRACE ("create_Simple_SimpleNilFacetUserHome_Impl (void)"); ::Components::HomeExecutorBase_ptr retval = ::Components::HomeExecutorBase::_nil (); diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp b/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp index 8d2692bdcfc..eab01e30f54 100644 --- a/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp +++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp @@ -1,7 +1,7 @@ // $Id$ #include "SimpleNull_exec.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO_Simple_SimpleNull_Impl { @@ -11,13 +11,13 @@ namespace CIAO_Simple_SimpleNull_Impl SimpleNull_exec_i::SimpleNull_exec_i (void) { - CIAO_TRACE ("SimpleNull_exec_i::SimpleNull_exec_i (void)"); + DANCE_TRACE ("SimpleNull_exec_i::SimpleNull_exec_i (void)"); ACE_DEBUG ((LM_EMERGENCY, "SimpleNull - Test - Lifecycle event - SimpleNull_exec_i::SimpleNull_exec_i (void)\n")); } SimpleNull_exec_i::~SimpleNull_exec_i (void) { - CIAO_TRACE ("SimpleNull_exec_i::~SimpleNull_exec_i"); + DANCE_TRACE ("SimpleNull_exec_i::~SimpleNull_exec_i"); ACE_DEBUG ((LM_EMERGENCY, "SimpleNull - Test - Lifecycle event - SimpleNull_exec_i::~SimpleNull_exec_i\n")); } @@ -33,7 +33,7 @@ namespace CIAO_Simple_SimpleNull_Impl SimpleNull_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { - CIAO_TRACE ("SimpleNull_exec_i::set_session_context"); + DANCE_TRACE ("SimpleNull_exec_i::set_session_context"); ACE_DEBUG ((LM_EMERGENCY, "SimpleNull - Test - Lifecycle event - SimpleNull_exec_i::set_session_context\n")); this->context_ = ::Simple::CCM_SimpleNull_Context::_narrow (ctx); @@ -47,7 +47,7 @@ namespace CIAO_Simple_SimpleNull_Impl void SimpleNull_exec_i::configuration_complete () { - CIAO_TRACE ("SimpleNull_exec_i::configuration_complete\n"); + DANCE_TRACE ("SimpleNull_exec_i::configuration_complete\n"); ACE_DEBUG ((LM_EMERGENCY, "SimpleNull - Test - Lifecycle event - SimpleNull_exec_i::configuration_complete\n")); // Your code here. } @@ -55,7 +55,7 @@ namespace CIAO_Simple_SimpleNull_Impl void SimpleNull_exec_i::ccm_activate () { - CIAO_TRACE ("SimpleNull_exec_i::ccm_activate"); + DANCE_TRACE ("SimpleNull_exec_i::ccm_activate"); ACE_DEBUG ((LM_EMERGENCY, "SimpleNull - Test - Lifecycle event - SimpleNull_exec_i::ccm_activate\n")); // Your code here. } @@ -63,7 +63,7 @@ namespace CIAO_Simple_SimpleNull_Impl void SimpleNull_exec_i::ccm_passivate () { - CIAO_TRACE ("SimpleNull_exec_i::ccm_passivate"); + DANCE_TRACE ("SimpleNull_exec_i::ccm_passivate"); ACE_DEBUG ((LM_EMERGENCY, "SimpleNull - Test - Lifecycle event - SimpleNull_exec_i::ccm_passivate\n")); // Your code here. } @@ -71,7 +71,7 @@ namespace CIAO_Simple_SimpleNull_Impl void SimpleNull_exec_i::ccm_remove () { - CIAO_TRACE ("SimpleNull_exec_i::ccm_remove"); + DANCE_TRACE ("SimpleNull_exec_i::ccm_remove"); ACE_DEBUG ((LM_EMERGENCY, "SimpleNull - Test - Lifecycle event - SimpleNull_exec_i::ccm_remove\n")); // Your code here. } @@ -95,13 +95,13 @@ namespace CIAO_Simple_SimpleNull_Impl SimpleNullHome_exec_i::SimpleNullHome_exec_i (void) { - CIAO_TRACE ("SimpleNullHome_exec_i::SimpleNullHome_exec_i"); + DANCE_TRACE ("SimpleNullHome_exec_i::SimpleNullHome_exec_i"); ACE_DEBUG ((LM_EMERGENCY, "SimpleNull - Test - Lifecycle event - SimpleNullHome_exec_i::SimpleNullHome_exec_i\n")); } SimpleNullHome_exec_i::~SimpleNullHome_exec_i (void) { - CIAO_TRACE ("SimpleNullHome_exec_i::~SimpleNullHome_exec_i"); + DANCE_TRACE ("SimpleNullHome_exec_i::~SimpleNullHome_exec_i"); ACE_DEBUG ((LM_EMERGENCY, "SimpleNull - Test - Lifecycle event - SimpleNullHome_exec_i::~SimpleNullHome_exec_i\n")); } @@ -118,7 +118,7 @@ namespace CIAO_Simple_SimpleNull_Impl ::Components::EnterpriseComponent_ptr SimpleNullHome_exec_i::create () { - CIAO_TRACE ("SimpleNullHome_exec_i::create"); + DANCE_TRACE ("SimpleNullHome_exec_i::create"); ACE_DEBUG ((LM_EMERGENCY, "SimpleNull - Test - Lifecycle event - SimpleNullHome_exec_i::create\n")); ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); @@ -134,7 +134,7 @@ namespace CIAO_Simple_SimpleNull_Impl extern "C" SIMPLENULL_EXEC_Export ::Components::HomeExecutorBase_ptr create_Simple_SimpleNullHome_Impl (void) { - CIAO_TRACE ("create_Simple_SimpleNullHome_Impl"); + DANCE_TRACE ("create_Simple_SimpleNullHome_Impl"); ACE_DEBUG ((LM_EMERGENCY, "SimpleNull - Test - Lifecycle event - create_Simple_SimpleNullHome_Impl\n")); ::Components::HomeExecutorBase_ptr retval = ::Components::HomeExecutorBase::_nil (); diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp b/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp index 02addc261f9..f42c735a559 100644 --- a/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp +++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp @@ -1,7 +1,7 @@ // $Id$ #include "SimpleProvider_exec.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO_Simple_SimpleProvider_Impl { @@ -11,12 +11,12 @@ namespace CIAO_Simple_SimpleProvider_Impl Trigger_exec_i::Trigger_exec_i (void) { - CIAO_TRACE ("Trigger_exec_i::Trigger_exec_i (void)"); + DANCE_TRACE ("Trigger_exec_i::Trigger_exec_i (void)"); } Trigger_exec_i::~Trigger_exec_i (void) { - CIAO_TRACE ("Trigger_exec_i::~Trigger_exec_i (void)"); + DANCE_TRACE ("Trigger_exec_i::~Trigger_exec_i (void)"); } // Operations from ::Simple::Trigger @@ -25,7 +25,7 @@ namespace CIAO_Simple_SimpleProvider_Impl Trigger_exec_i::hello ( const char * hello ) { - CIAO_TRACE ("Trigger_exec_i::hello ()"); + DANCE_TRACE ("Trigger_exec_i::hello ()"); // Your code here. ACE_DEBUG ((LM_EMERGENCY, "Trigger_exec_i::hello - " "Got the following information from trig port: %C\n", @@ -38,12 +38,12 @@ namespace CIAO_Simple_SimpleProvider_Impl SimpleProvider_exec_i::SimpleProvider_exec_i (void) { - CIAO_TRACE ("SimpleProvider_exec_i::SimpleProvider_exec_i (void)"); + DANCE_TRACE ("SimpleProvider_exec_i::SimpleProvider_exec_i (void)"); } SimpleProvider_exec_i::~SimpleProvider_exec_i (void) { - CIAO_TRACE ("SimpleProvider_exec_i::~SimpleProvider_exec_i (void)"); + DANCE_TRACE ("SimpleProvider_exec_i::~SimpleProvider_exec_i (void)"); } // Supported or inherited operations. @@ -55,7 +55,7 @@ namespace CIAO_Simple_SimpleProvider_Impl ::Simple::CCM_Trigger_ptr SimpleProvider_exec_i::get_trig () { - CIAO_TRACE ("SimpleProvider_exec_i::get_trig ()"); + DANCE_TRACE ("SimpleProvider_exec_i::get_trig ()"); return new Trigger_exec_i (); } @@ -65,7 +65,7 @@ namespace CIAO_Simple_SimpleProvider_Impl SimpleProvider_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { - CIAO_TRACE ("SimpleProvider_exec_i::set_session_context ()"); + DANCE_TRACE ("SimpleProvider_exec_i::set_session_context ()"); this->context_ = ::Simple::CCM_SimpleProvider_Context::_narrow (ctx); @@ -78,28 +78,28 @@ namespace CIAO_Simple_SimpleProvider_Impl void SimpleProvider_exec_i::configuration_complete () { - CIAO_TRACE ("SimpleProvider_exec_i::configuration_complete ()"); + DANCE_TRACE ("SimpleProvider_exec_i::configuration_complete ()"); // Your code here. } void SimpleProvider_exec_i::ccm_activate () { - CIAO_TRACE ("SimpleProvider_exec_i::ccm_activate ()"); + DANCE_TRACE ("SimpleProvider_exec_i::ccm_activate ()"); // Your code here. } void SimpleProvider_exec_i::ccm_passivate () { - CIAO_TRACE ("SimpleProvider_exec_i::ccm_passivate ()"); + DANCE_TRACE ("SimpleProvider_exec_i::ccm_passivate ()"); // Your code here. } void SimpleProvider_exec_i::ccm_remove () { - CIAO_TRACE ("SimpleProvider_exec_i::ccm_remove ()"); + DANCE_TRACE ("SimpleProvider_exec_i::ccm_remove ()"); // Your code here. } @@ -109,12 +109,12 @@ namespace CIAO_Simple_SimpleProvider_Impl SimpleProviderHome_exec_i::SimpleProviderHome_exec_i (void) { - CIAO_TRACE ("SimpleProviderHome_exec_i::SimpleProviderHome_exec_i (void)"); + DANCE_TRACE ("SimpleProviderHome_exec_i::SimpleProviderHome_exec_i (void)"); } SimpleProviderHome_exec_i::~SimpleProviderHome_exec_i (void) { - CIAO_TRACE ("SimpleProviderHome_exec_i::~SimpleProviderHome_exec_i (void)"); + DANCE_TRACE ("SimpleProviderHome_exec_i::~SimpleProviderHome_exec_i (void)"); } // Supported or inherited operations. @@ -130,7 +130,7 @@ namespace CIAO_Simple_SimpleProvider_Impl ::Components::EnterpriseComponent_ptr SimpleProviderHome_exec_i::create () { - CIAO_TRACE ("SimpleProviderHome_exec_i::create ()"); + DANCE_TRACE ("SimpleProviderHome_exec_i::create ()"); ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); @@ -145,7 +145,7 @@ namespace CIAO_Simple_SimpleProvider_Impl extern "C" SIMPLEPROVIDER_EXEC_Export ::Components::HomeExecutorBase_ptr create_Simple_SimpleProviderHome_Impl (void) { - CIAO_TRACE ("create_Simple_SimpleProviderHome_Impl (void)"); + DANCE_TRACE ("create_Simple_SimpleProviderHome_Impl (void)"); ::Components::HomeExecutorBase_ptr retval = ::Components::HomeExecutorBase::_nil (); diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp b/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp index 5bf38762ae4..a0e83b17707 100644 --- a/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp +++ b/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp @@ -1,7 +1,7 @@ // $Id$ #include "SimplePublisher_exec.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO_Simple_SimplePublisher_Impl { @@ -11,12 +11,12 @@ namespace CIAO_Simple_SimplePublisher_Impl SimplePublisher_exec_i::SimplePublisher_exec_i (void) { - CIAO_TRACE ("SimplePublisher_exec_i::SimplePublisher_exec_i (void)"); + DANCE_TRACE ("SimplePublisher_exec_i::SimplePublisher_exec_i (void)"); } SimplePublisher_exec_i::~SimplePublisher_exec_i (void) { - CIAO_TRACE ("SimplePublisher_exec_i::~SimplePublisher_exec_i (void)"); + DANCE_TRACE ("SimplePublisher_exec_i::~SimplePublisher_exec_i (void)"); } // Supported or inherited operations. @@ -31,7 +31,7 @@ namespace CIAO_Simple_SimplePublisher_Impl SimplePublisher_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { - CIAO_TRACE ("SimplePublisher_exec_i::set_session_context ()"); + DANCE_TRACE ("SimplePublisher_exec_i::set_session_context ()"); this->context_ = ::Simple::CCM_SimplePublisher_Context::_narrow (ctx); @@ -44,14 +44,14 @@ namespace CIAO_Simple_SimplePublisher_Impl void SimplePublisher_exec_i::configuration_complete () { - CIAO_TRACE ("SimplePublisher_exec_i::configuration_complete ()"); + DANCE_TRACE ("SimplePublisher_exec_i::configuration_complete ()"); // Your code here. } void SimplePublisher_exec_i::ccm_activate () { - CIAO_TRACE ("SimplePublisher_exec_i::ccm_activate ()"); + DANCE_TRACE ("SimplePublisher_exec_i::ccm_activate ()"); ::Simple::Hello_var hello = new OBV_Simple::Hello ("Test successful, hello from SimplePublisher_exec_i"); this->context_->push_hello (hello._retn ()); @@ -61,14 +61,14 @@ namespace CIAO_Simple_SimplePublisher_Impl void SimplePublisher_exec_i::ccm_passivate () { - CIAO_TRACE ("SimplePublisher_exec_i::ccm_passivate ()"); + DANCE_TRACE ("SimplePublisher_exec_i::ccm_passivate ()"); // Your code here. } void SimplePublisher_exec_i::ccm_remove () { - CIAO_TRACE ("SimplePublisher_exec_i::ccm_remove ()"); + DANCE_TRACE ("SimplePublisher_exec_i::ccm_remove ()"); // Your code here. } @@ -78,12 +78,12 @@ namespace CIAO_Simple_SimplePublisher_Impl SimplePublisherHome_exec_i::SimplePublisherHome_exec_i (void) { - CIAO_TRACE ("SimplePublisherHome_exec_i::SimplePublisherHome_exec_i (void)"); + DANCE_TRACE ("SimplePublisherHome_exec_i::SimplePublisherHome_exec_i (void)"); } SimplePublisherHome_exec_i::~SimplePublisherHome_exec_i (void) { - CIAO_TRACE ("SimplePublisherHome_exec_i::~SimplePublisherHome_exec_i (void)"); + DANCE_TRACE ("SimplePublisherHome_exec_i::~SimplePublisherHome_exec_i (void)"); } // Supported or inherited operations. @@ -99,7 +99,7 @@ namespace CIAO_Simple_SimplePublisher_Impl ::Components::EnterpriseComponent_ptr SimplePublisherHome_exec_i::create () { - CIAO_TRACE ("SimplePublisherHome_exec_i::create ()"); + DANCE_TRACE ("SimplePublisherHome_exec_i::create ()"); ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); @@ -114,7 +114,7 @@ namespace CIAO_Simple_SimplePublisher_Impl extern "C" SIMPLEPUBLISHER_EXEC_Export ::Components::HomeExecutorBase_ptr create_Simple_SimplePublisherHome_Impl (void) { - CIAO_TRACE ("create_Simple_SimplePublisherHome_Impl (void)"); + DANCE_TRACE ("create_Simple_SimplePublisherHome_Impl (void)"); ::Components::HomeExecutorBase_ptr retval = ::Components::HomeExecutorBase::_nil (); diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp b/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp index 7be0cf905c5..c27e6dc4c48 100644 --- a/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp +++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp @@ -1,7 +1,7 @@ // $Id$ #include "SimpleUser_exec.h" -#include "ciao/Logger/Log_Macros.h" +#include "DAnCE/Logger/Log_Macros.h" namespace CIAO_Simple_SimpleUser_Impl { @@ -11,12 +11,12 @@ namespace CIAO_Simple_SimpleUser_Impl SimpleUser_exec_i::SimpleUser_exec_i (void) { - CIAO_TRACE ("SimpleUser_exec_i::SimpleUser_exec_i (void)"); + DANCE_TRACE ("SimpleUser_exec_i::SimpleUser_exec_i (void)"); } SimpleUser_exec_i::~SimpleUser_exec_i (void) { - CIAO_TRACE ("SimpleUser_exec_i::~SimpleUser_exec_i (void)"); + DANCE_TRACE ("SimpleUser_exec_i::~SimpleUser_exec_i (void)"); } // Supported or inherited operations. @@ -31,7 +31,7 @@ namespace CIAO_Simple_SimpleUser_Impl SimpleUser_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { - CIAO_TRACE ("SimpleUser_exec_i::set_session_context ()"); + DANCE_TRACE ("SimpleUser_exec_i::set_session_context ()"); this->context_ = ::Simple::CCM_SimpleUser_Context::_narrow (ctx); @@ -44,14 +44,14 @@ namespace CIAO_Simple_SimpleUser_Impl void SimpleUser_exec_i::configuration_complete () { - CIAO_TRACE ("SimpleUser_exec_i::configuration_complete ()"); + DANCE_TRACE ("SimpleUser_exec_i::configuration_complete ()"); // Your code here. } void SimpleUser_exec_i::ccm_activate () { - CIAO_TRACE ("SimpleUser_exec_i::ccm_activate ()"); + DANCE_TRACE ("SimpleUser_exec_i::ccm_activate ()"); ::Simple::Trigger_var trig (this->context_->get_connection_trig ()); @@ -83,14 +83,14 @@ namespace CIAO_Simple_SimpleUser_Impl void SimpleUser_exec_i::ccm_passivate () { - CIAO_TRACE ("SimpleUser_exec_i::ccm_passivate ()"); + DANCE_TRACE ("SimpleUser_exec_i::ccm_passivate ()"); // Your code here. } void SimpleUser_exec_i::ccm_remove () { - CIAO_TRACE ("SimpleUser_exec_i::ccm_remove ()"); + DANCE_TRACE ("SimpleUser_exec_i::ccm_remove ()"); // Your code here. } @@ -100,12 +100,12 @@ namespace CIAO_Simple_SimpleUser_Impl SimpleUserHome_exec_i::SimpleUserHome_exec_i (void) { - CIAO_TRACE ("SimpleUserHome_exec_i::SimpleUserHome_exec_i (void)"); + DANCE_TRACE ("SimpleUserHome_exec_i::SimpleUserHome_exec_i (void)"); } SimpleUserHome_exec_i::~SimpleUserHome_exec_i (void) { - CIAO_TRACE ("SimpleUserHome_exec_i::~SimpleUserHome_exec_i (void)"); + DANCE_TRACE ("SimpleUserHome_exec_i::~SimpleUserHome_exec_i (void)"); } // Supported or inherited operations. @@ -121,7 +121,7 @@ namespace CIAO_Simple_SimpleUser_Impl ::Components::EnterpriseComponent_ptr SimpleUserHome_exec_i::create () { - CIAO_TRACE ("SimpleUserHome_exec_i::create ()"); + DANCE_TRACE ("SimpleUserHome_exec_i::create ()"); ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); @@ -136,7 +136,7 @@ namespace CIAO_Simple_SimpleUser_Impl extern "C" SIMPLEUSER_EXEC_Export ::Components::HomeExecutorBase_ptr create_Simple_SimpleUserHome_Impl (void) { - CIAO_TRACE ("create_Simple_SimpleUserHome_Impl (void)"); + DANCE_TRACE ("create_Simple_SimpleUserHome_Impl (void)"); ::Components::HomeExecutorBase_ptr retval = ::Components::HomeExecutorBase::_nil (); diff --git a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc index 0d18fbd856c..b46ae7df956 100644 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc +++ b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc @@ -1,5 +1,5 @@ // $Id$ -project(simple_em_launcher) : ciao_config_handlers, dance_nodemanager_stub, dance_domainapplication_stub, dance_executionmanager_stub, ciao_logger { +project(simple_em_launcher) : ciao_config_handlers, dance_nodemanager_stub, dance_domainapplication_stub, dance_executionmanager_stub, dance_logger { Source_Files { simple_em_launcher.cpp } diff --git a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp index aaa3577dadc..f8de5d05100 100644 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp +++ b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp @@ -8,14 +8,12 @@ #include "ace/OS_NS_unistd.h" #include "tao/ORB.h" -#include "ciao/Logger/Logger_Service.h" -#include "ciao/Logger/Log_Macros.h" #include "DAnCE/Logger/Logger_Service.h" #include "DAnCE/Logger/Log_Macros.h" #include "Deployment/Deployment_DomainApplicationC.h" #include "Deployment/Deployment_ExecutionManagerC.h" #include "Deployment/Deployment_DeploymentPlanC.h" -#include "tools/Config_Handlers/XML_File_Intf.h" +#include "Config_Handlers/XML_File_Intf.h" int usage () { @@ -27,15 +25,15 @@ int usage () int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - CIAO_DISABLE_TRACE (); + DANCE_DISABLE_TRACE (); - auto_ptr<CIAO::Logger_Service> logger; + auto_ptr<DAnCE::Logger_Service> logger; - CIAO::Logger_Service - * dlf = ACE_Dynamic_Service<CIAO::Logger_Service>::instance ("CIAO_Logger_Backend_Factory"); + DAnCE::Logger_Service + * dlf = ACE_Dynamic_Service<DAnCE::Logger_Service>::instance ("DAnCE_Logger_Backend_Factory"); if (!dlf) - dlf = new CIAO::Logger_Service; + dlf = new DAnCE::Logger_Service; logger.reset (dlf); logger->init (argc, argv); diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp index 9d86e3992ad..cf296baafdc 100644 --- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp +++ b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp @@ -12,7 +12,7 @@ #include "Deployment/Deployment_NodeApplicationC.h" #include "Deployment/Deployment_NodeManagerC.h" #include "Deployment/Deployment_DeploymentPlanC.h" -#include "tools/Config_Handlers/XML_File_Intf.h" +#include "Config_Handlers/XML_File_Intf.h" int usage () { diff --git a/CIAO/DAnCE/tests/DeploymentPlanDump/test.cpp b/CIAO/DAnCE/tests/DeploymentPlanDump/test.cpp index c2d86d3678d..b9ad49e70ab 100644 --- a/CIAO/DAnCE/tests/DeploymentPlanDump/test.cpp +++ b/CIAO/DAnCE/tests/DeploymentPlanDump/test.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tools/Config_Handlers/DnC_Dump.h" -#include "tools/Config_Handlers/XML_File_Intf.h" +#include "Config_Handlers/DnC_Dump.h" +#include "Config_Handlers/XML_File_Intf.h" #include "DAnCE/Logger/Log_Macros.h" int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) diff --git a/CIAO/DAnCE/tests/DeploymentPlanTestReferences/test.cpp b/CIAO/DAnCE/tests/DeploymentPlanTestReferences/test.cpp index 556b82ed9f7..30f6164408c 100644 --- a/CIAO/DAnCE/tests/DeploymentPlanTestReferences/test.cpp +++ b/CIAO/DAnCE/tests/DeploymentPlanTestReferences/test.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/Auto_Ptr.h" -#include "tools/Config_Handlers/DnC_Dump.h" -#include "tools/Config_Handlers/XML_File_Intf.h" +#include "Config_Handlers/DnC_Dump.h" +#include "Config_Handlers/XML_File_Intf.h" #include "DAnCE/Logger/Log_Macros.h" int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) diff --git a/CIAO/DAnCE/tests/DeploymentTest1/test.cpp b/CIAO/DAnCE/tests/DeploymentTest1/test.cpp index 820f42c8982..63dc5b80f8e 100644 --- a/CIAO/DAnCE/tests/DeploymentTest1/test.cpp +++ b/CIAO/DAnCE/tests/DeploymentTest1/test.cpp @@ -7,8 +7,8 @@ #include "DAnCE/Deployment/Deployment_NodeManagerC.h" #include "DAnCE/Deployment/Deployment_NodeApplicationManagerC.h" #include "DAnCE/Logger/Log_Macros.h" -#include "tools/Config_Handlers/DnC_Dump.h" -#include "tools/Config_Handlers/XML_File_Intf.h" +#include "Config_Handlers/DnC_Dump.h" +#include "Config_Handlers/XML_File_Intf.h" int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { diff --git a/CIAO/ciao/Logger/File_Logger_Backend.h b/CIAO/ciao/Logger/File_Logger_Backend.h index 7f11d070ecc..0ca07b67bac 100644 --- a/CIAO/ciao/Logger/File_Logger_Backend.h +++ b/CIAO/ciao/Logger/File_Logger_Backend.h @@ -4,7 +4,6 @@ #include "ace/Log_Msg_Backend.h" #include "ace/SString.h" -//#include "ace/String_Base.h" #include "CIAO_Logger_Export.h" |