ChangeLogTag: Wed Feb 11 14:46:15 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>

1 files changed, 385 insertions, 68 deletions

diff --git a/CIAO/tools/Config_Handlers/cid.cpp b/CIAO/tools/Config_Handlers/cid.cpp
index e35dbea885d..ff69d6d8473 100644
--- a/CIAO/tools/Config_Handlers/cid.cpp
+++ b/CIAO/tools/Config_Handlers/cid.cpp
@@ -21,6 +21,121 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
+    // ComponentPackageReference
+    // 
+
+    ComponentPackageReference::
+    ComponentPackageReference (::CIAO::Config_Handlers::ComponentInterfaceDescription const& requiredType__)
+    : 
+    ::XSCRT::Type (), 
+    requiredType_ (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (requiredType__)),
+    regulator__ ()
+    {
+      requiredType_->container (this);
+    }
+
+    ComponentPackageReference::
+    ComponentPackageReference (::CIAO::Config_Handlers::ComponentPackageReference const& s)
+    :
+    ::XSCRT::Type (),
+    requiredUUID_ (s.requiredUUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.requiredUUID_) : 0),
+    requiredName_ (s.requiredName_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.requiredName_) : 0),
+    requiredType_ (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.requiredType_)),
+    regulator__ ()
+    {
+      if (requiredUUID_.get ()) requiredUUID_->container (this);
+      if (requiredName_.get ()) requiredName_->container (this);
+      requiredType_->container (this);
+    }
+
+    ::CIAO::Config_Handlers::ComponentPackageReference& ComponentPackageReference::
+    operator= (::CIAO::Config_Handlers::ComponentPackageReference const& s)
+    {
+      if (s.requiredUUID_.get ()) requiredUUID (*(s.requiredUUID_));
+      else requiredUUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+
+      if (s.requiredName_.get ()) requiredName (*(s.requiredName_));
+      else requiredName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+
+      requiredType (s.requiredType ());
+
+      return *this;
+    }
+
+
+    // ComponentPackageReference
+    // 
+    bool ComponentPackageReference::
+    requiredUUID_p () const
+    {
+      return requiredUUID_.get () != 0;
+    }
+
+    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageReference::
+    requiredUUID () const
+    {
+      return *requiredUUID_;
+    }
+
+    void ComponentPackageReference::
+    requiredUUID (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (requiredUUID_.get ())
+      {
+        *requiredUUID_ = e;
+      }
+
+      else
+      {
+        requiredUUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        requiredUUID_->container (this);
+      }
+    }
+
+    // ComponentPackageReference
+    // 
+    bool ComponentPackageReference::
+    requiredName_p () const
+    {
+      return requiredName_.get () != 0;
+    }
+
+    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageReference::
+    requiredName () const
+    {
+      return *requiredName_;
+    }
+
+    void ComponentPackageReference::
+    requiredName (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (requiredName_.get ())
+      {
+        *requiredName_ = e;
+      }
+
+      else
+      {
+        requiredName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        requiredName_->container (this);
+      }
+    }
+
+    // ComponentPackageReference
+    // 
+    ::CIAO::Config_Handlers::ComponentInterfaceDescription const& ComponentPackageReference::
+    requiredType () const
+    {
+      return *requiredType_;
+    }
+
+    void ComponentPackageReference::
+    requiredType (::CIAO::Config_Handlers::ComponentInterfaceDescription const& e)
+    {
+      *requiredType_ = e;
+    }
+
+
     // SubcomponentInstantiationDescription
     // 
 
@@ -343,11 +458,11 @@ namespace CIAO
 
     SubcomponentPropertyReference::
     SubcomponentPropertyReference (::XMLSchema::string< ACE_TCHAR > const& propertyName__,
-                                   ::XMLSchema::IDREF< ACE_TCHAR > const& instance__)
+                                   ::CIAO::Config_Handlers::IdRef const& instance__)
     : 
     ::XSCRT::Type (), 
     propertyName_ (new ::XMLSchema::string< ACE_TCHAR > (propertyName__)),
