diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2004-09-25 15:18:36 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2004-09-25 15:18:36 +0000 |
| commit | 5f5cb7c1338bf039208c555a5496790e81455c4e (patch) | |
| tree | 1dc77a78a734bccc169fbe5bf6a89203523121fe | |
| parent | 4575aded9abae73ae8b5ad6afbabd9335a945589 (diff) | |
| download | ATCD-5f5cb7c1338bf039208c555a5496790e81455c4e.tar.gz | |
ChangeLogTag:Sat Sep 25 14:56:37 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
42 files changed, 1409 insertions, 1322 deletions
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp index 2d7d23639d9..8ad8b92c971 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp @@ -1,7 +1,4 @@ - // $Id$ - - #include "ADD_Handler.h" #include "Basic_Deployment_Data.hpp" #include "ciao/Deployment_DataC.h" @@ -9,7 +6,9 @@ #include "Req_Handler.h" #include "RDD_Handler.h" - +ACE_RCSID (DAnCE, + ADD_Handler, + "$Id$") namespace CIAO { @@ -27,69 +26,65 @@ namespace CIAO void ADD_Handler::get_ArtifactDeploymentDescription ( - Deployment::ArtifactDeploymentDescription& toconfig, - ArtifactDeploymentDescription& desc) + Deployment::ArtifactDeploymentDescription& add, + ArtifactDeploymentDescription& desc) { + add.name= + CORBA::string_dup (desc.name ().c_str ()); + add.source.length (add.source.length () + 1); + + add.source[add.source.length () - 1]= + CORBA::string_dup (desc.source ().c_str ()); - - toconfig.name= - CORBA::string_dup (desc.name ().c_str ()); - - toconfig.source.length ( - toconfig.source.length () + 1); - toconfig.source[toconfig.source.length () - 1]= - CORBA::string_dup (desc.source ().c_str ()); - if (desc.node_p ()) { - - toconfig.node= + add.node= CORBA::string_dup (desc.node ().c_str ()); } - + for (ArtifactDeploymentDescription::location_iterator item (desc.begin_location ()); item != desc.end_location (); ++item) - { - toconfig.location.length ( - toconfig.location.length () + 1); - toconfig.location[toconfig.location.length () - 1] = - CORBA::string_dup (item->c_str ()); + { + add.location.length ( + add.location.length () + 1); + add.location[add.location.length () - 1] = + CORBA::string_dup (item->c_str ()); } - + if (desc.execParameter_p ()) { - Prop_Handler handler; - toconfig.execParameter.length ( - toconfig.execParameter.length () + 1); + Prop_Handler handler; + + add.execParameter.length ( + add.execParameter.length () + 1); + handler.get_Property ( - toconfig.execParameter[toconfig.execParameter.length () - 1], + add.execParameter[add.execParameter.length () - 1], desc.execParameter ()); } - + if (desc.deployRequirement_p ()) { - Req_Handler handler; - toconfig.deployRequirement.length ( - toconfig.deployRequirement.length () + 1); + Req_Handler handler; + add.deployRequirement.length ( + add.deployRequirement.length () + 1); handler.get_Requirement ( - toconfig.deployRequirement[toconfig.deployRequirement.length () - 1], + add.deployRequirement[add.deployRequirement.length () - 1], desc.deployRequirement ()); } - + if (desc.deployedResource_p ()) { - RDD_Handler handler; - toconfig.deployedResource.length ( - toconfig.deployedResource.length () + 1); + RDD_Handler handler; + add.deployedResource.length ( + add.deployedResource.length () + 1); handler.get_ResourceDeploymentDescription ( - toconfig.deployedResource[toconfig.deployedResource.length () - 1], + add.deployedResource[add.deployedResource.length () - 1], desc.deployedResource ()); } - - } } diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.h index 957d10ec7e1..52fc4797548 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.h +++ b/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.h @@ -1,5 +1,4 @@ - - //============================================================== +//============================================================== /** * @file ADD_Handler.h * @@ -14,7 +13,7 @@ #include /**/ "ace/pre.h" #include "Base_Handler.h" -#include "Config_Handlers_export.h" +#include "Config_Handlers_Export.h" #include "ace/config-lite.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -22,7 +21,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ - namespace Deployment { class ArtifactDeploymentDescription; @@ -35,35 +33,31 @@ namespace CIAO namespace Config_Handlers { - class ArtifactDeploymentDescription; - + class ArtifactDeploymentDescription; - /* + /* * @class ADD_Handler * * @brief Handler class for <ArtifactDeploymentDescription> types. * - * This class defines handler methods to map values from - * XSC ArtifactDeploymentDescription objects, parsed from the descriptor files, to the - * corresponding CORBA IDL Any type. - * + * This class defines handler methods to map values from XSC + * ArtifactDeploymentDescription objects, parsed from the + * // @@ Jules, why Any type? + * descriptor files, to the corresponding CORBA IDL Any type. */ - - class Config_Handlers_Export ADD_Handler : public Base_Handler{ - - public: - - ADD_Handler (void); - virtual ~ADD_Handler (void); + class Config_Handlers_Export ADD_Handler : public Base_Handler + { + public: + ADD_Handler (void); + virtual ~ADD_Handler (void); - void get_ArtifactDeploymentDescription ( - Deployment::ArtifactDeploymentDescription& toconfig, - ArtifactDeploymentDescription& desc); + void get_ArtifactDeploymentDescription ( + Deployment::ArtifactDeploymentDescription& toconfig, + ArtifactDeploymentDescription& desc); }; } } -#include /**/ "ace/post.h" +#include /**/ "ace/post.h" #endif /* CIAO_CONFIG_HANDLERS_ADD_Handler_H */ - diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.cpp index b5f515f05b3..807f9c69962 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.cpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.cpp @@ -18,48 +18,53 @@ namespace CIAO void - Any_Handler::get_Any (CORBA::Any& toconfig, - Any& desc) - { + Any_Handler::extract_into_any (const Any& desc, + CORBA::Any& toconfig) + { // Get the value that should be assigned to the Any. DataValue value = desc.value (); if (value.short_p ()) { - toconfig <<= - static_cast <CORBA::Short> (value.short_ ()); + CORBA::Short val = value.short_ (); + + toconfig <<= val; } else if (value.ushort_p ()) { - toconfig <<= - static_cast <CORBA::UShort> (value.ushort ()); + CORBA::UShort val = value.ushort (); + + toconfig <<= val; } else if (value.long_p ()) { - toconfig <<= - static_cast <CORBA::UShort> (value.long_ ()); + CORBA::Long val = value.long_ (); + + toconfig <<= val; } else if (value.ulong_p ()) { - toconfig <<= - static_cast <CORBA::UShort> (value.ulong ()); + CORBA::ULong val = value.ulong (); + + toconfig <<= val; } else if (value.boolean_p ()) { - toconfig <<= - static_cast <CORBA::Boolean> (value.boolean ()); + CORBA::Boolean val = value.boolean (); + + toconfig <<= val; } else if (value.double_p ()) { - toconfig <<= - static_cast <CORBA::Double> (value.double_ ()); + CORBA::Boolean val = value.double_ (); + toconfig <<= val; } else if (value.float_p ()) { - toconfig <<= - static_cast <CORBA::Float> (value.float_ ()); + CORBA::Float val = value.float_ (); + toconfig <<= val; } else if (value.string_p ()) { @@ -68,20 +73,22 @@ namespace CIAO } else if (value.octet_p ()) { + CORBA::Octet val = value.octet (); + toconfig <<= - CORBA::Any::from_octet (static_cast<CORBA::Octet> (value.octet ())); + CORBA::Any::from_octet (val); } else if (value.longlong_p ()) { - toconfig <<= - static_cast <CORBA::LongLong> (value.longlong ()); + CORBA::LongLong val = value.longlong (); + + toconfig <<= val; } else if (value.ulonglong_p ()) { - toconfig <<= - static_cast <CORBA::ULongLong> (value.ulonglong ()); + CORBA::ULongLong val = value.ulonglong (); + toconfig <<=val; } - } } } diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.h index e3194a6f479..c4074f4f2d1 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.h +++ b/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.h @@ -12,28 +12,23 @@ #define CIAO_CONFIG_HANDLERS_ANY_HANDLER_H #include /**/ "ace/pre.h" - -#include "Basic_Deployment_Data.hpp" -#include "Config_Handlers_export.h" -#include "ace/config-lite.h" +#include "Config_Handlers_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - - namespace CORBA { class Any; } -// @@ Jules, can you please change the name of this file? namespace CIAO { - namespace Config_Handlers { + class Any; + /* * @class Any_Handler * @@ -44,15 +39,14 @@ namespace CIAO * corresponding CORBA IDL Any type. * */ - - class Config_Handlers_Export Any_Handler{ - + class Config_Handlers_Export Any_Handler + { public: + Any_Handler (void); + virtual ~Any_Handler (void); - Any_Handler (void); - virtual ~Any_Handler (void); - - static void get_Any (CORBA::Any& toconfig, Any& desc); + static void extract_into_any (const Any& desc, + ::CORBA::Any& toconfig); }; } diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Base_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Base_Handler.cpp index 3ab3d1bd6f8..a490921f204 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/Base_Handler.cpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/Base_Handler.cpp @@ -8,7 +8,6 @@ namespace CIAO { namespace Config_Handlers { - Base_Handler::Base_Handler (void) { } @@ -17,41 +16,45 @@ namespace CIAO { } - // This should probably be inline. - // Copies the string provided into the provided CORBA string. - void - Base_Handler::handle_string (const ::XMLSchema::string <char> &str, - CORBA::String_var &tofill) + void + Base_Handler::populate_string (const ::XMLSchema::string <char> &str, + CORBA::String_out &tofill) { - tofill = CORBA::string_dup (str.c_str ()); + tofill = + CORBA::string_dup (str.c_str ()); } - - - /// Appends the string provided to the provided StringSeq. - void - Base_Handler::handle_string_seq (::XMLSchema::string <char> &str, - CORBA::StringSeq &tofill) + + void + Base_Handler::populate_string_seq (const ::XMLSchema::string <char> &str, + CORBA::StringSeq &tofill) { tofill.length (tofill.length () + 1); - tofill[tofill.length () - 1] = + tofill[tofill.length () - 1] = CORBA::string_dup (str.c_str ()); } - - - /// The Deployment spec references elements by - /// their position within their parent sequence. - /// These two methods allow an element's index - /// to be stored/retrieved. - void - Base_Handler::bind_ref (ACE_TString& id, size_t index) + + bool + Base_Handler::bind_ref (ACE_CString& id, size_t index) { - idref_map_.bind (id,index); + int retval = + this->idref_map_.bind (id, index); + + if (return < 0) + return false; + + return true; } - - int - Base_Handler::get_ref (ACE_TString& id, size_t val) + + bool + Base_Handler::find_ref (ACE_CString& id, size_t val) { - return idref_map_.find (id,val); + int retval = + this->idref_map_.find (id, val); + + if (return < 0) + return false; + + return true; } } diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Base_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Base_Handler.h index 4d8d05fb09d..fa450b128dd 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/Base_Handler.h +++ b/TAO/CIAO/DAnCE/Config_Handlers/Base_Handler.h @@ -12,71 +12,69 @@ #define CIAO_CONFIG_HANDLERS_BASE_HANDLER_H #include /**/ "ace/pre.h" -#include "Config_Handlers_export.h" -#include "Basic_Deployment_Data.hpp" -#include "ace/Hash_Map_Manager.h" -#include "ace/Null_Mutex.h" +#include "Config_Handlers/Config_Handlers_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Hash_Map_Manager.h" +#include "ace/Null_Mutex.h" +#include "Config_Handlers/XSCRT/XMLSchema.hpp" + namespace CORBA { - struct String_var; - struct StringSeq; + class String_out; + class StringSeq; } namespace CIAO { - namespace Config_Handlers - { - + { /* * @class Base_Handler * - * @brief base class for Type handlers. - * - * - * + * @brief */ - - class Config_Handlers_Export Base_Handler{ - + class Config_Handlers_Export Base_Handler + { public: - - typedef ACE_Hash_Map_Manager<ACE_TString, size_t, ACE_Null_Mutex> IDREF_MAP; - Base_Handler (void); + virtual ~Base_Handler (void); - + /// Populates a CORBA string with the provided XMLString. - void handle_string (const ::XMLSchema::string <char> &str, - CORBA::String_var &tofill); - + void populate_string (const ::XMLSchema::string <char> &str, + CORBA::String_out &tofill); + /// Appends the string provided to the provided StringSeq. - void handle_string_seq (::XMLSchema::string <char> &str, - CORBA::StringSeq &tofill); - - /// The Deployment spec references elements by - /// their position within their parent sequence. - /// These two methods allow an element's index - /// to be stored/retrieved. - - /// Map the index <index> of an element to its IDREF <id>. - void bind_ref (ACE_TString& id, size_t index); - + void populate_string_seq (const ::XMLSchema::string <char> &str, + CORBA::StringSeq &tofill); + + /// The Deployment spec references elements by their position + /// within their parent sequence. + /** + * These two methods allow an element's index to be + * stored/retrieved. Map the index <index> of an element to its + * IDREF <id>. + */ + bool bind_ref (ACE_CString& id, size_t index); + /// Retrieve the index of an element with its IDREF <id>. - /// Returns 0 if the <id> was found. - int get_ref (ACE_TString& id, size_t val); + /** + * @\return true if the <id> was found. + */ + bool find_ref (ACE_CString& id, size_t val); private: - + typedef ACE_Hash_Map_Manager<ACE_CString, + size_t, + ACE_Null_Mutex> IDREF_MAP; + /// The map used to store and look up the indexes /// of elements referenced by their index. - IDREF_MAP idref_map_; - + IDREF_MAP idref_map_; }; } } diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.cpp index 062be4de64c..b67541c0615 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.cpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.cpp @@ -8,11 +8,6 @@ namespace CIAO // TCKind // - TCKind:: - TCKind () - { - } - TCKind::Value TCKind:: integral () const { @@ -771,10 +766,11 @@ namespace CIAO // Any:: - Any () + Any (::CIAO::Config_Handlers::DataType const& type__, + ::CIAO::Config_Handlers::DataValue const& value__) : - type_ (new ::CIAO::Config_Handlers::DataType ()), - value_ (new ::CIAO::Config_Handlers::DataValue ()), + type_ (new ::CIAO::Config_Handlers::DataType (type__)), + value_ (new ::CIAO::Config_Handlers::DataValue (value__)), regulator__ () { type_->container (this); @@ -848,10 +844,11 @@ namespace CIAO // Property:: - Property () + Property (::XMLSchema::string< char > const& name__, + ::CIAO::Config_Handlers::Any const& value__) : - name_ (new ::XMLSchema::string< char > ()), - value_ (new ::CIAO::Config_Handlers::Any ()), + name_ (new ::XMLSchema::string< char > (name__)), + value_ (new ::CIAO::Config_Handlers::Any (value__)), regulator__ () { name_->container (this); @@ -925,10 +922,11 @@ namespace CIAO // Node:: - Node () + Node (::XMLSchema::string< char > const& name__, + ::XMLSchema::string< char > const& label__) : - name_ (new ::XMLSchema::string< char > ()), - label_ (new ::XMLSchema::string< char > ()), + name_ (new ::XMLSchema::string< char > (name__)), + label_ (new ::XMLSchema::string< char > (label__)), regulator__ () { name_->container (this); @@ -1001,11 +999,6 @@ namespace CIAO // SatisfierPropertyKind // - SatisfierPropertyKind:: - SatisfierPropertyKind () - { - } - SatisfierPropertyKind::Value SatisfierPropertyKind:: integral () const { @@ -1034,11 +1027,13 @@ namespace CIAO // SatisfierProperty:: - SatisfierProperty () + SatisfierProperty (::XMLSchema::string< char > const& name__, + ::CIAO::Config_Handlers::SatisfierPropertyKind const& kind__, + ::CIAO::Config_Handlers::Any const& value__) : - name_ (new ::XMLSchema::string< char > ()), - kind_ (new ::CIAO::Config_Handlers::SatisfierPropertyKind ()), - value_ (new ::CIAO::Config_Handlers::Any ()), + name_ (new ::XMLSchema::string< char > (name__)), + kind_ (new ::CIAO::Config_Handlers::SatisfierPropertyKind (kind__)), + value_ (new ::CIAO::Config_Handlers::Any (value__)), regulator__ () { name_->container (this); @@ -1137,11 +1132,13 @@ namespace CIAO // Resource:: - Resource () + Resource (::XMLSchema::string< char > const& name__, + ::XMLSchema::string< char > const& resourceType__, + ::CIAO::Config_Handlers::SatisfierProperty const& property__) : - name_ (new ::XMLSchema::string< char > ()), - resourceType_ (new ::XMLSchema::string< char > ()), - property_ (new ::CIAO::Config_Handlers::SatisfierProperty ()), + name_ (new ::XMLSchema::string< char > (name__)), + resourceType_ (new ::XMLSchema::string< char > (resourceType__)), + property_ (new ::CIAO::Config_Handlers::SatisfierProperty (property__)), regulator__ () { name_->container (this); @@ -1240,12 +1237,15 @@ namespace CIAO // SharedResource:: - SharedResource () + SharedResource (::XMLSchema::string< char > const& name__, + ::XMLSchema::string< char > const& resourceType__, + ::CIAO::Config_Handlers::Node const& node__, + ::CIAO::Config_Handlers::SatisfierProperty const& property__) : - name_ (new ::XMLSchema::string< char > ()), - resourceType_ (new ::XMLSchema::string< char > ()), - node_ (new ::CIAO::Config_Handlers::Node ()), - property_ (new ::CIAO::Config_Handlers::SatisfierProperty ()), + name_ (new ::XMLSchema::string< char > (name__)), + resourceType_ (new ::XMLSchema::string< char > (resourceType__)), + node_ (new ::CIAO::Config_Handlers::Node (node__)), + property_ (new ::CIAO::Config_Handlers::SatisfierProperty (property__)), regulator__ () { name_->container (this); @@ -1369,11 +1369,13 @@ namespace CIAO // Requirement:: - Requirement () + Requirement (::XMLSchema::string< char > const& resourceType__, + ::XMLSchema::string< char > const& name__, + ::CIAO::Config_Handlers::Property const& property__) : - resourceType_ (new ::XMLSchema::string< char > ()), - name_ (new ::XMLSchema::string< char > ()), - property_ (new ::CIAO::Config_Handlers::Property ()), + resourceType_ (new ::XMLSchema::string< char > (resourceType__)), + name_ (new ::XMLSchema::string< char > (name__)), + property_ (new ::CIAO::Config_Handlers::Property (property__)), regulator__ () { resourceType_->container (this); @@ -1472,11 +1474,13 @@ namespace CIAO // ResourceDeploymentDescription:: - ResourceDeploymentDescription () + ResourceDeploymentDescription (::XMLSchema::string< char > const& requirementName__, + ::XMLSchema::string< char > const& resourceName__, + ::CIAO::Config_Handlers::Any const& resourceValue__) : - requirementName_ (new ::XMLSchema::string< char > ()), - resourceName_ (new ::XMLSchema::string< char > ()), - resourceValue_ (new ::CIAO::Config_Handlers::Any ()), + requirementName_ (new ::XMLSchema::string< char > (requirementName__)), + resourceName_ (new ::XMLSchema::string< char > (resourceName__)), + resourceValue_ (new ::CIAO::Config_Handlers::Any (resourceValue__)), regulator__ () { requirementName_->container (this); @@ -1575,10 +1579,11 @@ namespace CIAO // ArtifactDeploymentDescription:: - ArtifactDeploymentDescription () + ArtifactDeploymentDescription (::XMLSchema::string< char > const& name__, + ::XMLSchema::string< char > const& source__) : - name_ (new ::XMLSchema::string< char > ()), - source_ (new ::XMLSchema::string< char > ()), + name_ (new ::XMLSchema::string< char > (name__)), + source_ (new ::XMLSchema::string< char > (source__)), regulator__ () { name_->container (this); @@ -1918,10 +1923,11 @@ namespace CIAO // MonolithicDeploymentDescription:: - MonolithicDeploymentDescription () + MonolithicDeploymentDescription (::XMLSchema::string< char > const& name__, + ::XMLSchema::string< char > const& source__) : - name_ (new ::XMLSchema::string< char > ()), - source_ (new ::XMLSchema::string< char > ()), + name_ (new ::XMLSchema::string< char > (name__)), + source_ (new ::XMLSchema::string< char > (source__)), regulator__ () { name_->container (this); @@ -2180,11 +2186,6 @@ namespace CIAO // ResourceUsageKind // - ResourceUsageKind:: - ResourceUsageKind () - { - } - ResourceUsageKind::Value ResourceUsageKind:: integral () const { @@ -2213,12 +2214,15 @@ namespace CIAO // InstanceResourceDeploymentDescription:: - InstanceResourceDeploymentDescription () + InstanceResourceDeploymentDescription (::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage__, + ::XMLSchema::string< char > const& requirementName__, + ::XMLSchema::string< char > const& resourceName__, + ::CIAO::Config_Handlers::Any const& resourceValue__) : - resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind ()), - requirementName_ (new ::XMLSchema::string< char > ()), - resourceName_ (new ::XMLSchema::string< char > ()), - resourceValue_ (new ::CIAO::Config_Handlers::Any ()), + resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (resourceUsage__)), + requirementName_ (new ::XMLSchema::string< char > (requirementName__)), + resourceName_ (new ::XMLSchema::string< char > (resourceName__)), + resourceValue_ (new ::CIAO::Config_Handlers::Any (resourceValue__)), regulator__ () { resourceUsage_->container (this); @@ -2342,12 +2346,15 @@ namespace CIAO // InstanceDeploymentDescription:: - InstanceDeploymentDescription () + InstanceDeploymentDescription (::XMLSchema::string< char > const& name__, + ::XMLSchema::string< char > const& node__, + ::XMLSchema::string< char > const& source__, + ::XMLSchema::IDREF< char > const& implementation__) : - name_ (new ::XMLSchema::string< char > ()), - node_ (new ::XMLSchema::string< char > ()), - source_ (new ::XMLSchema::string< char > ()), - implementation_ (new ::XMLSchema::IDREF< char > ()), + name_ (new ::XMLSchema::string< char > (name__)), + node_ (new ::XMLSchema::string< char > (node__)), + source_ (new ::XMLSchema::string< char > (source__)), + implementation_ (new ::XMLSchema::IDREF< char > (implementation__)), regulator__ () { name_->container (this); @@ -2630,11 +2637,6 @@ namespace CIAO // CCMComponentPortKind // - CCMComponentPortKind:: - CCMComponentPortKind () - { - } - CCMComponentPortKind::Value CCMComponentPortKind:: integral () const { @@ -2663,16 +2665,23 @@ namespace CIAO // ComponentPortDescription:: - ComponentPortDescription () + ComponentPortDescription (::XMLSchema::string< char > const& name__, + ::XMLSchema::string< char > const& specificType__, + ::XMLSchema::string< char > const& supportedType__, + ::XMLSchema::string< char > const& provider__, + ::XMLSchema::string< char > const& exclusiveProvider__, + ::XMLSchema::string< char > const& exclusiveUser__, + ::XMLSchema::string< char > const& optional__, + ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__) : - name_ (new ::XMLSchema::string< char > ()), - specificType_ (new ::XMLSchema::string< char > ()), - supportedType_ (new ::XMLSchema::string< char > ()), - provider_ (new ::XMLSchema::string< char > ()), - exclusiveProvider_ (new ::XMLSchema::string< char > ()), - exclusiveUser_ (new ::XMLSchema::string< char > ()), - optional_ (new ::XMLSchema::string< char > ()), - kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind ()), + name_ (new ::XMLSchema::string< char > (name__)), + specificType_ (new ::XMLSchema::string< char > (specificType__)), + supportedType_ (new ::XMLSchema::string< char > (supportedType__)), + provider_ (new ::XMLSchema::string< char > (provider__)), + exclusiveProvider_ (new ::XMLSchema::string< char > (exclusiveProvider__)), + exclusiveUser_ (new ::XMLSchema::string< char > (exclusiveUser__)), + optional_ (new ::XMLSchema::string< char > (optional__)), + kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (kind__)), regulator__ () { name_->container (this); @@ -2896,10 +2905,11 @@ namespace CIAO // ComponentPropertyDescription:: - ComponentPropertyDescription () + ComponentPropertyDescription (::XMLSchema::string< char > const& name__, + ::CIAO::Config_Handlers::DataType const& type__) : - name_ (new ::XMLSchema::string< char > ()), - type_ (new ::CIAO::Config_Handlers::DataType ()), + name_ (new ::XMLSchema::string< char > (name__)), + type_ (new ::CIAO::Config_Handlers::DataType (type__)), regulator__ () { name_->container (this); @@ -2973,9 +2983,9 @@ namespace CIAO // ComponentExternalPortEndpoint:: - ComponentExternalPortEndpoint () + ComponentExternalPortEndpoint (::XMLSchema::string< char > const& portName__) : - portName_ (new ::XMLSchema::string< char > ()), + portName_ (new ::XMLSchema::string< char > (portName__)), regulator__ () { portName_->container (this); @@ -3024,11 +3034,13 @@ namespace CIAO // PlanSubcomponentPortEndpoint:: - PlanSubcomponentPortEndpoint () + PlanSubcomponentPortEndpoint (::XMLSchema::string< char > const& portName__, + ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__, + ::XMLSchema::IDREF< char > const& instance__) : - portName_ (new ::XMLSchema::string< char > ()), - kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind ()), - instance_ (new ::XMLSchema::IDREF< char > ()), + portName_ (new ::XMLSchema::string< char > (portName__)), + kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (kind__)), + instance_ (new ::XMLSchema::IDREF< char > (instance__)), regulator__ () { portName_->container (this); @@ -3167,9 +3179,9 @@ namespace CIAO // ExternalReferenceEndpoint:: - ExternalReferenceEndpoint () + ExternalReferenceEndpoint (::XMLSchema::string< char > const& location__) : - location_ (new ::XMLSchema::string< char > ()), + location_ (new ::XMLSchema::string< char > (location__)), regulator__ () { location_->container (this); @@ -3218,12 +3230,15 @@ namespace CIAO // ConnectionResourceDeploymentDescription:: - ConnectionResourceDeploymentDescription () + ConnectionResourceDeploymentDescription (::XMLSchema::string< char > const& targetName__, + ::XMLSchema::string< char > const& requirementName__, + ::XMLSchema::string< char > const& resourceName__, + ::CIAO::Config_Handlers::Any const& resourceValue__) : - targetName_ (new ::XMLSchema::string< char > ()), - requirementName_ (new ::XMLSchema::string< char > ()), - resourceName_ (new ::XMLSchema::string< char > ()), - resourceValue_ (new ::CIAO::Config_Handlers::Any ()), + targetName_ (new ::XMLSchema::string< char > (targetName__)), + requirementName_ (new ::XMLSchema::string< char > (requirementName__)), + resourceName_ (new ::XMLSchema::string< char > (resourceName__)), + resourceValue_ (new ::CIAO::Config_Handlers::Any (resourceValue__)), regulator__ () { targetName_->container (this); @@ -3347,9 +3362,9 @@ namespace CIAO // PlanConnectionDescription:: - PlanConnectionDescription () + PlanConnectionDescription (::XMLSchema::string< char > const& name__) : - name_ (new ::XMLSchema::string< char > ()), + name_ (new ::XMLSchema::string< char > (name__)), regulator__ () { name_->container (this); @@ -3716,9 +3731,9 @@ namespace CIAO // ImplementationDependency:: - ImplementationDependency () + ImplementationDependency (::XMLSchema::string< char > const& requiredType__) : - requiredType_ (new ::XMLSchema::string< char > ()), + requiredType_ (new ::XMLSchema::string< char > (requiredType__)), regulator__ () { requiredType_->container (this); @@ -3767,11 +3782,13 @@ namespace CIAO // Capability:: - Capability () + Capability (::XMLSchema::string< char > const& name__, + ::XMLSchema::string< char > const& resourceType__, + ::CIAO::Config_Handlers::SatisfierProperty const& property__) : - name_ (new ::XMLSchema::string< char > ()), - resourceType_ (new ::XMLSchema::string< char > ()), - property_ (new ::CIAO::Config_Handlers::SatisfierProperty ()), + name_ (new ::XMLSchema::string< char > (name__)), + resourceType_ (new ::XMLSchema::string< char > (resourceType__)), + property_ (new ::CIAO::Config_Handlers::SatisfierProperty (property__)), regulator__ () { name_->container (this); @@ -3870,14 +3887,19 @@ namespace CIAO // ImplementationRequirement:: - ImplementationRequirement () + ImplementationRequirement (::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage__, + ::XMLSchema::string< char > const& resourcePort__, + ::XMLSchema::string< char > const& componentPort__, + ::XMLSchema::string< char > const& resourceType__, + ::XMLSchema::string< char > const& name__, + ::CIAO::Config_Handlers::Property const& property__) : - resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind ()), - resourcePort_ (new ::XMLSchema::string< char > ()), - componentPort_ (new ::XMLSchema::string< char > ()), - resourceType_ (new ::XMLSchema::string< char > ()), - name_ (new ::XMLSchema::string< char > ()), - property_ (new ::CIAO::Config_Handlers::Property ()), + resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (resourceUsage__)), + resourcePort_ (new ::XMLSchema::string< char > (resourcePort__)), + componentPort_ (new ::XMLSchema::string< char > (componentPort__)), + resourceType_ (new ::XMLSchema::string< char > (resourceType__)), + name_ (new ::XMLSchema::string< char > (name__)), + property_ (new ::CIAO::Config_Handlers::Property (property__)), regulator__ () { resourceUsage_->container (this); @@ -4051,11 +4073,13 @@ namespace CIAO // ComponentPackageReference:: - ComponentPackageReference () + ComponentPackageReference (::XMLSchema::string< char > const& requiredUUID__, + ::XMLSchema::string< char > const& requiredName__, + ::XMLSchema::string< char > const& requiredType__) : - requiredUUID_ (new ::XMLSchema::string< char > ()), - requiredName_ (new ::XMLSchema::string< char > ()), - requiredType_ (new ::XMLSchema::string< char > ()), + requiredUUID_ (new ::XMLSchema::string< char > (requiredUUID__)), + requiredName_ (new ::XMLSchema::string< char > (requiredName__)), + requiredType_ (new ::XMLSchema::string< char > (requiredType__)), regulator__ () { requiredUUID_->container (this); @@ -4154,10 +4178,11 @@ namespace CIAO // SubcomponentPortEndpoint:: - SubcomponentPortEndpoint () + SubcomponentPortEndpoint (::XMLSchema::string< char > const& portName__, + ::XMLSchema::IDREF< char > const& instance__) : - portName_ (new ::XMLSchema::string< char > ()), - instance_ (new ::XMLSchema::IDREF< char > ()), + portName_ (new ::XMLSchema::string< char > (portName__)), + instance_ (new ::XMLSchema::IDREF< char > (instance__)), regulator__ () { portName_->container (this); @@ -4231,9 +4256,9 @@ namespace CIAO // AssemblyConnectionDescription:: - AssemblyConnectionDescription () + AssemblyConnectionDescription (::XMLSchema::string< char > const& name__) : - name_ (new ::XMLSchema::string< char > ()), + name_ (new ::XMLSchema::string< char > (name__)), regulator__ () { name_->container (this); @@ -4662,9 +4687,7 @@ namespace CIAO DataType:: DataType (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - regulator__ () + :Base__ (e), regulator__ () { ::XSCRT::Parser< char > p (e); @@ -4691,9 +4714,7 @@ namespace CIAO DataValue:: DataValue (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - regulator__ () + :Base__ (e), regulator__ () { ::XSCRT::Parser< char > p (e); @@ -4810,14 +4831,8 @@ namespace CIAO Any:: Any (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - type_ (new ::CIAO::Config_Handlers::DataType ()), - value_ (new ::CIAO::Config_Handlers::DataValue ()), - regulator__ () + :Base__ (e), regulator__ () { - type_->container (this); - value_->container (this); ::XSCRT::Parser< char > p (e); @@ -4828,14 +4843,14 @@ namespace CIAO if (n == "type") { - ::CIAO::Config_Handlers::DataType t (e); - type (t); + type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e)); + type_->container (this); } else if (n == "value") { - ::CIAO::Config_Handlers::DataValue t (e); - value (t); + value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataValue > (new ::CIAO::Config_Handlers::DataValue (e)); + value_->container (this); } else @@ -4849,14 +4864,8 @@ namespace CIAO Property:: Property (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - name_ (new ::XMLSchema::string< char > ()), - value_ (new ::CIAO::Config_Handlers::Any ()), - regulator__ () + :Base__ (e), regulator__ () { - name_->container (this); - value_->container (this); ::XSCRT::Parser< char > p (e); @@ -4867,14 +4876,14 @@ namespace CIAO if (n == "name") { - ::XMLSchema::string< char > t (e); - name (t); + name_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + name_->container (this); } else if (n == "value") { - ::CIAO::Config_Handlers::Any t (e); - value (t); + value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e)); + value_->container (this); } else @@ -4888,14 +4897,8 @@ namespace CIAO Node:: Node (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - name_ (new ::XMLSchema::string< char > ()), - label_ (new ::XMLSchema::string< char > ()), - regulator__ () + :Base__ (e), regulator__ () { - name_->container (this); - label_->container (this); ::XSCRT::Parser< char > p (e); @@ -4906,14 +4909,14 @@ namespace CIAO if (n == "name") { - ::XMLSchema::string< char > t (e); - name (t); + name_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + name_->container (this); } else if (n == "label") { - ::XMLSchema::string< char > t (e); - label (t); + label_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + label_->container (this); } else @@ -4971,16 +4974,8 @@ namespace CIAO SatisfierProperty:: SatisfierProperty (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - name_ (new ::XMLSchema::string< char > ()), - kind_ (new ::CIAO::Config_Handlers::SatisfierPropertyKind ()), - value_ (new ::CIAO::Config_Handlers::Any ()), - regulator__ () + :Base__ (e), regulator__ () { - name_->container (this); - kind_->container (this); - value_->container (this); ::XSCRT::Parser< char > p (e); @@ -4991,20 +4986,20 @@ namespace CIAO if (n == "name") { - ::XMLSchema::string< char > t (e); - name (t); + name_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + name_->container (this); } else if (n == "kind") { - ::CIAO::Config_Handlers::SatisfierPropertyKind t (e); - kind (t); + kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierPropertyKind > (new ::CIAO::Config_Handlers::SatisfierPropertyKind (e)); + kind_->container (this); } else if (n == "value") { - ::CIAO::Config_Handlers::Any t (e); - value (t); + value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e)); + value_->container (this); } else @@ -5018,16 +5013,8 @@ namespace CIAO Resource:: Resource (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - name_ (new ::XMLSchema::string< char > ()), - resourceType_ (new ::XMLSchema::string< char > ()), - property_ (new ::CIAO::Config_Handlers::SatisfierProperty ()), - regulator__ () + :Base__ (e), regulator__ () { - name_->container (this); - resourceType_->container (this); - property_->container (this); ::XSCRT::Parser< char > p (e); @@ -5038,20 +5025,20 @@ namespace CIAO if (n == "name") { - ::XMLSchema::string< char > t (e); - name (t); + name_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + name_->container (this); } else if (n == "resourceType") { - ::XMLSchema::string< char > t (e); - resourceType (t); + resourceType_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + resourceType_->container (this); } else if (n == "property") { - ::CIAO::Config_Handlers::SatisfierProperty t (e); - property (t); + property_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > (new ::CIAO::Config_Handlers::SatisfierProperty (e)); + property_->container (this); } else @@ -5065,18 +5052,8 @@ namespace CIAO SharedResource:: SharedResource (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - name_ (new ::XMLSchema::string< char > ()), - resourceType_ (new ::XMLSchema::string< char > ()), - node_ (new ::CIAO::Config_Handlers::Node ()), - property_ (new ::CIAO::Config_Handlers::SatisfierProperty ()), - regulator__ () + :Base__ (e), regulator__ () { - name_->container (this); - resourceType_->container (this); - node_->container (this); - property_->container (this); ::XSCRT::Parser< char > p (e); @@ -5087,26 +5064,26 @@ namespace CIAO if (n == "name") { - ::XMLSchema::string< char > t (e); - name (t); + name_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + name_->container (this); } else if (n == "resourceType") { - ::XMLSchema::string< char > t (e); - resourceType (t); + resourceType_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + resourceType_->container (this); } else if (n == "node") { - ::CIAO::Config_Handlers::Node t (e); - node (t); + node_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Node > (new ::CIAO::Config_Handlers::Node (e)); + node_->container (this); } else if (n == "property") { - ::CIAO::Config_Handlers::SatisfierProperty t (e); - property (t); + property_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > (new ::CIAO::Config_Handlers::SatisfierProperty (e)); + property_->container (this); } else @@ -5120,16 +5097,8 @@ namespace CIAO Requirement:: Requirement (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - resourceType_ (new ::XMLSchema::string< char > ()), - name_ (new ::XMLSchema::string< char > ()), - property_ (new ::CIAO::Config_Handlers::Property ()), - regulator__ () + :Base__ (e), regulator__ () { - resourceType_->container (this); - name_->container (this); - property_->container (this); ::XSCRT::Parser< char > p (e); @@ -5140,20 +5109,20 @@ namespace CIAO if (n == "resourceType") { - ::XMLSchema::string< char > t (e); - resourceType (t); + resourceType_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + resourceType_->container (this); } else if (n == "name") { - ::XMLSchema::string< char > t (e); - name (t); + name_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + name_->container (this); } else if (n == "property") { - ::CIAO::Config_Handlers::Property t (e); - property (t); + property_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e)); + property_->container (this); } else @@ -5167,16 +5136,8 @@ namespace CIAO ResourceDeploymentDescription:: ResourceDeploymentDescription (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - requirementName_ (new ::XMLSchema::string< char > ()), - resourceName_ (new ::XMLSchema::string< char > ()), - resourceValue_ (new ::CIAO::Config_Handlers::Any ()), - regulator__ () + :Base__ (e), regulator__ () { - requirementName_->container (this); - resourceName_->container (this); - resourceValue_->container (this); ::XSCRT::Parser< char > p (e); @@ -5187,20 +5148,20 @@ namespace CIAO if (n == "requirementName") { - ::XMLSchema::string< char > t (e); - requirementName (t); + requirementName_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + requirementName_->container (this); } else if (n == "resourceName") { - ::XMLSchema::string< char > t (e); - resourceName (t); + resourceName_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + resourceName_->container (this); } else if (n == "resourceValue") { - ::CIAO::Config_Handlers::Any t (e); - resourceValue (t); + resourceValue_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e)); + resourceValue_->container (this); } else @@ -5214,14 +5175,8 @@ namespace CIAO ArtifactDeploymentDescription:: ArtifactDeploymentDescription (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - name_ (new ::XMLSchema::string< char > ()), - source_ (new ::XMLSchema::string< char > ()), - regulator__ () + :Base__ (e), regulator__ () { - name_->container (this); - source_->container (this); ::XSCRT::Parser< char > p (e); @@ -5232,14 +5187,14 @@ namespace CIAO if (n == "name") { - ::XMLSchema::string< char > t (e); - name (t); + name_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + name_->container (this); } else if (n == "source") { - ::XMLSchema::string< char > t (e); - source (t); + source_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + source_->container (this); } else if (n == "node") @@ -5298,14 +5253,8 @@ namespace CIAO MonolithicDeploymentDescription:: MonolithicDeploymentDescription (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - name_ (new ::XMLSchema::string< char > ()), - source_ (new ::XMLSchema::string< char > ()), - regulator__ () + :Base__ (e), regulator__ () { - name_->container (this); - source_->container (this); ::XSCRT::Parser< char > p (e); @@ -5316,14 +5265,14 @@ namespace CIAO if (n == "name") { - ::XMLSchema::string< char > t (e); - name (t); + name_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + name_->container (this); } else if (n == "source") { - ::XMLSchema::string< char > t (e); - source (t); + source_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + source_->container (this); } else if (n == "artifact") @@ -5411,18 +5360,8 @@ namespace CIAO InstanceResourceDeploymentDescription:: InstanceResourceDeploymentDescription (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind ()), - requirementName_ (new ::XMLSchema::string< char > ()), - resourceName_ (new ::XMLSchema::string< char > ()), - resourceValue_ (new ::CIAO::Config_Handlers::Any ()), - regulator__ () + :Base__ (e), regulator__ () { - resourceUsage_->container (this); - requirementName_->container (this); - resourceName_->container (this); - resourceValue_->container (this); ::XSCRT::Parser< char > p (e); @@ -5433,26 +5372,26 @@ namespace CIAO if (n == "resourceUsage") { - ::CIAO::Config_Handlers::ResourceUsageKind t (e); - resourceUsage (t); + resourceUsage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > (new ::CIAO::Config_Handlers::ResourceUsageKind (e)); + resourceUsage_->container (this); } else if (n == "requirementName") { - ::XMLSchema::string< char > t (e); - requirementName (t); + requirementName_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + requirementName_->container (this); } else if (n == "resourceName") { - ::XMLSchema::string< char > t (e); - resourceName (t); + resourceName_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + resourceName_->container (this); } else if (n == "resourceValue") { - ::CIAO::Config_Handlers::Any t (e); - resourceValue (t); + resourceValue_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e)); + resourceValue_->container (this); } else @@ -5466,18 +5405,8 @@ namespace CIAO InstanceDeploymentDescription:: InstanceDeploymentDescription (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - name_ (new ::XMLSchema::string< char > ()), - node_ (new ::XMLSchema::string< char > ()), - source_ (new ::XMLSchema::string< char > ()), - implementation_ (new ::XMLSchema::IDREF< char > ()), - regulator__ () + :Base__ (e), regulator__ () { - name_->container (this); - node_->container (this); - source_->container (this); - implementation_->container (this); ::XSCRT::Parser< char > p (e); @@ -5488,26 +5417,26 @@ namespace CIAO if (n == "name") { - ::XMLSchema::string< char > t (e); - name (t); + name_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + name_->container (this); } else if (n == "node") { - ::XMLSchema::string< char > t (e); - node (t); + node_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + node_->container (this); } else if (n == "source") { - ::XMLSchema::string< char > t (e); - source (t); + source_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + source_->container (this); } else if (n == "implementation") { - ::XMLSchema::IDREF< char > t (e); - implementation (t); + implementation_ = ::std::auto_ptr< ::XMLSchema::IDREF< char > > (new ::XMLSchema::IDREF< char > (e)); + implementation_->container (this); } else if (n == "configProperty") @@ -5598,26 +5527,8 @@ namespace CIAO ComponentPortDescription:: ComponentPortDescription (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - name_ (new ::XMLSchema::string< char > ()), - specificType_ (new ::XMLSchema::string< char > ()), - supportedType_ (new ::XMLSchema::string< char > ()), - provider_ (new ::XMLSchema::string< char > ()), - exclusiveProvider_ (new ::XMLSchema::string< char > ()), - exclusiveUser_ (new ::XMLSchema::string< char > ()), - optional_ (new ::XMLSchema::string< char > ()), - kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind ()), - regulator__ () + :Base__ (e), regulator__ () { - name_->container (this); - specificType_->container (this); - supportedType_->container (this); - provider_->container (this); - exclusiveProvider_->container (this); - exclusiveUser_->container (this); - optional_->container (this); - kind_->container (this); ::XSCRT::Parser< char > p (e); @@ -5628,50 +5539,50 @@ namespace CIAO if (n == "name") { - ::XMLSchema::string< char > t (e); - name (t); + name_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + name_->container (this); } else if (n == "specificType") { - ::XMLSchema::string< char > t (e); - specificType (t); + specificType_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + specificType_->container (this); } else if (n == "supportedType") { - ::XMLSchema::string< char > t (e); - supportedType (t); + supportedType_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + supportedType_->container (this); } else if (n == "provider") { - ::XMLSchema::string< char > t (e); - provider (t); + provider_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + provider_->container (this); } else if (n == "exclusiveProvider") { - ::XMLSchema::string< char > t (e); - exclusiveProvider (t); + exclusiveProvider_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + exclusiveProvider_->container (this); } else if (n == "exclusiveUser") { - ::XMLSchema::string< char > t (e); - exclusiveUser (t); + exclusiveUser_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + exclusiveUser_->container (this); } else if (n == "optional") { - ::XMLSchema::string< char > t (e); - optional (t); + optional_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + optional_->container (this); } else if (n == "kind") { - ::CIAO::Config_Handlers::CCMComponentPortKind t (e); - kind (t); + kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > (new ::CIAO::Config_Handlers::CCMComponentPortKind (e)); + kind_->container (this); } else @@ -5685,14 +5596,8 @@ namespace CIAO ComponentPropertyDescription:: ComponentPropertyDescription (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - name_ (new ::XMLSchema::string< char > ()), - type_ (new ::CIAO::Config_Handlers::DataType ()), - regulator__ () + :Base__ (e), regulator__ () { - name_->container (this); - type_->container (this); ::XSCRT::Parser< char > p (e); @@ -5703,14 +5608,14 @@ namespace CIAO if (n == "name") { - ::XMLSchema::string< char > t (e); - name (t); + name_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + name_->container (this); } else if (n == "type") { - ::CIAO::Config_Handlers::DataType t (e); - type (t); + type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e)); + type_->container (this); } else @@ -5724,12 +5629,8 @@ namespace CIAO ComponentExternalPortEndpoint:: ComponentExternalPortEndpoint (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - portName_ (new ::XMLSchema::string< char > ()), - regulator__ () + :Base__ (e), regulator__ () { - portName_->container (this); ::XSCRT::Parser< char > p (e); @@ -5740,8 +5641,8 @@ namespace CIAO if (n == "portName") { - ::XMLSchema::string< char > t (e); - portName (t); + portName_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + portName_->container (this); } else @@ -5755,16 +5656,8 @@ namespace CIAO PlanSubcomponentPortEndpoint:: PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - portName_ (new ::XMLSchema::string< char > ()), - kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind ()), - instance_ (new ::XMLSchema::IDREF< char > ()), - regulator__ () + :Base__ (e), regulator__ () { - portName_->container (this); - kind_->container (this); - instance_->container (this); ::XSCRT::Parser< char > p (e); @@ -5775,8 +5668,8 @@ namespace CIAO if (n == "portName") { - ::XMLSchema::string< char > t (e); - portName (t); + portName_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + portName_->container (this); } else if (n == "provider") @@ -5787,14 +5680,14 @@ namespace CIAO else if (n == "kind") { - ::CIAO::Config_Handlers::CCMComponentPortKind t (e); - kind (t); + kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > (new ::CIAO::Config_Handlers::CCMComponentPortKind (e)); + kind_->container (this); } else if (n == "instance") { - ::XMLSchema::IDREF< char > t (e); - instance (t); + instance_ = ::std::auto_ptr< ::XMLSchema::IDREF< char > > (new ::XMLSchema::IDREF< char > (e)); + instance_->container (this); } else @@ -5808,12 +5701,8 @@ namespace CIAO ExternalReferenceEndpoint:: ExternalReferenceEndpoint (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - location_ (new ::XMLSchema::string< char > ()), - regulator__ () + :Base__ (e), regulator__ () { - location_->container (this); ::XSCRT::Parser< char > p (e); @@ -5824,8 +5713,8 @@ namespace CIAO if (n == "location") { - ::XMLSchema::string< char > t (e); - location (t); + location_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + location_->container (this); } else @@ -5839,18 +5728,8 @@ namespace CIAO ConnectionResourceDeploymentDescription:: ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - targetName_ (new ::XMLSchema::string< char > ()), - requirementName_ (new ::XMLSchema::string< char > ()), - resourceName_ (new ::XMLSchema::string< char > ()), - resourceValue_ (new ::CIAO::Config_Handlers::Any ()), - regulator__ () + :Base__ (e), regulator__ () { - targetName_->container (this); - requirementName_->container (this); - resourceName_->container (this); - resourceValue_->container (this); ::XSCRT::Parser< char > p (e); @@ -5861,26 +5740,26 @@ namespace CIAO if (n == "targetName") { - ::XMLSchema::string< char > t (e); - targetName (t); + targetName_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + targetName_->container (this); } else if (n == "requirementName") { - ::XMLSchema::string< char > t (e); - requirementName (t); + requirementName_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + requirementName_->container (this); } else if (n == "resourceName") { - ::XMLSchema::string< char > t (e); - resourceName (t); + resourceName_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + resourceName_->container (this); } else if (n == "resourceValue") { - ::CIAO::Config_Handlers::Any t (e); - resourceValue (t); + resourceValue_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e)); + resourceValue_->container (this); } else @@ -5894,12 +5773,8 @@ namespace CIAO PlanConnectionDescription:: PlanConnectionDescription (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - name_ (new ::XMLSchema::string< char > ()), - regulator__ () + :Base__ (e), regulator__ () { - name_->container (this); ::XSCRT::Parser< char > p (e); @@ -5910,8 +5785,8 @@ namespace CIAO if (n == "name") { - ::XMLSchema::string< char > t (e); - name (t); + name_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + name_->container (this); } else if (n == "source") @@ -5961,12 +5836,8 @@ namespace CIAO ImplementationDependency:: ImplementationDependency (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - requiredType_ (new ::XMLSchema::string< char > ()), - regulator__ () + :Base__ (e), regulator__ () { - requiredType_->container (this); ::XSCRT::Parser< char > p (e); @@ -5977,8 +5848,8 @@ namespace CIAO if (n == "requiredType") { - ::XMLSchema::string< char > t (e); - requiredType (t); + requiredType_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + requiredType_->container (this); } else @@ -5992,16 +5863,8 @@ namespace CIAO Capability:: Capability (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - name_ (new ::XMLSchema::string< char > ()), - resourceType_ (new ::XMLSchema::string< char > ()), - property_ (new ::CIAO::Config_Handlers::SatisfierProperty ()), - regulator__ () + :Base__ (e), regulator__ () { - name_->container (this); - resourceType_->container (this); - property_->container (this); ::XSCRT::Parser< char > p (e); @@ -6012,20 +5875,20 @@ namespace CIAO if (n == "name") { - ::XMLSchema::string< char > t (e); - name (t); + name_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + name_->container (this); } else if (n == "resourceType") { - ::XMLSchema::string< char > t (e); - resourceType (t); + resourceType_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + resourceType_->container (this); } else if (n == "property") { - ::CIAO::Config_Handlers::SatisfierProperty t (e); - property (t); + property_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > (new ::CIAO::Config_Handlers::SatisfierProperty (e)); + property_->container (this); } else @@ -6039,22 +5902,8 @@ namespace CIAO ImplementationRequirement:: ImplementationRequirement (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind ()), - resourcePort_ (new ::XMLSchema::string< char > ()), - componentPort_ (new ::XMLSchema::string< char > ()), - resourceType_ (new ::XMLSchema::string< char > ()), - name_ (new ::XMLSchema::string< char > ()), - property_ (new ::CIAO::Config_Handlers::Property ()), - regulator__ () + :Base__ (e), regulator__ () { - resourceUsage_->container (this); - resourcePort_->container (this); - componentPort_->container (this); - resourceType_->container (this); - name_->container (this); - property_->container (this); ::XSCRT::Parser< char > p (e); @@ -6065,38 +5914,38 @@ namespace CIAO if (n == "resourceUsage") { - ::CIAO::Config_Handlers::ResourceUsageKind t (e); - resourceUsage (t); + resourceUsage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > (new ::CIAO::Config_Handlers::ResourceUsageKind (e)); + resourceUsage_->container (this); } else if (n == "resourcePort") { - ::XMLSchema::string< char > t (e); - resourcePort (t); + resourcePort_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + resourcePort_->container (this); } else if (n == "componentPort") { - ::XMLSchema::string< char > t (e); - componentPort (t); + componentPort_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + componentPort_->container (this); } else if (n == "resourceType") { - ::XMLSchema::string< char > t (e); - resourceType (t); + resourceType_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + resourceType_->container (this); } else if (n == "name") { - ::XMLSchema::string< char > t (e); - name (t); + name_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + name_->container (this); } else if (n == "property") { - ::CIAO::Config_Handlers::Property t (e); - property (t); + property_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e)); + property_->container (this); } else @@ -6110,16 +5959,8 @@ namespace CIAO ComponentPackageReference:: ComponentPackageReference (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - requiredUUID_ (new ::XMLSchema::string< char > ()), - requiredName_ (new ::XMLSchema::string< char > ()), - requiredType_ (new ::XMLSchema::string< char > ()), - regulator__ () + :Base__ (e), regulator__ () { - requiredUUID_->container (this); - requiredName_->container (this); - requiredType_->container (this); ::XSCRT::Parser< char > p (e); @@ -6130,20 +5971,20 @@ namespace CIAO if (n == "requiredUUID") { - ::XMLSchema::string< char > t (e); - requiredUUID (t); + requiredUUID_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + requiredUUID_->container (this); } else if (n == "requiredName") { - ::XMLSchema::string< char > t (e); - requiredName (t); + requiredName_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + requiredName_->container (this); } else if (n == "requiredType") { - ::XMLSchema::string< char > t (e); - requiredType (t); + requiredType_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + requiredType_->container (this); } else @@ -6157,14 +5998,8 @@ namespace CIAO SubcomponentPortEndpoint:: SubcomponentPortEndpoint (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - portName_ (new ::XMLSchema::string< char > ()), - instance_ (new ::XMLSchema::IDREF< char > ()), - regulator__ () + :Base__ (e), regulator__ () { - portName_->container (this); - instance_->container (this); ::XSCRT::Parser< char > p (e); @@ -6175,14 +6010,14 @@ namespace CIAO if (n == "portName") { - ::XMLSchema::string< char > t (e); - portName (t); + portName_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + portName_->container (this); } else if (n == "instance") { - ::XMLSchema::IDREF< char > t (e); - instance (t); + instance_ = ::std::auto_ptr< ::XMLSchema::IDREF< char > > (new ::XMLSchema::IDREF< char > (e)); + instance_->container (this); } else @@ -6196,12 +6031,8 @@ namespace CIAO AssemblyConnectionDescription:: AssemblyConnectionDescription (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - name_ (new ::XMLSchema::string< char > ()), - regulator__ () + :Base__ (e), regulator__ () { - name_->container (this); ::XSCRT::Parser< char > p (e); @@ -6212,8 +6043,8 @@ namespace CIAO if (n == "name") { - ::XMLSchema::string< char > t (e); - name (t); + name_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + name_->container (this); } else if (n == "deployRequirement") diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp b/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp index 735ed133b4f..beedff7b7d5 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp @@ -54,7 +54,6 @@ namespace CIAO class TCKind : public ::XSCRT::Type { public: - TCKind (); TCKind (::XSCRT::XML::Element< char > const&); TCKind (::XSCRT::XML::Attribute< char > const&); @@ -171,6 +170,7 @@ namespace CIAO public: DataType (); + DataType (::XSCRT::XML::Element< char > const&); DataType (DataType const& s); @@ -364,6 +364,7 @@ namespace CIAO public: DataValue (); + DataValue (::XSCRT::XML::Element< char > const&); DataValue (DataValue const& s); @@ -400,7 +401,9 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::DataValue > value_; public: - Any (); + Any (::CIAO::Config_Handlers::DataType const& type__, + ::CIAO::Config_Handlers::DataValue const& value__); + Any (::XSCRT::XML::Element< char > const&); Any (Any const& s); @@ -437,7 +440,9 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::Any > value_; public: - Property (); + Property (::XMLSchema::string< char > const& name__, + ::CIAO::Config_Handlers::Any const& value__); + Property (::XSCRT::XML::Element< char > const&); Property (Property const& s); @@ -474,7 +479,9 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< char > > label_; public: - Node (); + Node (::XMLSchema::string< char > const& name__, + ::XMLSchema::string< char > const& label__); + Node (::XSCRT::XML::Element< char > const&); Node (Node const& s); @@ -488,7 +495,6 @@ namespace CIAO class SatisfierPropertyKind : public ::XSCRT::Type { public: - SatisfierPropertyKind (); SatisfierPropertyKind (::XSCRT::XML::Element< char > const&); SatisfierPropertyKind (::XSCRT::XML::Attribute< char > const&); @@ -561,7 +567,10 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::Any > value_; public: - SatisfierProperty (); + SatisfierProperty (::XMLSchema::string< char > const& name__, + ::CIAO::Config_Handlers::SatisfierPropertyKind const& kind__, + ::CIAO::Config_Handlers::Any const& value__); + SatisfierProperty (::XSCRT::XML::Element< char > const&); SatisfierProperty (SatisfierProperty const& s); @@ -608,7 +617,10 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > property_; public: - Resource (); + Resource (::XMLSchema::string< char > const& name__, + ::XMLSchema::string< char > const& resourceType__, + ::CIAO::Config_Handlers::SatisfierProperty const& property__); + Resource (::XSCRT::XML::Element< char > const&); Resource (Resource const& s); @@ -665,7 +677,11 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > property_; public: - SharedResource (); + SharedResource (::XMLSchema::string< char > const& name__, + ::XMLSchema::string< char > const& resourceType__, + ::CIAO::Config_Handlers::Node const& node__, + ::CIAO::Config_Handlers::SatisfierProperty const& property__); + SharedResource (::XSCRT::XML::Element< char > const&); SharedResource (SharedResource const& s); @@ -712,7 +728,10 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::Property > property_; public: - Requirement (); + Requirement (::XMLSchema::string< char > const& resourceType__, + ::XMLSchema::string< char > const& name__, + ::CIAO::Config_Handlers::Property const& property__); + Requirement (::XSCRT::XML::Element< char > const&); Requirement (Requirement const& s); @@ -759,7 +778,10 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::Any > resourceValue_; public: - ResourceDeploymentDescription (); + ResourceDeploymentDescription (::XMLSchema::string< char > const& requirementName__, + ::XMLSchema::string< char > const& resourceName__, + ::CIAO::Config_Handlers::Any const& resourceValue__); + ResourceDeploymentDescription (::XSCRT::XML::Element< char > const&); ResourceDeploymentDescription (ResourceDeploymentDescription const& s); @@ -865,7 +887,9 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::ID< char > > id_; public: - ArtifactDeploymentDescription (); + ArtifactDeploymentDescription (::XMLSchema::string< char > const& name__, + ::XMLSchema::string< char > const& source__); + ArtifactDeploymentDescription (::XSCRT::XML::Element< char > const&); ArtifactDeploymentDescription (ArtifactDeploymentDescription const& s); @@ -949,7 +973,9 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::ID< char > > id_; public: - MonolithicDeploymentDescription (); + MonolithicDeploymentDescription (::XMLSchema::string< char > const& name__, + ::XMLSchema::string< char > const& source__); + MonolithicDeploymentDescription (::XSCRT::XML::Element< char > const&); MonolithicDeploymentDescription (MonolithicDeploymentDescription const& s); @@ -963,7 +989,6 @@ namespace CIAO class ResourceUsageKind : public ::XSCRT::Type { public: - ResourceUsageKind (); ResourceUsageKind (::XSCRT::XML::Element< char > const&); ResourceUsageKind (::XSCRT::XML::Attribute< char > const&); @@ -1044,7 +1069,11 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::Any > resourceValue_; public: - InstanceResourceDeploymentDescription (); + InstanceResourceDeploymentDescription (::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage__, + ::XMLSchema::string< char > const& requirementName__, + ::XMLSchema::string< char > const& resourceName__, + ::CIAO::Config_Handlers::Any const& resourceValue__); + InstanceResourceDeploymentDescription (::XSCRT::XML::Element< char > const&); InstanceResourceDeploymentDescription (InstanceResourceDeploymentDescription const& s); @@ -1145,7 +1174,11 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::ID< char > > id_; public: - InstanceDeploymentDescription (); + InstanceDeploymentDescription (::XMLSchema::string< char > const& name__, + ::XMLSchema::string< char > const& node__, + ::XMLSchema::string< char > const& source__, + ::XMLSchema::IDREF< char > const& implementation__); + InstanceDeploymentDescription (::XSCRT::XML::Element< char > const&); InstanceDeploymentDescription (InstanceDeploymentDescription const& s); @@ -1159,7 +1192,6 @@ namespace CIAO class CCMComponentPortKind : public ::XSCRT::Type { public: - CCMComponentPortKind (); CCMComponentPortKind (::XSCRT::XML::Element< char > const&); CCMComponentPortKind (::XSCRT::XML::Attribute< char > const&); @@ -1282,7 +1314,15 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > kind_; public: - ComponentPortDescription (); + ComponentPortDescription (::XMLSchema::string< char > const& name__, + ::XMLSchema::string< char > const& specificType__, + ::XMLSchema::string< char > const& supportedType__, + ::XMLSchema::string< char > const& provider__, + ::XMLSchema::string< char > const& exclusiveProvider__, + ::XMLSchema::string< char > const& exclusiveUser__, + ::XMLSchema::string< char > const& optional__, + ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__); + ComponentPortDescription (::XSCRT::XML::Element< char > const&); ComponentPortDescription (ComponentPortDescription const& s); @@ -1319,7 +1359,9 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > type_; public: - ComponentPropertyDescription (); + ComponentPropertyDescription (::XMLSchema::string< char > const& name__, + ::CIAO::Config_Handlers::DataType const& type__); + ComponentPropertyDescription (::XSCRT::XML::Element< char > const&); ComponentPropertyDescription (ComponentPropertyDescription const& s); @@ -1346,7 +1388,8 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< char > > portName_; public: - ComponentExternalPortEndpoint (); + ComponentExternalPortEndpoint (::XMLSchema::string< char > const& portName__); + ComponentExternalPortEndpoint (::XSCRT::XML::Element< char > const&); ComponentExternalPortEndpoint (ComponentExternalPortEndpoint const& s); @@ -1404,7 +1447,10 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::IDREF< char > > instance_; public: - PlanSubcomponentPortEndpoint (); + PlanSubcomponentPortEndpoint (::XMLSchema::string< char > const& portName__, + ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__, + ::XMLSchema::IDREF< char > const& instance__); + PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< char > const&); PlanSubcomponentPortEndpoint (PlanSubcomponentPortEndpoint const& s); @@ -1431,7 +1477,8 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< char > > location_; public: - ExternalReferenceEndpoint (); + ExternalReferenceEndpoint (::XMLSchema::string< char > const& location__); + ExternalReferenceEndpoint (::XSCRT::XML::Element< char > const&); ExternalReferenceEndpoint (ExternalReferenceEndpoint const& s); @@ -1488,7 +1535,11 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::Any > resourceValue_; public: - ConnectionResourceDeploymentDescription (); + ConnectionResourceDeploymentDescription (::XMLSchema::string< char > const& targetName__, + ::XMLSchema::string< char > const& requirementName__, + ::XMLSchema::string< char > const& resourceName__, + ::CIAO::Config_Handlers::Any const& resourceValue__); + ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< char > const&); ConnectionResourceDeploymentDescription (ConnectionResourceDeploymentDescription const& s); @@ -1590,7 +1641,8 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription > deployedResource_; public: - PlanConnectionDescription (); + PlanConnectionDescription (::XMLSchema::string< char > const& name__); + PlanConnectionDescription (::XSCRT::XML::Element< char > const&); PlanConnectionDescription (PlanConnectionDescription const& s); @@ -1617,7 +1669,8 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< char > > requiredType_; public: - ImplementationDependency (); + ImplementationDependency (::XMLSchema::string< char > const& requiredType__); + ImplementationDependency (::XSCRT::XML::Element< char > const&); ImplementationDependency (ImplementationDependency const& s); @@ -1664,7 +1717,10 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > property_; public: - Capability (); + Capability (::XMLSchema::string< char > const& name__, + ::XMLSchema::string< char > const& resourceType__, + ::CIAO::Config_Handlers::SatisfierProperty const& property__); + Capability (::XSCRT::XML::Element< char > const&); Capability (Capability const& s); @@ -1741,7 +1797,13 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::Property > property_; public: - ImplementationRequirement (); + ImplementationRequirement (::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage__, + ::XMLSchema::string< char > const& resourcePort__, + ::XMLSchema::string< char > const& componentPort__, + ::XMLSchema::string< char > const& resourceType__, + ::XMLSchema::string< char > const& name__, + ::CIAO::Config_Handlers::Property const& property__); + ImplementationRequirement (::XSCRT::XML::Element< char > const&); ImplementationRequirement (ImplementationRequirement const& s); @@ -1788,7 +1850,10 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< char > > requiredType_; public: - ComponentPackageReference (); + ComponentPackageReference (::XMLSchema::string< char > const& requiredUUID__, + ::XMLSchema::string< char > const& requiredName__, + ::XMLSchema::string< char > const& requiredType__); + ComponentPackageReference (::XSCRT::XML::Element< char > const&); ComponentPackageReference (ComponentPackageReference const& s); @@ -1825,7 +1890,9 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::IDREF< char > > instance_; public: - SubcomponentPortEndpoint (); + SubcomponentPortEndpoint (::XMLSchema::string< char > const& portName__, + ::XMLSchema::IDREF< char > const& instance__); + SubcomponentPortEndpoint (::XSCRT::XML::Element< char > const&); SubcomponentPortEndpoint (SubcomponentPortEndpoint const& s); @@ -1905,7 +1972,8 @@ namespace CIAO ::std::vector< ::CIAO::Config_Handlers::ExternalReferenceEndpoint > externalReference_; public: - AssemblyConnectionDescription (); + AssemblyConnectionDescription (::XMLSchema::string< char > const& name__); + AssemblyConnectionDescription (::XSCRT::XML::Element< char > const&); AssemblyConnectionDescription (AssemblyConnectionDescription const& s); diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CCD_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/CCD_Handler.cpp new file mode 100644 index 00000000000..4c2723462dd --- /dev/null +++ b/TAO/CIAO/DAnCE/Config_Handlers/CCD_Handler.cpp @@ -0,0 +1,160 @@ +// $Id$ + +#include "CCD_Handler.h" +#include "Property_Handler.h" +#include "CPD_Handler.h" +#include "ComponentPropertyDescription_Handler.h" + + +namespace CIAO +{ + namespace Config_Handlers + { + bool + CCD_Handler::component_interface_descr ( + Deployment::ComponentInterfaceDescription& toconfig, + ComponentInterfaceDescription& desc) + { + if(desc.UUID_p ()) + { + toconfig.UUID = + CORBA::string_dup (desc.UUID ().c_str ()); + } + + if(desc.label_p ()) + { + toconfig.label = + CORBA::string_dup (desc.label ().c_str ()); + } + + if(desc.specificType_p ()) + { + toconfig.specificType = + CORBA::string_dup (desc.specificType ().c_str ()); + } + + ComponentInterfaceDescription::supportedType_iterator + end = desc.end_supportedType (); + + for (ComponentInterfaceDescription::supportedType_iterator s = + desc.begin_supportedType (); + s != end; ++s) + { + // This loop is going to be very slow! :(! + CORBA::ULong len = + toconfig.supportedType.length (); + + toconfig.supportedType.length (len + 1); + toconfig.supportedType[len] = + CORBA::string_dup ((*s).c_str ()); + } + + if (desc.idlFile_p ()) + { + CORBA::ULong len = + toconfig.supportedType.length (); + + if (!desc.idlFile ().empty ()) + { + toconfig.supportedType.length (len + 1); + toconfig.idlFile [len] = + CORBA::string_dup (desc.idlFile ().c_str ()); + } + } + + + ComponentInterfaceDescription::configProperty_iterator pend = + desc.end_configProperty (); + + for (ComponentInterfaceDescription::configProperty_iterator pstart = + desc.begin_configProperty (); + pstart != pend; + ++pstart) + { + // Need to improve this. This is clearly O(n^2). + CORBA::ULong len = + toconfig.configProperty.length (); + + toconfig.configProperty.length (len + 1); + + Property_Handler::get_property (*pstart, + toconfig.configProperty [len]); + } + + + /******************************* + * Will need to rework the ones in the bottom like the above. + * + */ + + //Create the handler for the + //<ComponentPortDescriptions>. + CPD_Handler cpd_handler; + + + //Iterate through each of the XSC Component + //Port Descriptions and use the CPD_Handler + //to propogate their values into the <port> + //sequence of <Deployment::ComponentInterfaceDescription> + for (ComponentInterfaceDescription::port_iterator + port (desc.begin_port ()); + port != desc.end_port (); + ++port) + { + toconfig.port.length (toconfig.port.length () + 1); + + cpd_handler.get_ComponentPortDescription ( + toconfig.port [toconfig.port.length () - 1], + *port); + } + + + //If there is a + //<CIAO::ConfigHandlers::ComponentPropertyDescription> + //then propogate its value to the + //<Deployment::ComponentInterfaceDescription>. + if (desc.property_p ()) + { + //Create the ComponentPropertyDescription handler. + ComponentPropertyDescription_Handler cprop_handler; + + //Increase the size of the property sequence. + toconfig.property.length ( + toconfig.property.length () + 1); + //Now delegate the propogation to the + //<ComponentPropertyDescription_Handler>. + cprop_handler.get_ComponentPropertyDescription ( + toconfig.property [toconfig.property.length () -1], + desc.property ()); + } + + + + //The IDL for the <infoProperty> specifies + //a sequence of <Property> structs but the schema + //specifies <infoProperty> as a single + //<Property>. We construct that single property + //element and assign it to the first position in the + //<infoProperty> sequence. We only do this if it + //is present. + if (desc.infoProperty_p () ) + { + //First construct the <Deployment::Property> + //to configure. + Deployment::Property prop; + + //Now, propogate the values from the <desc> into <prop>. + Property_Handler::get_property (desc.infoProperty (), + prop); + + //Finally, add it to the sequence. + toconfig.infoProperty.length ( + toconfig.infoProperty.length () + 1); + toconfig.infoProperty [toconfig.infoProperty.length () - 1] = prop; + } + + + return 1; + } + } +} diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CCD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CCD_Handler.h new file mode 100644 index 00000000000..cbcf1dbec8c --- /dev/null +++ b/TAO/CIAO/DAnCE/Config_Handlers/CCD_Handler.h @@ -0,0 +1,55 @@ +//================================================ +/** + * @file CID_Handler.h + * + * $Id$ + * + * @author Jules White <jules@dre.vanderbilt.edu> + */ +//================================================ + +#ifndef CIAO_CONFIG_HANDLERS_CCD_HANDLER_H +#define CIAO_CONFIG_HANDLERS_CCD_HANDLER_H +#include /**/ "ace/pre.h" + +#include "Config_Handlers/Config_Handlers_Export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "Config_Handlers/cid.hpp" + +namespace Deployment +{ + class ComponentInterfaceDescription; +} + +namespace CIAO +{ + namespace Config_Handlers + { + /* + * @class CCD_Handler + * + * @brief Handler class for <ComponentInterfaceDescription> types. + * + * This class is named CCD_Handler but actually fills + * <ComponentInterfaceDescription>. Why is this confusion? We + * want to maintain the correlation between the XSD file and the + * actual datatype. The file name corresponds to the XSD file but + * the data type being filled in is of type + * <ComponentInterfaceDescription> + */ + class Config_Handlers_Export CCD_Handler + { + public: + static bool component_interface_descr ( + Deployment::ComponentInterfaceDescription& toconfig, + ComponentInterfaceDescription& desc); + }; + } +} + +#include /**/ "ace/post.h" +#endif /* CID_HANDLER_H */ diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CEPE_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CEPE_Handler.h index 631ce4cfbcc..43afc78d7a8 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/CEPE_Handler.h +++ b/TAO/CIAO/DAnCE/Config_Handlers/CEPE_Handler.h @@ -12,7 +12,7 @@ #define CIAO_CONFIG_HANDLERS_CEPE_HANDLER_H #include /**/ "ace/pre.h" -#include "Config_Handlers_export.h" +#include "Config_Handlers_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -20,41 +20,40 @@ namespace Deployment { - struct ComponentExternalPortEndpoint; + struct ComponentExternalPortEndpoint; } namespace CIAO { - namespace Config_Handlers { - - struct ComponentExternalPortEndpoint; - - /* - * @class CEPE_Handler - * - * @brief Handler class for <ComponentExternalPortEndpoint> types. - * - * This class defines handler methods to map values from - * XSC ComponentExternalPortEndpoint objects, parsed from - * the descriptor files, to the corresponding CORBA IDL type. - * - */ - - class Config_Handlers_Export CEPE_Handler{ - - public: - - CEPE_Handler (void); - virtual ~CEPE_Handler (void); - - ///This method takes a <Deployment::ComponentExternalPortEndpoint> - ///and maps the values from the passed in XSC - ///ComponentExternalPortEndpoint to its members. - void get_ComponentExternalPortEndpoint ( - Deployment::ComponentExternalPortEndpoint& toconfig, - ComponentExternalPortEndpoint& desc); + + struct ComponentExternalPortEndpoint; + + /* + * @class CEPE_Handler + * + * @brief Handler class for <ComponentExternalPortEndpoint> types. + * + * This class defines handler methods to map values from + * XSC ComponentExternalPortEndpoint objects, parsed from + * the descriptor files, to the corresponding CORBA IDL type. + * + */ + + class Config_Handlers_Export CEPE_Handler + { + public: + CEPE_Handler (void); + virtual ~CEPE_Handler (void); + + /// This method takes a + /// <Deployment::ComponentExternalPortEndpoint> and maps the + /// values from the passed in XSC ComponentExternalPortEndpoint + /// to its members. + void get_ComponentExternalPortEndpoint ( + Deployment::ComponentExternalPortEndpoint& toconfig, + ComponentExternalPortEndpoint& desc); }; } diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CID_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/CID_Handler.cpp deleted file mode 100644 index ae0df2dcedf..00000000000 --- a/TAO/CIAO/DAnCE/Config_Handlers/CID_Handler.cpp +++ /dev/null @@ -1,172 +0,0 @@ -// $Id$ - -#include "CID_Handler.h" -#include "Prop_Handler.h" -#include "CPD_Handler.h" -#include "ComponentPropertyDescription_Handler.h" - - -namespace CIAO -{ - namespace Config_Handlers - { - CID_Handler::CID_Handler (void) - { - } - - CID_Handler::~CID_Handler (void) - { - } - - bool - CID_Handler::get_component_interface_descr ( - Deployment::ComponentInterfaceDescription& toconfig, - ComponentInterfaceDescription& desc) - { - - // We first set up some of the basic properties such as UUID. We - // check to make sure each one is actually present before - // assigning it to the corresponding field in <toconfig>. - if(desc.UUID_p ()) - { - toconfig.UUID = - CORBA::string_dup (desc.UUID ().c_str ()); - } - else if(desc.label_p ()) - { - toconfig.label = - CORBA::string_dup (desc.label ().c_str ()); - } - else if(desc.specificType_p ()) - { - toconfig.specificType = - CORBA::string_dup (desc.specificType ().c_str ()); - } - else if (desc.supportedType_p ()) - { - //Copy the values of the sequence types idlFile and - //supportedType to the - //<Deployment::ComponentInterfaceDescription>. - if (desc.supportedType ().empty () == 0) - { - toconfig.supportedType.length (toconfig.supportedType.length () + 1); - toconfig.supportedType[toconfig.supportedType.length () - 1] = - CORBA::string_dup (desc.supportedType ().c_str ()); - - } - } - - //Make sure the <idlFile> property - //is actually present before attempting - //any operations on it. - if (desc.idlFile_p ()) - { - if (desc.idlFile ().empty () == 0) - { - toconfig.idlFile.length (toconfig.idlFile.length () + 1); - toconfig.idlFile [toconfig.idlFile.length () - 1] = - CORBA::string_dup (desc.idlFile ().c_str ()); - } - } - - - Prop_Handler propertyhandler; - - //The IDL for the <configProperty> specifies - //a sequence of <Property> structs but the schema - //specifies <configProperty> as a single - //<Property>. We construct that single property - //element and assign it to the first position in the - //<configProperty> sequence. We only do this if it - //is present. - if (desc.configProperty_p ()) - { - //First construct the <Deployment::Property> - //to configure. - Deployment::Property prop; - - //Now, propogate the values from the <desc> into <prop>. - propertyhandler.get_Property (prop,desc.configProperty ()); - - //Increase the size of the sequence to handle - //the new value. - toconfig.configProperty.length ( - toconfig.configProperty.length () + 1); - - //Finally, add it to the sequence. - toconfig.configProperty [toconfig.configProperty.length () - 1] = prop; - - } - - - - //Create the handler for the - //<ComponentPortDescriptions>. - CPD_Handler cpd_handler; - - - //Iterate through each of the XSC Component - //Port Descriptions and use the CPD_Handler - //to propogate their values into the <port> - //sequence of <Deployment::ComponentInterfaceDescription> - for (ComponentInterfaceDescription::port_iterator - port (desc.begin_port ()); - port != desc.end_port (); - ++port) - { - toconfig.port.length (toconfig.port.length () + 1); - - cpd_handler.get_ComponentPortDescription ( - toconfig.port [toconfig.port.length () - 1], - *port); - } - - - //If there is a - //<CIAO::ConfigHandlers::ComponentPropertyDescription> - //then propogate its value to the - //<Deployment::ComponentInterfaceDescription>. - if (desc.property_p ()) - { - //Create the ComponentPropertyDescription handler. - ComponentPropertyDescription_Handler cprop_handler; - - //Increase the size of the property sequence. - toconfig.property.length ( - toconfig.property.length () + 1); - //Now delegate the propogation to the - //<ComponentPropertyDescription_Handler>. - cprop_handler.get_ComponentPropertyDescription ( - toconfig.property [toconfig.property.length () -1], - desc.property ()); - } - - - - //The IDL for the <infoProperty> specifies - //a sequence of <Property> structs but the schema - //specifies <infoProperty> as a single - //<Property>. We construct that single property - //element and assign it to the first position in the - //<infoProperty> sequence. We only do this if it - //is present. - if (desc.infoProperty_p () ) - { - //First construct the <Deployment::Property> - //to configure. - Deployment::Property prop; - - //Now, propogate the values from the <desc> into <prop>. - propertyhandler.get_Property (prop,desc.infoProperty ()); - - //Finally, add it to the sequence. - toconfig.infoProperty.length ( - toconfig.infoProperty.length () + 1); - toconfig.infoProperty [toconfig.infoProperty.length () - 1] = prop; - } - - - return 1; - } - } -} diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CID_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CID_Handler.h deleted file mode 100644 index 7a33ab38bad..00000000000 --- a/TAO/CIAO/DAnCE/Config_Handlers/CID_Handler.h +++ /dev/null @@ -1,66 +0,0 @@ -//================================================ -/** - * @file CID_Handler.h - * - * $Id$ - * - * @author Jules White <jules@dre.vanderbilt.edu> - */ -//================================================ - -#ifndef CIAO_CONFIG_HANDLERS_CID_HANDLER_H -#define CIAO_CONFIG_HANDLERS_CID_HANDLER_H - -#include /**/ "ace/pre.h" - -#include "cid.hpp" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -namespace Deployment -{ - class ComponentInterfaceDescription; -} - -namespace CIAO -{ - namespace Config_Handlers - { - /* - * @class CID_Handler - * - * @brief Handler class for <ComponentInterfaceDescription> types. - * - * This class defines handler methods to map values from - * XSC objects, parsed from the descriptor files, to the - * corresponding CORBA IDL type for the schema element. - * - */ - class CID_Handler - { - public: - - - CID_Handler (void); - virtual ~CID_Handler(void); - - /// This method maps the values from the XSC object - /// <ComponentPortDescription> to the CORBA IDL type - /// <Deployment::ComponentPortDescription>. It handles the - /// creation of the Deployment::ComponentPort's, - /// Deployment::ComponentPortDescriptions's, and - /// Deployment::Properties and delegates mapping the values from - /// their corresponding XSC objects to their handlers. - bool get_component_interface_descr ( - Deployment::ComponentInterfaceDescription& toconfig, - ComponentInterfaceDescription& desc); - }; - - } - -} - -#include /**/ "ace/post.h" -#endif /* CID_HANDLER_H */ diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog b/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog index 9569943d498..43d77a6d924 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog +++ b/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog @@ -1,3 +1,71 @@ +Sat Sep 25 14:56:37 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * DAnCE/Config_Handlers/ADD_Handler.cpp: + * DAnCE/Config_Handlers/ADD_Handler.h: + * DAnCE/Config_Handlers/Any_Handler.cpp: + * DAnCE/Config_Handlers/Any_Handler.h: + * DAnCE/Config_Handlers/Base_Handler.cpp: + * DAnCE/Config_Handlers/Base_Handler.h: + * DAnCE/Config_Handlers/CEPE_Handler.h: + * DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp: + * DAnCE/Config_Handlers/Config_Handlers.mpc: + * DAnCE/Config_Handlers/Deployment.cpp: + * DAnCE/Config_Handlers/Deployment.hpp: + * DAnCE/Config_Handlers/MDD_Handler.cpp: + * DAnCE/Config_Handlers/MDD_Handler.h: + + Cosmetic fixes to get them in shape and subtle bug fixes. + + * DAnCE/Config_Handlers/Config_Handlers_Export.h: + + New file. + + * DAnCE/Config_Handlers/CID_Handler.cpp: + * DAnCE/Config_Handlers/CID_Handler.h: + * DAnCE/Config_Handlers/Prop_Handler.cpp: + * DAnCE/Config_Handlers/Prop_Handler.h: + * DAnCE/Config_Handlers/Config_Handlers_export.h: + Removed this file from the repo. + + * DAnCE/Config_Handlers/Property_Handler.h: + * DAnCE/Config_Handlers/Property_Handler.cpp: + + New file for property handler. + + * DAnCE/Config_Handlers/Any_Handler.h: + * DAnCE/Config_Handlers/Any_Handler.cpp: + + New file for Any_Handler. + + * DAnCE/Config_Handlers/CCD_Handler.h: + * DAnCE/Config_Handlers/CCD_Handler.cpp: + + The CID_Handler has been named as CCD_Handler, since it + represents data in .ccd file. + + * DAnCE/Config_Handlers/Basic_Deployment_Data.cpp: + * DAnCE/Config_Handlers/Basic_Deployment_Data.hpp: + * DAnCE/Config_Handlers/ccd.cpp: + * DAnCE/Config_Handlers/ccd.hpp: + * DAnCE/Config_Handlers/cdd.cpp: + * DAnCE/Config_Handlers/cdd.hpp: + * DAnCE/Config_Handlers/cdp.cpp: + * DAnCE/Config_Handlers/cdp.hpp: + * DAnCE/Config_Handlers/cid.cpp: + * DAnCE/Config_Handlers/cid.hpp: + * DAnCE/Config_Handlers/cpd.cpp: + * DAnCE/Config_Handlers/cpd.hpp: + * DAnCE/Config_Handlers/iad.cpp: + * DAnCE/Config_Handlers/iad.hpp: + * DAnCE/Config_Handlers/pcd.cpp: + * DAnCE/Config_Handlers/pcd.hpp: + * DAnCE/Config_Handlers/toplevel.cpp: + * DAnCE/Config_Handlers/toplevel.hpp: + + Regenerated all the code with XSC 0.0.5. I will checkin the + changes to schema that warranted this change in the main trunk. + + Wed Sep 22 12:41:23 2004 Jules White <jules@dre.vanderbilt.edu> * BaseTypes_Handler.h: diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp index 1f1593f976a..b55b1bd2cf4 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp @@ -5,7 +5,7 @@ namespace CIAO{ - + namespace Config_Handlers{ CIAO::Config_Handlers::ComponentPropertyDescription_Handler::ComponentPropertyDescription_Handler(void) @@ -14,7 +14,7 @@ namespace CIAO{ CIAO::Config_Handlers::ComponentPropertyDescription_Handler::~ComponentPropertyDescription_Handler(void) { } - + void CIAO::Config_Handlers::ComponentPropertyDescription_Handler::get_ComponentPropertyDescription ( Deployment::ComponentPropertyDescription& toconfig, @@ -22,14 +22,14 @@ namespace CIAO{ { //Copy the name to the CPD. toconfig.name = CORBA::string_dup (desc.name ().c_str ()); - + //Delegate the DataType to the //DataType_Handler. DataType_Handler dtypehandler; - CORBA::TypeCode_ptr tcptr = toconfig.type; + CORBA::TypeCode_ptr tcptr = toconfig.type.in (); dtypehandler.get_DataType (tcptr,desc.type ()); - + } - + } } diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc b/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc index 5f422933e07..bf844295058 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc +++ b/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc @@ -1,7 +1,6 @@ //$Id$ project (XSC_Config_Handlers) : ciao_deployment_stub { - sharedname = XSC_Config_Handlers dynamicflags = CONFIG_HANDLER_BUILD_DLL macros += XML_USE_PTHREADS @@ -11,14 +10,6 @@ project (XSC_Config_Handlers) : ciao_deployment_stub { libs += xerces-c CIAO_DnC_Server TAO_IFR_Client Source_Files { - Basic_Deployment_Data.cpp - CID_Handler.cpp - ComponentPropertyDescription_Handler.cpp - CPD_Handler.cpp - DataType_Handler.cpp - MDD_Handler.cpp - Prop_Handler.cpp - Req_Handler.cpp ccd.cpp cdd.cpp cdp.cpp @@ -28,10 +19,17 @@ project (XSC_Config_Handlers) : ciao_deployment_stub { iad.cpp pcd.cpp toplevel.cpp + Basic_Deployment_Data.cpp + DP_Handler.cpp + CCD_Handler.cpp + Property_Handler.cpp + ComponentPropertyDescription_Handler.cpp + CPD_Handler.cpp + DataType_Handler.cpp + MDD_Handler.cpp + Req_Handler.cpp CPD_Handler.cpp - CID_Handler.cpp Any_Handler.cpp - Prop_Handler.cpp ComponentPropertyDescription_Handler.cpp DataType_Handler.cpp MDD_Handler.cpp @@ -49,48 +47,11 @@ project (XSC_Config_Handlers) : ciao_deployment_stub { } Header_Files { - Basic_Deployment_Data.h - CID_Handler.h - ComponentPropertyDescription_Handler.h - CPD_Handler.h - DataType_Handler.h - MDD_Handler.h - Prop_Handler.h - Req_Handler.h - Basic_Deployment_Data.hpp - ccd.hpp - cdd.hpp - cdp.hpp - cid.hpp - cpd.hpp - Deployment.hpp - iad.hpp - pcd.hpp - toplevel.hpp - CPD_Handler.h - CID_Handler.h - Any_Handler.h - Prop_Handler.h - ComponentPropertyDescription_Handler.h - DataType_Handler.h - MDD_Handler.h - Req_Handler.h - PCD_Handler.h - CEPE_Handler.h - PSPE_Handler.h - ERE_Handler.h - CRDD_Handler.h - Base_Handler.h - ADD_Handler.h - ComponentPropertyDescription_Handler.h - RDD_Handler.h - ID_Handler.h } } project (XSC_Config_Handlers_Tests) : ciao_deployment_stub { - - + exename = test dynamicflags = CONFIG_HANDLER_BUILD_DLL macros += XML_USE_PTHREADS diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers_Export.h b/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers_Export.h new file mode 100644 index 00000000000..64dec8bdfa5 --- /dev/null +++ b/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers_Export.h @@ -0,0 +1,58 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl -s Config_Handlers +// ------------------------------ +#ifndef CONFIG_HANDLERS_EXPORT_H +#define CONFIG_HANDLERS_EXPORT_H + +#include "ace/config-all.h" + +#if defined (ACE_AS_STATIC_LIBS) && !defined (CONFIG_HANDLERS_HAS_DLL) +# define CONFIG_HANDLERS_HAS_DLL 0 +#endif /* ACE_AS_STATIC_LIBS && CONFIG_HANDLERS_HAS_DLL */ + +#if !defined (CONFIG_HANDLERS_HAS_DLL) +# define CONFIG_HANDLERS_HAS_DLL 1 +#endif /* ! CONFIG_HANDLERS_HAS_DLL */ + +#if defined (CONFIG_HANDLERS_HAS_DLL) && (CONFIG_HANDLERS_HAS_DLL == 1) +# if defined (CONFIG_HANDLERS_BUILD_DLL) +# define Config_Handlers_Export ACE_Proper_Export_Flag +# define CONFIG_HANDLERS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define CONFIG_HANDLERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* CONFIG_HANDLERS_BUILD_DLL */ +# define Config_Handlers_Export ACE_Proper_Import_Flag +# define CONFIG_HANDLERS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define CONFIG_HANDLERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* CONFIG_HANDLERS_BUILD_DLL */ +#else /* CONFIG_HANDLERS_HAS_DLL == 1 */ +# define Config_Handlers_Export +# define CONFIG_HANDLERS_SINGLETON_DECLARATION(T) +# define CONFIG_HANDLERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* CONFIG_HANDLERS_HAS_DLL == 1 */ + +// Set CONFIG_HANDLERS_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (CONFIG_HANDLERS_NTRACE) +# if (ACE_NTRACE == 1) +# define CONFIG_HANDLERS_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define CONFIG_HANDLERS_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !CONFIG_HANDLERS_NTRACE */ + +#if (CONFIG_HANDLERS_NTRACE == 1) +# define CONFIG_HANDLERS_TRACE(X) +#else /* (CONFIG_HANDLERS_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define CONFIG_HANDLERS_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (CONFIG_HANDLERS_NTRACE == 1) */ + +#endif /* CONFIG_HANDLERS_EXPORT_H */ + +// End of auto generated file. diff --git a/TAO/CIAO/DAnCE/Config_Handlers/DP_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/DP_Handler.cpp new file mode 100644 index 00000000000..a1ccca65b1c --- /dev/null +++ b/TAO/CIAO/DAnCE/Config_Handlers/DP_Handler.cpp @@ -0,0 +1,52 @@ +#include "DP_Handler.h" +#include "ciao/Deployment_DataC.h" +#include "ace/Auto_Ptr.h" +#include "CCD_Handler.h" +#include "cdp.hpp" + +ACE_RCSID (Config_Handlers, + DP_Handler, + "$Id$") + +namespace CIAO +{ + namespace Config_Handlers + { + DP_Handler::DP_Handler (DeploymentPlan &dp) + : idl_dp_ (0) + , dp_ (dp) + { + if (!this->resolve_plan ()) + throw; + } + + DP_Handler::~DP_Handler (void) + { + delete this->idl_dp_; + } + + bool + DP_Handler::resolve_plan (void) + { + ::Deployment::DeploymentPlan *tmp = + new Deployment::DeploymentPlan; + + auto_ptr< ::Deployment::DeploymentPlan> + auto_idl_dp (tmp); + + bool retval = + CCD_Handler::component_interface_descr ((*auto_idl_dp).realizes, + this->dp_.realizes ()); + + if (!retval) + return retval; + + + this->idl_dp_ = + auto_idl_dp.release (); + + return true; + } + + } +} diff --git a/TAO/CIAO/DAnCE/Config_Handlers/DP_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/DP_Handler.h new file mode 100644 index 00000000000..397c69407fa --- /dev/null +++ b/TAO/CIAO/DAnCE/Config_Handlers/DP_Handler.h @@ -0,0 +1,59 @@ +//============================================================== +/** + * @file DP_Handler.h + * + * $Id$ + * + * @author Bala Natarajan <bala@dre.vanderbilt.edu> + */ +//================================================================ + +#ifndef CIAO_CONFIG_HANDLERS_DP_HANDLER_H +#define CIAO_CONFIG_HANDLERS_DP_HANDLER_H +#include /**/ "ace/pre.h" + +#include "Config_Handlers/Config_Handlers_Export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + + +namespace Deployment +{ + struct DeploymentPlan ; +} + +namespace CIAO +{ + namespace Config_Handlers + { + class DeploymentPlan; + + /* + * @class DP_Handler + * + * @brief Handler for Deployment::DeploymentPlan + */ + class Config_Handlers_Export DP_Handler + { + public: + DP_Handler (DeploymentPlan &dp); + + ~DP_Handler (void); + + private: + + bool resolve_plan (void); + + private: + + ::Deployment::DeploymentPlan *idl_dp_; + + DeploymentPlan &dp_; + }; + } +} + +#include /**/ "ace/post.h" +#endif /*CIAO_CONFIG_HANDLERS_DP_HANDLER_H*/ diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Deployment.hpp b/TAO/CIAO/DAnCE/Config_Handlers/Deployment.hpp index e4cd3aecdaf..08d531a727f 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/Deployment.hpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/Deployment.hpp @@ -1,4 +1,4 @@ -// $Id$ +//$Id$ #ifndef DEPLOYMENT_HPP #define DEPLOYMENT_HPP diff --git a/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.cpp index 6dca34c7dab..62250b4493a 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.cpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.cpp @@ -1,12 +1,9 @@ - // $Id$ - - #include "MDD_Handler.h" #include "Basic_Deployment_Data.hpp" #include "ciao/Deployment_DataC.h" #include "ADD_Handler.h" -#include "Prop_Handler.h" +#include "Property_Handler.h" #include "Req_Handler.h" @@ -27,51 +24,50 @@ namespace CIAO void MDD_Handler::get_MonolithicDeploymentDescription ( - Deployment::MonolithicDeploymentDescription& toconfig, - MonolithicDeploymentDescription& desc) + Deployment::MonolithicDeploymentDescription& toconfig, + MonolithicDeploymentDescription& desc) { - - toconfig.name= CORBA::string_dup (desc.name ().c_str ()); - + toconfig.source.length ( - toconfig.source.length () + 1); - toconfig.source[toconfig.source.length () - 1]= - CORBA::string_dup (desc.source ().c_str ()); - + toconfig.source.length () + 1); + + toconfig.source[toconfig.source.length () - 1] = + CORBA::string_dup (desc.source ().c_str ()); + ADD_Handler artifact_handler; ACE_TString artifact_id; + for (MonolithicDeploymentDescription::artifact_iterator - item (desc.begin_artifact ()); + item (desc.begin_artifact ()); item != desc.end_artifact (); ++item) { - toconfig.artifactRef.length ( toconfig.artifactRef.length () + 1); - + artifact_id = item->id ().c_str (); artifact_handler.get_ref ( artifact_id, toconfig.artifactRef[toconfig.artifactRef.length () - 1]); - + } - + if (desc.execParameter_p ()) { - Prop_Handler handler; + Property_Handler handler; toconfig.execParameter.length ( toconfig.execParameter.length () + 1); handler.get_Property ( toconfig.execParameter[toconfig.execParameter.length () - 1], desc.execParameter ()); } - + if (desc.deployRequirement_p ()) { - Req_Handler handler; + Req_Handler handler; toconfig.deployRequirement.length ( toconfig.deployRequirement.length () + 1); handler.get_Requirement ( @@ -79,7 +75,7 @@ namespace CIAO desc.deployRequirement ()); } - + } } diff --git a/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.h index 6a2babbf706..af320cad47d 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.h +++ b/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.h @@ -14,13 +14,14 @@ #include /**/ "ace/pre.h" #include "Base_Handler.h" -#include "Config_Handlers_export.h" -#include "ace/config-lite.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "Config_Handlers_export.h" +#include "ace/config-lite.h" namespace Deployment @@ -37,33 +38,31 @@ namespace CIAO class MonolithicDeploymentDescription; - - /* + /* * @class MDD_Handler * * @brief Handler class for <MonolithicDeploymentDescription> types. * - * This class defines handler methods to map values from - * XSC MonolithicDeploymentDescription objects, parsed from the descriptor files, to the - * corresponding CORBA IDL Any type. + * This class defines handler methods to map values from XSC + * MonolithicDeploymentDescription objects, parsed from the + * descriptor files, to the corresponding CORBA IDL types. * */ - - class Config_Handlers_Export MDD_Handler : public Base_Handler{ - - public: - MDD_Handler (void); - virtual ~MDD_Handler (void); + class Config_Handlers_Export MDD_Handler + { + public: - void get_MonolithicDeploymentDescription ( - Deployment::MonolithicDeploymentDescription& toconfig, - MonolithicDeploymentDescription& desc); + MDD_Handler (void); + virtual ~MDD_Handler (void); + + void get_MonolithicDeploymentDescription ( + Deployment::MonolithicDeploymentDescription& toconfig, + MonolithicDeploymentDescription& desc); }; } } -#include /**/ "ace/post.h" +#include /**/ "ace/post.h" #endif /* CIAO_CONFIG_HANDLERS_MDD_Handler_H */ - diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Prop_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Prop_Handler.cpp deleted file mode 100644 index 9b6279a3b3d..00000000000 --- a/TAO/CIAO/DAnCE/Config_Handlers/Prop_Handler.cpp +++ /dev/null @@ -1,38 +0,0 @@ -//$Id$ - -#include "Prop_Handler.h" -#include "ANY_Handler.h" - -namespace CIAO -{ - namespace Config_Handlers - { - - CIAO::Config_Handlers::Prop_Handler::Prop_Handler (void) - { - } - CIAO::Config_Handlers::Prop_Handler::~Prop_Handler (void) - { - } - - ///This method maps the values from the - ///XSC object <CIAO::Config_Handlers::Property> to - ///the CORBA IDL type <Deployment::Property>. - void - CIAO::Config_Handlers::Prop_Handler::get_Property ( - Deployment::Property& toconfig, - Property& desc) - { - toconfig.name = CORBA::string_dup (desc.name ().c_str ()); - - //Create the ANY_Handler to - //delegate the Any configuration - //to. - ANY_Handler anyhandler; - - //Delegate the Any configuration. - anyhandler.get_Any (toconfig.value, desc.value ()); - - } - } -} diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Prop_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Prop_Handler.h deleted file mode 100644 index c583124a433..00000000000 --- a/TAO/CIAO/DAnCE/Config_Handlers/Prop_Handler.h +++ /dev/null @@ -1,58 +0,0 @@ -//================================================ -/** - * @file Prop_Handler.h - * - * $Id$ - * - * @author Jules White <jules@dre.vanderbilt.edu> - */ -//================================================ - -#ifndef PROP_HANDLER_H -#define PROP_HANDLER_H - -#include /**/ "ace/pre.h" - -#include "ciao/DeploymentC.h" -#include "Basic_Deployment_Data.hpp" - - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -namespace CIAO{ - - namespace Config_Handlers{ - - /* - * @class Prop_Handler - * - * @brief Handler class for <CCMComponentPortDescription> types. - * - * This class defines handler methods to map values from - * XSC objects, parsed from the descriptor files, to the - * corresponding CORBA IDL type for the schema element. - * - */ - - class Prop_Handler{ - - public: - - Prop_Handler (void); - virtual ~Prop_Handler (void); - - ///This method maps the values from the - ///XSC object <CIAO::Config_Handlers::Property> to - ///the CORBA IDL type <Deployment::Property>. - void get_Property (Deployment::Property& toconfig, - Property& desc); - }; - - } -} - -#include /**/ "ace/post.h" -#endif /* PROP_HANDLER_H */ diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.cpp new file mode 100644 index 00000000000..60dacce16ed --- /dev/null +++ b/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.cpp @@ -0,0 +1,34 @@ +//$Id$ + +#include "Property_Handler.h" +#include "Any_Handler.h" +#include "Basic_Deployment_Data.hpp" +#include "ciao/Deployment_DataC.h" + +namespace CIAO +{ + namespace Config_Handlers + { + + Property_Handler::Property_Handler (void) + { + } + + Property_Handler::~Property_Handler (void) + { + } + + void + Property_Handler::get_property ( + const Property& desc, + Deployment::Property& toconfig) + { + toconfig.name = + CORBA::string_dup (desc.name ().c_str ()); + + Any_Handler::extract_into_any (desc.value (), + toconfig.value); + + } + } +} diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.h new file mode 100644 index 00000000000..253f62b6cbd --- /dev/null +++ b/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.h @@ -0,0 +1,61 @@ +//================================================ +/** + * @file Prop_Handler.h + * + * $Id$ + * + * @author Jules White <jules@dre.vanderbilt.edu> + */ +//================================================ + +#ifndef CIAO_CONFIG_HANDLERS_PROPERTY_HANDLER_H +#define CIAO_CONFIG_HANDLERS_PROPERTY_HANDLER_H + +#include /**/ "ace/pre.h" + +#include "Config_Handlers/Config_Handlers_Export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +namespace Deployment +{ + class Property; +} + +namespace CIAO +{ + namespace Config_Handlers + { + class Property; + + /* + * @class Property_Handler + * + * @brief Handler class for <CCMComponentPortDescription> types. + * + * This class defines handler methods to map values from + * XSC objects, parsed from the descriptor files, to the + * corresponding CORBA IDL type for the schema element. + * + */ + + class Config_Handlers_Export Property_Handler + { + public: + Property_Handler (void); + virtual ~Property_Handler (void); + + /// This method maps the values from the XSC object + /// <CIAO::Config_Handlers::Property> to the CORBA IDL type + /// <Deployment::Property>. + static void get_property (const Property& desc, + ::Deployment::Property& toconfig); + }; + + } +} + +#include /**/ "ace/post.h" +#endif /* CIAO_CONFIG_HANDLERS_PROPERTY_HANDLER_H*/ diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ccd.cpp b/TAO/CIAO/DAnCE/Config_Handlers/ccd.cpp index 2721776e2fd..63e0b33f29c 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/ccd.cpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/ccd.cpp @@ -21,9 +21,7 @@ namespace CIAO label_ (s.label_.get () ? new ::XMLSchema::string< char > (*s.label_) : 0), UUID_ (s.UUID_.get () ? new ::XMLSchema::string< char > (*s.UUID_) : 0), specificType_ (s.specificType_.get () ? new ::XMLSchema::string< char > (*s.specificType_) : 0), - supportedType_ (s.supportedType_.get () ? new ::XMLSchema::string< char > (*s.supportedType_) : 0), idlFile_ (s.idlFile_.get () ? new ::XMLSchema::string< char > (*s.idlFile_) : 0), - configProperty_ (s.configProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.configProperty_) : 0), property_ (s.property_.get () ? new ::CIAO::Config_Handlers::ComponentPropertyDescription (*s.property_) : 0), infoProperty_ (s.infoProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.infoProperty_) : 0), contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< char > (*s.contentLocation_) : 0), @@ -32,9 +30,21 @@ namespace CIAO if (label_.get ()) label_->container (this); if (UUID_.get ()) UUID_->container (this); if (specificType_.get ()) specificType_->container (this); - if (supportedType_.get ()) supportedType_->container (this); + supportedType_.reserve (s.supportedType_.size ()); + { + for (supportedType_const_iterator i (s.supportedType_.begin ()); + i != s.supportedType_.end (); + ++i) add_supportedType (*i); + } + if (idlFile_.get ()) idlFile_->container (this); - if (configProperty_.get ()) configProperty_->container (this); + configProperty_.reserve (s.configProperty_.size ()); + { + for (configProperty_const_iterator i (s.configProperty_.begin ()); + i != s.configProperty_.end (); + ++i) add_configProperty (*i); + } + port_.reserve (s.port_.size ()); { for (port_const_iterator i (s.port_.begin ()); @@ -59,14 +69,24 @@ namespace CIAO if (s.specificType_.get ()) specificType (*(s.specificType_)); else specificType_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0); - if (s.supportedType_.get ()) supportedType (*(s.supportedType_)); - else supportedType_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0); + supportedType_.clear (); + supportedType_.reserve (s.supportedType_.size ()); + { + for (supportedType_const_iterator i (s.supportedType_.begin ()); + i != s.supportedType_.end (); + ++i) add_supportedType (*i); + } if (s.idlFile_.get ()) idlFile (*(s.idlFile_)); else idlFile_ = ::std::auto_ptr< ::XMLSchema::string< char > > (0); - if (s.configProperty_.get ()) configProperty (*(s.configProperty_)); - else configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0); + configProperty_.clear (); + configProperty_.reserve (s.configProperty_.size ()); + { + for (configProperty_const_iterator i (s.configProperty_.begin ()); + i != s.configProperty_.end (); + ++i) add_configProperty (*i); + } port_.clear (); port_.reserve (s.port_.size ()); @@ -196,37 +216,53 @@ namespace CIAO // ComponentInterfaceDescription // - bool ComponentInterfaceDescription:: - supportedType_p () const + ComponentInterfaceDescription::supportedType_iterator ComponentInterfaceDescription:: + begin_supportedType () { - return supportedType_.get () != 0; + return supportedType_.begin (); } - ::XMLSchema::string< char > const& ComponentInterfaceDescription:: - supportedType () const + ComponentInterfaceDescription::supportedType_iterator ComponentInterfaceDescription:: + end_supportedType () { - return *supportedType_; + return supportedType_.end (); } - ::XMLSchema::string< char >& ComponentInterfaceDescription:: - supportedType () + ComponentInterfaceDescription::supportedType_const_iterator ComponentInterfaceDescription:: + begin_supportedType () const + { + return supportedType_.begin (); + } + + ComponentInterfaceDescription::supportedType_const_iterator ComponentInterfaceDescription:: + end_supportedType () const { - return *supportedType_; + return supportedType_.end (); } void ComponentInterfaceDescription:: - supportedType (::XMLSchema::string< char > const& e) + add_supportedType (::XMLSchema::string< char > const& e) { - if (supportedType_.get ()) + if (supportedType_.capacity () < supportedType_.size () + 1) { - *supportedType_ = e; - } + ::std::vector< ::XMLSchema::string< char > > v; + v.reserve (supportedType_.size () + 1); - else - { - supportedType_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); - supportedType_->container (this); + while (supportedType_.size ()) + { + //@@ VC6 + ::XMLSchema::string< char >& t = supportedType_.back (); + t.container (0); + v.push_back (t); + v.back ().container (this); + supportedType_.pop_back (); + } + + supportedType_.swap (v); } + + supportedType_.push_back (e); + supportedType_.back ().container (this); } // ComponentInterfaceDescription @@ -266,37 +302,53 @@ namespace CIAO // ComponentInterfaceDescription // - bool ComponentInterfaceDescription:: - configProperty_p () const + ComponentInterfaceDescription::configProperty_iterator ComponentInterfaceDescription:: + begin_configProperty () { - return configProperty_.get () != 0; + return configProperty_.begin (); } - ::CIAO::Config_Handlers::Property const& ComponentInterfaceDescription:: - configProperty () const + ComponentInterfaceDescription::configProperty_iterator ComponentInterfaceDescription:: + end_configProperty () { - return *configProperty_; + return configProperty_.end (); } - ::CIAO::Config_Handlers::Property& ComponentInterfaceDescription:: - configProperty () + ComponentInterfaceDescription::configProperty_const_iterator ComponentInterfaceDescription:: + begin_configProperty () const + { + return configProperty_.begin (); + } + + ComponentInterfaceDescription::configProperty_const_iterator ComponentInterfaceDescription:: + end_configProperty () const { - return *configProperty_; + return configProperty_.end (); } void ComponentInterfaceDescription:: - configProperty (::CIAO::Config_Handlers::Property const& e) + add_configProperty (::CIAO::Config_Handlers::Property const& e) { - if (configProperty_.get ()) + if (configProperty_.capacity () < configProperty_.size () + 1) { - *configProperty_ = e; - } + ::std::vector< ::CIAO::Config_Handlers::Property > v; + v.reserve (configProperty_.size () + 1); - else - { - configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e)); - configProperty_->container (this); + while (configProperty_.size ()) + { + //@@ VC6 + ::CIAO::Config_Handlers::Property& t = configProperty_.back (); + t.container (0); + v.push_back (t); + v.back ().container (this); + configProperty_.pop_back (); + } + + configProperty_.swap (v); } + + configProperty_.push_back (e); + configProperty_.back ().container (this); } // ComponentInterfaceDescription @@ -466,9 +518,7 @@ namespace CIAO ComponentInterfaceDescription:: ComponentInterfaceDescription (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - regulator__ () + :Base__ (e), regulator__ () { ::XSCRT::Parser< char > p (e); @@ -499,7 +549,7 @@ namespace CIAO else if (n == "supportedType") { ::XMLSchema::string< char > t (e); - supportedType (t); + add_supportedType (t); } else if (n == "idlFile") @@ -511,7 +561,7 @@ namespace CIAO else if (n == "configProperty") { ::CIAO::Config_Handlers::Property t (e); - configProperty (t); + add_configProperty (t); } else if (n == "port") diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ccd.hpp b/TAO/CIAO/DAnCE/Config_Handlers/ccd.hpp index 622334b2268..703e5560c99 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/ccd.hpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/ccd.hpp @@ -1,4 +1,4 @@ -//$Id$ +// $Id$ #ifndef CCD_HPP #define CCD_HPP @@ -64,13 +64,16 @@ namespace CIAO // supportedType // public: - bool supportedType_p () const; - ::XMLSchema::string< char > const& supportedType () const; - ::XMLSchema::string< char >& supportedType (); - void supportedType (::XMLSchema::string< char > const& ); + typedef ::std::vector< ::XMLSchema::string< char > >::iterator supportedType_iterator; + typedef ::std::vector< ::XMLSchema::string< char > >::const_iterator supportedType_const_iterator; + supportedType_iterator begin_supportedType (); + supportedType_iterator end_supportedType (); + supportedType_const_iterator begin_supportedType () const; + supportedType_const_iterator end_supportedType () const; + void add_supportedType (::XMLSchema::string< char > const& ); protected: - ::std::auto_ptr< ::XMLSchema::string< char > > supportedType_; + ::std::vector< ::XMLSchema::string< char > > supportedType_; // idlFile // @@ -86,13 +89,16 @@ namespace CIAO // configProperty // public: - bool configProperty_p () const; - ::CIAO::Config_Handlers::Property const& configProperty () const; - ::CIAO::Config_Handlers::Property& configProperty (); - void configProperty (::CIAO::Config_Handlers::Property const& ); + typedef ::std::vector< ::CIAO::Config_Handlers::Property >::iterator configProperty_iterator; + typedef ::std::vector< ::CIAO::Config_Handlers::Property >::const_iterator configProperty_const_iterator; + configProperty_iterator begin_configProperty (); + configProperty_iterator end_configProperty (); + configProperty_const_iterator begin_configProperty () const; + configProperty_const_iterator end_configProperty () const; + void add_configProperty (::CIAO::Config_Handlers::Property const& ); protected: - ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_; + ::std::vector< ::CIAO::Config_Handlers::Property > configProperty_; // port // @@ -143,6 +149,7 @@ namespace CIAO public: ComponentInterfaceDescription (); + ComponentInterfaceDescription (::XSCRT::XML::Element< char > const&); ComponentInterfaceDescription (ComponentInterfaceDescription const& s); diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cdd.cpp b/TAO/CIAO/DAnCE/Config_Handlers/cdd.cpp index 1fac6f758af..1bdab3f3935 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/cdd.cpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/cdd.cpp @@ -1,4 +1,4 @@ -//$Id$ +// $Id$ #include "cdd.hpp" namespace CIAO @@ -9,10 +9,11 @@ namespace CIAO // Domain:: - Domain () + Domain (::XMLSchema::string< char > const& label__, + ::XMLSchema::string< char > const& UUID__) : - label_ (new ::XMLSchema::string< char > ()), - UUID_ (new ::XMLSchema::string< char > ()), + label_ (new ::XMLSchema::string< char > (label__)), + UUID_ (new ::XMLSchema::string< char > (UUID__)), regulator__ () { label_->container (this); @@ -238,14 +239,8 @@ namespace CIAO Domain:: Domain (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - label_ (new ::XMLSchema::string< char > ()), - UUID_ (new ::XMLSchema::string< char > ()), - regulator__ () + :Base__ (e), regulator__ () { - label_->container (this); - UUID_->container (this); ::XSCRT::Parser< char > p (e); @@ -256,14 +251,14 @@ namespace CIAO if (n == "label") { - ::XMLSchema::string< char > t (e); - label (t); + label_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + label_->container (this); } else if (n == "UUID") { - ::XMLSchema::string< char > t (e); - UUID (t); + UUID_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + UUID_->container (this); } else if (n == "sharedResource") diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cdd.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cdd.hpp index a3834aa1303..b728c882aca 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/cdd.hpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/cdd.hpp @@ -85,7 +85,9 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_; public: - Domain (); + Domain (::XMLSchema::string< char > const& label__, + ::XMLSchema::string< char > const& UUID__); + Domain (::XSCRT::XML::Element< char > const&); Domain (Domain const& s); diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cdp.cpp b/TAO/CIAO/DAnCE/Config_Handlers/cdp.cpp index a4e63057eff..113c1edc886 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/cdp.cpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/cdp.cpp @@ -9,10 +9,11 @@ namespace CIAO // DeploymentPlan:: - DeploymentPlan () + DeploymentPlan (::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes__, + ::CIAO::Config_Handlers::MonolithicDeploymentDescription const& implementation__) : - realizes_ (new ::CIAO::Config_Handlers::ComponentInterfaceDescription ()), - implementation_ (new ::CIAO::Config_Handlers::MonolithicDeploymentDescription ()), + realizes_ (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (realizes__)), + implementation_ (new ::CIAO::Config_Handlers::MonolithicDeploymentDescription (implementation__)), regulator__ () { realizes_->container (this); @@ -501,14 +502,8 @@ namespace CIAO DeploymentPlan:: DeploymentPlan (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - realizes_ (new ::CIAO::Config_Handlers::ComponentInterfaceDescription ()), - implementation_ (new ::CIAO::Config_Handlers::MonolithicDeploymentDescription ()), - regulator__ () + :Base__ (e), regulator__ () { - realizes_->container (this); - implementation_->container (this); ::XSCRT::Parser< char > p (e); @@ -531,14 +526,14 @@ namespace CIAO else if (n == "realizes") { - ::CIAO::Config_Handlers::ComponentInterfaceDescription t (e); - realizes (t); + realizes_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (e)); + realizes_->container (this); } else if (n == "implementation") { - ::CIAO::Config_Handlers::MonolithicDeploymentDescription t (e); - implementation (t); + implementation_ = ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicDeploymentDescription > (new ::CIAO::Config_Handlers::MonolithicDeploymentDescription (e)); + implementation_->container (this); } else if (n == "instance") diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp index de201bfca33..a0544fdd059 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp @@ -141,7 +141,9 @@ namespace CIAO ::std::vector< ::CIAO::Config_Handlers::Property > infoProperty_; public: - DeploymentPlan (); + DeploymentPlan (::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes__, + ::CIAO::Config_Handlers::MonolithicDeploymentDescription const& implementation__); + DeploymentPlan (::XSCRT::XML::Element< char > const&); DeploymentPlan (DeploymentPlan const& s); diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cid.cpp b/TAO/CIAO/DAnCE/Config_Handlers/cid.cpp index 2b5ea3712db..5d9d3641aab 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/cid.cpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/cid.cpp @@ -9,10 +9,11 @@ namespace CIAO // SubcomponentInstantiationDescription:: - SubcomponentInstantiationDescription () + SubcomponentInstantiationDescription (::XMLSchema::string< char > const& name__, + ::CIAO::Config_Handlers::ComponentPackageDescription const& package__) : - name_ (new ::XMLSchema::string< char > ()), - package_ (new ::CIAO::Config_Handlers::ComponentPackageDescription ()), + name_ (new ::XMLSchema::string< char > (name__)), + package_ (new ::CIAO::Config_Handlers::ComponentPackageDescription (package__)), regulator__ () { name_->container (this); @@ -246,10 +247,11 @@ namespace CIAO // SubcomponentPropertyReference:: - SubcomponentPropertyReference () + SubcomponentPropertyReference (::XMLSchema::string< char > const& propertyName__, + ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance__) : - propertyName_ (new ::XMLSchema::string< char > ()), - instance_ (new ::CIAO::Config_Handlers::SubcomponentInstantiationDescription ()), + propertyName_ (new ::XMLSchema::string< char > (propertyName__)), + instance_ (new ::CIAO::Config_Handlers::SubcomponentInstantiationDescription (instance__)), regulator__ () { propertyName_->container (this); @@ -323,11 +325,13 @@ namespace CIAO // AssemblyPropertyMapping:: - AssemblyPropertyMapping () + AssemblyPropertyMapping (::XMLSchema::string< char > const& name__, + ::XMLSchema::string< char > const& externalName__, + ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo__) : - name_ (new ::XMLSchema::string< char > ()), - externalName_ (new ::XMLSchema::string< char > ()), - delegatesTo_ (new ::CIAO::Config_Handlers::SubcomponentPropertyReference ()), + name_ (new ::XMLSchema::string< char > (name__)), + externalName_ (new ::XMLSchema::string< char > (externalName__)), + delegatesTo_ (new ::CIAO::Config_Handlers::SubcomponentPropertyReference (delegatesTo__)), regulator__ () { name_->container (this); @@ -1225,14 +1229,8 @@ namespace CIAO SubcomponentInstantiationDescription:: SubcomponentInstantiationDescription (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - name_ (new ::XMLSchema::string< char > ()), - package_ (new ::CIAO::Config_Handlers::ComponentPackageDescription ()), - regulator__ () + :Base__ (e), regulator__ () { - name_->container (this); - package_->container (this); ::XSCRT::Parser< char > p (e); @@ -1243,14 +1241,14 @@ namespace CIAO if (n == "name") { - ::XMLSchema::string< char > t (e); - name (t); + name_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + name_->container (this); } else if (n == "package") { - ::CIAO::Config_Handlers::ComponentPackageDescription t (e); - package (t); + package_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > (new ::CIAO::Config_Handlers::ComponentPackageDescription (e)); + package_->container (this); } else if (n == "configProperty") @@ -1297,14 +1295,8 @@ namespace CIAO SubcomponentPropertyReference:: SubcomponentPropertyReference (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - propertyName_ (new ::XMLSchema::string< char > ()), - instance_ (new ::CIAO::Config_Handlers::SubcomponentInstantiationDescription ()), - regulator__ () + :Base__ (e), regulator__ () { - propertyName_->container (this); - instance_->container (this); ::XSCRT::Parser< char > p (e); @@ -1315,14 +1307,14 @@ namespace CIAO if (n == "propertyName") { - ::XMLSchema::string< char > t (e); - propertyName (t); + propertyName_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + propertyName_->container (this); } else if (n == "instance") { - ::CIAO::Config_Handlers::SubcomponentInstantiationDescription t (e); - instance (t); + instance_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > (new ::CIAO::Config_Handlers::SubcomponentInstantiationDescription (e)); + instance_->container (this); } else @@ -1336,16 +1328,8 @@ namespace CIAO AssemblyPropertyMapping:: AssemblyPropertyMapping (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - name_ (new ::XMLSchema::string< char > ()), - externalName_ (new ::XMLSchema::string< char > ()), - delegatesTo_ (new ::CIAO::Config_Handlers::SubcomponentPropertyReference ()), - regulator__ () + :Base__ (e), regulator__ () { - name_->container (this); - externalName_->container (this); - delegatesTo_->container (this); ::XSCRT::Parser< char > p (e); @@ -1356,20 +1340,20 @@ namespace CIAO if (n == "name") { - ::XMLSchema::string< char > t (e); - name (t); + name_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + name_->container (this); } else if (n == "externalName") { - ::XMLSchema::string< char > t (e); - externalName (t); + externalName_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + externalName_->container (this); } else if (n == "delegatesTo") { - ::CIAO::Config_Handlers::SubcomponentPropertyReference t (e); - delegatesTo (t); + delegatesTo_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SubcomponentPropertyReference > (new ::CIAO::Config_Handlers::SubcomponentPropertyReference (e)); + delegatesTo_->container (this); } else @@ -1383,9 +1367,7 @@ namespace CIAO ComponentAssemblyDescription:: ComponentAssemblyDescription (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - regulator__ () + :Base__ (e), regulator__ () { ::XSCRT::Parser< char > p (e); @@ -1424,9 +1406,7 @@ namespace CIAO MonolithicImplementationDescription:: MonolithicImplementationDescription (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - regulator__ () + :Base__ (e), regulator__ () { ::XSCRT::Parser< char > p (e); @@ -1465,9 +1445,7 @@ namespace CIAO ComponentImplementationDescription:: ComponentImplementationDescription (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - regulator__ () + :Base__ (e), regulator__ () { ::XSCRT::Parser< char > p (e); diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp index d3659edbe7d..2e233389177 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp @@ -102,7 +102,9 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::ID< char > > id_; public: - SubcomponentInstantiationDescription (); + SubcomponentInstantiationDescription (::XMLSchema::string< char > const& name__, + ::CIAO::Config_Handlers::ComponentPackageDescription const& package__); + SubcomponentInstantiationDescription (::XSCRT::XML::Element< char > const&); SubcomponentInstantiationDescription (SubcomponentInstantiationDescription const& s); @@ -139,7 +141,9 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > instance_; public: - SubcomponentPropertyReference (); + SubcomponentPropertyReference (::XMLSchema::string< char > const& propertyName__, + ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance__); + SubcomponentPropertyReference (::XSCRT::XML::Element< char > const&); SubcomponentPropertyReference (SubcomponentPropertyReference const& s); @@ -186,7 +190,10 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::SubcomponentPropertyReference > delegatesTo_; public: - AssemblyPropertyMapping (); + AssemblyPropertyMapping (::XMLSchema::string< char > const& name__, + ::XMLSchema::string< char > const& externalName__, + ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo__); + AssemblyPropertyMapping (::XSCRT::XML::Element< char > const&); AssemblyPropertyMapping (AssemblyPropertyMapping const& s); @@ -243,6 +250,7 @@ namespace CIAO public: ComponentAssemblyDescription (); + ComponentAssemblyDescription (::XSCRT::XML::Element< char > const&); ComponentAssemblyDescription (ComponentAssemblyDescription const& s); @@ -296,6 +304,7 @@ namespace CIAO public: MonolithicImplementationDescription (); + MonolithicImplementationDescription (::XSCRT::XML::Element< char > const&); MonolithicImplementationDescription (MonolithicImplementationDescription const& s); @@ -423,6 +432,7 @@ namespace CIAO public: ComponentImplementationDescription (); + ComponentImplementationDescription (::XSCRT::XML::Element< char > const&); ComponentImplementationDescription (ComponentImplementationDescription const& s); diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cpd.cpp b/TAO/CIAO/DAnCE/Config_Handlers/cpd.cpp index 93ffc86d1d3..1417dc041af 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/cpd.cpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/cpd.cpp @@ -9,10 +9,11 @@ namespace CIAO // PackagedComponentImplementation:: - PackagedComponentImplementation () + PackagedComponentImplementation (::XMLSchema::string< char > const& name__, + ::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation__) : - name_ (new ::XMLSchema::string< char > ()), - referencedImplementation_ (new ::CIAO::Config_Handlers::ComponentImplementationDescription ()), + name_ (new ::XMLSchema::string< char > (name__)), + referencedImplementation_ (new ::CIAO::Config_Handlers::ComponentImplementationDescription (referencedImplementation__)), regulator__ () { name_->container (this); @@ -397,14 +398,8 @@ namespace CIAO PackagedComponentImplementation:: PackagedComponentImplementation (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - name_ (new ::XMLSchema::string< char > ()), - referencedImplementation_ (new ::CIAO::Config_Handlers::ComponentImplementationDescription ()), - regulator__ () + :Base__ (e), regulator__ () { - name_->container (this); - referencedImplementation_->container (this); ::XSCRT::Parser< char > p (e); @@ -415,14 +410,14 @@ namespace CIAO if (n == "name") { - ::XMLSchema::string< char > t (e); - name (t); + name_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + name_->container (this); } else if (n == "referencedImplementation") { - ::CIAO::Config_Handlers::ComponentImplementationDescription t (e); - referencedImplementation (t); + referencedImplementation_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentImplementationDescription > (new ::CIAO::Config_Handlers::ComponentImplementationDescription (e)); + referencedImplementation_->container (this); } else @@ -436,9 +431,7 @@ namespace CIAO ComponentPackageDescription:: ComponentPackageDescription (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - regulator__ () + :Base__ (e), regulator__ () { ::XSCRT::Parser< char > p (e); diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp index 9d9292e8682..b39a06eb2e2 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp @@ -52,7 +52,9 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentImplementationDescription > referencedImplementation_; public: - PackagedComponentImplementation (); + PackagedComponentImplementation (::XMLSchema::string< char > const& name__, + ::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation__); + PackagedComponentImplementation (::XSCRT::XML::Element< char > const&); PackagedComponentImplementation (PackagedComponentImplementation const& s); @@ -147,6 +149,7 @@ namespace CIAO public: ComponentPackageDescription (); + ComponentPackageDescription (::XSCRT::XML::Element< char > const&); ComponentPackageDescription (ComponentPackageDescription const& s); diff --git a/TAO/CIAO/DAnCE/Config_Handlers/iad.cpp b/TAO/CIAO/DAnCE/Config_Handlers/iad.cpp index 4615031d2ab..febff70e66a 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/iad.cpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/iad.cpp @@ -9,10 +9,11 @@ namespace CIAO // NamedImplementationArtifact:: - NamedImplementationArtifact () + NamedImplementationArtifact (::XMLSchema::string< char > const& name__, + ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact__) : - name_ (new ::XMLSchema::string< char > ()), - referencedArtifact_ (new ::CIAO::Config_Handlers::ImplementationArtifactDescription ()), + name_ (new ::XMLSchema::string< char > (name__)), + referencedArtifact_ (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (referencedArtifact__)), regulator__ () { name_->container (this); @@ -489,14 +490,8 @@ namespace CIAO NamedImplementationArtifact:: NamedImplementationArtifact (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - name_ (new ::XMLSchema::string< char > ()), - referencedArtifact_ (new ::CIAO::Config_Handlers::ImplementationArtifactDescription ()), - regulator__ () + :Base__ (e), regulator__ () { - name_->container (this); - referencedArtifact_->container (this); ::XSCRT::Parser< char > p (e); @@ -507,14 +502,14 @@ namespace CIAO if (n == "name") { - ::XMLSchema::string< char > t (e); - name (t); + name_ = ::std::auto_ptr< ::XMLSchema::string< char > > (new ::XMLSchema::string< char > (e)); + name_->container (this); } else if (n == "referencedArtifact") { - ::CIAO::Config_Handlers::ImplementationArtifactDescription t (e); - referencedArtifact (t); + referencedArtifact_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationArtifactDescription > (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (e)); + referencedArtifact_->container (this); } else @@ -528,9 +523,7 @@ namespace CIAO ImplementationArtifactDescription:: ImplementationArtifactDescription (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - regulator__ () + :Base__ (e), regulator__ () { ::XSCRT::Parser< char > p (e); diff --git a/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp b/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp index a94ef2fd5a0..641d9c2092b 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp @@ -50,7 +50,9 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationArtifactDescription > referencedArtifact_; public: - NamedImplementationArtifact (); + NamedImplementationArtifact (::XMLSchema::string< char > const& name__, + ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact__); + NamedImplementationArtifact (::XSCRT::XML::Element< char > const&); NamedImplementationArtifact (NamedImplementationArtifact const& s); @@ -162,6 +164,7 @@ namespace CIAO public: ImplementationArtifactDescription (); + ImplementationArtifactDescription (::XSCRT::XML::Element< char > const&); ImplementationArtifactDescription (ImplementationArtifactDescription const& s); diff --git a/TAO/CIAO/DAnCE/Config_Handlers/pcd.cpp b/TAO/CIAO/DAnCE/Config_Handlers/pcd.cpp index bcae0ddb3a8..8e8e7cbcf44 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/pcd.cpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/pcd.cpp @@ -320,9 +320,7 @@ namespace CIAO PackageConfiguration:: PackageConfiguration (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - regulator__ () + :Base__ (e), regulator__ () { ::XSCRT::Parser< char > p (e); diff --git a/TAO/CIAO/DAnCE/Config_Handlers/pcd.hpp b/TAO/CIAO/DAnCE/Config_Handlers/pcd.hpp index 2b76f3cfdcc..f6567777ed9 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/pcd.hpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/pcd.hpp @@ -109,6 +109,7 @@ namespace CIAO public: PackageConfiguration (); + PackageConfiguration (::XSCRT::XML::Element< char > const&); PackageConfiguration (PackageConfiguration const& s); diff --git a/TAO/CIAO/DAnCE/Config_Handlers/toplevel.cpp b/TAO/CIAO/DAnCE/Config_Handlers/toplevel.cpp index 5cc0c37b532..e5ff87f59ee 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/toplevel.cpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/toplevel.cpp @@ -105,9 +105,7 @@ namespace CIAO TopLevelPackageDescription:: TopLevelPackageDescription (::XSCRT::XML::Element< char > const& e) - : - Base__ (e), - regulator__ () + :Base__ (e), regulator__ () { ::XSCRT::Parser< char > p (e); diff --git a/TAO/CIAO/DAnCE/Config_Handlers/toplevel.hpp b/TAO/CIAO/DAnCE/Config_Handlers/toplevel.hpp index c2f860ea87f..201fd7d1fcd 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/toplevel.hpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/toplevel.hpp @@ -44,6 +44,7 @@ namespace CIAO public: TopLevelPackageDescription (); + TopLevelPackageDescription (::XSCRT::XML::Element< char > const&); TopLevelPackageDescription (TopLevelPackageDescription const& s); |