diff options
Diffstat (limited to 'CIAO/tools/Config_Handlers/Package_Handlers')
14 files changed, 483 insertions, 479 deletions
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp index cf21caf31f9..0654822b79f 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp +++ b/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp @@ -19,180 +19,182 @@ namespace CIAO { struct Packaging_Handlers_Export SPE_Handler { - static void handle_spe ( - const SubcomponentPortEndpoint &desc, - ::Deployment::SubcomponentPortEndpoint &toconfig) - { - CIAO_TRACE("SPE_Handler::get_spe"); - - toconfig.portName = ACE_TEXT_ALWAYS_CHAR (desc.portName ().c_str ()); - - ACE_CString str (ACE_TEXT_ALWAYS_CHAR (desc.instance ().id ().c_str ())); - CORBA::ULong pos (0); - - SID_Handler::IDREF.find_ref (str, pos); - toconfig.instanceRef = pos; - } - - static SubcomponentPortEndpoint get_spe - (const ::Deployment::SubcomponentPortEndpoint &src) - { - CIAO_TRACE("SPE_Handler::get_spe - reverse"); - ACE_CString str; - SID_Handler::IDREF.find_ref (src.instanceRef, str); - - return SubcomponentPortEndpoint (ACE_TEXT_CHAR_TO_TCHAR (src.portName.in ()), - ACE_TEXT_CHAR_TO_TCHAR (str.c_str ())); - } + static void handle_spe (const SubcomponentPortEndpoint &desc, + ::Deployment::SubcomponentPortEndpoint &toconfig) + { + CIAO_TRACE("SPE_Handler::get_spe"); + + toconfig.portName = desc.portName ().c_str (); + + ACE_CString str (desc.instance ().idref ().id ().c_str ()); + CORBA::ULong pos (0); + + SID_Handler::IDREF.find_ref (str, pos); + toconfig.instanceRef = pos; + } + + static SubcomponentPortEndpoint + get_spe (const ::Deployment::SubcomponentPortEndpoint &src) + { + CIAO_TRACE("SPE_Handler::get_spe - reverse"); + ACE_CString str; + SID_Handler::IDREF.find_ref (src.instanceRef, str); + + IdRef xid; + xid.idref (str.c_str ()); + + return SubcomponentPortEndpoint (src.portName.in (), + xid); + } }; typedef Sequence_Handler < SubcomponentPortEndpoint, - ::Deployment::SubcomponentPortEndpoints, - ::Deployment::SubcomponentPortEndpoint, - SPE_Handler::handle_spe > SPE_Functor; + ::Deployment::SubcomponentPortEndpoints, + ::Deployment::SubcomponentPortEndpoint, + SPE_Handler::handle_spe > SPE_Functor; struct Packaging_Handlers_Export ACD_Handler { - static void handle_acd (const AssemblyConnectionDescription &desc, - ::Deployment::AssemblyConnectionDescription &toconfig) - { - CIAO_TRACE("ACD_Handler::get_acd"); - - toconfig.name = ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ()); - - toconfig.deployRequirement.length (desc.count_deployRequirement ()); - std::for_each (desc.begin_deployRequirement (), - desc.end_deployRequirement (), - 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)); - - toconfig.externalEndpoint.length (desc.count_externalEndpoint ()); - std::for_each (desc.begin_externalEndpoint (), - desc.end_externalEndpoint (), - CEPE_Functor (toconfig.externalEndpoint)); - - toconfig.externalReference.length (desc.count_externalReference ()); - std::for_each (desc.begin_externalReference (), - desc.end_externalReference (), - ERE_Functor (toconfig.externalReference)); - } - - static AssemblyConnectionDescription - get_acd (const ::Deployment::AssemblyConnectionDescription &src) - { - CIAO_TRACE("ACD_Handler::get_acd - reverse"); - - AssemblyConnectionDescription retval (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ())); - - for (CORBA::ULong i = 0; i < src.deployRequirement.length (); ++i) - retval.add_deployRequirement - (Req_Handler::get_requirement (src.deployRequirement[i])); - - for (CORBA::ULong i = 0; i < src.internalEndpoint.length (); ++i) - retval.add_internalEndpoint - (SPE_Handler::get_spe (src.internalEndpoint[i])); - - for (CORBA::ULong i = 0; i < src.externalEndpoint.length (); ++i) - retval.add_externalEndpoint - (CEPE_Handler::external_port_endpoint (src.externalEndpoint[i])); - - for (CORBA::ULong i = 0; i < src.externalReference.length (); ++i) - retval.add_externalReference - (ERE_Handler::external_ref_endpoint (src.externalReference[i])); - - return retval; - } + static void handle_acd (const AssemblyConnectionDescription &desc, + ::Deployment::AssemblyConnectionDescription &toconfig) + { + CIAO_TRACE("ACD_Handler::get_acd"); + + toconfig.name = desc.name ().c_str (); + + toconfig.deployRequirement.length (desc.count_deployRequirement ()); + std::for_each (desc.begin_deployRequirement (), + desc.end_deployRequirement (), + 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)); + + toconfig.externalEndpoint.length (desc.count_externalEndpoint ()); + std::for_each (desc.begin_externalEndpoint (), + desc.end_externalEndpoint (), + CEPE_Functor (toconfig.externalEndpoint)); + + toconfig.externalReference.length (desc.count_externalReference ()); + std::for_each (desc.begin_externalReference (), + desc.end_externalReference (), + ERE_Functor (toconfig.externalReference)); + + } + + static AssemblyConnectionDescription + get_acd (const ::Deployment::AssemblyConnectionDescription &src) + { + CIAO_TRACE("ACD_Handler::get_acd - reverse"); + + AssemblyConnectionDescription retval (src.name.in ()); + + for (CORBA::ULong i = 0; i < src.deployRequirement.length (); ++i) + retval.add_deployRequirement + (Req_Handler::get_requirement (src.deployRequirement[i])); + + for (CORBA::ULong i = 0; i < src.internalEndpoint.length (); ++i) + retval.add_internalEndpoint + (SPE_Handler::get_spe (src.internalEndpoint[i])); + + for (CORBA::ULong i = 0; i < src.externalEndpoint.length (); ++i) + retval.add_externalEndpoint + (CEPE_Handler::external_port_endpoint (src.externalEndpoint[i])); + + for (CORBA::ULong i = 0; i < src.externalReference.length (); ++i) + retval.add_externalReference + (ERE_Handler::external_ref_endpoint (src.externalReference[i])); + + return retval; + } }; - typedef Sequence_Handler < - AssemblyConnectionDescription, - ::Deployment::AssemblyConnectionDescriptions, - ::Deployment::AssemblyConnectionDescription, - ACD_Handler::handle_acd > ACD_Functor; + typedef Sequence_Handler < AssemblyConnectionDescription, + ::Deployment::AssemblyConnectionDescriptions, + ::Deployment::AssemblyConnectionDescription, + ACD_Handler::handle_acd > ACD_Functor; struct Packaging_Handlers_Export SPR_Handler { - static void handle_spr ( - const SubcomponentPropertyReference &desc, - ::Deployment::SubcomponentPropertyReference &toconfig) - { - CIAO_TRACE("SPR_Handler::get_spr"); - - toconfig.propertyName = ACE_TEXT_ALWAYS_CHAR (desc.propertyName ().c_str ()); - - ACE_CString str (ACE_TEXT_ALWAYS_CHAR (desc.instance ().id ().c_str ())); - CORBA::ULong pos (0); - - SID_Handler::IDREF.find_ref (str, pos); - toconfig.instanceRef = pos; - } - - static SubcomponentPropertyReference - get_spr (const ::Deployment::SubcomponentPropertyReference &src) - { - CIAO_TRACE("SPR_HAndler::get_spr - reverse"); - ACE_CString str; - SID_Handler::IDREF.find_ref (src.instanceRef, str); - - return SubcomponentPropertyReference (ACE_TEXT_CHAR_TO_TCHAR (src.propertyName.in ()), - ACE_TEXT_CHAR_TO_TCHAR (str.c_str ())); - } + static void handle_spr (const SubcomponentPropertyReference &desc, + ::Deployment::SubcomponentPropertyReference &toconfig) + { + CIAO_TRACE("SPR_Handler::get_spr"); + + toconfig.propertyName = desc.propertyName ().c_str (); + + ACE_CString str (desc.instance ().idref ().id ().c_str ()); + CORBA::ULong pos (0); + + SID_Handler::IDREF.find_ref (str, pos); + toconfig.instanceRef = pos; + + } + + static SubcomponentPropertyReference + get_spr (const ::Deployment::SubcomponentPropertyReference &src) + { + CIAO_TRACE("SPR_HAndler::get_spr - reverse"); + ACE_CString str; + SID_Handler::IDREF.find_ref (src.instanceRef, str); + + IdRef xid; + xid.idref (str.c_str ()); + return SubcomponentPropertyReference (src.propertyName.in (), + xid); + } + }; - typedef Sequence_Handler < - SubcomponentPropertyReference, - ::Deployment::SubcomponentPropertyReferences, - ::Deployment::SubcomponentPropertyReference, - SPR_Handler::handle_spr > SPR_Functor; + typedef Sequence_Handler < SubcomponentPropertyReference, + ::Deployment::SubcomponentPropertyReferences, + ::Deployment::SubcomponentPropertyReference, + SPR_Handler::handle_spr > SPR_Functor; struct Packaging_Handlers_Export APM_Handler { - static void handle_apm ( - const AssemblyPropertyMapping &desc, - ::Deployment::AssemblyPropertyMapping &toconfig) - { - CIAO_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 ()); - - 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)); - } - - static AssemblyPropertyMapping - get_apm (const ::Deployment::AssemblyPropertyMapping &src) - { - CIAO_TRACE("APM_Handler::get_apm - reverse"); - - AssemblyPropertyMapping retval (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()), - ACE_TEXT_CHAR_TO_TCHAR (src.externalName.in ())); - - for (CORBA::ULong i = 0; i < src.delegatesTo.length (); ++i) - retval.add_delegatesTo (SPR_Handler::get_spr (src.delegatesTo[i])); - - return retval; - } + static void handle_apm (const AssemblyPropertyMapping &desc, + ::Deployment::AssemblyPropertyMapping &toconfig) + { + CIAO_TRACE("APM_Handler::get_apm"); + + toconfig.name = desc.name ().c_str (); + 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)); + } + + static AssemblyPropertyMapping + get_apm (const ::Deployment::AssemblyPropertyMapping &src) + { + CIAO_TRACE("APM_Handler::get_apm - reverse"); + + AssemblyPropertyMapping retval (src.name.in (), + src.externalName.in ()); + + for (CORBA::ULong i = 0; i < src.delegatesTo.length (); ++i) + retval.add_delegatesTo (SPR_Handler::get_spr (src.delegatesTo[i])); + + return retval; + } }; - typedef Sequence_Handler < - AssemblyPropertyMapping, - ::Deployment::AssemblyPropertyMappings, - ::Deployment::AssemblyPropertyMapping, - APM_Handler::handle_apm > APM_Functor; + typedef Sequence_Handler < AssemblyPropertyMapping, + ::Deployment::AssemblyPropertyMappings, + ::Deployment::AssemblyPropertyMapping, + APM_Handler::handle_apm > APM_Functor; void CAD_Handler::component_assem_descr (const ComponentAssemblyDescription &desc, @@ -208,17 +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); + 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); + 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)); @@ -242,6 +244,7 @@ namespace CIAO retval.add_externalProperty (APM_Handler::get_apm (src.externalProperty[i])); return retval; + } ComponentAssemblyDescription * diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.h b/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.h index 139c24936ce..b42f13dcdc3 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.h +++ b/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.h @@ -10,7 +10,7 @@ #include /**/ "ace/pre.h" -#include "Utils/XML_Helper.h" +#include "XML_Typedefs.h" #include "DAnCE/Deployment/DeploymentC.h" #include "Package_Handlers/Packaging_Handlers_Export.h" diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp index 6cdc8b8c8cf..f4bca5f8248 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp +++ b/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp @@ -11,7 +11,7 @@ #include "Basic_Deployment_Data.hpp" #include "DAnCE/Deployment/Deployment_DataC.h" -#include "Utils/XML_Helper.h" +#include "XML_Typedefs.h" #include "Utils/Exceptions.h" #include "Deployment.hpp" @@ -29,226 +29,224 @@ namespace CIAO struct Capability_Handler { - static void handle_capability (const Capability &desc, - ::Deployment::Capability &toconfig) - { - CIAO_TRACE ("Capability_Handler::get_capability"); + static void handle_capability (const Capability &desc, + ::Deployment::Capability &toconfig) + { + CIAO_TRACE ("Capability_Handler::get_capability"); - toconfig.name = ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ()); + 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.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)); - } + 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"); + static Capability get_capability (const ::Deployment::Capability &src) + { + CIAO_TRACE ("Capability_Handler::get_capability - reverse"); - Capability retval (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ())); + Capability retval (src.name.in ()); - for (CORBA::ULong i = 0; i < src.resourceType.length (); ++i) - retval.add_resourceType (ACE_TEXT_CHAR_TO_TCHAR (src.resourceType[i].in ())); + for (CORBA::ULong i = 0; i < src.resourceType.length (); ++i) + retval.add_resourceType (src.resourceType[i].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 (SatisfierProperty_Handler::get_sat_property (src.property[i])); - return retval; - } + return retval; + } }; - typedef Sequence_Handler < - Capability, - ::Deployment::Capabilities, - ::Deployment::Capability, - Capability_Handler::handle_capability > Capability_Functor; + typedef Sequence_Handler < Capability, + ::Deployment::Capabilities, + ::Deployment::Capability, + Capability_Handler::handle_capability > Capability_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 (ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ()), - "Unknown ResourceUsageKind."); - break; - } - } - - if (desc.resourcePort_p ()) - toconfig.resourcePort = ACE_TEXT_ALWAYS_CHAR (desc.resourcePort ().c_str ()); - - if (desc.componentPort_p ()) - toconfig.componentPort = ACE_TEXT_ALWAYS_CHAR (desc.componentPort ().c_str ()); - - toconfig.resourceType = ACE_TEXT_ALWAYS_CHAR (desc.resourceType ().c_str ()); - toconfig.name = ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ()); - - std::for_each (desc.begin_property (), - desc.end_property (), - Property_Functor (toconfig.property )); - } + static void handle_ir (const ImplementationRequirement &desc, + ::Deployment::ImplementationRequirement &toconfig) + { + CIAO_TRACE ("IR_Handler::get_ir"); - static ImplementationRequirement - get_ir (const ::Deployment::ImplementationRequirement &src) + if (desc.resourceUsage_p ()) + { + switch (desc.resourceUsage ().integral ()) { - CIAO_TRACE ("IR_Handler::get_ir - reverse"); + 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; + } + } - ImplementationRequirement retval (ACE_TEXT_CHAR_TO_TCHAR (src.resourceType.in ()), - ACE_TEXT_CHAR_TO_TCHAR (src.name.in ())); + if (desc.resourcePort_p ()) + toconfig.resourcePort = desc.resourcePort ().c_str (); - if (src.resourceUsage.length () == 1) - switch (src.resourceUsage[0]) - { - case Deployment::None: - retval.resourceUsage (ResourceUsageKind::None); - break; + if (desc.componentPort_p ()) + toconfig.componentPort = desc.componentPort ().c_str (); - case Deployment::InstanceUsesResource: - retval.resourceUsage (ResourceUsageKind::InstanceUsesResource); - break; + toconfig.resourceType = desc.resourceType ().c_str (); + toconfig.name = desc.name ().c_str (); - case Deployment::ResourceUsesInstance: - retval.resourceUsage (ResourceUsageKind::ResourceUsesInstance); - break; + std::for_each (desc.begin_property (), + desc.end_property (), + Property_Functor (toconfig.property )); + } - case Deployment::PortUsesResource: - retval.resourceUsage (ResourceUsageKind::PortUsesResource); - break; + static ImplementationRequirement + get_ir (const ::Deployment::ImplementationRequirement &src) + { + CIAO_TRACE ("IR_Handler::get_ir - reverse"); - case Deployment::ResourceUsesPort: - retval.resourceUsage (ResourceUsageKind::ResourceUsesPort); - break; + ImplementationRequirement retval (src.resourceType.in (), + src.name.in ()); - default: - throw Config_Error (src.name.in (), - "Unknown ResourceUsageKind."); - break; - } + 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 (ACE_TEXT_CHAR_TO_TCHAR (src.resourcePort.in ())); + retval.resourcePort (src.resourcePort.in ()); - retval.componentPort (ACE_TEXT_CHAR_TO_TCHAR (src.componentPort.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])); + 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::handle_ir > IR_Functor; + 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) + 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) { - 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)); + 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"); + static MonolithicImplementationDescription + get_mid (const ::Deployment::MonolithicImplementationDescription &src) + { + CIAO_TRACE ("MID_Handler::get_mid - reverse"); - MonolithicImplementationDescription retval; + 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.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.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.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])); + for (CORBA::ULong i = 0; i < src.primaryArtifact.length (); ++i) + retval.add_primaryArtifact + (NIA_Handler::get_nia (src.primaryArtifact[i])); + + return retval; + } - return retval; - } }; - typedef Sequence_Handler < - MonolithicImplementationDescription, - ::Deployment::MonolithicImplementationDescriptions, - ::Deployment::MonolithicImplementationDescription, - MID_Handler::handle_mid > MID_Functor; + typedef Sequence_Handler < MonolithicImplementationDescription, + ::Deployment::MonolithicImplementationDescriptions, + ::Deployment::MonolithicImplementationDescription, + MID_Handler::handle_mid > MID_Functor; + + void - CID_Handler::component_impl_descr (const ComponentImplementationDescription &desc, + CID_Handler::component_impl_descr ( + const ComponentImplementationDescription &desc, ::Deployment::ComponentImplementationDescription &toconfig) { CIAO_TRACE ("CID_Handler::component_impl_descr"); @@ -258,17 +256,17 @@ namespace CIAO if (desc.href_p ()) { - xsc_cid.reset (CID_Handler::resolve_cid (ACE_TEXT_ALWAYS_CHAR (desc.href ().c_str ()))); + xsc_cid.reset (CID_Handler::resolve_cid (desc.href ().c_str ())); cid = xsc_cid.get (); } else cid = &desc; if (cid->label_p ()) - toconfig.label = ACE_TEXT_ALWAYS_CHAR (cid->label ().c_str ()); + toconfig.label = cid->label ().c_str (); if (cid->UUID_p ()) - toconfig.UUID = ACE_TEXT_ALWAYS_CHAR (cid->UUID ().c_str ()); + toconfig.UUID = cid->UUID ().c_str (); if (cid->implements_p ()) { // MAJO: We should be able to assume this exists, fix broken interpeters.. @@ -286,7 +284,7 @@ namespace CIAO { toconfig.monolithicImpl.length (1); MID_Handler::handle_mid (cid->monolithicImpl (), - toconfig.monolithicImpl[0]); + toconfig.monolithicImpl[0]); } else throw Plan_Error ("ComponentImplementationDescription must have either assemblyImpl or monolithicImpl"); @@ -299,9 +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); + 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)); @@ -312,14 +310,14 @@ namespace CIAO for (ComponentImplementationDescription::dependsOn_const_iterator i = cid->begin_dependsOn (); i != cid->end_dependsOn (); ++i) - toconfig.dependsOn[pos++].requiredType = - ACE_TEXT_ALWAYS_CHAR (i->requiredType ().c_str ()); + toconfig.dependsOn[pos++].requiredType = i->requiredType ().c_str (); // infoProperty toconfig.infoProperty.length (cid->count_infoProperty ()); std::for_each (cid->begin_infoProperty (), cid->end_infoProperty (), Property_Functor (toconfig.infoProperty)); + } ComponentImplementationDescription @@ -329,8 +327,8 @@ namespace CIAO ComponentImplementationDescription retval; - retval.label (ACE_TEXT_CHAR_TO_TCHAR (src.label.in ())); - retval.UUID (ACE_TEXT_CHAR_TO_TCHAR (src.UUID.in ())); + retval.label (src.label.in ()); + retval.UUID (src.UUID.in ()); { retval.implements (Comp_Intf_Descr_Handler::comp_intf_descr (src.implements)); @@ -350,18 +348,19 @@ namespace CIAO for (CORBA::ULong i = 0; i < src.configProperty.length (); ++i) { - retval.add_configProperty (Property_Handler::get_property (src.configProperty[i])); + retval.add_configProperty ( + Property_Handler::get_property (src.configProperty[i])); } for (CORBA::ULong i = 0; i < src.dependsOn.length (); ++i) { - retval.add_dependsOn (ImplementationDependency ( - ACE_TEXT_CHAR_TO_TCHAR (src.dependsOn[i].requiredType.in ()))); + retval.add_dependsOn (ImplementationDependency (src.dependsOn[i].requiredType.in ())); } for (CORBA::ULong i = 0; i < src.infoProperty.length (); ++i) { - retval.add_infoProperty (Property_Handler::get_property (src.infoProperty[i])); + retval.add_infoProperty ( + Property_Handler::get_property (src.infoProperty[i])); } return retval; @@ -372,18 +371,16 @@ namespace CIAO { CIAO_TRACE ("CID_Handler::resolve_cid"); - xercesc::DOMDocument *dom = XML_HELPER->create_dom (ACE_TEXT_CHAR_TO_TCHAR (uri)); + xercesc::DOMDocument *dom = XML_Helper::XML_HELPER.create_dom (uri); if (!dom) throw Parse_Error ("Unable to create DOM for CID"); - try - { + try { return new ComponentImplementationDescription (componentImplementationDescription (dom)); } - catch (...) - { + catch (...) { throw Parse_Error ("Unable to create XSC structure for CID"); } } diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp index e02bac407d1..e39d5ced065 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp +++ b/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp @@ -17,37 +17,34 @@ namespace CIAO { struct Packaging_Handlers_Export PCI_Handler { - static void handle_pci ( - const PackagedComponentImplementation &desc, - ::Deployment::PackagedComponentImplementation &toconfig) - { - CIAO_TRACE ("PCI_Handler::get_pci"); - toconfig.name = ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ()); + static void handle_pci (const PackagedComponentImplementation &desc, + ::Deployment::PackagedComponentImplementation &toconfig) + { + CIAO_TRACE ("PCI_Handler::get_pci"); + toconfig.name = desc.name ().c_str (); - CID_Handler::component_impl_descr (desc.referencedImplementation (), - toconfig.referencedImplementation); - } + CID_Handler::component_impl_descr (desc.referencedImplementation (), + toconfig.referencedImplementation); + } - static PackagedComponentImplementation - get_pci (const ::Deployment::PackagedComponentImplementation &src) - { - CIAO_TRACE ("PCI_Handler::get_pci - reverse"); - return PackagedComponentImplementation ( - ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()), - CID_Handler::component_impl_descr (src.referencedImplementation)); - } + static PackagedComponentImplementation + get_pci (const ::Deployment::PackagedComponentImplementation &src) + { + CIAO_TRACE ("PCI_Handler::get_pci - reverse"); + return PackagedComponentImplementation (src.name.in (), + CID_Handler::component_impl_descr (src.referencedImplementation)); + } }; - typedef Sequence_Handler < - PackagedComponentImplementation, - ::Deployment::PackagedComponentImplementations, - ::Deployment::PackagedComponentImplementation, - PCI_Handler::handle_pci > PCI_Functor; + typedef Sequence_Handler < PackagedComponentImplementation, + ::Deployment::PackagedComponentImplementations, + ::Deployment::PackagedComponentImplementation, + PCI_Handler::handle_pci > PCI_Functor; + void - CPD_Handler::handle_component_package_descr ( - const ComponentPackageDescription &desc, - ::Deployment::ComponentPackageDescription &toconfig) + CPD_Handler::handle_component_package_descr (const ComponentPackageDescription &desc, + ::Deployment::ComponentPackageDescription &toconfig) { CIAO_TRACE ("CPD_Handler::component_package_descr"); @@ -56,17 +53,17 @@ namespace CIAO if (desc.href_p ()) { - xsc_cpd.reset (CPD_Handler::resolve_cpd (ACE_TEXT_ALWAYS_CHAR (desc.href ().c_str ()))); + xsc_cpd.reset (CPD_Handler::resolve_cpd (desc.href ().c_str ())); cpd = xsc_cpd.get (); } else cpd = &desc; if (cpd->label_p ()) - toconfig.label = ACE_TEXT_ALWAYS_CHAR (cpd->label ().c_str ()); + toconfig.label = cpd->label ().c_str (); if (cpd->UUID_p ()) - toconfig.UUID = ACE_TEXT_ALWAYS_CHAR (cpd->UUID ().c_str ()); + toconfig.UUID = cpd->UUID ().c_str (); // CID if (cpd->realizes_p ()) @@ -84,9 +81,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); + 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)); @@ -105,10 +102,10 @@ namespace CIAO ComponentPackageDescription toconfig; if (src.label.in () != 0) - toconfig.label (ACE_TEXT_CHAR_TO_TCHAR (src.label.in ())); + toconfig.label (src.label.in ()); if (src.UUID.in () != 0) - toconfig.UUID (ACE_TEXT_CHAR_TO_TCHAR (src.UUID.in ())); + toconfig.UUID (src.UUID.in ()); { toconfig.realizes @@ -118,19 +115,19 @@ namespace CIAO for (size_t i = 0; i < src.configProperty.length (); ++i) { toconfig.add_configProperty ( - Property_Handler::get_property (src.configProperty[i])); + Property_Handler::get_property (src.configProperty[i])); } { // Packaged Component Implementations for (size_t i = 0; i < src.implementation.length (); ++i) toconfig.add_implementation ( - PCI_Handler::get_pci (src.implementation[i])); + PCI_Handler::get_pci (src.implementation[i])); } for (size_t i = 0; i < src.infoProperty.length (); ++i) { toconfig.add_infoProperty ( - Property_Handler::get_property (src.infoProperty[i])); + Property_Handler::get_property (src.infoProperty[i])); } return toconfig; @@ -139,25 +136,25 @@ namespace CIAO ComponentPackageDescription * CPD_Handler::resolve_cpd (const char *uri) { CIAO_TRACE ("CPD_Handler::resolve_cpd"); - if (!XML_HELPER->is_initialized ()) + if (!XML_Helper::XML_HELPER.is_initialized ()) return 0; xercesc::DOMDocument* dom = - XML_HELPER->create_dom (ACE_TEXT_CHAR_TO_TCHAR (uri)); + XML_Helper::XML_HELPER.create_dom (uri); if (!dom) throw Parse_Error ("Unable to create DOM for component package description"); - try - { + try { //ACE_ERROR ((LM_ERROR, "Creating new CPD XSC Object\n")); return new ComponentPackageDescription (componentPackageDescription (dom)); } - catch (...) - { + catch (...) { throw Parse_Error ("Unable to create XSC structure for CID"); } } } + + } } diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h b/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h index 4b25591a75c..2279054faee 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h +++ b/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" #include <memory> -#include "Utils/XML_Helper.h" +#include "XML_Typedefs.h" #include "Utils/Functors.h" #include "Package_Handlers/Packaging_Handlers_Export.h" @@ -54,17 +54,19 @@ namespace CIAO ::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); + }; typedef Sequence_Handler < ComponentPackageDescription, ::Deployment::ComponentPackageDescriptions, ::Deployment::ComponentPackageDescription, - CPD_Handler::handle_component_package_descr > - CPD_Functor; + CPD_Handler::handle_component_package_descr > CPD_Functor; + } + } } diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp index feb396c0c0e..d743106a2d0 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp +++ b/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Comp_Intf_Descr_Handler.h" -#include "Utils/XML_Helper.h" +#include "XML_Typedefs.h" #include "Utils/Exceptions.h" #include "Utils/Functors.h" #include "DataType_Handler.h" @@ -23,7 +23,7 @@ namespace CIAO { CIAO_TRACE ("Comp_Prop_Handler::get_cpd"); - toconfig.name = ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ()); + toconfig.name = desc.name ().c_str (); DataType_Handler::data_type (desc.type (), toconfig.type); } @@ -33,7 +33,7 @@ namespace CIAO { CIAO_TRACE ("Comp_Prop_Handler::get_cpd - reverse"); - return ComponentPropertyDescription (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()), + return ComponentPropertyDescription (src.name.in (), DataType_Handler::data_type (src.type)); } @@ -57,22 +57,21 @@ namespace CIAO if (desc.href_p ()) { - safe_cid.reset (Comp_Intf_Descr_Handler::resolve_cid ( - ACE_TEXT_ALWAYS_CHAR (desc.href ().c_str ()))); + safe_cid.reset (Comp_Intf_Descr_Handler::resolve_cid (desc.href ().c_str ())); cid = safe_cid.get (); } else cid = &desc; if (cid->label_p ()) - toconfig.label = ACE_TEXT_ALWAYS_CHAR (cid->label ().c_str ()); + toconfig.label = cid->label ().c_str (); if (cid->UUID_p ()) - toconfig.UUID = ACE_TEXT_ALWAYS_CHAR (cid->UUID ().c_str ()); + toconfig.UUID = cid->UUID ().c_str (); // MAJO: SpecificType should be required. if (cid->specificType_p ()) - toconfig.specificType = ACE_TEXT_ALWAYS_CHAR (cid->specificType ().c_str ()); + toconfig.specificType = cid->specificType ().c_str (); toconfig.supportedType.length (cid->count_supportedType ()); std::for_each (cid->begin_supportedType (), @@ -95,9 +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); + 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)); @@ -116,15 +115,15 @@ namespace CIAO CIAO_TRACE ("Comp_Intf_Descr_Handler::comp_intf_descr - reverse"); ComponentInterfaceDescription retval; - retval.label (ACE_TEXT_CHAR_TO_TCHAR (src.label.in ())); - retval.UUID (ACE_TEXT_CHAR_TO_TCHAR (src.UUID.in ())); - retval.specificType (ACE_TEXT_CHAR_TO_TCHAR (src.specificType.in ())); + retval.label (src.label.in ()); + retval.UUID (src.UUID.in ()); + retval.specificType (src.specificType.in ()); for (CORBA::ULong i = 0; i < src.supportedType.length (); ++i) - retval.add_supportedType (ACE_TEXT_CHAR_TO_TCHAR (src.supportedType[i].in ())); + retval.add_supportedType (src.supportedType[i].in ()); for (CORBA::ULong i = 0; i < src.idlFile.length (); ++i) - retval.add_idlFile (ACE_TEXT_CHAR_TO_TCHAR (src.idlFile[i].in ())); + retval.add_idlFile (src.idlFile[i].in ()); for (CORBA::ULong i = 0; i < src.configProperty.length (); ++i) retval.add_configProperty ( @@ -149,7 +148,7 @@ namespace CIAO { CIAO_TRACE ("Comp_Intf_Descr_Handler::resolve_cid"); - xercesc::DOMDocument *dom = XML_HELPER->create_dom (ACE_TEXT_CHAR_TO_TCHAR (uri)); + xercesc::DOMDocument *dom = XML_Helper::XML_HELPER.create_dom (uri); if (!dom) throw Parse_Error ("Unable to create DOM for Component Interface Description."); diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h b/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h index 02f07fbb438..08a877d0472 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h +++ b/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h @@ -10,7 +10,7 @@ #include /**/ "ace/pre.h" -#include "Utils/XML_Helper.h" +#include "XML_Typedefs.h" #include "DAnCE/Deployment/DeploymentC.h" #include "Package_Handlers/Packaging_Handlers_Export.h" diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp index 2291a30527b..e16a5c63ae8 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp +++ b/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp @@ -6,7 +6,7 @@ #include "Req_Handler.h" #include "Utils/Functors.h" #include "Utils/Exceptions.h" -#include "Utils/XML_Helper.h" +#include "XML_Typedefs.h" #include "Deployment.hpp" #include "ciao/CIAO_common.h" @@ -29,7 +29,7 @@ namespace CIAO if (desc.href_p ()) { - safe_iad.reset (IAD_Handler::resolve_iad (ACE_TEXT_ALWAYS_CHAR (desc.href ().c_str ()))); + safe_iad.reset (IAD_Handler::resolve_iad (desc.href ().c_str ())); iad = safe_iad.get (); } else @@ -37,10 +37,10 @@ namespace CIAO if (iad->label_p ()) - toconfig.label = ACE_TEXT_ALWAYS_CHAR (iad->label ().c_str ()); + toconfig.label = iad->label ().c_str (); if (iad->UUID_p ()) - toconfig.UUID = ACE_TEXT_ALWAYS_CHAR (iad->UUID ().c_str ()); + toconfig.UUID = iad->UUID ().c_str (); toconfig.location.length (iad->count_location ()); std::for_each (iad->begin_location (), @@ -48,9 +48,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); + 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)); @@ -77,11 +77,11 @@ namespace CIAO CIAO_TRACE ("IAD_Handler::impl_artifact_descr - reverse"); ImplementationArtifactDescription retval; - retval.label (ACE_TEXT_CHAR_TO_TCHAR (src.label.in ())); - retval.UUID (ACE_TEXT_CHAR_TO_TCHAR (src.UUID.in ())); + retval.label (src.label.in ()); + retval.UUID (src.UUID.in ()); for (CORBA::ULong i = 0; i < src.location.length (); ++i) - retval.add_location (ACE_TEXT_CHAR_TO_TCHAR (src.location[i].in ())); + retval.add_location (src.location[i].in ()); for (CORBA::ULong i = 0; i < src.dependsOn.length (); ++i) retval.add_dependsOn (NIA_Handler::get_nia (src.dependsOn[i])); @@ -105,7 +105,7 @@ namespace CIAO { CIAO_TRACE ("IAD_Handler::resolve_iad"); - xercesc::DOMDocument *dom = XML_HELPER->create_dom (ACE_TEXT_CHAR_TO_TCHAR (uri)); + xercesc::DOMDocument *dom = XML_Helper::XML_HELPER.create_dom (uri); if (!dom) throw Parse_Error ("Unable to create DOM for IAD"); diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h b/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h index 923104dc27b..2f3f2845343 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h +++ b/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h @@ -37,7 +37,7 @@ namespace CIAO static void handle_nia (const NamedImplementationArtifact &desc, ::Deployment::NamedImplementationArtifact &toconfig) { - toconfig.name = ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ()); + toconfig.name = desc.name ().c_str (); IAD_Handler::impl_artifact_descr (desc.referencedArtifact (), toconfig.referencedArtifact); } @@ -46,7 +46,7 @@ namespace CIAO static NamedImplementationArtifact get_nia (const ::Deployment::NamedImplementationArtifact &src) { - return NamedImplementationArtifact (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()), + return NamedImplementationArtifact (src.name.in (), IAD_Handler::impl_artifact_descr (src.referencedArtifact)); } diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp index 3f11ee374ff..c7e82624f3d 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp +++ b/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp @@ -2,8 +2,8 @@ #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "ciao/CIAO_common.h" #include "DAnCE/Deployment/Deployment_Packaging_DataC.h" -#include "Utils/XML_Helper.h" -#include "Utils/XercesString.h" +#include "XML_Typedefs.h" +#include "XML/XercesString.h" #include "Utils/Exceptions.h" #include "Package_Handlers/PCD_Handler.h" #include "Package_Handlers/CPD_Handler.h" @@ -14,6 +14,8 @@ #include <memory> +using CIAO::XML::XStr; + namespace CIAO { namespace Config_Handlers @@ -24,27 +26,27 @@ namespace CIAO PCD_Handler::package_config (const ACE_TCHAR *uri, ::Deployment::PackageConfiguration &toconfig) { - XERCES_CPP_NAMESPACE::DOMDocument *dom = XML_HELPER->create_dom (uri); + XERCES_CPP_NAMESPACE::DOMDocument *dom = XML_Helper::XML_HELPER.create_dom (uri); if (dom == 0) { std::string error ("Unable to open file: "); - error += ACE_TEXT_ALWAYS_CHAR (uri); + error += uri; throw Parse_Error (error); } XStr root = dom->getDocumentElement ()->getTagName (); - if (root == XStr (ACE_TEXT ("Deployment:topLevelPackageDescription"))) + if (root == XStr ("Deployment:topLevelPackageDescription")) { TopLevelPackageDescription tpd; - - tpd = topLevelPackageDescription (dom); + + tpd = topLevelPackageDescription (dom); PCD_Handler::package_config (*tpd.begin_basePackage (), toconfig); } - else if (root == XStr (ACE_TEXT ("Deployment:packageConfiguration"))) + else if (root == XStr ("Deployment:packageConfiguration")) { PackageConfiguration pcd; pcd = packageConfiguration (dom); @@ -76,8 +78,7 @@ namespace CIAO if (desc.contentLocation_p ()) { // Take ownership of the resolved pcd - xsc_pcd.reset (PCD_Handler:: resolve_package_config ( - ACE_TEXT_ALWAYS_CHAR (desc.contentLocation ().c_str ()))); + xsc_pcd.reset (PCD_Handler:: resolve_package_config (desc.contentLocation ().c_str ())); pcd = xsc_pcd.get (); } else @@ -85,11 +86,11 @@ namespace CIAO if (pcd->label_p ()) toconfig.label = - ACE_TEXT_ALWAYS_CHAR (pcd->label ().c_str ()); + pcd->label ().c_str (); if (pcd->UUID_p ()) toconfig.UUID = - ACE_TEXT_ALWAYS_CHAR (pcd->UUID ().c_str ()); + pcd->UUID ().c_str (); if (pcd->basePackage_p ()) { @@ -119,10 +120,10 @@ namespace CIAO PackageConfiguration pcd = PackageConfiguration (); if (src.label.in () != 0) - pcd.label (ACE_TEXT_CHAR_TO_TCHAR (src.label.in ())); + pcd.label (src.label.in ()); if (src.UUID.in () != 0) - pcd.UUID (ACE_TEXT_CHAR_TO_TCHAR (src.UUID.in ())); + pcd.UUID (src.UUID.in ()); if (src.basePackage.length () > 0) { @@ -144,7 +145,7 @@ namespace CIAO PackageConfiguration * PCD_Handler::resolve_package_config (const char *uri) { xercesc::DOMDocument* dom = - XML_HELPER->create_dom (ACE_TEXT_CHAR_TO_TCHAR (uri)); + XML_Helper::XML_HELPER.create_dom (uri); if (!dom) throw Parse_Error ("Unable to create DOM for PackageConfiguration"); diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc b/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc index f844313584c..a5253f05d05 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc +++ b/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc @@ -1,25 +1,24 @@ // $Id$ -project (Package_Config_Handlers) : acelib, ace_output, ciao_deployment_stub, ciao_config_handlers_base { +project (Package_Config_Handlers) : acelib, dance_deployment_stub, ciao_config_handlers_base, dance { sharedname = Package_Config_Handlers dynamicflags = PACKAGING_HANDLERS_BUILD_DLL avoids += ace_for_tao - - includes += $(CIAO_ROOT)/ciao - + + includes += $(CIAO_ROOT)/ciao + libpaths += $(CIAO_ROOT)/bin + after += XSC_Config_Handlers_Common \ XSC_Config_Handlers \ XSC_DynAny_Handler \ XSC_XML_Handlers \ CIAO_XML_Utils \ - CIAO_Events_Handlers libs += XSC_Config_Handlers_Common \ XSC_Config_Handlers \ XSC_DynAny_Handler \ XSC_XML_Handlers \ CIAO_XML_Utils \ - CIAO_Events_Handlers RT_CCM_Config_Handlers Source_files { CAD_Handler.cpp @@ -43,10 +42,11 @@ project (Package_Config_Handlers) : acelib, ace_output, ciao_deployment_stub, ci } -project (Package_Config_Handlers_Tests) : ciao_component_dnc, ciao_config_handlers, ifr_client { +project (Package_Config_Handlers_Tests) : dance_deployment_stub, ciao_config_handlers, ifr_client { exename = test macros += XML_USE_PTHREADS avoids += ace_for_tao + requires += dummy_label Source_Files { test.cpp diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp index 7039fec9493..b6d9673bef0 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp +++ b/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp @@ -5,6 +5,7 @@ #include "DAnCE/Deployment/DeploymentC.h" #include "Package_Handlers/CPD_Handler.h" #include "Package_Handlers/PCD_Handler.h" +#include "Package_Handlers/Comp_Intf_Descr_Handler.h" #include "Req_Handler.h" #include "Property_Handler.h" @@ -23,7 +24,7 @@ namespace CIAO ::Deployment::SubcomponentInstantiationDescription &toconfig) { CIAO_TRACE ("SID_Handler::sub_comp_inst_descr"); - toconfig.name = ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ()); + toconfig.name = desc.name ().c_str (); if (desc.basePackage_p ()) { @@ -52,14 +53,15 @@ namespace CIAO if (desc.referencedPackage ().requiredUUID_p ()) toconfig.referencedPackage[0].requiredUUID = - ACE_TEXT_ALWAYS_CHAR (desc.referencedPackage ().requiredUUID ().c_str ()); + desc.referencedPackage ().requiredUUID ().c_str (); if (desc.referencedPackage ().requiredName_p ()) toconfig.referencedPackage[0].requiredName = - ACE_TEXT_ALWAYS_CHAR (desc.referencedPackage ().requiredName ().c_str ()); - - toconfig.referencedPackage[0].requiredType = - ACE_TEXT_ALWAYS_CHAR (desc.referencedPackage ().requiredType ().c_str ()); + 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 ()); @@ -74,7 +76,7 @@ namespace CIAO if (desc.id_p ()) { - ACE_CString str (ACE_TEXT_ALWAYS_CHAR (desc.id ().c_str ())); + ACE_CString str (desc.id ().c_str ()); SID_Handler::IDREF.bind_next_available (str); } else @@ -87,7 +89,7 @@ namespace CIAO SID_Handler::sub_comp_inst_descr (const Deployment::SubcomponentInstantiationDescription &src) { CIAO_TRACE ("SID_Handler::sub_comp_inst_descr - reverse"); - SubcomponentInstantiationDescription retval (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ())); + SubcomponentInstantiationDescription retval (src.name.in ()); if (src.basePackage.length () == 1) retval.basePackage @@ -100,15 +102,15 @@ namespace CIAO ComponentPackageImport ci; for (CORBA::ULong i = 0; i < src.importedPackage[0].location.length (); ++i) - ci.add_location (ACE_TEXT_CHAR_TO_TCHAR (src.importedPackage[0].location[i].in ())); + ci.add_location (src.importedPackage[0].location[i].in ()); retval.importedPackage (ci); } else if (src.referencedPackage.length () == 1) { - ComponentPackageReference cpr (ACE_TEXT_CHAR_TO_TCHAR (src.referencedPackage[0].requiredType.in ())); - cpr.requiredUUID (ACE_TEXT_CHAR_TO_TCHAR (src.referencedPackage[0].requiredUUID.in ())); - cpr.requiredName (ACE_TEXT_CHAR_TO_TCHAR (src.referencedPackage[0].requiredName.in ())); + ComponentPackageReference cpr (Comp_Intf_Descr_Handler::comp_intf_descr (src.referencedPackage[0].requiredType)); + cpr.requiredUUID (src.referencedPackage[0].requiredUUID.in ()); + cpr.requiredName (src.referencedPackage[0].requiredName.in ()); retval.referencedPackage (cpr); } diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h b/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h index 7bc69b9ab95..2083b91b9b6 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h +++ b/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h @@ -11,7 +11,7 @@ #include /**/ "ace/pre.h" -#include "Utils/XML_Helper.h" +#include "XML_Typedefs.h" #include "Utils/Functors.h" #include "IDREF_Base.h" #include "Package_Handlers/Packaging_Handlers_Export.h" @@ -61,8 +61,8 @@ namespace CIAO typedef Sequence_Handler < SubcomponentInstantiationDescription, ::Deployment::SubcomponentInstantiationDescriptions, ::Deployment::SubcomponentInstantiationDescription, - SID_Handler::handle_sub_comp_inst_descr > - SID_Functor; + SID_Handler::handle_sub_comp_inst_descr > SID_Functor; + } } } diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp index dff1510e707..c107fed4a77 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp +++ b/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp @@ -11,12 +11,13 @@ #include "tao/ORB.h" #include "Utils/Exceptions.h" -static const ACE_TCHAR *input_file = ACE_TEXT ("BasicSP.cdp"); +static const char *input_file = "BasicSP.cdp"; + static int -parse_args (int argc, ACE_TCHAR *argv[]) +parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("i:")); + ACE_Get_Opt get_opts (argc, argv, "i:"); int c; @@ -44,10 +45,12 @@ void check_srd (const Deployment::DeploymentPlan &); using namespace CIAO::Config_Handlers; + int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { + if (parse_args (argc, argv) != 0) return 1; @@ -56,7 +59,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_UNUSED_ARG (orb); - if (xercesc::DOMDocument *doc = XML_HELPER->create_dom (ACE_TEXT_ALWAYS_CHAR (input_file))) + if (xercesc::DOMDocument *doc = XML_HELPER->create_dom (input_file)) { ::Deployment::PackageConfiguration idl_pc; @@ -66,7 +69,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) //std::cerr << "XML to XSC conversion succeeded. Converting to IDL...\n"; //Convert the XSC to an IDL datatype - Packaging::PCD_Handler::package_config (ACE_TEXT_ALWAYS_CHAR (input_file), idl_pc); + Packaging::PCD_Handler::package_config (input_file, idl_pc); std::cout << "Instance document import succeeded. Dumping contents to file\n"; } @@ -86,7 +89,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) //Write it to test.xml - XML_HELPER->write_DOM(the_xsc, ACE_TEXT ("test.xml")); + XML_HELPER->write_DOM(the_xsc, "test.xml"); //Cleanliness is next to Godliness delete doc; |