diff options
Diffstat (limited to 'TAO/CIAO/tools/Config_Handlers/Package_Handlers')
13 files changed, 284 insertions, 249 deletions
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp index d9756f3c07f..ec3bb20e539 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp @@ -21,7 +21,7 @@ namespace CIAO { struct SPE_Handler { - static void get_spe (const SubcomponentPortEndpoint &desc, + static void handle_spe (const SubcomponentPortEndpoint &desc, ::Deployment::SubcomponentPortEndpoint &toconfig) { CIAO_TRACE("SPE_Handler::get_spe"); @@ -50,11 +50,11 @@ namespace CIAO typedef Sequence_Handler < SubcomponentPortEndpoint, ::Deployment::SubcomponentPortEndpoints, ::Deployment::SubcomponentPortEndpoint, - SPE_Handler::get_spe > SPE_Functor; + SPE_Handler::handle_spe > SPE_Functor; struct ACD_Handler { - static void get_acd (const AssemblyConnectionDescription &desc, + static void handle_acd (const AssemblyConnectionDescription &desc, ::Deployment::AssemblyConnectionDescription &toconfig) { CIAO_TRACE("ACD_Handler::get_acd"); @@ -67,6 +67,9 @@ namespace CIAO Requirement_Functor (toconfig.deployRequirement)); toconfig.internalEndpoint.length (desc.count_internalEndpoint ()); + SEQ_HAND_GCC_BUG_WORKAROUND (SPE_Handler::handle_spe, + desc.begin_internalEndpoint (), + toconfig.internalEndpoint); std::for_each (desc.begin_internalEndpoint (), desc.end_internalEndpoint (), SPE_Functor (toconfig.internalEndpoint)); @@ -113,12 +116,12 @@ namespace CIAO typedef Sequence_Handler < AssemblyConnectionDescription, ::Deployment::AssemblyConnectionDescriptions, ::Deployment::AssemblyConnectionDescription, - ACD_Handler::get_acd > ACD_Functor; + ACD_Handler::handle_acd > ACD_Functor; struct SPR_Handler { - static void get_spr (const SubcomponentPropertyReference &desc, + static void handle_spr (const SubcomponentPropertyReference &desc, ::Deployment::SubcomponentPropertyReference &toconfig) { CIAO_TRACE("SPR_Handler::get_spr"); @@ -149,11 +152,11 @@ namespace CIAO typedef Sequence_Handler < SubcomponentPropertyReference, ::Deployment::SubcomponentPropertyReferences, ::Deployment::SubcomponentPropertyReference, - SPR_Handler::get_spr > SPR_Functor; + SPR_Handler::handle_spr > SPR_Functor; struct APM_Handler { - static void get_apm (const AssemblyPropertyMapping &desc, + static void handle_apm (const AssemblyPropertyMapping &desc, ::Deployment::AssemblyPropertyMapping &toconfig) { CIAO_TRACE("APM_Handler::get_apm"); @@ -162,6 +165,9 @@ namespace CIAO toconfig.externalName = desc.externalName ().c_str (); toconfig.delegatesTo.length (desc.count_delegatesTo ()); + SEQ_HAND_GCC_BUG_WORKAROUND (SPR_Handler::handle_spr, + desc.begin_delegatesTo (), + toconfig.delegatesTo); std::for_each (desc.begin_delegatesTo (), desc.end_delegatesTo (), SPR_Functor (toconfig.delegatesTo)); @@ -185,7 +191,7 @@ namespace CIAO typedef Sequence_Handler < AssemblyPropertyMapping, ::Deployment::AssemblyPropertyMappings, ::Deployment::AssemblyPropertyMapping, - APM_Handler::get_apm > APM_Functor; + APM_Handler::handle_apm > APM_Functor; } @@ -204,11 +210,17 @@ namespace CIAO /* @@ MAJO: Implement Locality */ toconfig.connection.length (desc.count_connection ()); + SEQ_HAND_GCC_BUG_WORKAROUND (ACD_Handler::handle_acd, + desc.begin_connection (), + toconfig.connection); std::for_each (desc.begin_connection (), desc.end_connection (), ACD_Functor (toconfig.connection)); toconfig.externalProperty.length (desc.count_externalProperty ()); + SEQ_HAND_GCC_BUG_WORKAROUND (APM_Handler::handle_apm, + desc.begin_externalProperty (), + toconfig.externalProperty); std::for_each (desc.begin_externalProperty (), desc.end_externalProperty (), APM_Functor (toconfig.externalProperty)); diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp index 782027a38fb..d5e39d485da 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp @@ -27,218 +27,222 @@ namespace CIAO IDREF_Base<CORBA::ULong> CID_Handler::IDREF; - namespace + struct Capability_Handler { - struct Capability_Handler - { - static void get_capability (const Capability &desc, - ::Deployment::Capability &toconfig) - { - CIAO_TRACE ("Capability_Handler::get_capability"); - - toconfig.name = desc.name ().c_str (); - - toconfig.resourceType.length (desc.count_resourceType ()); - std::for_each (desc.begin_resourceType (), - desc.end_resourceType (), - String_Seq_Functor (toconfig.resourceType)); - - toconfig.property.length (desc.count_property ()); - std::for_each (desc.begin_property (), - desc.end_property (), - SatisfierProperty_Functor (toconfig.property)); - } - - static Capability get_capability (const ::Deployment::Capability &src) - { - CIAO_TRACE ("Capability_Handler::get_capability - reverse"); - - Capability retval (src.name.in ()); - - for (CORBA::ULong i = 0; i < src.resourceType.length (); ++i) - retval.add_resourceType (src.resourceType[i]); - - for (CORBA::ULong i = 0; i < src.property.length (); ++i) - retval.add_property (SatisfierProperty_Handler::get_sat_property (src.property[i])); - - return retval; - } - }; - - typedef Sequence_Handler < Capability, - ::Deployment::Capabilities, - ::Deployment::Capability, - Capability_Handler::get_capability > Capability_Functor; - - struct IR_Handler - { - static void get_ir (const ImplementationRequirement &desc, - ::Deployment::ImplementationRequirement &toconfig) - { - CIAO_TRACE ("IR_Handler::get_ir"); - - if (desc.resourceUsage_p ()) - { - switch (desc.resourceUsage ().integral ()) - { - case ResourceUsageKind::None_l: - toconfig.resourceUsage = Deployment::None; - break; - - case ResourceUsageKind::InstanceUsesResource_l: - toconfig.resourceUsage = Deployment::InstanceUsesResource; - break; - - case ResourceUsageKind::ResourceUsesInstance_l: - toconfig.resourceUsage = Deployment::ResourceUsesInstance; - break; - - case ResourceUsageKind::PortUsesResource_l: - toconfig.resourceUsage = Deployment::PortUsesResource; - break; - - case ResourceUsageKind::ResourceUsesPort_l: - toconfig.resourceUsage = Deployment::ResourceUsesPort; - break; - - default: - throw Config_Error (desc.name (), - "Unknown ResourceUsageKind."); - break; - } - } - - if (desc.resourcePort_p ()) - toconfig.resourcePort = desc.resourcePort ().c_str (); - - if (desc.componentPort_p ()) - toconfig.componentPort = desc.componentPort ().c_str (); - - toconfig.resourceType = desc.resourceType ().c_str (); - toconfig.name = desc.name ().c_str (); - - std::for_each (desc.begin_property (), - desc.end_property (), - Property_Functor (toconfig.property )); - } - - static ImplementationRequirement - get_ir (const ::Deployment::ImplementationRequirement &src) - { - CIAO_TRACE ("IR_Handler::get_ir - reverse"); - - ImplementationRequirement retval (src.resourceType.in (), - src.name.in ()); - - if (src.resourceUsage.length () == 1) - switch (src.resourceUsage[0]) - { - case Deployment::None: - retval.resourceUsage (ResourceUsageKind::None); - break; + static void handle_capability (const Capability &desc, + ::Deployment::Capability &toconfig) + { + CIAO_TRACE ("Capability_Handler::get_capability"); - case Deployment::InstanceUsesResource: - retval.resourceUsage (ResourceUsageKind::InstanceUsesResource); - break; + toconfig.name = desc.name ().c_str (); - case Deployment::ResourceUsesInstance: - retval.resourceUsage (ResourceUsageKind::ResourceUsesInstance); - break; + toconfig.resourceType.length (desc.count_resourceType ()); + std::for_each (desc.begin_resourceType (), + desc.end_resourceType (), + String_Seq_Functor (toconfig.resourceType)); - case Deployment::PortUsesResource: - retval.resourceUsage (ResourceUsageKind::PortUsesResource); - break; + toconfig.property.length (desc.count_property ()); + std::for_each (desc.begin_property (), + desc.end_property (), + SatisfierProperty_Functor (toconfig.property)); + } - case Deployment::ResourceUsesPort: - retval.resourceUsage (ResourceUsageKind::ResourceUsesPort); - break; + static Capability get_capability (const ::Deployment::Capability &src) + { + CIAO_TRACE ("Capability_Handler::get_capability - reverse"); - default: - throw Config_Error (src.name.in (), - "Unknown ResourceUsageKind."); - break; - } + Capability retval (src.name.in ()); - retval.resourcePort (src.resourcePort.in ()); + for (CORBA::ULong i = 0; i < src.resourceType.length (); ++i) + retval.add_resourceType (src.resourceType[i]); - retval.componentPort (src.componentPort.in ()); + for (CORBA::ULong i = 0; i < src.property.length (); ++i) + retval.add_property (SatisfierProperty_Handler::get_sat_property (src.property[i])); - for (CORBA::ULong i = 0; i < src.property.length (); ++i) - retval.add_property (Property_Handler::get_property (src.property[i])); + return retval; + } + }; - return retval; - } - }; - - typedef Sequence_Handler < ImplementationRequirement, - ::Deployment::ImplementationRequirements, - ::Deployment::ImplementationRequirement, - IR_Handler::get_ir > IR_Functor; - - - - struct MID_Handler - { - static void get_mid (const MonolithicImplementationDescription &desc, - ::Deployment::MonolithicImplementationDescription &toconfig) - { - CIAO_TRACE ("MID_Handler::get_mid"); - - toconfig.nodeExecParameter.length (desc.count_nodeExecParameter ()); - std::for_each (desc.begin_nodeExecParameter (), - desc.end_nodeExecParameter (), - Property_Functor (toconfig.nodeExecParameter)); - - toconfig.componentExecParameter.length (desc.count_componentExecParameter ()); - std::for_each (desc.begin_componentExecParameter (), - desc.end_componentExecParameter (), - Property_Functor (toconfig.componentExecParameter)); - - toconfig.deployRequirement.length (desc.count_deployRequirement ()); - std::for_each (desc.begin_deployRequirement (), - desc.end_deployRequirement (), - IR_Functor (toconfig.deployRequirement)); - - toconfig.primaryArtifact.length (desc.count_primaryArtifact ()); - std::for_each (desc.begin_primaryArtifact (), - desc.end_primaryArtifact (), - NIA_Functor (toconfig.primaryArtifact)); - } - - static MonolithicImplementationDescription - get_mid (const ::Deployment::MonolithicImplementationDescription &src) - { - CIAO_TRACE ("MID_Handler::get_mid - reverse"); - - MonolithicImplementationDescription retval; + typedef Sequence_Handler < Capability, + ::Deployment::Capabilities, + ::Deployment::Capability, + Capability_Handler::handle_capability > Capability_Functor; - for (CORBA::ULong i = 0; i < src.nodeExecParameter.length (); ++i) - retval.add_nodeExecParameter - (Property_Handler::get_property (src.nodeExecParameter[i])); - - for (CORBA::ULong i = 0; i < src.componentExecParameter.length (); ++i) - retval.add_componentExecParameter - (Property_Handler::get_property (src.componentExecParameter[i])); - - for (CORBA::ULong i = 0; i < src.deployRequirement.length (); ++i) - retval.add_deployRequirement - (IR_Handler::get_ir (src.deployRequirement[i])); - - for (CORBA::ULong i = 0; i < src.primaryArtifact.length (); ++i) - retval.add_primaryArtifact - (NIA_Handler::get_nia (src.primaryArtifact[i])); - - return retval; - } - - }; - - typedef Sequence_Handler < MonolithicImplementationDescription, - ::Deployment::MonolithicImplementationDescriptions, - ::Deployment::MonolithicImplementationDescription, - MID_Handler::get_mid > MID_Functor; - - } + struct IR_Handler + { + static void handle_ir (const ImplementationRequirement &desc, + ::Deployment::ImplementationRequirement &toconfig) + { + CIAO_TRACE ("IR_Handler::get_ir"); + + if (desc.resourceUsage_p ()) + { + switch (desc.resourceUsage ().integral ()) + { + case ResourceUsageKind::None_l: + toconfig.resourceUsage = Deployment::None; + break; + + case ResourceUsageKind::InstanceUsesResource_l: + toconfig.resourceUsage = Deployment::InstanceUsesResource; + break; + + case ResourceUsageKind::ResourceUsesInstance_l: + toconfig.resourceUsage = Deployment::ResourceUsesInstance; + break; + + case ResourceUsageKind::PortUsesResource_l: + toconfig.resourceUsage = Deployment::PortUsesResource; + break; + + case ResourceUsageKind::ResourceUsesPort_l: + toconfig.resourceUsage = Deployment::ResourceUsesPort; + break; + + default: + throw Config_Error (desc.name (), + "Unknown ResourceUsageKind."); + break; + } + } + + if (desc.resourcePort_p ()) + toconfig.resourcePort = desc.resourcePort ().c_str (); + + if (desc.componentPort_p ()) + toconfig.componentPort = desc.componentPort ().c_str (); + + toconfig.resourceType = desc.resourceType ().c_str (); + toconfig.name = desc.name ().c_str (); + + std::for_each (desc.begin_property (), + desc.end_property (), + Property_Functor (toconfig.property )); + } + + static ImplementationRequirement + get_ir (const ::Deployment::ImplementationRequirement &src) + { + CIAO_TRACE ("IR_Handler::get_ir - reverse"); + + ImplementationRequirement retval (src.resourceType.in (), + src.name.in ()); + + if (src.resourceUsage.length () == 1) + switch (src.resourceUsage[0]) + { + case Deployment::None: + retval.resourceUsage (ResourceUsageKind::None); + break; + + case Deployment::InstanceUsesResource: + retval.resourceUsage (ResourceUsageKind::InstanceUsesResource); + break; + + case Deployment::ResourceUsesInstance: + retval.resourceUsage (ResourceUsageKind::ResourceUsesInstance); + break; + + case Deployment::PortUsesResource: + retval.resourceUsage (ResourceUsageKind::PortUsesResource); + break; + + case Deployment::ResourceUsesPort: + retval.resourceUsage (ResourceUsageKind::ResourceUsesPort); + break; + + default: + throw Config_Error (src.name.in (), + "Unknown ResourceUsageKind."); + break; + } + + retval.resourcePort (src.resourcePort.in ()); + + retval.componentPort (src.componentPort.in ()); + + for (CORBA::ULong i = 0; i < src.property.length (); ++i) + retval.add_property (Property_Handler::get_property (src.property[i])); + + return retval; + } + }; + + typedef Sequence_Handler < ImplementationRequirement, + ::Deployment::ImplementationRequirements, + ::Deployment::ImplementationRequirement, + IR_Handler::handle_ir > IR_Functor; + + struct MID_Handler + { + static void handle_mid (const MonolithicImplementationDescription &desc, + ::Deployment::MonolithicImplementationDescription &toconfig) + { + CIAO_TRACE ("MID_Handler::get_mid"); + + toconfig.nodeExecParameter.length (desc.count_nodeExecParameter ()); + std::for_each (desc.begin_nodeExecParameter (), + desc.end_nodeExecParameter (), + Property_Functor (toconfig.nodeExecParameter)); + + toconfig.componentExecParameter.length (desc.count_componentExecParameter ()); + std::for_each (desc.begin_componentExecParameter (), + desc.end_componentExecParameter (), + Property_Functor (toconfig.componentExecParameter)); + + toconfig.deployRequirement.length (desc.count_deployRequirement ()); + while (0) + { + IR_Handler::handle_ir (*desc.begin_deployRequirement (), + toconfig.deployRequirement[0]); + } + std::for_each (desc.begin_deployRequirement (), + desc.end_deployRequirement (), + IR_Functor (toconfig.deployRequirement)); + + toconfig.primaryArtifact.length (desc.count_primaryArtifact ()); + SEQ_HAND_GCC_BUG_WORKAROUND (NIA_Handler::handle_nia, + desc.begin_primaryArtifact (), + toconfig.primaryArtifact); + std::for_each (desc.begin_primaryArtifact (), + desc.end_primaryArtifact (), + NIA_Functor (toconfig.primaryArtifact)); + } + + static MonolithicImplementationDescription + get_mid (const ::Deployment::MonolithicImplementationDescription &src) + { + CIAO_TRACE ("MID_Handler::get_mid - reverse"); + + MonolithicImplementationDescription retval; + + for (CORBA::ULong i = 0; i < src.nodeExecParameter.length (); ++i) + retval.add_nodeExecParameter + (Property_Handler::get_property (src.nodeExecParameter[i])); + + for (CORBA::ULong i = 0; i < src.componentExecParameter.length (); ++i) + retval.add_componentExecParameter + (Property_Handler::get_property (src.componentExecParameter[i])); + + for (CORBA::ULong i = 0; i < src.deployRequirement.length (); ++i) + retval.add_deployRequirement + (IR_Handler::get_ir (src.deployRequirement[i])); + + for (CORBA::ULong i = 0; i < src.primaryArtifact.length (); ++i) + retval.add_primaryArtifact + (NIA_Handler::get_nia (src.primaryArtifact[i])); + + return retval; + } + + }; + + typedef Sequence_Handler < MonolithicImplementationDescription, + ::Deployment::MonolithicImplementationDescriptions, + ::Deployment::MonolithicImplementationDescription, + MID_Handler::handle_mid > MID_Functor; + + void CID_Handler::component_impl_descr ( @@ -279,8 +283,8 @@ namespace CIAO else if (cid->monolithicImpl_p ()) { toconfig.monolithicImpl.length (1); - MID_Handler::get_mid (cid->monolithicImpl (), - toconfig.monolithicImpl[0]); + MID_Handler::handle_mid (cid->monolithicImpl (), + toconfig.monolithicImpl[0]); } else throw Plan_Error ("ComponentImplementationDescription must have either assemblyImpl or monolithicImpl"); @@ -293,6 +297,9 @@ namespace CIAO // capability toconfig.capability.length (cid->count_capability ()); + SEQ_HAND_GCC_BUG_WORKAROUND (Capability_Handler::handle_capability, + cid->begin_capability (), + toconfig.capability); std::for_each (cid->begin_capability (), cid->end_capability (), Capability_Functor (toconfig.capability)); diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp index dc3976ce698..f7c37953b97 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp @@ -19,7 +19,7 @@ namespace CIAO { struct PCI_Handler { - static void get_pci (const PackagedComponentImplementation &desc, + static void handle_pci (const PackagedComponentImplementation &desc, ::Deployment::PackagedComponentImplementation &toconfig) { CIAO_TRACE ("PCI_Handler::get_pci"); @@ -41,11 +41,11 @@ namespace CIAO typedef Sequence_Handler < PackagedComponentImplementation, ::Deployment::PackagedComponentImplementations, ::Deployment::PackagedComponentImplementation, - PCI_Handler::get_pci > PCI_Functor; + PCI_Handler::handle_pci > PCI_Functor; } void - CPD_Handler::component_package_descr (const ComponentPackageDescription &desc, + CPD_Handler::handle_component_package_descr (const ComponentPackageDescription &desc, ::Deployment::ComponentPackageDescription &toconfig) { CIAO_TRACE ("CPD_Handler::component_package_descr"); @@ -83,6 +83,9 @@ namespace CIAO // Packaged Component Implementations toconfig.implementation.length ( cpd->count_implementation ()); + SEQ_HAND_GCC_BUG_WORKAROUND (PCI_Handler::handle_pci, + cpd->begin_implementation (), + toconfig.implementation); std::for_each (cpd->begin_implementation (), cpd->end_implementation (), PCI_Functor (toconfig.implementation)); @@ -136,7 +139,7 @@ namespace CIAO { CIAO_TRACE ("CPD_Handler::resolve_cpd"); if (!XML_HELPER->is_initialized ()) - return false; + return 0; xercesc::DOMDocument* dom = XML_HELPER->create_dom (uri); diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h index 92b05187fa8..9535d24eef2 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h @@ -1,6 +1,6 @@ //================================================ /** - * @file STD_CPD_Handler.h + * @file CPD_Handler.h * * $Id$ * @@ -50,11 +50,11 @@ namespace CIAO /// Maps the values from the XSC object /// <ComponentPackageDescription> to the CORBA IDL type /// <Deployment::ComponentPackageDescription>. - static void component_package_descr (const ComponentPackageDescription &desc, + static void handle_component_package_descr (const ComponentPackageDescription &desc, ::Deployment::ComponentPackageDescription &toconfig); static ComponentPackageDescription - component_package_descr (const Deployment::ComponentPackageDescription& src); + component_package_descr (const Deployment::ComponentPackageDescription& src); private: static ComponentPackageDescription * resolve_cpd (const char *uri); @@ -63,7 +63,7 @@ namespace CIAO typedef Sequence_Handler < ComponentPackageDescription, ::Deployment::ComponentPackageDescriptions, ::Deployment::ComponentPackageDescription, - CPD_Handler::component_package_descr > CPD_Functor; + CPD_Handler::handle_component_package_descr > CPD_Functor; } diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp index ea487980046..801519dc987 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp @@ -16,11 +16,9 @@ namespace CIAO { namespace Packaging { - namespace - { struct Comp_Prop_Handler { - static void get_cpd (const ComponentPropertyDescription &desc, + static void handle_cpd (const ComponentPropertyDescription &desc, ::Deployment::ComponentPropertyDescription &toconfig) { CIAO_TRACE ("Comp_Prop_Handler::get_cpd"); @@ -44,8 +42,8 @@ namespace CIAO typedef Sequence_Handler < ComponentPropertyDescription, ::Deployment::ComponentPropertyDescriptions, ::Deployment::ComponentPropertyDescription, - Comp_Prop_Handler::get_cpd > Comp_Prop_Functor; - } + Comp_Prop_Handler::handle_cpd > Comp_Prop_Functor; + void Comp_Intf_Descr_Handler::comp_intf_descr ( @@ -96,6 +94,9 @@ namespace CIAO CIAO::Config_Handlers::CPD_Functor (toconfig.port)); toconfig.property.length (cid->count_property ()); + SEQ_HAND_GCC_BUG_WORKAROUND (Comp_Prop_Handler::handle_cpd, + cid->begin_property (), + toconfig.property); std::for_each (cid->begin_property (), cid->end_property (), Comp_Prop_Functor (toconfig.property)); diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp index f77a5f092f1..c0010429df6 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp @@ -49,6 +49,9 @@ namespace CIAO String_Seq_Functor (toconfig.location)); toconfig.dependsOn.length (iad->count_dependsOn ()); + SEQ_HAND_GCC_BUG_WORKAROUND (NIA_Handler::handle_nia, + desc.begin_dependsOn (), + toconfig.dependsOn); std::for_each (iad->begin_dependsOn (), iad->end_dependsOn (), NIA_Functor (toconfig.dependsOn)); diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h index 6ad2767104b..edc5fe7fa6c 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h @@ -34,7 +34,7 @@ namespace CIAO class Packaging_Handlers_Export NIA_Handler { public: - static void get_nia (const NamedImplementationArtifact &desc, + static void handle_nia (const NamedImplementationArtifact &desc, ::Deployment::NamedImplementationArtifact &toconfig) { toconfig.name = desc.name ().c_str (); @@ -55,10 +55,11 @@ namespace CIAO typedef Sequence_Handler < NamedImplementationArtifact, ::Deployment::NamedImplementationArtifacts, ::Deployment::NamedImplementationArtifact, - NIA_Handler::get_nia > NIA_Functor; + NIA_Handler::handle_nia > NIA_Functor; } } } +#include /**/ "ace/post.h" #endif /* CIAO_PACKAGING_NIA_HANDLER_H */ diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp index 922c1fac252..675060fd082 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp @@ -1,19 +1,19 @@ // $Id$ #include "tao/AnyTypeCode/AnyTypeCode_methods.h" +#include "ciao/CIAO_common.h" +#include "ciao/Packaging_DataC.h" +#include "Utils/XML_Helper.h" +#include "Utils/XercesString.h" +#include "Utils/Exceptions.h" #include "Package_Handlers/PCD_Handler.h" #include "Package_Handlers/CPD_Handler.h" -#include "Basic_Deployment_Data.hpp" -#include "ciao/Packaging_DataC.h" #include "Deployment.hpp" #include "Property_Handler.h" #include "Req_Handler.h" -#include "Utils/XercesString.h" -#include "Utils/Exceptions.h" -#include <memory> -#include "ciao/CIAO_common.h" +#include "Basic_Deployment_Data.hpp" -#include <xercesc/util/XMLString.hpp> +#include <memory> namespace CIAO { @@ -25,13 +25,20 @@ namespace CIAO PCD_Handler::package_config (const ACE_TCHAR *uri, ::Deployment::PackageConfiguration &toconfig) { - xercesc::DOMDocument *dom = XML_HELPER->create_dom (uri); + const xercesc::DOMDocument *dom = XML_HELPER->create_dom (uri); + + if (dom == 0) + { + std::string error ("Unable to open file: "); + error += uri; + throw Parse_Error (error); + } - XStr root = dom->getDocumentElement ()->getTagName (); + XStr root = dom->getDocumentElement ()->getTagName (); if (root == XStr ("Deployment:topLevelPackageDescription")) { - TopLevelPackageDescription tpd (topLevelPackageDescription (dom)); + TopLevelPackageDescription tpd = topLevelPackageDescription (dom); PCD_Handler::package_config (tpd.package (), toconfig); } @@ -83,8 +90,8 @@ namespace CIAO if (pcd->basePackage_p ()) { toconfig.basePackage.length (1); - CPD_Handler::component_package_descr (pcd->basePackage (), - toconfig.basePackage [0]); + CPD_Handler::handle_component_package_descr (pcd->basePackage (), + toconfig.basePackage [0]); } // @@ MAJO: Support other elements present here. diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp index 334245559fa..e265295d040 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp @@ -1,11 +1,5 @@ // $Id$ -#if defined (_MSC_VER) && (_MSC_VER < 1300) -#pragma warning (disable: 4018) -#pragma warning (disable: 4284) -#pragma warning (disable: 4146) -#endif - #include "STD_PC_Intf.h" #include "Utils/XML_Helper.h" #include "Deployment.hpp" diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h index d280fb5c655..c15ae0389b9 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h @@ -1,6 +1,6 @@ //============================================================== /** - * @file STD_PC_Intf.h + * @file PC_Intf.h * * $Id$ * diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc index fce4f459738..e73d5790a70 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc @@ -29,6 +29,10 @@ project (Package_Config_Handlers) : acelib, ciao_deployment_stub, xerces { PCD_Handler.h SID_Handler.h } + + verbatim(gnuace, macros) { + override no_hidden_visibility = 1 + } } project (Package_Config_Handlers_Tests) : ciao_component_dnc, ciao_config_handlers, ifr_client { @@ -40,6 +44,9 @@ project (Package_Config_Handlers_Tests) : ciao_component_dnc, ciao_config_handle Source_Files { test.cpp } + verbatim(gnuace, macros) { + override no_hidden_visibility = 1 + } } diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp index 4cca9747789..34eadf9ea32 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp @@ -19,7 +19,7 @@ namespace CIAO IDREF_Base<CORBA::ULong> SID_Handler::IDREF; void - SID_Handler::sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc, + SID_Handler::handle_sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc, ::Deployment::SubcomponentInstantiationDescription &toconfig) { CIAO_TRACE ("SID_Handler::sub_comp_inst_descr"); @@ -28,7 +28,7 @@ namespace CIAO if (desc.basePackage_p ()) { toconfig.basePackage.length (1); - CPD_Handler::component_package_descr (desc.basePackage (), + CPD_Handler::handle_component_package_descr (desc.basePackage (), toconfig.basePackage[0]); } else if (desc.specializedConfig_p ()) diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h index c166fcd6294..1bcb73e751e 100644 --- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h +++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h @@ -43,7 +43,7 @@ namespace CIAO } public: - static void sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc, + static void handle_sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc, ::Deployment::SubcomponentInstantiationDescription &toconfig); static SubcomponentInstantiationDescription @@ -61,7 +61,7 @@ namespace CIAO typedef Sequence_Handler < SubcomponentInstantiationDescription, ::Deployment::SubcomponentInstantiationDescriptions, ::Deployment::SubcomponentInstantiationDescription, - SID_Handler::sub_comp_inst_descr > SID_Functor; + SID_Handler::handle_sub_comp_inst_descr > SID_Functor; } } |