-    instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (instance__)),
+    instance_ (new ::CIAO::Config_Handlers::IdRef (instance__)),
     regulator__ ()
     {
       propertyName_->container (this);
@@ -359,7 +474,7 @@ namespace CIAO
     :
     ::XSCRT::Type (),
     propertyName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.propertyName_)),
-    instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (*s.instance_)),
+    instance_ (new ::CIAO::Config_Handlers::IdRef (*s.instance_)),
     regulator__ ()
     {
       propertyName_->container (this);
@@ -393,14 +508,14 @@ namespace CIAO
 
     // SubcomponentPropertyReference
     // 
-    ::XMLSchema::IDREF< ACE_TCHAR > const& SubcomponentPropertyReference::
+    ::CIAO::Config_Handlers::IdRef const& SubcomponentPropertyReference::
     instance () const
     {
       return *instance_;
     }
 
     void SubcomponentPropertyReference::
-    instance (::XMLSchema::IDREF< ACE_TCHAR > const& e)
+    instance (::CIAO::Config_Handlers::IdRef const& e)
     {
       *instance_ = e;
     }
@@ -1365,6 +1480,45 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
+    // ComponentPackageReference
+    //
+
+    ComponentPackageReference::
+    ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
+
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
+
+      while (p.more_elements ())
+      {
+        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+        if (n == "requiredUUID")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          requiredUUID (t);
+        }
+
+        else if (n == "requiredName")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          requiredName (t);
+        }
+
+        else if (n == "requiredType")
+        {
+          requiredType_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (e));
+          requiredType_->container (this);
+        }
+
+        else 
+        {
+        }
+      }
+    }
+
     // SubcomponentInstantiationDescription
     //
 
@@ -1380,43 +1534,43 @@ namespace CIAO
         ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
         ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        if (n == ACE_TEXT ("name"))
+        if (n == "name")
         {
           name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           name_->container (this);
         }
 
-        else if (n == ACE_TEXT ("basePackage"))
+        else if (n == "basePackage")
         {
           ::CIAO::Config_Handlers::ComponentPackageDescription t (e);
           basePackage (t);
         }
 
-        else if (n == ACE_TEXT ("specializedConfig"))
+        else if (n == "specializedConfig")
         {
           ::CIAO::Config_Handlers::PackageConfiguration t (e);
           specializedConfig (t);
         }
 
-        else if (n == ACE_TEXT ("selectRequirement"))
+        else if (n == "selectRequirement")
         {
           ::CIAO::Config_Handlers::Requirement t (e);
           add_selectRequirement (t);
         }
 
-        else if (n == ACE_TEXT ("configProperty"))
+        else if (n == "configProperty")
         {
           ::CIAO::Config_Handlers::Property t (e);
           add_configProperty (t);
         }
 
-        else if (n == ACE_TEXT ("referencedPackage"))
+        else if (n == "referencedPackage")
         {
           ::CIAO::Config_Handlers::ComponentPackageReference t (e);
           referencedPackage (t);
         }
 
-        else if (n == ACE_TEXT ("importedPackage"))
+        else if (n == "importedPackage")
         {
           ::CIAO::Config_Handlers::ComponentPackageImport t (e);
           importedPackage (t);
@@ -1431,7 +1585,7 @@ namespace CIAO
       {
         ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
         ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-        if (n == ACE_TEXT ("id"))
+        if (n == "id")
         {
           ::XMLSchema::ID< ACE_TCHAR > t (a);
           id (t);
@@ -1458,15 +1612,15 @@ namespace CIAO
         ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
         ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        if (n == ACE_TEXT ("propertyName"))
+        if (n == "propertyName")
         {
           propertyName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           propertyName_->container (this);
         }
 
-        else if (n == ACE_TEXT ("instance"))
+        else if (n == "instance")
         {
-          instance_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
+          instance_ = ::std::auto_ptr< ::CIAO::Config_Handlers::IdRef > (new ::CIAO::Config_Handlers::IdRef (e));
           instance_->container (this);
         }
 
@@ -1491,19 +1645,19 @@ namespace CIAO
         ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
         ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        if (n == ACE_TEXT ("name"))
+        if (n == "name")
         {
           name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           name_->container (this);
         }
 
-        else if (n == ACE_TEXT ("externalName"))
+        else if (n == "externalName")
         {
           externalName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           externalName_->container (this);
         }
 
-        else if (n == ACE_TEXT ("delegatesTo"))
+        else if (n == "delegatesTo")
         {
           ::CIAO::Config_Handlers::SubcomponentPropertyReference t (e);
           add_delegatesTo (t);
@@ -1530,19 +1684,19 @@ namespace CIAO
         ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
         ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        if (n == ACE_TEXT ("instance"))
+        if (n == "instance")
         {
           ::CIAO::Config_Handlers::SubcomponentInstantiationDescription t (e);
           add_instance (t);
         }
 
-        else if (n == ACE_TEXT ("connection"))
+        else if (n == "connection")
         {
           ::CIAO::Config_Handlers::AssemblyConnectionDescription t (e);
           add_connection (t);
         }
 
-        else if (n == ACE_TEXT ("externalProperty"))
+        else if (n == "externalProperty")
         {
           ::CIAO::Config_Handlers::AssemblyPropertyMapping t (e);
           add_externalProperty (t);
@@ -1569,25 +1723,25 @@ namespace CIAO
         ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
         ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        if (n == ACE_TEXT ("nodeExecParameter"))
+        if (n == "nodeExecParameter")
         {
           ::CIAO::Config_Handlers::Property t (e);
           add_nodeExecParameter (t);
         }
 
-        else if (n == ACE_TEXT ("componentExecParameter"))
+        else if (n == "componentExecParameter")
         {
           ::CIAO::Config_Handlers::Property t (e);
           add_componentExecParameter (t);
         }
 
-        else if (n == ACE_TEXT ("deployRequirement"))
+        else if (n == "deployRequirement")
         {
           ::CIAO::Config_Handlers::ImplementationRequirement t (e);
           add_deployRequirement (t);
         }
 
-        else if (n == ACE_TEXT ("primaryArtifact"))
+        else if (n == "primaryArtifact")
         {
           ::CIAO::Config_Handlers::NamedImplementationArtifact t (e);
           add_primaryArtifact (t);
@@ -1614,61 +1768,61 @@ namespace CIAO
         ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
         ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-        if (n == ACE_TEXT ("label"))
+        if (n == "label")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           label (t);
         }
 
-        else if (n == ACE_TEXT ("UUID"))
+        else if (n == "UUID")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           UUID (t);
         }
 
-        else if (n == ACE_TEXT ("implements"))
+        else if (n == "implements")
         {
           ::CIAO::Config_Handlers::ComponentInterfaceDescription t (e);
           implements (t);
         }
 
-        else if (n == ACE_TEXT ("assemblyImpl"))
+        else if (n == "assemblyImpl")
         {
           ::CIAO::Config_Handlers::ComponentAssemblyDescription t (e);
           assemblyImpl (t);
         }
 
-        else if (n == ACE_TEXT ("monolithicImpl"))
+        else if (n == "monolithicImpl")
         {
           ::CIAO::Config_Handlers::MonolithicImplementationDescription t (e);
           monolithicImpl (t);
         }
 
-        else if (n == ACE_TEXT ("configProperty"))
+        else if (n == "configProperty")
         {
           ::CIAO::Config_Handlers::Property t (e);
           add_configProperty (t);
         }
 
-        else if (n == ACE_TEXT ("capability"))
+        else if (n == "capability")
         {
           ::CIAO::Config_Handlers::Capability t (e);
           add_capability (t);
         }
 
-        else if (n == ACE_TEXT ("dependsOn"))
+        else if (n == "dependsOn")
         {
           ::CIAO::Config_Handlers::ImplementationDependency t (e);
           add_dependsOn (t);
         }
 
-        else if (n == ACE_TEXT ("infoProperty"))
+        else if (n == "infoProperty")
         {
           ::CIAO::Config_Handlers::Property t (e);
           add_infoProperty (t);
         }
 
-        else if (n == ACE_TEXT ("contentLocation"))
+        else if (n == "contentLocation")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           contentLocation (t);
@@ -1683,7 +1837,7 @@ namespace CIAO
       {
         ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
         ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-        if (n == ACE_TEXT ("href"))
+        if (n == "href")
         {
           ::XMLSchema::string< ACE_TCHAR > t (a);
           href (t);
@@ -1714,6 +1868,20 @@ namespace CIAO
     {
       ::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
 
+      struct ComponentPackageReferenceTypeInfoInitializer
+      {
+        ComponentPackageReferenceTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (ComponentPackageReference));
+          ::XSCRT::ExtendedTypeInfo nf (id);
+
+          nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
+          ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
+        }
+      };
+
+      ComponentPackageReferenceTypeInfoInitializer ComponentPackageReferenceTypeInfoInitializer_;
+
       struct SubcomponentInstantiationDescriptionTypeInfoInitializer
       {
         SubcomponentInstantiationDescriptionTypeInfoInitializer ()
@@ -1807,6 +1975,110 @@ namespace CIAO
   {
     namespace Traversal
     {
+      // ComponentPackageReference
+      //
+      //
+
+      void ComponentPackageReference::
+      traverse (Type& o)
+      {
+        pre (o);
+        if (o.requiredUUID_p ()) requiredUUID (o);
+        else requiredUUID_none (o);
+        if (o.requiredName_p ()) requiredName (o);
+        else requiredName_none (o);
+        requiredType (o);
+        post (o);
+      }
+
+      void ComponentPackageReference::
+      traverse (Type const& o)
+      {
+        pre (o);
+        if (o.requiredUUID_p ()) requiredUUID (o);
+        else requiredUUID_none (o);
+        if (o.requiredName_p ()) requiredName (o);
+        else requiredName_none (o);
+        requiredType (o);
+        post (o);
+      }
+
+      void ComponentPackageReference::
+      pre (Type&)
+      {
+      }
+
+      void ComponentPackageReference::
+      pre (Type const&)
+      {
+      }
+
+      void ComponentPackageReference::
+      requiredUUID (Type& o)
+      {
+        dispatch (o.requiredUUID ());
+      }
+
+      void ComponentPackageReference::
+      requiredUUID (Type const& o)
+      {
+        dispatch (o.requiredUUID ());
+      }
+
+      void ComponentPackageReference::
+      requiredUUID_none (Type&)
+      {
+      }
+
+      void ComponentPackageReference::
+      requiredUUID_none (Type const&)
+      {
+      }
+
+      void ComponentPackageReference::
+      requiredName (Type& o)
+      {
+        dispatch (o.requiredName ());
+      }
+
+      void ComponentPackageReference::
+      requiredName (Type const& o)
+      {
+        dispatch (o.requiredName ());
+      }
+
+      void ComponentPackageReference::
+      requiredName_none (Type&)
+      {
+      }
+
+      void ComponentPackageReference::
+      requiredName_none (Type const&)
+      {
+      }
+
+      void ComponentPackageReference::
+      requiredType (Type& o)
+      {
+        dispatch (o.requiredType ());
+      }
+
+      void ComponentPackageReference::
+      requiredType (Type const& o)
+      {
+        dispatch (o.requiredType ());
+      }
+
+      void ComponentPackageReference::
+      post (Type&)
+      {
+      }
+
+      void ComponentPackageReference::
+      post (Type const&)
+      {
+      }
+
       // SubcomponentInstantiationDescription
       //
       //
@@ -3588,6 +3860,51 @@ namespace CIAO
   {
     namespace Writer
     {
+      // ComponentPackageReference
+      //
+      //
+
+      ComponentPackageReference::
+      ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      ComponentPackageReference::
+      ComponentPackageReference ()
+      {
+      }
+
+      void ComponentPackageReference::
+      traverse (Type const& o)
+      {
+        Traversal::ComponentPackageReference::traverse (o);
+      }
+
+      void ComponentPackageReference::
+      requiredUUID (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredUUID", top_ ()));
+        Traversal::ComponentPackageReference::requiredUUID (o);
+        pop_ ();
+      }
+
+      void ComponentPackageReference::
+      requiredName (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredName", top_ ()));
+        Traversal::ComponentPackageReference::requiredName (o);
+        pop_ ();
+      }
+
+      void ComponentPackageReference::
+      requiredType (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredType", top_ ()));
+        Traversal::ComponentPackageReference::requiredType (o);
+        pop_ ();
+      }
+
       // SubcomponentInstantiationDescription
       //
       //
@@ -3612,7 +3929,7 @@ namespace CIAO
       void SubcomponentInstantiationDescription::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::SubcomponentInstantiationDescription::name (o);
         pop_ ();
       }
@@ -3620,7 +3937,7 @@ namespace CIAO
       void SubcomponentInstantiationDescription::
       basePackage (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("basePackage"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("basePackage", top_ ()));
         Traversal::SubcomponentInstantiationDescription::basePackage (o);
         pop_ ();
       }
@@ -3628,7 +3945,7 @@ namespace CIAO
       void SubcomponentInstantiationDescription::
       specializedConfig (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("specializedConfig"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("specializedConfig", top_ ()));
         Traversal::SubcomponentInstantiationDescription::specializedConfig (o);
         pop_ ();
       }
@@ -3636,7 +3953,7 @@ namespace CIAO
       void SubcomponentInstantiationDescription::
       selectRequirement_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("selectRequirement"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("selectRequirement", top_ ()));
       }
 
       void SubcomponentInstantiationDescription::
@@ -3655,7 +3972,7 @@ namespace CIAO
       void SubcomponentInstantiationDescription::
       configProperty_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("configProperty"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
       }
 
       void SubcomponentInstantiationDescription::
@@ -3674,7 +3991,7 @@ namespace CIAO
       void SubcomponentInstantiationDescription::
       referencedPackage (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("referencedPackage"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("referencedPackage", top_ ()));
         Traversal::SubcomponentInstantiationDescription::referencedPackage (o);
         pop_ ();
       }
@@ -3682,7 +3999,7 @@ namespace CIAO
       void SubcomponentInstantiationDescription::
       importedPackage (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("importedPackage"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("importedPackage", top_ ()));
         Traversal::SubcomponentInstantiationDescription::importedPackage (o);
         pop_ ();
       }
@@ -3690,7 +4007,7 @@ namespace CIAO
       void SubcomponentInstantiationDescription::
       id (Type const& o)
       {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT ("id"), ACE_TEXT (""), top_ ());
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
         attr_ (&a);
         Traversal::SubcomponentInstantiationDescription::id (o);
         attr_ (0);
@@ -3720,7 +4037,7 @@ namespace CIAO
       void SubcomponentPropertyReference::
       propertyName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("propertyName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("propertyName", top_ ()));
         Traversal::SubcomponentPropertyReference::propertyName (o);
         pop_ ();
       }
@@ -3728,7 +4045,7 @@ namespace CIAO
       void SubcomponentPropertyReference::
       instance (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("instance"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
         Traversal::SubcomponentPropertyReference::instance (o);
         pop_ ();
       }
@@ -3757,7 +4074,7 @@ namespace CIAO
       void AssemblyPropertyMapping::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::AssemblyPropertyMapping::name (o);
         pop_ ();
       }
@@ -3765,7 +4082,7 @@ namespace CIAO
       void AssemblyPropertyMapping::
       externalName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("externalName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalName", top_ ()));
         Traversal::AssemblyPropertyMapping::externalName (o);
         pop_ ();
       }
@@ -3773,7 +4090,7 @@ namespace CIAO
       void AssemblyPropertyMapping::
       delegatesTo_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("delegatesTo"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("delegatesTo", top_ ()));
       }
 
       void AssemblyPropertyMapping::
@@ -3813,7 +4130,7 @@ namespace CIAO
       void ComponentAssemblyDescription::
       instance_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("instance"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
       }
 
       void ComponentAssemblyDescription::
@@ -3832,7 +4149,7 @@ namespace CIAO
       void ComponentAssemblyDescription::
       connection_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("connection"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connection", top_ ()));
       }
 
       void ComponentAssemblyDescription::
@@ -3851,7 +4168,7 @@ namespace CIAO
       void ComponentAssemblyDescription::
       externalProperty_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("externalProperty"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalProperty", top_ ()));
       }
 
       void ComponentAssemblyDescription::
@@ -3891,7 +4208,7 @@ namespace CIAO
       void MonolithicImplementationDescription::
       nodeExecParameter_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("nodeExecParameter"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("nodeExecParameter", top_ ()));
       }
 
       void MonolithicImplementationDescription::
@@ -3910,7 +4227,7 @@ namespace CIAO
       void MonolithicImplementationDescription::
       componentExecParameter_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("componentExecParameter"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("componentExecParameter", top_ ()));
       }
 
       void MonolithicImplementationDescription::
@@ -3929,7 +4246,7 @@ namespace CIAO
       void MonolithicImplementationDescription::
       deployRequirement_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("deployRequirement"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
       }
 
       void MonolithicImplementationDescription::
@@ -3948,7 +4265,7 @@ namespace CIAO
       void MonolithicImplementationDescription::
       primaryArtifact_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("primaryArtifact"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("primaryArtifact", top_ ()));
       }
 
       void MonolithicImplementationDescription::
@@ -3988,7 +4305,7 @@ namespace CIAO
       void ComponentImplementationDescription::
       label (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("label"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
         Traversal::ComponentImplementationDescription::label (o);
         pop_ ();
       }
@@ -3996,7 +4313,7 @@ namespace CIAO
       void ComponentImplementationDescription::
       UUID (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("UUID"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
         Traversal::ComponentImplementationDescription::UUID (o);
         pop_ ();
       }
@@ -4004,7 +4321,7 @@ namespace CIAO
       void ComponentImplementationDescription::
       implements (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("implements"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("implements", top_ ()));
         Traversal::ComponentImplementationDescription::implements (o);
         pop_ ();
       }
@@ -4012,7 +4329,7 @@ namespace CIAO
       void ComponentImplementationDescription::
       assemblyImpl (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("assemblyImpl"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("assemblyImpl", top_ ()));
         Traversal::ComponentImplementationDescription::assemblyImpl (o);
         pop_ ();
       }
@@ -4020,7 +4337,7 @@ namespace CIAO
       void ComponentImplementationDescription::
       monolithicImpl (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("monolithicImpl"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("monolithicImpl", top_ ()));
         Traversal::ComponentImplementationDescription::monolithicImpl (o);
         pop_ ();
       }
@@ -4028,7 +4345,7 @@ namespace CIAO
       void ComponentImplementationDescription::
       configProperty_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("configProperty"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
       }
 
       void ComponentImplementationDescription::
@@ -4047,7 +4364,7 @@ namespace CIAO
       void ComponentImplementationDescription::
       capability_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("capability"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("capability", top_ ()));
       }
 
       void ComponentImplementationDescription::
@@ -4066,7 +4383,7 @@ namespace CIAO
       void ComponentImplementationDescription::
       dependsOn_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("dependsOn"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("dependsOn", top_ ()));
       }
 
       void ComponentImplementationDescription::
@@ -4085,7 +4402,7 @@ namespace CIAO
       void ComponentImplementationDescription::
       infoProperty_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("infoProperty"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
       }
 
       void ComponentImplementationDescription::
@@ -4104,7 +4421,7 @@ namespace CIAO
       void ComponentImplementationDescription::
       contentLocation (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("contentLocation"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("contentLocation", top_ ()));
         Traversal::ComponentImplementationDescription::contentLocation (o);
         pop_ ();
       }
@@ -4112,7 +4429,7 @@ namespace CIAO
       void ComponentImplementationDescription::
       href (Type const& o)
       {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT ("href"), ACE_TEXT (""), top_ ());
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("href", "", top_ ());
         attr_ (&a);
         Traversal::ComponentImplementationDescription::href (o);
         attr_ (0);