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

135 files changed, 8070 insertions, 4236 deletions

diff --git a/CIAO/tools/Config_Handlers/ADD_Handler.cpp b/CIAO/tools/Config_Handlers/ADD_Handler.cpp
index 05db95d8780..1b898b603d2 100644
--- a/CIAO/tools/Config_Handlers/ADD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/ADD_Handler.cpp
@@ -16,16 +16,15 @@ namespace CIAO
     IDREF_Base<CORBA::ULong> ADD_Handler::IDREF;
 
       void
-      ADD_Handler::artifact_deployment_descrs (
-                                               const DeploymentPlan &src,
+      ADD_Handler::artifact_deployment_descrs (const deploymentPlan &src,
                                                ::Deployment::ArtifactDeploymentDescriptions &dest)
       {
         CIAO_TRACE("ADD_Handler::atrifact_deployment_descrs");
-        DeploymentPlan::artifact_const_iterator aci_e =
+        deploymentPlan::artifact_const_iterator aci_e =
           src.end_artifact ();
         dest.length (src.count_artifact ());
         CORBA::ULong pos = 0;
-        for (DeploymentPlan::artifact_const_iterator aci_b =
+        for (deploymentPlan::artifact_const_iterator aci_b =
                src.begin_artifact ();
              aci_e != aci_b;
              ++aci_b)
@@ -44,10 +43,10 @@ namespace CIAO
                                               CORBA::ULong pos)
       {
         CIAO_TRACE("ADD_Handler::atrifact_deployment_descr");
-        dest.name = ACE_TEXT_ALWAYS_CHAR (src.name ().c_str ());
+        dest.name = src.name ().c_str ();
 
 
-        dest.node = ACE_TEXT_ALWAYS_CHAR (src.node ().c_str ());
+        dest.node = src.node ().c_str ();
 
         ArtifactDeploymentDescription::location_const_iterator end =
           src.end_location ();
@@ -59,7 +58,7 @@ namespace CIAO
              start != end;
              ++start)
           {
-            dest.location[len++] = ACE_TEXT_ALWAYS_CHAR (start->c_str ());
+            dest.location[len++] = start->c_str ();
           }
 
         ArtifactDeploymentDescription::source_const_iterator sce =
@@ -71,7 +70,7 @@ namespace CIAO
              scb != sce;
              ++scb)
           {
-            dest.source[len++] = ACE_TEXT_ALWAYS_CHAR (scb->c_str ());
+            dest.source[len++] = scb->c_str ();
           }
 
         // @@TODO: See this loop is repeated
@@ -85,12 +84,12 @@ namespace CIAO
              ++adcb)
           {
             Property_Handler::handle_property ((*adcb),
-                                               dest.execParameter[len++]);
+                           dest.execParameter[len++]);
           }
 
-        if (src.id_p ())
+        if (src.xmi_id_p ())
           {
-            ACE_CString cstr (ACE_TEXT_ALWAYS_CHAR (src.id ().c_str ()));
+            ACE_CString cstr (src.xmi_id ().c_str ());
 
             ADD_Handler::IDREF.bind_ref (cstr,pos);
           }
@@ -131,8 +130,8 @@ namespace CIAO
       {
         CIAO_TRACE("ADD_Handler::atrifact_deployment_descr - reverse");
         //Get the name and node and store them in the add
-        XMLSchema::string< ACE_TCHAR > name (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()));
-        XMLSchema::string< ACE_TCHAR > node (ACE_TEXT_CHAR_TO_TCHAR (src.node.in ()));
+        XMLSchema::string< char > name ((src.name));
+        XMLSchema::string< char > node ((src.node));
 
         ArtifactDeploymentDescription add (name,node);
 
@@ -140,7 +139,7 @@ namespace CIAO
         size_t total = src.location.length ();
         for (size_t i = 0; i < total; ++i)
           {
-            XMLSchema::string< ACE_TCHAR > curr (ACE_TEXT_CHAR_TO_TCHAR (src.location[i].in ()));
+            XMLSchema::string< char > curr ((src.location[i]));
             add.add_location (curr);
           }
 
@@ -148,7 +147,7 @@ namespace CIAO
         total = src.source.length ();
         for (size_t j = 0; j < total; ++j)
           {
-            XMLSchema::string< ACE_TCHAR > curr (ACE_TEXT_CHAR_TO_TCHAR (src.source[j].in ()));
+            XMLSchema::string< char > curr ((src.source[j]));
             add.add_source (curr);
           }
 
@@ -165,12 +164,12 @@ namespace CIAO
         ACE_CString add_id ("_");
         add_id += *uuid.to_string ();
 
-        XMLSchema::ID< ACE_TCHAR > xml_id (ACE_TEXT_CHAR_TO_TCHAR (add_id.c_str ()));
+        XMLSchema::ID< ACE_TCHAR > xml_id (add_id.c_str ());
 
         // Bind the ref and set it in the IDD
         ADD_Handler::IDREF.bind_next_available (add_id);
 
-        add.id (xml_id);
+        add.xmi_id (xml_id);
 
         return add;
       }
diff --git a/CIAO/tools/Config_Handlers/ADD_Handler.h b/CIAO/tools/Config_Handlers/ADD_Handler.h
index 0db82b30fb2..063093a7038 100644
--- a/CIAO/tools/Config_Handlers/ADD_Handler.h
+++ b/CIAO/tools/Config_Handlers/ADD_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
-*  @file  ADD_Handler.h
-*
-*  $Id$
-*
-*  @author Jules White <jules@dre.vanderbilt.edu>
-*/
+ *  @file  ADD_Handler.h
+ *
+ *  $Id$
+ *
+ *  @author Jules White <jules@dre.vanderbilt.edu>
+ */
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_ADD_Handler_H
@@ -23,50 +23,48 @@
 
 namespace Deployment
 {
-struct ArtifactDeploymentDescription;
-class ArtifactDeploymentDescriptions;
+  struct ArtifactDeploymentDescription;
+  class ArtifactDeploymentDescriptions;
 }
 
 
 namespace CIAO
 {
 
-namespace Config_Handlers
-{
-class DeploymentPlan;
-class ArtifactDeploymentDescription;
+  namespace Config_Handlers
+    {
+      class deploymentPlan;
+      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
-*       // @@ Jules, why Any type?
-* descriptor files, to the  corresponding CORBA IDL Any type.
-*/
-class Config_Handlers_Export ADD_Handler
-{
-public:
-static void artifact_deployment_descrs (
-const DeploymentPlan &src,
-::Deployment::ArtifactDeploymentDescriptions &dest);
+      /*
+       * @class ADD_Handler
+       *
+       * @brief Handler class for <ArtifactDeploymentDescription> types.
+       *
+       * 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:
+          static void artifact_deployment_descrs (const deploymentPlan &src,
+                                                  ::Deployment::ArtifactDeploymentDescriptions &dest);
 
-static ArtifactDeploymentDescription
-artifact_deployment_descr (
-const Deployment::ArtifactDeploymentDescription &src);
+          static ArtifactDeploymentDescription
+            artifact_deployment_descr (const Deployment::ArtifactDeploymentDescription &src);
 
-///  The IDREF Table associated with this class
-static IDREF_Base<CORBA::ULong> IDREF;
+          ///  The IDREF Table associated with this class
+          static IDREF_Base<CORBA::ULong> IDREF;
 
-private:
-static void artifact_deployment_descr (
-const ArtifactDeploymentDescription& desc,
-::Deployment::ArtifactDeploymentDescription &dest,
-CORBA::ULong l = 0);
-};
-}
+        private:
+          static void artifact_deployment_descr (
+                                                 const ArtifactDeploymentDescription& desc,
+                                                 ::Deployment::ArtifactDeploymentDescription &dest,
+                                                 CORBA::ULong l = 0);
+        };
+    }
 }
 
 #include /**/ "ace/post.h"
diff --git a/CIAO/tools/Config_Handlers/Any_Handler.cpp b/CIAO/tools/Config_Handlers/Any_Handler.cpp
index 987b3de0b49..314e5abde22 100644
--- a/CIAO/tools/Config_Handlers/Any_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/Any_Handler.cpp
@@ -9,6 +9,8 @@
 #include "ciao/CIAO_common.h"
 #include "DynAny_Handler/DynAny_Handler.h"
 
+#include "ace/Null_Mutex.h"
+
 namespace CIAO
 {
   namespace Config_Handlers
@@ -25,16 +27,25 @@ namespace CIAO
     void
     Any_Handler::extract_into_any (const Any& desc,
                                    CORBA::Any& toconfig)
-
     {
       CIAO_TRACE("Any_Handler::extract_into_any");
-      DynamicAny::DynAny_var dyn = DYNANY_HANDLER->extract_into_dynany (desc.type (),
-                                                                        desc.value ());
-
-      CORBA::Any_var owner = dyn->to_any ();
-      toconfig = owner.in ();
-
-      dyn->destroy ();
+      try
+        {
+          DynamicAny::DynAny_var dyn = DYNANY_HANDLER->extract_into_dynany (desc.type (),
+                                                                            desc.value ());
+
+          toconfig = *dyn->to_any ();
+          
+          dyn->destroy ();
+        }
+      catch (Config_Error &ex)
+        {
+          throw ex;
+        }
+      catch (...)
+        {
+          throw Config_Error ("", "Caught error whilst parsing XML into Any\n");
+        }
     }
 
     Any Any_Handler::get_any (const ::CORBA::Any& src)
diff --git a/CIAO/tools/Config_Handlers/Any_Handler.h b/CIAO/tools/Config_Handlers/Any_Handler.h
index 8e176a7ed35..03f99722034 100644
--- a/CIAO/tools/Config_Handlers/Any_Handler.h
+++ b/CIAO/tools/Config_Handlers/Any_Handler.h
@@ -18,6 +18,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "Config_Handlers/Common.h"
 #include "tao/Versioned_Namespace.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -30,20 +31,20 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 namespace CIAO
 {
   namespace Config_Handlers
-  {
-    class Any;
-
-    /*
-      * @class Any_Handler
-      *
-      * @brief Handler class for <ComponentInterfaceDescription> types.
-      *
-      * This class defines handler methods to map values from
-      * XSC Any objects, parsed from the descriptor files, to the
-      * corresponding CORBA IDL Any type.
-      *
-      */
-    class Config_Handlers_Common_Export Any_Handler
+    {
+      class Any;
+
+      /*
+       * @class Any_Handler
+       *
+       * @brief Handler class for <ComponentInterfaceDescription> types.
+       *
+       * This class defines handler methods to map values from
+       * XSC Any objects, parsed from the descriptor files, to the
+       * corresponding CORBA IDL Any type.
+       *
+       */
+      class Config_Handlers_Common_Export Any_Handler
     {
     public:
       Any_Handler (void);
@@ -54,7 +55,7 @@ namespace CIAO
 
       static Any get_any (const CORBA::Any &src);
     };
-  }
+    }
 }
 
 #include /**/ "ace/post.h"
diff --git a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
index 77bcce3365d..a000d175f0f 100644
--- a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
+++ b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
@@ -21,6 +21,111 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
+    // IdRef
+    // 
+
+    IdRef::
+    IdRef ()
+    : 
+    regulator__ ()
+    {
+    }
+
+    IdRef::
+    IdRef (::CIAO::Config_Handlers::IdRef const& s)
+      : XSCRT::Type (),
+    href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
+    idref_ (s.idref_.get () ? new ::XMLSchema::IDREF< ACE_TCHAR > (*s.idref_) : 0),
+    regulator__ ()
+    {
+      if (href_.get ()) href_->container (this);
+      if (idref_.get ()) idref_->container (this);
+    }
+
+    ::CIAO::Config_Handlers::IdRef& IdRef::
+    operator= (::CIAO::Config_Handlers::IdRef const& s)
+    {
+      if (s.href_.get ()) href (*(s.href_));
+      else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+
+      if (s.idref_.get ()) idref (*(s.idref_));
+      else idref_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (0);
+
+      return *this;
+    }
+
+
+    // IdRef
+    // 
+    bool IdRef::
+    href_p () const
+    {
+      return href_.get () != 0;
+    }
+
+    ::XMLSchema::string< ACE_TCHAR > const& IdRef::
+    href () const
+    {
+      return *href_;
+    }
+
+    ::XMLSchema::string< ACE_TCHAR >& IdRef::
+    href ()
+    {
+      return *href_;
+    }
+
+    void IdRef::
+    href (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (href_.get ())
+      {
+        *href_ = e;
+      }
+
+      else
+      {
+        href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        href_->container (this);
+      }
+    }
+
+    // IdRef
+    // 
+    bool IdRef::
+    idref_p () const
+    {
+      return idref_.get () != 0;
+    }
+
+    ::XMLSchema::IDREF< ACE_TCHAR > const& IdRef::
+    idref () const
+    {
+      return *idref_;
+    }
+
+    ::XMLSchema::IDREF< ACE_TCHAR >& IdRef::
+    idref ()
+    {
+      return *idref_;
+    }
+
+    void IdRef::
+    idref (::XMLSchema::IDREF< ACE_TCHAR > const& e)
+    {
+      if (idref_.get ())
+      {
+        *idref_ = e;
+      }
+
+      else
+      {
+        idref_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
+        idref_->container (this);
+      }
+    }
+
+
     // TCKind
     // 
 
@@ -70,7 +175,8 @@ namespace CIAO
     struct__ (s.struct__.get () ? new ::CIAO::Config_Handlers::StructType (*s.struct__) : 0),
     value_ (s.value_.get () ? new ::CIAO::Config_Handlers::ValueType (*s.value_) : 0),
     sequence_ (s.sequence_.get () ? new ::CIAO::Config_Handlers::SequenceType (*s.sequence_) : 0),
-    id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
+    alias_ (s.alias_.get () ? new ::CIAO::Config_Handlers::AliasType (*s.alias_) : 0),
+    xmi_id_ (s.xmi_id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.xmi_id_) : 0),
     regulator__ ()
     {
       kind_->container (this);
@@ -78,7 +184,8 @@ namespace CIAO
       if (struct__.get ()) struct__->container (this);
       if (value_.get ()) value_->container (this);
       if (sequence_.get ()) sequence_->container (this);
-      if (id_.get ()) id_->container (this);
+      if (alias_.get ()) alias_->container (this);
+      if (xmi_id_.get ()) xmi_id_->container (this);
     }
 
     ::CIAO::Config_Handlers::DataType& DataType::
@@ -98,8 +205,11 @@ namespace CIAO
       if (s.sequence_.get ()) sequence (*(s.sequence_));
       else sequence_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SequenceType > (0);
 
-      if (s.id_.get ()) id (*(s.id_));
-      else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+      if (s.alias_.get ()) alias (*(s.alias_));
+      else alias_ = ::std::auto_ptr< ::CIAO::Config_Handlers::AliasType > (0);
+
+      if (s.xmi_id_.get ()) xmi_id (*(s.xmi_id_));
+      else xmi_id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
 
       return *this;
     }
@@ -238,35 +348,64 @@ namespace CIAO
     // DataType
     // 
     bool DataType::
-    id_p () const
+    alias_p () const
+    {
+      return alias_.get () != 0;
+    }
+
+    ::CIAO::Config_Handlers::AliasType const& DataType::
+    alias () const
+    {
+      return *alias_;
+    }
+
+    void DataType::
+    alias (::CIAO::Config_Handlers::AliasType const& e)
+    {
+      if (alias_.get ())
+      {
+        *alias_ = e;
+      }
+
+      else
+      {
+        alias_ = ::std::auto_ptr< ::CIAO::Config_Handlers::AliasType > (new ::CIAO::Config_Handlers::AliasType (e));
+        alias_->container (this);
+      }
+    }
+
+    // DataType
+    // 
+    bool DataType::
+    xmi_id_p () const
     {
-      return id_.get () != 0;
+      return xmi_id_.get () != 0;
     }
 
     ::XMLSchema::ID< ACE_TCHAR > const& DataType::
-    id () const
+    xmi_id () const
     {
-      return *id_;
+      return *xmi_id_;
     }
 
     ::XMLSchema::ID< ACE_TCHAR >& DataType::
-    id ()
+    xmi_id ()
     {
-      return *id_;
+      return *xmi_id_;
     }
 
     void DataType::
-    id (::XMLSchema::ID< ACE_TCHAR > const& e)
+    xmi_id (::XMLSchema::ID< ACE_TCHAR > const& e)
     {
-      if (id_.get ())
+      if (xmi_id_.get ())
       {
-        *id_ = e;
+        *xmi_id_ = e;
       }
 
       else
       {
-        id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-        id_->container (this);
+        xmi_id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
+        xmi_id_->container (this);
       }
     }
 
@@ -341,6 +480,10 @@ namespace CIAO
       }
 
       {
+        for (element_const_iterator i (s.element_.begin ());i != s.element_.end ();++i) add_element (*i);
+      }
+
+      {
         for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i);
       }
     }
@@ -413,6 +556,11 @@ namespace CIAO
         for (longdouble_const_iterator i (s.longdouble_.begin ());i != s.longdouble_.end ();++i) add_longdouble (*i);
       }
 
+      element_.clear ();
+      {
+        for (element_const_iterator i (s.element_.begin ());i != s.element_.end ();++i) add_element (*i);
+      }
+
       member_.clear ();
       {
         for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i);
@@ -918,6 +1066,44 @@ namespace CIAO
 
     // DataValue
     // 
+    DataValue::element_iterator DataValue::
+    begin_element ()
+    {
+      return element_.begin ();
+    }
+
+    DataValue::element_iterator DataValue::
+    end_element ()
+    {
+      return element_.end ();
+    }
+
+    DataValue::element_const_iterator DataValue::
+    begin_element () const
+    {
+      return element_.begin ();
+    }
+
+    DataValue::element_const_iterator DataValue::
+    end_element () const
+    {
+      return element_.end ();
+    }
+
+    void DataValue::
+    add_element (::CIAO::Config_Handlers::DataValue const& e)
+    {
+      element_.push_back (e);
+    }
+
+    size_t DataValue::
+    count_element(void) const
+    {
+      return element_.size ();
+    }
+
+    // DataValue
+    // 
     DataValue::member_iterator DataValue::
     begin_member ()
     {
@@ -955,6 +1141,95 @@ namespace CIAO
     }
 
 
+    // AliasType
+    // 
+
+    AliasType::
+    AliasType (::XMLSchema::string< ACE_TCHAR > const& name__,
+               ::XMLSchema::string< ACE_TCHAR > const& typeId__,
+               ::CIAO::Config_Handlers::DataType const& elementType__)
+    : 
+    ::XSCRT::Type (), 
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+    typeId_ (new ::XMLSchema::string< ACE_TCHAR > (typeId__)),
+    elementType_ (new ::CIAO::Config_Handlers::DataType (elementType__)),
+    regulator__ ()
+    {
+      name_->container (this);
+      typeId_->container (this);
+      elementType_->container (this);
+    }
+
+    AliasType::
+    AliasType (::CIAO::Config_Handlers::AliasType const& s)
+    :
+    ::XSCRT::Type (),
+    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+    typeId_ (new ::XMLSchema::string< ACE_TCHAR > (*s.typeId_)),
+    elementType_ (new ::CIAO::Config_Handlers::DataType (*s.elementType_)),
+    regulator__ ()
+    {
+      name_->container (this);
+      typeId_->container (this);
+      elementType_->container (this);
+    }
+
+    ::CIAO::Config_Handlers::AliasType& AliasType::
+    operator= (::CIAO::Config_Handlers::AliasType const& s)
+    {
+      name (s.name ());
+
+      typeId (s.typeId ());
+
+      elementType (s.elementType ());
+
+      return *this;
+    }
+
+
+    // AliasType
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& AliasType::
+    name () const
+    {
+      return *name_;
+    }
+
+    void AliasType::
+    name (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *name_ = e;
+    }
+
+    // AliasType
+    // 
+    ::XMLSchema::string< ACE_TCHAR > const& AliasType::
+    typeId () const
+    {
+      return *typeId_;
+    }
+
+    void AliasType::
+    typeId (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      *typeId_ = e;
+    }
+
+    // AliasType
+    // 
+    ::CIAO::Config_Handlers::DataType const& AliasType::
+    elementType () const
+    {
+      return *elementType_;
+    }
+
+    void AliasType::
+    elementType (::CIAO::Config_Handlers::DataType const& e)
+    {
+      *elementType_ = e;
+    }
+
+
     // EnumType
     // 
 
@@ -1581,7 +1856,7 @@ namespace CIAO
     SequenceType (::CIAO::Config_Handlers::SequenceType const& s)
     :
     ::XSCRT::Type (),
-    bound_ (s.bound_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.bound_) : 0),
+    bound_ (s.bound_.get () ? new ::XMLSchema::unsignedInt (*s.bound_) : 0),
     elementType_ (new ::CIAO::Config_Handlers::DataType (*s.elementType_)),
     regulator__ ()
     {
@@ -1593,7 +1868,7 @@ namespace CIAO
     operator= (::CIAO::Config_Handlers::SequenceType const& s)
     {
       if (s.bound_.get ()) bound (*(s.bound_));
-      else bound_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+      else bound_ = ::std::auto_ptr< ::XMLSchema::unsignedInt > (0);
 
       elementType (s.elementType ());
 
@@ -1609,14 +1884,14 @@ namespace CIAO
       return bound_.get () != 0;
     }
 
-    ::XMLSchema::string< ACE_TCHAR > const& SequenceType::
+    ::XMLSchema::unsignedInt const& SequenceType::
     bound () const
     {
       return *bound_;
     }
 
     void SequenceType::
-    bound (::XMLSchema::string< ACE_TCHAR > const& e)
+    bound (::XMLSchema::unsignedInt const& e)
     {
       if (bound_.get ())
       {
@@ -1625,7 +1900,7 @@ namespace CIAO
 
       else
       {
-        bound_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        bound_ = ::std::auto_ptr< ::XMLSchema::unsignedInt > (new ::XMLSchema::unsignedInt (e));
         bound_->container (this);
       }
     }
@@ -2308,7 +2583,7 @@ namespace CIAO
     ::XSCRT::Type (),
     name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
     node_ (new ::XMLSchema::string< ACE_TCHAR > (*s.node_)),
-    id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
+    xmi_id_ (s.xmi_id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.xmi_id_) : 0),
     regulator__ ()
     {
       name_->container (this);
@@ -2333,7 +2608,7 @@ namespace CIAO
         for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
       }
 
-      if (id_.get ()) id_->container (this);
+      if (xmi_id_.get ()) xmi_id_->container (this);
     }
 
     ::CIAO::Config_Handlers::ArtifactDeploymentDescription& ArtifactDeploymentDescription::
@@ -2368,8 +2643,8 @@ namespace CIAO
         for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
       }
 
-      if (s.id_.get ()) id (*(s.id_));
-      else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+      if (s.xmi_id_.get ()) xmi_id (*(s.xmi_id_));
+      else xmi_id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
 
       return *this;
     }
@@ -2596,35 +2871,35 @@ namespace CIAO
     // ArtifactDeploymentDescription
     // 
     bool ArtifactDeploymentDescription::
-    id_p () const
+    xmi_id_p () const
     {
-      return id_.get () != 0;
+      return xmi_id_.get () != 0;
     }
 
     ::XMLSchema::ID< ACE_TCHAR > const& ArtifactDeploymentDescription::
-    id () const
+    xmi_id () const
     {
-      return *id_;
+      return *xmi_id_;
     }
 
     ::XMLSchema::ID< ACE_TCHAR >& ArtifactDeploymentDescription::
-    id ()
+    xmi_id ()
     {
-      return *id_;
+      return *xmi_id_;
     }
 
     void ArtifactDeploymentDescription::
-    id (::XMLSchema::ID< ACE_TCHAR > const& e)
+    xmi_id (::XMLSchema::ID< ACE_TCHAR > const& e)
     {
-      if (id_.get ())
+      if (xmi_id_.get ())
       {
-        *id_ = e;
+        *xmi_id_ = e;
       }
 
       else
       {
-        id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-        id_->container (this);
+        xmi_id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
+        xmi_id_->container (this);
       }
     }
 
@@ -2647,7 +2922,7 @@ namespace CIAO
     :
     ::XSCRT::Type (),
     name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
+    xmi_id_ (s.xmi_id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.xmi_id_) : 0),
     regulator__ ()
     {
       name_->container (this);
@@ -2667,7 +2942,7 @@ namespace CIAO
         for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
       }
 
-      if (id_.get ()) id_->container (this);
+      if (xmi_id_.get ()) xmi_id_->container (this);
     }
 
     ::CIAO::Config_Handlers::MonolithicDeploymentDescription& MonolithicDeploymentDescription::
@@ -2695,8 +2970,8 @@ namespace CIAO
         for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
       }
 
-      if (s.id_.get ()) id (*(s.id_));
-      else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+      if (s.xmi_id_.get ()) xmi_id (*(s.xmi_id_));
+      else xmi_id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
 
       return *this;
     }
@@ -2781,7 +3056,7 @@ namespace CIAO
     }
 
     void MonolithicDeploymentDescription::
-    add_artifact (::XMLSchema::IDREF< ACE_TCHAR > const& e)
+    add_artifact (::CIAO::Config_Handlers::IdRef const& e)
     {
       artifact_.push_back (e);
     }
@@ -2871,35 +3146,35 @@ namespace CIAO
     // MonolithicDeploymentDescription
     // 
     bool MonolithicDeploymentDescription::
-    id_p () const
+    xmi_id_p () const
     {
-      return id_.get () != 0;
+      return xmi_id_.get () != 0;
     }
 
     ::XMLSchema::ID< ACE_TCHAR > const& MonolithicDeploymentDescription::
-    id () const
+    xmi_id () const
     {
-      return *id_;
+      return *xmi_id_;
     }
 
     ::XMLSchema::ID< ACE_TCHAR >& MonolithicDeploymentDescription::
-    id ()
+    xmi_id ()
     {
-      return *id_;
+      return *xmi_id_;
     }
 
     void MonolithicDeploymentDescription::
-    id (::XMLSchema::ID< ACE_TCHAR > const& e)
+    xmi_id (::XMLSchema::ID< ACE_TCHAR > const& e)
     {
-      if (id_.get ())
+      if (xmi_id_.get ())
       {
-        *id_ = e;
+        *xmi_id_ = e;
       }
 
       else
       {
-        id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-        id_->container (this);
+        xmi_id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
+        xmi_id_->container (this);
       }
     }
 
@@ -3073,13 +3348,13 @@ namespace CIAO
     InstanceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
                                    ::XMLSchema::string< ACE_TCHAR > const& node__,
                                    ::XMLSchema::string< ACE_TCHAR > const& source__,
-                                   ::XMLSchema::IDREF< ACE_TCHAR > const& implementation__)
+                                   ::CIAO::Config_Handlers::IdRef const& implementation__)
     : 
     ::XSCRT::Type (), 
     name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
     node_ (new ::XMLSchema::string< ACE_TCHAR > (node__)),
     source_ (new ::XMLSchema::string< ACE_TCHAR > (source__)),
-    implementation_ (new ::XMLSchema::IDREF< ACE_TCHAR > (implementation__)),
+    implementation_ (new ::CIAO::Config_Handlers::IdRef (implementation__)),
     regulator__ ()
     {
       name_->container (this);
@@ -3095,9 +3370,9 @@ namespace CIAO
     name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
     node_ (new ::XMLSchema::string< ACE_TCHAR > (*s.node_)),
     source_ (new ::XMLSchema::string< ACE_TCHAR > (*s.source_)),
-    implementation_ (new ::XMLSchema::IDREF< ACE_TCHAR > (*s.implementation_)),
+    implementation_ (new ::CIAO::Config_Handlers::IdRef (*s.implementation_)),
     deployedSharedResource_ (s.deployedSharedResource_.get () ? new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (*s.deployedSharedResource_) : 0),
-    id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
+    xmi_id_ (s.xmi_id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.xmi_id_) : 0),
     regulator__ ()
     {
       name_->container (this);
@@ -3113,7 +3388,7 @@ namespace CIAO
       }
 
       if (deployedSharedResource_.get ()) deployedSharedResource_->container (this);
-      if (id_.get ()) id_->container (this);
+      if (xmi_id_.get ()) xmi_id_->container (this);
     }
 
     ::CIAO::Config_Handlers::InstanceDeploymentDescription& InstanceDeploymentDescription::
@@ -3140,8 +3415,8 @@ namespace CIAO
       if (s.deployedSharedResource_.get ()) deployedSharedResource (*(s.deployedSharedResource_));
       else deployedSharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (0);
 
-      if (s.id_.get ()) id (*(s.id_));
-      else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+      if (s.xmi_id_.get ()) xmi_id (*(s.xmi_id_));
+      else xmi_id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
 
       return *this;
     }
@@ -3191,14 +3466,14 @@ namespace CIAO
 
     // InstanceDeploymentDescription
     // 
-    ::XMLSchema::IDREF< ACE_TCHAR > const& InstanceDeploymentDescription::
+    ::CIAO::Config_Handlers::IdRef const& InstanceDeploymentDescription::
     implementation () const
     {
       return *implementation_;
     }
 
     void InstanceDeploymentDescription::
-    implementation (::XMLSchema::IDREF< ACE_TCHAR > const& e)
+    implementation (::CIAO::Config_Handlers::IdRef const& e)
     {
       *implementation_ = e;
     }
@@ -3311,35 +3586,35 @@ namespace CIAO
     // InstanceDeploymentDescription
     // 
     bool InstanceDeploymentDescription::
-    id_p () const
+    xmi_id_p () const
     {
-      return id_.get () != 0;
+      return xmi_id_.get () != 0;
     }
 
     ::XMLSchema::ID< ACE_TCHAR > const& InstanceDeploymentDescription::
-    id () const
+    xmi_id () const
     {
-      return *id_;
+      return *xmi_id_;
     }
 
     ::XMLSchema::ID< ACE_TCHAR >& InstanceDeploymentDescription::
-    id ()
+    xmi_id ()
     {
-      return *id_;
+      return *xmi_id_;
     }
 
     void InstanceDeploymentDescription::
-    id (::XMLSchema::ID< ACE_TCHAR > const& e)
+    xmi_id (::XMLSchema::ID< ACE_TCHAR > const& e)
     {
-      if (id_.get ())
+      if (xmi_id_.get ())
       {
-        *id_ = e;
+        *xmi_id_ = e;
       }
 
       else
       {
-        id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-        id_->container (this);
+        xmi_id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
+        xmi_id_->container (this);
       }
     }
 
@@ -3725,12 +4000,12 @@ namespace CIAO
     PlanSubcomponentPortEndpoint::
     PlanSubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
                                   ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__,
-                                  ::XMLSchema::IDREF< ACE_TCHAR > const& instance__)
+                                  ::CIAO::Config_Handlers::IdRef const& instance__)
     : 
     ::XSCRT::Type (), 
     portName_ (new ::XMLSchema::string< ACE_TCHAR > (portName__)),
     kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (kind__)),
-    instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (instance__)),
+    instance_ (new ::CIAO::Config_Handlers::IdRef (instance__)),
     regulator__ ()
     {
       portName_->container (this);
@@ -3745,7 +4020,7 @@ namespace CIAO
     portName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.portName_)),
     provider_ (s.provider_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.provider_) : 0),
     kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (*s.kind_)),
-    instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (*s.instance_)),
+    instance_ (new ::CIAO::Config_Handlers::IdRef (*s.instance_)),
     regulator__ ()
     {
       portName_->container (this);
@@ -3829,14 +4104,14 @@ namespace CIAO
 
     // PlanSubcomponentPortEndpoint
     // 
-    ::XMLSchema::IDREF< ACE_TCHAR > const& PlanSubcomponentPortEndpoint::
+    ::CIAO::Config_Handlers::IdRef const& PlanSubcomponentPortEndpoint::
     instance () const
     {
       return *instance_;
     }
 
     void PlanSubcomponentPortEndpoint::
-    instance (::XMLSchema::IDREF< ACE_TCHAR > const& e)
+    instance (::CIAO::Config_Handlers::IdRef const& e)
     {
       *instance_ = e;
     }
@@ -3846,13 +4121,16 @@ namespace CIAO
     // 
 
     ExternalReferenceEndpoint::
-    ExternalReferenceEndpoint (::XMLSchema::string< ACE_TCHAR > const& location__)
+    ExternalReferenceEndpoint (::XMLSchema::string< ACE_TCHAR > const& location__,
+                               ::XMLSchema::boolean const& provider__)
     : 
     ::XSCRT::Type (), 
     location_ (new ::XMLSchema::string< ACE_TCHAR > (location__)),
+    provider_ (new ::XMLSchema::boolean (provider__)),
     regulator__ ()
     {
       location_->container (this);
+      provider_->container (this);
     }
 
     ExternalReferenceEndpoint::
@@ -3860,9 +4138,16 @@ namespace CIAO
     :
     ::XSCRT::Type (),
     location_ (new ::XMLSchema::string< ACE_TCHAR > (*s.location_)),
+    provider_ (new ::XMLSchema::boolean (*s.provider_)),
+    portName_ (s.portName_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.portName_) : 0),
     regulator__ ()
     {
       location_->container (this);
+      provider_->container (this);
+      if (portName_.get ()) portName_->container (this);
+      {
+        for (supportedType_const_iterator i (s.supportedType_.begin ());i != s.supportedType_.end ();++i) add_supportedType (*i);
+      }
     }
 
     ::CIAO::Config_Handlers::ExternalReferenceEndpoint& ExternalReferenceEndpoint::
@@ -3870,6 +4155,16 @@ namespace CIAO
     {
       location (s.location ());
 
+      provider (s.provider ());
+
+      if (s.portName_.get ()) portName (*(s.portName_));
+      else portName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+
+      supportedType_.clear ();
+      {
+        for (supportedType_const_iterator i (s.supportedType_.begin ());i != s.supportedType_.end ();++i) add_supportedType (*i);
+      }
+
       return *this;
     }
 
@@ -3888,6 +4183,87 @@ namespace CIAO
       *location_ = e;
     }
 
+    // ExternalReferenceEndpoint
+    // 
+    ::XMLSchema::boolean const& ExternalReferenceEndpoint::
+    provider () const
+    {
+      return *provider_;
+    }
+
+    void ExternalReferenceEndpoint::
+    provider (::XMLSchema::boolean const& e)
+    {
+      *provider_ = e;
+    }
+
+    // ExternalReferenceEndpoint
+    // 
+    bool ExternalReferenceEndpoint::
+    portName_p () const
+    {
+      return portName_.get () != 0;
+    }
+
+    ::XMLSchema::string< ACE_TCHAR > const& ExternalReferenceEndpoint::
+    portName () const
+    {
+      return *portName_;
+    }
+
+    void ExternalReferenceEndpoint::
+    portName (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (portName_.get ())
+      {
+        *portName_ = e;
+      }
+
+      else
+      {
+        portName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        portName_->container (this);
+      }
+    }
+
+    // ExternalReferenceEndpoint
+    // 
+    ExternalReferenceEndpoint::supportedType_iterator ExternalReferenceEndpoint::
+    begin_supportedType ()
+    {
+      return supportedType_.begin ();
+    }
+
+    ExternalReferenceEndpoint::supportedType_iterator ExternalReferenceEndpoint::
+    end_supportedType ()
+    {
+      return supportedType_.end ();
+    }
+
+    ExternalReferenceEndpoint::supportedType_const_iterator ExternalReferenceEndpoint::
+    begin_supportedType () const
+    {
+      return supportedType_.begin ();
+    }
+
+    ExternalReferenceEndpoint::supportedType_const_iterator ExternalReferenceEndpoint::
+    end_supportedType () const
+    {
+      return supportedType_.end ();
+    }
+
+    void ExternalReferenceEndpoint::
+    add_supportedType (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      supportedType_.push_back (e);
+    }
+
+    size_t ExternalReferenceEndpoint::
+    count_supportedType(void) const
+    {
+      return supportedType_.size ();
+    }
+
 
     // ConnectionResourceDeploymentDescription
     // 
@@ -4742,131 +5118,16 @@ namespace CIAO
     }
 
 
-    // ComponentPackageReference
-    // 
-
-    ComponentPackageReference::
-    ComponentPackageReference (::XMLSchema::string< ACE_TCHAR > const& requiredType__)
-    : 
-    ::XSCRT::Type (), 
-    requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (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 ::XMLSchema::string< ACE_TCHAR > (*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
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageReference::
-    requiredType () const
-    {
-      return *requiredType_;
-    }
-
-    void ComponentPackageReference::
-    requiredType (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *requiredType_ = e;
-    }
-
-
     // SubcomponentPortEndpoint
     // 
 
     SubcomponentPortEndpoint::
     SubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
-                              ::XMLSchema::IDREF< ACE_TCHAR > const& instance__)
+                              ::CIAO::Config_Handlers::IdRef const& instance__)
     : 
     ::XSCRT::Type (), 
     portName_ (new ::XMLSchema::string< ACE_TCHAR > (portName__)),
-    instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (instance__)),
+    instance_ (new ::CIAO::Config_Handlers::IdRef (instance__)),
     regulator__ ()
     {
       portName_->container (this);
@@ -4878,7 +5139,7 @@ namespace CIAO
     :
     ::XSCRT::Type (),
     portName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.portName_)),
-    instance_ (new ::XMLSchema::IDREF< ACE_TCHAR > (*s.instance_)),
+    instance_ (new ::CIAO::Config_Handlers::IdRef (*s.instance_)),
     regulator__ ()
     {
       portName_->container (this);
@@ -4912,14 +5173,14 @@ namespace CIAO
 
     // SubcomponentPortEndpoint
     // 
-    ::XMLSchema::IDREF< ACE_TCHAR > const& SubcomponentPortEndpoint::
+    ::CIAO::Config_Handlers::IdRef const& SubcomponentPortEndpoint::
     instance () const
     {
       return *instance_;
     }
 
     void SubcomponentPortEndpoint::
-    instance (::XMLSchema::IDREF< ACE_TCHAR > const& e)
+    instance (::CIAO::Config_Handlers::IdRef const& e)
     {
       *instance_ = e;
     }
@@ -5157,6 +5418,101 @@ namespace CIAO
     {
       return externalReference_.size ();
     }
+
+
+    // PlanLocalityKind
+    // 
+
+    PlanLocalityKind::Value PlanLocalityKind::
+    integral () const
+    {
+      return v_;
+    }
+
+    bool
+    operator== (::CIAO::Config_Handlers::PlanLocalityKind const& a, ::CIAO::Config_Handlers::PlanLocalityKind const& b)
+    {
+      return a.v_ == b.v_;
+    }
+
+    bool
+    operator!= (::CIAO::Config_Handlers::PlanLocalityKind const& a, ::CIAO::Config_Handlers::PlanLocalityKind const& b)
+    {
+      return a.v_ != b.v_;
+    }
+
+    PlanLocalityKind::
+    PlanLocalityKind (PlanLocalityKind::Value v)
+    : v_ (v)
+    {
+    }
+
+    // PlanLocality
+    // 
+
+    PlanLocality::
+    PlanLocality (::CIAO::Config_Handlers::PlanLocalityKind const& constraint__,
+                  ::CIAO::Config_Handlers::IdRef const& constrainedInstance__)
+    : 
+    ::XSCRT::Type (), 
+    constraint_ (new ::CIAO::Config_Handlers::PlanLocalityKind (constraint__)),
+    constrainedInstance_ (new ::CIAO::Config_Handlers::IdRef (constrainedInstance__)),
+    regulator__ ()
+    {
+      constraint_->container (this);
+      constrainedInstance_->container (this);
+    }
+
+    PlanLocality::
+    PlanLocality (::CIAO::Config_Handlers::PlanLocality const& s)
+    :
+    ::XSCRT::Type (),
+    constraint_ (new ::CIAO::Config_Handlers::PlanLocalityKind (*s.constraint_)),
+    constrainedInstance_ (new ::CIAO::Config_Handlers::IdRef (*s.constrainedInstance_)),
+    regulator__ ()
+    {
+      constraint_->container (this);
+      constrainedInstance_->container (this);
+    }
+
+    ::CIAO::Config_Handlers::PlanLocality& PlanLocality::
+    operator= (::CIAO::Config_Handlers::PlanLocality const& s)
+    {
+      constraint (s.constraint ());
+
+      constrainedInstance (s.constrainedInstance ());
+
+      return *this;
+    }
+
+
+    // PlanLocality
+    // 
+    ::CIAO::Config_Handlers::PlanLocalityKind const& PlanLocality::
+    constraint () const
+    {
+      return *constraint_;
+    }
+
+    void PlanLocality::
+    constraint (::CIAO::Config_Handlers::PlanLocalityKind const& e)
+    {
+      *constraint_ = e;
+    }
+
+    // PlanLocality
+    // 
+    ::CIAO::Config_Handlers::IdRef const& PlanLocality::
+    constrainedInstance () const
+    {
+      return *constrainedInstance_;
+    }
+
+    void PlanLocality::
+    constrainedInstance (::CIAO::Config_Handlers::IdRef const& e)
+    {
+      *constrainedInstance_ = e;
+    }
   }
 }
 
@@ -5164,6 +5520,38 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
+    // IdRef
+    //
+
+    IdRef::
+    IdRef (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    :Base (e), regulator__ ()
+    {
+
+      ::XSCRT::Parser< ACE_TCHAR > p (e);
+
+      while (p.more_attributes ())
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+        if (n == "href")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (a);
+          href (t);
+        }
+
+        else if (n == "idref")
+        {
+          ::XMLSchema::IDREF< ACE_TCHAR > t (a);
+          idref (t);
+        }
+
+        else 
+        {
+        }
+      }
+    }
+
     // TCKind
     //
 
@@ -5173,43 +5561,43 @@ namespace CIAO
     {
       ::std::basic_string< ACE_TCHAR > v (e.value ());
 
-      if (v == ACE_TEXT ("tk_null")) v_ = tk_null_l;
-      else if (v == ACE_TEXT ("tk_void")) v_ = tk_void_l;
-      else if (v == ACE_TEXT ("tk_short")) v_ = tk_short_l;
-      else if (v == ACE_TEXT ("tk_long")) v_ = tk_long_l;
-      else if (v == ACE_TEXT ("tk_ushort")) v_ = tk_ushort_l;
-      else if (v == ACE_TEXT ("tk_ulong")) v_ = tk_ulong_l;
-      else if (v == ACE_TEXT ("tk_float")) v_ = tk_float_l;
-      else if (v == ACE_TEXT ("tk_double")) v_ = tk_double_l;
-      else if (v == ACE_TEXT ("tk_boolean")) v_ = tk_boolean_l;
-      else if (v == ACE_TEXT ("tk_char")) v_ = tk_char_l;
-      else if (v == ACE_TEXT ("tk_octet")) v_ = tk_octet_l;
-      else if (v == ACE_TEXT ("tk_any")) v_ = tk_any_l;
-      else if (v == ACE_TEXT ("tk_TypeCode")) v_ = tk_TypeCode_l;
-      else if (v == ACE_TEXT ("tk_Principal")) v_ = tk_Principal_l;
-      else if (v == ACE_TEXT ("tk_objref")) v_ = tk_objref_l;
-      else if (v == ACE_TEXT ("tk_struct")) v_ = tk_struct_l;
-      else if (v == ACE_TEXT ("tk_union")) v_ = tk_union_l;
-      else if (v == ACE_TEXT ("tk_enum")) v_ = tk_enum_l;
-      else if (v == ACE_TEXT ("tk_string")) v_ = tk_string_l;
-      else if (v == ACE_TEXT ("tk_sequence")) v_ = tk_sequence_l;
-      else if (v == ACE_TEXT ("tk_array")) v_ = tk_array_l;
-      else if (v == ACE_TEXT ("tk_alias")) v_ = tk_alias_l;
-      else if (v == ACE_TEXT ("tk_except")) v_ = tk_except_l;
-      else if (v == ACE_TEXT ("tk_longlong")) v_ = tk_longlong_l;
-      else if (v == ACE_TEXT ("tk_ulonglong")) v_ = tk_ulonglong_l;
-      else if (v == ACE_TEXT ("tk_longdouble")) v_ = tk_longdouble_l;
-      else if (v == ACE_TEXT ("tk_wchar")) v_ = tk_wchar_l;
-      else if (v == ACE_TEXT ("tk_wstring")) v_ = tk_wstring_l;
-      else if (v == ACE_TEXT ("tk_wfixed")) v_ = tk_wfixed_l;
-      else if (v == ACE_TEXT ("tk_value")) v_ = tk_value_l;
-      else if (v == ACE_TEXT ("tk_value_box")) v_ = tk_value_box_l;
-      else if (v == ACE_TEXT ("tk_native")) v_ = tk_native_l;
-      else if (v == ACE_TEXT ("tk_abstract_interface")) v_ = tk_abstract_interface_l;
-      else if (v == ACE_TEXT ("tk_local_interface")) v_ = tk_local_interface_l;
-      else if (v == ACE_TEXT ("tk_component")) v_ = tk_component_l;
-      else if (v == ACE_TEXT ("tk_home")) v_ = tk_home_l;
-      else if (v == ACE_TEXT ("tk_event")) v_ = tk_event_l;
+      if (v == "tk_null") v_ = tk_null_l;
+      else if (v == "tk_void") v_ = tk_void_l;
+      else if (v == "tk_short") v_ = tk_short_l;
+      else if (v == "tk_long") v_ = tk_long_l;
+      else if (v == "tk_ushort") v_ = tk_ushort_l;
+      else if (v == "tk_ulong") v_ = tk_ulong_l;
+      else if (v == "tk_float") v_ = tk_float_l;
+      else if (v == "tk_double") v_ = tk_double_l;
+      else if (v == "tk_boolean") v_ = tk_boolean_l;
+      else if (v == "tk_char") v_ = tk_char_l;
+      else if (v == "tk_octet") v_ = tk_octet_l;
+      else if (v == "tk_any") v_ = tk_any_l;
+      else if (v == "tk_TypeCode") v_ = tk_TypeCode_l;
+      else if (v == "tk_Principal") v_ = tk_Principal_l;
+      else if (v == "tk_objref") v_ = tk_objref_l;
+      else if (v == "tk_struct") v_ = tk_struct_l;
+      else if (v == "tk_union") v_ = tk_union_l;
+      else if (v == "tk_enum") v_ = tk_enum_l;
+      else if (v == "tk_string") v_ = tk_string_l;
+      else if (v == "tk_sequence") v_ = tk_sequence_l;
+      else if (v == "tk_array") v_ = tk_array_l;
+      else if (v == "tk_alias") v_ = tk_alias_l;
+      else if (v == "tk_except") v_ = tk_except_l;
+      else if (v == "tk_longlong") v_ = tk_longlong_l;
+      else if (v == "tk_ulonglong") v_ = tk_ulonglong_l;
+      else if (v == "tk_longdouble") v_ = tk_longdouble_l;
+      else if (v == "tk_wchar") v_ = tk_wchar_l;
+      else if (v == "tk_wstring") v_ = tk_wstring_l;
+      else if (v == "tk_wfixed") v_ = tk_wfixed_l;
+      else if (v == "tk_value") v_ = tk_value_l;
+      else if (v == "tk_value_box") v_ = tk_value_box_l;
+      else if (v == "tk_native") v_ = tk_native_l;
+      else if (v == "tk_abstract_interface") v_ = tk_abstract_interface_l;
+      else if (v == "tk_local_interface") v_ = tk_local_interface_l;
+      else if (v == "tk_component") v_ = tk_component_l;
+      else if (v == "tk_home") v_ = tk_home_l;
+      else if (v == "tk_event") v_ = tk_event_l;
       else 
       {
       }
@@ -5221,43 +5609,43 @@ namespace CIAO
     {
       ::std::basic_string< ACE_TCHAR > v (a.value ());
 
-      if (v == ACE_TEXT ("tk_null")) v_ = tk_null_l;
-      else if (v == ACE_TEXT ("tk_void")) v_ = tk_void_l;
-      else if (v == ACE_TEXT ("tk_short")) v_ = tk_short_l;
-      else if (v == ACE_TEXT ("tk_long")) v_ = tk_long_l;
-      else if (v == ACE_TEXT ("tk_ushort")) v_ = tk_ushort_l;
-      else if (v == ACE_TEXT ("tk_ulong")) v_ = tk_ulong_l;
-      else if (v == ACE_TEXT ("tk_float")) v_ = tk_float_l;
-      else if (v == ACE_TEXT ("tk_double")) v_ = tk_double_l;
-      else if (v == ACE_TEXT ("tk_boolean")) v_ = tk_boolean_l;
-      else if (v == ACE_TEXT ("tk_char")) v_ = tk_char_l;
-      else if (v == ACE_TEXT ("tk_octet")) v_ = tk_octet_l;
-      else if (v == ACE_TEXT ("tk_any")) v_ = tk_any_l;
-      else if (v == ACE_TEXT ("tk_TypeCode")) v_ = tk_TypeCode_l;
-      else if (v == ACE_TEXT ("tk_Principal")) v_ = tk_Principal_l;
-      else if (v == ACE_TEXT ("tk_objref")) v_ = tk_objref_l;
-      else if (v == ACE_TEXT ("tk_struct")) v_ = tk_struct_l;
-      else if (v == ACE_TEXT ("tk_union")) v_ = tk_union_l;
-      else if (v == ACE_TEXT ("tk_enum")) v_ = tk_enum_l;
-      else if (v == ACE_TEXT ("tk_string")) v_ = tk_string_l;
-      else if (v == ACE_TEXT ("tk_sequence")) v_ = tk_sequence_l;
-      else if (v == ACE_TEXT ("tk_array")) v_ = tk_array_l;
-      else if (v == ACE_TEXT ("tk_alias")) v_ = tk_alias_l;
-      else if (v == ACE_TEXT ("tk_except")) v_ = tk_except_l;
-      else if (v == ACE_TEXT ("tk_longlong")) v_ = tk_longlong_l;
-      else if (v == ACE_TEXT ("tk_ulonglong")) v_ = tk_ulonglong_l;
-      else if (v == ACE_TEXT ("tk_longdouble")) v_ = tk_longdouble_l;
-      else if (v == ACE_TEXT ("tk_wchar")) v_ = tk_wchar_l;
-      else if (v == ACE_TEXT ("tk_wstring")) v_ = tk_wstring_l;
-      else if (v == ACE_TEXT ("tk_wfixed")) v_ = tk_wfixed_l;
-      else if (v == ACE_TEXT ("tk_value")) v_ = tk_value_l;
-      else if (v == ACE_TEXT ("tk_value_box")) v_ = tk_value_box_l;
-      else if (v == ACE_TEXT ("tk_native")) v_ = tk_native_l;
-      else if (v == ACE_TEXT ("tk_abstract_interface")) v_ = tk_abstract_interface_l;
-      else if (v == ACE_TEXT ("tk_local_interface")) v_ = tk_local_interface_l;
-      else if (v == ACE_TEXT ("tk_component")) v_ = tk_component_l;
-      else if (v == ACE_TEXT ("tk_home")) v_ = tk_home_l;
-      else if (v == ACE_TEXT ("tk_event")) v_ = tk_event_l;
+      if (v == "tk_null") v_ = tk_null_l;
+      else if (v == "tk_void") v_ = tk_void_l;
+      else if (v == "tk_short") v_ = tk_short_l;
+      else if (v == "tk_long") v_ = tk_long_l;
+      else if (v == "tk_ushort") v_ = tk_ushort_l;
+      else if (v == "tk_ulong") v_ = tk_ulong_l;
+      else if (v == "tk_float") v_ = tk_float_l;
+      else if (v == "tk_double") v_ = tk_double_l;
+      else if (v == "tk_boolean") v_ = tk_boolean_l;
+      else if (v == "tk_char") v_ = tk_char_l;
+      else if (v == "tk_octet") v_ = tk_octet_l;
+      else if (v == "tk_any") v_ = tk_any_l;
+      else if (v == "tk_TypeCode") v_ = tk_TypeCode_l;
+      else if (v == "tk_Principal") v_ = tk_Principal_l;
+      else if (v == "tk_objref") v_ = tk_objref_l;
+      else if (v == "tk_struct") v_ = tk_struct_l;
+      else if (v == "tk_union") v_ = tk_union_l;
+      else if (v == "tk_enum") v_ = tk_enum_l;
+      else if (v == "tk_string") v_ = tk_string_l;
+      else if (v == "tk_sequence") v_ = tk_sequence_l;
+      else if (v == "tk_array") v_ = tk_array_l;
+      else if (v == "tk_alias") v_ = tk_alias_l;
+      else if (v == "tk_except") v_ = tk_except_l;
+      else if (v == "tk_longlong") v_ = tk_longlong_l;
+      else if (v == "tk_ulonglong") v_ = tk_ulonglong_l;
+      else if (v == "tk_longdouble") v_ = tk_longdouble_l;
+      else if (v == "tk_wchar") v_ = tk_wchar_l;
+      else if (v == "tk_wstring") v_ = tk_wstring_l;
+      else if (v == "tk_wfixed") v_ = tk_wfixed_l;
+      else if (v == "tk_value") v_ = tk_value_l;
+      else if (v == "tk_value_box") v_ = tk_value_box_l;
+      else if (v == "tk_native") v_ = tk_native_l;
+      else if (v == "tk_abstract_interface") v_ = tk_abstract_interface_l;
+      else if (v == "tk_local_interface") v_ = tk_local_interface_l;
+      else if (v == "tk_component") v_ = tk_component_l;
+      else if (v == "tk_home") v_ = tk_home_l;
+      else if (v == "tk_event") v_ = tk_event_l;
       else 
       {
       }
@@ -5316,36 +5704,42 @@ 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 ("kind"))
+        if (n == "kind")
         {
           kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::TCKind > (new ::CIAO::Config_Handlers::TCKind (e));
           kind_->container (this);
         }
 
-        else if (n == ACE_TEXT ("enum"))
+        else if (n == "enum")
         {
           ::CIAO::Config_Handlers::EnumType t (e);
           enum_ (t);
         }
 
-        else if (n == ACE_TEXT ("struct"))
+        else if (n == "struct")
         {
           ::CIAO::Config_Handlers::StructType t (e);
           struct_ (t);
         }
 
-        else if (n == ACE_TEXT ("value"))
+        else if (n == "value")
         {
           ::CIAO::Config_Handlers::ValueType t (e);
           value (t);
         }
 
-        else if (n == ACE_TEXT ("sequence"))
+        else if (n == "sequence")
         {
           ::CIAO::Config_Handlers::SequenceType t (e);
           sequence (t);
         }
 
+        else if (n == "alias")
+        {
+          ::CIAO::Config_Handlers::AliasType t (e);
+          alias (t);
+        }
+
         else 
         {
         }
@@ -5355,10 +5749,10 @@ 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);
+          xmi_id (t);
         }
 
         else 
@@ -5382,85 +5776,91 @@ 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 ("short"))
+        if (n == "short")
         {
           ::XMLSchema::short_ t (e);
           add_short (t);
         }
 
-        else if (n == ACE_TEXT ("long"))
+        else if (n == "long")
         {
           ::XMLSchema::int_ t (e);
           add_long (t);
         }
 
-        else if (n == ACE_TEXT ("ushort"))
+        else if (n == "ushort")
         {
           ::XMLSchema::unsignedShort t (e);
           add_ushort (t);
         }
 
-        else if (n == ACE_TEXT ("ulong"))
+        else if (n == "ulong")
         {
           ::XMLSchema::unsignedInt t (e);
           add_ulong (t);
         }
 
-        else if (n == ACE_TEXT ("float"))
+        else if (n == "float")
         {
           ::XMLSchema::float_ t (e);
           add_float (t);
         }
 
-        else if (n == ACE_TEXT ("double"))
+        else if (n == "double")
         {
           ::XMLSchema::double_ t (e);
           add_double (t);
         }
 
-        else if (n == ACE_TEXT ("boolean"))
+        else if (n == "boolean")
         {
           ::XMLSchema::boolean t (e);
           add_boolean (t);
         }
 
-        else if (n == ACE_TEXT ("octet"))
+        else if (n == "octet")
         {
           ::XMLSchema::unsignedByte t (e);
           add_octet (t);
         }
 
-        else if (n == ACE_TEXT ("enum"))
+        else if (n == "enum")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           add_enum (t);
         }
 
-        else if (n == ACE_TEXT ("string"))
+        else if (n == "string")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           add_string (t);
         }
 
-        else if (n == ACE_TEXT ("longlong"))
+        else if (n == "longlong")
         {
           ::XMLSchema::long_ t (e);
           add_longlong (t);
         }
 
-        else if (n == ACE_TEXT ("ulonglong"))
+        else if (n == "ulonglong")
         {
           ::XMLSchema::unsignedLong t (e);
           add_ulonglong (t);
         }
 
-        else if (n == ACE_TEXT ("longdouble"))
+        else if (n == "longdouble")
         {
           ::XMLSchema::double_ t (e);
           add_longdouble (t);
         }
 
-        else if (n == ACE_TEXT ("member"))
+        else if (n == "element")
+        {
+          ::CIAO::Config_Handlers::DataValue t (e);
+          add_element (t);
+        }
+
+        else if (n == "member")
         {
           ::CIAO::Config_Handlers::NamedValue t (e);
           add_member (t);
@@ -5472,6 +5872,45 @@ namespace CIAO
       }
     }
 
+    // AliasType
+    //
+
+    AliasType::
+    AliasType (::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 == "name")
+        {
+          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          name_->container (this);
+        }
+
+        else if (n == "typeId")
+        {
+          typeId_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          typeId_->container (this);
+        }
+
+        else if (n == "elementType")
+        {
+          elementType_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
+          elementType_->container (this);
+        }
+
+        else 
+        {
+        }
+      }
+    }
+
     // EnumType
     //
 
@@ -5487,19 +5926,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 ("typeId"))
+        else if (n == "typeId")
         {
           typeId_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           typeId_->container (this);
         }
 
-        else if (n == ACE_TEXT ("member"))
+        else if (n == "member")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           add_member (t);
@@ -5526,19 +5965,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 ("typeId"))
+        else if (n == "typeId")
         {
           typeId_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           typeId_->container (this);
         }
 
-        else if (n == ACE_TEXT ("member"))
+        else if (n == "member")
         {
           ::CIAO::Config_Handlers::StructMemberType t (e);
           add_member (t);
@@ -5565,13 +6004,13 @@ 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 ("type"))
+        else if (n == "type")
         {
           type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
           type_->container (this);
@@ -5598,31 +6037,31 @@ 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 ("typeId"))
+        else if (n == "typeId")
         {
           typeId_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           typeId_->container (this);
         }
 
-        else if (n == ACE_TEXT ("modifier"))
+        else if (n == "modifier")
         {
           modifier_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           modifier_->container (this);
         }
 
-        else if (n == ACE_TEXT ("baseType"))
+        else if (n == "baseType")
         {
           baseType_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
           baseType_->container (this);
         }
 
-        else if (n == ACE_TEXT ("member"))
+        else if (n == "member")
         {
           ::CIAO::Config_Handlers::ValueMemberType t (e);
           add_member (t);
@@ -5649,19 +6088,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 ("visibility"))
+        else if (n == "visibility")
         {
           visibility_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           visibility_->container (this);
         }
 
-        else if (n == ACE_TEXT ("type"))
+        else if (n == "type")
         {
           type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
           type_->container (this);
@@ -5688,13 +6127,13 @@ 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 ("value"))
+        else if (n == "value")
         {
           value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataValue > (new ::CIAO::Config_Handlers::DataValue (e));
           value_->container (this);
@@ -5721,13 +6160,13 @@ 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 ("bound"))
+        if (n == "bound")
         {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
+          ::XMLSchema::unsignedInt t (e);
           bound (t);
         }
 
-        else if (n == ACE_TEXT ("elementType"))
+        else if (n == "elementType")
         {
           elementType_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
           elementType_->container (this);
@@ -5754,13 +6193,13 @@ 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 ("type"))
+        if (n == "type")
         {
           type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
           type_->container (this);
         }
 
-        else if (n == ACE_TEXT ("value"))
+        else if (n == "value")
         {
           value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataValue > (new ::CIAO::Config_Handlers::DataValue (e));
           value_->container (this);
@@ -5787,13 +6226,13 @@ 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 ("value"))
+        else if (n == "value")
         {
           value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e));
           value_->container (this);
@@ -5814,12 +6253,12 @@ namespace CIAO
     {
       ::std::basic_string< ACE_TCHAR > v (e.value ());
 
-      if (v == ACE_TEXT ("Quantity")) v_ = Quantity_l;
-      else if (v == ACE_TEXT ("Capacity")) v_ = Capacity_l;
-      else if (v == ACE_TEXT ("Minimum")) v_ = Minimum_l;
-      else if (v == ACE_TEXT ("Maximum")) v_ = Maximum_l;
-      else if (v == ACE_TEXT ("Attribute")) v_ = Attribute_l;
-      else if (v == ACE_TEXT ("Selection")) v_ = Selection_l;
+      if (v == "Quantity") v_ = Quantity_l;
+      else if (v == "Capacity") v_ = Capacity_l;
+      else if (v == "Minimum") v_ = Minimum_l;
+      else if (v == "Maximum") v_ = Maximum_l;
+      else if (v == "Attribute") v_ = Attribute_l;
+      else if (v == "Selection") v_ = Selection_l;
       else 
       {
       }
@@ -5831,12 +6270,12 @@ namespace CIAO
     {
       ::std::basic_string< ACE_TCHAR > v (a.value ());
 
-      if (v == ACE_TEXT ("Quantity")) v_ = Quantity_l;
-      else if (v == ACE_TEXT ("Capacity")) v_ = Capacity_l;
-      else if (v == ACE_TEXT ("Minimum")) v_ = Minimum_l;
-      else if (v == ACE_TEXT ("Maximum")) v_ = Maximum_l;
-      else if (v == ACE_TEXT ("Attribute")) v_ = Attribute_l;
-      else if (v == ACE_TEXT ("Selection")) v_ = Selection_l;
+      if (v == "Quantity") v_ = Quantity_l;
+      else if (v == "Capacity") v_ = Capacity_l;
+      else if (v == "Minimum") v_ = Minimum_l;
+      else if (v == "Maximum") v_ = Maximum_l;
+      else if (v == "Attribute") v_ = Attribute_l;
+      else if (v == "Selection") v_ = Selection_l;
       else 
       {
       }
@@ -5864,25 +6303,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 ("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 ("kind"))
+        else if (n == "kind")
         {
           kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierPropertyKind > (new ::CIAO::Config_Handlers::SatisfierPropertyKind (e));
           kind_->container (this);
         }
 
-        else if (n == ACE_TEXT ("dynamic"))
+        else if (n == "dynamic")
         {
           dynamic_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
           dynamic_->container (this);
         }
 
-        else if (n == ACE_TEXT ("value"))
+        else if (n == "value")
         {
           value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Any > (new ::CIAO::Config_Handlers::Any (e));
           value_->container (this);
@@ -5909,19 +6348,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 ("resourceType"))
+        else if (n == "resourceType")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           add_resourceType (t);
         }
 
-        else if (n == ACE_TEXT ("property"))
+        else if (n == "property")
         {
           ::CIAO::Config_Handlers::SatisfierProperty t (e);
           add_property (t);
@@ -5948,19 +6387,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 ("resourceType"))
+        if (n == "resourceType")
         {
           resourceType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           resourceType_->container (this);
         }
 
-        else if (n == ACE_TEXT ("name"))
+        else 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 ("property"))
+        else if (n == "property")
         {
           ::CIAO::Config_Handlers::Property t (e);
           add_property (t);
@@ -5987,19 +6426,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 ("requirementName"))
+        if (n == "requirementName")
         {
           requirementName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           requirementName_->container (this);
         }
 
-        else if (n == ACE_TEXT ("resourceName"))
+        else if (n == "resourceName")
         {
           resourceName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           resourceName_->container (this);
         }
 
-        else if (n == ACE_TEXT ("property"))
+        else if (n == "property")
         {
           ::CIAO::Config_Handlers::Property t (e);
           add_property (t);
@@ -6026,43 +6465,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 ("source"))
+        else if (n == "source")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           add_source (t);
         }
 
-        else if (n == ACE_TEXT ("node"))
+        else if (n == "node")
         {
           node_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           node_->container (this);
         }
 
-        else if (n == ACE_TEXT ("location"))
+        else if (n == "location")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           add_location (t);
         }
 
-        else if (n == ACE_TEXT ("execParameter"))
+        else if (n == "execParameter")
         {
           ::CIAO::Config_Handlers::Property t (e);
           add_execParameter (t);
         }
 
-        else if (n == ACE_TEXT ("deployRequirement"))
+        else if (n == "deployRequirement")
         {
           ::CIAO::Config_Handlers::Requirement t (e);
           add_deployRequirement (t);
         }
 
-        else if (n == ACE_TEXT ("deployedResource"))
+        else if (n == "deployedResource")
         {
           ::CIAO::Config_Handlers::ResourceDeploymentDescription t (e);
           add_deployedResource (t);
@@ -6077,10 +6516,10 @@ 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);
+          xmi_id (t);
         }
 
         else 
@@ -6104,31 +6543,31 @@ 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 ("source"))
+        else if (n == "source")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           add_source (t);
         }
 
-        else if (n == ACE_TEXT ("artifact"))
+        else if (n == "artifact")
         {
-          ::XMLSchema::IDREF< ACE_TCHAR > t (e);
+          ::CIAO::Config_Handlers::IdRef t (e);
           add_artifact (t);
         }
 
-        else if (n == ACE_TEXT ("execParameter"))
+        else if (n == "execParameter")
         {
           ::CIAO::Config_Handlers::Property t (e);
           add_execParameter (t);
         }
 
-        else if (n == ACE_TEXT ("deployRequirement"))
+        else if (n == "deployRequirement")
         {
           ::CIAO::Config_Handlers::Requirement t (e);
           add_deployRequirement (t);
@@ -6143,10 +6582,10 @@ 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);
+          xmi_id (t);
         }
 
         else 
@@ -6164,11 +6603,11 @@ namespace CIAO
     {
       ::std::basic_string< ACE_TCHAR > v (e.value ());
 
-      if (v == ACE_TEXT ("None")) v_ = None_l;
-      else if (v == ACE_TEXT ("InstanceUsesResource")) v_ = InstanceUsesResource_l;
-      else if (v == ACE_TEXT ("ResourceUsesInstance")) v_ = ResourceUsesInstance_l;
-      else if (v == ACE_TEXT ("PortUsesResource")) v_ = PortUsesResource_l;
-      else if (v == ACE_TEXT ("ResourceUsesPort")) v_ = ResourceUsesPort_l;
+      if (v == "None") v_ = None_l;
+      else if (v == "InstanceUsesResource") v_ = InstanceUsesResource_l;
+      else if (v == "ResourceUsesInstance") v_ = ResourceUsesInstance_l;
+      else if (v == "PortUsesResource") v_ = PortUsesResource_l;
+      else if (v == "ResourceUsesPort") v_ = ResourceUsesPort_l;
       else 
       {
       }
@@ -6180,11 +6619,11 @@ namespace CIAO
     {
       ::std::basic_string< ACE_TCHAR > v (a.value ());
 
-      if (v == ACE_TEXT ("None")) v_ = None_l;
-      else if (v == ACE_TEXT ("InstanceUsesResource")) v_ = InstanceUsesResource_l;
-      else if (v == ACE_TEXT ("ResourceUsesInstance")) v_ = ResourceUsesInstance_l;
-      else if (v == ACE_TEXT ("PortUsesResource")) v_ = PortUsesResource_l;
-      else if (v == ACE_TEXT ("ResourceUsesPort")) v_ = ResourceUsesPort_l;
+      if (v == "None") v_ = None_l;
+      else if (v == "InstanceUsesResource") v_ = InstanceUsesResource_l;
+      else if (v == "ResourceUsesInstance") v_ = ResourceUsesInstance_l;
+      else if (v == "PortUsesResource") v_ = PortUsesResource_l;
+      else if (v == "ResourceUsesPort") v_ = ResourceUsesPort_l;
       else 
       {
       }
@@ -6211,25 +6650,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 ("resourceUsage"))
+        if (n == "resourceUsage")
         {
           resourceUsage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > (new ::CIAO::Config_Handlers::ResourceUsageKind (e));
           resourceUsage_->container (this);
         }
 
-        else if (n == ACE_TEXT ("requirementName"))
+        else if (n == "requirementName")
         {
           requirementName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           requirementName_->container (this);
         }
 
-        else if (n == ACE_TEXT ("resourceName"))
+        else if (n == "resourceName")
         {
           resourceName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           resourceName_->container (this);
         }
 
-        else if (n == ACE_TEXT ("property"))
+        else if (n == "property")
         {
           ::CIAO::Config_Handlers::Property t (e);
           add_property (t);
@@ -6256,43 +6695,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 ("node"))
+        else if (n == "node")
         {
           node_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           node_->container (this);
         }
 
-        else if (n == ACE_TEXT ("source"))
+        else if (n == "source")
         {
           source_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           source_->container (this);
         }
 
-        else if (n == ACE_TEXT ("implementation"))
+        else if (n == "implementation")
         {
-          implementation_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
+          implementation_ = ::std::auto_ptr< ::CIAO::Config_Handlers::IdRef > (new ::CIAO::Config_Handlers::IdRef (e));
           implementation_->container (this);
         }
 
-        else if (n == ACE_TEXT ("configProperty"))
+        else if (n == "configProperty")
         {
           ::CIAO::Config_Handlers::Property t (e);
           add_configProperty (t);
         }
 
-        else if (n == ACE_TEXT ("deployedResource"))
+        else if (n == "deployedResource")
         {
           ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription t (e);
           add_deployedResource (t);
         }
 
-        else if (n == ACE_TEXT ("deployedSharedResource"))
+        else if (n == "deployedSharedResource")
         {
           ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription t (e);
           deployedSharedResource (t);
@@ -6307,10 +6746,10 @@ 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);
+          xmi_id (t);
         }
 
         else 
@@ -6328,12 +6767,12 @@ namespace CIAO
     {
       ::std::basic_string< ACE_TCHAR > v (e.value ());
 
-      if (v == ACE_TEXT ("Facet")) v_ = Facet_l;
-      else if (v == ACE_TEXT ("SimplexReceptacle")) v_ = SimplexReceptacle_l;
-      else if (v == ACE_TEXT ("MultiplexReceptacle")) v_ = MultiplexReceptacle_l;
-      else if (v == ACE_TEXT ("EventEmitter")) v_ = EventEmitter_l;
-      else if (v == ACE_TEXT ("EventPublisher")) v_ = EventPublisher_l;
-      else if (v == ACE_TEXT ("EventConsumer")) v_ = EventConsumer_l;
+      if (v == "Facet") v_ = Facet_l;
+      else if (v == "SimplexReceptacle") v_ = SimplexReceptacle_l;
+      else if (v == "MultiplexReceptacle") v_ = MultiplexReceptacle_l;
+      else if (v == "EventEmitter") v_ = EventEmitter_l;
+      else if (v == "EventPublisher") v_ = EventPublisher_l;
+      else if (v == "EventConsumer") v_ = EventConsumer_l;
       else 
       {
       }
@@ -6345,12 +6784,12 @@ namespace CIAO
     {
       ::std::basic_string< ACE_TCHAR > v (a.value ());
 
-      if (v == ACE_TEXT ("Facet")) v_ = Facet_l;
-      else if (v == ACE_TEXT ("SimplexReceptacle")) v_ = SimplexReceptacle_l;
-      else if (v == ACE_TEXT ("MultiplexReceptacle")) v_ = MultiplexReceptacle_l;
-      else if (v == ACE_TEXT ("EventEmitter")) v_ = EventEmitter_l;
-      else if (v == ACE_TEXT ("EventPublisher")) v_ = EventPublisher_l;
-      else if (v == ACE_TEXT ("EventConsumer")) v_ = EventConsumer_l;
+      if (v == "Facet") v_ = Facet_l;
+      else if (v == "SimplexReceptacle") v_ = SimplexReceptacle_l;
+      else if (v == "MultiplexReceptacle") v_ = MultiplexReceptacle_l;
+      else if (v == "EventEmitter") v_ = EventEmitter_l;
+      else if (v == "EventPublisher") v_ = EventPublisher_l;
+      else if (v == "EventConsumer") v_ = EventConsumer_l;
       else 
       {
       }
@@ -6378,49 +6817,49 @@ 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 ("specificType"))
+        else if (n == "specificType")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           specificType (t);
         }
 
-        else if (n == ACE_TEXT ("supportedType"))
+        else if (n == "supportedType")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           add_supportedType (t);
         }
 
-        else if (n == ACE_TEXT ("provider"))
+        else if (n == "provider")
         {
           provider_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
           provider_->container (this);
         }
 
-        else if (n == ACE_TEXT ("exclusiveProvider"))
+        else if (n == "exclusiveProvider")
         {
           exclusiveProvider_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
           exclusiveProvider_->container (this);
         }
 
-        else if (n == ACE_TEXT ("exclusiveUser"))
+        else if (n == "exclusiveUser")
         {
           exclusiveUser_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
           exclusiveUser_->container (this);
         }
 
-        else if (n == ACE_TEXT ("optional"))
+        else if (n == "optional")
         {
           optional_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
           optional_->container (this);
         }
 
-        else if (n == ACE_TEXT ("kind"))
+        else if (n == "kind")
         {
           kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > (new ::CIAO::Config_Handlers::CCMComponentPortKind (e));
           kind_->container (this);
@@ -6447,13 +6886,13 @@ 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 ("type"))
+        else if (n == "type")
         {
           type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > (new ::CIAO::Config_Handlers::DataType (e));
           type_->container (this);
@@ -6480,7 +6919,7 @@ 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 ("portName"))
+        if (n == "portName")
         {
           portName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           portName_->container (this);
@@ -6507,27 +6946,27 @@ 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 ("portName"))
+        if (n == "portName")
         {
           portName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           portName_->container (this);
         }
 
-        else if (n == ACE_TEXT ("provider"))
+        else if (n == "provider")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           provider (t);
         }
 
-        else if (n == ACE_TEXT ("kind"))
+        else if (n == "kind")
         {
           kind_ = ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > (new ::CIAO::Config_Handlers::CCMComponentPortKind (e));
           kind_->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);
         }
 
@@ -6552,12 +6991,30 @@ 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 ("location"))
+        if (n == "location")
         {
           location_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           location_->container (this);
         }
 
+        else if (n == "provider")
+        {
+          provider_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
+          provider_->container (this);
+        }
+
+        else if (n == "portName")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          portName (t);
+        }
+
+        else if (n == "supportedType")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (e);
+          add_supportedType (t);
+        }
+
         else 
         {
         }
@@ -6579,25 +7036,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 ("targetName"))
+        if (n == "targetName")
         {
           targetName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           targetName_->container (this);
         }
 
-        else if (n == ACE_TEXT ("requirementName"))
+        else if (n == "requirementName")
         {
           requirementName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           requirementName_->container (this);
         }
 
-        else if (n == ACE_TEXT ("resourceName"))
+        else if (n == "resourceName")
         {
           resourceName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           resourceName_->container (this);
         }
 
-        else if (n == ACE_TEXT ("property"))
+        else if (n == "property")
         {
           ::CIAO::Config_Handlers::Property t (e);
           add_property (t);
@@ -6624,43 +7081,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 ("source"))
+        else if (n == "source")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           source (t);
         }
 
-        else if (n == ACE_TEXT ("deployRequirement"))
+        else if (n == "deployRequirement")
         {
           ::CIAO::Config_Handlers::Requirement t (e);
           add_deployRequirement (t);
         }
 
-        else if (n == ACE_TEXT ("externalEndpoint"))
+        else if (n == "externalEndpoint")
         {
           ::CIAO::Config_Handlers::ComponentExternalPortEndpoint t (e);
           add_externalEndpoint (t);
         }
 
-        else if (n == ACE_TEXT ("internalEndpoint"))
+        else if (n == "internalEndpoint")
         {
           ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint t (e);
           add_internalEndpoint (t);
         }
 
-        else if (n == ACE_TEXT ("externalReference"))
+        else if (n == "externalReference")
         {
           ::CIAO::Config_Handlers::ExternalReferenceEndpoint t (e);
           add_externalReference (t);
         }
 
-        else if (n == ACE_TEXT ("deployedResource"))
+        else if (n == "deployedResource")
         {
           ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription t (e);
           add_deployedResource (t);
@@ -6687,7 +7144,7 @@ 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 ("requiredType"))
+        if (n == "requiredType")
         {
           requiredType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           requiredType_->container (this);
@@ -6714,19 +7171,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 ("resourceType"))
+        else if (n == "resourceType")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           add_resourceType (t);
         }
 
-        else if (n == ACE_TEXT ("property"))
+        else if (n == "property")
         {
           ::CIAO::Config_Handlers::SatisfierProperty t (e);
           add_property (t);
@@ -6753,37 +7210,37 @@ 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 ("resourceUsage"))
+        if (n == "resourceUsage")
         {
           ::CIAO::Config_Handlers::ResourceUsageKind t (e);
           resourceUsage (t);
         }
 
-        else if (n == ACE_TEXT ("resourcePort"))
+        else if (n == "resourcePort")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           resourcePort (t);
         }
 
-        else if (n == ACE_TEXT ("componentPort"))
+        else if (n == "componentPort")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           componentPort (t);
         }
 
-        else if (n == ACE_TEXT ("resourceType"))
+        else if (n == "resourceType")
         {
           resourceType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           resourceType_->container (this);
         }
 
-        else if (n == ACE_TEXT ("name"))
+        else 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 ("property"))
+        else if (n == "property")
         {
           ::CIAO::Config_Handlers::Property t (e);
           add_property (t);
@@ -6795,45 +7252,6 @@ namespace CIAO
       }
     }
 
-    // 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 == ACE_TEXT ("requiredUUID"))
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          requiredUUID (t);
-        }
-
-        else if (n == ACE_TEXT ("requiredName"))
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          requiredName (t);
-        }
-
-        else if (n == ACE_TEXT ("requiredType"))
-        {
-          requiredType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          requiredType_->container (this);
-        }
-
-        else 
-        {
-        }
-      }
-    }
-
     // SubcomponentPortEndpoint
     //
 
@@ -6849,15 +7267,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 ("portName"))
+        if (n == "portName")
         {
           portName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           portName_->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);
         }
 
@@ -6882,31 +7300,31 @@ 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 ("deployRequirement"))
+        else if (n == "deployRequirement")
         {
           ::CIAO::Config_Handlers::Requirement t (e);
           add_deployRequirement (t);
         }
 
-        else if (n == ACE_TEXT ("internalEndpoint"))
+        else if (n == "internalEndpoint")
         {
           ::CIAO::Config_Handlers::SubcomponentPortEndpoint t (e);
           add_internalEndpoint (t);
         }
 
-        else if (n == ACE_TEXT ("externalEndpoint"))
+        else if (n == "externalEndpoint")
         {
           ::CIAO::Config_Handlers::ComponentExternalPortEndpoint t (e);
           add_externalEndpoint (t);
         }
 
-        else if (n == ACE_TEXT ("externalReference"))
+        else if (n == "externalReference")
         {
           ::CIAO::Config_Handlers::ExternalReferenceEndpoint t (e);
           add_externalReference (t);
@@ -6917,6 +7335,74 @@ namespace CIAO
         }
       }
     }
+
+    // PlanLocalityKind
+    //
+
+    PlanLocalityKind::
+    PlanLocalityKind (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    : ::XSCRT::Type (e)
+    {
+      ::std::basic_string< ACE_TCHAR > v (e.value ());
+
+      if (v == "SameProcess") v_ = SameProcess_l;
+      else if (v == "DifferentProcess") v_ = DifferentProcess_l;
+      else if (v == "NoConstraint") v_ = NoConstraint_l;
+      else 
+      {
+      }
+    }
+
+    PlanLocalityKind::
+    PlanLocalityKind (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
+    : ::XSCRT::Type (a)
+    {
+      ::std::basic_string< ACE_TCHAR > v (a.value ());
+
+      if (v == "SameProcess") v_ = SameProcess_l;
+      else if (v == "DifferentProcess") v_ = DifferentProcess_l;
+      else if (v == "NoConstraint") v_ = NoConstraint_l;
+      else 
+      {
+      }
+    }
+
+    PlanLocalityKind const PlanLocalityKind::SameProcess (PlanLocalityKind::SameProcess_l);
+    PlanLocalityKind const PlanLocalityKind::DifferentProcess (PlanLocalityKind::DifferentProcess_l);
+    PlanLocalityKind const PlanLocalityKind::NoConstraint (PlanLocalityKind::NoConstraint_l);
+
+    // PlanLocality
+    //
+
+    PlanLocality::
+    PlanLocality (::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 == "constraint")
+        {
+          constraint_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PlanLocalityKind > (new ::CIAO::Config_Handlers::PlanLocalityKind (e));
+          constraint_->container (this);
+        }
+
+        else if (n == "constrainedInstance")
+        {
+          constrainedInstance_ = ::std::auto_ptr< ::CIAO::Config_Handlers::IdRef > (new ::CIAO::Config_Handlers::IdRef (e));
+          constrainedInstance_->container (this);
+        }
+
+        else 
+        {
+        }
+      }
+    }
   }
 }
 
@@ -6937,6 +7423,20 @@ namespace CIAO
     {
       ::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
 
+      struct IdRefTypeInfoInitializer
+      {
+        IdRefTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (IdRef));
+          ::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));
+        }
+      };
+
+      IdRefTypeInfoInitializer IdRefTypeInfoInitializer_;
+
       struct TCKindTypeInfoInitializer
       {
         TCKindTypeInfoInitializer ()
@@ -6980,6 +7480,20 @@ namespace CIAO
 
       DataValueTypeInfoInitializer DataValueTypeInfoInitializer_;
 
+      struct AliasTypeTypeInfoInitializer
+      {
+        AliasTypeTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (AliasType));
+          ::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));
+        }
+      };
+
+      AliasTypeTypeInfoInitializer AliasTypeTypeInfoInitializer_;
+
       struct EnumTypeTypeInfoInitializer
       {
         EnumTypeTypeInfoInitializer ()
@@ -7403,11 +7917,11 @@ namespace CIAO
 
       ImplementationRequirementTypeInfoInitializer ImplementationRequirementTypeInfoInitializer_;
 
-      struct ComponentPackageReferenceTypeInfoInitializer
+      struct SubcomponentPortEndpointTypeInfoInitializer
       {
-        ComponentPackageReferenceTypeInfoInitializer ()
+        SubcomponentPortEndpointTypeInfoInitializer ()
         {
-          ::XSCRT::TypeId id (typeid (ComponentPackageReference));
+          ::XSCRT::TypeId id (typeid (SubcomponentPortEndpoint));
           ::XSCRT::ExtendedTypeInfo nf (id);
 
           nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
@@ -7415,13 +7929,13 @@ namespace CIAO
         }
       };
 
-      ComponentPackageReferenceTypeInfoInitializer ComponentPackageReferenceTypeInfoInitializer_;
+      SubcomponentPortEndpointTypeInfoInitializer SubcomponentPortEndpointTypeInfoInitializer_;
 
-      struct SubcomponentPortEndpointTypeInfoInitializer
+      struct AssemblyConnectionDescriptionTypeInfoInitializer
       {
-        SubcomponentPortEndpointTypeInfoInitializer ()
+        AssemblyConnectionDescriptionTypeInfoInitializer ()
         {
-          ::XSCRT::TypeId id (typeid (SubcomponentPortEndpoint));
+          ::XSCRT::TypeId id (typeid (AssemblyConnectionDescription));
           ::XSCRT::ExtendedTypeInfo nf (id);
 
           nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
@@ -7429,21 +7943,36 @@ namespace CIAO
         }
       };
 
-      SubcomponentPortEndpointTypeInfoInitializer SubcomponentPortEndpointTypeInfoInitializer_;
+      AssemblyConnectionDescriptionTypeInfoInitializer AssemblyConnectionDescriptionTypeInfoInitializer_;
 
-      struct AssemblyConnectionDescriptionTypeInfoInitializer
+      struct PlanLocalityKindTypeInfoInitializer
       {
-        AssemblyConnectionDescriptionTypeInfoInitializer ()
+        PlanLocalityKindTypeInfoInitializer ()
         {
-          ::XSCRT::TypeId id (typeid (AssemblyConnectionDescription));
+          ::XSCRT::TypeId id (typeid (PlanLocalityKind));
           ::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));
         }
       };
 
-      AssemblyConnectionDescriptionTypeInfoInitializer AssemblyConnectionDescriptionTypeInfoInitializer_;
+      PlanLocalityKindTypeInfoInitializer PlanLocalityKindTypeInfoInitializer_;
+
+      struct PlanLocalityTypeInfoInitializer
+      {
+        PlanLocalityTypeInfoInitializer ()
+        {
+          ::XSCRT::TypeId id (typeid (PlanLocality));
+          ::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));
+        }
+      };
+
+      PlanLocalityTypeInfoInitializer PlanLocalityTypeInfoInitializer_;
     }
   }
 }
@@ -7454,6 +7983,96 @@ namespace CIAO
   {
     namespace Traversal
     {
+      // IdRef
+      //
+      //
+
+      void IdRef::
+      traverse (Type& o)
+      {
+        pre (o);
+        if (o.href_p ()) href (o);
+        else href_none (o);
+        if (o.idref_p ()) idref (o);
+        else idref_none (o);
+        post (o);
+      }
+
+      void IdRef::
+      traverse (Type const& o)
+      {
+        pre (o);
+        if (o.href_p ()) href (o);
+        else href_none (o);
+        if (o.idref_p ()) idref (o);
+        else idref_none (o);
+        post (o);
+      }
+
+      void IdRef::
+      pre (Type&)
+      {
+      }
+
+      void IdRef::
+      pre (Type const&)
+      {
+      }
+
+      void IdRef::
+      href (Type& o)
+      {
+        dispatch (o.href ());
+      }
+
+      void IdRef::
+      href (Type const& o)
+      {
+        dispatch (o.href ());
+      }
+
+      void IdRef::
+      href_none (Type&)
+      {
+      }
+
+      void IdRef::
+      href_none (Type const&)
+      {
+      }
+
+      void IdRef::
+      idref (Type& o)
+      {
+        dispatch (o.idref ());
+      }
+
+      void IdRef::
+      idref (Type const& o)
+      {
+        dispatch (o.idref ());
+      }
+
+      void IdRef::
+      idref_none (Type&)
+      {
+      }
+
+      void IdRef::
+      idref_none (Type const&)
+      {
+      }
+
+      void IdRef::
+      post (Type&)
+      {
+      }
+
+      void IdRef::
+      post (Type const&)
+      {
+      }
+
       // DataType
       //
       //
@@ -7471,8 +8090,10 @@ namespace CIAO
         else value_none (o);
         if (o.sequence_p ()) sequence (o);
         else sequence_none (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
+        if (o.alias_p ()) alias (o);
+        else alias_none (o);
+        if (o.xmi_id_p ()) xmi_id (o);
+        else xmi_id_none (o);
         post (o);
       }
 
@@ -7489,8 +8110,10 @@ namespace CIAO
         else value_none (o);
         if (o.sequence_p ()) sequence (o);
         else sequence_none (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
+        if (o.alias_p ()) alias (o);
+        else alias_none (o);
+        if (o.xmi_id_p ()) xmi_id (o);
+        else xmi_id_none (o);
         post (o);
       }
 
@@ -7605,24 +8228,46 @@ namespace CIAO
       }
 
       void DataType::
-      id (Type& o)
+      alias (Type& o)
+      {
+        dispatch (o.alias ());
+      }
+
+      void DataType::
+      alias (Type const& o)
       {
-        dispatch (o.id ());
+        dispatch (o.alias ());
       }
 
       void DataType::
-      id (Type const& o)
+      alias_none (Type&)
       {
-        dispatch (o.id ());
       }
 
       void DataType::
-      id_none (Type&)
+      alias_none (Type const&)
       {
       }
 
       void DataType::
-      id_none (Type const&)
+      xmi_id (Type& o)
+      {
+        dispatch (o.xmi_id ());
+      }
+
+      void DataType::
+      xmi_id (Type const& o)
+      {
+        dispatch (o.xmi_id ());
+      }
+
+      void DataType::
+      xmi_id_none (Type&)
+      {
+      }
+
+      void DataType::
+      xmi_id_none (Type const&)
       {
       }
 
@@ -7657,6 +8302,7 @@ namespace CIAO
         longlong (o);
         ulonglong (o);
         longdouble (o);
+        element (o);
         member (o);
         post (o);
       }
@@ -7678,6 +8324,7 @@ namespace CIAO
         longlong (o);
         ulonglong (o);
         longdouble (o);
+        element (o);
         member (o);
         post (o);
       }
@@ -8785,6 +9432,90 @@ namespace CIAO
       }
 
       void DataValue::
+      element (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::element_iterator b (o.begin_element()), e (o.end_element());
+
+        if (b != e)
+        {
+          element_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) element_next (o);
+          }
+
+          element_post (o);
+        }
+
+        else element_none (o);
+      }
+
+      void DataValue::
+      element (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        DataValue::Type::element_const_iterator b (o.begin_element()), e (o.end_element());
+
+        if (b != e)
+        {
+          element_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) element_next (o);
+          }
+
+          element_post (o);
+        }
+
+        else element_none (o);
+      }
+
+      void DataValue::
+      element_pre (Type&)
+      {
+      }
+
+      void DataValue::
+      element_pre (Type const&)
+      {
+      }
+
+      void DataValue::
+      element_next (Type&)
+      {
+      }
+
+      void DataValue::
+      element_next (Type const&)
+      {
+      }
+
+      void DataValue::
+      element_post (Type&)
+      {
+      }
+
+      void DataValue::
+      element_post (Type const&)
+      {
+      }
+
+      void DataValue::
+      element_none (Type&)
+      {
+      }
+
+      void DataValue::
+      element_none (Type const&)
+      {
+      }
+
+      void DataValue::
       member (Type& o)
       {
         // VC6 anathema strikes again
@@ -8878,6 +9609,86 @@ namespace CIAO
       {
       }
 
+      // AliasType
+      //
+      //
+
+      void AliasType::
+      traverse (Type& o)
+      {
+        pre (o);
+        name (o);
+        typeId (o);
+        elementType (o);
+        post (o);
+      }
+
+      void AliasType::
+      traverse (Type const& o)
+      {
+        pre (o);
+        name (o);
+        typeId (o);
+        elementType (o);
+        post (o);
+      }
+
+      void AliasType::
+      pre (Type&)
+      {
+      }
+
+      void AliasType::
+      pre (Type const&)
+      {
+      }
+
+      void AliasType::
+      name (Type& o)
+      {
+        dispatch (o.name ());
+      }
+
+      void AliasType::
+      name (Type const& o)
+      {
+        dispatch (o.name ());
+      }
+
+      void AliasType::
+      typeId (Type& o)
+      {
+        dispatch (o.typeId ());
+      }
+
+      void AliasType::
+      typeId (Type const& o)
+      {
+        dispatch (o.typeId ());
+      }
+
+      void AliasType::
+      elementType (Type& o)
+      {
+        dispatch (o.elementType ());
+      }
+
+      void AliasType::
+      elementType (Type const& o)
+      {
+        dispatch (o.elementType ());
+      }
+
+      void AliasType::
+      post (Type&)
+      {
+      }
+
+      void AliasType::
+      post (Type const&)
+      {
+      }
+
       // EnumType
       //
       //
@@ -10393,8 +11204,8 @@ namespace CIAO
         execParameter (o);
         deployRequirement (o);
         deployedResource (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
+        if (o.xmi_id_p ()) xmi_id (o);
+        else xmi_id_none (o);
         post (o);
       }
 
@@ -10409,8 +11220,8 @@ namespace CIAO
         execParameter (o);
         deployRequirement (o);
         deployedResource (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
+        if (o.xmi_id_p ()) xmi_id (o);
+        else xmi_id_none (o);
         post (o);
       }
 
@@ -10841,24 +11652,24 @@ namespace CIAO
       }
 
       void ArtifactDeploymentDescription::
-      id (Type& o)
+      xmi_id (Type& o)
       {
-        dispatch (o.id ());
+        dispatch (o.xmi_id ());
       }
 
       void ArtifactDeploymentDescription::
-      id (Type const& o)
+      xmi_id (Type const& o)
       {
-        dispatch (o.id ());
+        dispatch (o.xmi_id ());
       }
 
       void ArtifactDeploymentDescription::
-      id_none (Type&)
+      xmi_id_none (Type&)
       {
       }
 
       void ArtifactDeploymentDescription::
-      id_none (Type const&)
+      xmi_id_none (Type const&)
       {
       }
 
@@ -10885,8 +11696,8 @@ namespace CIAO
         artifact (o);
         execParameter (o);
         deployRequirement (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
+        if (o.xmi_id_p ()) xmi_id (o);
+        else xmi_id_none (o);
         post (o);
       }
 
@@ -10899,8 +11710,8 @@ namespace CIAO
         artifact (o);
         execParameter (o);
         deployRequirement (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
+        if (o.xmi_id_p ()) xmi_id (o);
+        else xmi_id_none (o);
         post (o);
       }
 
@@ -11235,24 +12046,24 @@ namespace CIAO
       }
 
       void MonolithicDeploymentDescription::
-      id (Type& o)
+      xmi_id (Type& o)
       {
-        dispatch (o.id ());
+        dispatch (o.xmi_id ());
       }
 
       void MonolithicDeploymentDescription::
-      id (Type const& o)
+      xmi_id (Type const& o)
       {
-        dispatch (o.id ());
+        dispatch (o.xmi_id ());
       }
 
       void MonolithicDeploymentDescription::
-      id_none (Type&)
+      xmi_id_none (Type&)
       {
       }
 
       void MonolithicDeploymentDescription::
-      id_none (Type const&)
+      xmi_id_none (Type const&)
       {
       }
 
@@ -11448,8 +12259,8 @@ namespace CIAO
         deployedResource (o);
         if (o.deployedSharedResource_p ()) deployedSharedResource (o);
         else deployedSharedResource_none (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
+        if (o.xmi_id_p ()) xmi_id (o);
+        else xmi_id_none (o);
         post (o);
       }
 
@@ -11465,8 +12276,8 @@ namespace CIAO
         deployedResource (o);
         if (o.deployedSharedResource_p ()) deployedSharedResource (o);
         else deployedSharedResource_none (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
+        if (o.xmi_id_p ()) xmi_id (o);
+        else xmi_id_none (o);
         post (o);
       }
 
@@ -11719,24 +12530,24 @@ namespace CIAO
       }
 
       void InstanceDeploymentDescription::
-      id (Type& o)
+      xmi_id (Type& o)
       {
-        dispatch (o.id ());
+        dispatch (o.xmi_id ());
       }
 
       void InstanceDeploymentDescription::
-      id (Type const& o)
+      xmi_id (Type const& o)
       {
-        dispatch (o.id ());
+        dispatch (o.xmi_id ());
       }
 
       void InstanceDeploymentDescription::
-      id_none (Type&)
+      xmi_id_none (Type&)
       {
       }
 
       void InstanceDeploymentDescription::
-      id_none (Type const&)
+      xmi_id_none (Type const&)
       {
       }
 
@@ -12217,6 +13028,10 @@ namespace CIAO
       {
         pre (o);
         location (o);
+        provider (o);
+        if (o.portName_p ()) portName (o);
+        else portName_none (o);
+        supportedType (o);
         post (o);
       }
 
@@ -12225,6 +13040,10 @@ namespace CIAO
       {
         pre (o);
         location (o);
+        provider (o);
+        if (o.portName_p ()) portName (o);
+        else portName_none (o);
+        supportedType (o);
         post (o);
       }
 
@@ -12251,6 +13070,110 @@ namespace CIAO
       }
 
       void ExternalReferenceEndpoint::
+      provider (Type& o)
+      {
+        dispatch (o.provider ());
+      }
+
+      void ExternalReferenceEndpoint::
+      provider (Type const& o)
+      {
+        dispatch (o.provider ());
+      }
+
+      void ExternalReferenceEndpoint::
+      portName (Type& o)
+      {
+        dispatch (o.portName ());
+      }
+
+      void ExternalReferenceEndpoint::
+      portName (Type const& o)
+      {
+        dispatch (o.portName ());
+      }
+
+      void ExternalReferenceEndpoint::
+      portName_none (Type&)
+      {
+      }
+
+      void ExternalReferenceEndpoint::
+      portName_none (Type const&)
+      {
+      }
+
+      void ExternalReferenceEndpoint::
+      supportedType (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ExternalReferenceEndpoint::Type::supportedType_iterator b (o.begin_supportedType()), e (o.end_supportedType());
+
+        if (b != e)
+        {
+          supportedType_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) supportedType_next (o);
+          }
+
+          supportedType_post (o);
+        }
+      }
+
+      void ExternalReferenceEndpoint::
+      supportedType (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        ExternalReferenceEndpoint::Type::supportedType_const_iterator b (o.begin_supportedType()), e (o.end_supportedType());
+
+        if (b != e)
+        {
+          supportedType_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) supportedType_next (o);
+          }
+
+          supportedType_post (o);
+        }
+      }
+
+      void ExternalReferenceEndpoint::
+      supportedType_pre (Type&)
+      {
+      }
+
+      void ExternalReferenceEndpoint::
+      supportedType_pre (Type const&)
+      {
+      }
+
+      void ExternalReferenceEndpoint::
+      supportedType_next (Type&)
+      {
+      }
+
+      void ExternalReferenceEndpoint::
+      supportedType_next (Type const&)
+      {
+      }
+
+      void ExternalReferenceEndpoint::
+      supportedType_post (Type&)
+      {
+      }
+
+      void ExternalReferenceEndpoint::
+      supportedType_post (Type const&)
+      {
+      }
+
+      void ExternalReferenceEndpoint::
       post (Type&)
       {
       }
@@ -13426,110 +14349,6 @@ namespace CIAO
       {
       }
 
-      // 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&)
-      {
-      }
-
       // SubcomponentPortEndpoint
       //
       //
@@ -13991,6 +14810,72 @@ namespace CIAO
       post (Type const&)
       {
       }
+
+      // PlanLocality
+      //
+      //
+
+      void PlanLocality::
+      traverse (Type& o)
+      {
+        pre (o);
+        constraint (o);
+        constrainedInstance (o);
+        post (o);
+      }
+
+      void PlanLocality::
+      traverse (Type const& o)
+      {
+        pre (o);
+        constraint (o);
+        constrainedInstance (o);
+        post (o);
+      }
+
+      void PlanLocality::
+      pre (Type&)
+      {
+      }
+
+      void PlanLocality::
+      pre (Type const&)
+      {
+      }
+
+      void PlanLocality::
+      constraint (Type& o)
+      {
+        dispatch (o.constraint ());
+      }
+
+      void PlanLocality::
+      constraint (Type const& o)
+      {
+        dispatch (o.constraint ());
+      }
+
+      void PlanLocality::
+      constrainedInstance (Type& o)
+      {
+        dispatch (o.constrainedInstance ());
+      }
+
+      void PlanLocality::
+      constrainedInstance (Type const& o)
+      {
+        dispatch (o.constrainedInstance ());
+      }
+
+      void PlanLocality::
+      post (Type&)
+      {
+      }
+
+      void PlanLocality::
+      post (Type const&)
+      {
+      }
     }
   }
 }
@@ -14001,6 +14886,45 @@ namespace CIAO
   {
     namespace Writer
     {
+      // IdRef
+      //
+      //
+
+      IdRef::
+      IdRef (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      IdRef::
+      IdRef ()
+      {
+      }
+
+      void IdRef::
+      traverse (Type const& o)
+      {
+        Traversal::IdRef::traverse (o);
+      }
+
+      void IdRef::
+      href (Type const& o)
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("href", "", top_ ());
+        attr_ (&a);
+        Traversal::IdRef::href (o);
+        attr_ (0);
+      }
+
+      void IdRef::
+      idref (Type const& o)
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("idref", "http://www.omg.org/Deployment", "", top_ ());
+        attr_ (&a);
+        Traversal::IdRef::idref (o);
+        attr_ (0);
+      }
+
       // TCKind
       //
       //
@@ -14021,43 +14945,43 @@ namespace CIAO
       {
         ::std::basic_string< ACE_TCHAR > s;
 
-        if (o == ::CIAO::Config_Handlers::TCKind::tk_null) s = ACE_TEXT ("tk_null");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_void) s = ACE_TEXT ("tk_void");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_short) s = ACE_TEXT ("tk_short");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_long) s = ACE_TEXT ("tk_long");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_ushort) s = ACE_TEXT ("tk_ushort");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_ulong) s = ACE_TEXT ("tk_ulong");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_float) s = ACE_TEXT ("tk_float");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_double) s = ACE_TEXT ("tk_double");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_boolean) s = ACE_TEXT ("tk_boolean");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_char) s = ACE_TEXT ("tk_char");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_octet) s = ACE_TEXT ("tk_octet");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_any) s = ACE_TEXT ("tk_any");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_TypeCode) s = ACE_TEXT ("tk_TypeCode");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_Principal) s = ACE_TEXT ("tk_Principal");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_objref) s = ACE_TEXT ("tk_objref");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_struct) s = ACE_TEXT ("tk_struct");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_union) s = ACE_TEXT ("tk_union");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_enum) s = ACE_TEXT ("tk_enum");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_string) s = ACE_TEXT ("tk_string");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_sequence) s = ACE_TEXT ("tk_sequence");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_array) s = ACE_TEXT ("tk_array");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_alias) s = ACE_TEXT ("tk_alias");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_except) s = ACE_TEXT ("tk_except");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_longlong) s = ACE_TEXT ("tk_longlong");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_ulonglong) s = ACE_TEXT ("tk_ulonglong");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_longdouble) s = ACE_TEXT ("tk_longdouble");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_wchar) s = ACE_TEXT ("tk_wchar");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_wstring) s = ACE_TEXT ("tk_wstring");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_wfixed) s = ACE_TEXT ("tk_wfixed");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_value) s = ACE_TEXT ("tk_value");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_value_box) s = ACE_TEXT ("tk_value_box");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_native) s = ACE_TEXT ("tk_native");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_abstract_interface) s = ACE_TEXT ("tk_abstract_interface");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_local_interface) s = ACE_TEXT ("tk_local_interface");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_component) s = ACE_TEXT ("tk_component");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_home) s = ACE_TEXT ("tk_home");
-        else if (o == ::CIAO::Config_Handlers::TCKind::tk_event) s = ACE_TEXT ("tk_event");
+        if (o == ::CIAO::Config_Handlers::TCKind::tk_null) s = "tk_null";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_void) s = "tk_void";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_short) s = "tk_short";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_long) s = "tk_long";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_ushort) s = "tk_ushort";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_ulong) s = "tk_ulong";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_float) s = "tk_float";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_double) s = "tk_double";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_boolean) s = "tk_boolean";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_char) s = "tk_char";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_octet) s = "tk_octet";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_any) s = "tk_any";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_TypeCode) s = "tk_TypeCode";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_Principal) s = "tk_Principal";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_objref) s = "tk_objref";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_struct) s = "tk_struct";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_union) s = "tk_union";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_enum) s = "tk_enum";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_string) s = "tk_string";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_sequence) s = "tk_sequence";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_array) s = "tk_array";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_alias) s = "tk_alias";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_except) s = "tk_except";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_longlong) s = "tk_longlong";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_ulonglong) s = "tk_ulonglong";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_longdouble) s = "tk_longdouble";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_wchar) s = "tk_wchar";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_wstring) s = "tk_wstring";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_wfixed) s = "tk_wfixed";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_value) s = "tk_value";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_value_box) s = "tk_value_box";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_native) s = "tk_native";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_abstract_interface) s = "tk_abstract_interface";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_local_interface) s = "tk_local_interface";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_component) s = "tk_component";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_home) s = "tk_home";
+        else if (o == ::CIAO::Config_Handlers::TCKind::tk_event) s = "tk_event";
         else 
         {
         }
@@ -14097,7 +15021,7 @@ namespace CIAO
       void DataType::
       kind (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("kind"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
         Traversal::DataType::kind (o);
         pop_ ();
       }
@@ -14105,7 +15029,7 @@ namespace CIAO
       void DataType::
       enum_ (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("enum"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("enum", top_ ()));
         Traversal::DataType::enum_ (o);
         pop_ ();
       }
@@ -14113,7 +15037,7 @@ namespace CIAO
       void DataType::
       struct_ (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("struct"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("struct", top_ ()));
         Traversal::DataType::struct_ (o);
         pop_ ();
       }
@@ -14121,7 +15045,7 @@ namespace CIAO
       void DataType::
       value (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("value"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
         Traversal::DataType::value (o);
         pop_ ();
       }
@@ -14129,17 +15053,25 @@ namespace CIAO
       void DataType::
       sequence (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("sequence"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("sequence", top_ ()));
         Traversal::DataType::sequence (o);
         pop_ ();
       }
 
       void DataType::
-      id (Type const& o)
+      alias (Type const& o)
       {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT ("id"), ACE_TEXT (""), top_ ());
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("alias", top_ ()));
+        Traversal::DataType::alias (o);
+        pop_ ();
+      }
+
+      void DataType::
+      xmi_id (Type const& o)
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "http://www.omg.org/Deployment", "", top_ ());
         attr_ (&a);
-        Traversal::DataType::id (o);
+        Traversal::DataType::xmi_id (o);
         attr_ (0);
       }
 
@@ -14167,7 +15099,7 @@ namespace CIAO
       void DataValue::
       short_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("short"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("short", top_ ()));
       }
 
       void DataValue::
@@ -14186,7 +15118,7 @@ namespace CIAO
       void DataValue::
       long_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("long"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("long", top_ ()));
       }
 
       void DataValue::
@@ -14205,7 +15137,7 @@ namespace CIAO
       void DataValue::
       ushort_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("ushort"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("ushort", top_ ()));
       }
 
       void DataValue::
@@ -14224,7 +15156,7 @@ namespace CIAO
       void DataValue::
       ulong_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("ulong"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("ulong", top_ ()));
       }
 
       void DataValue::
@@ -14243,7 +15175,7 @@ namespace CIAO
       void DataValue::
       float_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("float"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("float", top_ ()));
       }
 
       void DataValue::
@@ -14262,7 +15194,7 @@ namespace CIAO
       void DataValue::
       double_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("double"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("double", top_ ()));
       }
 
       void DataValue::
@@ -14281,7 +15213,7 @@ namespace CIAO
       void DataValue::
       boolean_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("boolean"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("boolean", top_ ()));
       }
 
       void DataValue::
@@ -14300,7 +15232,7 @@ namespace CIAO
       void DataValue::
       octet_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("octet"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("octet", top_ ()));
       }
 
       void DataValue::
@@ -14319,7 +15251,7 @@ namespace CIAO
       void DataValue::
       enum_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("enum"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("enum", top_ ()));
       }
 
       void DataValue::
@@ -14338,7 +15270,7 @@ namespace CIAO
       void DataValue::
       string_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("string"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("string", top_ ()));
       }
 
       void DataValue::
@@ -14357,7 +15289,7 @@ namespace CIAO
       void DataValue::
       longlong_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("longlong"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("longlong", top_ ()));
       }
 
       void DataValue::
@@ -14376,7 +15308,7 @@ namespace CIAO
       void DataValue::
       ulonglong_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("ulonglong"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("ulonglong", top_ ()));
       }
 
       void DataValue::
@@ -14395,7 +15327,7 @@ namespace CIAO
       void DataValue::
       longdouble_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("longdouble"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("longdouble", top_ ()));
       }
 
       void DataValue::
@@ -14412,9 +15344,28 @@ namespace CIAO
       }
 
       void DataValue::
+      element_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("element", top_ ()));
+      }
+
+      void DataValue::
+      element_next (Type const& o)
+      {
+        element_post (o);
+        element_pre (o);
+      }
+
+      void DataValue::
+      element_post (Type const&)
+      {
+        pop_ ();
+      }
+
+      void DataValue::
       member_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("member"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("member", top_ ()));
       }
 
       void DataValue::
@@ -14430,6 +15381,51 @@ namespace CIAO
         pop_ ();
       }
 
+      // AliasType
+      //
+      //
+
+      AliasType::
+      AliasType (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      AliasType::
+      AliasType ()
+      {
+      }
+
+      void AliasType::
+      traverse (Type const& o)
+      {
+        Traversal::AliasType::traverse (o);
+      }
+
+      void AliasType::
+      name (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
+        Traversal::AliasType::name (o);
+        pop_ ();
+      }
+
+      void AliasType::
+      typeId (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("typeId", top_ ()));
+        Traversal::AliasType::typeId (o);
+        pop_ ();
+      }
+
+      void AliasType::
+      elementType (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("elementType", top_ ()));
+        Traversal::AliasType::elementType (o);
+        pop_ ();
+      }
+
       // EnumType
       //
       //
@@ -14454,7 +15450,7 @@ namespace CIAO
       void EnumType::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::EnumType::name (o);
         pop_ ();
       }
@@ -14462,7 +15458,7 @@ namespace CIAO
       void EnumType::
       typeId (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("typeId"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("typeId", top_ ()));
         Traversal::EnumType::typeId (o);
         pop_ ();
       }
@@ -14470,7 +15466,7 @@ namespace CIAO
       void EnumType::
       member_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("member"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("member", top_ ()));
       }
 
       void EnumType::
@@ -14510,7 +15506,7 @@ namespace CIAO
       void StructType::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::StructType::name (o);
         pop_ ();
       }
@@ -14518,7 +15514,7 @@ namespace CIAO
       void StructType::
       typeId (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("typeId"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("typeId", top_ ()));
         Traversal::StructType::typeId (o);
         pop_ ();
       }
@@ -14526,7 +15522,7 @@ namespace CIAO
       void StructType::
       member_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("member"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("member", top_ ()));
       }
 
       void StructType::
@@ -14566,7 +15562,7 @@ namespace CIAO
       void StructMemberType::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::StructMemberType::name (o);
         pop_ ();
       }
@@ -14574,7 +15570,7 @@ namespace CIAO
       void StructMemberType::
       type (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("type"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
         Traversal::StructMemberType::type (o);
         pop_ ();
       }
@@ -14603,7 +15599,7 @@ namespace CIAO
       void ValueType::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::ValueType::name (o);
         pop_ ();
       }
@@ -14611,7 +15607,7 @@ namespace CIAO
       void ValueType::
       typeId (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("typeId"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("typeId", top_ ()));
         Traversal::ValueType::typeId (o);
         pop_ ();
       }
@@ -14619,7 +15615,7 @@ namespace CIAO
       void ValueType::
       modifier (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("modifier"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("modifier", top_ ()));
         Traversal::ValueType::modifier (o);
         pop_ ();
       }
@@ -14627,7 +15623,7 @@ namespace CIAO
       void ValueType::
       baseType (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("baseType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("baseType", top_ ()));
         Traversal::ValueType::baseType (o);
         pop_ ();
       }
@@ -14635,7 +15631,7 @@ namespace CIAO
       void ValueType::
       member_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("member"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("member", top_ ()));
       }
 
       void ValueType::
@@ -14675,7 +15671,7 @@ namespace CIAO
       void ValueMemberType::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::ValueMemberType::name (o);
         pop_ ();
       }
@@ -14683,7 +15679,7 @@ namespace CIAO
       void ValueMemberType::
       visibility (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("visibility"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("visibility", top_ ()));
         Traversal::ValueMemberType::visibility (o);
         pop_ ();
       }
@@ -14691,7 +15687,7 @@ namespace CIAO
       void ValueMemberType::
       type (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("type"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
         Traversal::ValueMemberType::type (o);
         pop_ ();
       }
@@ -14720,7 +15716,7 @@ namespace CIAO
       void NamedValue::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::NamedValue::name (o);
         pop_ ();
       }
@@ -14728,7 +15724,7 @@ namespace CIAO
       void NamedValue::
       value (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("value"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
         Traversal::NamedValue::value (o);
         pop_ ();
       }
@@ -14757,7 +15753,7 @@ namespace CIAO
       void SequenceType::
       bound (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("bound"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("bound", top_ ()));
         Traversal::SequenceType::bound (o);
         pop_ ();
       }
@@ -14765,7 +15761,7 @@ namespace CIAO
       void SequenceType::
       elementType (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("elementType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("elementType", top_ ()));
         Traversal::SequenceType::elementType (o);
         pop_ ();
       }
@@ -14794,7 +15790,7 @@ namespace CIAO
       void Any::
       type (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("type"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
         Traversal::Any::type (o);
         pop_ ();
       }
@@ -14802,7 +15798,7 @@ namespace CIAO
       void Any::
       value (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("value"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
         Traversal::Any::value (o);
         pop_ ();
       }
@@ -14831,7 +15827,7 @@ namespace CIAO
       void Property::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::Property::name (o);
         pop_ ();
       }
@@ -14839,7 +15835,7 @@ namespace CIAO
       void Property::
       value (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("value"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
         Traversal::Property::value (o);
         pop_ ();
       }
@@ -14864,12 +15860,12 @@ namespace CIAO
       {
         ::std::basic_string< ACE_TCHAR > s;
 
-        if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Quantity) s = ACE_TEXT ("Quantity");
-        else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Capacity) s = ACE_TEXT ("Capacity");
-        else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Minimum) s = ACE_TEXT ("Minimum");
-        else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Maximum) s = ACE_TEXT ("Maximum");
-        else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Attribute) s = ACE_TEXT ("Attribute");
-        else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Selection) s = ACE_TEXT ("Selection");
+        if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Quantity) s = "Quantity";
+        else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Capacity) s = "Capacity";
+        else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Minimum) s = "Minimum";
+        else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Maximum) s = "Maximum";
+        else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Attribute) s = "Attribute";
+        else if (o == ::CIAO::Config_Handlers::SatisfierPropertyKind::Selection) s = "Selection";
         else 
         {
         }
@@ -14909,7 +15905,7 @@ namespace CIAO
       void SatisfierProperty::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::SatisfierProperty::name (o);
         pop_ ();
       }
@@ -14917,7 +15913,7 @@ namespace CIAO
       void SatisfierProperty::
       kind (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("kind"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
         Traversal::SatisfierProperty::kind (o);
         pop_ ();
       }
@@ -14925,7 +15921,7 @@ namespace CIAO
       void SatisfierProperty::
       dynamic (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("dynamic"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("dynamic", top_ ()));
         Traversal::SatisfierProperty::dynamic (o);
         pop_ ();
       }
@@ -14933,7 +15929,7 @@ namespace CIAO
       void SatisfierProperty::
       value (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("value"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("value", top_ ()));
         Traversal::SatisfierProperty::value (o);
         pop_ ();
       }
@@ -14962,7 +15958,7 @@ namespace CIAO
       void Resource::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::Resource::name (o);
         pop_ ();
       }
@@ -14970,7 +15966,7 @@ namespace CIAO
       void Resource::
       resourceType_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resourceType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
       }
 
       void Resource::
@@ -14989,7 +15985,7 @@ namespace CIAO
       void Resource::
       property_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("property"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
       }
 
       void Resource::
@@ -15029,7 +16025,7 @@ namespace CIAO
       void Requirement::
       resourceType (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resourceType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
         Traversal::Requirement::resourceType (o);
         pop_ ();
       }
@@ -15037,7 +16033,7 @@ namespace CIAO
       void Requirement::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::Requirement::name (o);
         pop_ ();
       }
@@ -15045,7 +16041,7 @@ namespace CIAO
       void Requirement::
       property_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("property"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
       }
 
       void Requirement::
@@ -15085,7 +16081,7 @@ namespace CIAO
       void ResourceDeploymentDescription::
       requirementName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("requirementName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requirementName", top_ ()));
         Traversal::ResourceDeploymentDescription::requirementName (o);
         pop_ ();
       }
@@ -15093,7 +16089,7 @@ namespace CIAO
       void ResourceDeploymentDescription::
       resourceName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resourceName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceName", top_ ()));
         Traversal::ResourceDeploymentDescription::resourceName (o);
         pop_ ();
       }
@@ -15101,7 +16097,7 @@ namespace CIAO
       void ResourceDeploymentDescription::
       property_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("property"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
       }
 
       void ResourceDeploymentDescription::
@@ -15141,7 +16137,7 @@ namespace CIAO
       void ArtifactDeploymentDescription::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::ArtifactDeploymentDescription::name (o);
         pop_ ();
       }
@@ -15149,7 +16145,7 @@ namespace CIAO
       void ArtifactDeploymentDescription::
       source_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("source"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
       }
 
       void ArtifactDeploymentDescription::
@@ -15168,7 +16164,7 @@ namespace CIAO
       void ArtifactDeploymentDescription::
       node (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("node"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
         Traversal::ArtifactDeploymentDescription::node (o);
         pop_ ();
       }
@@ -15176,7 +16172,7 @@ namespace CIAO
       void ArtifactDeploymentDescription::
       location_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("location"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("location", top_ ()));
       }
 
       void ArtifactDeploymentDescription::
@@ -15195,7 +16191,7 @@ namespace CIAO
       void ArtifactDeploymentDescription::
       execParameter_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("execParameter"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("execParameter", top_ ()));
       }
 
       void ArtifactDeploymentDescription::
@@ -15214,7 +16210,7 @@ namespace CIAO
       void ArtifactDeploymentDescription::
       deployRequirement_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("deployRequirement"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
       }
 
       void ArtifactDeploymentDescription::
@@ -15233,7 +16229,7 @@ namespace CIAO
       void ArtifactDeploymentDescription::
       deployedResource_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("deployedResource"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
       }
 
       void ArtifactDeploymentDescription::
@@ -15250,11 +16246,11 @@ namespace CIAO
       }
 
       void ArtifactDeploymentDescription::
-      id (Type const& o)
+      xmi_id (Type const& o)
       {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT ("id"), ACE_TEXT (""), top_ ());
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "http://www.omg.org/Deployment", "", top_ ());
         attr_ (&a);
-        Traversal::ArtifactDeploymentDescription::id (o);
+        Traversal::ArtifactDeploymentDescription::xmi_id (o);
         attr_ (0);
       }
 
@@ -15282,7 +16278,7 @@ namespace CIAO
       void MonolithicDeploymentDescription::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::MonolithicDeploymentDescription::name (o);
         pop_ ();
       }
@@ -15290,7 +16286,7 @@ namespace CIAO
       void MonolithicDeploymentDescription::
       source_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("source"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
       }
 
       void MonolithicDeploymentDescription::
@@ -15309,7 +16305,7 @@ namespace CIAO
       void MonolithicDeploymentDescription::
       artifact_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("artifact"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("artifact", top_ ()));
       }
 
       void MonolithicDeploymentDescription::
@@ -15328,7 +16324,7 @@ namespace CIAO
       void MonolithicDeploymentDescription::
       execParameter_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("execParameter"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("execParameter", top_ ()));
       }
 
       void MonolithicDeploymentDescription::
@@ -15347,7 +16343,7 @@ namespace CIAO
       void MonolithicDeploymentDescription::
       deployRequirement_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("deployRequirement"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
       }
 
       void MonolithicDeploymentDescription::
@@ -15364,11 +16360,11 @@ namespace CIAO
       }
 
       void MonolithicDeploymentDescription::
-      id (Type const& o)
+      xmi_id (Type const& o)
       {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT ("id"), ACE_TEXT (""), top_ ());
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "http://www.omg.org/Deployment", "", top_ ());
         attr_ (&a);
-        Traversal::MonolithicDeploymentDescription::id (o);
+        Traversal::MonolithicDeploymentDescription::xmi_id (o);
         attr_ (0);
       }
 
@@ -15392,11 +16388,11 @@ namespace CIAO
       {
         ::std::basic_string< ACE_TCHAR > s;
 
-        if (o == ::CIAO::Config_Handlers::ResourceUsageKind::None) s = ACE_TEXT ("None");
-        else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::InstanceUsesResource) s = ACE_TEXT ("InstanceUsesResource");
-        else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::ResourceUsesInstance) s = ACE_TEXT ("ResourceUsesInstance");
-        else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::PortUsesResource) s = ACE_TEXT ("PortUsesResource");
-        else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::ResourceUsesPort) s = ACE_TEXT ("ResourceUsesPort");
+        if (o == ::CIAO::Config_Handlers::ResourceUsageKind::None) s = "None";
+        else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::InstanceUsesResource) s = "InstanceUsesResource";
+        else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::ResourceUsesInstance) s = "ResourceUsesInstance";
+        else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::PortUsesResource) s = "PortUsesResource";
+        else if (o == ::CIAO::Config_Handlers::ResourceUsageKind::ResourceUsesPort) s = "ResourceUsesPort";
         else 
         {
         }
@@ -15436,7 +16432,7 @@ namespace CIAO
       void InstanceResourceDeploymentDescription::
       resourceUsage (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resourceUsage"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceUsage", top_ ()));
         Traversal::InstanceResourceDeploymentDescription::resourceUsage (o);
         pop_ ();
       }
@@ -15444,7 +16440,7 @@ namespace CIAO
       void InstanceResourceDeploymentDescription::
       requirementName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("requirementName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requirementName", top_ ()));
         Traversal::InstanceResourceDeploymentDescription::requirementName (o);
         pop_ ();
       }
@@ -15452,7 +16448,7 @@ namespace CIAO
       void InstanceResourceDeploymentDescription::
       resourceName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resourceName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceName", top_ ()));
         Traversal::InstanceResourceDeploymentDescription::resourceName (o);
         pop_ ();
       }
@@ -15460,7 +16456,7 @@ namespace CIAO
       void InstanceResourceDeploymentDescription::
       property_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("property"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
       }
 
       void InstanceResourceDeploymentDescription::
@@ -15500,7 +16496,7 @@ namespace CIAO
       void InstanceDeploymentDescription::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::InstanceDeploymentDescription::name (o);
         pop_ ();
       }
@@ -15508,7 +16504,7 @@ namespace CIAO
       void InstanceDeploymentDescription::
       node (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("node"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
         Traversal::InstanceDeploymentDescription::node (o);
         pop_ ();
       }
@@ -15516,7 +16512,7 @@ namespace CIAO
       void InstanceDeploymentDescription::
       source (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("source"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
         Traversal::InstanceDeploymentDescription::source (o);
         pop_ ();
       }
@@ -15524,7 +16520,7 @@ namespace CIAO
       void InstanceDeploymentDescription::
       implementation (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("implementation"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("implementation", top_ ()));
         Traversal::InstanceDeploymentDescription::implementation (o);
         pop_ ();
       }
@@ -15532,7 +16528,7 @@ namespace CIAO
       void InstanceDeploymentDescription::
       configProperty_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("configProperty"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
       }
 
       void InstanceDeploymentDescription::
@@ -15551,7 +16547,7 @@ namespace CIAO
       void InstanceDeploymentDescription::
       deployedResource_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("deployedResource"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
       }
 
       void InstanceDeploymentDescription::
@@ -15570,17 +16566,17 @@ namespace CIAO
       void InstanceDeploymentDescription::
       deployedSharedResource (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("deployedSharedResource"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedSharedResource", top_ ()));
         Traversal::InstanceDeploymentDescription::deployedSharedResource (o);
         pop_ ();
       }
 
       void InstanceDeploymentDescription::
-      id (Type const& o)
+      xmi_id (Type const& o)
       {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT ("id"), ACE_TEXT (""), top_ ());
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "http://www.omg.org/Deployment", "", top_ ());
         attr_ (&a);
-        Traversal::InstanceDeploymentDescription::id (o);
+        Traversal::InstanceDeploymentDescription::xmi_id (o);
         attr_ (0);
       }
 
@@ -15604,12 +16600,12 @@ namespace CIAO
       {
         ::std::basic_string< ACE_TCHAR > s;
 
-        if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::Facet) s = ACE_TEXT ("Facet");
-        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::SimplexReceptacle) s = ACE_TEXT ("SimplexReceptacle");
-        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::MultiplexReceptacle) s = ACE_TEXT ("MultiplexReceptacle");
-        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::EventEmitter) s = ACE_TEXT ("EventEmitter");
-        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::EventPublisher) s = ACE_TEXT ("EventPublisher");
-        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::EventConsumer) s = ACE_TEXT ("EventConsumer");
+        if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::Facet) s = "Facet";
+        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::SimplexReceptacle) s = "SimplexReceptacle";
+        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::MultiplexReceptacle) s = "MultiplexReceptacle";
+        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::EventEmitter) s = "EventEmitter";
+        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::EventPublisher) s = "EventPublisher";
+        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::EventConsumer) s = "EventConsumer";
         else 
         {
         }
@@ -15649,7 +16645,7 @@ namespace CIAO
       void ComponentPortDescription::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::ComponentPortDescription::name (o);
         pop_ ();
       }
@@ -15657,7 +16653,7 @@ namespace CIAO
       void ComponentPortDescription::
       specificType (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("specificType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("specificType", top_ ()));
         Traversal::ComponentPortDescription::specificType (o);
         pop_ ();
       }
@@ -15665,7 +16661,7 @@ namespace CIAO
       void ComponentPortDescription::
       supportedType_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("supportedType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("supportedType", top_ ()));
       }
 
       void ComponentPortDescription::
@@ -15684,7 +16680,7 @@ namespace CIAO
       void ComponentPortDescription::
       provider (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("provider"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("provider", top_ ()));
         Traversal::ComponentPortDescription::provider (o);
         pop_ ();
       }
@@ -15692,7 +16688,7 @@ namespace CIAO
       void ComponentPortDescription::
       exclusiveProvider (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("exclusiveProvider"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("exclusiveProvider", top_ ()));
         Traversal::ComponentPortDescription::exclusiveProvider (o);
         pop_ ();
       }
@@ -15700,7 +16696,7 @@ namespace CIAO
       void ComponentPortDescription::
       exclusiveUser (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("exclusiveUser"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("exclusiveUser", top_ ()));
         Traversal::ComponentPortDescription::exclusiveUser (o);
         pop_ ();
       }
@@ -15708,7 +16704,7 @@ namespace CIAO
       void ComponentPortDescription::
       optional (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("optional"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("optional", top_ ()));
         Traversal::ComponentPortDescription::optional (o);
         pop_ ();
       }
@@ -15716,7 +16712,7 @@ namespace CIAO
       void ComponentPortDescription::
       kind (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("kind"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
         Traversal::ComponentPortDescription::kind (o);
         pop_ ();
       }
@@ -15745,7 +16741,7 @@ namespace CIAO
       void ComponentPropertyDescription::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::ComponentPropertyDescription::name (o);
         pop_ ();
       }
@@ -15753,7 +16749,7 @@ namespace CIAO
       void ComponentPropertyDescription::
       type (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("type"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
         Traversal::ComponentPropertyDescription::type (o);
         pop_ ();
       }
@@ -15782,7 +16778,7 @@ namespace CIAO
       void ComponentExternalPortEndpoint::
       portName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("portName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("portName", top_ ()));
         Traversal::ComponentExternalPortEndpoint::portName (o);
         pop_ ();
       }
@@ -15811,7 +16807,7 @@ namespace CIAO
       void PlanSubcomponentPortEndpoint::
       portName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("portName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("portName", top_ ()));
         Traversal::PlanSubcomponentPortEndpoint::portName (o);
         pop_ ();
       }
@@ -15819,7 +16815,7 @@ namespace CIAO
       void PlanSubcomponentPortEndpoint::
       provider (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("provider"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("provider", top_ ()));
         Traversal::PlanSubcomponentPortEndpoint::provider (o);
         pop_ ();
       }
@@ -15827,7 +16823,7 @@ namespace CIAO
       void PlanSubcomponentPortEndpoint::
       kind (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("kind"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("kind", top_ ()));
         Traversal::PlanSubcomponentPortEndpoint::kind (o);
         pop_ ();
       }
@@ -15835,7 +16831,7 @@ namespace CIAO
       void PlanSubcomponentPortEndpoint::
       instance (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("instance"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
         Traversal::PlanSubcomponentPortEndpoint::instance (o);
         pop_ ();
       }
@@ -15864,11 +16860,46 @@ namespace CIAO
       void ExternalReferenceEndpoint::
       location (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("location"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("location", top_ ()));
         Traversal::ExternalReferenceEndpoint::location (o);
         pop_ ();
       }
 
+      void ExternalReferenceEndpoint::
+      provider (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("provider", top_ ()));
+        Traversal::ExternalReferenceEndpoint::provider (o);
+        pop_ ();
+      }
+
+      void ExternalReferenceEndpoint::
+      portName (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("portName", top_ ()));
+        Traversal::ExternalReferenceEndpoint::portName (o);
+        pop_ ();
+      }
+
+      void ExternalReferenceEndpoint::
+      supportedType_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("supportedType", top_ ()));
+      }
+
+      void ExternalReferenceEndpoint::
+      supportedType_next (Type const& o)
+      {
+        supportedType_post (o);
+        supportedType_pre (o);
+      }
+
+      void ExternalReferenceEndpoint::
+      supportedType_post (Type const&)
+      {
+        pop_ ();
+      }
+
       // ConnectionResourceDeploymentDescription
       //
       //
@@ -15893,7 +16924,7 @@ namespace CIAO
       void ConnectionResourceDeploymentDescription::
       targetName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("targetName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("targetName", top_ ()));
         Traversal::ConnectionResourceDeploymentDescription::targetName (o);
         pop_ ();
       }
@@ -15901,7 +16932,7 @@ namespace CIAO
       void ConnectionResourceDeploymentDescription::
       requirementName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("requirementName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requirementName", top_ ()));
         Traversal::ConnectionResourceDeploymentDescription::requirementName (o);
         pop_ ();
       }
@@ -15909,7 +16940,7 @@ namespace CIAO
       void ConnectionResourceDeploymentDescription::
       resourceName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resourceName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceName", top_ ()));
         Traversal::ConnectionResourceDeploymentDescription::resourceName (o);
         pop_ ();
       }
@@ -15917,7 +16948,7 @@ namespace CIAO
       void ConnectionResourceDeploymentDescription::
       property_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("property"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
       }
 
       void ConnectionResourceDeploymentDescription::
@@ -15957,7 +16988,7 @@ namespace CIAO
       void PlanConnectionDescription::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::PlanConnectionDescription::name (o);
         pop_ ();
       }
@@ -15965,7 +16996,7 @@ namespace CIAO
       void PlanConnectionDescription::
       source (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("source"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
         Traversal::PlanConnectionDescription::source (o);
         pop_ ();
       }
@@ -15973,7 +17004,7 @@ namespace CIAO
       void PlanConnectionDescription::
       deployRequirement_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("deployRequirement"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
       }
 
       void PlanConnectionDescription::
@@ -15992,7 +17023,7 @@ namespace CIAO
       void PlanConnectionDescription::
       externalEndpoint_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("externalEndpoint"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalEndpoint", top_ ()));
       }
 
       void PlanConnectionDescription::
@@ -16011,7 +17042,7 @@ namespace CIAO
       void PlanConnectionDescription::
       internalEndpoint_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("internalEndpoint"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("internalEndpoint", top_ ()));
       }
 
       void PlanConnectionDescription::
@@ -16030,7 +17061,7 @@ namespace CIAO
       void PlanConnectionDescription::
       externalReference_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("externalReference"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalReference", top_ ()));
       }
 
       void PlanConnectionDescription::
@@ -16049,7 +17080,7 @@ namespace CIAO
       void PlanConnectionDescription::
       deployedResource_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("deployedResource"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
       }
 
       void PlanConnectionDescription::
@@ -16089,7 +17120,7 @@ namespace CIAO
       void ImplementationDependency::
       requiredType (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("requiredType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("requiredType", top_ ()));
         Traversal::ImplementationDependency::requiredType (o);
         pop_ ();
       }
@@ -16118,7 +17149,7 @@ namespace CIAO
       void Capability::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::Capability::name (o);
         pop_ ();
       }
@@ -16126,7 +17157,7 @@ namespace CIAO
       void Capability::
       resourceType_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resourceType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
       }
 
       void Capability::
@@ -16145,7 +17176,7 @@ namespace CIAO
       void Capability::
       property_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("property"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
       }
 
       void Capability::
@@ -16185,7 +17216,7 @@ namespace CIAO
       void ImplementationRequirement::
       resourceUsage (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resourceUsage"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceUsage", top_ ()));
         Traversal::ImplementationRequirement::resourceUsage (o);
         pop_ ();
       }
@@ -16193,7 +17224,7 @@ namespace CIAO
       void ImplementationRequirement::
       resourcePort (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resourcePort"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourcePort", top_ ()));
         Traversal::ImplementationRequirement::resourcePort (o);
         pop_ ();
       }
@@ -16201,7 +17232,7 @@ namespace CIAO
       void ImplementationRequirement::
       componentPort (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("componentPort"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("componentPort", top_ ()));
         Traversal::ImplementationRequirement::componentPort (o);
         pop_ ();
       }
@@ -16209,7 +17240,7 @@ namespace CIAO
       void ImplementationRequirement::
       resourceType (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resourceType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
         Traversal::ImplementationRequirement::resourceType (o);
         pop_ ();
       }
@@ -16217,7 +17248,7 @@ namespace CIAO
       void ImplementationRequirement::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::ImplementationRequirement::name (o);
         pop_ ();
       }
@@ -16225,7 +17256,7 @@ namespace CIAO
       void ImplementationRequirement::
       property_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("property"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
       }
 
       void ImplementationRequirement::
@@ -16241,51 +17272,6 @@ namespace CIAO
         pop_ ();
       }
 
-      // 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 > (ACE_TEXT ("requiredUUID"), top_ ()));
-        Traversal::ComponentPackageReference::requiredUUID (o);
-        pop_ ();
-      }
-
-      void ComponentPackageReference::
-      requiredName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("requiredName"), top_ ()));
-        Traversal::ComponentPackageReference::requiredName (o);
-        pop_ ();
-      }
-
-      void ComponentPackageReference::
-      requiredType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("requiredType"), top_ ()));
-        Traversal::ComponentPackageReference::requiredType (o);
-        pop_ ();
-      }
-
       // SubcomponentPortEndpoint
       //
       //
@@ -16310,7 +17296,7 @@ namespace CIAO
       void SubcomponentPortEndpoint::
       portName (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("portName"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("portName", top_ ()));
         Traversal::SubcomponentPortEndpoint::portName (o);
         pop_ ();
       }
@@ -16318,7 +17304,7 @@ namespace CIAO
       void SubcomponentPortEndpoint::
       instance (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("instance"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
         Traversal::SubcomponentPortEndpoint::instance (o);
         pop_ ();
       }
@@ -16347,7 +17333,7 @@ namespace CIAO
       void AssemblyConnectionDescription::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::AssemblyConnectionDescription::name (o);
         pop_ ();
       }
@@ -16355,7 +17341,7 @@ namespace CIAO
       void AssemblyConnectionDescription::
       deployRequirement_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("deployRequirement"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
       }
 
       void AssemblyConnectionDescription::
@@ -16374,7 +17360,7 @@ namespace CIAO
       void AssemblyConnectionDescription::
       internalEndpoint_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("internalEndpoint"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("internalEndpoint", top_ ()));
       }
 
       void AssemblyConnectionDescription::
@@ -16393,7 +17379,7 @@ namespace CIAO
       void AssemblyConnectionDescription::
       externalEndpoint_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("externalEndpoint"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalEndpoint", top_ ()));
       }
 
       void AssemblyConnectionDescription::
@@ -16412,7 +17398,7 @@ namespace CIAO
       void AssemblyConnectionDescription::
       externalReference_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("externalReference"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("externalReference", top_ ()));
       }
 
       void AssemblyConnectionDescription::
@@ -16427,6 +17413,81 @@ namespace CIAO
       {
         pop_ ();
       }
+
+      // PlanLocalityKind
+      //
+      //
+
+      PlanLocalityKind::
+      PlanLocalityKind (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      PlanLocalityKind::
+      PlanLocalityKind ()
+      {
+      }
+
+      void PlanLocalityKind::
+      traverse (Type const& o)
+      {
+        ::std::basic_string< ACE_TCHAR > s;
+
+        if (o == ::CIAO::Config_Handlers::PlanLocalityKind::SameProcess) s = "SameProcess";
+        else if (o == ::CIAO::Config_Handlers::PlanLocalityKind::DifferentProcess) s = "DifferentProcess";
+        else if (o == ::CIAO::Config_Handlers::PlanLocalityKind::NoConstraint) s = "NoConstraint";
+        else 
+        {
+        }
+
+        if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
+        {
+          a->value (s);
+        }
+
+        else
+        {
+          top_().value (s);
+        }
+      }
+
+      // PlanLocality
+      //
+      //
+
+      PlanLocality::
+      PlanLocality (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+
+      PlanLocality::
+      PlanLocality ()
+      {
+      }
+
+      void PlanLocality::
+      traverse (Type const& o)
+      {
+        Traversal::PlanLocality::traverse (o);
+      }
+
+      void PlanLocality::
+      constraint (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("constraint", top_ ()));
+        Traversal::PlanLocality::constraint (o);
+        pop_ ();
+      }
+
+      void PlanLocality::
+      constrainedInstance (Type const& o)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("constrainedInstance", top_ ()));
+        Traversal::PlanLocality::constrainedInstance (o);
+        pop_ ();
+      }
     }
   }
 }
diff --git a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
index f67d45baeaa..e6c52c74a25 100644
--- a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
+++ b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
@@ -25,9 +25,11 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
+    class IdRef;
     class TCKind;
     class DataType;
     class DataValue;
+    class AliasType;
     class EnumType;
     class StructType;
     class StructMemberType;
@@ -58,9 +60,10 @@ namespace CIAO
     class ImplementationDependency;
     class Capability;
     class ImplementationRequirement;
-    class ComponentPackageReference;
     class SubcomponentPortEndpoint;
     class AssemblyConnectionDescription;
+    class PlanLocalityKind;
+    class PlanLocality;
   }
 }
 
@@ -68,10 +71,52 @@ namespace CIAO
 #include <list>
 #include "XMLSchema/Types.hpp"
 
+#include "XMI.hpp"
+
 namespace CIAO
 {
   namespace Config_Handlers
   {
+    class XSC_XML_Handlers_Export IdRef : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // href
+      // 
+      public:
+      bool href_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& href () const;
+      ::XMLSchema::string< ACE_TCHAR >& href ();
+      void href (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
+
+      // idref
+      // 
+      public:
+      bool idref_p () const;
+      ::XMLSchema::IDREF< ACE_TCHAR > const& idref () const;
+      ::XMLSchema::IDREF< ACE_TCHAR >& idref ();
+      void idref (::XMLSchema::IDREF< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > idref_;
+
+      public:
+      IdRef ();
+
+      IdRef (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      IdRef (IdRef const& s);
+
+      IdRef&
+      operator= (IdRef const& s);
+
+      private:
+      char regulator__;
+    };
+
+
     class XSC_XML_Handlers_Export TCKind : public ::XSCRT::Type
     {
       public:
@@ -195,16 +240,26 @@ namespace CIAO
       protected:
       ::std::auto_ptr< ::CIAO::Config_Handlers::SequenceType > sequence_;
 
-      // id
+      // alias
       // 
       public:
-      bool id_p () const;
-      ::XMLSchema::ID< ACE_TCHAR > const& id () const;
-      ::XMLSchema::ID< ACE_TCHAR >& id ();
-      void id (::XMLSchema::ID< ACE_TCHAR > const& );
+      bool alias_p () const;
+      ::CIAO::Config_Handlers::AliasType const& alias () const;
+      void alias (::CIAO::Config_Handlers::AliasType const& );
 
       protected:
-      ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
+      ::std::auto_ptr< ::CIAO::Config_Handlers::AliasType > alias_;
+
+      // xmi_id
+      // 
+      public:
+      bool xmi_id_p () const;
+      ::XMLSchema::ID< ACE_TCHAR > const& xmi_id () const;
+      ::XMLSchema::ID< ACE_TCHAR >& xmi_id ();
+      void xmi_id (::XMLSchema::ID< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > xmi_id_;
 
       public:
       DataType (::CIAO::Config_Handlers::TCKind const& kind__);
@@ -419,6 +474,21 @@ namespace CIAO
       protected:
       ::std::list< ::XMLSchema::double_ > longdouble_;
 
+      // element
+      // 
+      public:
+      typedef ::std::list< ::CIAO::Config_Handlers::DataValue >::iterator element_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::DataValue >::const_iterator element_const_iterator;
+      element_iterator begin_element ();
+      element_iterator end_element ();
+      element_const_iterator begin_element () const;
+      element_const_iterator end_element () const;
+      void add_element (::CIAO::Config_Handlers::DataValue const& );
+      size_t count_element (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::DataValue > element_;
+
       // member
       // 
       public:
@@ -448,6 +518,53 @@ namespace CIAO
     };
 
 
+    class XSC_XML_Handlers_Export AliasType : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // name
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& name () const;
+      void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+      // typeId
+      // 
+      public:
+      ::XMLSchema::string< ACE_TCHAR > const& typeId () const;
+      void typeId (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > typeId_;
+
+      // elementType
+      // 
+      public:
+      ::CIAO::Config_Handlers::DataType const& elementType () const;
+      void elementType (::CIAO::Config_Handlers::DataType const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > elementType_;
+
+      public:
+      AliasType (::XMLSchema::string< ACE_TCHAR > const& name__,
+                 ::XMLSchema::string< ACE_TCHAR > const& typeId__,
+                 ::CIAO::Config_Handlers::DataType const& elementType__);
+
+      AliasType (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      AliasType (AliasType const& s);
+
+      AliasType&
+      operator= (AliasType const& s);
+
+      private:
+      char regulator__;
+    };
+
+
     class XSC_XML_Handlers_Export EnumType : public ::XSCRT::Type
     {
       typedef ::XSCRT::Type Base;
@@ -753,11 +870,11 @@ namespace CIAO
       // 
       public:
       bool bound_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& bound () const;
-      void bound (::XMLSchema::string< ACE_TCHAR > const& );
+      ::XMLSchema::unsignedInt const& bound () const;
+      void bound (::XMLSchema::unsignedInt const& );
 
       protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > bound_;
+      ::std::auto_ptr< ::XMLSchema::unsignedInt > bound_;
 
       // elementType
       // 
@@ -1210,16 +1327,16 @@ namespace CIAO
       protected:
       ::std::list< ::CIAO::Config_Handlers::ResourceDeploymentDescription > deployedResource_;
 
-      // id
+      // xmi_id
       // 
       public:
-      bool id_p () const;
-      ::XMLSchema::ID< ACE_TCHAR > const& id () const;
-      ::XMLSchema::ID< ACE_TCHAR >& id ();
-      void id (::XMLSchema::ID< ACE_TCHAR > const& );
+      bool xmi_id_p () const;
+      ::XMLSchema::ID< ACE_TCHAR > const& xmi_id () const;
+      ::XMLSchema::ID< ACE_TCHAR >& xmi_id ();
+      void xmi_id (::XMLSchema::ID< ACE_TCHAR > const& );
 
       protected:
-      ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
+      ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > xmi_id_;
 
       public:
       ArtifactDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
@@ -1267,17 +1384,17 @@ namespace CIAO
       // artifact
       // 
       public:
-      typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::iterator artifact_iterator;
-      typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::const_iterator artifact_const_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::IdRef >::iterator artifact_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::IdRef >::const_iterator artifact_const_iterator;
       artifact_iterator begin_artifact ();
       artifact_iterator end_artifact ();
       artifact_const_iterator begin_artifact () const;
       artifact_const_iterator end_artifact () const;
-      void add_artifact (::XMLSchema::IDREF< ACE_TCHAR > const& );
+      void add_artifact (::CIAO::Config_Handlers::IdRef const& );
       size_t count_artifact (void) const;
 
       protected:
-      ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > > artifact_;
+      ::std::list< ::CIAO::Config_Handlers::IdRef > artifact_;
 
       // execParameter
       // 
@@ -1309,16 +1426,16 @@ namespace CIAO
       protected:
       ::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
 
-      // id
+      // xmi_id
       // 
       public:
-      bool id_p () const;
-      ::XMLSchema::ID< ACE_TCHAR > const& id () const;
-      ::XMLSchema::ID< ACE_TCHAR >& id ();
-      void id (::XMLSchema::ID< ACE_TCHAR > const& );
+      bool xmi_id_p () const;
+      ::XMLSchema::ID< ACE_TCHAR > const& xmi_id () const;
+      ::XMLSchema::ID< ACE_TCHAR >& xmi_id ();
+      void xmi_id (::XMLSchema::ID< ACE_TCHAR > const& );
 
       protected:
-      ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
+      ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > xmi_id_;
 
       public:
       MonolithicDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__);
@@ -1468,11 +1585,11 @@ namespace CIAO
       // implementation
       // 
       public:
-      ::XMLSchema::IDREF< ACE_TCHAR > const& implementation () const;
-      void implementation (::XMLSchema::IDREF< ACE_TCHAR > const& );
+      ::CIAO::Config_Handlers::IdRef const& implementation () const;
+      void implementation (::CIAO::Config_Handlers::IdRef const& );
 
       protected:
-      ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > implementation_;
+      ::std::auto_ptr< ::CIAO::Config_Handlers::IdRef > implementation_;
 
       // configProperty
       // 
@@ -1514,22 +1631,22 @@ namespace CIAO
       protected:
       ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > deployedSharedResource_;
 
-      // id
+      // xmi_id
       // 
       public:
-      bool id_p () const;
-      ::XMLSchema::ID< ACE_TCHAR > const& id () const;
-      ::XMLSchema::ID< ACE_TCHAR >& id ();
-      void id (::XMLSchema::ID< ACE_TCHAR > const& );
+      bool xmi_id_p () const;
+      ::XMLSchema::ID< ACE_TCHAR > const& xmi_id () const;
+      ::XMLSchema::ID< ACE_TCHAR >& xmi_id ();
+      void xmi_id (::XMLSchema::ID< ACE_TCHAR > const& );
 
       protected:
-      ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
+      ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > xmi_id_;
 
       public:
       InstanceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
                                      ::XMLSchema::string< ACE_TCHAR > const& node__,
                                      ::XMLSchema::string< ACE_TCHAR > const& source__,
-                                     ::XMLSchema::IDREF< ACE_TCHAR > const& implementation__);
+                                     ::CIAO::Config_Handlers::IdRef const& implementation__);
 
       InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
       InstanceDeploymentDescription (InstanceDeploymentDescription const& s);
@@ -1782,16 +1899,16 @@ namespace CIAO
       // instance
       // 
       public:
-      ::XMLSchema::IDREF< ACE_TCHAR > const& instance () const;
-      void instance (::XMLSchema::IDREF< ACE_TCHAR > const& );
+      ::CIAO::Config_Handlers::IdRef const& instance () const;
+      void instance (::CIAO::Config_Handlers::IdRef const& );
 
       protected:
-      ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > instance_;
+      ::std::auto_ptr< ::CIAO::Config_Handlers::IdRef > instance_;
 
       public:
       PlanSubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
                                     ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__,
-                                    ::XMLSchema::IDREF< ACE_TCHAR > const& instance__);
+                                    ::CIAO::Config_Handlers::IdRef const& instance__);
 
       PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
       PlanSubcomponentPortEndpoint (PlanSubcomponentPortEndpoint const& s);
@@ -1817,8 +1934,43 @@ namespace CIAO
       protected:
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > location_;
 
+      // provider
+      // 
       public:
-      ExternalReferenceEndpoint (::XMLSchema::string< ACE_TCHAR > const& location__);
+      ::XMLSchema::boolean const& provider () const;
+      void provider (::XMLSchema::boolean const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::boolean > provider_;
+
+      // portName
+      // 
+      public:
+      bool portName_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& portName () const;
+      void portName (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > portName_;
+
+      // supportedType
+      // 
+      public:
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator supportedType_iterator;
+      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::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< ACE_TCHAR > const& );
+      size_t count_supportedType (void) const;
+
+      protected:
+      ::std::list< ::XMLSchema::string< ACE_TCHAR > > supportedType_;
+
+      public:
+      ExternalReferenceEndpoint (::XMLSchema::string< ACE_TCHAR > const& location__,
+                                 ::XMLSchema::boolean const& provider__);
 
       ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
       ExternalReferenceEndpoint (ExternalReferenceEndpoint const& s);
@@ -2171,53 +2323,6 @@ namespace CIAO
     };
 
 
-    class XSC_XML_Handlers_Export ComponentPackageReference : public ::XSCRT::Type
-    {
-      typedef ::XSCRT::Type Base;
-
-      // requiredUUID
-      // 
-      public:
-      bool requiredUUID_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& requiredUUID () const;
-      void requiredUUID (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requiredUUID_;
-
-      // requiredName
-      // 
-      public:
-      bool requiredName_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& requiredName () const;
-      void requiredName (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requiredName_;
-
-      // requiredType
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& requiredType () const;
-      void requiredType (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requiredType_;
-
-      public:
-      ComponentPackageReference (::XMLSchema::string< ACE_TCHAR > const& requiredType__);
-
-      ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ComponentPackageReference (ComponentPackageReference const& s);
-
-      ComponentPackageReference&
-      operator= (ComponentPackageReference const& s);
-
-      private:
-      char regulator__;
-    };
-
-
     class XSC_XML_Handlers_Export SubcomponentPortEndpoint : public ::XSCRT::Type
     {
       typedef ::XSCRT::Type Base;
@@ -2234,15 +2339,15 @@ namespace CIAO
       // instance
       // 
       public:
-      ::XMLSchema::IDREF< ACE_TCHAR > const& instance () const;
-      void instance (::XMLSchema::IDREF< ACE_TCHAR > const& );
+      ::CIAO::Config_Handlers::IdRef const& instance () const;
+      void instance (::CIAO::Config_Handlers::IdRef const& );
 
       protected:
-      ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > instance_;
+      ::std::auto_ptr< ::CIAO::Config_Handlers::IdRef > instance_;
 
       public:
       SubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
-                                ::XMLSchema::IDREF< ACE_TCHAR > const& instance__);
+                                ::CIAO::Config_Handlers::IdRef const& instance__);
 
       SubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
       SubcomponentPortEndpoint (SubcomponentPortEndpoint const& s);
@@ -2340,6 +2445,79 @@ namespace CIAO
       private:
       char regulator__;
     };
+
+
+    class XSC_XML_Handlers_Export PlanLocalityKind : public ::XSCRT::Type
+    {
+      public:
+      PlanLocalityKind (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      PlanLocalityKind (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
+
+      static PlanLocalityKind const SameProcess;
+      static PlanLocalityKind const DifferentProcess;
+      static PlanLocalityKind const NoConstraint;
+
+      enum Value
+      {
+        SameProcess_l, DifferentProcess_l, NoConstraint_l
+      };
+
+
+      Value
+      integral () const;
+
+      friend bool XSC_XML_Handlers_Export 
+      operator== (PlanLocalityKind const& a, PlanLocalityKind const& b);
+
+      friend bool XSC_XML_Handlers_Export 
+      operator!= (PlanLocalityKind const& a, PlanLocalityKind const& b);
+
+      private:
+      PlanLocalityKind (Value v);
+
+      Value v_;
+    };
+
+    bool XSC_XML_Handlers_Export operator== (PlanLocalityKind const &a, PlanLocalityKind const &b);
+
+    bool XSC_XML_Handlers_Export operator!= (PlanLocalityKind const &a, PlanLocalityKind const &b);
+
+
+    class XSC_XML_Handlers_Export PlanLocality : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // constraint
+      // 
+      public:
+      ::CIAO::Config_Handlers::PlanLocalityKind const& constraint () const;
+      void constraint (::CIAO::Config_Handlers::PlanLocalityKind const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::PlanLocalityKind > constraint_;
+
+      // constrainedInstance
+      // 
+      public:
+      ::CIAO::Config_Handlers::IdRef const& constrainedInstance () const;
+      void constrainedInstance (::CIAO::Config_Handlers::IdRef const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::IdRef > constrainedInstance_;
+
+      public:
+      PlanLocality (::CIAO::Config_Handlers::PlanLocalityKind const& constraint__,
+                    ::CIAO::Config_Handlers::IdRef const& constrainedInstance__);
+
+      PlanLocality (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      PlanLocality (PlanLocality const& s);
+
+      PlanLocality&
+      operator= (PlanLocality const& s);
+
+      private:
+      char regulator__;
+    };
   }
 }
 
@@ -2358,6 +2536,51 @@ namespace CIAO
   {
     namespace Traversal
     {
+      struct XSC_XML_Handlers_Export IdRef : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::IdRef >
+      {
+        virtual void
+        traverse (Type&);
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void
+        pre (Type&);
+
+        virtual void
+        pre (Type const&);
+
+        virtual void
+        href (Type&);
+
+        virtual void
+        href (Type const&);
+
+        virtual void
+        href_none (Type&);
+
+        virtual void
+        href_none (Type const&);
+
+        virtual void
+        idref (Type&);
+
+        virtual void
+        idref (Type const&);
+
+        virtual void
+        idref_none (Type&);
+
+        virtual void
+        idref_none (Type const&);
+
+        virtual void
+        post (Type&);
+
+        virtual void
+        post (Type const&);
+      };
+
       typedef
       ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::TCKind >
       TCKind;
@@ -2431,16 +2654,28 @@ namespace CIAO
         sequence_none (Type const&);
 
         virtual void
-        id (Type&);
+        alias (Type&);
+
+        virtual void
+        alias (Type const&);
+
+        virtual void
+        alias_none (Type&);
 
         virtual void
-        id (Type const&);
+        alias_none (Type const&);
 
         virtual void
-        id_none (Type&);
+        xmi_id (Type&);
 
         virtual void
-        id_none (Type const&);
+        xmi_id (Type const&);
+
+        virtual void
+        xmi_id_none (Type&);
+
+        virtual void
+        xmi_id_none (Type const&);
 
         virtual void
         post (Type&);
@@ -2854,6 +3089,36 @@ namespace CIAO
         longdouble_none (Type const&);
 
         virtual void
+        element (Type&);
+
+        virtual void
+        element (Type const&);
+
+        virtual void
+        element_pre (Type&);
+
+        virtual void
+        element_pre (Type const&);
+
+        virtual void
+        element_next (Type&);
+
+        virtual void
+        element_next (Type const&);
+
+        virtual void
+        element_post (Type&);
+
+        virtual void
+        element_post (Type const&);
+
+        virtual void
+        element_none (Type&);
+
+        virtual void
+        element_none (Type const&);
+
+        virtual void
         member (Type&);
 
         virtual void
@@ -2890,6 +3155,45 @@ namespace CIAO
         post (Type const&);
       };
 
+      struct XSC_XML_Handlers_Export AliasType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::AliasType >
+      {
+        virtual void
+        traverse (Type&);
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void
+        pre (Type&);
+
+        virtual void
+        pre (Type const&);
+
+        virtual void
+        name (Type&);
+
+        virtual void
+        name (Type const&);
+
+        virtual void
+        typeId (Type&);
+
+        virtual void
+        typeId (Type const&);
+
+        virtual void
+        elementType (Type&);
+
+        virtual void
+        elementType (Type const&);
+
+        virtual void
+        post (Type&);
+
+        virtual void
+        post (Type const&);
+      };
+
       struct XSC_XML_Handlers_Export EnumType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::EnumType >
       {
         virtual void
@@ -3716,16 +4020,16 @@ namespace CIAO
         deployedResource_none (Type const&);
 
         virtual void
-        id (Type&);
+        xmi_id (Type&);
 
         virtual void
-        id (Type const&);
+        xmi_id (Type const&);
 
         virtual void
-        id_none (Type&);
+        xmi_id_none (Type&);
 
         virtual void
-        id_none (Type const&);
+        xmi_id_none (Type const&);
 
         virtual void
         post (Type&);
@@ -3863,16 +4167,16 @@ namespace CIAO
         deployRequirement_none (Type const&);
 
         virtual void
-        id (Type&);
+        xmi_id (Type&);
 
         virtual void
-        id (Type const&);
+        xmi_id (Type const&);
 
         virtual void
-        id_none (Type&);
+        xmi_id_none (Type&);
 
         virtual void
-        id_none (Type const&);
+        xmi_id_none (Type const&);
 
         virtual void
         post (Type&);
@@ -4065,16 +4369,16 @@ namespace CIAO
         deployedSharedResource_none (Type const&);
 
         virtual void
-        id (Type&);
+        xmi_id (Type&);
 
         virtual void
-        id (Type const&);
+        xmi_id (Type const&);
 
         virtual void
-        id_none (Type&);
+        xmi_id_none (Type&);
 
         virtual void
-        id_none (Type const&);
+        xmi_id_none (Type const&);
 
         virtual void
         post (Type&);
@@ -4318,6 +4622,48 @@ namespace CIAO
         location (Type const&);
 
         virtual void
+        provider (Type&);
+
+        virtual void
+        provider (Type const&);
+
+        virtual void
+        portName (Type&);
+
+        virtual void
+        portName (Type const&);
+
+        virtual void
+        portName_none (Type&);
+
+        virtual void
+        portName_none (Type const&);
+
+        virtual void
+        supportedType (Type&);
+
+        virtual void
+        supportedType (Type const&);
+
+        virtual void
+        supportedType_pre (Type&);
+
+        virtual void
+        supportedType_pre (Type const&);
+
+        virtual void
+        supportedType_next (Type&);
+
+        virtual void
+        supportedType_next (Type const&);
+
+        virtual void
+        supportedType_post (Type&);
+
+        virtual void
+        supportedType_post (Type const&);
+
+        virtual void
         post (Type&);
 
         virtual void
@@ -4789,57 +5135,6 @@ namespace CIAO
         post (Type const&);
       };
 
-      struct XSC_XML_Handlers_Export ComponentPackageReference : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPackageReference >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (Type const&);
-
-        virtual void
-        requiredUUID (Type&);
-
-        virtual void
-        requiredUUID (Type const&);
-
-        virtual void
-        requiredUUID_none (Type&);
-
-        virtual void
-        requiredUUID_none (Type const&);
-
-        virtual void
-        requiredName (Type&);
-
-        virtual void
-        requiredName (Type const&);
-
-        virtual void
-        requiredName_none (Type&);
-
-        virtual void
-        requiredName_none (Type const&);
-
-        virtual void
-        requiredType (Type&);
-
-        virtual void
-        requiredType (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
       struct XSC_XML_Handlers_Export SubcomponentPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >
       {
         virtual void
@@ -5019,6 +5314,43 @@ namespace CIAO
         virtual void
         post (Type const&);
       };
+
+      typedef
+      ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PlanLocalityKind >
+      PlanLocalityKind;
+
+      struct XSC_XML_Handlers_Export PlanLocality : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PlanLocality >
+      {
+        virtual void
+        traverse (Type&);
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void
+        pre (Type&);
+
+        virtual void
+        pre (Type const&);
+
+        virtual void
+        constraint (Type&);
+
+        virtual void
+        constraint (Type const&);
+
+        virtual void
+        constrainedInstance (Type&);
+
+        virtual void
+        constrainedInstance (Type const&);
+
+        virtual void
+        post (Type&);
+
+        virtual void
+        post (Type const&);
+      };
     }
   }
 }
@@ -5031,6 +5363,49 @@ namespace CIAO
   {
     namespace Writer
     {
+      struct IdRef : Traversal::IdRef, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::IdRef Type;
+        IdRef (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+        virtual void 
+        traverse (Type &o)
+        {
+
+          this->traverse (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void 
+        href (Type &o)
+        {
+
+          this->href (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        href (Type const&);
+
+        virtual void 
+        idref (Type &o)
+        {
+
+          this->idref (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        idref (Type const&);
+
+        protected:
+        IdRef ();
+      };
+
       struct TCKind : Traversal::TCKind, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
@@ -5122,15 +5497,26 @@ namespace CIAO
         sequence (Type const&);
 
         virtual void 
-        id (Type &o)
+        alias (Type &o)
         {
 
-          this->id (const_cast <Type const &> (o));
+          this->alias (const_cast <Type const &> (o));
         }
 
 
         virtual void
-        id (Type const&);
+        alias (Type const&);
+
+        virtual void 
+        xmi_id (Type &o)
+        {
+
+          this->xmi_id (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        xmi_id (Type const&);
 
         protected:
         DataType ();
@@ -5583,6 +5969,39 @@ namespace CIAO
         longdouble_post (Type const&);
 
         virtual void 
+        element_pre (Type &o)
+        {
+
+          this->element_pre (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        element_pre (Type const&);
+
+        virtual void 
+        element_next (Type &o)
+        {
+
+          this->element_next (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        element_next (Type const&);
+
+        virtual void 
+        element_post (Type &o)
+        {
+
+          this->element_post (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        element_post (Type const&);
+
+        virtual void 
         member_pre (Type &o)
         {
 
@@ -5619,6 +6038,60 @@ namespace CIAO
         DataValue ();
       };
 
+      struct AliasType : Traversal::AliasType, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::AliasType Type;
+        AliasType (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+        virtual void 
+        traverse (Type &o)
+        {
+
+          this->traverse (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void 
+        name (Type &o)
+        {
+
+          this->name (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        name (Type const&);
+
+        virtual void 
+        typeId (Type &o)
+        {
+
+          this->typeId (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        typeId (Type const&);
+
+        virtual void 
+        elementType (Type &o)
+        {
+
+          this->elementType (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        elementType (Type const&);
+
+        protected:
+        AliasType ();
+      };
+
       struct EnumType : Traversal::EnumType, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
@@ -6676,15 +7149,15 @@ namespace CIAO
         deployedResource_post (Type const&);
 
         virtual void 
-        id (Type &o)
+        xmi_id (Type &o)
         {
 
-          this->id (const_cast <Type const &> (o));
+          this->xmi_id (const_cast <Type const &> (o));
         }
 
 
         virtual void
-        id (Type const&);
+        xmi_id (Type const&);
 
         protected:
         ArtifactDeploymentDescription ();
@@ -6851,15 +7324,15 @@ namespace CIAO
         deployRequirement_post (Type const&);
 
         virtual void 
-        id (Type &o)
+        xmi_id (Type &o)
         {
 
-          this->id (const_cast <Type const &> (o));
+          this->xmi_id (const_cast <Type const &> (o));
         }
 
 
         virtual void
-        id (Type const&);
+        xmi_id (Type const&);
 
         protected:
         MonolithicDeploymentDescription ();
@@ -7109,15 +7582,15 @@ namespace CIAO
         deployedSharedResource (Type const&);
 
         virtual void 
-        id (Type &o)
+        xmi_id (Type &o)
         {
 
-          this->id (const_cast <Type const &> (o));
+          this->xmi_id (const_cast <Type const &> (o));
         }
 
 
         virtual void
-        id (Type const&);
+        xmi_id (Type const&);
 
         protected:
         InstanceDeploymentDescription ();
@@ -7440,6 +7913,61 @@ namespace CIAO
         virtual void
         location (Type const&);
 
+        virtual void 
+        provider (Type &o)
+        {
+
+          this->provider (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        provider (Type const&);
+
+        virtual void 
+        portName (Type &o)
+        {
+
+          this->portName (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        portName (Type const&);
+
+        virtual void 
+        supportedType_pre (Type &o)
+        {
+
+          this->supportedType_pre (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        supportedType_pre (Type const&);
+
+        virtual void 
+        supportedType_next (Type &o)
+        {
+
+          this->supportedType_next (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        supportedType_next (Type const&);
+
+        virtual void 
+        supportedType_post (Type &o)
+        {
+
+          this->supportedType_post (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        supportedType_post (Type const&);
+
         protected:
         ExternalReferenceEndpoint ();
       };
@@ -7978,60 +8506,6 @@ namespace CIAO
         ImplementationRequirement ();
       };
 
-      struct ComponentPackageReference : Traversal::ComponentPackageReference, 
-      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-        typedef ::CIAO::Config_Handlers::ComponentPackageReference Type;
-        ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR >&);
-
-        virtual void 
-        traverse (Type &o)
-        {
-
-          this->traverse (const_cast <Type const &> (o));
-        }
-
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void 
-        requiredUUID (Type &o)
-        {
-
-          this->requiredUUID (const_cast <Type const &> (o));
-        }
-
-
-        virtual void
-        requiredUUID (Type const&);
-
-        virtual void 
-        requiredName (Type &o)
-        {
-
-          this->requiredName (const_cast <Type const &> (o));
-        }
-
-
-        virtual void
-        requiredName (Type const&);
-
-        virtual void 
-        requiredType (Type &o)
-        {
-
-          this->requiredType (const_cast <Type const &> (o));
-        }
-
-
-        virtual void
-        requiredType (Type const&);
-
-        protected:
-        ComponentPackageReference ();
-      };
-
       struct SubcomponentPortEndpoint : Traversal::SubcomponentPortEndpoint, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
@@ -8238,6 +8712,67 @@ namespace CIAO
         protected:
         AssemblyConnectionDescription ();
       };
+
+      struct PlanLocalityKind : Traversal::PlanLocalityKind, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        PlanLocalityKind (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+        virtual void 
+        traverse (Type &o)
+        {
+          this->traverse (const_cast <Type const &> (o));
+        }
+
+        virtual void
+        traverse (Type const&);
+
+        protected:
+        PlanLocalityKind ();
+      };
+
+      struct PlanLocality : Traversal::PlanLocality, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::PlanLocality Type;
+        PlanLocality (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+        virtual void 
+        traverse (Type &o)
+        {
+
+          this->traverse (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void 
+        constraint (Type &o)
+        {
+
+          this->constraint (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        constraint (Type const&);
+
+        virtual void 
+        constrainedInstance (Type &o)
+        {
+
+          this->constrainedInstance (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        constrainedInstance (Type const&);
+
+        protected:
+        PlanLocality ();
+      };
     }
   }
 }
diff --git a/CIAO/tools/Config_Handlers/CCD_Handler.cpp b/CIAO/tools/Config_Handlers/CCD_Handler.cpp
index 3dc3af1a414..871cb5c44f1 100644
--- a/CIAO/tools/Config_Handlers/CCD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/CCD_Handler.cpp
@@ -22,18 +22,18 @@ namespace CIAO
       CIAO_TRACE("CCD_Handler::component_interface_descr");
       if (desc.UUID_p ())
         toconfig.UUID =
-          CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (desc.UUID ().c_str ()));
+          CORBA::string_dup (desc.UUID ().c_str ());
 
       if (desc.label_p ())
         {
           toconfig.label =
-            CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (desc.label ().c_str ()));
+            CORBA::string_dup (desc.label ().c_str ());
         }
 
       if (desc.specificType_p ())
         {
           toconfig.specificType =
-            CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (desc.specificType ().c_str ()));
+            CORBA::string_dup (desc.specificType ().c_str ());
         }
 
       ComponentInterfaceDescription::supportedType_const_iterator
@@ -46,7 +46,7 @@ namespace CIAO
            s != end;
            ++s)
         {
-          toconfig.supportedType[pos++] = ACE_TEXT_ALWAYS_CHAR (s->c_str ());
+          toconfig.supportedType[pos++] = s->c_str ();
         }
 
       ComponentInterfaceDescription::idlFile_const_iterator
@@ -58,7 +58,7 @@ namespace CIAO
            sidl != eidl;
            ++sidl)
         {
-          toconfig.idlFile [pos++] = ACE_TEXT_ALWAYS_CHAR (sidl->c_str ());
+          toconfig.idlFile [pos++] = sidl->c_str ();
         }
 
       ComponentInterfaceDescription::configProperty_const_iterator pend =
@@ -71,7 +71,7 @@ namespace CIAO
            ++pstart)
         {
           Property_Handler::handle_property (*pstart,
-                                             toconfig.configProperty [pos++]);
+                         toconfig.configProperty [pos++]);
         }
 
       pos = 0;
@@ -105,7 +105,7 @@ namespace CIAO
             infoProp++)
         {
           Property_Handler::handle_property (*infoProp,
-                                             toconfig.infoProperty[pos]);
+                         toconfig.infoProperty[pos]);
         }
     }
 
@@ -117,9 +117,9 @@ namespace CIAO
       ComponentInterfaceDescription cid;
 
       //Load up the basic string members
-      XMLSchema::string< ACE_TCHAR > uuid (ACE_TEXT_CHAR_TO_TCHAR (src.UUID.in ()));
-      XMLSchema::string< ACE_TCHAR > label (ACE_TEXT_CHAR_TO_TCHAR (src.label.in ()));
-      XMLSchema::string< ACE_TCHAR > specifict (ACE_TEXT_CHAR_TO_TCHAR (src.specificType.in ()));
+      XMLSchema::string< char > uuid ((src.UUID));
+      XMLSchema::string< char > label ((src.label));
+      XMLSchema::string< char > specifict ((src.specificType));
 
       //Then put them in the CID
       cid.UUID (uuid);
@@ -130,7 +130,7 @@ namespace CIAO
       ::CORBA::ULong total = src.supportedType.length ();
       for (size_t i = 0; i < total; ++i)
         {
-          XMLSchema::string< ACE_TCHAR > curr (ACE_TEXT_CHAR_TO_TCHAR (src.supportedType[i].in ()));
+          XMLSchema::string< char > curr ((src.supportedType[i]));
           cid.add_supportedType (curr);
         }
 
@@ -138,7 +138,7 @@ namespace CIAO
       total = src.idlFile.length ();
       for (size_t j = 0; j < total; ++j)
         {
-          XMLSchema::string< ACE_TCHAR > curr (ACE_TEXT_CHAR_TO_TCHAR (src.idlFile[j].in ()));
+          XMLSchema::string< char > curr ((src.idlFile[j]));
           cid.add_idlFile (curr);
         }
 
diff --git a/CIAO/tools/Config_Handlers/CEPE_Handler.cpp b/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
index 1f74c43e040..4c93545f2c6 100644
--- a/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
@@ -35,7 +35,7 @@ namespace CIAO
                                           ::Deployment::ComponentExternalPortEndpoint &dest)
     {
       CIAO_TRACE("CEOE_Handler::external_port_endpoint");
-      dest.portName = ACE_TEXT_ALWAYS_CHAR (src.portName ().c_str ());
+      dest.portName = src.portName ().c_str ();
     }
 
     ComponentExternalPortEndpoint
@@ -44,8 +44,8 @@ namespace CIAO
     {
       CIAO_TRACE("CEOE_Handler::external_port_endpoint - reverse");
       //MAJO Unfinished
-      XMLSchema::string< ACE_TCHAR > portname (ACE_TEXT_CHAR_TO_TCHAR (src.portName.in ()));
-      return ComponentExternalPortEndpoint (portname);
+      XMLSchema::string< char > portname ((src.portName));
+      return ComponentExternalPortEndpoint  (portname);
     }
   }
 }
diff --git a/CIAO/tools/Config_Handlers/CEPE_Handler.h b/CIAO/tools/Config_Handlers/CEPE_Handler.h
index faa02a58737..b3b0938b8c2 100644
--- a/CIAO/tools/Config_Handlers/CEPE_Handler.h
+++ b/CIAO/tools/Config_Handlers/CEPE_Handler.h
@@ -28,43 +28,39 @@ namespace Deployment
 namespace CIAO
 {
   namespace Config_Handlers
-  {
-    class PlanConnectionDescription;
-    class ComponentExternalPortEndpoint;
+    {
+      class PlanConnectionDescription;
+      class 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 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_Common_Export CEPE_Handler
+      class Config_Handlers_Common_Export CEPE_Handler
     {
     public:
-      static void external_port_endpoints (
-          const PlanConnectionDescription &src,
-          ::Deployment::ComponentExternalPortEndpoints &dest);
+      static void external_port_endpoints (const PlanConnectionDescription &src,
+                           ::Deployment::ComponentExternalPortEndpoints &dest);
 
       static ComponentExternalPortEndpoint
-      external_port_endpoint (
-          const ::Deployment::ComponentExternalPortEndpoint &src);
+        external_port_endpoint (const ::Deployment::ComponentExternalPortEndpoint &src);
 
-      static void handle_external_port_endpoint (
-          const ComponentExternalPortEndpoint &src,
-          ::Deployment::ComponentExternalPortEndpoint &dest);
+      static void handle_external_port_endpoint (const ComponentExternalPortEndpoint &src,
+                             ::Deployment::ComponentExternalPortEndpoint &dest);
     };
 
-    typedef Sequence_Handler < ComponentExternalPortEndpoint,
-                               ::Deployment::ComponentExternalPortEndpoints,
-                               ::Deployment::ComponentExternalPortEndpoint,
-                               CEPE_Handler::handle_external_port_endpoint >
-      CEPE_Functor;
-  }
+      typedef Sequence_Handler < ComponentExternalPortEndpoint,
+    ::Deployment::ComponentExternalPortEndpoints,
+    ::Deployment::ComponentExternalPortEndpoint,
+    CEPE_Handler::handle_external_port_endpoint > CEPE_Functor;
+    }
 }
 
 #include /**/ "ace/post.h"
diff --git a/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp b/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp
index 628d8d11622..a31c183415d 100644
--- a/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp
+++ b/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp
@@ -976,10 +976,10 @@ namespace CIAO
     {
       ::std::basic_string< ACE_TCHAR > v (e.value ());
 
-      if (v == ACE_TEXT ("EC")) v_ = EC_l;
-      else if (v == ACE_TEXT ("RTEC")) v_ = RTEC_l;
-      else if (v == ACE_TEXT ("NOTIFY")) v_ = NOTIFY_l;
-      else if (v == ACE_TEXT ("RTNOTIFY")) v_ = RTNOTIFY_l;
+      if (v == "EC") v_ = EC_l;
+      else if (v == "RTEC") v_ = RTEC_l;
+      else if (v == "NOTIFY") v_ = NOTIFY_l;
+      else if (v == "RTNOTIFY") v_ = RTNOTIFY_l;
       else 
       {
       }
@@ -991,10 +991,10 @@ namespace CIAO
     {
       ::std::basic_string< ACE_TCHAR > v (a.value ());
 
-      if (v == ACE_TEXT ("EC")) v_ = EC_l;
-      else if (v == ACE_TEXT ("RTEC")) v_ = RTEC_l;
-      else if (v == ACE_TEXT ("NOTIFY")) v_ = NOTIFY_l;
-      else if (v == ACE_TEXT ("RTNOTIFY")) v_ = RTNOTIFY_l;
+      if (v == "EC") v_ = EC_l;
+      else if (v == "RTEC") v_ = RTEC_l;
+      else if (v == "NOTIFY") v_ = NOTIFY_l;
+      else if (v == "RTNOTIFY") v_ = RTNOTIFY_l;
       else 
       {
       }
@@ -1020,7 +1020,7 @@ 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 ("eventServiceConfiguration"))
+        if (n == "eventServiceConfiguration")
         {
           ::CIAO::Config_Handlers::EventServiceDescription t (e);
           add_eventServiceConfiguration (t);
@@ -1035,7 +1035,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);
@@ -1062,49 +1062,49 @@ 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 ("node"))
+        else if (n == "node")
         {
           node_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           node_->container (this);
         }
 
-        else if (n == ACE_TEXT ("type"))
+        else if (n == "type")
         {
           type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::EventServiceType > (new ::CIAO::Config_Handlers::EventServiceType (e));
           type_->container (this);
         }
 
-        else if (n == ACE_TEXT ("svc_cfg_file"))
+        else if (n == "svc_cfg_file")
         {
           svc_cfg_file_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           svc_cfg_file_->container (this);
         }
 
-        else if (n == ACE_TEXT ("filter"))
+        else if (n == "filter")
         {
           ::CIAO::Config_Handlers::Filter t (e);
           add_filter (t);
         }
 
-        else if (n == ACE_TEXT ("addr_serv"))
+        else if (n == "addr_serv")
         {
           ::CIAO::Config_Handlers::AddressServerDescription t (e);
           add_addr_serv (t);
         }
 
-        else if (n == ACE_TEXT ("udp_sender"))
+        else if (n == "udp_sender")
         {
           ::CIAO::Config_Handlers::UDPSenderDescription t (e);
           add_udp_sender (t);
         }
 
-        else if (n == ACE_TEXT ("udp_receiver"))
+        else if (n == "udp_receiver")
         {
           ::CIAO::Config_Handlers::UDPReceiverDescription t (e);
           add_udp_receiver (t);
@@ -1119,7 +1119,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);
@@ -1140,10 +1140,10 @@ namespace CIAO
     {
       ::std::basic_string< ACE_TCHAR > v (e.value ());
 
-      if (v == ACE_TEXT ("CONJUNCTION")) v_ = CONJUNCTION_l;
-      else if (v == ACE_TEXT ("DISJUNCTION")) v_ = DISJUNCTION_l;
-      else if (v == ACE_TEXT ("LOGICAL_AND")) v_ = LOGICAL_AND_l;
-      else if (v == ACE_TEXT ("NEGATE")) v_ = NEGATE_l;
+      if (v == "CONJUNCTION") v_ = CONJUNCTION_l;
+      else if (v == "DISJUNCTION") v_ = DISJUNCTION_l;
+      else if (v == "LOGICAL_AND") v_ = LOGICAL_AND_l;
+      else if (v == "NEGATE") v_ = NEGATE_l;
       else 
       {
       }
@@ -1155,10 +1155,10 @@ namespace CIAO
     {
       ::std::basic_string< ACE_TCHAR > v (a.value ());
 
-      if (v == ACE_TEXT ("CONJUNCTION")) v_ = CONJUNCTION_l;
-      else if (v == ACE_TEXT ("DISJUNCTION")) v_ = DISJUNCTION_l;
-      else if (v == ACE_TEXT ("LOGICAL_AND")) v_ = LOGICAL_AND_l;
-      else if (v == ACE_TEXT ("NEGATE")) v_ = NEGATE_l;
+      if (v == "CONJUNCTION") v_ = CONJUNCTION_l;
+      else if (v == "DISJUNCTION") v_ = DISJUNCTION_l;
+      else if (v == "LOGICAL_AND") v_ = LOGICAL_AND_l;
+      else if (v == "NEGATE") v_ = NEGATE_l;
       else 
       {
       }
@@ -1184,19 +1184,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 ("type"))
+        else if (n == "type")
         {
           type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::FilterType > (new ::CIAO::Config_Handlers::FilterType (e));
           type_->container (this);
         }
 
-        else if (n == ACE_TEXT ("source"))
+        else if (n == "source")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           add_source (t);
@@ -1211,7 +1211,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);
@@ -1238,19 +1238,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 ("port"))
+        else if (n == "port")
         {
           port_ = ::std::auto_ptr< ::XMLSchema::unsignedShort > (new ::XMLSchema::unsignedShort (e));
           port_->container (this);
         }
 
-        else if (n == ACE_TEXT ("address"))
+        else if (n == "address")
         {
           address_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           address_->container (this);
@@ -1277,13 +1277,13 @@ 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 ("addr_serv_id"))
+        else if (n == "addr_serv_id")
         {
           addr_serv_id_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           addr_serv_id_->container (this);
@@ -1310,25 +1310,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 ("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 ("addr_serv_id"))
+        else if (n == "addr_serv_id")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           addr_serv_id (t);
         }
 
-        else if (n == ACE_TEXT ("is_multicast"))
+        else if (n == "is_multicast")
         {
           is_multicast_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
           is_multicast_->container (this);
         }
 
-        else if (n == ACE_TEXT ("listen_port"))
+        else if (n == "listen_port")
         {
           listen_port_ = ::std::auto_ptr< ::XMLSchema::unsignedShort > (new ::XMLSchema::unsignedShort (e));
           listen_port_->container (this);
@@ -1350,7 +1350,7 @@ namespace CIAO
     CIAOEvents (xercesc::DOMDocument const* d)
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-      if (e.name () == ACE_TEXT ("CIAOEvents"))
+      if (e.name () == "CIAOEvents")
       {
         ::CIAO::Config_Handlers::CIAOEventsDef r (e);
         return r;
@@ -2542,10 +2542,10 @@ namespace CIAO
       {
         ::std::basic_string< ACE_TCHAR > s;
 
-        if (o == ::CIAO::Config_Handlers::EventServiceType::EC) s = ACE_TEXT ("EC");
-        else if (o == ::CIAO::Config_Handlers::EventServiceType::RTEC) s = ACE_TEXT ("RTEC");
-        else if (o == ::CIAO::Config_Handlers::EventServiceType::NOTIFY) s = ACE_TEXT ("NOTIFY");
-        else if (o == ::CIAO::Config_Handlers::EventServiceType::RTNOTIFY) s = ACE_TEXT ("RTNOTIFY");
+        if (o == ::CIAO::Config_Handlers::EventServiceType::EC) s = "EC";
+        else if (o == ::CIAO::Config_Handlers::EventServiceType::RTEC) s = "RTEC";
+        else if (o == ::CIAO::Config_Handlers::EventServiceType::NOTIFY) s = "NOTIFY";
+        else if (o == ::CIAO::Config_Handlers::EventServiceType::RTNOTIFY) s = "RTNOTIFY";
         else 
         {
         }
@@ -2585,7 +2585,7 @@ namespace CIAO
       void CIAOEventsDef::
       eventServiceConfiguration_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("eventServiceConfiguration"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("eventServiceConfiguration", top_ ()));
       }
 
       void CIAOEventsDef::
@@ -2604,7 +2604,7 @@ namespace CIAO
       void CIAOEventsDef::
       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::CIAOEventsDef::id (o);
         attr_ (0);
@@ -2634,7 +2634,7 @@ namespace CIAO
       void EventServiceDescription::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::EventServiceDescription::name (o);
         pop_ ();
       }
@@ -2642,7 +2642,7 @@ namespace CIAO
       void EventServiceDescription::
       node (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("node"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
         Traversal::EventServiceDescription::node (o);
         pop_ ();
       }
@@ -2650,7 +2650,7 @@ namespace CIAO
       void EventServiceDescription::
       type (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("type"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
         Traversal::EventServiceDescription::type (o);
         pop_ ();
       }
@@ -2658,7 +2658,7 @@ namespace CIAO
       void EventServiceDescription::
       svc_cfg_file (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("svc_cfg_file"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("svc_cfg_file", top_ ()));
         Traversal::EventServiceDescription::svc_cfg_file (o);
         pop_ ();
       }
@@ -2666,7 +2666,7 @@ namespace CIAO
       void EventServiceDescription::
       filter_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("filter"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("filter", top_ ()));
       }
 
       void EventServiceDescription::
@@ -2685,7 +2685,7 @@ namespace CIAO
       void EventServiceDescription::
       addr_serv_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("addr_serv"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("addr_serv", top_ ()));
       }
 
       void EventServiceDescription::
@@ -2704,7 +2704,7 @@ namespace CIAO
       void EventServiceDescription::
       udp_sender_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("udp_sender"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("udp_sender", top_ ()));
       }
 
       void EventServiceDescription::
@@ -2723,7 +2723,7 @@ namespace CIAO
       void EventServiceDescription::
       udp_receiver_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("udp_receiver"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("udp_receiver", top_ ()));
       }
 
       void EventServiceDescription::
@@ -2742,7 +2742,7 @@ namespace CIAO
       void EventServiceDescription::
       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::EventServiceDescription::id (o);
         attr_ (0);
@@ -2768,10 +2768,10 @@ namespace CIAO
       {
         ::std::basic_string< ACE_TCHAR > s;
 
-        if (o == ::CIAO::Config_Handlers::FilterType::CONJUNCTION) s = ACE_TEXT ("CONJUNCTION");
-        else if (o == ::CIAO::Config_Handlers::FilterType::DISJUNCTION) s = ACE_TEXT ("DISJUNCTION");
-        else if (o == ::CIAO::Config_Handlers::FilterType::LOGICAL_AND) s = ACE_TEXT ("LOGICAL_AND");
-        else if (o == ::CIAO::Config_Handlers::FilterType::NEGATE) s = ACE_TEXT ("NEGATE");
+        if (o == ::CIAO::Config_Handlers::FilterType::CONJUNCTION) s = "CONJUNCTION";
+        else if (o == ::CIAO::Config_Handlers::FilterType::DISJUNCTION) s = "DISJUNCTION";
+        else if (o == ::CIAO::Config_Handlers::FilterType::LOGICAL_AND) s = "LOGICAL_AND";
+        else if (o == ::CIAO::Config_Handlers::FilterType::NEGATE) s = "NEGATE";
         else 
         {
         }
@@ -2811,7 +2811,7 @@ namespace CIAO
       void Filter::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::Filter::name (o);
         pop_ ();
       }
@@ -2819,7 +2819,7 @@ namespace CIAO
       void Filter::
       type (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("type"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
         Traversal::Filter::type (o);
         pop_ ();
       }
@@ -2827,7 +2827,7 @@ namespace CIAO
       void Filter::
       source_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("source"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
       }
 
       void Filter::
@@ -2846,7 +2846,7 @@ namespace CIAO
       void Filter::
       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::Filter::id (o);
         attr_ (0);
@@ -2876,7 +2876,7 @@ namespace CIAO
       void AddressServerDescription::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::AddressServerDescription::name (o);
         pop_ ();
       }
@@ -2884,7 +2884,7 @@ namespace CIAO
       void AddressServerDescription::
       port (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("port"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("port", top_ ()));
         Traversal::AddressServerDescription::port (o);
         pop_ ();
       }
@@ -2892,7 +2892,7 @@ namespace CIAO
       void AddressServerDescription::
       address (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("address"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("address", top_ ()));
         Traversal::AddressServerDescription::address (o);
         pop_ ();
       }
@@ -2921,7 +2921,7 @@ namespace CIAO
       void UDPSenderDescription::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::UDPSenderDescription::name (o);
         pop_ ();
       }
@@ -2929,7 +2929,7 @@ namespace CIAO
       void UDPSenderDescription::
       addr_serv_id (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("addr_serv_id"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("addr_serv_id", top_ ()));
         Traversal::UDPSenderDescription::addr_serv_id (o);
         pop_ ();
       }
@@ -2958,7 +2958,7 @@ namespace CIAO
       void UDPReceiverDescription::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::UDPReceiverDescription::name (o);
         pop_ ();
       }
@@ -2966,7 +2966,7 @@ namespace CIAO
       void UDPReceiverDescription::
       addr_serv_id (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("addr_serv_id"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("addr_serv_id", top_ ()));
         Traversal::UDPReceiverDescription::addr_serv_id (o);
         pop_ ();
       }
@@ -2974,7 +2974,7 @@ namespace CIAO
       void UDPReceiverDescription::
       is_multicast (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("is_multicast"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("is_multicast", top_ ()));
         Traversal::UDPReceiverDescription::is_multicast (o);
         pop_ ();
       }
@@ -2982,7 +2982,7 @@ namespace CIAO
       void UDPReceiverDescription::
       listen_port (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("listen_port"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("listen_port", top_ ()));
         Traversal::UDPReceiverDescription::listen_port (o);
         pop_ ();
       }
@@ -2998,7 +2998,7 @@ namespace CIAO
     CIAOEvents (::CIAO::Config_Handlers::CIAOEventsDef const& s, xercesc::DOMDocument* d)
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-      if (e.name () != ACE_TEXT ("CIAOEvents"))
+      if (e.name () != "CIAOEvents")
       {
         throw 1;
       }
diff --git a/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp b/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp
index d264b0c7ceb..75fad29366e 100644
--- a/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp
@@ -56,8 +56,8 @@ namespace CIAO
       {
            CIAO::DAnCE::EventServiceDeploymentDescription a_esd;
 
-           a_esd.name = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (i->name ().c_str ()));
-           a_esd.node = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (i->node ().c_str ()));
+           a_esd.name = CORBA::string_dup (i->name ().c_str ());
+           a_esd.node = CORBA::string_dup (i->node ().c_str ());
 
            switch (i->type ().integral ())
            {
@@ -79,7 +79,7 @@ namespace CIAO
              return false;
            }
 
-           a_esd.svc_cfg_file = CORBA::string_dup  (ACE_TEXT_ALWAYS_CHAR (i->svc_cfg_file ().c_str ()));
+           a_esd.svc_cfg_file = CORBA::string_dup  (i->svc_cfg_file ().c_str ());
 
 
            // Populate filtering information for this event channel
@@ -89,7 +89,7 @@ namespace CIAO
                 j != i->end_filter ();
                 j++)
            {
-              a_esd.filters[pos_j].name = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (j->name ().c_str ()));
+              a_esd.filters[pos_j].name = CORBA::string_dup (j->name ().c_str ());
               switch (j->type ().integral ())
               {
                   case ::CIAO::Config_Handlers::FilterType::CONJUNCTION_l:
@@ -116,7 +116,7 @@ namespace CIAO
                     k != j->end_source ();
                     k++)
                {
-                 a_esd.filters[pos_j].sources[pos_k] = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (k->c_str ()));
+                 a_esd.filters[pos_j].sources[pos_k] = CORBA::string_dup (k->c_str ());
                  pos_k++;
 
                }
@@ -130,9 +130,9 @@ namespace CIAO
                 j != i->end_addr_serv ();
                 j++)
            {
-              a_esd.addr_servs[pos_j].name = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (j->name ().c_str ()));
+              a_esd.addr_servs[pos_j].name = CORBA::string_dup (j->name ().c_str ());
               a_esd.addr_servs[pos_j].port = j->port ();
-              a_esd.addr_servs[pos_j].address = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (j->address ().c_str ()));
+              a_esd.addr_servs[pos_j].address = CORBA::string_dup (j->address ().c_str ());
               pos_j++;
             }
 
@@ -143,9 +143,9 @@ namespace CIAO
                 j != i->end_udp_sender ();
                 j++)
            {
-              a_esd.senders[pos_j].name = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (j->name ().c_str ()));
+              a_esd.senders[pos_j].name = CORBA::string_dup (j->name ().c_str ());
               a_esd.senders[pos_j].addr_serv_id = 
-                CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (j->addr_serv_id ().c_str ()));
+                CORBA::string_dup (j->addr_serv_id ().c_str ());
               pos_j++;
             }
 
@@ -156,9 +156,9 @@ namespace CIAO
                 j != i->end_udp_receiver ();
                 j++)
            {
-              a_esd.receivers[pos_j].name = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (j->name ().c_str ()));
+              a_esd.receivers[pos_j].name = CORBA::string_dup (j->name ().c_str ());
               a_esd.receivers[pos_j].addr_serv_id = 
-                CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (j->addr_serv_id ().c_str ()));
+                CORBA::string_dup (j->addr_serv_id ().c_str ());
               a_esd.receivers[pos_j].is_multicast = j->is_multicast ();
               a_esd.receivers[pos_j].listen_port = j->listen_port ();
               pos_j++;
@@ -170,25 +170,26 @@ namespace CIAO
       return true;
     }
 
+
     ::CIAO::DAnCE::EventServiceDeploymentDescriptions const *
-    CIAOEvents_Handler::esd_idl () const
-    {
-      if(!this->idl_esd_.get())
-        throw NoESD ();
+        CIAOEvents_Handler::esd_idl () const
+      {
+        if(!this->idl_esd_.get())
+          throw NoESD ();
 
-      //else
-      return this->idl_esd_.get();
-    }
+         //else
+        return this->idl_esd_.get();
+      }
 
     ::CIAO::DAnCE::EventServiceDeploymentDescriptions *
-    CIAOEvents_Handler::esd_idl ()
-    {
-      if(!this->idl_esd_.get())
-        throw NoESD();
+        CIAOEvents_Handler::esd_idl ()
+      {
+        if(!this->idl_esd_.get())
+          throw NoESD();
 
-      //else
-      return this->idl_esd_.release();
-    }
-  }
+        //else
+        return this->idl_esd_.release();
+      }
+   }
 }
 
diff --git a/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h b/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h
index 98e71009a8e..f977808bc5a 100644
--- a/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h
+++ b/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h
@@ -52,7 +52,7 @@ namespace CIAO
       ~CIAOEvents_Handler (void);
 
       CIAO::DAnCE::EventServiceDeploymentDescriptions const *esd_idl (void) const;
-
+        
       CIAO::DAnCE::EventServiceDeploymentDescriptions *esd_idl (void);
 
     private:
diff --git a/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc b/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc
index f481a556670..691d5b9a222 100644
--- a/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc
+++ b/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc
@@ -1,7 +1,7 @@
 //$Id$
 
 project (CIAO_Events_XML_Generation) : xscdefaults {
-   requires += xsc
+   requires += xsc dummy_label
 
    xscflags += --cxx-banner-file $(CIAO_ROOT)/docs/schema/xsc-banner.cpp
    xscflags += --cxx-header-banner-file $(CIAO_ROOT)/docs/schema/xsc-banner.h
@@ -9,7 +9,7 @@ project (CIAO_Events_XML_Generation) : xscdefaults {
    xscflags += --cxx-namespace-regex  <%quote%>%.*vanderbilt.*%CIAO/Config_Handlers%<%quote%>
    xscflags += --cxx-export-header CIAO_Events_Handlers_Export.h
    xscflags += --search-path "$(CIAO_ROOT)/docs/schema"
-
+   
    custom_only = 1
 
    XSC_Files {
@@ -18,13 +18,13 @@ project (CIAO_Events_XML_Generation) : xscdefaults {
    }
 }
 
-project (CIAO_Events_Handlers) : acelib, ace_output, ciao_config_handlers_base, ciao_events_dnc, ciao_deployment_stub {
+project (CIAO_Events_Handlers) : acelib, ciao_config_handlers_base, ciao_events_dnc, dance_deployment_stub {
   sharedname = CIAO_Events_Handlers
   dynamicflags   = CIAO_EVENTS_HANDLERS_BUILD_DLL
   macros   += XML_USE_PTHREADS
   includes += $(CIAO_ROOT)/tools/Config_Handlers
-
-  after += CIAO_Events_XML_Generation
+  requires += dummy_label
+  after += CIAO_Events_XML_Generation 
   Source_Files {
     CIAOEvents.cpp
     CIAOEvents_Handler.cpp
@@ -34,13 +34,13 @@ project (CIAO_Events_Handlers) : acelib, ace_output, ciao_config_handlers_base,
   }
 }
 
-project (CIAO_Events_Handlers_Tests) : ciao_config_handlers_base, ciao_server_dnc {
+project (CIAO_Events_Handlers_Tests) : ciao_config_handlers_base, ccm_stub {
   exename = test
   after    += CIAO_Events_Handlers
   macros   += XML_USE_PTHREADS
   includes += $(CIAO_ROOT)/tools/Config_Handlers
   libs     += CIAO_Events_Handlers
-
+  requires += dummy_label
   Source_Files {
     test.cpp
   }
diff --git a/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers_Export.h b/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers_Export.h
index 9054890bfa7..efe95849905 100644
--- a/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers_Export.h
+++ b/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers_Export.h
@@ -2,17 +2,13 @@
 // -*- C++ -*-
 // $Id$
 // Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CIAO_Events_Handlers
+// This file is generated automatically by generate_export_file.pl -n CIAO_Events_Handlers
 // ------------------------------
 #ifndef CIAO_EVENTS_HANDLERS_EXPORT_H
 #define CIAO_EVENTS_HANDLERS_EXPORT_H
 
 #include "ace/config-all.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAO_EVENTS_HANDLERS_HAS_DLL)
-#  define CIAO_EVENTS_HANDLERS_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CIAO_EVENTS_HANDLERS_HAS_DLL */
-
 #if !defined (CIAO_EVENTS_HANDLERS_HAS_DLL)
 #  define CIAO_EVENTS_HANDLERS_HAS_DLL 1
 #endif /* ! CIAO_EVENTS_HANDLERS_HAS_DLL */
diff --git a/CIAO/tools/Config_Handlers/CIAO_Events/test.cpp b/CIAO/tools/Config_Handlers/CIAO_Events/test.cpp
index 1e47ce1c4df..362a47c3b22 100644
--- a/CIAO/tools/Config_Handlers/CIAO_Events/test.cpp
+++ b/CIAO/tools/Config_Handlers/CIAO_Events/test.cpp
@@ -9,12 +9,13 @@
 #include "ace/Get_Opt.h"
 #include "tao/ORB.h"
 
-static const ACE_TCHAR *input_file = ACE_TEXT ("test.ced");
+static const char *input_file = "test.ced";
+
 
 static int
-parse_args (int argc, ACE_TCHAR *argv[])
+parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("i:"));
+  ACE_Get_Opt get_opts (argc, argv, "i:");
 
   int c;
 
@@ -45,7 +46,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   if (parse_args (argc, argv) != 0)
     return 1;
 
-  CIAOEvents_Handler event_handler (ACE_TEXT_ALWAYS_CHAR (input_file));
+  CIAOEvents_Handler event_handler (input_file);
   // Convert XSC to idl datatype
 
   std::cout << "Instance document import succeeded.  Dumping contents to file\n";
diff --git a/CIAO/tools/Config_Handlers/CPD_Handler.cpp b/CIAO/tools/Config_Handlers/CPD_Handler.cpp
index dbbf4b7f58a..97a9e50ae23 100644
--- a/CIAO/tools/Config_Handlers/CPD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/CPD_Handler.cpp
@@ -16,11 +16,11 @@ namespace CIAO
     {
       CIAO_TRACE("CPD_Handler::component_port_description");
       toconfig.name =
-        ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ());
+        desc.name ().c_str ();
 
       if (desc.specificType_p ())
         toconfig.specificType =
-          ACE_TEXT_ALWAYS_CHAR (desc.specificType ().c_str ());
+          desc.specificType ().c_str ();
 
       toconfig.supportedType.length (desc.count_supportedType ());
       std::for_each (desc.begin_supportedType (),
@@ -72,13 +72,13 @@ namespace CIAO
                                              const Deployment::ComponentPortDescription& src)
     {
       CIAO_TRACE("CPD_Handler::component_port_description - reverse");
-      ::XMLSchema::string< ACE_TCHAR > name (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()));
-      ::XMLSchema::string< char > stype (src.specificType);
+      ::XMLSchema::string< char > name ((src.name));
+      ::XMLSchema::string< char > stype ((src.specificType));
 
       ::XMLSchema::string< char > tval ("true");
       ::XMLSchema::string< char > fval ("false");
       XMLSchema::boolean provider;
-      XMLSchema::boolean exclusiveProvider;
+      XMLSchema::boolean  exclusiveProvider;
       XMLSchema::boolean exclusiveUser;
       XMLSchema::boolean optional;
 
@@ -141,8 +141,7 @@ namespace CIAO
         }
 
       for (CORBA::ULong i = 0; i < src.supportedType.length (); ++i)
-        cpd.add_supportedType (
-          XMLSchema::string< ACE_TCHAR > (ACE_TEXT_CHAR_TO_TCHAR (src.supportedType[i].in ())));
+        cpd.add_supportedType (XMLSchema::string< char > ((src.supportedType[i])));
 
       return cpd;
     }
diff --git a/CIAO/tools/Config_Handlers/CPD_Handler.h b/CIAO/tools/Config_Handlers/CPD_Handler.h
index 0bd645eb07d..445d2c5f329 100644
--- a/CIAO/tools/Config_Handlers/CPD_Handler.h
+++ b/CIAO/tools/Config_Handlers/CPD_Handler.h
@@ -29,39 +29,39 @@ namespace Deployment
 namespace CIAO
 {
   namespace Config_Handlers
-  {
-    class ComponentPortDescription;
-    /*
-     * @class CPD_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 ComponentPortDescription;
+      /*
+       * @class CPD_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_Common_Export CPD_Handler
+      class Config_Handlers_Common_Export CPD_Handler
     {
+
     public:
       /// Maps the values from the XSC object
       /// <ComponentInterfaceDescription> to the CORBA IDL type
       /// <Deployment::ComponentInterfaceDescription>.
-      static void handle_component_port_description (
-          const ComponentPortDescription &desc,
-          ::Deployment::ComponentPortDescription &toconfig);
+      static void handle_component_port_description (const ComponentPortDescription &desc,
+                             ::Deployment::ComponentPortDescription &toconfig);
 
       static ComponentPortDescription
-      component_port_description (
-          const Deployment::ComponentPortDescription& src);
+        component_port_description (const Deployment::ComponentPortDescription& src);
     };
 
-    typedef Sequence_Handler < ComponentPortDescription,
-                               ::Deployment::ComponentPortDescriptions,
-                               ::Deployment::ComponentPortDescription,
-                               CPD_Handler::handle_component_port_description >
-      CPD_Functor;
-  }
+      typedef Sequence_Handler < ComponentPortDescription,
+                 ::Deployment::ComponentPortDescriptions,
+                 ::Deployment::ComponentPortDescription,
+                 CPD_Handler::handle_component_port_description > CPD_Functor;
+
+    }
 }
 
 #include /**/ "ace/post.h"
diff --git a/CIAO/tools/Config_Handlers/CRDD_Handler.cpp b/CIAO/tools/Config_Handlers/CRDD_Handler.cpp
index 608e9cb1b31..87d1b6511e5 100644
--- a/CIAO/tools/Config_Handlers/CRDD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/CRDD_Handler.cpp
@@ -29,9 +29,9 @@ namespace CIAO
     {
       CIAO_TRACE("CRDD_Handler::get_ConnectionResourceDD");
 
-      toconfig.targetName = ACE_TEXT_ALWAYS_CHAR (desc.targetName ().c_str ());
-      toconfig.requirementName = ACE_TEXT_ALWAYS_CHAR (desc.requirementName ().c_str ());
-      toconfig.resourceName = ACE_TEXT_ALWAYS_CHAR (desc.resourceName ().c_str ());
+      toconfig.targetName = desc.targetName ().c_str ();
+      toconfig.requirementName = desc.requirementName ().c_str ();
+      toconfig.resourceName = desc.resourceName ().c_str ();
 
       std::for_each (desc.begin_property (),
                      desc.end_property (),
@@ -43,9 +43,9 @@ namespace CIAO
                                                  const ::Deployment::ConnectionResourceDeploymentDescription& src)
     {
       CIAO_TRACE("CRDD_Handler::get_ConnectionResourceDeploymentDescription- reverse");
-      XMLSchema::string< ACE_TCHAR > tname (ACE_TEXT_CHAR_TO_TCHAR (src.targetName.in ()));
-      XMLSchema::string< ACE_TCHAR > reqname (ACE_TEXT_CHAR_TO_TCHAR (src.requirementName.in ()));
-      XMLSchema::string <ACE_TCHAR> resname (ACE_TEXT_CHAR_TO_TCHAR (src.resourceName.in ()));
+      XMLSchema::string< ACE_TCHAR > tname ((src.targetName));
+      XMLSchema::string< ACE_TCHAR > reqname ((src.requirementName));
+      XMLSchema::string <ACE_TCHAR> resname ((src.resourceName));
 
       ConnectionResourceDeploymentDescription crdd (tname,
                                                     reqname,
diff --git a/CIAO/tools/Config_Handlers/Common.h b/CIAO/tools/Config_Handlers/Common.h
index 6057cbb74be..0bf07d58ba2 100644
--- a/CIAO/tools/Config_Handlers/Common.h
+++ b/CIAO/tools/Config_Handlers/Common.h
@@ -1,40 +1,45 @@
 // $Id$
 /**
-* @file Common.h
-* @author Will Otte <wotte@dre.vanderbilt.edu>
-*
-* Some common definitions for all config_handlers.
-*/
+ * @file Common.h
+ * @author Will Otte <wotte@dre.vanderbilt.edu>
+ *
+ * Some common definitions for all config_handlers.
+ */
 #ifndef CONFIG_HANDLERS_COMMON_H
 #define CONFIG_HANDLERS_COMMON_H
 #include <string>
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-/**
-* @class Config_Error
-* @brief Exception to communicate a config_handlers error
-*/
-class Config_Error
-{
-public:
-Config_Error (const std::string &name,
-const std::string &error) :
-name_ (name),
-error_ (error)
-{};
+  namespace Config_Handlers
+  {
+    /**
+     * @class Config_Error
+     * @brief Exception to communicate a config_handlers error
+     */
+    class Config_Error
+    {
+    public:
+      Config_Error (const std::string &name,
+                    const std::string &error) :
+        name_ (name),
+        error_ (error)
+      {};
+      
+      void add_name (const std::string &name)
+      {
+        name_ = name + ':' + name_;
+      }
 
-/// Some identifying information about the element that
-/// caused the error
-std::string name_;
+      /// Some identifying information about the element that
+      /// caused the error
+      std::string name_;
 
-/// A human readable error message
-std::string error_;
+      /// A human readable error message
+      std::string error_;
 
-};
-}
+    };
+  }
 }
 #endif /* CONFIG_HANDLERS_COMMON_H */
 
diff --git a/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp b/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
index 40548fae71c..d916bf8076f 100644
--- a/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
@@ -14,7 +14,7 @@ namespace CIAO
                                                                           ::Deployment::ComponentPropertyDescription& toconfig)
     {
       CIAO_TRACE("ComponentPropertyDescription_Handler::component_property_description");
-      toconfig.name = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ()));
+      toconfig.name = CORBA::string_dup (desc.name ().c_str ());
 
       // Delegate the DataType to the
       // DataType_Handler.
@@ -31,7 +31,7 @@ namespace CIAO
                                                                           const ::Deployment::ComponentPropertyDescription &src)
     {
       CIAO_TRACE("ComponentPropertyDescription_Handler::component_property_description - reverse");
-      XMLSchema::string< ACE_TCHAR > name (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()));
+      XMLSchema::string< char > name ((src.name));
       DataType dt (DataType_Handler::data_type (src.type));
       ComponentPropertyDescription cpd (name,dt);
       return cpd;
diff --git a/CIAO/tools/Config_Handlers/Config_Handlers.mpc b/CIAO/tools/Config_Handlers/Config_Handlers.mpc
index d068b1665f1..c5a30b682ff 100644
--- a/CIAO/tools/Config_Handlers/Config_Handlers.mpc
+++ b/CIAO/tools/Config_Handlers/Config_Handlers.mpc
@@ -1,43 +1,45 @@
 //$Id$
 
 project (XSC_XML_Generation) : xscdefaults {
-   requires += xsc
-
-   xscflags += --cxx-banner-file $(CIAO_ROOT)/docs/schema/xsc-banner.cpp
-   xscflags += --cxx-header-banner-file $(CIAO_ROOT)/docs/schema/xsc-banner.h
-   xscflags += --cxx-export-symbol XSC_XML_Handlers_Export
-   xscflags += --cxx-namespace-regex  <%quote%>%.*Deployment.*%CIAO/Config_Handlers%<%quote%>
-   xscflags += --cxx-export-header XSC_XML_Handlers_Export.h
-   xscflags += --search-path "$(CIAO_ROOT)/docs/schema"
-
-   custom_only = 1
-
-   XSC_Files {
-        gendir = .
-        $(CIAO_ROOT)/docs/schema/Basic_Deployment_Data.xsd
-        $(CIAO_ROOT)/docs/schema/Deployment.xsd
-        $(CIAO_ROOT)/docs/schema/ccd.xsd
-        $(CIAO_ROOT)/docs/schema/cdd.xsd
-        $(CIAO_ROOT)/docs/schema/cdp.xsd
-        $(CIAO_ROOT)/docs/schema/cid.xsd
-        $(CIAO_ROOT)/docs/schema/cpd.xsd
-        $(CIAO_ROOT)/docs/schema/iad.xsd
-        $(CIAO_ROOT)/docs/schema/pcd.xsd
-        $(CIAO_ROOT)/docs/schema/toplevel.xsd
-   }
-
-   Source_Files {
-   }
+  requires += xsc
+
+  xscflags += --cxx-banner-file $(CIAO_ROOT)/docs/schema/xsc-banner.cpp
+  xscflags += --cxx-header-banner-file $(CIAO_ROOT)/docs/schema/xsc-banner.h
+  xscflags += --cxx-export-symbol XSC_XML_Handlers_Export
+  xscflags += --cxx-namespace-regex  "%.*Deployment.*%CIAO/Config_Handlers%" //<%quote%>
+  xscflags += --cxx-export-header XSC_XML_Handlers_Export.h
+  xscflags += --search-path "$(CIAO_ROOT)/docs/schema"
+  
+  custom_only = 1
+
+  XSC_Files {
+    gendir = .
+    $(CIAO_ROOT)/docs/schema/Basic_Deployment_Data.xsd
+    $(CIAO_ROOT)/docs/schema/Deployment.xsd
+    $(CIAO_ROOT)/docs/schema/XMI.xsd
+    $(CIAO_ROOT)/docs/schema/ccd.xsd
+    $(CIAO_ROOT)/docs/schema/cdd.xsd
+    $(CIAO_ROOT)/docs/schema/cdp.xsd
+    $(CIAO_ROOT)/docs/schema/cid.xsd
+    $(CIAO_ROOT)/docs/schema/cpd.xsd
+    $(CIAO_ROOT)/docs/schema/iad.xsd
+    $(CIAO_ROOT)/docs/schema/pcd.xsd
+    $(CIAO_ROOT)/docs/schema/toplevel.xsd
+  }
+
+  Source_Files {
+  }
 }
 
-project (XSC_XML_Handlers) : acelib, ace_output, xerces {
+project (XSC_XML_Handlers) : acelib, xerces, ciao_lib, ciao_xml_utils {
   sharedname    += XSC_XML_Handlers
   dynamicflags  = XSC_XML_HANDLERS_BUILD_DLL
   macros       += XML_USE_PTHREADS
-  includes += $(CIAO_ROOT)/tools/Config_Handlers
+  includes += $(CIAO_ROOT)/tools/Config_Handlers $(CIAO_ROOT)/tools
   after += XSC_XML_Generation
 
   Source_Files {
+    XMI.cpp
     Deployment.cpp
     ccd.cpp
     cdd.cpp
@@ -48,32 +50,33 @@ project (XSC_XML_Handlers) : acelib, ace_output, xerces {
     pcd.cpp
     toplevel.cpp
     Basic_Deployment_Data.cpp
+    XML_Typedefs.cpp
   }
 
   Header_Files {
     XSC_XML_Handlers_Export.h
+    XML_Typedefs.h
   }
 
   verbatim(gnuace, macros) {
-   override no_hidden_visibility = 1
+    override no_hidden_visibility = 1
   }
 
 }
 
-project (XSC_Config_Handlers) : ciao_deployment_stub, ciao_events_dnc, ciao_config_handlers_base, ace_output {
-  after += CIAO_Events_Handlers \
-           RT_CCM_Config_Handlers \
-           XSC_DynAny_Handler \
+project (XSC_Config_Handlers) : dance_deployment_stub, ciao_config_handlers_base, ciao_lib, dance {
+  after += XSC_DynAny_Handler \
            XSC_Config_Handlers_Common
+	   
   sharedname = XSC_Config_Handlers
   dynamicflags   = CONFIG_HANDLERS_BUILD_DLL
   libs += CIAO_XML_Utils \
-          CIAO_Events_Handlers \
-          RT_CCM_Config_Handlers \
           XSC_XML_Handlers \
           XSC_DynAny_Handler \
           XSC_Config_Handlers_Common
-
+	  
+  includes += $(CIAO_ROOT)/ciao
+  
   Source_Files {
     DP_Handler.cpp
     CCD_Handler.cpp
@@ -90,12 +93,11 @@ project (XSC_Config_Handlers) : ciao_deployment_stub, ciao_events_dnc, ciao_conf
     ID_Handler.cpp
     XML_File_Intf.cpp
     IDREF_Base.cpp
-    DnC_Dump.cpp
     Dump_Obj.cpp
     PCD_Handler.cpp
     IRDD_Handler.cpp
     DD_Handler.cpp
-
+    DnC_Dump.cpp
   }
 
   Header_Files {
@@ -104,14 +106,14 @@ project (XSC_Config_Handlers) : ciao_deployment_stub, ciao_events_dnc, ciao_conf
 
 }
 
-project (XSC_Config_Handlers_Common) : ciao_deployment_stub, ciao_config_handlers_base, ace_output {
-   after += XSC_DynAny_Handler
-   sharedname = XSC_Config_Handlers_Common
-   dynamicflags = CONFIG_HANDLERS_COMMON_BUILD_DLL
+project (XSC_Config_Handlers_Common) : dance_deployment_stub, ciao_config_handlers_base, ciao_lib, dance {
+  after += XSC_DynAny_Handler
+  sharedname = XSC_Config_Handlers_Common
+  dynamicflags = CONFIG_HANDLERS_COMMON_BUILD_DLL
 
-   libs += XSC_DynAny_Handler
+  libs += XSC_DynAny_Handler
 
-   Source_Files {
+  Source_Files {
     ERE_Handler.cpp
     Req_Handler.cpp
     DataType_Handler.cpp
@@ -120,18 +122,18 @@ project (XSC_Config_Handlers_Common) : ciao_deployment_stub, ciao_config_handler
     CPD_Handler.cpp
     CEPE_Handler.cpp
     Any_Handler.cpp
-   }
-}
-project (XSC_Config_Handlers_Tests) : ciao_component_dnc, ciao_config_handlers, ifr_client {
-//  requires += dummy_label
-includes += $(CIAO_ROOT)/tools/Config_Handlers
-exename = test
-dynamicflags   = CONFIG_HANDLERS_BUILD_DLL
-macros   += XML_USE_PTHREADS
-
-Source_Files {
-test.cpp
+  }
 }
+project (XSC_Config_Handlers_Tests) : dance_deployment_stub, ciao_config_handlers, ifr_client {
+  requires += dummy_label
+  includes += $(CIAO_ROOT)/tools/Config_Handlers
+  exename = test
+  dynamicflags   = CONFIG_HANDLERS_BUILD_DLL
+  macros   += XML_USE_PTHREADS
+
+  Source_Files {
+    test.cpp
+  }
 }
 
 
diff --git a/CIAO/tools/Config_Handlers/DD_Handler.cpp b/CIAO/tools/Config_Handlers/DD_Handler.cpp
index bb8981096de..ee9fbd79012 100644
--- a/CIAO/tools/Config_Handlers/DD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/DD_Handler.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Utils/XML_Helper.h"
+#include "XML_Typedefs.h"
 #include "SatisfierProperty_Handler.h"
 #include "DD_Handler.h"
 #include "Any_Handler.h"
@@ -20,21 +20,9 @@ namespace CIAO
       retval_ (false)
     {
       CIAO_TRACE("DP_PCD_Handler::constructor");
-      XML_Helper helper;
-
-      if (CIAO::debug_level () > 9)
-        {
-          ACE_DEBUG ((LM_DEBUG , "inside DD_Handler"));
-        }
-
-
+      
       XERCES_CPP_NAMESPACE::DOMDocument *dom =
-        helper.create_dom (file);
-
-      if (CIAO::debug_level () > 9)
-        {
-          ACE_DEBUG ((LM_DEBUG , "after create dom"));
-        }
+        XML_Helper::XML_HELPER.create_dom (file);
 
       if (!dom)
         throw DD_Handler::NoDomain ();
@@ -44,19 +32,8 @@ namespace CIAO
 
       //      Domain d = domain (dom);
 
-      if (CIAO::debug_level () > 9)
-        {
-          ACE_DEBUG ((LM_DEBUG , "dom"));
-        }
-
-
       this->domain_.reset (dm);
 
-      if (CIAO::debug_level () > 9)
-        {
-          ACE_DEBUG ((LM_DEBUG , "after reset"));
-        }
-
       if (!this->build_domain ())
         throw NoDomain ();
     }
@@ -94,20 +71,15 @@ namespace CIAO
       // Check if the label is there or not
       if (domain_->label_p ())
         this->idl_domain_->label =
-          CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (domain_->label ().c_str ()));
+          CORBA::string_dup (domain_->label ().c_str ());
 
       if (domain_->UUID_p ())
         this->idl_domain_->UUID =
-          CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (domain_->UUID ().c_str ()));
+          CORBA::string_dup (domain_->UUID ().c_str ());
 
       CORBA::ULong len = domain_->count_node ();
       this->idl_domain_->node.length (len);
 
-      if (CIAO::debug_level () > 9)
-        {
-          ACE_DEBUG ((LM_DEBUG , "The node length is [%d]\n",len));
-        }
-
       //Resource _resource;
       int i =0;
       for (Domain::node_const_iterator iter = domain_->begin_node ();
@@ -117,11 +89,11 @@ namespace CIAO
         {
           // Node* thisNode = (Node*)iter;
           this->idl_domain_->node[i].name =
-            CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (iter->name ().c_str ()));
+            CORBA::string_dup (iter->name ().c_str ());
 
           if (iter->label_p ())
             this->idl_domain_->node[i].label =
-              CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (iter->label ().c_str ()));
+              CORBA::string_dup (iter->label ().c_str ());
 
           // length is hard-coded for now ...
           // here iterate over the resources ...
@@ -136,7 +108,7 @@ namespace CIAO
             {
 
               this->idl_domain_->node[i].resource[res_id].name =
-                CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (res_iter->name ().c_str ()));
+                CORBA::string_dup (res_iter->name ().c_str ());
 
               CORBA::ULong resource_type_len = res_iter->count_resourceType ();
               this->idl_domain_->node[i].resource[res_id].resourceType.length (resource_type_len);
@@ -150,7 +122,7 @@ namespace CIAO
                    res_type_iter++, res_type_id++)
                 {
                   this->idl_domain_->node[i].resource[res_id].resourceType[res_type_id] =
-                    CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (res_type_iter->c_str ()));
+                    CORBA::string_dup (res_type_iter->c_str ());
                 }
 
               CORBA::ULong property_len = res_iter->count_property ();
diff --git a/CIAO/tools/Config_Handlers/DD_Handler.h b/CIAO/tools/Config_Handlers/DD_Handler.h
index eb05269d360..f3a9e0c60c9 100644
--- a/CIAO/tools/Config_Handlers/DD_Handler.h
+++ b/CIAO/tools/Config_Handlers/DD_Handler.h
@@ -17,7 +17,6 @@
 
 #include "Config_Handlers_Export.h"
 #include "ace/Auto_Ptr.h"
-// #include "Utils/XML_Helper.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -68,25 +67,25 @@ DD_Handler(::Deployment::Domain *dmn);
 * @brief Returns the const IDL domain
 * @return Domain* the IDL domain pointer
 */
-::Deployment::Domain const *domain_idl (void) const;
+ ::Deployment::Domain const *domain_idl (void) const;
 
 /**
 * @brief Returns the IDL domain
 * @return Domain* the IDL domain pointer
 */
-::Deployment::Domain *domain_idl (void);
+ ::Deployment::Domain *domain_idl (void);
 
 /**
 * @brief Returns the const XSC domain
 * @return Domain* the XSC domain pointer
 */
-Domain const *domain_xsc (void) const;
+ Domain const *domain_xsc (void) const;
 
 /**
 * @brief Returns the XSC domain
 * @return Domain* the XSC domain pointer
 */
-Domain *domain_xsc (void);
+ Domain *domain_xsc (void);
 
 private:
 /**
diff --git a/CIAO/tools/Config_Handlers/DP_Handler.cpp b/CIAO/tools/Config_Handlers/DP_Handler.cpp
index 2ed9a8e709f..3ee8e394bf5 100644
--- a/CIAO/tools/Config_Handlers/DP_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/DP_Handler.cpp
@@ -11,10 +11,6 @@
 #include "ID_Handler.h"
 #include "Property_Handler.h"
 #include "cdp.hpp"
-#include "RT-CCM/SRD_Handler.h"
-#include "RT-CCM/CIAOServerResources.hpp"
-#include "CIAO_Events/CIAOEvents_Handler.h"
-#include "CIAO_Events/CIAOEvents.hpp"
 
 #include "PCD_Handler.h"
 
@@ -26,7 +22,7 @@ ACE_RCSID (Config_Handlers,
   {
     namespace Config_Handlers
     {
-      DP_Handler::DP_Handler (DeploymentPlan &dp)
+      DP_Handler::DP_Handler (deploymentPlan &dp)
         :   xsc_dp_ (0)
         , idl_dp_ (0)
         , retval_ (true)
@@ -36,7 +32,7 @@ ACE_RCSID (Config_Handlers,
       }
 
       DP_Handler::DP_Handler (const ::Deployment::DeploymentPlan &plan)
-        : xsc_dp_ (new DeploymentPlan),
+        : xsc_dp_ (new deploymentPlan),
           idl_dp_ (0),
           retval_ (0)
       {
@@ -49,7 +45,7 @@ ACE_RCSID (Config_Handlers,
       {
       }
 
-      DeploymentPlan const *
+      deploymentPlan const *
       DP_Handler::xsc (void) const
       {
         if (this->retval_ && this->xsc_dp_.get () != 0)
@@ -58,7 +54,7 @@ ACE_RCSID (Config_Handlers,
         throw NoPlan ();
       }
 
-      DeploymentPlan *
+      deploymentPlan *
       DP_Handler::xsc (void)
       {
         if (this->retval_ && this->xsc_dp_.get () != 0)
@@ -86,7 +82,7 @@ ACE_RCSID (Config_Handlers,
       }
 
       bool
-      DP_Handler::resolve_plan (DeploymentPlan &xsc_dp)
+      DP_Handler::resolve_plan (deploymentPlan &xsc_dp)
       {
         CIAO_TRACE ("DP_Handler::resolve_plan");
 
@@ -99,18 +95,18 @@ ACE_RCSID (Config_Handlers,
         if (xsc_dp.label_p ())
           {
             this->idl_dp_->label =
-              CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (xsc_dp.label ().c_str ()));
+              CORBA::string_dup (xsc_dp.label ().c_str ());
           }
 
         // Read in the UUID, if present
         if (xsc_dp.UUID_p ())
           {
             this->idl_dp_->UUID =
-              CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (xsc_dp.UUID ().c_str ()));
+              CORBA::string_dup (xsc_dp.UUID ().c_str ());
           }
 
         // Similar thing for dependsOn
-        for (DeploymentPlan::dependsOn_const_iterator dstart = xsc_dp.begin_dependsOn ();
+        for (deploymentPlan::dependsOn_const_iterator dstart = xsc_dp.begin_dependsOn ();
              dstart != xsc_dp.end_dependsOn ();
              ++dstart)
           {
@@ -122,7 +118,7 @@ ACE_RCSID (Config_Handlers,
           }
 
         // ... An the property stuff
-        for (DeploymentPlan::infoProperty_const_iterator pstart = xsc_dp.begin_infoProperty ();
+        for (deploymentPlan::infoProperty_const_iterator pstart = xsc_dp.begin_infoProperty ();
              pstart != xsc_dp.end_infoProperty ();
              ++pstart)
           {
@@ -131,44 +127,8 @@ ACE_RCSID (Config_Handlers,
 
             this->idl_dp_->infoProperty.length (len + 1);
 
-            if (pstart->name () == ACE_TEXT ("CIAOServerResources"))
-              {
-                /*
-                 * Hook for RT-CCM
-                 */
-
-
-                ACE_DEBUG ((LM_DEBUG,
-                            "Importing ServerResources...\n"));
-
-                // Parse the SR document
-                SRD_Handler srd_handler (pstart->value ().value ().begin_string ()->c_str ());
-
-                // Populate the property
-                this->idl_dp_->infoProperty [len].name = ACE_TEXT_ALWAYS_CHAR (pstart->name ().c_str ());
-                this->idl_dp_->infoProperty [len].value <<= *(srd_handler.srd_idl ());
-              }
-            else if (pstart->name () == ACE_TEXT ("CIAOEvents"))
-              {
-                /*
-                * Hook for EVENTS
-                */
-
-                ACE_DEBUG ((LM_DEBUG,
-                            "Importing CIAOEvents...\n"));
-
-                // Parse the SR document
-                CIAOEvents_Handler event_handler (pstart->value ().value ().begin_string ()->c_str ());
-
-                // Populate the property
-                this->idl_dp_->infoProperty [len].name = ACE_TEXT_ALWAYS_CHAR (pstart->name ().c_str ());
-                this->idl_dp_->infoProperty [len].value <<= *(event_handler.esd_idl ());
-              }
-            else
-              {
-                Property_Handler::handle_property (*pstart,
-                                                this->idl_dp_->infoProperty [len]);
-              }
+            Property_Handler::handle_property (*pstart,
+                                               this->idl_dp_->infoProperty [len]);
           }
 
         // Read in the realizes, if present
@@ -217,14 +177,14 @@ ACE_RCSID (Config_Handlers,
         // Read in the label, if present, since minoccurs = 0
         if (plan.label != 0)
           {
-            XMLSchema::string< ACE_TCHAR > i(ACE_TEXT_CHAR_TO_TCHAR (plan.label.in ()));
+            XMLSchema::string< char > i((plan.label));
             this->xsc_dp_->label(i);
           }
 
         // Read in the UUID, if present
         if (plan.UUID != 0)
           {
-            XMLSchema::string< ACE_TCHAR > j(ACE_TEXT_CHAR_TO_TCHAR (plan.UUID.in ()));
+            XMLSchema::string< char > j((plan.UUID));
             this->xsc_dp_->UUID(j);
           }
 
diff --git a/CIAO/tools/Config_Handlers/DP_Handler.h b/CIAO/tools/Config_Handlers/DP_Handler.h
index cbee2d1f568..82d93aaa62f 100644
--- a/CIAO/tools/Config_Handlers/DP_Handler.h
+++ b/CIAO/tools/Config_Handlers/DP_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
-*  @file  DP_Handler.h
-*
-*  $Id$
-*
-*  @author Bala Natarajan <bala@dre.vanderbilt.edu>
-*/
+ *  @file  DP_Handler.h
+ *
+ *  $Id$
+ *
+ *  @author Bala Natarajan <bala@dre.vanderbilt.edu>
+ */
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_DP_HANDLER_H
@@ -24,63 +24,63 @@ using std::auto_ptr;
 
 namespace Deployment
 {
-struct DeploymentPlan ;
+  struct DeploymentPlan ;
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-class DeploymentPlan;
-
-/*
-* @class DP_Handler
-*
-* @brief Handler for Deployment::DeploymentPlan
-*/
-class Config_Handlers_Export DP_Handler
-{
-public:
-class NoPlan {};
+  namespace Config_Handlers
+    {
+      class deploymentPlan;
 
-/// Use this constructor if you want to use
-/// the XSC->IDL mapping
-DP_Handler (DeploymentPlan &dp);
+      /*
+       * @class DP_Handler
+       *
+       * @brief Handler for Deployment::DeploymentPlan
+       */
+      class Config_Handlers_Export DP_Handler
+        {
+        public:
+          class NoPlan {};
 
-/// Use this constructor if you want to use
-/// the IDL->XSC mapping
-DP_Handler (const ::Deployment::DeploymentPlan &plan);
+          /// Use this constructor if you want to use
+          /// the XSC->IDL mapping
+          DP_Handler (deploymentPlan &dp);
 
-~DP_Handler (void)
-throw ();
+          /// Use this constructor if you want to use
+          /// the IDL->XSC mapping
+          DP_Handler (const ::Deployment::DeploymentPlan &plan);
 
-/// Generates the IDL->XSC mapping.  returns
-/// null if the method fails or if the class was
-/// constructed with the wrong source.
-DeploymentPlan const *xsc (void) const;
+          ~DP_Handler (void)
+            throw ();
 
-DeploymentPlan *xsc (void);
+          /// Generates the IDL->XSC mapping.  returns
+          /// null if the method fails or if the class was
+          /// constructed with the wrong source.
+          deploymentPlan const *xsc (void) const;
 
-/// Generates the XSC->IDL mapping.  returns null
-/// if the method fails or the class was constructed
-::Deployment::DeploymentPlan const *plan (void) const;
+          deploymentPlan *xsc (void);
 
-::Deployment::DeploymentPlan *plan (void);
+          /// Generates the XSC->IDL mapping.  returns null
+          /// if the method fails or the class was constructed
+          ::Deployment::DeploymentPlan const *plan (void) const;
 
-private:
+          ::Deployment::DeploymentPlan *plan (void);
 
-bool resolve_plan (DeploymentPlan &dp);
+        private:
 
-bool build_xsc (const ::Deployment::DeploymentPlan &plan);
+          bool resolve_plan (deploymentPlan &dp);
 
-private:
-auto_ptr< DeploymentPlan > xsc_dp_;
+          bool build_xsc (const ::Deployment::DeploymentPlan &plan);
 
-auto_ptr< ::Deployment::DeploymentPlan> idl_dp_;
+        private:
+          auto_ptr< deploymentPlan > xsc_dp_;
 
-bool retval_;
-};
-}
+          auto_ptr< ::Deployment::DeploymentPlan> idl_dp_;
+
+          bool retval_;
+        };
+    }
 }
 
 #include /**/ "ace/post.h"
diff --git a/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp b/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp
index ea36b5037f5..882a87393c0 100644
--- a/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp
@@ -22,7 +22,7 @@ namespace CIAO
       CIAO_TRACE("DP_PCD_Handler::plan_connection_descrs");
       DeploymentPlan::connection_const_iterator cci_e =
         src.end_connection ();
-
+      
       CORBA::ULong pos = 0;
       dest.length (src.count_connection ());
       for (DeploymentPlan::connection_const_iterator cci_b =
@@ -34,10 +34,10 @@ namespace CIAO
                                                  dest[pos++]);
         }
     }
-
+    
     PlanConnectionDescription
     DP_PCD_Handler::plan_connection_descr (
-      const Deployment::PlanConnectionDescription &src)
+    const Deployment::PlanConnectionDescription &src)
     {
       CIAO_TRACE("DP_PCD_Handler::plan_connection_descr");
       PlanConnectionDescription pcd = PCD_Handler::get_PlanConnectionDescription(src);
diff --git a/CIAO/tools/Config_Handlers/DP_PCD_Handler.h b/CIAO/tools/Config_Handlers/DP_PCD_Handler.h
index 25c1cb336dc..eceb6f03bb6 100644
--- a/CIAO/tools/Config_Handlers/DP_PCD_Handler.h
+++ b/CIAO/tools/Config_Handlers/DP_PCD_Handler.h
@@ -53,7 +53,7 @@ namespace CIAO
           Deployment::PlanConnectionDescriptions& toconfig);
 
       static PlanConnectionDescription plan_connection_descr(
-        const Deployment::PlanConnectionDescription &src);
+      const Deployment::PlanConnectionDescription &src);
 
     private:
       static void plan_connection_descr (
diff --git a/CIAO/tools/Config_Handlers/Deployment.cpp b/CIAO/tools/Config_Handlers/Deployment.cpp
index 88016096004..8884b13c108 100644
--- a/CIAO/tools/Config_Handlers/Deployment.cpp
+++ b/CIAO/tools/Config_Handlers/Deployment.cpp
@@ -39,7 +39,7 @@ namespace CIAO
     domain (xercesc::DOMDocument const* d)
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-      if (e.name () == ACE_TEXT ("domain"))
+      if (e.name () == "domain")
       {
         ::CIAO::Config_Handlers::Domain r (e);
         return r;
@@ -51,13 +51,13 @@ namespace CIAO
       }
     }
 
-    ::CIAO::Config_Handlers::DeploymentPlan
-    deploymentPlan (xercesc::DOMDocument const* d)
+    ::CIAO::Config_Handlers::deploymentPlan
+    DeploymentPlan (xercesc::DOMDocument const* d)
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-      if (e.name () == ACE_TEXT ("deploymentPlan"))
+      if (e.name () == "DeploymentPlan")
       {
-        ::CIAO::Config_Handlers::DeploymentPlan r (e);
+        ::CIAO::Config_Handlers::deploymentPlan r (e);
         return r;
       }
 
@@ -71,7 +71,7 @@ namespace CIAO
     implementationArtifactDescription (xercesc::DOMDocument const* d)
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-      if (e.name () == ACE_TEXT ("implementationArtifactDescription"))
+      if (e.name () == "implementationArtifactDescription")
       {
         ::CIAO::Config_Handlers::ImplementationArtifactDescription r (e);
         return r;
@@ -87,7 +87,7 @@ namespace CIAO
     componentInterfaceDescription (xercesc::DOMDocument const* d)
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-      if (e.name () == ACE_TEXT ("componentInterfaceDescription"))
+      if (e.name () == "componentInterfaceDescription")
       {
         ::CIAO::Config_Handlers::ComponentInterfaceDescription r (e);
         return r;
@@ -103,7 +103,7 @@ namespace CIAO
     componentImplementationDescription (xercesc::DOMDocument const* d)
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-      if (e.name () == ACE_TEXT ("componentImplementationDescription"))
+      if (e.name () == "componentImplementationDescription")
       {
         ::CIAO::Config_Handlers::ComponentImplementationDescription r (e);
         return r;
@@ -119,7 +119,7 @@ namespace CIAO
     componentPackageDescription (xercesc::DOMDocument const* d)
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-      if (e.name () == ACE_TEXT ("componentPackageDescription"))
+      if (e.name () == "componentPackageDescription")
       {
         ::CIAO::Config_Handlers::ComponentPackageDescription r (e);
         return r;
@@ -135,7 +135,7 @@ namespace CIAO
     packageConfiguration (xercesc::DOMDocument const* d)
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-      if (e.name () == ACE_TEXT ("packageConfiguration"))
+      if (e.name () == "packageConfiguration")
       {
         ::CIAO::Config_Handlers::PackageConfiguration r (e);
         return r;
@@ -151,7 +151,7 @@ namespace CIAO
     topLevelPackageDescription (xercesc::DOMDocument const* d)
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-      if (e.name () == ACE_TEXT ("topLevelPackageDescription"))
+      if (e.name () == "topLevelPackageDescription")
       {
         ::CIAO::Config_Handlers::TopLevelPackageDescription r (e);
         return r;
@@ -206,7 +206,7 @@ namespace CIAO
     domain (::CIAO::Config_Handlers::Domain const& s, xercesc::DOMDocument* d)
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-      if (e.name () != ACE_TEXT ("domain"))
+      if (e.name () != "domain")
       {
         throw 1;
       }
@@ -229,12 +229,13 @@ namespace CIAO
       virtual ::CIAO::Config_Handlers::Writer::ValueType,
       virtual ::CIAO::Config_Handlers::Writer::ValueMemberType,
       virtual ::CIAO::Config_Handlers::Writer::SequenceType,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::AliasType,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
       virtual ::CIAO::Config_Handlers::Writer::DataValue,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >,
@@ -256,15 +257,15 @@ namespace CIAO
     }
 
     void
-    deploymentPlan (::CIAO::Config_Handlers::DeploymentPlan const& s, xercesc::DOMDocument* d)
+    DeploymentPlan (::CIAO::Config_Handlers::deploymentPlan const& s, xercesc::DOMDocument* d)
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-      if (e.name () != ACE_TEXT ("deploymentPlan"))
+      if (e.name () != "DeploymentPlan")
       {
         throw 1;
       }
 
-      struct W : virtual ::CIAO::Config_Handlers::Writer::DeploymentPlan,
+      struct W : virtual ::CIAO::Config_Handlers::Writer::deploymentPlan,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
       virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
       virtual ::CIAO::Config_Handlers::Writer::Property,
@@ -277,12 +278,13 @@ namespace CIAO
       virtual ::CIAO::Config_Handlers::Writer::ValueType,
       virtual ::CIAO::Config_Handlers::Writer::ValueMemberType,
       virtual ::CIAO::Config_Handlers::Writer::SequenceType,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::AliasType,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
       virtual ::CIAO::Config_Handlers::Writer::DataValue,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
@@ -294,6 +296,7 @@ namespace CIAO
       virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
       virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
       virtual ::CIAO::Config_Handlers::Writer::MonolithicDeploymentDescription,
+      virtual ::CIAO::Config_Handlers::Writer::IdRef,
       virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
       virtual ::CIAO::Config_Handlers::Writer::Requirement,
       virtual ::CIAO::Config_Handlers::Writer::InstanceDeploymentDescription,
@@ -307,6 +310,8 @@ namespace CIAO
       virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
       virtual ::CIAO::Config_Handlers::Writer::ArtifactDeploymentDescription,
       virtual ::CIAO::Config_Handlers::Writer::ResourceDeploymentDescription,
+      virtual ::CIAO::Config_Handlers::Writer::PlanLocality,
+      virtual ::CIAO::Config_Handlers::Writer::PlanLocalityKind,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         W (::XSCRT::XML::Element< ACE_TCHAR >& e)
@@ -323,7 +328,7 @@ namespace CIAO
     implementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const& s, xercesc::DOMDocument* d)
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-      if (e.name () != ACE_TEXT ("implementationArtifactDescription"))
+      if (e.name () != "implementationArtifactDescription")
       {
         throw 1;
       }
@@ -341,12 +346,13 @@ namespace CIAO
       virtual ::CIAO::Config_Handlers::Writer::ValueType,
       virtual ::CIAO::Config_Handlers::Writer::ValueMemberType,
       virtual ::CIAO::Config_Handlers::Writer::SequenceType,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::AliasType,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
       virtual ::CIAO::Config_Handlers::Writer::DataValue,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
@@ -371,7 +377,7 @@ namespace CIAO
     componentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const& s, xercesc::DOMDocument* d)
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-      if (e.name () != ACE_TEXT ("componentInterfaceDescription"))
+      if (e.name () != "componentInterfaceDescription")
       {
         throw 1;
       }
@@ -388,12 +394,13 @@ namespace CIAO
       virtual ::CIAO::Config_Handlers::Writer::ValueType,
       virtual ::CIAO::Config_Handlers::Writer::ValueMemberType,
       virtual ::CIAO::Config_Handlers::Writer::SequenceType,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::AliasType,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
       virtual ::CIAO::Config_Handlers::Writer::DataValue,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
@@ -420,7 +427,7 @@ namespace CIAO
     componentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const& s, xercesc::DOMDocument* d)
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-      if (e.name () != ACE_TEXT ("componentImplementationDescription"))
+      if (e.name () != "componentImplementationDescription")
       {
         throw 1;
       }
@@ -438,12 +445,13 @@ namespace CIAO
       virtual ::CIAO::Config_Handlers::Writer::ValueType,
       virtual ::CIAO::Config_Handlers::Writer::ValueMemberType,
       virtual ::CIAO::Config_Handlers::Writer::SequenceType,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::AliasType,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
       virtual ::CIAO::Config_Handlers::Writer::DataValue,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
@@ -464,6 +472,7 @@ namespace CIAO
       virtual ::CIAO::Config_Handlers::Writer::Requirement,
       virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
       virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
+      virtual ::CIAO::Config_Handlers::Writer::IdRef,
       virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
       virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
       virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
@@ -494,7 +503,7 @@ namespace CIAO
     componentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const& s, xercesc::DOMDocument* d)
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-      if (e.name () != ACE_TEXT ("componentPackageDescription"))
+      if (e.name () != "componentPackageDescription")
       {
         throw 1;
       }
@@ -512,12 +521,13 @@ namespace CIAO
       virtual ::CIAO::Config_Handlers::Writer::ValueType,
       virtual ::CIAO::Config_Handlers::Writer::ValueMemberType,
       virtual ::CIAO::Config_Handlers::Writer::SequenceType,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::AliasType,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
       virtual ::CIAO::Config_Handlers::Writer::DataValue,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
@@ -538,6 +548,7 @@ namespace CIAO
       virtual ::CIAO::Config_Handlers::Writer::Requirement,
       virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
       virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
+      virtual ::CIAO::Config_Handlers::Writer::IdRef,
       virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
       virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
       virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
@@ -568,7 +579,7 @@ namespace CIAO
     packageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const& s, xercesc::DOMDocument* d)
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-      if (e.name () != ACE_TEXT ("packageConfiguration"))
+      if (e.name () != "packageConfiguration")
       {
         throw 1;
       }
@@ -587,12 +598,13 @@ namespace CIAO
       virtual ::CIAO::Config_Handlers::Writer::ValueType,
       virtual ::CIAO::Config_Handlers::Writer::ValueMemberType,
       virtual ::CIAO::Config_Handlers::Writer::SequenceType,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::AliasType,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
       virtual ::CIAO::Config_Handlers::Writer::DataValue,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
@@ -612,6 +624,7 @@ namespace CIAO
       virtual ::CIAO::Config_Handlers::Writer::ComponentPackageImport,
       virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
       virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
+      virtual ::CIAO::Config_Handlers::Writer::IdRef,
       virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
       virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
       virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
@@ -642,7 +655,7 @@ namespace CIAO
     topLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const& s, xercesc::DOMDocument* d)
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-      if (e.name () != ACE_TEXT ("topLevelPackageDescription"))
+      if (e.name () != "topLevelPackageDescription")
       {
         throw 1;
       }
@@ -662,12 +675,13 @@ namespace CIAO
       virtual ::CIAO::Config_Handlers::Writer::ValueType,
       virtual ::CIAO::Config_Handlers::Writer::ValueMemberType,
       virtual ::CIAO::Config_Handlers::Writer::SequenceType,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
+      virtual ::CIAO::Config_Handlers::Writer::AliasType,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
       virtual ::CIAO::Config_Handlers::Writer::DataValue,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >,
       virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >,
@@ -687,6 +701,7 @@ namespace CIAO
       virtual ::CIAO::Config_Handlers::Writer::ComponentPackageImport,
       virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
       virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
+      virtual ::CIAO::Config_Handlers::Writer::IdRef,
       virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
       virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
       virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
diff --git a/CIAO/tools/Config_Handlers/Deployment.hpp b/CIAO/tools/Config_Handlers/Deployment.hpp
index d0477b78113..d502c9b534a 100644
--- a/CIAO/tools/Config_Handlers/Deployment.hpp
+++ b/CIAO/tools/Config_Handlers/Deployment.hpp
@@ -58,8 +58,8 @@ namespace CIAO
     domain (xercesc::DOMDocument const*);
 
     XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::DeploymentPlan
-    deploymentPlan (xercesc::DOMDocument const*);
+    ::CIAO::Config_Handlers::deploymentPlan
+    DeploymentPlan (xercesc::DOMDocument const*);
 
     XSC_XML_Handlers_Export
     ::CIAO::Config_Handlers::ImplementationArtifactDescription
@@ -121,7 +121,7 @@ namespace CIAO
 
     XSC_XML_Handlers_Export
     void
-    deploymentPlan (::CIAO::Config_Handlers::DeploymentPlan const&, xercesc::DOMDocument*);
+    DeploymentPlan (::CIAO::Config_Handlers::deploymentPlan const&, xercesc::DOMDocument*);
 
     XSC_XML_Handlers_Export
     void
diff --git a/CIAO/tools/Config_Handlers/DnC_Dump.cpp b/CIAO/tools/Config_Handlers/DnC_Dump.cpp
index 475b8894dab..f9efb5a95a8 100644
--- a/CIAO/tools/Config_Handlers/DnC_Dump.cpp
+++ b/CIAO/tools/Config_Handlers/DnC_Dump.cpp
@@ -525,7 +525,7 @@ namespace Deployment
 
     dump ("requiredUUID", cpr.requiredUUID);
     dump ("requiredName", cpr.requiredName);
-    dump ("requiredType", cpr.requiredType);
+    dump ("requiredType", cpr.requiredType.specificType);
   }
 
   // SubcomponentInstantiationDescription
@@ -736,7 +736,7 @@ namespace Deployment
     dump ("UUID", pc.UUID);
     dump_sequence ("specializedConfig", pc.specializedConfig);
     dump_sequence ("basePackage", pc.basePackage);
-    dump_sequence ("reference", pc.reference);
+    dump_sequence ("reference", pc.referencedPackage);
     dump_sequence ("selectRequirement", pc.selectRequirement);
     dump_sequence ("configProperty", pc.configProperty);
   }
@@ -960,7 +960,20 @@ encoded with different type"));
                       temp));
         }
         break;
-
+        
+        case CORBA::tk_enum:
+        {
+/*          CORBA::Enum temp;
+          if (! (any >>= temp))
+            {
+              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected enum \
+encoded with different type"));
+              throw CORBA::INTERNAL ();
+            }
+*/          ACE_DEBUG ((LM_DEBUG, "%sAny value: some enum \n", Dump_Obj::indent ()));
+        }
+        break;
+        
       default:
         ACE_DEBUG ((LM_DEBUG, "Unknown type encoded in Any\n"));
         throw CORBA::INTERNAL ();
diff --git a/CIAO/tools/Config_Handlers/DnC_Dump.h b/CIAO/tools/Config_Handlers/DnC_Dump.h
index 17fb49377de..cacc9b338ad 100644
--- a/CIAO/tools/Config_Handlers/DnC_Dump.h
+++ b/CIAO/tools/Config_Handlers/DnC_Dump.h
@@ -23,6 +23,7 @@
 
 namespace Deployment
 {
+
 /**
 * @class DnC_Dump
 *
@@ -36,7 +37,7 @@ public:
 static void dump (const char* caption,
 const ::CORBA::StringSeq &str_seq);
 
-static void dump (const char* caption, const TAO::String_Manager& str);
+ static void dump (const char* caption, const TAO::String_Manager& str);
 
 static void dump (const char* caption, const CORBA::Boolean& val);
 
diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler.mpc b/CIAO/tools/Config_Handlers/DynAny_Handler.mpc
index 170d67aa9ad..c5cc64b7a34 100644
--- a/CIAO/tools/Config_Handlers/DynAny_Handler.mpc
+++ b/CIAO/tools/Config_Handlers/DynAny_Handler.mpc
@@ -1,6 +1,7 @@
 // $Id$
 
-project (XSC_DynAny_Handler) : xerces, dynamicany, typecodefactory, ciao_client_dnc, ciao_config_handlers_base {
+project (XSC_DynAny_Handler) : xerces, dynamicany, typecodefactory, dance_deployment_stub, \
+	ciao_config_handlers_base, ciao_lib, dance, ifr_client {
   after += XSC_XML_Handlers
   libs += XSC_XML_Handlers
   dynamicflags += DYNANY_HANDLER_BUILD_DLL
@@ -10,6 +11,9 @@ project (XSC_DynAny_Handler) : xerces, dynamicany, typecodefactory, ciao_client_
   Source_Files {
     DynAny_Handler/DynAny_Handler.cpp
     DynAny_Handler/DynEnum_Handler.cpp
+    DynAny_Handler/DynSequence_Handler.cpp
+    DynAny_Handler/DynStruct_Handler.cpp
+    DynAny_Handler/DynAlias_Handler.cpp
   }
 
   Header_Files {
diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp b/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp
index 77567e3739c..333e9fd7b92 100644
--- a/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp
@@ -98,7 +98,7 @@ namespace CIAO{
 
           default:
             ACE_ERROR ((LM_ERROR, "Invalid typecode in any\n"));
-            throw 1;
+            throw Config_Error ("", "Invalid typecode");
           }
 
         //   This case used to be supported...is it not in the schema?
@@ -170,7 +170,7 @@ namespace CIAO{
             type.kind (TCKind::tk_TypeCode);
           default:
             ACE_ERROR ((LM_ERROR, "Invalid typecode\n"));
-            throw 1;
+            throw Config_Error ("", "Invalid typecode");
           }
 
         return type;
diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp b/CIAO/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp
new file mode 100644
index 00000000000..5a25b192c00
--- /dev/null
+++ b/CIAO/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp
@@ -0,0 +1,195 @@
+// $Id$
+
+#include "DynAlias_Handler.h"
+#include "DynAny_Handler.h"
+
+#include "Basic_Deployment_Data.hpp"
+#include "Common.h"
+
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h"
+#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
+#include "tao/AnyTypeCode/Enum_TypeCode.h"
+#include "tao/IFR_Client/IFR_BasicC.h"
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    DynamicAny::DynAny_ptr
+    DynAlias_Handler::extract_into_dynany (const DataType &type,
+                                           const DataValue &value,
+                                           CORBA::TypeCode_ptr req_tc)
+    {
+      try
+        {
+          CORBA::TypeCode_ptr tc;
+            
+          if (req_tc)
+            tc = req_tc;
+          else
+            tc = DynAlias_Handler::create_typecode (type);
+          
+          // Make the actual DynAlias
+          //          DynamicAny::DynAny_var retval =
+          //DYNANY_HANDLER->daf ()->create_dyn_any_from_type_code (tc);
+          //          DynamicAny::DynAlias_var retval = DynamicAny::DynAlias::_narrow (temp.in ());
+          
+          DynamicAny::DynAny_var alias = DYNANY_HANDLER->extract_into_dynany (type.alias ().elementType (), value, tc);
+          return alias._retn ();
+          /*
+          switch (type.kind ().integral ())
+            {
+              // ========== BASIC TYPES
+            case TCKind::tk_null_l:
+            case TCKind::tk_void_l:
+              ACE_ERROR ((LM_WARNING, "I don't know how to handle null or void types\n"));
+              
+            case TCKind::tk_short_l:
+              retval->insert_short (CORBA::Short (static_cast < ::XMLSchema::short_ const & > (*value.begin_short ())));
+              break;
+              
+            case TCKind::tk_long_l:
+              retval->insert_long (CORBA::Long (static_cast < ::XMLSchema::int_ const& > (*value.begin_long ())));
+              break;
+
+            case TCKind::tk_ushort_l:
+              retval->insert_ushort (CORBA::UShort (static_cast< ::XMLSchema::unsignedShort const & > (*value.begin_ushort ())));
+              break;
+
+            case TCKind::tk_ulong_l:
+              retval->insert_ulong (CORBA::ULong (static_cast < ::XMLSchema::unsignedInt const& > (*value.begin_ulong ())));
+              break;
+
+            case TCKind::tk_float_l:
+              retval->insert_float (CORBA::Float (*value.begin_float ()));
+              break;
+
+            case TCKind::tk_double_l:
+              retval->insert_double (CORBA::Double (*value.begin_double ()));
+              break;
+              
+            case TCKind::tk_boolean_l:
+              retval->insert_boolean (static_cast < ::XMLSchema::boolean const& > (*value.begin_boolean ()));
+              break;
+
+            case TCKind::tk_char_l:
+              retval->insert_char (CORBA::Char (*value.begin_string ()->c_str ()));
+              break;
+              
+            case TCKind::tk_octet_l:
+              retval->insert_octet (static_cast <const unsigned char &> (*value.begin_octet ()));
+              break;
+
+            case TCKind::tk_string_l:
+              retval->insert_string (value.begin_string ()->c_str ());
+              break;
+
+            case TCKind::tk_longlong_l:
+              retval->insert_longlong (CORBA::LongLong (static_cast < ::XMLSchema::long_ const& > (*value.begin_longlong ())));
+              break;
+              
+            case TCKind::tk_ulonglong_l:
+              retval->insert_ulonglong (CORBA::ULongLong (static_cast < ::XMLSchema::unsignedLong const& > (*value.begin_ulonglong ())));
+              break;
+
+            case TCKind::tk_wchar_l:
+              retval->insert_wchar (CORBA::WChar (*value.begin_string ()->c_str ()));
+              break;
+
+        case TCKind::tk_enum_l:
+          return DynEnum_Handler::extract_into_dynany (type, value);
+          
+        case TCKind::tk_sequence_l:
+          return DynSequence_Handler::extract_into_dynany (type, value);
+          
+        case TCKind::tk_struct_l:
+          return DynStruct_Handler::extract_into_dynany (type, value);
+
+        case TCKind::tk_alias_l:
+          return DynAlias_Handler::extract_into_dynany (type, value);
+
+        case TCKind::tk_longdouble_l:
+        case TCKind::tk_wstring_l:
+        case TCKind::tk_wfixed_l:
+        case TCKind::tk_any_l:
+        case TCKind::tk_TypeCode_l:
+        case TCKind::tk_Principal_l:
+        case TCKind::tk_objref_l:
+        case TCKind::tk_union_l:
+        case TCKind::tk_array_l:
+        case TCKind::tk_except_l:
+        case TCKind::tk_value_l:
+        case TCKind::tk_value_box_l:
+        case TCKind::tk_native_l:
+        case TCKind::tk_abstract_interface_l:
+        case TCKind::tk_local_interface_l:
+        case TCKind::tk_component_l:
+        case TCKind::tk_home_l:
+        case TCKind::tk_event_l:
+          ACE_ERROR ((LM_ERROR, "Type not supported\n"));
+          throw Config_Error ("", "Type not supported");
+        }
+          */
+          //          retval->assign (alias);
+
+          //          return retval._retn ();
+        }
+      catch (DynamicAny::DynAny::InvalidValue)
+        {
+          ACE_ERROR ((LM_ERROR, "Invalid value provided in XML when trying to "
+                      "initialize an instance of enumerated type %s\n",
+                      type.alias ().typeId ().c_str ()));
+          throw Config_Error (type.alias ().typeId (),
+                              "Invalid value provided in XML");
+        }
+      catch (Config_Error &ex)
+        {
+          ACE_ERROR ((LM_ERROR, "DynAlias_Handler caught Config_Error\n"));
+          if (type.alias_p ())
+            ex.add_name (type.alias ().typeId ());
+
+          throw ex;
+        }
+      catch (...)
+        {
+          ACE_ERROR ((LM_ERROR, "DynAlias_Handler caught unknown exception\n"));
+          throw Config_Error (type.alias ().typeId (),
+                              "Unknown exception");
+        }
+    }
+
+    void
+    DynAlias_Handler::extract_out_of_dynany (const DynamicAny::DynAny_ptr dyn)
+    {
+      ACE_UNUSED_ARG (dyn);
+      ACE_ERROR ((LM_ERROR, "Extracting Enums not yet supported\n"));
+    }
+    
+    CORBA::TypeCode_ptr
+    DynAlias_Handler::create_typecode (const DataType &type)
+    {
+      if (!type.alias_p ())
+        {
+          ACE_ERROR ((LM_ERROR, "ERROR: Alias type descriptioin required"));
+          throw Config_Error ("", "Did not find expected alias type description, tk_kind may be wrong.");
+        }
+
+
+      // @@ Leak this guy onto the heap to avoid a compile problem.
+      CORBA::TypeCode_ptr tc =
+        DYNANY_HANDLER->orb ()->create_alias_tc 
+        (type.alias ().typeId ().c_str (),
+         type.alias ().name ().c_str (),
+         DYNANY_HANDLER->create_typecode (type.alias ().elementType ()));
+      
+      DYNANY_HANDLER->register_typecode (type.alias ().typeId (),
+                                         tc);
+      
+      return tc;
+    }
+    
+  }
+}
+
+
diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.h b/CIAO/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.h
new file mode 100644
index 00000000000..b5bca3c7377
--- /dev/null
+++ b/CIAO/tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.h
@@ -0,0 +1,52 @@
+/**
+ * $Id$
+ *
+ * @file DynAlias_Handler.h
+ * @author Will Otte <wotte@dre.vanderbilt.edu>
+ */
+
+#ifndef CIAO_CONFIG_HANDLERS_DYNALIAS_HANDLER_H
+#define CIAO_CONFIG_HANDLERS_DYNALIAS_HANDLER_H
+#include /**/ "ace/pre.h"
+
+#include "DynAny_Handler_Export.h"
+
+#include "tao/ORB.h"
+#include "tao/DynamicAny/DynamicAny.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    class Any;
+    class DataType;
+    class DataValue;
+
+    /**
+     * @class DynAlias_Handler
+     * @brief Translates enums specified in deployment plans into Dynamic Anys
+     *
+     */
+    class DynAlias_Handler
+    {
+    public:
+      static DynamicAny::DynAny_ptr extract_into_dynany (const DataType &type,
+                                                         const DataValue &value,
+                                                         CORBA::TypeCode_ptr = 0);
+
+      static void extract_out_of_dynany (const DynamicAny::DynAny_ptr dyn);
+      
+      static CORBA::TypeCode_ptr create_typecode (const DataType &type);
+    };
+
+  }
+}
+
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_CONFIG_HANDLERS_DYNENUM_HANDLER_H*/
+
diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp b/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
index c3d0d62eb26..a4f8d2292f8 100644
--- a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
@@ -4,7 +4,11 @@
 
 #include "DynAny_Handler.h"
 #include "DynEnum_Handler.h"
+#include "DynSequence_Handler.h"
+#include "DynStruct_Handler.h"
+#include "DynAlias_Handler.h"
 #include "Basic_Deployment_Data.hpp"
+#include "Common.h"
 
 namespace CIAO
 {
@@ -25,7 +29,7 @@ namespace CIAO
       if (CORBA::is_nil (daf_.in ()))
         {
           ACE_ERROR ((LM_ERROR, "Unable to narrow Dynamic Any factory\n"));
-          throw 1;
+          throw Config_Error ("", "Unable to narrow DynAny factory");
         }
     }
 
@@ -46,10 +50,14 @@ namespace CIAO
     }
 
     DynamicAny::DynAny_ptr
-    DynAny_Handler::extract_into_dynany (const DataType& type,
-                                         const DataValue& value)
+    DynAny_Handler::extract_into_dynany (const DataType &type,
+                                         const DataValue &value,
+                                         CORBA::TypeCode_ptr req_tc)
     {
       DynamicAny::DynAny_var retval;
+      
+      if (req_tc)
+        retval = this->daf_->create_dyn_any_from_type_code (req_tc);
 
       switch (type.kind ().integral ())
         {
@@ -57,92 +65,93 @@ namespace CIAO
         case TCKind::tk_null_l:
         case TCKind::tk_void_l:
           ACE_ERROR ((LM_WARNING, "I don't know how to handle null or void types\n"));
-
+              
         case TCKind::tk_short_l:
-          retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_short);
+          if (!req_tc) retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_short);
           retval->insert_short (CORBA::Short (static_cast < ::XMLSchema::short_ const & > (*value.begin_short ())));
           break;
-
+              
         case TCKind::tk_long_l:
-          retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_long);
+          if (!req_tc) retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_long);
           retval->insert_long (CORBA::Long (static_cast < ::XMLSchema::int_ const& > (*value.begin_long ())));
           break;
 
         case TCKind::tk_ushort_l:
-          retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_ushort);
+          if (!req_tc) retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_ushort);
           retval->insert_ushort (CORBA::UShort (static_cast< ::XMLSchema::unsignedShort const & > (*value.begin_ushort ())));
           break;
 
         case TCKind::tk_ulong_l:
-          retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_ulong);
+          if (!req_tc) retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_ulong);
           retval->insert_ulong (CORBA::ULong (static_cast < ::XMLSchema::unsignedInt const& > (*value.begin_ulong ())));
           break;
 
         case TCKind::tk_float_l:
-          retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_float);
+          if (!req_tc) retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_float);
           retval->insert_float (CORBA::Float (*value.begin_float ()));
           break;
 
         case TCKind::tk_double_l:
-          retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_double);
+          if (!req_tc) retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_double);
           retval->insert_double (CORBA::Double (*value.begin_double ()));
           break;
 
         case TCKind::tk_boolean_l:
-          retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_boolean);
+          if (!req_tc) retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_boolean);
           retval->insert_boolean (static_cast < ::XMLSchema::boolean const& > (*value.begin_boolean ()));
           break;
 
         case TCKind::tk_char_l:
-          retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_char);
+          if (!req_tc) retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_char);
           retval->insert_char (CORBA::Char (*value.begin_string ()->c_str ()));
           break;
 
         case TCKind::tk_octet_l:
-          retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_octet);
+          if (!req_tc) retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_octet);
           retval->insert_octet (static_cast <const unsigned char &> (*value.begin_octet ()));
           break;
 
         case TCKind::tk_string_l:
-          retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_string);
-          retval->insert_string (ACE_TEXT_ALWAYS_CHAR (value.begin_string ()->c_str ()));
+          if (!req_tc) retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_string);
+          retval->insert_string (value.begin_string ()->c_str ());
           break;
 
         case TCKind::tk_longlong_l:
-          retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_longlong);
+          if (!req_tc) retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_longlong);
           retval->insert_longlong (CORBA::LongLong (static_cast < ::XMLSchema::long_ const& > (*value.begin_longlong ())));
           break;
 
         case TCKind::tk_ulonglong_l:
-          retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_ulonglong);
+          if (!req_tc) retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_ulonglong);
           retval->insert_ulonglong (CORBA::ULongLong (static_cast < ::XMLSchema::unsignedLong const& > (*value.begin_ulonglong ())));
           break;
 
-         case TCKind::tk_longdouble_l:
-           break;
-
         case TCKind::tk_wchar_l:
-          retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_wchar);
+          if (!req_tc) retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_wchar);
           retval->insert_wchar (CORBA::WChar (*value.begin_string ()->c_str ()));
           break;
 
-        case TCKind::tk_wstring_l:
-          break;
-
         case TCKind::tk_enum_l:
-          ACE_ERROR ((LM_ERROR, "Preparing to extract into enum\n"));
-          return DynEnum_Handler::extract_into_dynany (type, value);
+          return DynEnum_Handler::extract_into_dynany (type, value, req_tc);
+          
+        case TCKind::tk_sequence_l:
+          return DynSequence_Handler::extract_into_dynany (type, value, req_tc);
+          
+        case TCKind::tk_struct_l:
+          return DynStruct_Handler::extract_into_dynany (type, value, req_tc);
+
+        case TCKind::tk_alias_l:
+          return DynAlias_Handler::extract_into_dynany (type, value, req_tc);
 
+        case TCKind::tk_longdouble_l:
+        case TCKind::tk_wstring_l:
         case TCKind::tk_wfixed_l:
         case TCKind::tk_any_l:
         case TCKind::tk_TypeCode_l:
         case TCKind::tk_Principal_l:
         case TCKind::tk_objref_l:
-        case TCKind::tk_struct_l:
         case TCKind::tk_union_l:
-        case TCKind::tk_sequence_l:
         case TCKind::tk_array_l:
-        case TCKind::tk_alias_l:
         case TCKind::tk_except_l:
         case TCKind::tk_value_l:
         case TCKind::tk_value_box_l:
@@ -153,7 +162,7 @@ namespace CIAO
         case TCKind::tk_home_l:
         case TCKind::tk_event_l:
           ACE_ERROR ((LM_ERROR, "Type not supported\n"));
-          throw 1;
+          throw Config_Error ("", "Type not supported");
         }
 
       return retval._retn ();
@@ -201,11 +210,8 @@ namespace CIAO
           return Any (TCKind::tk_octet, val);
 
         case CORBA::tk_string:
-          {
-            CORBA::String_var owner = dyn->get_string ();
-            val.add_string (ACE_TEXT_CHAR_TO_TCHAR (owner.in ()));
-            return Any (TCKind::tk_string, val);
-          }
+          val.add_string (dyn->get_string ());
+          return Any (TCKind::tk_string, val);
 
         case CORBA::tk_longlong:
           val.add_longlong (dyn->get_longlong ());
@@ -235,9 +241,135 @@ namespace CIAO
         case ::CORBA::tk_null:
         default:
           ACE_ERROR ((LM_ERROR, "DynAny_Handler: I have no idea how to perform a referse mapping.\n"));
-          throw 1;
+          throw Config_Error ("", "reverse mapping for this type not supported");
         }
+    }
+    
+    CORBA::TypeCode_ptr 
+    DynAny_Handler::create_typecode (const DataType &type)
+    {
+      
+      switch (type.kind ().integral ())
+        {
+          // ========== BASIC TYPES
+        case TCKind::tk_null_l:
+        case TCKind::tk_void_l:
+          ACE_ERROR ((LM_WARNING, "I don't know how to handle null or void types\n"));
+          throw Config_Error ("", "Null or void types not supported");
+          break;
+
+        case TCKind::tk_short_l:
+          return CORBA::_tc_short;
+          break;
+
+        case TCKind::tk_long_l:
+          return CORBA::_tc_long;
+          break;
+
+        case TCKind::tk_ushort_l:
+          return CORBA::_tc_ushort;
+          break;
+
+        case TCKind::tk_ulong_l:
+          return CORBA::_tc_ulong;
+          break;
+
+        case TCKind::tk_float_l:
+          return CORBA::_tc_float;
+          break;
+
+        case TCKind::tk_double_l:
+          return CORBA::_tc_double;
+          break;
+
+        case TCKind::tk_boolean_l:
+          return CORBA::_tc_boolean;
+          break;
+
+        case TCKind::tk_char_l:
+          return CORBA::_tc_char;
+          break;
+
+        case TCKind::tk_octet_l:
+          return CORBA::_tc_octet;
+          break;
 
+        case TCKind::tk_string_l:
+          return CORBA::_tc_string;
+          break;
+
+        case TCKind::tk_longlong_l:
+          return CORBA::_tc_longlong;
+          break;
+
+        case TCKind::tk_ulonglong_l:
+          return CORBA::_tc_ulonglong;
+          break;
+
+        case TCKind::tk_longdouble_l:
+          break;
+
+        case TCKind::tk_wchar_l:
+          return CORBA::_tc_wchar;
+          break;
+
+        case TCKind::tk_wstring_l:
+          break;
+
+        case TCKind::tk_enum_l:
+          return DynEnum_Handler::create_typecode (type);
+          
+        case TCKind::tk_struct_l:
+          return DynStruct_Handler::create_typecode (type);
+
+        case TCKind::tk_sequence_l:
+          return DynSequence_Handler::create_typecode (type);
+
+        case TCKind::tk_alias_l:
+          return DynAlias_Handler::create_typecode (type);
+
+        case TCKind::tk_wfixed_l:
+        case TCKind::tk_any_l:
+        case TCKind::tk_TypeCode_l:
+        case TCKind::tk_Principal_l:
+        case TCKind::tk_objref_l:
+        case TCKind::tk_union_l:
+        case TCKind::tk_array_l:
+        case TCKind::tk_except_l:
+        case TCKind::tk_value_l:
+        case TCKind::tk_value_box_l:
+        case TCKind::tk_native_l:
+        case TCKind::tk_abstract_interface_l:
+        case TCKind::tk_local_interface_l:
+        case TCKind::tk_component_l:
+        case TCKind::tk_home_l:
+        case TCKind::tk_event_l:
+          ACE_ERROR ((LM_ERROR, "Type not supported\n"));
+          throw Config_Error ("", "Type not supported");
+        }
+      
+      return 0;
+    }
+    
+    void 
+    DynAny_Handler::register_typecode (const std::string typeID,
+                                       CORBA::TypeCode_ptr tc)
+    {
+      this->typecode_map_[typeID] = tc;
+    }
+    
+    
+    CORBA::TypeCode_ptr
+    DynAny_Handler::get_typecode (const std::string typeID)
+    {
+      try
+        {
+          return this->typecode_map_ [typeID];
+        }
+      catch (...)
+        {
+          return 0;
+        }
     }
   }
 }
diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h b/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h
index a209b3eae2c..cb4f3448b5a 100644
--- a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h
+++ b/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h
@@ -14,10 +14,13 @@
 
 #include "DynAny_Handler_Export.h"
 
+#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/ORB.h"
 #include "tao/DynamicAny/DynamicAny.h"
 #include "ace/Singleton.h"
 
+#include <map>
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -47,20 +50,30 @@ namespace CIAO
 
       ~DynAny_Handler (void);
 
-      DynamicAny::DynAny_ptr  extract_into_dynany (const DataType& type,
-                                                   const DataValue& value);
-
+      DynamicAny::DynAny_ptr  extract_into_dynany (const DataType &type,
+                                                   const DataValue &value,
+                                                   CORBA::TypeCode_ptr = 0);
+      
       Any extract_from_dynany (const CORBA::Any &any);
 
       CORBA::ORB_ptr orb ();
 
       DynamicAny::DynAnyFactory_ptr daf ();
+      
+      CORBA::TypeCode_ptr create_typecode (const DataType &type);
+      
+      void register_typecode (const std::string typeID,
+                              CORBA::TypeCode_ptr tc);
+      
+      CORBA::TypeCode_ptr get_typecode (const std::string typeID);
 
     private:
 
       CORBA::ORB_var orb_;
 
       DynamicAny::DynAnyFactory_var daf_;
+      
+      std::map <std::string, CORBA::TypeCode_ptr> typecode_map_;
     };
 
     typedef ACE_Singleton<DynAny_Handler, ACE_Null_Mutex> DynAny_Singleton;
diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h b/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h
index 970869a830d..78a3ee57b77 100644
--- a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h
+++ b/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h
@@ -9,10 +9,6 @@
 
 #include "ace/config-all.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DYNANY_HANDLER_HAS_DLL)
-#  define DYNANY_HANDLER_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DYNANY_HANDLER_HAS_DLL */
-
 #if !defined (DYNANY_HANDLER_HAS_DLL)
 #  define DYNANY_HANDLER_HAS_DLL 1
 #endif /* ! DYNANY_HANDLER_HAS_DLL */
diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp b/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
index 03b0e5c25da..0a525bf22d1 100644
--- a/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
@@ -1,10 +1,12 @@
 // $Id$
 
-#include "tao/AnyTypeCode/TypeCode.h"
 #include "DynEnum_Handler.h"
 #include "DynAny_Handler.h"
 
 #include "Basic_Deployment_Data.hpp"
+#include "Common.h"
+
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h"
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/AnyTypeCode/Enum_TypeCode.h"
@@ -16,12 +18,65 @@ namespace CIAO
   {
     DynamicAny::DynAny_ptr
     DynEnum_Handler::extract_into_dynany (const DataType &type,
-                                          const DataValue &value)
+                                          const DataValue &value,
+                                          CORBA::TypeCode_ptr req_tc)
+    {
+      try
+        {
+          CORBA::TypeCode_ptr tc;
+
+          if (req_tc)
+            tc = req_tc;
+          else
+            tc = DynEnum_Handler::create_typecode (type);
+
+          // Make the actual DynEnum
+          DynamicAny::DynAny_var temp =
+            DYNANY_HANDLER->daf ()->create_dyn_any_from_type_code (tc);
+          DynamicAny::DynEnum_var retval = DynamicAny::DynEnum::_narrow (temp.in ());
+
+          retval->set_as_string (value.begin_enum ()->c_str ());
+
+          return retval._retn ();
+        }
+      catch (DynamicAny::DynAny::InvalidValue)
+        {
+          ACE_ERROR ((LM_ERROR, "Invalid value provided in XML when trying to "
+                      "initialize an instance of enumerated type %s\n",
+                      type.enum_ ().typeId ().c_str ()));
+          throw Config_Error (type.enum_ ().typeId (),
+                              "Invalid value provided in XML");
+        }
+      catch (Config_Error &ex)
+        {
+          ACE_ERROR ((LM_ERROR, "DynEnum_Handler caught Config_Error\n"));
+          if (type.enum_p ())
+            ex.add_name (type.enum_ ().typeId ());
+
+          throw ex;
+        }
+      catch (...)
+        {
+          ACE_ERROR ((LM_ERROR, "DynEnum_Handler caught unknown exception\n"));
+          throw Config_Error (type.enum_ ().typeId (),
+                              "Unknown exception");
+        }
+    }
+
+    void
+    DynEnum_Handler::extract_out_of_dynany (const DynamicAny::DynAny_ptr dyn)
+    {
+      ACE_UNUSED_ARG (dyn);
+      ACE_ERROR ((LM_ERROR, "Extracting Enums not yet supported\n"));
+    }
+    
+    CORBA::TypeCode_ptr
+    DynEnum_Handler::create_typecode (const DataType &type)
     {
       if (!type.enum_p ())
         {
           ACE_ERROR ((LM_ERROR, "ERROR: Enum type descriptioin required"));
-          throw 1;
+          throw Config_Error ("", "Did not find expected enum type description, tk_kind may be wrong.");
         }
 
       // Construct TypeCode for the enum
@@ -33,39 +88,21 @@ namespace CIAO
            i != type.enum_ ().end_member ();
            ++i)
         {
-          members[index++] = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (i->c_str ()));
+          members[index++] = CORBA::string_dup (i->c_str ());
         }
 
-      // Grab pointer to the DynAny_Handler to use the orb and any factory.
-      //      DynAny_Handler *dah = DynAny_Handler::instance ();
-
-      CORBA::TypeCode_var tc =
-        DYNANY_HANDLER->orb ()->create_enum_tc (
-          ACE_TEXT_ALWAYS_CHAR (type.enum_ ().typeId ().c_str ()),
-          ACE_TEXT_ALWAYS_CHAR (type.enum_ ().name ().c_str ()),
-          members);
-
-      ACE_ERROR ((LM_ERROR, "Type: %s \nName: %s\nvalue: %s\n",
-                  type.enum_ ().typeId ().c_str (),
-                  type.enum_ ().name ().c_str (),
-                  value.begin_enum ()->c_str ()));
-
-      // Make the actual DynEnum
-      DynamicAny::DynAny_var temp =
-        DYNANY_HANDLER->daf ()->create_dyn_any_from_type_code (tc.in ());
-      DynamicAny::DynEnum_var retval = DynamicAny::DynEnum::_narrow (temp.in ());
-
-      retval->set_as_string (ACE_TEXT_ALWAYS_CHAR (value.begin_enum ()->c_str ()));
-
-      return retval._retn ();
-    }
-
-    void
-    DynEnum_Handler::extract_out_of_dynany (const DynamicAny::DynAny_ptr dyn)
-    {
-      ACE_UNUSED_ARG (dyn);
-      ACE_ERROR ((LM_ERROR, "Extracting Enums not yet supported\n"));
+      // @@ Leak this guy onto the heap to avoid a compile problem.
+      CORBA::TypeCode_ptr tc =
+        DYNANY_HANDLER->orb ()->create_enum_tc (type.enum_ ().typeId ().c_str (),
+                                     type.enum_ ().name ().c_str (),
+                                     members);
+      
+      DYNANY_HANDLER->register_typecode (type.enum_ ().typeId (),
+                                         tc);
+      
+      return tc;
     }
+    
   }
 }
 
diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h b/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h
index 009b8b37659..8eaa1f11897 100644
--- a/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h
+++ b/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h
@@ -35,9 +35,12 @@ namespace CIAO
     {
     public:
       static DynamicAny::DynAny_ptr extract_into_dynany (const DataType &type,
-                                                      const DataValue &value);
+                                                         const DataValue &value,
+                                                         CORBA::TypeCode_ptr = 0);
 
       static void extract_out_of_dynany (const DynamicAny::DynAny_ptr dyn);
+      
+      static CORBA::TypeCode_ptr create_typecode (const DataType &type);
     };
 
   }
diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp b/CIAO/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp
new file mode 100644
index 00000000000..fa86fefef76
--- /dev/null
+++ b/CIAO/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp
@@ -0,0 +1,163 @@
+// $Id$
+
+#include "DynSequence_Handler.h"
+#include "DynAny_Handler.h"
+
+#include "Basic_Deployment_Data.hpp"
+#include "Common.h"
+
+#include "ace/Null_Mutex.h"
+
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h"
+#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode.h"
+#include "tao/IFR_Client/IFR_BasicC.h"
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    DynamicAny::DynAny_ptr
+    DynSequence_Handler::extract_into_dynany (const DataType &type,
+                                              const DataValue &value,
+                                              CORBA::TypeCode_ptr req_tc)
+    {
+      CORBA::TypeCode_ptr tc;
+      if (req_tc)
+        tc = req_tc;
+      else
+        tc = DynSequence_Handler::create_typecode (type);
+      
+      // Make the actual DynSequence
+      DynamicAny::DynAny_var temp =
+        DYNANY_HANDLER->daf ()->create_dyn_any_from_type_code (tc);
+      DynamicAny::DynSequence_var retval = DynamicAny::DynSequence::_narrow (temp.in ());
+      
+      DynamicAny::DynAnySeq dynseq;
+      CORBA::ULong pos = 0;
+
+      switch (type.sequence ().elementType ().kind ().integral ())
+        {
+          // ========== BASIC TYPES
+        case TCKind::tk_null_l:
+        case TCKind::tk_void_l:
+        case TCKind::tk_objref_l:
+        case TCKind::tk_wfixed_l:
+        case TCKind::tk_component_l:
+        case TCKind::tk_home_l:
+
+          ACE_ERROR ((LM_WARNING, "I don't know how to handle null or void types\n"));
+          throw 1;
+
+        case TCKind::tk_short_l:
+        case TCKind::tk_long_l:
+        case TCKind::tk_ushort_l:
+        case TCKind::tk_ulong_l:
+        case TCKind::tk_float_l:
+        case TCKind::tk_double_l:
+        case TCKind::tk_boolean_l:
+        case TCKind::tk_octet_l:
+        case TCKind::tk_string_l:
+        case TCKind::tk_longlong_l:
+        case TCKind::tk_ulonglong_l:
+        case TCKind::tk_longdouble_l:
+        case TCKind::tk_wstring_l:
+        case TCKind::tk_enum_l:
+        case TCKind::tk_struct_l:
+          try
+            {
+              dynseq.length (value.count_element ());
+              retval->set_length (value.count_element ());
+              
+              for (DataValue::element_const_iterator i = value.begin_element ();
+                   i != value.end_element ();
+                   ++i)
+                {
+                  DynamicAny::DynAny_var dynany 
+                    (DYNANY_HANDLER->extract_into_dynany (type.sequence ().elementType (),
+                                                          *i));
+                  dynseq[pos++] = dynany->copy ();
+                }
+          
+              retval->set_elements_as_dyn_any (dynseq);
+              return retval._retn ();
+            }
+          catch (DynamicAny::DynAny::InvalidValue)
+            {
+              ACE_ERROR ((LM_ERROR, "Invalid value provided in XML when trying to "
+                          "populate %ith element of a sequence\n",
+                          pos));
+              throw Config_Error ("", "Invalid value whilst populating the sequence.");
+            }
+          
+        case TCKind::tk_char_l:
+        case TCKind::tk_wchar_l:
+          // special case where value iterataor multiplicity should be one, and should 
+          // represent a string, each character of which becomes a element of the sequence.
+
+        case TCKind::tk_sequence_l:
+        case TCKind::tk_array_l:
+          // Several special cases here.
+          
+        case TCKind::tk_any_l:
+        case TCKind::tk_TypeCode_l:
+        case TCKind::tk_Principal_l:
+        case TCKind::tk_union_l:
+        case TCKind::tk_alias_l:
+        case TCKind::tk_except_l:
+        case TCKind::tk_value_l:
+        case TCKind::tk_value_box_l:
+        case TCKind::tk_native_l:
+        case TCKind::tk_abstract_interface_l:
+        case TCKind::tk_local_interface_l:
+        case TCKind::tk_event_l:
+          // Special case where element association in datavalue contains another datavalue.
+          
+          ACE_ERROR ((LM_ERROR, "Type not supported\n"));
+          throw Config_Error ("", "Type not supported");
+        }
+      
+      return retval._retn ();
+    }
+    
+    void
+    DynSequence_Handler::extract_out_of_dynany (const DynamicAny::DynAny_ptr dyn)
+    {
+      ACE_UNUSED_ARG (dyn);
+      ACE_ERROR ((LM_ERROR, "Extracting Sequences not yet supported\n"));
+    }
+    
+    CORBA::TypeCode_ptr 
+    DynSequence_Handler::create_typecode (const DataType &type)
+    {
+      if (!type.sequence_p ())
+        {
+          ACE_ERROR ((LM_ERROR, "ERROR: Sequence type descriptioin required"));
+          throw Config_Error ("", "Expected <sequence> element, incorrect tc_kind.");
+        }
+      
+      CORBA::TypeCode_ptr etc = 
+        DYNANY_HANDLER->create_typecode (type.sequence ().elementType ());
+      
+      CORBA::ULong bound (0);
+      if (type.sequence ().bound_p ())
+        bound = type.sequence ().bound ();
+      
+      // @@ Leak this guy onto the heap to avoid a compile problem.
+      CORBA::TypeCode_ptr tc =
+        DYNANY_HANDLER->orb ()->create_sequence_tc (bound,
+                                                    etc);
+      
+      // Sequences don't have names.
+      //      DYNANY_HANDLER->register_typecode (type.sequence_ ().typeId (),
+      //                                   tc);
+      
+      return tc;
+    }
+    
+  }
+}
+
+
+  
diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.h b/CIAO/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.h
new file mode 100644
index 00000000000..7d6a5b6ba6c
--- /dev/null
+++ b/CIAO/tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.h
@@ -0,0 +1,52 @@
+/**
+ * $Id$
+ *
+ * @file DynSequence_Handler.h
+ * @author Will Otte <wotte@dre.vanderbilt.edu>
+ */
+
+#ifndef CIAO_CONFIG_HANDLERS_DYNSEQUENCE_HANDLER_H
+#define CIAO_CONFIG_HANDLERS_DYNSEQUENCE_HANDLER_H
+#include /**/ "ace/pre.h"
+
+#include "DynAny_Handler_Export.h"
+
+#include "tao/ORB.h"
+#include "tao/DynamicAny/DynamicAny.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    class Any;
+    class DataType;
+    class DataValue;
+
+    /**
+     * @class DynSequence_Handler
+     * @brief Translates sequences specified in deployment plans into Dynamic Anys
+     *
+     */
+    class DynSequence_Handler
+    {
+    public:
+      static DynamicAny::DynAny_ptr extract_into_dynany (const DataType &type,
+                                                         const DataValue &value,
+                                                         CORBA::TypeCode_ptr = 0);
+
+      static void extract_out_of_dynany (const DynamicAny::DynAny_ptr dyn);
+      
+      static CORBA::TypeCode_ptr create_typecode (const DataType &type);
+    };
+
+  }
+}
+
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_CONFIG_HANDLERS_DYNSEQUENCE_HANDLER_H*/
+
diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp b/CIAO/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp
new file mode 100644
index 00000000000..807cd72b53e
--- /dev/null
+++ b/CIAO/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp
@@ -0,0 +1,130 @@
+// $Id$
+
+#include "DynStruct_Handler.h"
+#include "DynAny_Handler.h"
+
+#include "Basic_Deployment_Data.hpp"
+#include "Common.h"
+
+#include "ace/Null_Mutex.h"
+
+//#include "tao/ORB.h"
+#include "tao/IFR_Client/IFR_BasicC.h"
+//#include "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h"
+
+#include "tao/AnyTypeCode/Struct_TypeCode.h"
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    void create_type_map (const DataType &type,
+                          std::map <std::string, DataType const *> &dt_map)
+    {
+      for (StructType::member_const_iterator i = type.struct_ ().begin_member ();
+           i != type.struct_ ().end_member (); ++i)
+        {
+          dt_map[i->name ()] = &(i->type ());
+        }
+    }
+
+    DynamicAny::DynAny_ptr
+    DynStruct_Handler::extract_into_dynany (const DataType &type,
+                                            const DataValue &value,
+                                            CORBA::TypeCode_ptr req_tc)
+    {
+      try
+        {
+          CORBA::TypeCode_ptr tc;
+
+          if (req_tc)
+            tc = req_tc;
+          else
+            tc = DynStruct_Handler::create_typecode (type);
+
+          std::map <std::string, DataType const*> dt_map;
+          create_type_map (type, dt_map);
+          
+          // Make the actual DynStruct
+          DynamicAny::DynAny_var temp =
+            DYNANY_HANDLER->daf ()->create_dyn_any_from_type_code (tc);
+          DynamicAny::DynStruct_var retval = DynamicAny::DynStruct::_narrow (temp.in ());
+          
+          CORBA::ULong pos (0);
+          DynamicAny::NameDynAnyPairSeq values;
+          values.length (value.count_member ());
+          
+          for (DataValue::member_const_iterator i = value.begin_member ();
+               i != value.end_member (); ++i)
+            {
+              values[pos].id = i->name ().c_str ();
+              values[pos].value = DYNANY_HANDLER->extract_into_dynany (*dt_map[i->name ()],
+                                                                       i->value ());
+              pos++;
+            }
+          
+          retval->set_members_as_dyn_any (values);
+          
+          return retval._retn ();
+        }
+      catch (Config_Error &ex)
+        {
+          if (type.struct_p ())
+            ex.add_name (type.struct_ ().typeId ());
+          throw ex;
+        }
+      catch (...)
+        {
+          throw Config_Error (type.struct_ ().typeId (),
+                              "Unknown exception");
+        }
+    }
+    
+    
+    void
+    DynStruct_Handler::extract_out_of_dynany (const DynamicAny::DynAny_ptr dyn)
+    {
+      ACE_UNUSED_ARG (dyn);
+      ACE_ERROR ((LM_ERROR, "Extracting Structs not yet supported\n"));
+    }
+    
+    CORBA::TypeCode_ptr 
+    DynStruct_Handler::create_typecode (const DataType &type)
+    {
+      if (!type.struct_p ())
+        {
+          ACE_ERROR ((LM_ERROR, "ERROR: Struct type descriptioin required"));
+          throw Config_Error ("", "Expected struct type information, tc_kind may be incorrect\n");
+        }
+      
+      std::string rid (type.struct_ ().typeId ());
+      std::string name (type.struct_ ().name ());
+      
+      CORBA::StructMemberSeq members;
+      members.length (type.struct_ ().count_member ());
+      CORBA::ULong pos (0);
+
+      for (StructType::member_const_iterator i = type.struct_ ().begin_member ();
+           i != type.struct_ ().end_member (); ++i)
+        {
+          members[pos].name = i->name ().c_str ();
+          members[pos].type = DYNANY_HANDLER->create_typecode (i->type ());
+          ++pos;
+        }
+
+      // @@ Leak this guy onto the heap to avoid a compile problem.
+      CORBA::TypeCode_ptr tc =
+        DYNANY_HANDLER->orb ()->create_struct_tc (rid.c_str (),
+                                                  name.c_str (),
+                                                  members);
+      
+      DYNANY_HANDLER->register_typecode (type.struct_ ().typeId (),
+                                         tc);
+      
+      return tc;
+    }
+  }
+}
+
+
+  
diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.h b/CIAO/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.h
new file mode 100644
index 00000000000..554912378c6
--- /dev/null
+++ b/CIAO/tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.h
@@ -0,0 +1,52 @@
+/**
+ * $Id$
+ *
+ * @file DynStruct_Handler.h
+ * @author Will Otte <wotte@dre.vanderbilt.edu>
+ */
+
+#ifndef CIAO_CONFIG_HANDLERS_DYNSTRUCT_HANDLER_H
+#define CIAO_CONFIG_HANDLERS_DYNSTRUCT_HANDLER_H
+#include /**/ "ace/pre.h"
+
+#include "DynAny_Handler_Export.h"
+#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
+#include "tao/ORB.h"
+#include "tao/DynamicAny/DynamicAny.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    class Any;
+    class DataType;
+    class DataValue;
+
+    /**
+     * @class DynStruct_Handler
+     * @brief Translates structs specified in deployment plans into Dynamic Anys
+     *
+     */
+    class DynStruct_Handler
+    {
+    public:
+      static DynamicAny::DynAny_ptr extract_into_dynany (const DataType &type,
+                                                         const DataValue &value,
+                                                         CORBA::TypeCode_ptr = 0);
+
+      static void extract_out_of_dynany (const DynamicAny::DynAny_ptr dyn);
+      
+      static CORBA::TypeCode_ptr create_typecode (const DataType &type);
+    };
+
+  }
+}
+
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_CONFIG_HANDLERS_DYNSTRUCT_HANDLER_H*/
+
diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/dynany_test.idl b/CIAO/tools/Config_Handlers/DynAny_Handler/dynany_test.idl
new file mode 100644
index 00000000000..0ffecc5c757
--- /dev/null
+++ b/CIAO/tools/Config_Handlers/DynAny_Handler/dynany_test.idl
@@ -0,0 +1,28 @@
+//$Id$
+module dynany_test
+{
+  typedef sequence<double> DoubleSequence;
+  typedef sequence<long> LongSequence;
+  typedef sequence<string, 3> StringSequence;
+  
+  enum COLOR
+    {
+      yellow,
+      blue,
+      black,
+      grey,
+      red
+    };
+
+  typedef sequence<COLOR> ColorSequence;
+  
+  struct Foo
+  {
+    double db;
+    LongSequence long_sequence;
+    StringSequence string_sequence;
+    ColorSequence color_sequence;
+  };
+  
+  typedef sequence<Foo> FooSequence;
+};
diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/test.cpp b/CIAO/tools/Config_Handlers/DynAny_Handler/test.cpp
new file mode 100644
index 00000000000..e03f21236b1
--- /dev/null
+++ b/CIAO/tools/Config_Handlers/DynAny_Handler/test.cpp
@@ -0,0 +1,291 @@
+// $Id$
+
+#include <iostream>
+
+#include "Deployment.hpp"
+#include "DP_Handler.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
+#include "ace/Get_Opt.h"
+#include "XML_Typedefs.h"
+#include "tao/ORB.h"
+#include "Common.h"
+#include "dynany_testC.h"
+#include "XML_File_Intf.h"
+
+static const char *input_file = "BasicSP.cdp";
+
+
+static int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "i:");
+
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'i':
+        input_file = get_opts.opt_arg ();
+        break;
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-i <input file> "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command-line
+  return 0;
+}
+
+using namespace CIAO::Config_Handlers;
+
+bool check_doubleseq (CORBA::Any &any)
+{
+  ACE_DEBUG ((LM_DEBUG, "Checking a double sequence\n"));
+
+  dynany_test::DoubleSequence *seq;
+  
+  if (!(any >>= seq))
+    {
+      ACE_ERROR ((LM_ERROR, "failed to extract double sequence\n"));
+      return false;
+    }
+  
+  static const CORBA::Double ref_seq[3] = {1.0, 2.0, 2.5};
+  
+  if (seq->length () != 3)
+    {
+      ACE_ERROR ((LM_ERROR, "Unexpected length of double sequence\n"));
+      return false;
+    }
+  
+  for (CORBA::ULong i = 0; i < seq->length (); ++i)
+    {
+      if ((*seq)[i] != ref_seq[i])
+        {
+          ACE_ERROR ((LM_ERROR, "Expected %ith element of double sequence "
+                      " to be %d, got %d instead.\n", i, (*seq)[i], ref_seq[i]));
+          return false;
+        }
+    }
+  
+  return true;
+}
+
+bool check_longseq (dynany_test::LongSequence *seq);
+
+bool check_longseq (CORBA::Any &any)
+{
+  dynany_test::LongSequence *seq;
+  
+  if (!(any >>= seq))
+    {
+      ACE_ERROR ((LM_ERROR, "failed to extract long sequence\n"));
+      return false;
+    }
+  
+  return check_longseq (seq);
+}
+
+bool check_longseq (dynany_test::LongSequence *seq)
+{
+  ACE_DEBUG ((LM_DEBUG, "Checking a long sequence\n"));
+
+  static const CORBA::Long ref_seq[3] = {1, 5, 6};
+  
+  if (seq->length () != 3)
+    {
+      ACE_ERROR ((LM_ERROR, "Unexpected length of long sequence\n"));
+      return false;
+    }
+  
+  for (CORBA::ULong i = 0; i < seq->length (); ++i)
+    {
+      if ((*seq)[i] != ref_seq[i])
+        {
+          ACE_ERROR ((LM_ERROR, "Expected %ith element of long sequence "
+                      " to be %i, got %i instead.\n", i, (*seq)[i], ref_seq[i]));
+          return false;
+        }
+    }
+  
+  return true;
+}
+
+
+bool check_stringseq (dynany_test::StringSequence *seq);
+
+bool check_stringseq (CORBA::Any &any)
+{
+  dynany_test::StringSequence *seq;
+  
+  if (!(any >>= seq))
+    {
+      ACE_ERROR ((LM_ERROR, "failed to extract string sequence\n"));
+      return false;
+    }
+  
+  return check_stringseq (seq);
+}  
+
+bool check_stringseq (dynany_test::StringSequence *seq)
+{
+  ACE_DEBUG ((LM_DEBUG, "Checking a string sequence\n"));
+
+  static const std::string ref_seq[3] = {"StringOne",
+                                         "StringTwo",
+                                         "StringThree"};
+  
+  if (seq->length () != 3)
+    {
+      ACE_ERROR ((LM_ERROR, "Unexpected length of string sequence\n"));
+      return false;
+    }
+  
+  for (CORBA::ULong i = 0; i < seq->length (); ++i)
+    {
+      std::string val ((*seq)[i].in ());
+
+      if (val != ref_seq[i])
+        {
+          ACE_ERROR ((LM_ERROR, "Expected %ith element of string sequence "
+                      " to be %i, got %i instead.\n", i, val.c_str (), ref_seq[i].c_str ()));
+          return false;
+        }
+    }
+  
+  return true;
+}
+
+bool check_colorseq (dynany_test::ColorSequence *seq);
+
+bool check_colorseq (CORBA::Any &any)
+{
+  dynany_test::ColorSequence *seq;
+  
+  if (!(any >>= seq))
+    {
+      ACE_ERROR ((LM_ERROR, "failed to extract color sequence\n"));
+      return false;
+    }
+
+  return check_colorseq (seq);
+}
+    
+bool check_colorseq (dynany_test::ColorSequence *seq)
+{
+  ACE_DEBUG ((LM_DEBUG, "Checking a color sequence\n"));
+
+  static const dynany_test::COLOR ref_seq[5] = {dynany_test::yellow, dynany_test::grey, dynany_test::red, 
+                                                dynany_test::blue, dynany_test::black};
+  
+  if (seq->length () != 5)
+    {
+      ACE_ERROR ((LM_ERROR, "Unexpected length of color sequence\n"));
+      return false;
+    }
+  
+  for (CORBA::ULong i = 0; i < seq->length (); ++i)
+    {
+      if ((*seq)[i] != ref_seq[i])
+        {
+          ACE_ERROR ((LM_ERROR, "Expected %ith element of color sequence "
+                      " to be %i, got %i instead.\n", i, (*seq)[i], ref_seq[i]));
+          return false;
+        }
+    }
+  
+  return true;
+}
+
+bool check_foo_struct (CORBA::Any &any)
+{
+  ACE_DEBUG ((LM_DEBUG, "Checking a foo struct\n"));
+
+  dynany_test::Foo *foo;
+  
+  if (!(any >>= foo))
+    {
+      ACE_ERROR ((LM_ERROR, "failed to extract foo struct\n"));
+      return false;
+    }
+  
+  // Check contents of foo struct
+  if (foo->db != 5.5)
+    {
+      ACE_ERROR ((LM_ERROR, "expected value of db field to be 5.5, for %d\n",
+                  foo->db));
+      return false;
+    }
+  
+  return check_colorseq (&foo->color_sequence) &&
+    check_longseq (&foo->long_sequence) &&
+    check_stringseq (&foo->string_sequence);
+}
+
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
+{
+  try
+    {
+      if (parse_args (argc, argv) != 0)
+    return 1;
+
+  // Initialize an ORB so Any will work
+  CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv);
+  ACE_UNUSED_ARG (orb);
+
+  //Create an XML_Helper for all the file work
+  
+  bool success (true);
+  
+  XML_File_Intf intf (input_file);
+  intf.add_search_path ("CIAO_ROOT", "/docs/schema/");
+  
+  if (intf.get_plan () != 0)
+    {
+      std::cout << "Instance document import succeeded.  Checking contents.\n";
+
+      //Retrieve the newly created IDL structure
+      Deployment::DeploymentPlan *idl = intf.release_plan();
+      
+      for (CORBA::ULong i = 0; i < idl->infoProperty.length (); ++i)
+        {
+          std::string name (idl->infoProperty[i].name.in ());
+          
+          if (name == "double_sequence")
+            success = success && check_doubleseq (idl->infoProperty[i].value);
+          if (name == "long_sequence")
+            success = success && check_longseq (idl->infoProperty[i].value);
+          if (name == "string_sequence")
+            success = success && check_stringseq (idl->infoProperty[i].value);
+          if (name == "color_sequence")
+            success = success && check_colorseq (idl->infoProperty[i].value);
+          if (name == "foo_struct")
+            success = success && check_foo_struct (idl->infoProperty[i].value);
+        }
+      delete idl;
+
+      
+    }
+  
+  if (success)
+    return 0;
+  else
+    {
+      ACE_ERROR((LM_ERROR, "Some test failures occurred, bailing out."));
+      return -1;
+    }
+    }
+  catch (CIAO::Config_Handlers::Config_Error &ex)
+    {
+      ACE_ERROR ((LM_ERROR, "Caught config_error: %s:%s\n",
+                  ex.name_.c_str (), ex.error_.c_str ()));
+      return -1;
+    }
+}
+
+
diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/test.mpc b/CIAO/tools/Config_Handlers/DynAny_Handler/test.mpc
new file mode 100644
index 00000000000..b4124683c7a
--- /dev/null
+++ b/CIAO/tools/Config_Handlers/DynAny_Handler/test.mpc
@@ -0,0 +1,16 @@
+// $Id$
+project (XSC_DynAny_Test) : ciao_config_handlers, ifr_client, taoidldefaults {
+  requires += dummy_label
+  exename = test
+  macros   += XML_USE_PTHREADS
+
+  IDL_Files {
+    dynany_test.idl
+  }
+
+  Source_Files {
+    test.cpp
+  }
+}
+
+
diff --git a/CIAO/tools/Config_Handlers/ERE_Handler.cpp b/CIAO/tools/Config_Handlers/ERE_Handler.cpp
index 5cd3dc2ccb1..8a8a8f31666 100644
--- a/CIAO/tools/Config_Handlers/ERE_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/ERE_Handler.cpp
@@ -25,7 +25,7 @@ namespace CIAO
            ++erep_b)
         {
           ERE_Handler::handle_external_ref_endpoint ((*erep_b),
-                                              dest[pos++]);
+                                                     dest[pos++]);
         }
     }
 
@@ -35,8 +35,14 @@ namespace CIAO
                                         Deployment::ExternalReferenceEndpoint &dest)
     {
       CIAO_TRACE("ERE_Handler::external_ref_endpoint");
-      dest.location =
-        ACE_TEXT_ALWAYS_CHAR (src.location ().c_str ());
+      dest.location = src.location ().c_str ();
+      dest.provider = src.provider ();
+      if (src.portName_p ())
+        dest.portName = src.portName ().c_str ();
+      dest.supportedType.length (src.count_supportedType ());
+      std::for_each (src.begin_supportedType (),
+                     src.end_supportedType (),
+                     String_Seq_Functor (dest.supportedType));
     }
 
     ExternalReferenceEndpoint
@@ -44,8 +50,11 @@ namespace CIAO
                                         const Deployment::ExternalReferenceEndpoint& src)
     {
       CIAO_TRACE("ERE_Handler::external_ref_endpoint - reverse");
-      XMLSchema::string< ACE_TCHAR > loc (ACE_TEXT_CHAR_TO_TCHAR (src.location.in ()));
-      ExternalReferenceEndpoint erp (loc);
+      XMLSchema::string< char > loc ((src.location));
+      //      XMLSchema::string< char > provider ((src.provider));
+      XMLSchema::string< char > pn ((src.portName));
+      //      XMLSchema::string< char > st ((src.supportedType));
+      ExternalReferenceEndpoint erp (loc, src.provider);
       return erp;
     }
   }
diff --git a/CIAO/tools/Config_Handlers/ERE_Handler.h b/CIAO/tools/Config_Handlers/ERE_Handler.h
index 77e0a125b96..9d1fc412bce 100644
--- a/CIAO/tools/Config_Handlers/ERE_Handler.h
+++ b/CIAO/tools/Config_Handlers/ERE_Handler.h
@@ -28,42 +28,42 @@ namespace Deployment
 
 namespace CIAO
 {
+
   namespace Config_Handlers
-  {
-    class PlanConnectionDescription;
-    class ExternalReferenceEndpoint;
+    {
+      class PlanConnectionDescription;
+      class ExternalReferenceEndpoint;
 
-    /*
-     * @class ERE_Handler
-     *
-     * @brief Handler class for <ExternalReferenceEndpoint> types.
-     *
-     * This class defines handler methods to map values from
-     * XSC ExternalReferenceEndpoint objects, parsed from
-     * the descriptor files, to the corresponding CORBA IDL type.
-     */
+      /*
+       * @class ERE_Handler
+       *
+       * @brief Handler class for <ExternalReferenceEndpoint> types.
+       *
+       * This class defines handler methods to map values from
+       * XSC ExternalReferenceEndpoint objects, parsed from
+       * the descriptor files, to the corresponding CORBA IDL type.
+       *
+       */
 
-      class Config_Handlers_Common_Export ERE_Handler
-      {
-      public:
-        static void external_ref_endpoints (
-            const PlanConnectionDescription &src,
-            ::Deployment::ExternalReferenceEndpoints &dest);
+  class Config_Handlers_Common_Export ERE_Handler
+    {
+    public:
+      static void external_ref_endpoints (const PlanConnectionDescription &src,
+                          ::Deployment::ExternalReferenceEndpoints &dest);
 
-        static ExternalReferenceEndpoint external_ref_endpoint (
-            const Deployment::ExternalReferenceEndpoint& src);
+      static ExternalReferenceEndpoint external_ref_endpoint (
+                                  const Deployment::ExternalReferenceEndpoint& src);
 
-        static void handle_external_ref_endpoint (
-            const ExternalReferenceEndpoint &src,
-            Deployment::ExternalReferenceEndpoint &dest);
+      static void handle_external_ref_endpoint (const ExternalReferenceEndpoint &src,
+                         Deployment::ExternalReferenceEndpoint &dest);
     };
 
-    typedef Sequence_Handler < ExternalReferenceEndpoint,
-                               ::Deployment::ExternalReferenceEndpoints,
-                               ::Deployment::ExternalReferenceEndpoint,
-                               ERE_Handler::handle_external_ref_endpoint >
-      ERE_Functor;
-  }
+      typedef Sequence_Handler < ExternalReferenceEndpoint,
+    ::Deployment::ExternalReferenceEndpoints,
+    ::Deployment::ExternalReferenceEndpoint,
+    ERE_Handler::handle_external_ref_endpoint > ERE_Functor;
+
+    }
 }
 
 #include /**/ "ace/post.h"
diff --git a/CIAO/tools/Config_Handlers/ESD_Handler.h b/CIAO/tools/Config_Handlers/ESD_Handler.h
index 9d3e968e05e..b20828a9713 100644
--- a/CIAO/tools/Config_Handlers/ESD_Handler.h
+++ b/CIAO/tools/Config_Handlers/ESD_Handler.h
@@ -52,8 +52,7 @@ namespace CIAO
           const DeploymentPlan &src,
           ::Deployment::EventServiceDeploymentDescriptions& dest);
 
-      static EventServiceDeploymentDescription es_deployment_descr (
-          const Deployment::EventServiceDeploymentDescription &src);
+      static EventServiceDeploymentDescription es_deployment_descr (const Deployment::EventServiceDeploymentDescription &src);
 
       static IDREF_Base<CORBA::ULong> IDREF;
 
diff --git a/CIAO/tools/Config_Handlers/IDD_Handler.cpp b/CIAO/tools/Config_Handlers/IDD_Handler.cpp
index 2a1f017be3c..6beded8c2a7 100644
--- a/CIAO/tools/Config_Handlers/IDD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/IDD_Handler.cpp
@@ -17,16 +17,16 @@ namespace CIAO
     IDREF_Base<CORBA::ULong> IDD_Handler::IDREF;
 
     void
-    IDD_Handler::instance_deployment_descrs (const DeploymentPlan &src,
+    IDD_Handler::instance_deployment_descrs (const deploymentPlan &src,
                                              Deployment::InstanceDeploymentDescriptions& dest)
     {
       CIAO_TRACE("IDD_Handler::instance_deployment_descrs");
-      DeploymentPlan::instance_const_iterator idd_e =
+      deploymentPlan::instance_const_iterator idd_e =
         src.end_instance ();
 
       CORBA::ULong pos = 0;
       dest.length (src.count_instance ());
-      for (DeploymentPlan::instance_const_iterator idd_b =
+      for (deploymentPlan::instance_const_iterator idd_b =
              src.begin_instance ();
            idd_b != idd_e;
            ++idd_b)
@@ -38,19 +38,20 @@ namespace CIAO
     }
 
     void
-    IDD_Handler::instance_deployment_descr (const InstanceDeploymentDescription& src,
+    IDD_Handler::instance_deployment_descr (
+                                            const InstanceDeploymentDescription& src,
                                             Deployment::InstanceDeploymentDescription& dest,
                                             CORBA::ULong pos)
     {
       CIAO_TRACE("IDD_Handler::instance_deployment_descr");
       try
         {
-          dest.name = ACE_TEXT_ALWAYS_CHAR (src.name ().c_str ());
-          dest.node = ACE_TEXT_ALWAYS_CHAR (src.node ().c_str ());
+          dest.name = src.name ().c_str ();
+          dest.node = src.node ().c_str ();
 
-          if (src.id_p ())
+          if (src.xmi_id_p ())
             {
-              ACE_CString cstr (ACE_TEXT_ALWAYS_CHAR (src.id ().c_str ()));
+              ACE_CString cstr (src.xmi_id ().c_str ());
               IDD_Handler::IDREF.bind_ref (cstr, pos);
             }
           else
@@ -63,20 +64,19 @@ namespace CIAO
           // We know there should be only one element
           dest.source.length (1);
           dest.source [0] =
-            ACE_TEXT_ALWAYS_CHAR (src.source ().c_str ());
+            src.source ().c_str ();
 
           CORBA::ULong tmp = 0;
-          MDD_Handler::IDREF.find_ref (
-            ACE_CString (ACE_TEXT_ALWAYS_CHAR (src.implementation ().id ().c_str ())),
-            tmp);
+          MDD_Handler::IDREF.find_ref
+            (ACE_CString (src.implementation ().idref ().id ().c_str ()), tmp);
 
           dest.implementationRef = tmp;
-
+          
           dest.configProperty.length (src.count_configProperty ());
           std::for_each (src.begin_configProperty (),
                          src.end_configProperty (),
                          Property_Functor (dest.configProperty));
-
+          
           dest.deployedResource.length (src.count_deployedResource ());
           std::for_each (src.begin_deployedResource (),
                          src.end_deployedResource (),
@@ -92,37 +92,49 @@ namespace CIAO
         }
       catch (Config_Error &ex)
         {
-          ex.name_ = ACE_TEXT_ALWAYS_CHAR (src.name ().c_str ())  + std::string (":") + ex.name_;
+          ex.name_ = src.name ()  + ":" + ex.name_;
           throw ex;
         }
+      catch (...)
+        {
+          ACE_ERROR ((LM_ERROR, "Unknown exception at IDD:%s",
+                      src.name ().c_str ()));
+          throw Config_Error (src.name (), "Unknown exception");
+        }
+            
       // Done!
     }
 
     InstanceDeploymentDescription
-    IDD_Handler::instance_deployment_descr (const Deployment::InstanceDeploymentDescription& src)
+    IDD_Handler::instance_deployment_descr (
+                                            const Deployment::InstanceDeploymentDescription& src)
     {
       CIAO_TRACE("IDD_Handler::instance_deployment_descr - reverse");
       //Get all the string/IDREFs
-      XMLSchema::string < ACE_TCHAR > name (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()));
-      XMLSchema::string < ACE_TCHAR > node (ACE_TEXT_CHAR_TO_TCHAR (src.node.in ()));
-      XMLSchema::string < ACE_TCHAR > source (ACE_TEXT (""));
+      XMLSchema::string < ACE_TCHAR > name ((src.name));
+      XMLSchema::string < ACE_TCHAR > node ((src.node));
+      XMLSchema::string < ACE_TCHAR > source ("");
       if (src.source.length () > 0)
         {
-          XMLSchema::string < ACE_TCHAR > source_detail (ACE_TEXT_CHAR_TO_TCHAR (src.source[0].in ()));
+          XMLSchema::string < ACE_TCHAR > source_detail (src.source[0]);
           source = source_detail;
         }
       ACE_CString temp;
       MDD_Handler::IDREF.find_ref(src.implementationRef, temp);
-      XMLSchema::IDREF< ACE_TCHAR > implementation (ACE_TEXT_CHAR_TO_TCHAR (temp.c_str()));
+      XMLSchema::IDREF< ACE_TCHAR > implementation ((temp.c_str()));
 
       // Instantiate the IDD
-      InstanceDeploymentDescription idd (name, node, source, implementation);
+      IdRef xid;
+      xid.idref (implementation);
+      InstanceDeploymentDescription idd (name, node, source, xid);
 
       //Get and store the configProperty(s)
       size_t total = src.configProperty.length();
       for(size_t j = 0; j < total; j++)
         {
-          idd.add_configProperty(Property_Handler::get_property (src.configProperty[j]));
+          idd.add_configProperty(
+                                 Property_Handler::get_property (
+                                                                 src.configProperty[j]));
         }
 
       // Get and store the deployedResource(s)
@@ -142,14 +154,15 @@ namespace CIAO
       ACE_CString idd_id ("_");
       idd_id += *uuid.to_string ();
 
-      XMLSchema::ID< ACE_TCHAR > xml_id (ACE_TEXT_CHAR_TO_TCHAR (idd_id.c_str ()));
+      XMLSchema::ID< ACE_TCHAR > xml_id (idd_id.c_str ());
 
       // Bind the ref and set it in the IDD
       IDD_Handler::IDREF.bind_next_available (idd_id);
 
-      idd.id (xml_id);
+      idd.xmi_id (xml_id);
 
       return idd;
     }
+
   }
 }
diff --git a/CIAO/tools/Config_Handlers/IDD_Handler.h b/CIAO/tools/Config_Handlers/IDD_Handler.h
index d23b9643cc8..313b7d9e6b2 100644
--- a/CIAO/tools/Config_Handlers/IDD_Handler.h
+++ b/CIAO/tools/Config_Handlers/IDD_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
-*  @file  IDD_Handler.h
-*
-*  $Id$
-*
-*  @author Jules White <jules@dre.vanderbilt.edu>
-*/
+ *  @file  IDD_Handler.h
+ *
+ *  $Id$
+ *
+ *  @author Jules White <jules@dre.vanderbilt.edu>
+ */
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_IDD_HANDLER_H
@@ -23,50 +23,47 @@
 
 namespace Deployment
 {
-struct InstanceDeploymentDescription;
-class InstanceDeploymentDescriptions;
-struct InstanceResourceDeploymentDescription;
+  struct InstanceDeploymentDescription;
+  class InstanceDeploymentDescriptions;
+  struct InstanceResourceDeploymentDescription;
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-class DeploymentPlan;
-class InstanceDeploymentDescription;
-class InstanceResourceDeploymentDescription;
+  namespace Config_Handlers
+    {
+      class deploymentPlan;
+      class InstanceDeploymentDescription;
+      class InstanceResourceDeploymentDescription;
 
-/*
-* @class IDD_Handler
-*
-* @brief Handler class for <InstanceDeploymentDescription> types.
-*
-* This class defines handler methods to map values from
-* XSC InstanceDeploymentDescriptionn objects, parsed from
-* the descriptor files, to the corresponding CORBA IDL type.
-*
-*/
+      /*
+       * @class IDD_Handler
+       *
+       * @brief Handler class for <InstanceDeploymentDescription> types.
+       *
+       * This class defines handler methods to map values from
+       * XSC InstanceDeploymentDescriptionn objects, parsed from
+       * the descriptor files, to the corresponding CORBA IDL type.
+       *
+       */
 
-class Config_Handlers_Export IDD_Handler
-{
-public:
-static void instance_deployment_descrs (
-const DeploymentPlan &src,
-::Deployment::InstanceDeploymentDescriptions& dest);
+      class Config_Handlers_Export IDD_Handler
+        {
+        public:
+          static void instance_deployment_descrs (const deploymentPlan &src,
+                                                  ::Deployment::InstanceDeploymentDescriptions& dest);
 
-static InstanceDeploymentDescription instance_deployment_descr (
-const Deployment::InstanceDeploymentDescription &src);
+          static InstanceDeploymentDescription instance_deployment_descr (const Deployment::InstanceDeploymentDescription &src);
 
-static IDREF_Base<CORBA::ULong> IDREF;
+          static IDREF_Base<CORBA::ULong> IDREF;
 
-private:
-static void instance_deployment_descr (
-const InstanceDeploymentDescription &src,
-::Deployment::InstanceDeploymentDescription &dest,
-CORBA::ULong pos);
+        private:
+          static void instance_deployment_descr (const InstanceDeploymentDescription &src,
+                                                 ::Deployment::InstanceDeploymentDescription &dest,
+                                                 CORBA::ULong pos);
 
-};
-}
+        };
+    }
 }
 
 #include /**/ "ace/post.h"
diff --git a/CIAO/tools/Config_Handlers/IDREF_Base.h b/CIAO/tools/Config_Handlers/IDREF_Base.h
index 99e325be875..643b4a3fb3d 100644
--- a/CIAO/tools/Config_Handlers/IDREF_Base.h
+++ b/CIAO/tools/Config_Handlers/IDREF_Base.h
@@ -46,15 +46,15 @@ IDREF_Base (T start_point)
 }
 
 /// Bind an IDREF to an index
-void bind_ref (ACE_CString& id, T value);
+ void bind_ref (ACE_CString& id, T value);
 
 void bind_next_available (ACE_CString &id);
 
 /// Get the index associated with an IDREF
-void find_ref (const ACE_CString& id, T& value);
+ void find_ref (const ACE_CString& id, T& value);
 
 /// get the IDREF associated with an index
-void find_ref (const T &value, ACE_CString& id);
+ void find_ref (const T &value, ACE_CString& id);
 
 /// Unbind all IDREFS
 bool
diff --git a/CIAO/tools/Config_Handlers/ID_Handler.cpp b/CIAO/tools/Config_Handlers/ID_Handler.cpp
index 572827582c8..b2e888338e0 100644
--- a/CIAO/tools/Config_Handlers/ID_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/ID_Handler.cpp
@@ -25,7 +25,7 @@ namespace CIAO
       CIAO_TRACE("ID_Handler::get_ImplementationDependency");
       
       toconfig.requiredType=
-        CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (desc.requiredType ().c_str ()));
+        CORBA::string_dup (desc.requiredType ().c_str ());
     }
 
     ImplementationDependency
@@ -33,7 +33,7 @@ namespace CIAO
                                  const ::Deployment::ImplementationDependency& src)
     {
       CIAO_TRACE("ID_Handler::get_ImplementationDependency - reverse");
-      XMLSchema::string< ACE_TCHAR > reqtype (ACE_TEXT_CHAR_TO_TCHAR (src.requiredType.in ()));
+      XMLSchema::string< char > reqtype ((src.requiredType));
 
       ImplementationDependency id (reqtype);
 
diff --git a/CIAO/tools/Config_Handlers/IRDD_Handler.cpp b/CIAO/tools/Config_Handlers/IRDD_Handler.cpp
index 5c060d08792..f834fcbd192 100644
--- a/CIAO/tools/Config_Handlers/IRDD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/IRDD_Handler.cpp
@@ -50,14 +50,14 @@ namespace CIAO
           break;
 
         default:
-          throw Config_Error (ACE_TEXT_ALWAYS_CHAR (desc.requirementName ().c_str ()),
+          throw Config_Error (desc.requirementName (),
                               "Unknown ResourceUsageKind.");
           break;
         }
 
-      toconfig.requirementName = ACE_TEXT_ALWAYS_CHAR (desc.requirementName ().c_str ());
+      toconfig.requirementName = desc.requirementName ().c_str ();
 
-      toconfig.resourceName= ACE_TEXT_ALWAYS_CHAR (desc.resourceName ().c_str ());
+      toconfig.resourceName= desc.resourceName ().c_str ();
 
       toconfig.property.length (desc.count_property ());
       std::for_each (desc.begin_property (),
@@ -70,8 +70,8 @@ namespace CIAO
     {
       CIAO_TRACE("IRDD_Handler::instance_resource_deployment_descr - reverse");
 
-      XMLSchema::string< ACE_TCHAR > reqname (ACE_TEXT_CHAR_TO_TCHAR (src.requirementName.in ()));
-      XMLSchema::string< ACE_TCHAR > resname (ACE_TEXT_CHAR_TO_TCHAR (src.resourceName.in ()));
+      XMLSchema::string< char > reqname ((src.requirementName));
+      XMLSchema::string< char > resname ((src.resourceName));
 
       InstanceResourceDeploymentDescription irdd (ResourceUsageKind::None,
                                                   reqname,
@@ -114,4 +114,5 @@ namespace CIAO
       return irdd;
     }
   }
+
 }
diff --git a/CIAO/tools/Config_Handlers/IRDD_Handler.h b/CIAO/tools/Config_Handlers/IRDD_Handler.h
index baeccef9b48..af641813e26 100644
--- a/CIAO/tools/Config_Handlers/IRDD_Handler.h
+++ b/CIAO/tools/Config_Handlers/IRDD_Handler.h
@@ -48,23 +48,24 @@ namespace CIAO
        * corresponding CORBA IDL Any type.
        *
        */
-      class Config_Handlers_Export IRDD_Handler 
-      {
+      class Config_Handlers_Export IRDD_Handler {
       public:
-        IRDD_Handler (void);
-        virtual ~IRDD_Handler (void);
+    IRDD_Handler (void);
+    virtual ~IRDD_Handler (void);
 
-        static void handle_irdd (const InstanceResourceDeploymentDescription& desc,
-                                 Deployment::InstanceResourceDeploymentDescription& toconfig);
+    static void handle_irdd (const InstanceResourceDeploymentDescription& desc,
+                            Deployment::InstanceResourceDeploymentDescription& toconfig)
+      /*throw (Config_Error)*/;
 
-        static InstanceResourceDeploymentDescription
-        instance_resource_deployment_descr (const Deployment::InstanceResourceDeploymentDescription& src);
+    static InstanceResourceDeploymentDescription
+      instance_resource_deployment_descr (const Deployment::InstanceResourceDeploymentDescription& src)
+      /*throw (Config_Error)*/;
       };
 
       typedef Sequence_Handler < InstanceResourceDeploymentDescription,
-                                 ::Deployment::InstanceResourceDeploymentDescriptions,
-                                 ::Deployment::InstanceResourceDeploymentDescription,
-                                 IRDD_Handler::handle_irdd > IRDD_Functor;
+                 ::Deployment::InstanceResourceDeploymentDescriptions,
+                 ::Deployment::InstanceResourceDeploymentDescription,
+                 IRDD_Handler::handle_irdd > IRDD_Functor;
     }
 }
 
diff --git a/CIAO/tools/Config_Handlers/MDD_Handler.cpp b/CIAO/tools/Config_Handlers/MDD_Handler.cpp
index 6bd0ec04c0a..7e44a95b62c 100644
--- a/CIAO/tools/Config_Handlers/MDD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/MDD_Handler.cpp
@@ -16,17 +16,16 @@ namespace CIAO
     IDREF_Base<CORBA::ULong> MDD_Handler::IDREF;
 
     void
-    MDD_Handler::mono_deployment_descriptions (
-                                               const DeploymentPlan& src,
+    MDD_Handler::mono_deployment_descriptions (const deploymentPlan& src,
                                                Deployment::MonolithicDeploymentDescriptions& dest)
     {
       CIAO_TRACE("MDD_Handler::mono_deployment_descriptions");
 
-      DeploymentPlan::implementation_const_iterator imp_e =
+      deploymentPlan::implementation_const_iterator imp_e =
         src.end_implementation ();
       CORBA::ULong pos = 0;
       dest.length (src.count_implementation ());
-      for (DeploymentPlan::implementation_const_iterator imp_b =
+      for (deploymentPlan::implementation_const_iterator imp_b =
              src.begin_implementation ();
            imp_b != imp_e;
            ++imp_b)
@@ -39,13 +38,12 @@ namespace CIAO
     }
 
     void
-    MDD_Handler::mono_deployment_description (
-                                              const MonolithicDeploymentDescription& desc,
+    MDD_Handler::mono_deployment_description (const MonolithicDeploymentDescription& desc,
                                               Deployment::MonolithicDeploymentDescription& toconfig,
                                               CORBA::ULong pos)
     {
       toconfig.name =
-        CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ()));
+        CORBA::string_dup (desc.name ().c_str ());
 
       MonolithicDeploymentDescription::source_const_iterator me =
         desc.end_source ();
@@ -58,7 +56,7 @@ namespace CIAO
            ++se)
         {
           toconfig.source[len++] =
-            CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR ((*se).c_str ()));
+            CORBA::string_dup ((*se).c_str ());
         }
 
       MonolithicDeploymentDescription::artifact_const_iterator ae =
@@ -72,9 +70,8 @@ namespace CIAO
         {
           CORBA::ULong tmp = 0;
 
-          ADD_Handler::IDREF.find_ref (
-            ACE_CString (ACE_TEXT_ALWAYS_CHAR (ab->id ().c_str ())),
-            tmp);
+          ADD_Handler::IDREF.find_ref (ACE_CString (ab->idref ().id ().c_str ()),
+                                       tmp);
 
           toconfig.artifactRef[len++] = tmp;
         }
@@ -98,9 +95,9 @@ namespace CIAO
                      Requirement_Functor (toconfig.deployRequirement));
 
       // Handle the idref
-      if (desc.id_p ())
+      if (desc.xmi_id_p ())
         {
-          ACE_CString cstr (ACE_TEXT_ALWAYS_CHAR (desc.id ().c_str ()));
+          ACE_CString cstr (desc.xmi_id ().c_str ());
 
           MDD_Handler::IDREF.bind_ref (cstr, pos);
         }
@@ -120,14 +117,14 @@ namespace CIAO
       CIAO_TRACE("mono_deployment_description - reverse");
 
       //Get the name and instantiate the mdd
-      XMLSchema::string < ACE_TCHAR > name (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()));
+      XMLSchema::string < char > name ((src.name));
       MonolithicDeploymentDescription mdd (name);
 
       //Get the source(s) from the IDL and store them
       size_t total = src.source.length();
       for(size_t i = 0; i < total; i++)
         {
-          XMLSchema::string< ACE_TCHAR > curr (ACE_TEXT_CHAR_TO_TCHAR (src.source[i].in ()));
+          XMLSchema::string< char > curr ((src.source[i]));
           mdd.add_source(curr);
         }
 
@@ -137,8 +134,9 @@ namespace CIAO
         {
           ACE_CString tmp;
           ADD_Handler::IDREF.find_ref(src.artifactRef[j], tmp);
-          XMLSchema::IDREF< ACE_TCHAR > curr(ACE_TEXT_CHAR_TO_TCHAR (tmp.c_str()));
-          mdd.add_artifact (curr);
+          IdRef idref;
+          idref.idref (tmp.c_str ());
+          mdd.add_artifact (idref);
         }
 
       //Get the execParameter(s) from the IDL and store them
@@ -163,12 +161,12 @@ namespace CIAO
       ACE_CString mdd_id ("_");
       mdd_id += *uuid.to_string ();
 
-      XMLSchema::ID< ACE_TCHAR > xml_id (ACE_TEXT_CHAR_TO_TCHAR (mdd_id.c_str ()));
+      XMLSchema::ID< ACE_TCHAR > xml_id (mdd_id.c_str ());
 
       // Bind the ref and set it in the IDD
       MDD_Handler::IDREF.bind_next_available (mdd_id);
 
-      mdd.id (xml_id);
+      mdd.xmi_id (xml_id);
 
       return mdd;
     }
diff --git a/CIAO/tools/Config_Handlers/MDD_Handler.h b/CIAO/tools/Config_Handlers/MDD_Handler.h
index 2d95ff71e2d..c36efe6885b 100644
--- a/CIAO/tools/Config_Handlers/MDD_Handler.h
+++ b/CIAO/tools/Config_Handlers/MDD_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
-*  @file  MDD_Handler.h
-*
-*  $Id$
-*
-*  @author Jules White <jules@dre.vanderbilt.edu>
-*/
+ *  @file  MDD_Handler.h
+ *
+ *  $Id$
+ *
+ *  @author Jules White <jules@dre.vanderbilt.edu>
+ */
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_MDD_Handler_H
@@ -22,49 +22,46 @@
 
 namespace Deployment
 {
-struct MonolithicDeploymentDescription;
-class MonolithicDeploymentDescriptions;
+  struct MonolithicDeploymentDescription;
+  class MonolithicDeploymentDescriptions;
 }
 
 
 namespace CIAO
 {
 
-namespace Config_Handlers
-{
-class MonolithicDeploymentDescription;
-class DeploymentPlan;
+  namespace Config_Handlers
+    {
+      class MonolithicDeploymentDescription;
+      class deploymentPlan;
 
-/*
-* @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 types.
-*
-*/
+      /*
+       * @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 types.
+       *
+       */
 
-class Config_Handlers_Export MDD_Handler
-{
-public:
-static void mono_deployment_descriptions (
-const DeploymentPlan &src,
-Deployment::MonolithicDeploymentDescriptions &dest);
+      class Config_Handlers_Export MDD_Handler
+        {
+        public:
+          static void mono_deployment_descriptions (const deploymentPlan &src,
+                                                    Deployment::MonolithicDeploymentDescriptions &dest);
 
-static MonolithicDeploymentDescription mono_deployment_description(
-const Deployment::MonolithicDeploymentDescription &src);
+          static MonolithicDeploymentDescription mono_deployment_description(const Deployment::MonolithicDeploymentDescription &src);
 
-static IDREF_Base<CORBA::ULong> IDREF;
+          static IDREF_Base<CORBA::ULong> IDREF;
 
-private:
-static void mono_deployment_description (
-const MonolithicDeploymentDescription& desc,
-Deployment::MonolithicDeploymentDescription& toconfig,
-CORBA::ULong pos);
-};
-}
+        private:
+          static void mono_deployment_description (const MonolithicDeploymentDescription& desc,
+                                                   Deployment::MonolithicDeploymentDescription& toconfig,
+                                                   CORBA::ULong pos);
+        };
+    }
 }
 
 #include /**/ "ace/post.h"
diff --git a/CIAO/tools/Config_Handlers/PCD_Handler.cpp b/CIAO/tools/Config_Handlers/PCD_Handler.cpp
index 9647554bbb1..071194d778a 100644
--- a/CIAO/tools/Config_Handlers/PCD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/PCD_Handler.cpp
@@ -31,7 +31,7 @@ namespace CIAO
     {
       CIAO_TRACE("PCD_Handler::get_PlanConnectionDescription");
 
-      toconfig.name = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ()));
+      toconfig.name = CORBA::string_dup (desc.name ().c_str ());
 
       //Source is mapped to a string in the schema and a sequence
       //in the IDL. We just assign the source string from the xml
@@ -42,7 +42,7 @@ namespace CIAO
         {
           // Only one.....
           toconfig.source.length (1);
-          toconfig.source[0] = ACE_TEXT_ALWAYS_CHAR (desc.source ().c_str ());
+          toconfig.source[0] = desc.source ().c_str ();
         }
 
       toconfig.deployRequirement.length (desc.count_deployRequirement ());
@@ -83,14 +83,14 @@ namespace CIAO
     {
       CIAO_TRACE("PCD_Handler::get_PlanConnectionDescription");
 
-      XMLSchema::string< ACE_TCHAR > name (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()));
+      XMLSchema::string< char > name ((src.name));
 
       PlanConnectionDescription pcd(name);
 
       //Get the source if it exists
       if(src.source.length() != 0)
         {
-          XMLSchema::string< ACE_TCHAR > source(ACE_TEXT_CHAR_TO_TCHAR (src.source[0].in ()));
+          XMLSchema::string< char > source((src.source[0]));
           pcd.source(source);
         }
 
diff --git a/CIAO/tools/Config_Handlers/PSPE_Handler.cpp b/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
index 55b66e86e6b..221ec4fa7d9 100644
--- a/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
@@ -38,11 +38,11 @@ namespace CIAO
     {
       CIAO_TRACE("PSPE_Handler::sub_component_port_endpoint");
       dest.portName =
-        ACE_TEXT_ALWAYS_CHAR (src.portName ().c_str ());
+        src.portName ().c_str ();
 
       if (src.provider_p ())
         {
-          dest.provider = src.provider () == ACE_TEXT ("true");
+          dest.provider = src.provider () == "true";
         }
       else
         {
@@ -51,9 +51,8 @@ namespace CIAO
 
       CORBA::ULong tmp = 0;
 
-      IDD_Handler::IDREF.find_ref (
-        ACE_CString (ACE_TEXT_ALWAYS_CHAR (src.instance ().id ().c_str ())),
-        tmp);
+      IDD_Handler::IDREF.find_ref (ACE_CString (src.instance ().idref ().id ().c_str ()),
+                                   tmp);
 
       dest.instanceRef = tmp;
 
@@ -94,19 +93,22 @@ namespace CIAO
                                                const Deployment::PlanSubcomponentPortEndpoint &src)
     { // @@MAJO
       CIAO_TRACE("PSPE_Handler::sub_component_port_endpoint - reverse");
-      XMLSchema::string< ACE_TCHAR > pname (ACE_TEXT_CHAR_TO_TCHAR (src.portName.in ()));
-      XMLSchema::string< ACE_TCHAR > tval  (ACE_TEXT ("true"));
-      XMLSchema::string< ACE_TCHAR > prov  (ACE_TEXT (""));
+      XMLSchema::string< char > pname ((src.portName));
+      XMLSchema::string< char > tval  ("true");
+      XMLSchema::string< char > prov  ("");
       ACE_CString id;
       IDD_Handler::IDREF.find_ref(src.instanceRef, id);
-      XMLSchema::IDREF < ACE_TCHAR > idref(ACE_TEXT_CHAR_TO_TCHAR (id.c_str()));
+      XMLSchema::IDREF < ACE_TCHAR > idref(id.c_str());
 
       if (src.provider)
         prov = tval;
+      
+      IdRef idr;
+      idr.idref (idref);
 
       PlanSubcomponentPortEndpoint pspe (pname,
                                          CCMComponentPortKind::Facet,
-                                         idref);
+                                         idr);
       pspe.provider (prov);
 
       switch (src.kind)
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
index cf21caf31f9..0654822b79f 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
@@ -19,180 +19,182 @@ namespace CIAO
     {
       struct Packaging_Handlers_Export SPE_Handler
       {
-        static void handle_spe (
-          const SubcomponentPortEndpoint &desc,
-          ::Deployment::SubcomponentPortEndpoint &toconfig)
-        {
-          CIAO_TRACE("SPE_Handler::get_spe");
-
-          toconfig.portName = ACE_TEXT_ALWAYS_CHAR (desc.portName ().c_str ());
-
-          ACE_CString str (ACE_TEXT_ALWAYS_CHAR (desc.instance ().id ().c_str ()));
-          CORBA::ULong pos (0);
-
-          SID_Handler::IDREF.find_ref (str, pos);
-          toconfig.instanceRef = pos;
-        }
-
-        static SubcomponentPortEndpoint get_spe
-          (const ::Deployment::SubcomponentPortEndpoint &src)
-        {
-          CIAO_TRACE("SPE_Handler::get_spe - reverse");
-          ACE_CString str;
-          SID_Handler::IDREF.find_ref (src.instanceRef, str);
-
-          return SubcomponentPortEndpoint (ACE_TEXT_CHAR_TO_TCHAR (src.portName.in ()),
-                                           ACE_TEXT_CHAR_TO_TCHAR (str.c_str ()));
-        }
+    static void handle_spe (const SubcomponentPortEndpoint &desc,
+                ::Deployment::SubcomponentPortEndpoint &toconfig)
+    {
+      CIAO_TRACE("SPE_Handler::get_spe");
+
+      toconfig.portName = desc.portName ().c_str ();
+
+      ACE_CString str (desc.instance ().idref ().id ().c_str ());
+      CORBA::ULong pos (0);
+
+      SID_Handler::IDREF.find_ref (str, pos);
+      toconfig.instanceRef = pos;
+    }
+
+    static SubcomponentPortEndpoint
+    get_spe (const ::Deployment::SubcomponentPortEndpoint &src)
+    {
+      CIAO_TRACE("SPE_Handler::get_spe - reverse");
+      ACE_CString str;
+      SID_Handler::IDREF.find_ref (src.instanceRef, str);
+      
+      IdRef xid;
+      xid.idref (str.c_str ());
+
+      return SubcomponentPortEndpoint (src.portName.in (),
+                                       xid);
+    }
       };
 
       typedef Sequence_Handler < SubcomponentPortEndpoint,
-                                 ::Deployment::SubcomponentPortEndpoints,
-                                 ::Deployment::SubcomponentPortEndpoint,
-                                 SPE_Handler::handle_spe > SPE_Functor;
+                 ::Deployment::SubcomponentPortEndpoints,
+                 ::Deployment::SubcomponentPortEndpoint,
+                 SPE_Handler::handle_spe > SPE_Functor;
 
       struct Packaging_Handlers_Export ACD_Handler
       {
-        static void handle_acd (const AssemblyConnectionDescription &desc,
-                                ::Deployment::AssemblyConnectionDescription &toconfig)
-        {
-          CIAO_TRACE("ACD_Handler::get_acd");
-
-          toconfig.name = ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ());
-
-          toconfig.deployRequirement.length (desc.count_deployRequirement ());
-          std::for_each (desc.begin_deployRequirement (),
-                         desc.end_deployRequirement (),
-                         Requirement_Functor (toconfig.deployRequirement));
-
-          toconfig.internalEndpoint.length (desc.count_internalEndpoint ());
-          SEQ_HAND_GCC_BUG_WORKAROUND (SPE_Handler::handle_spe,
-                                       desc.begin_internalEndpoint (),
-                                       toconfig.internalEndpoint);
-          std::for_each (desc.begin_internalEndpoint (),
-                         desc.end_internalEndpoint (),
-                         SPE_Functor (toconfig.internalEndpoint));
-
-          toconfig.externalEndpoint.length (desc.count_externalEndpoint ());
-          std::for_each (desc.begin_externalEndpoint (),
-                         desc.end_externalEndpoint (),
-                         CEPE_Functor (toconfig.externalEndpoint));
-
-          toconfig.externalReference.length (desc.count_externalReference ());
-          std::for_each (desc.begin_externalReference (),
-                         desc.end_externalReference (),
-                         ERE_Functor (toconfig.externalReference));
-        }
-
-        static AssemblyConnectionDescription
-          get_acd (const ::Deployment::AssemblyConnectionDescription &src)
-        {
-          CIAO_TRACE("ACD_Handler::get_acd - reverse");
-
-          AssemblyConnectionDescription retval (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()));
-
-          for (CORBA::ULong i = 0; i < src.deployRequirement.length (); ++i)
-            retval.add_deployRequirement
-              (Req_Handler::get_requirement (src.deployRequirement[i]));
-
-          for (CORBA::ULong i = 0; i < src.internalEndpoint.length (); ++i)
-            retval.add_internalEndpoint
-              (SPE_Handler::get_spe (src.internalEndpoint[i]));
-
-          for (CORBA::ULong i = 0; i < src.externalEndpoint.length (); ++i)
-            retval.add_externalEndpoint
-              (CEPE_Handler::external_port_endpoint (src.externalEndpoint[i]));
-
-          for (CORBA::ULong i = 0; i < src.externalReference.length (); ++i)
-            retval.add_externalReference
-              (ERE_Handler::external_ref_endpoint (src.externalReference[i]));
-
-          return retval;
-        }
+    static void handle_acd (const AssemblyConnectionDescription &desc,
+                ::Deployment::AssemblyConnectionDescription &toconfig)
+    {
+      CIAO_TRACE("ACD_Handler::get_acd");
+
+      toconfig.name = desc.name ().c_str ();
+
+      toconfig.deployRequirement.length (desc.count_deployRequirement ());
+      std::for_each (desc.begin_deployRequirement (),
+             desc.end_deployRequirement (),
+             Requirement_Functor (toconfig.deployRequirement));
+
+      toconfig.internalEndpoint.length (desc.count_internalEndpoint ());
+      SEQ_HAND_GCC_BUG_WORKAROUND (SPE_Handler::handle_spe,
+                       desc.begin_internalEndpoint (),
+                       toconfig.internalEndpoint);
+      std::for_each (desc.begin_internalEndpoint (),
+             desc.end_internalEndpoint (),
+             SPE_Functor (toconfig.internalEndpoint));
+
+      toconfig.externalEndpoint.length (desc.count_externalEndpoint ());
+      std::for_each (desc.begin_externalEndpoint (),
+             desc.end_externalEndpoint (),
+             CEPE_Functor (toconfig.externalEndpoint));
+
+      toconfig.externalReference.length (desc.count_externalReference ());
+      std::for_each (desc.begin_externalReference (),
+             desc.end_externalReference (),
+             ERE_Functor (toconfig.externalReference));
+
+    }
+
+    static AssemblyConnectionDescription
+    get_acd (const ::Deployment::AssemblyConnectionDescription &src)
+    {
+      CIAO_TRACE("ACD_Handler::get_acd - reverse");
+
+      AssemblyConnectionDescription retval (src.name.in ());
+
+      for (CORBA::ULong i = 0; i < src.deployRequirement.length (); ++i)
+        retval.add_deployRequirement
+          (Req_Handler::get_requirement (src.deployRequirement[i]));
+
+      for (CORBA::ULong i = 0; i < src.internalEndpoint.length (); ++i)
+        retval.add_internalEndpoint
+          (SPE_Handler::get_spe (src.internalEndpoint[i]));
+
+      for (CORBA::ULong i = 0; i < src.externalEndpoint.length (); ++i)
+        retval.add_externalEndpoint
+          (CEPE_Handler::external_port_endpoint (src.externalEndpoint[i]));
+
+      for (CORBA::ULong i = 0; i < src.externalReference.length (); ++i)
+        retval.add_externalReference
+          (ERE_Handler::external_ref_endpoint (src.externalReference[i]));
+
+      return retval;
+    }
       };
 
-      typedef Sequence_Handler <
-        AssemblyConnectionDescription,
-        ::Deployment::AssemblyConnectionDescriptions,
-        ::Deployment::AssemblyConnectionDescription,
-        ACD_Handler::handle_acd > ACD_Functor;
+      typedef Sequence_Handler < AssemblyConnectionDescription,
+                 ::Deployment::AssemblyConnectionDescriptions,
+                 ::Deployment::AssemblyConnectionDescription,
+                 ACD_Handler::handle_acd > ACD_Functor;
 
 
       struct Packaging_Handlers_Export SPR_Handler
       {
-        static void handle_spr (
-            const SubcomponentPropertyReference &desc,
-            ::Deployment::SubcomponentPropertyReference &toconfig)
-        {
-          CIAO_TRACE("SPR_Handler::get_spr");
-
-          toconfig.propertyName = ACE_TEXT_ALWAYS_CHAR (desc.propertyName ().c_str ());
-
-          ACE_CString str (ACE_TEXT_ALWAYS_CHAR (desc.instance ().id ().c_str ()));
-          CORBA::ULong pos (0);
-
-          SID_Handler::IDREF.find_ref (str, pos);
-          toconfig.instanceRef = pos;
-        }
-
-        static SubcomponentPropertyReference
-          get_spr (const ::Deployment::SubcomponentPropertyReference &src)
-        {
-          CIAO_TRACE("SPR_HAndler::get_spr - reverse");
-          ACE_CString str;
-          SID_Handler::IDREF.find_ref (src.instanceRef, str);
-
-          return SubcomponentPropertyReference (ACE_TEXT_CHAR_TO_TCHAR (src.propertyName.in ()),
-                                                ACE_TEXT_CHAR_TO_TCHAR (str.c_str ()));
-        }
+    static void handle_spr (const SubcomponentPropertyReference &desc,
+                ::Deployment::SubcomponentPropertyReference &toconfig)
+    {
+      CIAO_TRACE("SPR_Handler::get_spr");
+
+      toconfig.propertyName = desc.propertyName ().c_str ();
+
+      ACE_CString str (desc.instance ().idref ().id ().c_str ());
+      CORBA::ULong pos (0);
+
+      SID_Handler::IDREF.find_ref (str, pos);
+      toconfig.instanceRef = pos;
+
+    }
+
+    static SubcomponentPropertyReference
+    get_spr (const ::Deployment::SubcomponentPropertyReference &src)
+    {
+      CIAO_TRACE("SPR_HAndler::get_spr - reverse");
+      ACE_CString str;
+      SID_Handler::IDREF.find_ref (src.instanceRef, str);
+      
+      IdRef xid;
+      xid.idref (str.c_str ());
+      return SubcomponentPropertyReference (src.propertyName.in (),
+                                            xid);
+    }
+
       };
 
-      typedef Sequence_Handler <
-        SubcomponentPropertyReference,
-        ::Deployment::SubcomponentPropertyReferences,
-        ::Deployment::SubcomponentPropertyReference,
-        SPR_Handler::handle_spr > SPR_Functor;
+      typedef Sequence_Handler < SubcomponentPropertyReference,
+                 ::Deployment::SubcomponentPropertyReferences,
+                 ::Deployment::SubcomponentPropertyReference,
+                 SPR_Handler::handle_spr > SPR_Functor;
 
       struct Packaging_Handlers_Export APM_Handler
       {
-        static void handle_apm (
-            const AssemblyPropertyMapping &desc,
-            ::Deployment::AssemblyPropertyMapping &toconfig)
-        {
-          CIAO_TRACE("APM_Handler::get_apm");
-
-          toconfig.name = ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ());
-          toconfig.externalName = ACE_TEXT_ALWAYS_CHAR (desc.externalName ().c_str ());
-
-          toconfig.delegatesTo.length (desc.count_delegatesTo ());
-          SEQ_HAND_GCC_BUG_WORKAROUND (SPR_Handler::handle_spr,
-                                       desc.begin_delegatesTo (),
-                                       toconfig.delegatesTo);
-          std::for_each (desc.begin_delegatesTo (),
-                         desc.end_delegatesTo (),
-                         SPR_Functor (toconfig.delegatesTo));
-        }
-
-        static AssemblyPropertyMapping
-        get_apm (const ::Deployment::AssemblyPropertyMapping &src)
-        {
-          CIAO_TRACE("APM_Handler::get_apm - reverse");
-
-          AssemblyPropertyMapping retval (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()),
-                                          ACE_TEXT_CHAR_TO_TCHAR (src.externalName.in ()));
-
-          for (CORBA::ULong i = 0; i < src.delegatesTo.length (); ++i)
-            retval.add_delegatesTo (SPR_Handler::get_spr (src.delegatesTo[i]));
-
-          return retval;
-        }
+    static void handle_apm (const AssemblyPropertyMapping &desc,
+                ::Deployment::AssemblyPropertyMapping &toconfig)
+    {
+      CIAO_TRACE("APM_Handler::get_apm");
+
+      toconfig.name = desc.name ().c_str ();
+      toconfig.externalName = desc.externalName ().c_str ();
+
+      toconfig.delegatesTo.length (desc.count_delegatesTo ());
+      SEQ_HAND_GCC_BUG_WORKAROUND (SPR_Handler::handle_spr,
+                       desc.begin_delegatesTo (),
+                       toconfig.delegatesTo);
+      std::for_each (desc.begin_delegatesTo (),
+             desc.end_delegatesTo (),
+             SPR_Functor (toconfig.delegatesTo));
+    }
+
+    static AssemblyPropertyMapping
+    get_apm (const ::Deployment::AssemblyPropertyMapping &src)
+    {
+      CIAO_TRACE("APM_Handler::get_apm - reverse");
+
+      AssemblyPropertyMapping retval (src.name.in (),
+                      src.externalName.in ());
+
+      for (CORBA::ULong i = 0; i < src.delegatesTo.length (); ++i)
+        retval.add_delegatesTo (SPR_Handler::get_spr (src.delegatesTo[i]));
+
+      return retval;
+    }
       };
 
-      typedef Sequence_Handler <
-        AssemblyPropertyMapping,
-        ::Deployment::AssemblyPropertyMappings,
-        ::Deployment::AssemblyPropertyMapping,
-        APM_Handler::handle_apm > APM_Functor;
+      typedef Sequence_Handler < AssemblyPropertyMapping,
+                 ::Deployment::AssemblyPropertyMappings,
+                 ::Deployment::AssemblyPropertyMapping,
+                 APM_Handler::handle_apm > APM_Functor;
 
       void
       CAD_Handler::component_assem_descr (const ComponentAssemblyDescription &desc,
@@ -208,17 +210,17 @@ namespace CIAO
         /* @@ MAJO: Implement Locality */
 
         toconfig.connection.length (desc.count_connection ());
-        SEQ_HAND_GCC_BUG_WORKAROUND (ACD_Handler::handle_acd,
-                                     desc.begin_connection (),
-                                     toconfig.connection);
+    SEQ_HAND_GCC_BUG_WORKAROUND (ACD_Handler::handle_acd,
+                     desc.begin_connection (),
+                     toconfig.connection);
         std::for_each (desc.begin_connection (),
                        desc.end_connection (),
                        ACD_Functor (toconfig.connection));
 
         toconfig.externalProperty.length (desc.count_externalProperty ());
-        SEQ_HAND_GCC_BUG_WORKAROUND (APM_Handler::handle_apm,
-                                     desc.begin_externalProperty (),
-                                     toconfig.externalProperty);
+    SEQ_HAND_GCC_BUG_WORKAROUND (APM_Handler::handle_apm,
+                     desc.begin_externalProperty (),
+                     toconfig.externalProperty);
         std::for_each (desc.begin_externalProperty (),
                        desc.end_externalProperty (),
                        APM_Functor (toconfig.externalProperty));
@@ -242,6 +244,7 @@ namespace CIAO
           retval.add_externalProperty (APM_Handler::get_apm (src.externalProperty[i]));
 
         return retval;
+
       }
 
       ComponentAssemblyDescription *
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.h b/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.h
index 139c24936ce..b42f13dcdc3 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.h
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.h
@@ -10,7 +10,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Utils/XML_Helper.h"
+#include "XML_Typedefs.h"
 #include "DAnCE/Deployment/DeploymentC.h"
 #include "Package_Handlers/Packaging_Handlers_Export.h"
 
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
index 6cdc8b8c8cf..f4bca5f8248 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
@@ -11,7 +11,7 @@
 
 #include "Basic_Deployment_Data.hpp"
 #include "DAnCE/Deployment/Deployment_DataC.h"
-#include "Utils/XML_Helper.h"
+#include "XML_Typedefs.h"
 #include "Utils/Exceptions.h"
 
 #include "Deployment.hpp"
@@ -29,226 +29,224 @@ namespace CIAO
 
       struct Capability_Handler
       {
-        static void handle_capability (const Capability &desc,
-                                       ::Deployment::Capability &toconfig)
-        {
-          CIAO_TRACE ("Capability_Handler::get_capability");
+    static void handle_capability (const Capability &desc,
+                       ::Deployment::Capability &toconfig)
+    {
+      CIAO_TRACE ("Capability_Handler::get_capability");
 
-          toconfig.name = ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ());
+      toconfig.name = desc.name ().c_str ();
 
-          toconfig.resourceType.length (desc.count_resourceType ());
-          std::for_each (desc.begin_resourceType (),
-                         desc.end_resourceType (),
-                         String_Seq_Functor (toconfig.resourceType));
+      toconfig.resourceType.length (desc.count_resourceType ());
+      std::for_each (desc.begin_resourceType (),
+             desc.end_resourceType (),
+             String_Seq_Functor (toconfig.resourceType));
 
-          toconfig.property.length (desc.count_property ());
-          std::for_each (desc.begin_property (),
-                         desc.end_property (),
-                         SatisfierProperty_Functor (toconfig.property));
-        }
+      toconfig.property.length (desc.count_property ());
+      std::for_each (desc.begin_property (),
+             desc.end_property (),
+             SatisfierProperty_Functor (toconfig.property));
+    }
 
-        static Capability get_capability (const ::Deployment::Capability &src)
-        {
-          CIAO_TRACE ("Capability_Handler::get_capability - reverse");
+    static Capability get_capability (const ::Deployment::Capability &src)
+    {
+      CIAO_TRACE ("Capability_Handler::get_capability - reverse");
 
-          Capability retval (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()));
+      Capability retval (src.name.in ());
 
-          for (CORBA::ULong i = 0; i < src.resourceType.length (); ++i)
-              retval.add_resourceType (ACE_TEXT_CHAR_TO_TCHAR (src.resourceType[i].in ()));
+      for (CORBA::ULong i = 0; i < src.resourceType.length (); ++i)
+      retval.add_resourceType (src.resourceType[i].in ());
 
-          for (CORBA::ULong i = 0; i < src.property.length (); ++i)
-            retval.add_property (
-              SatisfierProperty_Handler::get_sat_property (src.property[i]));
+      for (CORBA::ULong i = 0; i < src.property.length (); ++i)
+        retval.add_property (SatisfierProperty_Handler::get_sat_property (src.property[i]));
 
-          return retval;
-        }
+      return retval;
+    }
       };
 
-      typedef Sequence_Handler <
-        Capability,
-        ::Deployment::Capabilities,
-        ::Deployment::Capability,
-        Capability_Handler::handle_capability > Capability_Functor;
+      typedef Sequence_Handler < Capability,
+                 ::Deployment::Capabilities,
+                 ::Deployment::Capability,
+                 Capability_Handler::handle_capability > Capability_Functor;
 
       struct IR_Handler
       {
-        static void handle_ir (const ImplementationRequirement &desc,
-                               ::Deployment::ImplementationRequirement &toconfig)
-        {
-          CIAO_TRACE ("IR_Handler::get_ir");
-
-          if (desc.resourceUsage_p ())
-          {
-            switch (desc.resourceUsage ().integral ())
-              {
-              case ResourceUsageKind::None_l:
-                toconfig.resourceUsage = Deployment::None;
-                break;
-
-              case ResourceUsageKind::InstanceUsesResource_l:
-                toconfig.resourceUsage = Deployment::InstanceUsesResource;
-                break;
-
-              case ResourceUsageKind::ResourceUsesInstance_l:
-                toconfig.resourceUsage = Deployment::ResourceUsesInstance;
-                break;
-
-              case ResourceUsageKind::PortUsesResource_l:
-                toconfig.resourceUsage = Deployment::PortUsesResource;
-                break;
-
-              case ResourceUsageKind::ResourceUsesPort_l:
-                toconfig.resourceUsage = Deployment::ResourceUsesPort;
-                break;
-
-              default:
-                throw Config_Error (ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ()),
-                                    "Unknown ResourceUsageKind.");
-                break;
-              }
-          }
-
-          if (desc.resourcePort_p ())
-            toconfig.resourcePort = ACE_TEXT_ALWAYS_CHAR (desc.resourcePort ().c_str ());
-
-          if (desc.componentPort_p  ())
-            toconfig.componentPort = ACE_TEXT_ALWAYS_CHAR (desc.componentPort ().c_str ());
-
-          toconfig.resourceType = ACE_TEXT_ALWAYS_CHAR (desc.resourceType ().c_str ());
-          toconfig.name = ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ());
-
-          std::for_each (desc.begin_property (),
-                        desc.end_property (),
-                        Property_Functor (toconfig.property ));
-        }
+    static void handle_ir (const ImplementationRequirement &desc,
+                   ::Deployment::ImplementationRequirement &toconfig)
+    {
+      CIAO_TRACE ("IR_Handler::get_ir");
 
-        static ImplementationRequirement
-        get_ir (const ::Deployment::ImplementationRequirement &src)
+      if (desc.resourceUsage_p ())
+        {
+          switch (desc.resourceUsage ().integral ())
         {
-          CIAO_TRACE ("IR_Handler::get_ir - reverse");
+        case ResourceUsageKind::None_l:
+          toconfig.resourceUsage = Deployment::None;
+          break;
+
+        case ResourceUsageKind::InstanceUsesResource_l:
+          toconfig.resourceUsage = Deployment::InstanceUsesResource;
+          break;
+
+        case ResourceUsageKind::ResourceUsesInstance_l:
+          toconfig.resourceUsage = Deployment::ResourceUsesInstance;
+          break;
+
+        case ResourceUsageKind::PortUsesResource_l:
+          toconfig.resourceUsage = Deployment::PortUsesResource;
+          break;
+
+        case ResourceUsageKind::ResourceUsesPort_l:
+          toconfig.resourceUsage = Deployment::ResourceUsesPort;
+          break;
+
+        default:
+          throw Config_Error (desc.name (),
+                      "Unknown ResourceUsageKind.");
+          break;
+        }
+        }
 
-          ImplementationRequirement retval (ACE_TEXT_CHAR_TO_TCHAR (src.resourceType.in ()),
-                                            ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()));
+      if (desc.resourcePort_p ())
+        toconfig.resourcePort = desc.resourcePort ().c_str ();
 
-          if (src.resourceUsage.length () == 1)
-            switch (src.resourceUsage[0])
-            {
-            case Deployment::None:
-              retval.resourceUsage (ResourceUsageKind::None);
-              break;
+      if (desc.componentPort_p  ())
+        toconfig.componentPort = desc.componentPort ().c_str ();
 
-            case Deployment::InstanceUsesResource:
-              retval.resourceUsage (ResourceUsageKind::InstanceUsesResource);
-              break;
+      toconfig.resourceType = desc.resourceType ().c_str ();
+      toconfig.name = desc.name ().c_str ();
 
-            case Deployment::ResourceUsesInstance:
-              retval.resourceUsage (ResourceUsageKind::ResourceUsesInstance);
-              break;
+      std::for_each (desc.begin_property (),
+             desc.end_property (),
+             Property_Functor (toconfig.property ));
+    }
 
-            case Deployment::PortUsesResource:
-              retval.resourceUsage (ResourceUsageKind::PortUsesResource);
-              break;
+    static ImplementationRequirement
+    get_ir (const ::Deployment::ImplementationRequirement &src)
+    {
+      CIAO_TRACE ("IR_Handler::get_ir - reverse");
 
-            case Deployment::ResourceUsesPort:
-              retval.resourceUsage (ResourceUsageKind::ResourceUsesPort);
-              break;
+      ImplementationRequirement retval (src.resourceType.in (),
+                        src.name.in ());
 
-            default:
-              throw Config_Error (src.name.in (),
-                                  "Unknown ResourceUsageKind.");
-              break;
-            }
+      if (src.resourceUsage.length () == 1)
+        switch (src.resourceUsage[0])
+          {
+          case Deployment::None:
+        retval.resourceUsage (ResourceUsageKind::None);
+        break;
+
+          case Deployment::InstanceUsesResource:
+        retval.resourceUsage (ResourceUsageKind::InstanceUsesResource);
+        break;
+
+          case Deployment::ResourceUsesInstance:
+        retval.resourceUsage (ResourceUsageKind::ResourceUsesInstance);
+        break;
+
+          case Deployment::PortUsesResource:
+        retval.resourceUsage (ResourceUsageKind::PortUsesResource);
+        break;
+
+          case Deployment::ResourceUsesPort:
+        retval.resourceUsage (ResourceUsageKind::ResourceUsesPort);
+        break;
+
+          default:
+        throw Config_Error (src.name.in (),
+                    "Unknown ResourceUsageKind.");
+        break;
+          }
 
-          retval.resourcePort (ACE_TEXT_CHAR_TO_TCHAR (src.resourcePort.in ()));
+      retval.resourcePort (src.resourcePort.in ());
 
-          retval.componentPort (ACE_TEXT_CHAR_TO_TCHAR (src.componentPort.in ()));
+      retval.componentPort (src.componentPort.in ());
 
-          for (CORBA::ULong i = 0; i < src.property.length (); ++i)
-            retval.add_property (Property_Handler::get_property (src.property[i]));
+      for (CORBA::ULong i = 0; i < src.property.length (); ++i)
+        retval.add_property (Property_Handler::get_property (src.property[i]));
 
-          return retval;
-        }
+      return retval;
+    }
       };
 
-      typedef Sequence_Handler <
-        ImplementationRequirement,
-        ::Deployment::ImplementationRequirements,
-        ::Deployment::ImplementationRequirement,
-        IR_Handler::handle_ir > IR_Functor;
+      typedef Sequence_Handler < ImplementationRequirement,
+                 ::Deployment::ImplementationRequirements,
+                 ::Deployment::ImplementationRequirement,
+                 IR_Handler::handle_ir > IR_Functor;
 
       struct MID_Handler
       {
-        static void handle_mid (
-            const MonolithicImplementationDescription &desc,
-            ::Deployment::MonolithicImplementationDescription &toconfig)
+    static void handle_mid (const MonolithicImplementationDescription &desc,
+                ::Deployment::MonolithicImplementationDescription &toconfig)
+    {
+      CIAO_TRACE ("MID_Handler::get_mid");
+
+      toconfig.nodeExecParameter.length (desc.count_nodeExecParameter ());
+      std::for_each (desc.begin_nodeExecParameter (),
+             desc.end_nodeExecParameter (),
+             Property_Functor (toconfig.nodeExecParameter));
+
+      toconfig.componentExecParameter.length (desc.count_componentExecParameter ());
+      std::for_each (desc.begin_componentExecParameter (),
+             desc.end_componentExecParameter (),
+             Property_Functor (toconfig.componentExecParameter));
+
+      toconfig.deployRequirement.length (desc.count_deployRequirement ());
+      while (0)
         {
-          CIAO_TRACE ("MID_Handler::get_mid");
-
-          toconfig.nodeExecParameter.length (desc.count_nodeExecParameter ());
-          std::for_each (desc.begin_nodeExecParameter (),
-                         desc.end_nodeExecParameter (),
-                         Property_Functor (toconfig.nodeExecParameter));
-
-          toconfig.componentExecParameter.length (
-            desc.count_componentExecParameter ());
-          std::for_each (desc.begin_componentExecParameter (),
-                         desc.end_componentExecParameter (),
-                         Property_Functor (toconfig.componentExecParameter));
-
-          toconfig.deployRequirement.length (desc.count_deployRequirement ());
-          while (0)
-            {
-              IR_Handler::handle_ir (*desc.begin_deployRequirement (),
-                                     toconfig.deployRequirement[0]);
-            }
-          std::for_each (desc.begin_deployRequirement (),
-                         desc.end_deployRequirement (),
-                         IR_Functor (toconfig.deployRequirement));
-
-          toconfig.primaryArtifact.length (desc.count_primaryArtifact ());
-          SEQ_HAND_GCC_BUG_WORKAROUND (NIA_Handler::handle_nia,
-                                       desc.begin_primaryArtifact (),
-                                       toconfig.primaryArtifact);
-          std::for_each (desc.begin_primaryArtifact (),
-                         desc.end_primaryArtifact (),
-                         NIA_Functor (toconfig.primaryArtifact));
+          IR_Handler::handle_ir (*desc.begin_deployRequirement (),
+                     toconfig.deployRequirement[0]);
         }
+      std::for_each (desc.begin_deployRequirement (),
+             desc.end_deployRequirement (),
+             IR_Functor (toconfig.deployRequirement));
+
+      toconfig.primaryArtifact.length (desc.count_primaryArtifact ());
+      SEQ_HAND_GCC_BUG_WORKAROUND (NIA_Handler::handle_nia,
+                       desc.begin_primaryArtifact (),
+                       toconfig.primaryArtifact);
+      std::for_each (desc.begin_primaryArtifact (),
+             desc.end_primaryArtifact (),
+             NIA_Functor (toconfig.primaryArtifact));
+    }
 
-        static MonolithicImplementationDescription
-        get_mid (const ::Deployment::MonolithicImplementationDescription &src)
-        {
-          CIAO_TRACE ("MID_Handler::get_mid - reverse");
+    static MonolithicImplementationDescription
+    get_mid (const ::Deployment::MonolithicImplementationDescription &src)
+    {
+      CIAO_TRACE ("MID_Handler::get_mid - reverse");
 
-          MonolithicImplementationDescription retval;
+      MonolithicImplementationDescription retval;
 
-          for (CORBA::ULong i = 0; i < src.nodeExecParameter.length (); ++i)
-            retval.add_nodeExecParameter
-              (Property_Handler::get_property (src.nodeExecParameter[i]));
+      for (CORBA::ULong i = 0; i < src.nodeExecParameter.length (); ++i)
+        retval.add_nodeExecParameter
+          (Property_Handler::get_property (src.nodeExecParameter[i]));
 
-          for (CORBA::ULong i = 0; i < src.componentExecParameter.length (); ++i)
-            retval.add_componentExecParameter
-              (Property_Handler::get_property (src.componentExecParameter[i]));
+      for (CORBA::ULong i = 0; i < src.componentExecParameter.length (); ++i)
+        retval.add_componentExecParameter
+          (Property_Handler::get_property (src.componentExecParameter[i]));
 
-          for (CORBA::ULong i = 0; i < src.deployRequirement.length (); ++i)
-            retval.add_deployRequirement
-              (IR_Handler::get_ir (src.deployRequirement[i]));
+      for (CORBA::ULong i = 0; i < src.deployRequirement.length (); ++i)
+        retval.add_deployRequirement
+          (IR_Handler::get_ir (src.deployRequirement[i]));
 
-          for (CORBA::ULong i = 0; i < src.primaryArtifact.length (); ++i)
-            retval.add_primaryArtifact
-              (NIA_Handler::get_nia (src.primaryArtifact[i]));
+      for (CORBA::ULong i = 0; i < src.primaryArtifact.length (); ++i)
+        retval.add_primaryArtifact
+          (NIA_Handler::get_nia (src.primaryArtifact[i]));
+
+      return retval;
+    }
 
-          return retval;
-        }
       };
 
-      typedef Sequence_Handler <
-        MonolithicImplementationDescription,
-        ::Deployment::MonolithicImplementationDescriptions,
-        ::Deployment::MonolithicImplementationDescription,
-        MID_Handler::handle_mid > MID_Functor;
+      typedef Sequence_Handler < MonolithicImplementationDescription,
+                 ::Deployment::MonolithicImplementationDescriptions,
+                 ::Deployment::MonolithicImplementationDescription,
+                 MID_Handler::handle_mid > MID_Functor;
+
+      
 
       void
-      CID_Handler::component_impl_descr (const ComponentImplementationDescription &desc,
+      CID_Handler::component_impl_descr (
+                                         const ComponentImplementationDescription &desc,
                                          ::Deployment::ComponentImplementationDescription &toconfig)
       {
         CIAO_TRACE ("CID_Handler::component_impl_descr");
@@ -258,17 +256,17 @@ namespace CIAO
 
         if (desc.href_p ())
           {
-            xsc_cid.reset (CID_Handler::resolve_cid (ACE_TEXT_ALWAYS_CHAR (desc.href ().c_str ())));
+            xsc_cid.reset (CID_Handler::resolve_cid (desc.href ().c_str ()));
             cid = xsc_cid.get ();
           }
         else
           cid = &desc;
 
         if (cid->label_p ())
-          toconfig.label = ACE_TEXT_ALWAYS_CHAR (cid->label ().c_str ());
+          toconfig.label = cid->label ().c_str ();
 
         if (cid->UUID_p ())
-          toconfig.UUID = ACE_TEXT_ALWAYS_CHAR (cid->UUID ().c_str ());
+          toconfig.UUID = cid->UUID ().c_str ();
 
         if (cid->implements_p ())
           { // MAJO: We should be able to assume this exists, fix broken interpeters..
@@ -286,7 +284,7 @@ namespace CIAO
           {
             toconfig.monolithicImpl.length (1);
             MID_Handler::handle_mid (cid->monolithicImpl (),
-                                     toconfig.monolithicImpl[0]);
+                     toconfig.monolithicImpl[0]);
           }
         else
           throw Plan_Error ("ComponentImplementationDescription must have either assemblyImpl or monolithicImpl");
@@ -299,9 +297,9 @@ namespace CIAO
 
         // capability
         toconfig.capability.length (cid->count_capability ());
-        SEQ_HAND_GCC_BUG_WORKAROUND (Capability_Handler::handle_capability,
-                                     cid->begin_capability (),
-                                     toconfig.capability);
+    SEQ_HAND_GCC_BUG_WORKAROUND (Capability_Handler::handle_capability,
+                     cid->begin_capability (),
+                     toconfig.capability);
         std::for_each (cid->begin_capability (),
                        cid->end_capability (),
                        Capability_Functor (toconfig.capability));
@@ -312,14 +310,14 @@ namespace CIAO
         for (ComponentImplementationDescription::dependsOn_const_iterator i = cid->begin_dependsOn ();
              i != cid->end_dependsOn ();
              ++i)
-          toconfig.dependsOn[pos++].requiredType =
-            ACE_TEXT_ALWAYS_CHAR (i->requiredType ().c_str ());
+          toconfig.dependsOn[pos++].requiredType = i->requiredType ().c_str ();
 
         // infoProperty
         toconfig.infoProperty.length (cid->count_infoProperty ());
         std::for_each (cid->begin_infoProperty (),
                        cid->end_infoProperty (),
                        Property_Functor (toconfig.infoProperty));
+
       }
 
       ComponentImplementationDescription
@@ -329,8 +327,8 @@ namespace CIAO
 
         ComponentImplementationDescription retval;
 
-        retval.label (ACE_TEXT_CHAR_TO_TCHAR (src.label.in ()));
-        retval.UUID (ACE_TEXT_CHAR_TO_TCHAR (src.UUID.in ()));
+        retval.label (src.label.in ());
+        retval.UUID (src.UUID.in ());
 
         {
           retval.implements (Comp_Intf_Descr_Handler::comp_intf_descr (src.implements));
@@ -350,18 +348,19 @@ namespace CIAO
 
         for (CORBA::ULong i = 0; i < src.configProperty.length (); ++i)
           {
-            retval.add_configProperty (Property_Handler::get_property (src.configProperty[i]));
+            retval.add_configProperty (
+                                       Property_Handler::get_property (src.configProperty[i]));
           }
 
         for (CORBA::ULong i = 0; i < src.dependsOn.length (); ++i)
           {
-            retval.add_dependsOn (ImplementationDependency (
-              ACE_TEXT_CHAR_TO_TCHAR (src.dependsOn[i].requiredType.in ())));
+            retval.add_dependsOn (ImplementationDependency (src.dependsOn[i].requiredType.in ()));
           }
 
         for (CORBA::ULong i = 0; i < src.infoProperty.length (); ++i)
           {
-            retval.add_infoProperty (Property_Handler::get_property (src.infoProperty[i]));
+            retval.add_infoProperty (
+                                     Property_Handler::get_property (src.infoProperty[i]));
           }
 
         return retval;
@@ -372,18 +371,16 @@ namespace CIAO
       {
         CIAO_TRACE ("CID_Handler::resolve_cid");
 
-        xercesc::DOMDocument *dom = XML_HELPER->create_dom (ACE_TEXT_CHAR_TO_TCHAR (uri));
+        xercesc::DOMDocument *dom = XML_Helper::XML_HELPER.create_dom (uri);
 
         if (!dom)
           throw Parse_Error ("Unable to create DOM for CID");
 
-        try
-        {
+        try {
           return new ComponentImplementationDescription
             (componentImplementationDescription (dom));
         }
-        catch (...)
-        {
+        catch (...) {
           throw Parse_Error ("Unable to create XSC structure for CID");
         }
       }
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
index e02bac407d1..e39d5ced065 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
@@ -17,37 +17,34 @@ namespace CIAO
     {
       struct Packaging_Handlers_Export PCI_Handler
       {
-        static void handle_pci (
-            const PackagedComponentImplementation &desc,
-            ::Deployment::PackagedComponentImplementation &toconfig)
-        {
-          CIAO_TRACE ("PCI_Handler::get_pci");
-          toconfig.name = ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ());
+    static void handle_pci (const PackagedComponentImplementation &desc,
+                ::Deployment::PackagedComponentImplementation &toconfig)
+    {
+      CIAO_TRACE ("PCI_Handler::get_pci");
+      toconfig.name = desc.name ().c_str ();
 
-          CID_Handler::component_impl_descr (desc.referencedImplementation (),
-                                             toconfig.referencedImplementation);
-        }
+      CID_Handler::component_impl_descr (desc.referencedImplementation (),
+                         toconfig.referencedImplementation);
+    }
 
-        static PackagedComponentImplementation
-        get_pci (const ::Deployment::PackagedComponentImplementation &src)
-        {
-          CIAO_TRACE ("PCI_Handler::get_pci - reverse");
-          return PackagedComponentImplementation (
-                    ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()),
-                    CID_Handler::component_impl_descr (src.referencedImplementation));
-        }
+    static PackagedComponentImplementation
+    get_pci (const ::Deployment::PackagedComponentImplementation &src)
+    {
+      CIAO_TRACE ("PCI_Handler::get_pci - reverse");
+      return PackagedComponentImplementation (src.name.in (),
+                          CID_Handler::component_impl_descr (src.referencedImplementation));
+    }
       };
 
-      typedef Sequence_Handler <
-        PackagedComponentImplementation,
-        ::Deployment::PackagedComponentImplementations,
-        ::Deployment::PackagedComponentImplementation,
-        PCI_Handler::handle_pci > PCI_Functor;
+      typedef Sequence_Handler < PackagedComponentImplementation,
+                 ::Deployment::PackagedComponentImplementations,
+                 ::Deployment::PackagedComponentImplementation,
+                 PCI_Handler::handle_pci > PCI_Functor;
+     
 
       void
-      CPD_Handler::handle_component_package_descr (
-          const ComponentPackageDescription &desc,
-          ::Deployment::ComponentPackageDescription &toconfig)
+      CPD_Handler::handle_component_package_descr (const ComponentPackageDescription &desc,
+                           ::Deployment::ComponentPackageDescription &toconfig)
       {
         CIAO_TRACE ("CPD_Handler::component_package_descr");
 
@@ -56,17 +53,17 @@ namespace CIAO
 
         if (desc.href_p ())
           {
-            xsc_cpd.reset (CPD_Handler::resolve_cpd (ACE_TEXT_ALWAYS_CHAR (desc.href ().c_str ())));
+            xsc_cpd.reset (CPD_Handler::resolve_cpd (desc.href ().c_str ()));
             cpd = xsc_cpd.get ();
           }
         else
           cpd = &desc;
 
         if (cpd->label_p ())
-          toconfig.label = ACE_TEXT_ALWAYS_CHAR (cpd->label ().c_str ());
+          toconfig.label = cpd->label ().c_str ();
 
         if (cpd->UUID_p ())
-          toconfig.UUID = ACE_TEXT_ALWAYS_CHAR (cpd->UUID ().c_str ());
+          toconfig.UUID = cpd->UUID ().c_str ();
 
         // CID
         if (cpd->realizes_p ())
@@ -84,9 +81,9 @@ namespace CIAO
 
         // Packaged Component Implementations
         toconfig.implementation.length ( cpd->count_implementation ());
-        SEQ_HAND_GCC_BUG_WORKAROUND (PCI_Handler::handle_pci,
-                                     cpd->begin_implementation (),
-                                     toconfig.implementation);
+    SEQ_HAND_GCC_BUG_WORKAROUND (PCI_Handler::handle_pci,
+                     cpd->begin_implementation (),
+                     toconfig.implementation);
         std::for_each (cpd->begin_implementation (),
                        cpd->end_implementation (),
                        PCI_Functor (toconfig.implementation));
@@ -105,10 +102,10 @@ namespace CIAO
         ComponentPackageDescription toconfig;
 
         if (src.label.in () != 0)
-          toconfig.label (ACE_TEXT_CHAR_TO_TCHAR (src.label.in ()));
+          toconfig.label (src.label.in ());
 
         if (src.UUID.in () != 0)
-          toconfig.UUID (ACE_TEXT_CHAR_TO_TCHAR (src.UUID.in ()));
+          toconfig.UUID (src.UUID.in ());
 
         {
           toconfig.realizes
@@ -118,19 +115,19 @@ namespace CIAO
         for (size_t i = 0; i < src.configProperty.length (); ++i)
           {
             toconfig.add_configProperty (
-              Property_Handler::get_property (src.configProperty[i]));
+                     Property_Handler::get_property (src.configProperty[i]));
           }
 
         { // Packaged Component Implementations
           for (size_t i = 0; i < src.implementation.length (); ++i)
             toconfig.add_implementation (
-              PCI_Handler::get_pci (src.implementation[i]));
+                     PCI_Handler::get_pci (src.implementation[i]));
         }
 
         for (size_t i = 0; i < src.infoProperty.length (); ++i)
           {
             toconfig.add_infoProperty (
-              Property_Handler::get_property (src.infoProperty[i]));
+                       Property_Handler::get_property (src.infoProperty[i]));
           }
 
         return toconfig;
@@ -139,25 +136,25 @@ namespace CIAO
       ComponentPackageDescription * CPD_Handler::resolve_cpd (const char *uri)
       {
         CIAO_TRACE ("CPD_Handler::resolve_cpd");
-        if (!XML_HELPER->is_initialized ())
+        if (!XML_Helper::XML_HELPER.is_initialized ())
           return 0;
 
         xercesc::DOMDocument* dom =
-          XML_HELPER->create_dom (ACE_TEXT_CHAR_TO_TCHAR (uri));
+          XML_Helper::XML_HELPER.create_dom (uri);
 
         if (!dom)
           throw Parse_Error ("Unable to create DOM for component package description");
 
-        try
-        {
+        try {
           //ACE_ERROR ((LM_ERROR, "Creating new CPD XSC Object\n"));
           return new ComponentPackageDescription (componentPackageDescription (dom));
         }
-        catch (...)
-        {
+        catch (...) {
           throw Parse_Error ("Unable to create XSC structure for CID");
         }
       }
     }
+
+
   }
 }
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h b/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h
index 4b25591a75c..2279054faee 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h
@@ -14,7 +14,7 @@
 #include /**/ "ace/pre.h"
 
 #include <memory>
-#include "Utils/XML_Helper.h"
+#include "XML_Typedefs.h"
 #include "Utils/Functors.h"
 #include "Package_Handlers/Packaging_Handlers_Export.h"
 
@@ -54,17 +54,19 @@ namespace CIAO
                                              ::Deployment::ComponentPackageDescription &toconfig);
 
         static ComponentPackageDescription
-        component_package_descr (const Deployment::ComponentPackageDescription& src);
+      component_package_descr (const Deployment::ComponentPackageDescription& src);
       private:
         static ComponentPackageDescription * resolve_cpd (const char *uri);
+
       };
 
       typedef Sequence_Handler < ComponentPackageDescription,
                                  ::Deployment::ComponentPackageDescriptions,
                                  ::Deployment::ComponentPackageDescription,
-                                 CPD_Handler::handle_component_package_descr >
-        CPD_Functor;
+                                 CPD_Handler::handle_component_package_descr > CPD_Functor;
+
     }
+
   }
 }
 
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
index feb396c0c0e..d743106a2d0 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
@@ -1,7 +1,7 @@
 // $Id$
 #include "Comp_Intf_Descr_Handler.h"
 
-#include "Utils/XML_Helper.h"
+#include "XML_Typedefs.h"
 #include "Utils/Exceptions.h"
 #include "Utils/Functors.h"
 #include "DataType_Handler.h"
@@ -23,7 +23,7 @@ namespace CIAO
           {
             CIAO_TRACE ("Comp_Prop_Handler::get_cpd");
 
-            toconfig.name = ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ());
+            toconfig.name = desc.name ().c_str ();
             DataType_Handler::data_type (desc.type (),
                                          toconfig.type);
           }
@@ -33,7 +33,7 @@ namespace CIAO
           {
             CIAO_TRACE ("Comp_Prop_Handler::get_cpd - reverse");
 
-            return ComponentPropertyDescription (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()),
+            return ComponentPropertyDescription (src.name.in (),
                                                  DataType_Handler::data_type (src.type));
           }
 
@@ -57,22 +57,21 @@ namespace CIAO
 
         if (desc.href_p ())
           {
-            safe_cid.reset (Comp_Intf_Descr_Handler::resolve_cid (
-              ACE_TEXT_ALWAYS_CHAR (desc.href ().c_str ())));
+            safe_cid.reset (Comp_Intf_Descr_Handler::resolve_cid (desc.href ().c_str ()));
             cid = safe_cid.get ();
           }
         else
           cid = &desc;
 
         if (cid->label_p ())
-          toconfig.label = ACE_TEXT_ALWAYS_CHAR (cid->label ().c_str ());
+          toconfig.label = cid->label ().c_str ();
 
         if (cid->UUID_p ())
-          toconfig.UUID = ACE_TEXT_ALWAYS_CHAR (cid->UUID ().c_str ());
+          toconfig.UUID = cid->UUID ().c_str ();
 
         // MAJO: SpecificType should be required.
         if (cid->specificType_p ())
-          toconfig.specificType = ACE_TEXT_ALWAYS_CHAR (cid->specificType ().c_str ());
+          toconfig.specificType = cid->specificType ().c_str ();
 
         toconfig.supportedType.length (cid->count_supportedType ());
         std::for_each (cid->begin_supportedType (),
@@ -95,9 +94,9 @@ namespace CIAO
                        CIAO::Config_Handlers::CPD_Functor (toconfig.port));
 
         toconfig.property.length (cid->count_property ());
-        SEQ_HAND_GCC_BUG_WORKAROUND (Comp_Prop_Handler::handle_cpd,
-                                     cid->begin_property (),
-                                     toconfig.property);
+    SEQ_HAND_GCC_BUG_WORKAROUND (Comp_Prop_Handler::handle_cpd,
+                     cid->begin_property (),
+                     toconfig.property);
         std::for_each (cid->begin_property (),
                        cid->end_property (),
                        Comp_Prop_Functor (toconfig.property));
@@ -116,15 +115,15 @@ namespace CIAO
         CIAO_TRACE ("Comp_Intf_Descr_Handler::comp_intf_descr - reverse");
         ComponentInterfaceDescription retval;
 
-        retval.label (ACE_TEXT_CHAR_TO_TCHAR (src.label.in ()));
-        retval.UUID (ACE_TEXT_CHAR_TO_TCHAR (src.UUID.in ()));
-        retval.specificType (ACE_TEXT_CHAR_TO_TCHAR (src.specificType.in ()));
+        retval.label (src.label.in ());
+        retval.UUID (src.UUID.in ());
+        retval.specificType (src.specificType.in ());
 
         for (CORBA::ULong i = 0; i < src.supportedType.length (); ++i)
-          retval.add_supportedType (ACE_TEXT_CHAR_TO_TCHAR (src.supportedType[i].in ()));
+          retval.add_supportedType (src.supportedType[i].in ());
 
         for (CORBA::ULong i = 0; i < src.idlFile.length (); ++i)
-          retval.add_idlFile (ACE_TEXT_CHAR_TO_TCHAR (src.idlFile[i].in ()));
+          retval.add_idlFile (src.idlFile[i].in ());
 
         for (CORBA::ULong i = 0; i < src.configProperty.length (); ++i)
           retval.add_configProperty (
@@ -149,7 +148,7 @@ namespace CIAO
       {
         CIAO_TRACE ("Comp_Intf_Descr_Handler::resolve_cid");
 
-        xercesc::DOMDocument *dom = XML_HELPER->create_dom (ACE_TEXT_CHAR_TO_TCHAR (uri));
+        xercesc::DOMDocument *dom = XML_Helper::XML_HELPER.create_dom (uri);
 
         if (!dom)
           throw Parse_Error ("Unable to create DOM for Component Interface Description.");
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h b/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h
index 02f07fbb438..08a877d0472 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h
@@ -10,7 +10,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Utils/XML_Helper.h"
+#include "XML_Typedefs.h"
 #include "DAnCE/Deployment/DeploymentC.h"
 #include "Package_Handlers/Packaging_Handlers_Export.h"
 
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
index 2291a30527b..e16a5c63ae8 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp
@@ -6,7 +6,7 @@
 #include "Req_Handler.h"
 #include "Utils/Functors.h"
 #include "Utils/Exceptions.h"
-#include "Utils/XML_Helper.h"
+#include "XML_Typedefs.h"
 
 #include "Deployment.hpp"
 #include "ciao/CIAO_common.h"
@@ -29,7 +29,7 @@ namespace CIAO
 
         if (desc.href_p ())
           {
-            safe_iad.reset (IAD_Handler::resolve_iad (ACE_TEXT_ALWAYS_CHAR (desc.href ().c_str ())));
+            safe_iad.reset (IAD_Handler::resolve_iad (desc.href ().c_str ()));
             iad = safe_iad.get ();
           }
         else
@@ -37,10 +37,10 @@ namespace CIAO
 
 
         if (iad->label_p ())
-          toconfig.label = ACE_TEXT_ALWAYS_CHAR (iad->label ().c_str ());
+          toconfig.label = iad->label ().c_str ();
 
         if (iad->UUID_p ())
-          toconfig.UUID = ACE_TEXT_ALWAYS_CHAR (iad->UUID ().c_str ());
+          toconfig.UUID = iad->UUID ().c_str ();
 
         toconfig.location.length (iad->count_location ());
         std::for_each (iad->begin_location (),
@@ -48,9 +48,9 @@ namespace CIAO
                        String_Seq_Functor (toconfig.location));
 
         toconfig.dependsOn.length (iad->count_dependsOn ());
-        SEQ_HAND_GCC_BUG_WORKAROUND (NIA_Handler::handle_nia,
-                                     desc.begin_dependsOn (),
-                                     toconfig.dependsOn);
+    SEQ_HAND_GCC_BUG_WORKAROUND (NIA_Handler::handle_nia,
+                     desc.begin_dependsOn (),
+                     toconfig.dependsOn);
         std::for_each (iad->begin_dependsOn (),
                        iad->end_dependsOn (),
                        NIA_Functor (toconfig.dependsOn));
@@ -77,11 +77,11 @@ namespace CIAO
         CIAO_TRACE ("IAD_Handler::impl_artifact_descr - reverse");
         ImplementationArtifactDescription retval;
 
-        retval.label (ACE_TEXT_CHAR_TO_TCHAR (src.label.in ()));
-        retval.UUID (ACE_TEXT_CHAR_TO_TCHAR (src.UUID.in ()));
+        retval.label (src.label.in ());
+        retval.UUID (src.UUID.in ());
 
         for (CORBA::ULong i = 0; i < src.location.length (); ++i)
-          retval.add_location (ACE_TEXT_CHAR_TO_TCHAR (src.location[i].in ()));
+          retval.add_location (src.location[i].in ());
 
         for (CORBA::ULong i = 0; i < src.dependsOn.length (); ++i)
           retval.add_dependsOn (NIA_Handler::get_nia (src.dependsOn[i]));
@@ -105,7 +105,7 @@ namespace CIAO
       {
         CIAO_TRACE ("IAD_Handler::resolve_iad");
 
-        xercesc::DOMDocument *dom = XML_HELPER->create_dom (ACE_TEXT_CHAR_TO_TCHAR (uri));
+        xercesc::DOMDocument *dom = XML_Helper::XML_HELPER.create_dom (uri);
 
         if (!dom)
           throw Parse_Error ("Unable to create DOM for IAD");
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h b/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
index 923104dc27b..2f3f2845343 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
@@ -37,7 +37,7 @@ namespace CIAO
         static void handle_nia (const NamedImplementationArtifact &desc,
                              ::Deployment::NamedImplementationArtifact &toconfig)
         {
-          toconfig.name = ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ());
+          toconfig.name = desc.name ().c_str ();
           IAD_Handler::impl_artifact_descr (desc.referencedArtifact (),
                                             toconfig.referencedArtifact);
         }
@@ -46,7 +46,7 @@ namespace CIAO
         static NamedImplementationArtifact
         get_nia (const ::Deployment::NamedImplementationArtifact &src)
         {
-          return NamedImplementationArtifact (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()),
+          return NamedImplementationArtifact (src.name.in (),
                                               IAD_Handler::impl_artifact_descr (src.referencedArtifact));
         }
 
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
index 3f11ee374ff..c7e82624f3d 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
@@ -2,8 +2,8 @@
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "ciao/CIAO_common.h"
 #include "DAnCE/Deployment/Deployment_Packaging_DataC.h"
-#include "Utils/XML_Helper.h"
-#include "Utils/XercesString.h"
+#include "XML_Typedefs.h"
+#include "XML/XercesString.h"
 #include "Utils/Exceptions.h"
 #include "Package_Handlers/PCD_Handler.h"
 #include "Package_Handlers/CPD_Handler.h"
@@ -14,6 +14,8 @@
 
 #include <memory>
 
+using CIAO::XML::XStr;
+
 namespace CIAO
 {
   namespace Config_Handlers
@@ -24,27 +26,27 @@ namespace CIAO
       PCD_Handler::package_config (const ACE_TCHAR *uri,
                                    ::Deployment::PackageConfiguration &toconfig)
       {
-        XERCES_CPP_NAMESPACE::DOMDocument *dom = XML_HELPER->create_dom (uri);
+        XERCES_CPP_NAMESPACE::DOMDocument *dom = XML_Helper::XML_HELPER.create_dom (uri);
 
         if (dom == 0)
           {
             std::string error ("Unable to open file: ");
-            error += ACE_TEXT_ALWAYS_CHAR (uri);
+            error += uri;
             throw Parse_Error (error);
           }
 
         XStr root = dom->getDocumentElement ()->getTagName ();
 
-        if (root == XStr (ACE_TEXT ("Deployment:topLevelPackageDescription")))
+        if (root == XStr ("Deployment:topLevelPackageDescription"))
           {
             TopLevelPackageDescription tpd;
-
-            tpd = topLevelPackageDescription (dom);
+        
+        tpd = topLevelPackageDescription (dom);
 
             PCD_Handler::package_config (*tpd.begin_basePackage (),
                                          toconfig);
           }
-        else if (root == XStr (ACE_TEXT ("Deployment:packageConfiguration")))
+        else if (root == XStr ("Deployment:packageConfiguration"))
           {
             PackageConfiguration pcd;
             pcd = packageConfiguration (dom);
@@ -76,8 +78,7 @@ namespace CIAO
         if (desc.contentLocation_p ())
           {
             // Take ownership of the resolved pcd
-            xsc_pcd.reset (PCD_Handler:: resolve_package_config (
-              ACE_TEXT_ALWAYS_CHAR (desc.contentLocation ().c_str ())));
+            xsc_pcd.reset (PCD_Handler:: resolve_package_config (desc.contentLocation ().c_str ()));
             pcd = xsc_pcd.get ();
           }
         else
@@ -85,11 +86,11 @@ namespace CIAO
 
         if (pcd->label_p ())
           toconfig.label =
-            ACE_TEXT_ALWAYS_CHAR (pcd->label ().c_str ());
+            pcd->label ().c_str ();
 
         if (pcd->UUID_p ())
           toconfig.UUID =
-            ACE_TEXT_ALWAYS_CHAR (pcd->UUID ().c_str ());
+            pcd->UUID ().c_str ();
 
         if (pcd->basePackage_p ())
           {
@@ -119,10 +120,10 @@ namespace CIAO
         PackageConfiguration pcd = PackageConfiguration ();
 
         if (src.label.in () != 0)
-          pcd.label (ACE_TEXT_CHAR_TO_TCHAR (src.label.in ()));
+          pcd.label (src.label.in ());
 
         if (src.UUID.in () != 0)
-          pcd.UUID (ACE_TEXT_CHAR_TO_TCHAR (src.UUID.in ()));
+          pcd.UUID (src.UUID.in ());
 
         if (src.basePackage.length () > 0)
           {
@@ -144,7 +145,7 @@ namespace CIAO
       PackageConfiguration * PCD_Handler::resolve_package_config (const char *uri)
       {
         xercesc::DOMDocument* dom =
-          XML_HELPER->create_dom (ACE_TEXT_CHAR_TO_TCHAR (uri));
+          XML_Helper::XML_HELPER.create_dom (uri);
 
         if (!dom)
           throw Parse_Error ("Unable to create DOM for PackageConfiguration");
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc b/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
index f844313584c..a5253f05d05 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
@@ -1,25 +1,24 @@
 // $Id$
 
-project (Package_Config_Handlers) : acelib, ace_output, ciao_deployment_stub, ciao_config_handlers_base {
+project (Package_Config_Handlers) : acelib, dance_deployment_stub, ciao_config_handlers_base, dance {
   sharedname = Package_Config_Handlers
   dynamicflags = PACKAGING_HANDLERS_BUILD_DLL
   avoids   += ace_for_tao
-
-  includes += $(CIAO_ROOT)/ciao
-
+    
+  includes += $(CIAO_ROOT)/ciao 
+  libpaths += $(CIAO_ROOT)/bin
+ 
   after    += XSC_Config_Handlers_Common \
               XSC_Config_Handlers \
               XSC_DynAny_Handler \
               XSC_XML_Handlers \
               CIAO_XML_Utils \
-              CIAO_Events_Handlers
 
   libs     += XSC_Config_Handlers_Common \
               XSC_Config_Handlers \
               XSC_DynAny_Handler \
               XSC_XML_Handlers \
               CIAO_XML_Utils \
-              CIAO_Events_Handlers RT_CCM_Config_Handlers
 
   Source_files {
     CAD_Handler.cpp
@@ -43,10 +42,11 @@ project (Package_Config_Handlers) : acelib, ace_output, ciao_deployment_stub, ci
 
 }
 
-project (Package_Config_Handlers_Tests) : ciao_component_dnc, ciao_config_handlers, ifr_client {
+project (Package_Config_Handlers_Tests) : dance_deployment_stub, ciao_config_handlers, ifr_client {
   exename = test
   macros   += XML_USE_PTHREADS
   avoids   += ace_for_tao
+  requires += dummy_label 
 
   Source_Files {
     test.cpp
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
index 7039fec9493..b6d9673bef0 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
@@ -5,6 +5,7 @@
 #include "DAnCE/Deployment/DeploymentC.h"
 #include "Package_Handlers/CPD_Handler.h"
 #include "Package_Handlers/PCD_Handler.h"
+#include "Package_Handlers/Comp_Intf_Descr_Handler.h"
 #include "Req_Handler.h"
 #include "Property_Handler.h"
 
@@ -23,7 +24,7 @@ namespace CIAO
                                          ::Deployment::SubcomponentInstantiationDescription &toconfig)
       {
         CIAO_TRACE ("SID_Handler::sub_comp_inst_descr");
-        toconfig.name = ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ());
+        toconfig.name = desc.name ().c_str ();
 
         if (desc.basePackage_p ())
           {
@@ -52,14 +53,15 @@ namespace CIAO
 
             if (desc.referencedPackage ().requiredUUID_p ())
               toconfig.referencedPackage[0].requiredUUID =
-                ACE_TEXT_ALWAYS_CHAR (desc.referencedPackage ().requiredUUID ().c_str ());
+                desc.referencedPackage ().requiredUUID ().c_str ();
 
             if (desc.referencedPackage ().requiredName_p ())
               toconfig.referencedPackage[0].requiredName =
-                ACE_TEXT_ALWAYS_CHAR (desc.referencedPackage ().requiredName ().c_str ());
-
-            toconfig.referencedPackage[0].requiredType =
-              ACE_TEXT_ALWAYS_CHAR (desc.referencedPackage ().requiredType ().c_str ());
+                desc.referencedPackage ().requiredName ().c_str ();
+            
+            Comp_Intf_Descr_Handler::comp_intf_descr (desc.referencedPackage ().requiredType (),
+                                                      toconfig.referencedPackage[0].requiredType);
+            
           }
 
         toconfig.selectRequirement.length (desc.count_selectRequirement ());
@@ -74,7 +76,7 @@ namespace CIAO
 
         if (desc.id_p ())
           {
-            ACE_CString str (ACE_TEXT_ALWAYS_CHAR (desc.id ().c_str ()));
+            ACE_CString str (desc.id ().c_str ());
             SID_Handler::IDREF.bind_next_available (str);
           }
         else
@@ -87,7 +89,7 @@ namespace CIAO
       SID_Handler::sub_comp_inst_descr (const Deployment::SubcomponentInstantiationDescription &src)
       {
         CIAO_TRACE ("SID_Handler::sub_comp_inst_descr - reverse");
-        SubcomponentInstantiationDescription retval (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()));
+        SubcomponentInstantiationDescription retval (src.name.in ());
 
         if (src.basePackage.length () == 1)
           retval.basePackage
@@ -100,15 +102,15 @@ namespace CIAO
             ComponentPackageImport ci;
 
             for (CORBA::ULong i = 0; i < src.importedPackage[0].location.length (); ++i)
-              ci.add_location (ACE_TEXT_CHAR_TO_TCHAR (src.importedPackage[0].location[i].in ()));
+              ci.add_location (src.importedPackage[0].location[i].in ());
 
             retval.importedPackage (ci);
           }
         else if (src.referencedPackage.length () == 1)
           {
-            ComponentPackageReference cpr (ACE_TEXT_CHAR_TO_TCHAR (src.referencedPackage[0].requiredType.in ()));
-            cpr.requiredUUID (ACE_TEXT_CHAR_TO_TCHAR (src.referencedPackage[0].requiredUUID.in ()));
-            cpr.requiredName (ACE_TEXT_CHAR_TO_TCHAR (src.referencedPackage[0].requiredName.in ()));
+            ComponentPackageReference cpr (Comp_Intf_Descr_Handler::comp_intf_descr (src.referencedPackage[0].requiredType));
+            cpr.requiredUUID (src.referencedPackage[0].requiredUUID.in ());
+            cpr.requiredName (src.referencedPackage[0].requiredName.in ());
 
             retval.referencedPackage (cpr);
           }
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h b/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h
index 7bc69b9ab95..2083b91b9b6 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h
@@ -11,7 +11,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Utils/XML_Helper.h"
+#include "XML_Typedefs.h"
 #include "Utils/Functors.h"
 #include "IDREF_Base.h"
 #include "Package_Handlers/Packaging_Handlers_Export.h"
@@ -61,8 +61,8 @@ namespace CIAO
       typedef Sequence_Handler < SubcomponentInstantiationDescription,
                                  ::Deployment::SubcomponentInstantiationDescriptions,
                                  ::Deployment::SubcomponentInstantiationDescription,
-                                 SID_Handler::handle_sub_comp_inst_descr >
-        SID_Functor;
+    SID_Handler::handle_sub_comp_inst_descr > SID_Functor;
+
     }
   }
 }
diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp
index dff1510e707..c107fed4a77 100644
--- a/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp
+++ b/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp
@@ -11,12 +11,13 @@
 #include "tao/ORB.h"
 #include "Utils/Exceptions.h"
 
-static const ACE_TCHAR *input_file = ACE_TEXT ("BasicSP.cdp");
+static const char *input_file = "BasicSP.cdp";
+
 
 static int
-parse_args (int argc, ACE_TCHAR *argv[])
+parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("i:"));
+  ACE_Get_Opt get_opts (argc, argv, "i:");
 
   int c;
 
@@ -44,10 +45,12 @@ void check_srd (const Deployment::DeploymentPlan &);
 
 using namespace CIAO::Config_Handlers;
 
+
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
+
       if (parse_args (argc, argv) != 0)
         return 1;
 
@@ -56,7 +59,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_UNUSED_ARG (orb);
 
 
-      if (xercesc::DOMDocument *doc = XML_HELPER->create_dom (ACE_TEXT_ALWAYS_CHAR (input_file)))
+      if (xercesc::DOMDocument *doc = XML_HELPER->create_dom (input_file))
         {
 
           ::Deployment::PackageConfiguration idl_pc;
@@ -66,7 +69,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
             //std::cerr << "XML to XSC conversion succeeded. Converting to IDL...\n";
 
             //Convert the XSC to an IDL datatype
-            Packaging::PCD_Handler::package_config (ACE_TEXT_ALWAYS_CHAR (input_file), idl_pc);
+            Packaging::PCD_Handler::package_config (input_file, idl_pc);
             std::cout << "Instance document import succeeded.  Dumping contents to file\n";
           }
 
@@ -86,7 +89,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 
           //Write it to test.xml
-          XML_HELPER->write_DOM(the_xsc, ACE_TEXT ("test.xml"));
+          XML_HELPER->write_DOM(the_xsc, "test.xml");
 
           //Cleanliness is next to Godliness
           delete doc;
diff --git a/CIAO/tools/Config_Handlers/Property_Handler.cpp b/CIAO/tools/Config_Handlers/Property_Handler.cpp
index 6cd927dd218..5aece211c5c 100644
--- a/CIAO/tools/Config_Handlers/Property_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/Property_Handler.cpp
@@ -19,27 +19,32 @@ namespace CIAO
     }
 
     void
-    Property_Handler::handle_property (
-                                    const Property& desc,
-                                    Deployment::Property& toconfig)
+    Property_Handler::handle_property (const Property& desc,
+                                       Deployment::Property& toconfig)
     {
       CIAO_TRACE("Property_Handler::get_property");
 
-      toconfig.name =
-        CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ()));
-
-      Any_Handler::extract_into_any (desc.value (),
-                                     toconfig.value);
-
+      try
+        {
+          toconfig.name =
+            CORBA::string_dup (desc.name ().c_str ());
+          
+          Any_Handler::extract_into_any (desc.value (),
+                                         toconfig.value);
+        }
+      catch (Config_Error &ex)
+        {
+          ex.name_ = desc.name ();
+          throw ex;
+        }
     }
 
     Property
-    Property_Handler::get_property (
-                                    const Deployment::Property& src)
+    Property_Handler::get_property (const Deployment::Property& src)
     {
       CIAO_TRACE("Property_Handler::get_property - reverse");
 
-      ::XMLSchema::string< ACE_TCHAR > name (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()));
+      ::XMLSchema::string< char > name ((src.name));
       Any value (Any_Handler::get_any (src.value));
 
       Property prop (name,value);
diff --git a/CIAO/tools/Config_Handlers/Property_Handler.h b/CIAO/tools/Config_Handlers/Property_Handler.h
index 096a2aae432..422aa1d4a44 100644
--- a/CIAO/tools/Config_Handlers/Property_Handler.h
+++ b/CIAO/tools/Config_Handlers/Property_Handler.h
@@ -29,20 +29,21 @@ namespace Deployment
 namespace CIAO
 {
   namespace Config_Handlers
-  {
-    class Property;
+    {
+      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 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_Common_Export Property_Handler
+      class Config_Handlers_Common_Export Property_Handler
     {
     public:
       Property_Handler (void);
@@ -52,16 +53,17 @@ namespace CIAO
       /// <CIAO::Config_Handlers::Property> to the CORBA IDL type
       /// <Deployment::Property>.
       static void handle_property (const Property& desc,
-                                   ::Deployment::Property& toconfig);
+                       ::Deployment::Property& toconfig);
       static Property get_property (const ::Deployment::Property& src);
     };
 
-    typedef Sequence_Handler < Property,
-                               ::Deployment::Properties,
-                               ::Deployment::Property,
-                               Property_Handler::handle_property >
-      Property_Functor;
-  }
+
+      typedef Sequence_Handler < Property,
+                 ::Deployment::Properties,
+                 ::Deployment::Property,
+                 Property_Handler::handle_property > Property_Functor;
+
+    }
 }
 
 #include /**/ "ace/post.h"
diff --git a/CIAO/tools/Config_Handlers/RDD_Handler.cpp b/CIAO/tools/Config_Handlers/RDD_Handler.cpp
index 963e7a027ce..28ddc5ec7cf 100644
--- a/CIAO/tools/Config_Handlers/RDD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RDD_Handler.cpp
@@ -19,10 +19,10 @@ namespace CIAO
       CIAO_TRACE("RDD_Handler::resource_deployment_descr");
 
       dest.requirementName =
-        ACE_TEXT_ALWAYS_CHAR (src.requirementName ().c_str ());
+        src.requirementName ().c_str ();
 
       dest.resourceName=
-        ACE_TEXT_ALWAYS_CHAR (src.resourceName ().c_str ());
+        src.resourceName ().c_str ();
 
       std::for_each (src.begin_property (),
                      src.end_property (),
@@ -36,8 +36,8 @@ namespace CIAO
     {
       CIAO_TRACE("RDD_Handler::resource_deployment_descr - reverse");
 
-      XMLSchema::string< ACE_TCHAR > reqname (ACE_TEXT_CHAR_TO_TCHAR (src.requirementName.in ()));
-      XMLSchema::string< ACE_TCHAR > resname (ACE_TEXT_CHAR_TO_TCHAR (src.resourceName.in ()));
+      XMLSchema::string< char > reqname ((src.requirementName));
+      XMLSchema::string< char > resname ((src.resourceName.in ()));
 
       ResourceDeploymentDescription rdd (reqname,resname);
 
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp
index c0ab8d5daa9..85a06851d78 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp
@@ -34,7 +34,7 @@ namespace CIAO
           if (!IDD_Handler::IDREF.bind_ref (cstr, dest))
             return false;
           */
-          dest.Id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (src.id ().c_str ()));
+          dest.Id = CORBA::string_dup (src.id ().c_str ());
         }
 
       return true;
@@ -61,7 +61,7 @@ namespace CIAO
       */
 
       if (src.Id.in () != 0)
-        cb.id (ACE_TEXT_CHAR_TO_TCHAR (src.Id.in ()));
+        cb.id (src.Id.in ());
 
       return cb;
     }
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp b/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
index a653c2fa311..01f192d5201 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
@@ -1906,19 +1906,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 ("cmdline"))
+        if (n == "cmdline")
         {
           ::CIAO::Config_Handlers::ServerCmdlineOptions t (e);
           cmdline (t);
         }
 
-        else if (n == ACE_TEXT ("svcconf"))
+        else if (n == "svcconf")
         {
           ::CIAO::Config_Handlers::ACESvcConf t (e);
           svcconf (t);
         }
 
-        else if (n == ACE_TEXT ("orbConfigs"))
+        else if (n == "orbConfigs")
         {
           orbConfigs_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ORBConfigs > (new ::CIAO::Config_Handlers::ORBConfigs (e));
           orbConfigs_->container (this);
@@ -1933,7 +1933,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);
@@ -1960,7 +1960,7 @@ 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 ("arg"))
+        if (n == "arg")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           add_arg (t);
@@ -1987,7 +1987,7 @@ 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 ("uri"))
+        if (n == "uri")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           uri (t);
@@ -2014,13 +2014,13 @@ 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 ("resources"))
+        if (n == "resources")
         {
           ::CIAO::Config_Handlers::ORBResources t (e);
           resources (t);
         }
 
-        else if (n == ACE_TEXT ("policySet"))
+        else if (n == "policySet")
         {
           ::CIAO::Config_Handlers::PolicySet t (e);
           add_policySet (t);
@@ -2047,19 +2047,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 ("threadpool"))
+        if (n == "threadpool")
         {
           ::CIAO::Config_Handlers::ThreadpoolDef t (e);
           add_threadpool (t);
         }
 
-        else if (n == ACE_TEXT ("threadpoolWithLanes"))
+        else if (n == "threadpoolWithLanes")
         {
           ::CIAO::Config_Handlers::ThreadpoolWithLanesDef t (e);
           add_threadpoolWithLanes (t);
         }
 
-        else if (n == ACE_TEXT ("connectionBands"))
+        else if (n == "connectionBands")
         {
           ::CIAO::Config_Handlers::ConnectionBandsDef t (e);
           add_connectionBands (t);
@@ -2086,43 +2086,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 ("stacksize"))
+        if (n == "stacksize")
         {
           stacksize_ = ::std::auto_ptr< ::XMLSchema::unsignedLong > (new ::XMLSchema::unsignedLong (e));
           stacksize_->container (this);
         }
 
-        else if (n == ACE_TEXT ("static_threads"))
+        else if (n == "static_threads")
         {
           static_threads_ = ::std::auto_ptr< ::XMLSchema::unsignedLong > (new ::XMLSchema::unsignedLong (e));
           static_threads_->container (this);
         }
 
-        else if (n == ACE_TEXT ("dynamic_threads"))
+        else if (n == "dynamic_threads")
         {
           dynamic_threads_ = ::std::auto_ptr< ::XMLSchema::unsignedLong > (new ::XMLSchema::unsignedLong (e));
           dynamic_threads_->container (this);
         }
 
-        else if (n == ACE_TEXT ("default_priority"))
+        else if (n == "default_priority")
         {
           default_priority_ = ::std::auto_ptr< ::XMLSchema::int_ > (new ::XMLSchema::int_ (e));
           default_priority_->container (this);
         }
 
-        else if (n == ACE_TEXT ("allow_request_buffering"))
+        else if (n == "allow_request_buffering")
         {
           allow_request_buffering_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
           allow_request_buffering_->container (this);
         }
 
-        else if (n == ACE_TEXT ("max_buffered_requests"))
+        else if (n == "max_buffered_requests")
         {
           max_buffered_requests_ = ::std::auto_ptr< ::XMLSchema::unsignedLong > (new ::XMLSchema::unsignedLong (e));
           max_buffered_requests_->container (this);
         }
 
-        else if (n == ACE_TEXT ("max_request_buffered_size"))
+        else if (n == "max_request_buffered_size")
         {
           max_request_buffered_size_ = ::std::auto_ptr< ::XMLSchema::unsignedLong > (new ::XMLSchema::unsignedLong (e));
           max_request_buffered_size_->container (this);
@@ -2137,7 +2137,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);
@@ -2164,37 +2164,37 @@ 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 ("threadpoolLane"))
+        if (n == "threadpoolLane")
         {
           ::CIAO::Config_Handlers::ThreadpoolLaneDef t (e);
           add_threadpoolLane (t);
         }
 
-        else if (n == ACE_TEXT ("stacksize"))
+        else if (n == "stacksize")
         {
           stacksize_ = ::std::auto_ptr< ::XMLSchema::unsignedLong > (new ::XMLSchema::unsignedLong (e));
           stacksize_->container (this);
         }
 
-        else if (n == ACE_TEXT ("allow_borrowing"))
+        else if (n == "allow_borrowing")
         {
           allow_borrowing_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
           allow_borrowing_->container (this);
         }
 
-        else if (n == ACE_TEXT ("allow_request_buffering"))
+        else if (n == "allow_request_buffering")
         {
           allow_request_buffering_ = ::std::auto_ptr< ::XMLSchema::boolean > (new ::XMLSchema::boolean (e));
           allow_request_buffering_->container (this);
         }
 
-        else if (n == ACE_TEXT ("max_buffered_requests"))
+        else if (n == "max_buffered_requests")
         {
           max_buffered_requests_ = ::std::auto_ptr< ::XMLSchema::unsignedLong > (new ::XMLSchema::unsignedLong (e));
           max_buffered_requests_->container (this);
         }
 
-        else if (n == ACE_TEXT ("max_request_buffered_size"))
+        else if (n == "max_request_buffered_size")
         {
           max_request_buffered_size_ = ::std::auto_ptr< ::XMLSchema::unsignedLong > (new ::XMLSchema::unsignedLong (e));
           max_request_buffered_size_->container (this);
@@ -2209,7 +2209,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);
@@ -2236,19 +2236,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 ("static_threads"))
+        if (n == "static_threads")
         {
           static_threads_ = ::std::auto_ptr< ::XMLSchema::unsignedLong > (new ::XMLSchema::unsignedLong (e));
           static_threads_->container (this);
         }
 
-        else if (n == ACE_TEXT ("dynamic_threads"))
+        else if (n == "dynamic_threads")
         {
           dynamic_threads_ = ::std::auto_ptr< ::XMLSchema::unsignedLong > (new ::XMLSchema::unsignedLong (e));
           dynamic_threads_->container (this);
         }
 
-        else if (n == ACE_TEXT ("priority"))
+        else if (n == "priority")
         {
           priority_ = ::std::auto_ptr< ::XMLSchema::int_ > (new ::XMLSchema::int_ (e));
           priority_->container (this);
@@ -2275,7 +2275,7 @@ 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 ("band"))
+        if (n == "band")
         {
           ::CIAO::Config_Handlers::PriorityBandDef t (e);
           add_band (t);
@@ -2290,7 +2290,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);
@@ -2317,13 +2317,13 @@ 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 ("low"))
+        if (n == "low")
         {
           low_ = ::std::auto_ptr< ::XMLSchema::int_ > (new ::XMLSchema::int_ (e));
           low_->container (this);
         }
 
-        else if (n == ACE_TEXT ("high"))
+        else if (n == "high")
         {
           high_ = ::std::auto_ptr< ::XMLSchema::int_ > (new ::XMLSchema::int_ (e));
           high_->container (this);
@@ -2350,31 +2350,31 @@ 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 ("priorityModel"))
+        if (n == "priorityModel")
         {
           ::CIAO::Config_Handlers::PriorityModelPolicyDef t (e);
           add_priorityModel (t);
         }
 
-        else if (n == ACE_TEXT ("nwpriorityModel"))
+        else if (n == "nwpriorityModel")
         {
           ::CIAO::Config_Handlers::NWPriorityModelPolicyDef t (e);
           add_nwpriorityModel (t);
         }
 
-        else if (n == ACE_TEXT ("cnwpriorityModel"))
+        else if (n == "cnwpriorityModel")
         {
           ::CIAO::Config_Handlers::CNWPriorityModelPolicyDef t (e);
           add_cnwpriorityModel (t);
         }
 
-        else if (n == ACE_TEXT ("threadpool"))
+        else if (n == "threadpool")
         {
           ::XMLSchema::IDREF< ACE_TCHAR > t (e);
           add_threadpool (t);
         }
 
-        else if (n == ACE_TEXT ("priorityBandedConnection"))
+        else if (n == "priorityBandedConnection")
         {
           ::XMLSchema::IDREF< ACE_TCHAR > t (e);
           add_priorityBandedConnection (t);
@@ -2389,7 +2389,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);
@@ -2410,8 +2410,8 @@ namespace CIAO
     {
       ::std::basic_string< ACE_TCHAR > v (e.value ());
 
-      if (v == ACE_TEXT ("SERVER_DECLARED")) v_ = SERVER_DECLARED_l;
-      else if (v == ACE_TEXT ("CLIENT_PROPAGATED")) v_ = CLIENT_PROPAGATED_l;
+      if (v == "SERVER_DECLARED") v_ = SERVER_DECLARED_l;
+      else if (v == "CLIENT_PROPAGATED") v_ = CLIENT_PROPAGATED_l;
       else 
       {
       }
@@ -2423,8 +2423,8 @@ namespace CIAO
     {
       ::std::basic_string< ACE_TCHAR > v (a.value ());
 
-      if (v == ACE_TEXT ("SERVER_DECLARED")) v_ = SERVER_DECLARED_l;
-      else if (v == ACE_TEXT ("CLIENT_PROPAGATED")) v_ = CLIENT_PROPAGATED_l;
+      if (v == "SERVER_DECLARED") v_ = SERVER_DECLARED_l;
+      else if (v == "CLIENT_PROPAGATED") v_ = CLIENT_PROPAGATED_l;
       else 
       {
       }
@@ -2442,8 +2442,8 @@ namespace CIAO
     {
       ::std::basic_string< ACE_TCHAR > v (e.value ());
 
-      if (v == ACE_TEXT ("SERVER_DECLARED_NWPRIORITY")) v_ = SERVER_DECLARED_NWPRIORITY_l;
-      else if (v == ACE_TEXT ("CLIENT_PROPAGATED_NWPRIORITY")) v_ = CLIENT_PROPAGATED_NWPRIORITY_l;
+      if (v == "SERVER_DECLARED_NWPRIORITY") v_ = SERVER_DECLARED_NWPRIORITY_l;
+      else if (v == "CLIENT_PROPAGATED_NWPRIORITY") v_ = CLIENT_PROPAGATED_NWPRIORITY_l;
       else 
       {
       }
@@ -2455,8 +2455,8 @@ namespace CIAO
     {
       ::std::basic_string< ACE_TCHAR > v (a.value ());
 
-      if (v == ACE_TEXT ("SERVER_DECLARED_NWPRIORITY")) v_ = SERVER_DECLARED_NWPRIORITY_l;
-      else if (v == ACE_TEXT ("CLIENT_PROPAGATED_NWPRIORITY")) v_ = CLIENT_PROPAGATED_NWPRIORITY_l;
+      if (v == "SERVER_DECLARED_NWPRIORITY") v_ = SERVER_DECLARED_NWPRIORITY_l;
+      else if (v == "CLIENT_PROPAGATED_NWPRIORITY") v_ = CLIENT_PROPAGATED_NWPRIORITY_l;
       else 
       {
       }
@@ -2480,7 +2480,7 @@ 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 ("priority_model"))
+        if (n == "priority_model")
         {
           priority_model_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PriorityModel > (new ::CIAO::Config_Handlers::PriorityModel (e));
           priority_model_->container (this);
@@ -2495,7 +2495,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 ("server_priority"))
+        if (n == "server_priority")
         {
           ::XMLSchema::int_ t (a);
           server_priority (t);
@@ -2522,19 +2522,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 ("nw_priority_model"))
+        if (n == "nw_priority_model")
         {
           nw_priority_model_ = ::std::auto_ptr< ::CIAO::Config_Handlers::NWPriorityModel > (new ::CIAO::Config_Handlers::NWPriorityModel (e));
           nw_priority_model_->container (this);
         }
 
-        else if (n == ACE_TEXT ("request_dscp"))
+        else if (n == "request_dscp")
         {
           request_dscp_ = ::std::auto_ptr< ::XMLSchema::long_ > (new ::XMLSchema::long_ (e));
           request_dscp_->container (this);
         }
 
-        else if (n == ACE_TEXT ("reply_dscp"))
+        else if (n == "reply_dscp")
         {
           reply_dscp_ = ::std::auto_ptr< ::XMLSchema::long_ > (new ::XMLSchema::long_ (e));
           reply_dscp_->container (this);
@@ -2561,13 +2561,13 @@ 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 ("request_dscp"))
+        if (n == "request_dscp")
         {
           request_dscp_ = ::std::auto_ptr< ::XMLSchema::long_ > (new ::XMLSchema::long_ (e));
           request_dscp_->container (this);
         }
 
-        else if (n == ACE_TEXT ("reply_dscp"))
+        else if (n == "reply_dscp")
         {
           reply_dscp_ = ::std::auto_ptr< ::XMLSchema::long_ > (new ::XMLSchema::long_ (e));
           reply_dscp_->container (this);
@@ -2589,7 +2589,7 @@ namespace CIAO
     ServerResources (xercesc::DOMDocument const* d)
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-      if (e.name () == ACE_TEXT ("ServerResources"))
+      if (e.name () == "ServerResources")
       {
         ::CIAO::Config_Handlers::ServerResourcesDef r (e);
         return r;
@@ -4985,7 +4985,7 @@ namespace CIAO
       void ServerResourcesDef::
       cmdline (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("cmdline"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("cmdline", top_ ()));
         Traversal::ServerResourcesDef::cmdline (o);
         pop_ ();
       }
@@ -4993,7 +4993,7 @@ namespace CIAO
       void ServerResourcesDef::
       svcconf (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("svcconf"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("svcconf", top_ ()));
         Traversal::ServerResourcesDef::svcconf (o);
         pop_ ();
       }
@@ -5001,7 +5001,7 @@ namespace CIAO
       void ServerResourcesDef::
       orbConfigs (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("orbConfigs"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("orbConfigs", top_ ()));
         Traversal::ServerResourcesDef::orbConfigs (o);
         pop_ ();
       }
@@ -5009,7 +5009,7 @@ namespace CIAO
       void ServerResourcesDef::
       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::ServerResourcesDef::id (o);
         attr_ (0);
@@ -5039,7 +5039,7 @@ namespace CIAO
       void ServerCmdlineOptions::
       arg_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("arg"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("arg", top_ ()));
       }
 
       void ServerCmdlineOptions::
@@ -5079,7 +5079,7 @@ namespace CIAO
       void ACESvcConf::
       uri (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("uri"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("uri", top_ ()));
         Traversal::ACESvcConf::uri (o);
         pop_ ();
       }
@@ -5108,7 +5108,7 @@ namespace CIAO
       void ORBConfigs::
       resources (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resources"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resources", top_ ()));
         Traversal::ORBConfigs::resources (o);
         pop_ ();
       }
@@ -5116,7 +5116,7 @@ namespace CIAO
       void ORBConfigs::
       policySet_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("policySet"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("policySet", top_ ()));
       }
 
       void ORBConfigs::
@@ -5156,7 +5156,7 @@ namespace CIAO
       void ORBResources::
       threadpool_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("threadpool"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("threadpool", top_ ()));
       }
 
       void ORBResources::
@@ -5175,7 +5175,7 @@ namespace CIAO
       void ORBResources::
       threadpoolWithLanes_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("threadpoolWithLanes"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("threadpoolWithLanes", top_ ()));
       }
 
       void ORBResources::
@@ -5194,7 +5194,7 @@ namespace CIAO
       void ORBResources::
       connectionBands_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("connectionBands"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connectionBands", top_ ()));
       }
 
       void ORBResources::
@@ -5234,7 +5234,7 @@ namespace CIAO
       void ThreadpoolDef::
       stacksize (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("stacksize"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("stacksize", top_ ()));
         Traversal::ThreadpoolDef::stacksize (o);
         pop_ ();
       }
@@ -5242,7 +5242,7 @@ namespace CIAO
       void ThreadpoolDef::
       static_threads (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("static_threads"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("static_threads", top_ ()));
         Traversal::ThreadpoolDef::static_threads (o);
         pop_ ();
       }
@@ -5250,7 +5250,7 @@ namespace CIAO
       void ThreadpoolDef::
       dynamic_threads (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("dynamic_threads"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("dynamic_threads", top_ ()));
         Traversal::ThreadpoolDef::dynamic_threads (o);
         pop_ ();
       }
@@ -5258,7 +5258,7 @@ namespace CIAO
       void ThreadpoolDef::
       default_priority (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("default_priority"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("default_priority", top_ ()));
         Traversal::ThreadpoolDef::default_priority (o);
         pop_ ();
       }
@@ -5266,7 +5266,7 @@ namespace CIAO
       void ThreadpoolDef::
       allow_request_buffering (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("allow_request_buffering"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("allow_request_buffering", top_ ()));
         Traversal::ThreadpoolDef::allow_request_buffering (o);
         pop_ ();
       }
@@ -5274,7 +5274,7 @@ namespace CIAO
       void ThreadpoolDef::
       max_buffered_requests (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("max_buffered_requests"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("max_buffered_requests", top_ ()));
         Traversal::ThreadpoolDef::max_buffered_requests (o);
         pop_ ();
       }
@@ -5282,7 +5282,7 @@ namespace CIAO
       void ThreadpoolDef::
       max_request_buffered_size (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("max_request_buffered_size"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("max_request_buffered_size", top_ ()));
         Traversal::ThreadpoolDef::max_request_buffered_size (o);
         pop_ ();
       }
@@ -5290,7 +5290,7 @@ namespace CIAO
       void ThreadpoolDef::
       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::ThreadpoolDef::id (o);
         attr_ (0);
@@ -5320,7 +5320,7 @@ namespace CIAO
       void ThreadpoolWithLanesDef::
       threadpoolLane_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("threadpoolLane"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("threadpoolLane", top_ ()));
       }
 
       void ThreadpoolWithLanesDef::
@@ -5339,7 +5339,7 @@ namespace CIAO
       void ThreadpoolWithLanesDef::
       stacksize (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("stacksize"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("stacksize", top_ ()));
         Traversal::ThreadpoolWithLanesDef::stacksize (o);
         pop_ ();
       }
@@ -5347,7 +5347,7 @@ namespace CIAO
       void ThreadpoolWithLanesDef::
       allow_borrowing (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("allow_borrowing"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("allow_borrowing", top_ ()));
         Traversal::ThreadpoolWithLanesDef::allow_borrowing (o);
         pop_ ();
       }
@@ -5355,7 +5355,7 @@ namespace CIAO
       void ThreadpoolWithLanesDef::
       allow_request_buffering (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("allow_request_buffering"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("allow_request_buffering", top_ ()));
         Traversal::ThreadpoolWithLanesDef::allow_request_buffering (o);
         pop_ ();
       }
@@ -5363,7 +5363,7 @@ namespace CIAO
       void ThreadpoolWithLanesDef::
       max_buffered_requests (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("max_buffered_requests"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("max_buffered_requests", top_ ()));
         Traversal::ThreadpoolWithLanesDef::max_buffered_requests (o);
         pop_ ();
       }
@@ -5371,7 +5371,7 @@ namespace CIAO
       void ThreadpoolWithLanesDef::
       max_request_buffered_size (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("max_request_buffered_size"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("max_request_buffered_size", top_ ()));
         Traversal::ThreadpoolWithLanesDef::max_request_buffered_size (o);
         pop_ ();
       }
@@ -5379,7 +5379,7 @@ namespace CIAO
       void ThreadpoolWithLanesDef::
       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::ThreadpoolWithLanesDef::id (o);
         attr_ (0);
@@ -5409,7 +5409,7 @@ namespace CIAO
       void ThreadpoolLaneDef::
       static_threads (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("static_threads"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("static_threads", top_ ()));
         Traversal::ThreadpoolLaneDef::static_threads (o);
         pop_ ();
       }
@@ -5417,7 +5417,7 @@ namespace CIAO
       void ThreadpoolLaneDef::
       dynamic_threads (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("dynamic_threads"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("dynamic_threads", top_ ()));
         Traversal::ThreadpoolLaneDef::dynamic_threads (o);
         pop_ ();
       }
@@ -5425,7 +5425,7 @@ namespace CIAO
       void ThreadpoolLaneDef::
       priority (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("priority"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("priority", top_ ()));
         Traversal::ThreadpoolLaneDef::priority (o);
         pop_ ();
       }
@@ -5454,7 +5454,7 @@ namespace CIAO
       void ConnectionBandsDef::
       band_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("band"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("band", top_ ()));
       }
 
       void ConnectionBandsDef::
@@ -5473,7 +5473,7 @@ namespace CIAO
       void ConnectionBandsDef::
       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::ConnectionBandsDef::id (o);
         attr_ (0);
@@ -5503,7 +5503,7 @@ namespace CIAO
       void PriorityBandDef::
       low (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("low"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("low", top_ ()));
         Traversal::PriorityBandDef::low (o);
         pop_ ();
       }
@@ -5511,7 +5511,7 @@ namespace CIAO
       void PriorityBandDef::
       high (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("high"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("high", top_ ()));
         Traversal::PriorityBandDef::high (o);
         pop_ ();
       }
@@ -5540,7 +5540,7 @@ namespace CIAO
       void PolicySet::
       priorityModel_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("priorityModel"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("priorityModel", top_ ()));
       }
 
       void PolicySet::
@@ -5559,7 +5559,7 @@ namespace CIAO
       void PolicySet::
       nwpriorityModel_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("nwpriorityModel"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("nwpriorityModel", top_ ()));
       }
 
       void PolicySet::
@@ -5578,7 +5578,7 @@ namespace CIAO
       void PolicySet::
       cnwpriorityModel_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("cnwpriorityModel"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("cnwpriorityModel", top_ ()));
       }
 
       void PolicySet::
@@ -5597,7 +5597,7 @@ namespace CIAO
       void PolicySet::
       threadpool_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("threadpool"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("threadpool", top_ ()));
       }
 
       void PolicySet::
@@ -5616,7 +5616,7 @@ namespace CIAO
       void PolicySet::
       priorityBandedConnection_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("priorityBandedConnection"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("priorityBandedConnection", top_ ()));
       }
 
       void PolicySet::
@@ -5635,7 +5635,7 @@ namespace CIAO
       void PolicySet::
       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::PolicySet::id (o);
         attr_ (0);
@@ -5661,8 +5661,8 @@ namespace CIAO
       {
         ::std::basic_string< ACE_TCHAR > s;
 
-        if (o == ::CIAO::Config_Handlers::PriorityModel::SERVER_DECLARED) s = ACE_TEXT ("SERVER_DECLARED");
-        else if (o == ::CIAO::Config_Handlers::PriorityModel::CLIENT_PROPAGATED) s = ACE_TEXT ("CLIENT_PROPAGATED");
+        if (o == ::CIAO::Config_Handlers::PriorityModel::SERVER_DECLARED) s = "SERVER_DECLARED";
+        else if (o == ::CIAO::Config_Handlers::PriorityModel::CLIENT_PROPAGATED) s = "CLIENT_PROPAGATED";
         else 
         {
         }
@@ -5698,8 +5698,8 @@ namespace CIAO
       {
         ::std::basic_string< ACE_TCHAR > s;
 
-        if (o == ::CIAO::Config_Handlers::NWPriorityModel::SERVER_DECLARED_NWPRIORITY) s = ACE_TEXT ("SERVER_DECLARED_NWPRIORITY");
-        else if (o == ::CIAO::Config_Handlers::NWPriorityModel::CLIENT_PROPAGATED_NWPRIORITY) s = ACE_TEXT ("CLIENT_PROPAGATED_NWPRIORITY");
+        if (o == ::CIAO::Config_Handlers::NWPriorityModel::SERVER_DECLARED_NWPRIORITY) s = "SERVER_DECLARED_NWPRIORITY";
+        else if (o == ::CIAO::Config_Handlers::NWPriorityModel::CLIENT_PROPAGATED_NWPRIORITY) s = "CLIENT_PROPAGATED_NWPRIORITY";
         else 
         {
         }
@@ -5739,7 +5739,7 @@ namespace CIAO
       void PriorityModelPolicyDef::
       priority_model (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("priority_model"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("priority_model", top_ ()));
         Traversal::PriorityModelPolicyDef::priority_model (o);
         pop_ ();
       }
@@ -5747,7 +5747,7 @@ namespace CIAO
       void PriorityModelPolicyDef::
       server_priority (Type const& o)
       {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT ("server_priority"), ACE_TEXT (""), top_ ());
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a ("server_priority", "", top_ ());
         attr_ (&a);
         Traversal::PriorityModelPolicyDef::server_priority (o);
         attr_ (0);
@@ -5777,7 +5777,7 @@ namespace CIAO
       void NWPriorityModelPolicyDef::
       nw_priority_model (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("nw_priority_model"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("nw_priority_model", top_ ()));
         Traversal::NWPriorityModelPolicyDef::nw_priority_model (o);
         pop_ ();
       }
@@ -5785,7 +5785,7 @@ namespace CIAO
       void NWPriorityModelPolicyDef::
       request_dscp (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("request_dscp"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("request_dscp", top_ ()));
         Traversal::NWPriorityModelPolicyDef::request_dscp (o);
         pop_ ();
       }
@@ -5793,7 +5793,7 @@ namespace CIAO
       void NWPriorityModelPolicyDef::
       reply_dscp (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("reply_dscp"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("reply_dscp", top_ ()));
         Traversal::NWPriorityModelPolicyDef::reply_dscp (o);
         pop_ ();
       }
@@ -5822,7 +5822,7 @@ namespace CIAO
       void CNWPriorityModelPolicyDef::
       request_dscp (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("request_dscp"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("request_dscp", top_ ()));
         Traversal::CNWPriorityModelPolicyDef::request_dscp (o);
         pop_ ();
       }
@@ -5830,7 +5830,7 @@ namespace CIAO
       void CNWPriorityModelPolicyDef::
       reply_dscp (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("reply_dscp"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("reply_dscp", top_ ()));
         Traversal::CNWPriorityModelPolicyDef::reply_dscp (o);
         pop_ ();
       }
@@ -5846,7 +5846,7 @@ namespace CIAO
     ServerResources (::CIAO::Config_Handlers::ServerResourcesDef const& s, xercesc::DOMDocument* d)
     {
       ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-      if (e.name () != ACE_TEXT ("ServerResources"))
+      if (e.name () != "ServerResources")
       {
         throw 1;
       }
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp
index 510b3f5c755..39e2d72bbbf 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.cpp
@@ -20,7 +20,7 @@ namespace CIAO
 
           dest.length(len+1);
 
-          dest[len] = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (loc->c_str ()));
+          dest[len] = CORBA::string_dup (loc->c_str ());
         }
 
       return true;
@@ -35,7 +35,7 @@ namespace CIAO
             i < src.length ();
             ++i)
         {
-          co.add_arg (ACE_TEXT_CHAR_TO_TCHAR (src[i].in ()));
+          co.add_arg (src[i].in ());
         }
 
       return co;
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp
index 2d13dc42d1c..16a2f71f40a 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp
@@ -15,7 +15,7 @@ namespace CIAO
                             ::CIAO::DAnCE::PolicySet &dest)
     {
       if (src.id_p ())
-        dest.Id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (src.id ().c_str ()));
+        dest.Id = CORBA::string_dup (src.id ().c_str ());
 
       // Make room for all of the policies
       CORBA::ULong len (dest.policies.length ());
@@ -67,7 +67,7 @@ namespace CIAO
         {
           ::CIAO::DAnCE::ThreadpoolPolicyDef tpd;
 
-          tpd.Id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (i->id ().c_str ()));
+          tpd.Id = CORBA::string_dup (i->id ().c_str ());
 
           dest.policies[len++].ThreadpoolDef (tpd);
         }
@@ -79,7 +79,7 @@ namespace CIAO
         {
           ::CIAO::DAnCE::PriorityBandedConnectionPolicyDef pbc;
 
-          pbc.Id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (i->id ().c_str ()));
+          pbc.Id = CORBA::string_dup (i->id ().c_str ());
 
           dest.policies[len++].PriorityBandedConnectionDef (pbc);
         }
@@ -92,7 +92,7 @@ namespace CIAO
       PolicySet ps;
 
       if (src.Id.in ())
-        ps.id (ACE_TEXT_CHAR_TO_TCHAR (src.Id.in ()));
+        ps.id (src.Id.in ());
 
       for (CORBA::ULong i = 0;
            i < src.policies.length ();
@@ -123,12 +123,12 @@ namespace CIAO
               break;
 
             case ::CIAO::DAnCE::THREADPOOL_POLICY_TYPE:
-              ps.add_threadpool (ACE_TEXT_CHAR_TO_TCHAR (src.policies[i].ThreadpoolDef ().Id.in ()));
+              ps.add_threadpool  (src.policies[i].ThreadpoolDef ().Id.in ());
               break;
 
             case ::CIAO::DAnCE::PRIORITY_BANDED_CONNECTION_POLICY_TYPE:
               ps.add_priorityBandedConnection (
-                ACE_TEXT_CHAR_TO_TCHAR (src.policies[i].PriorityBandedConnectionDef ().Id.in ()));
+                src.policies[i].PriorityBandedConnectionDef ().Id.in ());
               break;
 
             case 0:
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc b/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc
index e39be8550a8..eb95e0788d5 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc
+++ b/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc
@@ -1,7 +1,7 @@
 //$Id$
 
 project (RT_CCM_XML_Generation) : xscdefaults {
-   requires += xsc
+   requires += xsc dummy_label
 
    xscflags += --cxx-banner-file $(CIAO_ROOT)/docs/schema/xsc-banner.cpp
    xscflags += --cxx-header-banner-file $(CIAO_ROOT)/docs/schema/xsc-banner.h
@@ -9,7 +9,7 @@ project (RT_CCM_XML_Generation) : xscdefaults {
    xscflags += --cxx-namespace-regex  <%quote%>%.*vanderbilt.*%CIAO/Config_Handlers%<%quote%>
    xscflags += --cxx-export-header RT_CCM_Handlers_Export.h
    xscflags += --search-path "$(CIAO_ROOT)/docs/schema"
-
+   
    custom_only = 1
 
    XSC_Files {
@@ -18,7 +18,7 @@ project (RT_CCM_XML_Generation) : xscdefaults {
    }
 }
 
-project (RT_CCM_Config_Handlers) : acelib, ace_output, ciao_deployment_stub, ciao_config_handlers_base {
+project (RT_CCM_Config_Handlers) : acelib, dance_deployment_stub, ciao_config_handlers_base {
   sharedname = RT_CCM_Config_Handlers
   dynamicflags   = RT_CCM_HANDLERS_BUILD_DLL
   macros   += XML_USE_PTHREADS
@@ -26,6 +26,8 @@ project (RT_CCM_Config_Handlers) : acelib, ace_output, ciao_deployment_stub, cia
   includes += $(CIAO_ROOT)/ciao
 
   after += RT_CCM_XML_Generation
+  
+  requires += dummy_label
 
   Source_Files {
         CIAOServerResources.cpp
@@ -46,7 +48,7 @@ project (RT_CCM_Config_Handlers) : acelib, ace_output, ciao_deployment_stub, cia
   }
 }
 
-//project (RT-CCM_Config_Handlers_Tests) : ciao_component_dnc, xerces {
+//project (RT-CCM_Config_Handlers_Tests) : ciao_executor, xerces {
 //  requires += dummy_label
 //  exename = rt-ccm-test
 //  after    += RT-CCM-Handlers
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/RT_CCM_Handlers_Export.h b/CIAO/tools/Config_Handlers/RT-CCM/RT_CCM_Handlers_Export.h
index 8a969d10f7d..fdba117ae61 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/RT_CCM_Handlers_Export.h
+++ b/CIAO/tools/Config_Handlers/RT-CCM/RT_CCM_Handlers_Export.h
@@ -9,10 +9,6 @@
 
 #include "ace/config-all.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (RT_CCM_HANDLERS_HAS_DLL)
-#  define RT_CCM_HANDLERS_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && RT_CCM_HANDLERS_HAS_DLL */
-
 #if !defined (RT_CCM_HANDLERS_HAS_DLL)
 #  define RT_CCM_HANDLERS_HAS_DLL 1
 #endif /* ! RT_CCM_HANDLERS_HAS_DLL */
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp
index 89f3d7d5ee7..17ce790182e 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp
@@ -1,5 +1,5 @@
 // $Id$
-#include "Utils/XML_Helper.h"
+#include "Utils/XML_Typedefs.h"
 #include "SRD_Handler.h"
 #include "CIAOServerResources.hpp"
 #include "CLA_Handler.h"
@@ -14,10 +14,8 @@ namespace CIAO
       srd_ (0),
       retval_ (false)
     {
-      XML_Helper helper;
-
       XERCES_CPP_NAMESPACE::DOMDocument *dom =
-        helper.create_dom (file);
+        XML_HELPER.create_dom (file);
 
       if (!dom)
         throw SRD_Handler::NoSRD ();
@@ -64,7 +62,7 @@ namespace CIAO
 
       if(this->srd_->svcconf_p())
         {
-          this->idl_srd_->svcconf = ACE_TEXT_ALWAYS_CHAR (srd_->svcconf().uri().c_str());
+          this->idl_srd_->svcconf = (srd_->svcconf().uri().c_str());
         }
 
       this->retval_ = OC_Handler::orb_config (this->srd_->orbConfigs (),
@@ -72,7 +70,7 @@ namespace CIAO
 
       if (this->srd_->id_p ())
         {
-          this->idl_srd_->Id = ACE_TEXT_ALWAYS_CHAR (srd_->id ().c_str ());
+          this->idl_srd_->Id = srd_->id ().c_str ();
         }
 
       return this->retval_;
@@ -96,18 +94,18 @@ namespace CIAO
       len = idl_srd_->args.length();
       for(size_t i = 0; i < len; i++)
         {
-          XMLSchema::string < ACE_TCHAR > curr (ACE_TEXT_CHAR_TO_TCHAR (this->idl_srd_->args[i]));
+          XMLSchema::string < ACE_TCHAR > curr ((this->idl_srd_->args[i]));
           sco.add_arg(curr);
         }
       this->srd_->cmdline (sco);
 
       //Then a similar thing for the svcconf
-      XMLSchema::string < ACE_TCHAR > curr (ACE_TEXT_CHAR_TO_TCHAR (this->idl_srd_->svcconf.in ()));
+      XMLSchema::string < ACE_TCHAR > curr (this->idl_srd_->svcconf);
       ACESvcConf asc;
       asc.uri(curr);
       this->srd_->svcconf (asc);
 
-      XMLSchema::string < ACE_TCHAR > id (ACE_TEXT_CHAR_TO_TCHAR (this->idl_srd_->Id.in ()));
+      XMLSchema::string < ACE_TCHAR > id (this->idl_srd_->Id.in ());
       this->srd_->id  (id);
 
       return true;
@@ -154,3 +152,5 @@ namespace CIAO
     }
   }
 }
+
+
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.cpp
index 5f78fc91e00..4d65478d19c 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.cpp
@@ -14,7 +14,7 @@ namespace CIAO
     {
       if (src.id_p ())
         {
-          dest.Id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (src.id().c_str ()));
+          dest.Id = CORBA::string_dup (src.id().c_str ());
         }
 
       for (ThreadpoolWithLanesDef::threadpoolLane_const_iterator loc =
@@ -62,7 +62,7 @@ namespace CIAO
                                   );
 
       //XMLSchema::ID <ACE_TCHAR> id = ((src.Id));
-      tpl.id (ACE_TEXT_CHAR_TO_TCHAR (src.Id.in ()));
+      tpl.id (src.Id.in ());
 
       size_t len = src.threadpool_lanes.length ();
       for (size_t i = 0; i < len; i++)
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h b/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h
index 9b8a4508213..6d1b3b72e98 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h
+++ b/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h
@@ -20,8 +20,8 @@
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
+    namespace Config_Handlers
+    {
     class ThreadpoolWithLanesDef;
 
     /*
@@ -33,14 +33,14 @@ namespace CIAO
     {
     public:
 
-      static bool threadpool_with_lanes (
+        static bool threadpool_with_lanes (
         const ThreadpoolWithLanesDef &src,
         ::CIAO::DAnCE::ORS_ThreadpoolWithLanes &dest);
 
-      static ThreadpoolWithLanesDef threadpool_with_lanes (
+        static ThreadpoolWithLanesDef threadpool_with_lanes (
         const ::CIAO::DAnCE::ORS_ThreadpoolWithLanes &src);
     };
-  }
+    }
 }
 
 #include /**/ "ace/post.h"
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp b/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp
index fd2316a17d0..3def524a0bb 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.cpp
@@ -10,7 +10,7 @@ namespace CIAO
     bool TP_Handler::thread_pool (const ThreadpoolDef &src,
                                   ::CIAO::DAnCE::ORS_Threadpool &dest)
     {
-      dest.Id = CORBA::String_var (ACE_TEXT_ALWAYS_CHAR (src.id ().c_str ()));
+      dest.Id = CORBA::String_var (src.id ().c_str ());
 
       dest.stacksize =
         static_cast <ACE_UINT32> (src.stacksize ());
@@ -48,7 +48,7 @@ namespace CIAO
 
       if (src.Id.in () == 0)
         {
-          tp.id (ACE_TEXT_CHAR_TO_TCHAR (src.Id.in ()));
+          tp.id (src.Id.in ());
         }
 
       return tp;
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/test.cpp b/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
index 3ec97cab2ab..0476fddd6cc 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
@@ -7,16 +7,16 @@
 #include "ciao/ServerResourcesC.h"
 
 #include "ace/Get_Opt.h"
-#include "XML_Helper.h"
+#include "Utils/XML_Typedefs.h"
 #include "tao/ORB.h"
 
-static const ACE_TCHAR *input_file = ACE_TEXT ("BasicSP.cdp");
+static const char *input_file = "BasicSP.cdp";
 
 
 static int
-parse_args (int argc, ACE_TCHAR *argv[])
+parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("i:"));
+  ACE_Get_Opt get_opts (argc, argv, "i:");
 
   int c;
 
@@ -53,7 +53,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   //Create an XML_Helper for all the file work
   XML_Helper the_helper;
 
-  if (xercesc::DOMDocument *doc = the_helper.create_dom (ACE_TEXT_ALWAYS_CHAR (input_file)))
+  if (xercesc::DOMDocument *doc = the_helper.create_dom (input_file))
   {
     //Read in the XSC type structure from the DOMDocument
     ServerResourcesDef srd = ServerResources (doc);
@@ -79,7 +79,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     ServerResources (*reverse_handler.srd_xsc (), the_xsc);
 
     // write out the result
-    the_helper.write_DOM (the_xsc, ACE_TEXT ("output.srd"));
+    the_helper.write_DOM (the_xsc, "output.srd");
   }
 
   std::cout << "Test completed!";
diff --git a/CIAO/tools/Config_Handlers/Req_Handler.cpp b/CIAO/tools/Config_Handlers/Req_Handler.cpp
index 5d9092a2903..f8bb5b90fec 100644
--- a/CIAO/tools/Config_Handlers/Req_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/Req_Handler.cpp
@@ -19,15 +19,14 @@ namespace CIAO
 
     void
     Req_Handler::handle_requirement (const Requirement& desc,
-                                     Deployment::Requirement& toconfig)
+                     Deployment::Requirement& toconfig)
     {
       CIAO_TRACE("Req_Handler::get_Requirement");
 
       //Map the basic string types to their Deployment::Req
       //counterparts.
-      toconfig.name = ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ());
-      toconfig.resourceType =
-        ACE_TEXT_ALWAYS_CHAR (desc.resourceType ().c_str ());
+      toconfig.name = desc.name ().c_str ();
+      toconfig.resourceType = desc.resourceType ().c_str ();
 
       toconfig.property.length (desc.count_property ());
       std::for_each (desc.begin_property (),
@@ -45,9 +44,7 @@ namespace CIAO
       XMLSchema::string< char > res ((src.resourceType));
 
       //Instantiate the Requirement
-      Requirement req (
-        ACE_TEXT_CHAR_TO_TCHAR (name.c_str ()),
-        ACE_TEXT_CHAR_TO_TCHAR (res.c_str ()));
+      Requirement req (name,res);
 
       for (CORBA::ULong i = 0; i < src.property.length (); ++i)
         {
diff --git a/CIAO/tools/Config_Handlers/Req_Handler.h b/CIAO/tools/Config_Handlers/Req_Handler.h
index 3119df4b798..3955b85a55f 100644
--- a/CIAO/tools/Config_Handlers/Req_Handler.h
+++ b/CIAO/tools/Config_Handlers/Req_Handler.h
@@ -28,21 +28,24 @@ namespace Deployment
 
 namespace CIAO
 {
+
   namespace Config_Handlers
-  {
-    /*
-     * @class REQ_Handler
-     *
-     * @brief Handler class for <Requirement> types.
-     *
-     * This class defines handler methods to map values from
-     * XSC Requirement objects, parsed from
-     * the descriptor files, to the corresponding CORBA IDL type.
-     */
+    {
+      /*
+       * @class REQ_Handler
+       *
+       * @brief Handler class for <Requirement> types.
+       *
+       * This class defines handler methods to map values from
+       * XSC Requirement objects, parsed from
+       * the descriptor files, to the corresponding CORBA IDL type.
+       *
+       */
 
-    class Config_Handlers_Common_Export Req_Handler
+      class Config_Handlers_Common_Export Req_Handler
     {
     public:
+
       Req_Handler (void);
       virtual ~Req_Handler (void);
 
@@ -50,16 +53,18 @@ namespace CIAO
       ///and maps the values from the passed in XSC
       ///Requirement to its members.
       static void handle_requirement (const Requirement& desc,
-                                      Deployment::Requirement& toconfig);
-      static Requirement get_requirement (const Deployment::Requirement& src);
+                       Deployment::Requirement& toconfig);
+      static Requirement
+        get_requirement (const Deployment::Requirement& src);
     };
 
-    typedef Sequence_Handler < Requirement,
-                               ::Deployment::Requirements,
-                               ::Deployment::Requirement,
-                               Req_Handler::handle_requirement >
-      Requirement_Functor;
-  }
+      typedef Sequence_Handler < Requirement,
+    ::Deployment::Requirements,
+    ::Deployment::Requirement,
+    Req_Handler::handle_requirement > Requirement_Functor;
+
+
+    }
 }
 
 #include /**/ "ace/post.h"
diff --git a/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp b/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp
index d9c9a01e119..d0bd4e92904 100644
--- a/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp
@@ -48,9 +48,9 @@ namespace CIAO
           if ((*iter).id_p ())
           {
             ACE_CString cstr ((*iter).id ().c_str ());
-
-            STD_CID_Handler::IDREF.bind_ref (cstr,len);
-          }
+            
+        STD_CID_Handler::IDREF.bind_ref (cstr,len);
+      }
 
           if (!this->xml_helper_->is_initialized ())
             return false;
@@ -103,8 +103,8 @@ namespace CIAO
               (*ep_iter).portName ().c_str ();
 
             CORBA::ULong tmp = 0;
-            STD_CID_Handler::IDREF.find_ref (
-              ACE_CString ((((*ep_iter).instance ()).id ()).c_str ()), tmp);
+        STD_CID_Handler::IDREF.find_ref (ACE_CString ((((*ep_iter).instance ()).id ()).c_str ()),
+                         tmp);
             CORBA::ULong ref = tmp;
             idl_cad.connection[conn_len].internalEndpoint [endp_len].instanceRef = ref;
           }
diff --git a/CIAO/tools/Config_Handlers/STD_CID_Handler.h b/CIAO/tools/Config_Handlers/STD_CID_Handler.h
index 475c1c1b471..c875d05edba 100644
--- a/CIAO/tools/Config_Handlers/STD_CID_Handler.h
+++ b/CIAO/tools/Config_Handlers/STD_CID_Handler.h
@@ -13,7 +13,6 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Utils/XML_Helper.h"
 #include "IDREF_Base.h"
 #include "Config_Handlers_Export.h"
 #include "DAnCE/Deployment/DeploymentC.h"
@@ -44,8 +43,7 @@ namespace CIAO
 
     public:
 
-      STD_CID_Handler (XML_Helper *xml_helper)
-        :xml_helper_ (xml_helper)
+      STD_CID_Handler (void)
       {
       }
 
@@ -69,8 +67,6 @@ namespace CIAO
         :xml_helper_ (0)
       {
       }
-
-      XML_Helper *xml_helper_;
     };
   }
 }
diff --git a/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp b/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp
index 1ad0d109fa5..c9fa40f0258 100644
--- a/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp
@@ -4,6 +4,7 @@
 #include "Basic_Deployment_Data.hpp"
 #include "DAnCE/Deployment/Deployment_DataC.h"
 #include "Deployment.hpp"
+#include "Utils/XML_Typedefs.h"
 
 namespace CIAO
 {
@@ -25,13 +26,14 @@ namespace CIAO
       idl_pci.name =
         pci.name ().c_str ();
 
-      if (!this->xml_helper_->is_initialized ())
+      if (XML_Helper::XML_HELPER.is_initialized ())
         return false;
 
       // parse the .cid (ComponentImplementationDescription) file
       // that <referencedImplementation> links to
       xercesc::DOMDocument* dom =
-        this->xml_helper_->create_dom ((pci.referencedImplementation ()).href ().c_str ()); // here location indicates .pcd file
+        XML_Helper::XML_HELPER.create_dom 
+        ((pci.referencedImplementation ()).href ().c_str ()); // here location indicates .pcd file
 
       if (!dom)
         return false;
@@ -41,7 +43,7 @@ namespace CIAO
 
       Deployment::ComponentImplementationDescription idl_cid;
 
-      STD_CID_Handler cid_handler (this->xml_helper_);
+      STD_CID_Handler cid_handler;
 
       cid_handler.component_impl_descr (cid,
                                         idl_cid);
diff --git a/CIAO/tools/Config_Handlers/STD_PCD_Handler.cpp b/CIAO/tools/Config_Handlers/STD_PCD_Handler.cpp
index 6bef6636238..5a65826f340 100644
--- a/CIAO/tools/Config_Handlers/STD_PCD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/STD_PCD_Handler.cpp
@@ -22,13 +22,13 @@ namespace CIAO
       toconfig.UUID =
         desc.UUID ().c_str ();
 
-      if (!this->xml_helper_->is_initialized ())
+      if (!XML_Helper::XML_HELPER.is_initialized ())
         return false;
 
       // parse the .cpd (ComponentPackageDescription) file
       // that <basePackage> links to
       xercesc::DOMDocument* dom =
-        this->xml_helper_->create_dom ((desc.basePackage()).href ().c_str ());
+        XML_Helper::XML_HELPER.create_dom ((desc.basePackage()).href ().c_str ());
 
       if (!dom)
         return false;
@@ -38,7 +38,7 @@ namespace CIAO
 
       Deployment::ComponentPackageDescription idl_cpc;
 
-      STD_CPD_Handler cpd_handler (this->xml_helper_);
+      STD_CPD_Handler cpd_handler;
 
       cpd_handler.component_package_descr (cpc,
                                            idl_cpc);
diff --git a/CIAO/tools/Config_Handlers/STD_PCD_Handler.h b/CIAO/tools/Config_Handlers/STD_PCD_Handler.h
index ba53f6736da..8c65f6eb6f3 100644
--- a/CIAO/tools/Config_Handlers/STD_PCD_Handler.h
+++ b/CIAO/tools/Config_Handlers/STD_PCD_Handler.h
@@ -12,7 +12,6 @@
 #define CIAO_CONFIG_HANDLERS_STD_PCD_HANDLER_H
 
 #include /**/ "ace/pre.h"
-#include "Utils/XML_Helper.h"
 
 #include "Config_Handlers_Export.h"
 
@@ -45,8 +44,7 @@ namespace CIAO
     {
 
     public:
-      STD_PCD_Handler (XML_Helper *xml_helper)
-        :xml_helper_ (xml_helper)
+      STD_PCD_Handler ()
       {
       }
 
@@ -65,11 +63,9 @@ namespace CIAO
     private:
       // Disable the default constructor
       STD_PCD_Handler ()
-        :xml_helper_ (0)
       {
       }
 
-      XML_Helper *xml_helper_;
     };
  }
 }
diff --git a/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp b/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp
index e265295d040..2dfb6a63366 100644
--- a/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp
+++ b/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "STD_PC_Intf.h"
-#include "Utils/XML_Helper.h"
+#include "Utils/XML_Typedefs.h"
 #include "Deployment.hpp"
 #include "STD_PCD_Handler.h"
 #include "ciao/Packaging_DataC.h"
@@ -22,14 +22,10 @@ namespace CIAO
     {
       CIAO_TRACE("STD_PC_Intf::prepare_PC");
 
-      ACE_Auto_Ptr<XML_Helper> helper (new XML_Helper);
-
-      if (!helper->is_initialized ())
-        return false;
 
       // parse the .pcd (PackageConfigurationDescription) file
       xercesc::DOMDocument *dom =
-        helper->create_dom (file);
+        XML_Helper::XML_HELPER.create_dom (file);
 
       if (!dom)
         return false;
@@ -42,7 +38,7 @@ namespace CIAO
       Deployment::PackageConfiguration idl_pc;
 
 
-      STD_PCD_Handler pcd_handler (helper.get ());
+      STD_PCD_Handler pcd_handler;
 
       pcd_handler.package_config (pc,
                                   idl_pc);
diff --git a/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp b/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
index e42ae7a6a49..ded23404689 100644
--- a/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
@@ -25,8 +25,8 @@ namespace CIAO
                                                  Deployment::SatisfierProperty& toconfig)
     {
       CIAO_TRACE("SatisfierProperty_Handler::get_sat_property");
-
-      toconfig.name = ACE_TEXT_ALWAYS_CHAR (desc.name ().c_str ());
+      
+      toconfig.name = desc.name ().c_str ();
 
       switch (desc.kind ().integral ())
         {
@@ -56,14 +56,22 @@ namespace CIAO
           
         default:
           ACE_ERROR ((LM_ERROR, "Unknown SatisfierPropertyKind\n"));
-          throw 1;
+          throw Config_Error (desc.name (), "Unknown SatisfierPropertyKind");
           
         }
 
       toconfig.dynamic = desc.dynamic ();
-
-      Any_Handler::extract_into_any (desc.value (),
-                                     toconfig.value);
+      
+      try
+        {
+          Any_Handler::extract_into_any (desc.value (),
+                                         toconfig.value);
+        }
+      catch (Config_Error &ex)
+        {
+          ex.name_ = desc.name ();
+          throw ex;
+        }
     }
 
     SatisfierProperty
@@ -72,7 +80,7 @@ namespace CIAO
     {
       CIAO_TRACE("SatisfierProperty_Handler::get_sat_property - reverse");
 
-      ::XMLSchema::string< ACE_TCHAR > name (ACE_TEXT_CHAR_TO_TCHAR (src.name.in ()));
+      ::XMLSchema::string< ACE_TCHAR > name ((src.name));
       SatisfierPropertyKind::Value kind;
 
       const SatisfierPropertyKind *spk = 0;
diff --git a/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h b/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h
index 2ffe9a412c2..e166b341d9f 100644
--- a/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h
+++ b/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h
@@ -29,20 +29,21 @@ namespace Deployment
 namespace CIAO
 {
   namespace Config_Handlers
-  {
-    class SatisfierProperty;
+    {
+      class SatisfierProperty;
 
-    /*
-     * @class SatisfierProperty_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 SatisfierProperty_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_Common_Export SatisfierProperty_Handler
+      class Config_Handlers_Common_Export SatisfierProperty_Handler
     {
     public:
       SatisfierProperty_Handler (void);
@@ -52,17 +53,16 @@ namespace CIAO
       /// <CIAO::Config_Handlers::SatisfierProperty> to the CORBA IDL type
       /// <Deployment::SatisfierProperty>.
       static void handle_sat_property (const SatisfierProperty& desc,
-                                       ::Deployment::SatisfierProperty& toconfig);
-      static SatisfierProperty get_sat_property (
-        const ::Deployment::SatisfierProperty& src);
+                       ::Deployment::SatisfierProperty& toconfig);
+      static SatisfierProperty get_sat_property (const ::Deployment::SatisfierProperty& src);
     };
 
-    typedef Sequence_Handler < SatisfierProperty,
-                               ::Deployment::SatisfierProperties,
-                               ::Deployment::SatisfierProperty,
-                               SatisfierProperty_Handler::handle_sat_property>
-      SatisfierProperty_Functor;
-  }
+      typedef Sequence_Handler < SatisfierProperty,
+    ::Deployment::SatisfierProperties,
+    ::Deployment::SatisfierProperty,
+    SatisfierProperty_Handler::handle_sat_property> SatisfierProperty_Functor;
+
+    }
 }
 
 #include /**/ "ace/post.h"
diff --git a/CIAO/tools/Config_Handlers/Utils/CIAO_XML_Utils_Export.h b/CIAO/tools/Config_Handlers/Utils/CIAO_XML_Utils_Export.h
deleted file mode 100644
index b322da0a591..00000000000
--- a/CIAO/tools/Config_Handlers/Utils/CIAO_XML_Utils_Export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CIAO_XML_Utils
-// ------------------------------
-#ifndef CIAO_XML_UTILS_EXPORT_H
-#define CIAO_XML_UTILS_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAO_XML_UTILS_HAS_DLL)
-#  define CIAO_XML_UTILS_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CIAO_XML_UTILS_HAS_DLL */
-
-#if !defined (CIAO_XML_UTILS_HAS_DLL)
-#  define CIAO_XML_UTILS_HAS_DLL 1
-#endif /* ! CIAO_XML_UTILS_HAS_DLL */
-
-#if defined (CIAO_XML_UTILS_HAS_DLL) && (CIAO_XML_UTILS_HAS_DLL == 1)
-#  if defined (CIAO_XML_UTILS_BUILD_DLL)
-#    define CIAO_XML_Utils_Export ACE_Proper_Export_Flag
-#    define CIAO_XML_UTILS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAO_XML_UTILS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CIAO_XML_UTILS_BUILD_DLL */
-#    define CIAO_XML_Utils_Export ACE_Proper_Import_Flag
-#    define CIAO_XML_UTILS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAO_XML_UTILS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CIAO_XML_UTILS_BUILD_DLL */
-#else /* CIAO_XML_UTILS_HAS_DLL == 1 */
-#  define CIAO_XML_Utils_Export
-#  define CIAO_XML_UTILS_SINGLETON_DECLARATION(T)
-#  define CIAO_XML_UTILS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CIAO_XML_UTILS_HAS_DLL == 1 */
-
-// Set CIAO_XML_UTILS_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CIAO_XML_UTILS_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CIAO_XML_UTILS_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CIAO_XML_UTILS_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CIAO_XML_UTILS_NTRACE */
-
-#if (CIAO_XML_UTILS_NTRACE == 1)
-#  define CIAO_XML_UTILS_TRACE(X)
-#else /* (CIAO_XML_UTILS_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CIAO_XML_UTILS_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CIAO_XML_UTILS_NTRACE == 1) */
-
-#endif /* CIAO_XML_UTILS_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/tools/Config_Handlers/Utils/Functors.h b/CIAO/tools/Config_Handlers/Utils/Functors.h
index f07c0573783..c72478311a9 100644
--- a/CIAO/tools/Config_Handlers/Utils/Functors.h
+++ b/CIAO/tools/Config_Handlers/Utils/Functors.h
@@ -53,7 +53,7 @@ namespace CIAO
      * X: First argument to the function
      * Y: Second argument to the function
      */
-#define SEQ_HAND_GCC_BUG_WORKAROUND(W, X, Y) \
+#define SEQ_HAND_GCC_BUG_WORKAROUND(W, X, Y)    \
     while(0) { \
       W (*X, Y[0]);  \
     }
@@ -70,7 +70,7 @@ namespace CIAO
 
       void operator() (const ::XMLSchema::string<ACE_TCHAR>  &src)
       {
-        dest_[pos_++] = ACE_TEXT_ALWAYS_CHAR (src.c_str ());
+        dest_[pos_++] = src.c_str ();
       }
 
     private:
diff --git a/CIAO/tools/Config_Handlers/Utils/Utils.mpc b/CIAO/tools/Config_Handlers/Utils/Utils.mpc
deleted file mode 100644
index e22cf138130..00000000000
--- a/CIAO/tools/Config_Handlers/Utils/Utils.mpc
+++ /dev/null
@@ -1,15 +0,0 @@
-// $Id$
-
-project (CIAO_XML_Utils) : acelib, ace_output, xerces {
-  includes += $(CIAO_ROOT)/tools/Config_Handlers
-  sharedname   += CIAO_XML_Utils
-  dynamicflags  = CIAO_XML_UTILS_BUILD_DLL
-  macros       += XML_USE_PTHREADS
-
-  Source_Files {
-    XML_Schema_Resolver.cpp
-    XML_Error_Handler.cpp
-    XML_Helper.cpp
-    XercesString.cpp
-  }
-}
diff --git a/CIAO/tools/Config_Handlers/Utils/XML_Error_Handler.cpp b/CIAO/tools/Config_Handlers/Utils/XML_Error_Handler.cpp
deleted file mode 100644
index beae7bce56c..00000000000
--- a/CIAO/tools/Config_Handlers/Utils/XML_Error_Handler.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-// $Id$
-
-#include "XML_Error_Handler.h"
-#include "ace/Log_Msg.h"
-#include "ace/Auto_Ptr.h"
-#include <xercesc/util/XMLString.hpp>
-#include <xercesc/dom/DOMLocator.hpp>
-#include "XercesString.h"
-
-using xercesc::XMLString;
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    XML_Error_Handler::XML_Error_Handler (void)
-      : errors_ (false)
-    {
-    }
-
-    XML_Error_Handler::~XML_Error_Handler()
-    {
-    }
-
-
-    bool
-    XML_Error_Handler::handleError (const DOMError& domError)
-    {
-      this->errors_ = true;
-
-      if (domError.getSeverity() == DOMError::DOM_SEVERITY_WARNING)
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t), Warning "));
-      else if (domError.getSeverity() == DOMError::DOM_SEVERITY_ERROR)
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t), Error "));
-      else
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t), Fatal Error "));
-      char *msg =
-        XMLString::transcode (domError.getMessage ());
-
-      ACE_Auto_Basic_Array_Ptr<char> cleanup_msg (msg);
-
-      char *file =
-        XMLString::transcode (domError.getLocation ()->getURI ());
-
-      ACE_Auto_Basic_Array_Ptr<char> cleanup_file (file);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s at line %d and column %d in file %s\n",
-                  msg,
-                  domError.getLocation ()->getLineNumber (),
-                  domError.getLocation ()->getColumnNumber (),
-                  file));
-
-      return true;
-    }
-
-    void
-    XML_Error_Handler::resetErrors (void)
-    {
-      this->errors_ = false;
-    }
-
-    bool
-    XML_Error_Handler::getErrors (void) const
-    {
-      return this->errors_;
-    }
-  }
-}
diff --git a/CIAO/tools/Config_Handlers/Utils/XML_Error_Handler.h b/CIAO/tools/Config_Handlers/Utils/XML_Error_Handler.h
deleted file mode 100644
index 155a6e22629..00000000000
--- a/CIAO/tools/Config_Handlers/Utils/XML_Error_Handler.h
+++ /dev/null
@@ -1,65 +0,0 @@
-//==============================================================
-/**
- *  @file  XML_Error_Handler.h
- *
- *  $Id$
- *
- *  @brief Error handler for Xerces
- *
- *  @author Bala Natarajan <bala@dre.vanderbilt.edu>
- */
-//================================================================
-#ifndef CIAO_CONFIG_HANLDERS_ERROR_HANDLER_H
-#define CIAO_CONFIG_HANLDERS_ERROR_HANDLER_H
-
-#include /**/ "ace/pre.h"
-
-#include "CIAO_XML_Utils_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include <xercesc/dom/DOMErrorHandler.hpp>
-
-using xercesc::DOMErrorHandler;
-using xercesc::DOMError;
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    /**
-     * @class XML_Error_Hander
-     *
-     * @brief Error handler for XERCES
-     *
-     */
-    class CIAO_XML_Utils_Export XML_Error_Handler
-      : public DOMErrorHandler
-    {
-    public:
-
-      XML_Error_Handler (void);
-
-      ~XML_Error_Handler (void);
-
-      bool handleError (const DOMError& domError);
-
-      void resetErrors (void);
-
-      bool getErrors(void) const;
-
-    private :
-      // Disallow copying
-      XML_Error_Handler (const XML_Error_Handler&);
-      XML_Error_Handler& operator= (const XML_Error_Handler&);
-
-      bool errors_;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CIAO_CONFIG_HANLDERS_ERROR_HANDLER_H*/
diff --git a/CIAO/tools/Config_Handlers/Utils/XML_Helper.cpp b/CIAO/tools/Config_Handlers/Utils/XML_Helper.cpp
deleted file mode 100644
index 3359cef0869..00000000000
--- a/CIAO/tools/Config_Handlers/Utils/XML_Helper.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-//$Id$
-#include "XML_Helper.h"
-
-// This file is needed only for proper instantiation of
-// XML_Helper_Singleton in a dll.
-
-#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
-template ACE_Singleton<CIAO::Config_Handlers::XML_Helper, ACE_Null_Mutex> *
-ACE_Singleton<CIAO::Config_Handlers::XML_Helper, ACE_Null_Mutex>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
diff --git a/CIAO/tools/Config_Handlers/Utils/XML_Helper.h b/CIAO/tools/Config_Handlers/Utils/XML_Helper.h
deleted file mode 100644
index 036c6eb713a..00000000000
--- a/CIAO/tools/Config_Handlers/Utils/XML_Helper.h
+++ /dev/null
@@ -1,118 +0,0 @@
-// $Id$
-//============================================================
-/**
- * @file XML_Helper.h
- *
- * @brief Some helper functions for XML
- *
- * @author Bala Natarajan <bala@dre.vanderbilt.edu>
- */
-//============================================================
-#ifndef CIAO_CONFIG_HANDLERS_XML_HELPER_H
-#define CIAO_CONFIG_HANDLERS_XML_HELPER_H
-#include /**/ "ace/pre.h"
-
-#include "CIAO_XML_Utils_Export.h"
-#include "XML_Error_Handler.h"
-#include "XML_Schema_Resolver.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "ace/Singleton.h"
-#include "ace/Null_Mutex.h"
-#include "ace/Auto_Ptr.h"
-
-#include "xercesc/util/XercesDefs.hpp"
-
-namespace XERCES_CPP_NAMESPACE
-{
-  class DOMDocument;
-  class DOMWriter;
-  class DOMImplementation;
-  class DOMDocumentType;
-}
-
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    /**
-     * @class XML_Helper
-     *
-     * @brief Helper class for some routine XML stuff.
-     */
-    template <typename Resolver = CIAO_Schema_Resolver <>,
-              typename Error_Handler = XML_Error_Handler>
-    class XML_Helper_T
-    {
-    public:
-      XML_Helper_T (void);
-
-      ~XML_Helper_T (void);
-
-      /// Create a DOM tree
-      XERCES_CPP_NAMESPACE::DOMDocument *
-      create_dom (const ACE_TCHAR *uri);
-
-      XERCES_CPP_NAMESPACE::DOMDocument *
-      create_dom (const ACE_TCHAR *root,
-                  const ACE_TCHAR *ns,
-                  XERCES_CPP_NAMESPACE::DOMDocumentType * doctype = 0);
-
-      XERCES_CPP_NAMESPACE::DOMDocumentType *
-      create_doctype (const ACE_TCHAR *qn,
-                      const ACE_TCHAR *pid,
-                      const ACE_TCHAR *sid);
-
-      //Writes out a DOMDocument to an XML file
-      bool write_DOM (XERCES_CPP_NAMESPACE::DOMDocument *doc,
-                      const ACE_TCHAR *file) const;
-
-      bool is_initialized (void) const;
-
-    protected:
-      /// Intialize the parser
-      void init_parser (void);
-
-      /// Terminate the parser
-      void terminate_parser (void);
-
-    private:
-      bool initialized_;
-      XERCES_CPP_NAMESPACE::DOMImplementation *impl_;
-      Resolver resolver_;
-      Error_Handler e_handler_;
-    };
-
-    typedef XML_Helper_T<> XML_Helper;
-  }
-}
-
-
-
-CIAO_XML_UTILS_SINGLETON_DECLARE (ACE_Singleton,
-                                  CIAO::Config_Handlers::XML_Helper,
-                                  ACE_Null_Mutex)
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    typedef ACE_Singleton < XML_Helper, ACE_Null_Mutex > XML_Helper_Singleton;
-  }
-}
-
-
-#define XML_HELPER CIAO::Config_Handlers::XML_Helper_Singleton::instance ()
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "XML_Helper.tpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("XML_Helper.tpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-#endif/*CIAO_CONFIG_HANDLERS_XML_HELPER_H*/
diff --git a/CIAO/tools/Config_Handlers/Utils/XML_Helper.tpp b/CIAO/tools/Config_Handlers/Utils/XML_Helper.tpp
deleted file mode 100644
index 3d9d250d5c3..00000000000
--- a/CIAO/tools/Config_Handlers/Utils/XML_Helper.tpp
+++ /dev/null
@@ -1,273 +0,0 @@
-//$Id$
-#include "ace/Log_Msg.h"
-#include "xercesc/util/XMLUniDefs.hpp"
-#include "xercesc/dom/DOM.hpp"
-#include "xercesc/framework/LocalFileFormatTarget.hpp"
-#include "XercesString.h"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    using xercesc::XMLException;
-    using xercesc::XMLString;
-    using xercesc::DOMImplementation;
-    using xercesc::DOMImplementationRegistry;
-    using xercesc::DOMBuilder;
-    using xercesc::DOMImplementationLS;
-    using xercesc::XMLUni;
-    using xercesc::DOMDocument;
-    using xercesc::DOMException;
-    using xercesc::DOMDocumentType;
-
-    template <typename Resolver, typename Error>
-    XML_Helper_T<Resolver, Error>::XML_Helper_T (void)
-      : initialized_ (false),
-        impl_ (0)
-    {
-      this->init_parser ();
-    }
-
-    template <typename Resolver, typename Error>
-    XML_Helper_T<Resolver, Error>::~XML_Helper_T (void)
-    {
-      try
-        {
-          this->terminate_parser ();
-        }
-      catch (...)
-        {
-          // We don't care about exceptions here.
-        }
-    }
-
-    template <typename Resolver, typename Error>
-    bool
-    XML_Helper_T<Resolver, Error>::is_initialized (void) const
-    {
-      return this->initialized_ == true;
-    }
-
-    template <typename Resolver, typename Error>
-    void
-    XML_Helper_T<Resolver, Error>::init_parser (void)
-    {
-      if (this->initialized_)
-        return;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) Initializing the Xerces runtime \n"));
-      // Initialize the Xerces run-time
-      try
-        {
-          xercesc::XMLPlatformUtils::Initialize();
-        }
-      catch (const XMLException&)
-        {
-          throw;
-        }
-      catch (...)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) Some other exception,"
-                      " returning\n"));
-
-          return;
-        }
-
-      // Instantiate the DOM parser.
-      static const XMLCh gLS[] = { xercesc::chLatin_L,
-                                   xercesc::chLatin_S,
-                                   xercesc::chNull };
-
-      // Get an implementation of the Load-Store (LS) interface
-      // and cache it for later use
-      impl_ =
-        DOMImplementationRegistry::getDOMImplementation(gLS);
-
-      this->initialized_ = true;
-      return;
-    }
-
-    template <typename Resolver, typename Error>
-    XERCES_CPP_NAMESPACE::DOMDocument *
-    XML_Helper_T<Resolver, Error>::create_dom (const ACE_TCHAR *root,
-                                               const ACE_TCHAR *ns,
-                                               DOMDocumentType *doctype)
-    {
-      if (!this->initialized_)
-        return 0;
-
-      if (root == 0 || ns == 0)
-        return 0;
-
-      return this->impl_->createDocument (XStr (ns),
-                                          XStr (root),
-                                          doctype);
-    }
-
-    template <typename Resolver, typename Error>
-    XERCES_CPP_NAMESPACE::DOMDocumentType *
-    XML_Helper_T<Resolver, Error>::create_doctype (const ACE_TCHAR *qn,
-                                                   const ACE_TCHAR *pid,
-                                                   const ACE_TCHAR *sid)
-    {
-      if (!this->initialized_)
-        return 0;
-
-      return this->impl_->createDocumentType (XStr (qn),
-                                              XStr (pid),
-                                              XStr (sid));
-    }
-
-    template <typename Resolver, typename Error>
-    XERCES_CPP_NAMESPACE::DOMDocument *
-    XML_Helper_T<Resolver, Error>::create_dom (const ACE_TCHAR *url)
-    {
-      if (!this->initialized_)
-        return 0;
-
-      if (url == 0)
-        return impl_->createDocument(
-          XStr (ACE_TEXT ("http://www.omg.org/DeploymentPlan")),
-          XStr (ACE_TEXT ("deploymentPlan")),
-          0);
-
-      try
-        {
-          // Create a DOMBuilder
-          DOMBuilder* parser =
-            impl_->createDOMBuilder (DOMImplementationLS::MODE_SYNCHRONOUS,
-                                     0);
-
-          // Discard comment nodes in the document
-          parser->setFeature (XMLUni::fgDOMComments, false);
-
-          // Disable datatype normalization. The XML 1.0 attribute value
-          // normalization always occurs though.
-          parser->setFeature (XMLUni::fgDOMDatatypeNormalization, true);
-
-          // Do not create EntityReference nodes in the DOM tree. No
-          // EntityReference nodes will be created, only the nodes
-          // corresponding to their fully expanded sustitution text will be
-          // created.
-          parser->setFeature (XMLUni::fgDOMEntities, false);
-
-          // Perform Namespace processing.
-          parser->setFeature (XMLUni::fgDOMNamespaces, true);
-
-          // Perform Validation
-          parser->setFeature (XMLUni::fgDOMValidation, true);
-
-          // Do not include ignorable whitespace in the DOM tree.
-          parser->setFeature (XMLUni::fgDOMWhitespaceInElementContent, false);
-
-          // Enable the parser's schema support.
-          parser->setFeature (XMLUni::fgXercesSchema, true);
-
-          // Enable full schema constraint checking, including checking which
-          // may be time-consuming or memory intensive. Currently, particle
-          // unique attribution constraint checking and particle derivation
-          // restriction checking are controlled by this option.
-          parser->setFeature (XMLUni::fgXercesSchemaFullChecking, true);
-
-          // The parser will treat validation error as fatal and will exit.
-          parser->setFeature (XMLUni::fgXercesValidationErrorAsFatal, true);
-
-          parser->setErrorHandler (&this->e_handler_);
-
-          parser->setEntityResolver (&this->resolver_);
-
-          std::auto_ptr<DOMDocument> doc (
-            parser->parseURI (ACE_TEXT_ALWAYS_CHAR (url)));
-
-          if (this->e_handler_.getErrors ())
-            throw 0;
-
-          return doc.release ();
-        }
-      catch (const DOMException&)
-        {
-          return 0;
-        }
-      catch (const XMLException&)
-        {
-          throw 0;
-        }
-      catch (...)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) Caught an unknown exception \n"));
-          throw 0;
-        }
-
-      return 0;
-    }
-
-    template <typename Resolver, typename Error>
-    void
-    XML_Helper_T<Resolver, Error>::terminate_parser (void)
-    {
-      try
-        {
-          xercesc::XMLPlatformUtils::Terminate();
-        }
-      catch (const XMLException&)
-        {
-          throw;
-        }
-
-      this->initialized_ = false;
-      return;
-    }
-
-    template <typename Resolver, typename Error>
-    bool
-    XML_Helper_T<Resolver, Error>::write_DOM (
-      XERCES_CPP_NAMESPACE::DOMDocument *doc,
-      const ACE_TCHAR *file) const
-    {
-      if (!this->initialized_)
-        return false;
-
-      try
-        {
-          bool retn;
-          std::auto_ptr<XERCES_CPP_NAMESPACE::DOMWriter> writer (impl_->createDOMWriter());
-
-          if (writer->canSetFeature (XMLUni::fgDOMWRTFormatPrettyPrint,
-                                     true))
-            {
-              writer->setFeature (XMLUni::fgDOMWRTFormatPrettyPrint, true);
-            }
-
-          std::auto_ptr <xercesc::XMLFormatTarget> ft (
-            new xercesc::LocalFileFormatTarget(ACE_TEXT_ALWAYS_CHAR (file)));
-          retn = writer->writeNode(ft.get (), *doc);
-          return retn;
-        }
-      catch (const xercesc::XMLException &e)
-        {
-          char* message =
-            XMLString::transcode (e.getMessage());
-          ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
-
-          char* name =
-            XMLString::transcode (e.getType());
-          ACE_Auto_Basic_Array_Ptr<char> cleanup_name (name);
-
-          ACE_ERROR ((LM_ERROR,
-                      "Caught exception while serializing DOM to file.\n"
-                      "Name: %C\n"
-                      "Message: %C\n"
-                      "SrcFile: %C\n"
-                      "SrcLine: %d\n",
-                      name,
-                      message,
-                      e.getSrcFile (),
-                      e.getSrcLine ()));
-          return false;
-        }
-    }
-  }
-}
diff --git a/CIAO/tools/Config_Handlers/Utils/XML_Schema_Resolver.cpp b/CIAO/tools/Config_Handlers/Utils/XML_Schema_Resolver.cpp
deleted file mode 100644
index 966c46a02e0..00000000000
--- a/CIAO/tools/Config_Handlers/Utils/XML_Schema_Resolver.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// $Id$
-#include <xercesc/util/PlatformUtils.hpp>
-#include <xercesc/util/XercesDefs.hpp>
-
-#include "XML_Schema_Resolver.h"
-#include "XercesString.h"
-
-#include "ace/Env_Value_T.h"
-
-#include <iostream>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    Basic_Resolver::Basic_Resolver (const ACE_TCHAR *path)
-      : path_ (path)
-    {
-    }
-
-    XMLCh *
-    Basic_Resolver::operator() (const XMLCh *const,
-                                const XMLCh *const systemId,
-                                const XMLCh *const) const
-    {
-      XStr path (path_);
-      path.append (systemId);
-      return path.release ();
-    }
-
-    void
-    Basic_Resolver::set_path (const ACE_TCHAR *path)
-    {
-      this->path_ = path;
-    }
-
-    Environment_Resolver::Environment_Resolver (const ACE_TCHAR *variable,
-                                                const ACE_TCHAR *relpath)
-    {
-      xercesc::XMLPlatformUtils::Initialize();
-      this->add_path (variable, relpath);
-    }
-
-    Environment_Resolver::~Environment_Resolver ()
-    {
-      xercesc::XMLPlatformUtils::Terminate();
-    }
-
-    using xercesc::XMLPlatformUtils;
-
-    void
-    Environment_Resolver::add_path (const ACE_TCHAR *variable,
-                                    const ACE_TCHAR *relpath)
-    {
-      ACE_Env_Value <const ACE_TCHAR *> path_env (variable,
-                                                  ACE_TEXT(""));
-
-      XStr xpath (path_env);
-      XStr xrelpath (relpath);
-
-      xpath.append (xrelpath);
-
-      paths_.push_back (xpath);
-    }
-
-    XMLCh *
-    Environment_Resolver::operator() (const XMLCh *const,
-                                      const XMLCh *const systemId,
-                                      const XMLCh *const) const
-    {
-      for (std::vector<XStr>::const_iterator i = this->paths_.begin ();
-           i != this->paths_.end ();
-           ++i)
-        {
-          XStr path (*i);
-          path.append(systemId);
-
-          FileHandle file (XMLPlatformUtils::openFile (path));
-
-          // Check for the file presence.
-          if (file != 0)
-            {
-              XMLPlatformUtils::closeFile (file);
-              return path.release ();
-            }
-        }
-      return 0;
-    }
-  }
-}
diff --git a/CIAO/tools/Config_Handlers/Utils/XML_Schema_Resolver.h b/CIAO/tools/Config_Handlers/Utils/XML_Schema_Resolver.h
deleted file mode 100644
index 5a978ec591f..00000000000
--- a/CIAO/tools/Config_Handlers/Utils/XML_Schema_Resolver.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * @file XML_Schema_Resolver.h
- * @author Will Otte <wotte@dre.vanderbilt.edu>
- *
- * $Id$
- *
- * Resolves schema locations.
- */
-
-#ifndef CIAO_CONFIG_HANDLERS_XML_SCHEAM_RESOLVER_H
-#define CIAO_CONFIG_HANDLERS_XML_SCHEAM_RESOLVER_H
-#include /**/ "ace/pre.h"
-
-#include "CIAO_XML_Utils_Export.h"
-#include "XercesString.h"
-#include "ace/Auto_Ptr.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include <xercesc/dom/DOMEntityResolver.hpp>
-#include <xercesc/dom/DOMInputSource.hpp>
-#include <xercesc/framework/LocalFileInputSource.hpp>
-#include <xercesc/framework/Wrapper4InputSource.hpp>
-
-#include <vector>
-#include <string>
-
-using xercesc::DOMEntityResolver;
-using xercesc::DOMInputSource;
-using xercesc::Wrapper4InputSource;
-using xercesc::LocalFileInputSource;
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    // forward decl.
-    class Environment_Resolver;
-
-    /**
-     * @class CIAO_Schema_Resolver
-     * @brief Resolves schema locations for CIAO.
-     *
-     * Template argument Resolver_Functor should be a functor with an operation
-     * const ACE_TCHAR * operator () (...arguments from resolveEntity...)
-     */
-    template <typename Resolver_Functor = Environment_Resolver>
-    class CIAO_Schema_Resolver
-      : public virtual DOMEntityResolver
-    {
-    public:
-      /// This function is called by the Xerces infrastructure to
-      /// actually resolve the location of a schema.
-      virtual DOMInputSource * resolveEntity (const XMLCh *const publicId,
-                                              const XMLCh *const systemId,
-                                              const XMLCh *const baseURI)
-      {
-        XStr path = this->resolver_ (publicId, systemId, baseURI);
-        if (path.begin () == 0)
-          return 0;
-
-        // Ownership of these objects is given to other people.
-        return new Wrapper4InputSource (new LocalFileInputSource (path));
-      }
-
-      Resolver_Functor &resolver ()
-      {
-        return this->resolver_;
-      }
-
-    private:
-      Resolver_Functor resolver_;
-    };
-
-    /**
-     * @class NoOp_Resolver
-     * @brief Resolver that does nothing.
-     */
-    struct CIAO_XML_Utils_Export NoOp_Resolver
-    {
-      const XMLCh* operator() (const XMLCh *const,
-                               const XMLCh *const systemId,
-                               const XMLCh *const)
-      {
-        return systemId;
-      }
-    };
-
-    /**
-     * @class Basic_Resolver
-     * @brief Resolves a schema location from a fixed path.
-     *        By default @param path is the current folder.
-     */
-    class CIAO_XML_Utils_Export Basic_Resolver
-    {
-    public:
-      Basic_Resolver (const ACE_TCHAR *path = ACE_TEXT ("./"));
-
-      XMLCh* operator() (const XMLCh *const publicId,
-                         const XMLCh *const systemId,
-                         const XMLCh *const baseURI) const;
-
-      void set_path (const ACE_TCHAR *path);
-
-    private:
-      XStr path_;
-    };
-
-    /**
-     * @class Environment_Resolver
-     * @brief Resolves a schema location from a path from an
-     *        environment variable. By default @param variable is $CIAO_ROOT
-     *        and @param path is /docs/schema.
-     */
-    class CIAO_XML_Utils_Export Environment_Resolver
-    {
-    public:
-      Environment_Resolver (const ACE_TCHAR *variable = ACE_TEXT ("CIAO_ROOT"),
-                            const ACE_TCHAR *path = ACE_TEXT ("/docs/schema/"));
-
-      ~Environment_Resolver ();
-
-      void add_path (const ACE_TCHAR *variable,
-                     const ACE_TCHAR *path);
-
-      XMLCh* operator() (const XMLCh *const publicId,
-                         const XMLCh *const systemId,
-                         const XMLCh *const baseURI) const;
-
-    private:
-      std::vector<XStr> paths_;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /*  CIAO_CONFIG_HANDLERS_XML_SCHEAM_RESOLVER_H */
diff --git a/CIAO/tools/Config_Handlers/Utils/XercesString.cpp b/CIAO/tools/Config_Handlers/Utils/XercesString.cpp
deleted file mode 100644
index b64ede20c6e..00000000000
--- a/CIAO/tools/Config_Handlers/Utils/XercesString.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-// $Id$
-
-#include <ostream>
-#include <algorithm>
-
-#include "XercesString.h"
-using xercesc::XMLString;
-
-namespace CIAO
-{
-namespace Config_Handlers
-{
-
-  XStr::XStr (const ACE_TCHAR *str)
-    : _wstr(0)
-  {
-    _wstr = XMLString::transcode(ACE_TEXT_ALWAYS_CHAR (str));
-  }
-
-  XStr::XStr (XMLCh *wstr)
-    : _wstr(wstr)
-  {
-
-  }
-
-  XStr::XStr (const XMLCh* wstr)
-    : _wstr(0)
-  {
-    _wstr = XMLString::replicate(wstr);
-  }
-
-  XStr::XStr (const XStr &right)
-    : _wstr(0)
-  {
-    _wstr = XMLString::replicate(right._wstr);
-  }
-
-  XStr& XStr::operator= (const XStr& rhs)
-  {
-    if (&rhs == this)
-      return *this;
-    XStr temp (rhs);
-    std::swap (this->_wstr, temp._wstr);
-    return *this;
-  }
-
-  XStr::~XStr ()
-  {
-    if (_wstr)
-      XMLString::release(&_wstr);
-  }
-
-  const XMLCh* XStr::begin () const
-  {
-    return _wstr;
-  }
-
-  const XMLCh* XStr::end () const
-  {
-    return _wstr + size();
-  }
-
-  bool XStr::append(const XMLCh *tail)
-  {
-    int iTailLen = XMLString::stringLen(tail);
-    int iWorkLen = XMLString::stringLen(_wstr);
-    XMLCh *result = new XMLCh[ iWorkLen + iTailLen + 1 ];
-    bool bOK = result != 0;
-    if (bOK)
-      {
-        XMLCh *target = result;
-        XMLString::moveChars(target, _wstr, iWorkLen);
-        target += iWorkLen;
-        XMLString::moveChars(target, tail, iTailLen);
-        target += iTailLen;
-        *target++ = 0;
-        XMLString::release(&_wstr);
-        _wstr = result;
-      }
-    return bOK;
-  }
-
-  bool XStr::erase(const XMLCh *head, const XMLCh *tail)
-  {
-    bool bOK = head <= tail && head >= begin() && tail <= end();
-    if (bOK)
-      {
-        XMLCh *result = new XMLCh[ size() - (tail - head) + 1 ];
-        XMLCh *target = result;
-        bOK = target != 0;
-        if (bOK)
-          {
-            const XMLCh *cursor = begin();
-
-            while (cursor != head) *target++ = *cursor++;
-            cursor = tail;
-            while ( cursor != end() ) *target++ = *cursor++;
-            *target ++ = 0;
-            XMLString::release(&_wstr);
-            _wstr = result;
-          }
-      }
-    return bOK;
-  }
-
-  int XStr::size () const
-  {
-    return XMLString::stringLen(_wstr);
-  }
-
-  XMLCh XStr::operator [] (const int i)
-  {
-    return _wstr[i];
-  }
-
-  XMLCh XStr::operator [] (const int i) const
-  {
-    return _wstr[i];
-  }
-
-  XMLCh* XStr::release (void)
-  {
-    XMLCh* tmp = _wstr;
-    this->_wstr = 0;
-    return tmp;
-  }
-
-  bool operator== (const XStr& lhs, const XStr& rhs)
-  {
-    return XMLString::compareIString (lhs,rhs) == 0;
-  }
-
-  bool operator!= (const XStr& lhs, const XStr& rhs)
-  {
-    return !operator==(lhs, rhs);
-  }
-
-
-  std::ostream&
-  operator<< (std::ostream& o, XStr const& str)
-  {
-    char* s = XMLString::transcode (str);
-
-    o << s;
-
-    XMLString::release (&s); // idiots?
-    return o;
-  }
-
-}
-}
diff --git a/CIAO/tools/Config_Handlers/Utils/XercesString.h b/CIAO/tools/Config_Handlers/Utils/XercesString.h
deleted file mode 100644
index 9c5cf3c7e86..00000000000
--- a/CIAO/tools/Config_Handlers/Utils/XercesString.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// $Id$
-
-#ifndef _XERCESSTRING_H
-#define _XERCESSTRING_H
-
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include <iosfwd>
-
-#include <xercesc/util/XMLString.hpp>
-
-// Utility class that provides a std::string like facade to XMLString.
-// Doesn't implement all of the methods of std::string.
-#include "CIAO_XML_Utils_Export.h"
-namespace CIAO
-{
-namespace Config_Handlers
-{
-
-  class CIAO_XML_Utils_Export XStr
-  {
-  public:
-    XStr() : _wstr(0L) { }
-
-    XStr (const ACE_TCHAR* wstr);
-
-    XStr (XMLCh* wstr);
-
-    XStr (const XMLCh* wstr);
-
-    XStr (const XStr& copy);
-
-    XStr& operator= (const XStr& rhs);
-
-    ~XStr();
-
-    const XMLCh* begin() const;
-
-    const XMLCh* end() const;
-
-    bool append(const XMLCh* tail);
-
-    bool erase (const XMLCh* head, const XMLCh* tail);
-
-    int size() const;
-
-    XMLCh operator [] (const int i);
-
-    XMLCh operator [] (const int i) const;
-
-    operator const XMLCh* () const { return _wstr; }
-
-    XMLCh * release (void);
-
-  private:
-
-    XMLCh* _wstr; // Internal representation
-
-  };
-
-  CIAO_XML_Utils_Export bool operator== (const XStr& lhs, const XStr& rhs);
-  CIAO_XML_Utils_Export bool operator!= (const XStr& lhs, const XStr& rhs);
-
-  CIAO_XML_Utils_Export std::ostream&
-  operator<< (std::ostream& o, XStr const& str);
-
-}
-}
-#include /**/ "ace/post.h"
-
-#endif /* _XERCESSTRING_H */
diff --git a/CIAO/tools/Config_Handlers/XMI.cpp b/CIAO/tools/Config_Handlers/XMI.cpp
new file mode 100644
index 00000000000..ce54bf47d87
--- /dev/null
+++ b/CIAO/tools/Config_Handlers/XMI.cpp
@@ -0,0 +1,860 @@
+/* $Id$
+ * This code was generated by the XML Schema Compiler.
+ *
+ * Changes made to this code will most likely be overwritten
+ * when the handlers are recompiled.
+ *
+ * If you find errors or feel that there are bugfixes to be made,
+ * please contact the current XSC maintainer:
+ *             Will Otte <wotte@dre.vanderbilt.edu>
+ */
+
+// Fix for Borland compilers, which seem to have a broken
+// <string> include.
+#ifdef __BORLANDC__
+# include <string.h>
+#endif
+
+#include "XMI.hpp"
+
+namespace XMI
+{
+  // Extension
+  // 
+
+  Extension::
+  Extension ()
+  : 
+  regulator__ ()
+  {
+  }
+
+  Extension::
+  Extension (::XMI::Extension const& s)
+    :
+    XSCRT::Type (),
+  xmi_id_ (s.xmi_id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.xmi_id_) : 0),
+  label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+  uuid_ (s.uuid_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.uuid_) : 0),
+  href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
+  idref_ (s.idref_.get () ? new ::XMLSchema::IDREF< ACE_TCHAR > (*s.idref_) : 0),
+  version_ (s.version_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.version_) : 0),
+  extender_ (s.extender_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.extender_) : 0),
+  extenderID_ (s.extenderID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.extenderID_) : 0),
+  regulator__ ()
+  {
+    if (xmi_id_.get ()) xmi_id_->container (this);
+    if (label_.get ()) label_->container (this);
+    if (uuid_.get ()) uuid_->container (this);
+    if (href_.get ()) href_->container (this);
+    if (idref_.get ()) idref_->container (this);
+    if (version_.get ()) version_->container (this);
+    if (extender_.get ()) extender_->container (this);
+    if (extenderID_.get ()) extenderID_->container (this);
+  }
+
+  ::XMI::Extension& Extension::
+  operator= (::XMI::Extension const& s)
+  {
+    if (s.xmi_id_.get ()) xmi_id (*(s.xmi_id_));
+    else xmi_id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+
+    if (s.label_.get ()) label (*(s.label_));
+    else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+
+    if (s.uuid_.get ()) uuid (*(s.uuid_));
+    else uuid_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+
+    if (s.href_.get ()) href (*(s.href_));
+    else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+
+    if (s.idref_.get ()) idref (*(s.idref_));
+    else idref_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (0);
+
+    if (s.version_.get ()) version (*(s.version_));
+    else version_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+
+    if (s.extender_.get ()) extender (*(s.extender_));
+    else extender_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+
+    if (s.extenderID_.get ()) extenderID (*(s.extenderID_));
+    else extenderID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+
+    return *this;
+  }
+
+
+  // Extension
+  // 
+  bool Extension::
+  xmi_id_p () const
+  {
+    return xmi_id_.get () != 0;
+  }
+
+  ::XMLSchema::ID< ACE_TCHAR > const& Extension::
+  xmi_id () const
+  {
+    return *xmi_id_;
+  }
+
+  ::XMLSchema::ID< ACE_TCHAR >& Extension::
+  xmi_id ()
+  {
+    return *xmi_id_;
+  }
+
+  void Extension::
+  xmi_id (::XMLSchema::ID< ACE_TCHAR > const& e)
+  {
+    if (xmi_id_.get ())
+    {
+      *xmi_id_ = e;
+    }
+
+    else
+    {
+      xmi_id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
+      xmi_id_->container (this);
+    }
+  }
+
+  // Extension
+  // 
+  bool Extension::
+  label_p () const
+  {
+    return label_.get () != 0;
+  }
+
+  ::XMLSchema::string< ACE_TCHAR > const& Extension::
+  label () const
+  {
+    return *label_;
+  }
+
+  ::XMLSchema::string< ACE_TCHAR >& Extension::
+  label ()
+  {
+    return *label_;
+  }
+
+  void Extension::
+  label (::XMLSchema::string< ACE_TCHAR > const& e)
+  {
+    if (label_.get ())
+    {
+      *label_ = e;
+    }
+
+    else
+    {
+      label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+      label_->container (this);
+    }
+  }
+
+  // Extension
+  // 
+  bool Extension::
+  uuid_p () const
+  {
+    return uuid_.get () != 0;
+  }
+
+  ::XMLSchema::string< ACE_TCHAR > const& Extension::
+  uuid () const
+  {
+    return *uuid_;
+  }
+
+  ::XMLSchema::string< ACE_TCHAR >& Extension::
+  uuid ()
+  {
+    return *uuid_;
+  }
+
+  void Extension::
+  uuid (::XMLSchema::string< ACE_TCHAR > const& e)
+  {
+    if (uuid_.get ())
+    {
+      *uuid_ = e;
+    }
+
+    else
+    {
+      uuid_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+      uuid_->container (this);
+    }
+  }
+
+  // Extension
+  // 
+  bool Extension::
+  href_p () const
+  {
+    return href_.get () != 0;
+  }
+
+  ::XMLSchema::string< ACE_TCHAR > const& Extension::
+  href () const
+  {
+    return *href_;
+  }
+
+  ::XMLSchema::string< ACE_TCHAR >& Extension::
+  href ()
+  {
+    return *href_;
+  }
+
+  void Extension::
+  href (::XMLSchema::string< ACE_TCHAR > const& e)
+  {
+    if (href_.get ())
+    {
+      *href_ = e;
+    }
+
+    else
+    {
+      href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+      href_->container (this);
+    }
+  }
+
+  // Extension
+  // 
+  bool Extension::
+  idref_p () const
+  {
+    return idref_.get () != 0;
+  }
+
+  ::XMLSchema::IDREF< ACE_TCHAR > const& Extension::
+  idref () const
+  {
+    return *idref_;
+  }
+
+  ::XMLSchema::IDREF< ACE_TCHAR >& Extension::
+  idref ()
+  {
+    return *idref_;
+  }
+
+  void Extension::
+  idref (::XMLSchema::IDREF< ACE_TCHAR > const& e)
+  {
+    if (idref_.get ())
+    {
+      *idref_ = e;
+    }
+
+    else
+    {
+      idref_ = ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > (new ::XMLSchema::IDREF< ACE_TCHAR > (e));
+      idref_->container (this);
+    }
+  }
+
+  // Extension
+  // 
+  bool Extension::
+  version_p () const
+  {
+    return version_.get () != 0;
+  }
+
+  ::XMLSchema::string< ACE_TCHAR > const& Extension::
+  version () const
+  {
+    return *version_;
+  }
+
+  ::XMLSchema::string< ACE_TCHAR >& Extension::
+  version ()
+  {
+    return *version_;
+  }
+
+  void Extension::
+  version (::XMLSchema::string< ACE_TCHAR > const& e)
+  {
+    if (version_.get ())
+    {
+      *version_ = e;
+    }
+
+    else
+    {
+      version_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+      version_->container (this);
+    }
+  }
+
+  // Extension
+  // 
+  bool Extension::
+  extender_p () const
+  {
+    return extender_.get () != 0;
+  }
+
+  ::XMLSchema::string< ACE_TCHAR > const& Extension::
+  extender () const
+  {
+    return *extender_;
+  }
+
+  ::XMLSchema::string< ACE_TCHAR >& Extension::
+  extender ()
+  {
+    return *extender_;
+  }
+
+  void Extension::
+  extender (::XMLSchema::string< ACE_TCHAR > const& e)
+  {
+    if (extender_.get ())
+    {
+      *extender_ = e;
+    }
+
+    else
+    {
+      extender_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+      extender_->container (this);
+    }
+  }
+
+  // Extension
+  // 
+  bool Extension::
+  extenderID_p () const
+  {
+    return extenderID_.get () != 0;
+  }
+
+  ::XMLSchema::string< ACE_TCHAR > const& Extension::
+  extenderID () const
+  {
+    return *extenderID_;
+  }
+
+  ::XMLSchema::string< ACE_TCHAR >& Extension::
+  extenderID ()
+  {
+    return *extenderID_;
+  }
+
+  void Extension::
+  extenderID (::XMLSchema::string< ACE_TCHAR > const& e)
+  {
+    if (extenderID_.get ())
+    {
+      *extenderID_ = e;
+    }
+
+    else
+    {
+      extenderID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+      extenderID_->container (this);
+    }
+  }
+}
+
+namespace XMI
+{
+  // Extension
+  //
+
+  Extension::
+  Extension (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+  :Base (e), regulator__ ()
+  {
+
+    ::XSCRT::Parser< ACE_TCHAR > p (e);
+
+    while (p.more_attributes ())
+    {
+      ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+      ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+      if (n == "xmi_id")
+      {
+        ::XMLSchema::ID< ACE_TCHAR > t (a);
+        xmi_id (t);
+      }
+
+      else if (n == "label")
+      {
+        ::XMLSchema::string< ACE_TCHAR > t (a);
+        label (t);
+      }
+
+      else if (n == "uuid")
+      {
+        ::XMLSchema::string< ACE_TCHAR > t (a);
+        uuid (t);
+      }
+
+      else if (n == "href")
+      {
+        ::XMLSchema::string< ACE_TCHAR > t (a);
+        href (t);
+      }
+
+      else if (n == "idref")
+      {
+        ::XMLSchema::IDREF< ACE_TCHAR > t (a);
+        idref (t);
+      }
+
+      else if (n == "version")
+      {
+        ::XMLSchema::string< ACE_TCHAR > t (a);
+        version (t);
+      }
+
+      else if (n == "extender")
+      {
+        ::XMLSchema::string< ACE_TCHAR > t (a);
+        extender (t);
+      }
+
+      else if (n == "extenderID")
+      {
+        ::XMLSchema::string< ACE_TCHAR > t (a);
+        extenderID (t);
+      }
+
+      else 
+      {
+      }
+    }
+  }
+}
+
+namespace XMI
+{
+  ::XMI::Extension
+  extension (xercesc::DOMDocument const* d)
+  {
+    ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
+    if (e.name () == "extension")
+    {
+      ::XMI::Extension r (e);
+      return r;
+    }
+
+    else
+    {
+      throw 1;
+    }
+  }
+}
+
+#include "XMLSchema/TypeInfo.hpp"
+
+namespace XMI
+{
+  namespace
+  {
+    ::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
+
+    struct ExtensionTypeInfoInitializer
+    {
+      ExtensionTypeInfoInitializer ()
+      {
+        ::XSCRT::TypeId id (typeid (Extension));
+        ::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));
+      }
+    };
+
+    ExtensionTypeInfoInitializer ExtensionTypeInfoInitializer_;
+  }
+}
+
+namespace XMI
+{
+  namespace Traversal
+  {
+    // Extension
+    //
+    //
+
+    void Extension::
+    traverse (Type& o)
+    {
+      pre (o);
+      if (o.xmi_id_p ()) xmi_id (o);
+      else xmi_id_none (o);
+      if (o.label_p ()) label (o);
+      else label_none (o);
+      if (o.uuid_p ()) uuid (o);
+      else uuid_none (o);
+      if (o.href_p ()) href (o);
+      else href_none (o);
+      if (o.idref_p ()) idref (o);
+      else idref_none (o);
+      if (o.version_p ()) version (o);
+      else version_none (o);
+      if (o.extender_p ()) extender (o);
+      else extender_none (o);
+      if (o.extenderID_p ()) extenderID (o);
+      else extenderID_none (o);
+      post (o);
+    }
+
+    void Extension::
+    traverse (Type const& o)
+    {
+      pre (o);
+      if (o.xmi_id_p ()) xmi_id (o);
+      else xmi_id_none (o);
+      if (o.label_p ()) label (o);
+      else label_none (o);
+      if (o.uuid_p ()) uuid (o);
+      else uuid_none (o);
+      if (o.href_p ()) href (o);
+      else href_none (o);
+      if (o.idref_p ()) idref (o);
+      else idref_none (o);
+      if (o.version_p ()) version (o);
+      else version_none (o);
+      if (o.extender_p ()) extender (o);
+      else extender_none (o);
+      if (o.extenderID_p ()) extenderID (o);
+      else extenderID_none (o);
+      post (o);
+    }
+
+    void Extension::
+    pre (Type&)
+    {
+    }
+
+    void Extension::
+    pre (Type const&)
+    {
+    }
+
+    void Extension::
+    xmi_id (Type& o)
+    {
+      dispatch (o.xmi_id ());
+    }
+
+    void Extension::
+    xmi_id (Type const& o)
+    {
+      dispatch (o.xmi_id ());
+    }
+
+    void Extension::
+    xmi_id_none (Type&)
+    {
+    }
+
+    void Extension::
+    xmi_id_none (Type const&)
+    {
+    }
+
+    void Extension::
+    label (Type& o)
+    {
+      dispatch (o.label ());
+    }
+
+    void Extension::
+    label (Type const& o)
+    {
+      dispatch (o.label ());
+    }
+
+    void Extension::
+    label_none (Type&)
+    {
+    }
+
+    void Extension::
+    label_none (Type const&)
+    {
+    }
+
+    void Extension::
+    uuid (Type& o)
+    {
+      dispatch (o.uuid ());
+    }
+
+    void Extension::
+    uuid (Type const& o)
+    {
+      dispatch (o.uuid ());
+    }
+
+    void Extension::
+    uuid_none (Type&)
+    {
+    }
+
+    void Extension::
+    uuid_none (Type const&)
+    {
+    }
+
+    void Extension::
+    href (Type& o)
+    {
+      dispatch (o.href ());
+    }
+
+    void Extension::
+    href (Type const& o)
+    {
+      dispatch (o.href ());
+    }
+
+    void Extension::
+    href_none (Type&)
+    {
+    }
+
+    void Extension::
+    href_none (Type const&)
+    {
+    }
+
+    void Extension::
+    idref (Type& o)
+    {
+      dispatch (o.idref ());
+    }
+
+    void Extension::
+    idref (Type const& o)
+    {
+      dispatch (o.idref ());
+    }
+
+    void Extension::
+    idref_none (Type&)
+    {
+    }
+
+    void Extension::
+    idref_none (Type const&)
+    {
+    }
+
+    void Extension::
+    version (Type& o)
+    {
+      dispatch (o.version ());
+    }
+
+    void Extension::
+    version (Type const& o)
+    {
+      dispatch (o.version ());
+    }
+
+    void Extension::
+    version_none (Type&)
+    {
+    }
+
+    void Extension::
+    version_none (Type const&)
+    {
+    }
+
+    void Extension::
+    extender (Type& o)
+    {
+      dispatch (o.extender ());
+    }
+
+    void Extension::
+    extender (Type const& o)
+    {
+      dispatch (o.extender ());
+    }
+
+    void Extension::
+    extender_none (Type&)
+    {
+    }
+
+    void Extension::
+    extender_none (Type const&)
+    {
+    }
+
+    void Extension::
+    extenderID (Type& o)
+    {
+      dispatch (o.extenderID ());
+    }
+
+    void Extension::
+    extenderID (Type const& o)
+    {
+      dispatch (o.extenderID ());
+    }
+
+    void Extension::
+    extenderID_none (Type&)
+    {
+    }
+
+    void Extension::
+    extenderID_none (Type const&)
+    {
+    }
+
+    void Extension::
+    post (Type&)
+    {
+    }
+
+    void Extension::
+    post (Type const&)
+    {
+    }
+  }
+}
+
+namespace XMI
+{
+  namespace Writer
+  {
+    // Extension
+    //
+    //
+
+    Extension::
+    Extension (::XSCRT::XML::Element< ACE_TCHAR >& e)
+    : ::XSCRT::Writer< ACE_TCHAR > (e)
+    {
+    }
+
+    Extension::
+    Extension ()
+    {
+    }
+
+    void Extension::
+    traverse (Type const& o)
+    {
+      Traversal::Extension::traverse (o);
+    }
+
+    void Extension::
+    xmi_id (Type const& o)
+    {
+      ::XSCRT::XML::Attribute< ACE_TCHAR > a ("xmi_id", "http://www.omg.org/XMI", "", top_ ());
+      attr_ (&a);
+      Traversal::Extension::xmi_id (o);
+      attr_ (0);
+    }
+
+    void Extension::
+    label (Type const& o)
+    {
+      ::XSCRT::XML::Attribute< ACE_TCHAR > a ("label", "http://www.omg.org/XMI", "", top_ ());
+      attr_ (&a);
+      Traversal::Extension::label (o);
+      attr_ (0);
+    }
+
+    void Extension::
+    uuid (Type const& o)
+    {
+      ::XSCRT::XML::Attribute< ACE_TCHAR > a ("uuid", "http://www.omg.org/XMI", "", top_ ());
+      attr_ (&a);
+      Traversal::Extension::uuid (o);
+      attr_ (0);
+    }
+
+    void Extension::
+    href (Type const& o)
+    {
+      ::XSCRT::XML::Attribute< ACE_TCHAR > a ("href", "", top_ ());
+      attr_ (&a);
+      Traversal::Extension::href (o);
+      attr_ (0);
+    }
+
+    void Extension::
+    idref (Type const& o)
+    {
+      ::XSCRT::XML::Attribute< ACE_TCHAR > a ("idref", "http://www.omg.org/XMI", "", top_ ());
+      attr_ (&a);
+      Traversal::Extension::idref (o);
+      attr_ (0);
+    }
+
+    void Extension::
+    version (Type const& o)
+    {
+      ::XSCRT::XML::Attribute< ACE_TCHAR > a ("version", "http://www.omg.org/XMI", "", top_ ());
+      attr_ (&a);
+      Traversal::Extension::version (o);
+      attr_ (0);
+    }
+
+    void Extension::
+    extender (Type const& o)
+    {
+      ::XSCRT::XML::Attribute< ACE_TCHAR > a ("extender", "", top_ ());
+      attr_ (&a);
+      Traversal::Extension::extender (o);
+      attr_ (0);
+    }
+
+    void Extension::
+    extenderID (Type const& o)
+    {
+      ::XSCRT::XML::Attribute< ACE_TCHAR > a ("extenderID", "", top_ ());
+      attr_ (&a);
+      Traversal::Extension::extenderID (o);
+      attr_ (0);
+    }
+  }
+}
+
+namespace XMI
+{
+  void
+  extension (::XMI::Extension const& s, xercesc::DOMDocument* d)
+  {
+    ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
+    if (e.name () != "extension")
+    {
+      throw 1;
+    }
+
+    struct W : virtual ::XMI::Writer::Extension,
+    virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
+    virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
+    virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
+    virtual ::XSCRT::Writer< ACE_TCHAR >
+    {
+      W (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      : ::XSCRT::Writer< ACE_TCHAR > (e)
+      {
+      }
+    };
+
+    W w (e);
+    w.dispatch (s);
+  }
+}
+
diff --git a/CIAO/tools/Config_Handlers/XMI.hpp b/CIAO/tools/Config_Handlers/XMI.hpp
new file mode 100644
index 00000000000..e1ac06ab52c
--- /dev/null
+++ b/CIAO/tools/Config_Handlers/XMI.hpp
@@ -0,0 +1,397 @@
+/* $Id$
+ * This code was generated by the XML Schema Compiler.
+ *
+ * Changes made to this code will most likely be overwritten
+ * when the handlers are recompiled.
+ *
+ * If you find errors or feel that there are bugfixes to be made,
+ * please contact the current XSC maintainer:
+ *             Will Otte <wotte@dre.vanderbilt.edu>
+ */
+
+// Fix for Borland compilers, which seem to have a broken
+// <string> include.
+#ifdef __BORLANDC__
+# include <string.h>
+#endif
+
+#ifndef XMI_HPP
+#define XMI_HPP
+
+#include "XSC_XML_Handlers_Export.h"
+// Forward declarations.
+//
+namespace XMI
+{
+  class Extension;
+}
+
+#include <memory>
+#include <list>
+#include "XMLSchema/Types.hpp"
+
+namespace XMI
+{
+  class XSC_XML_Handlers_Export Extension : public ::XSCRT::Type
+  {
+    typedef ::XSCRT::Type Base;
+
+    // xmi_id
+    // 
+    public:
+    bool xmi_id_p () const;
+    ::XMLSchema::ID< ACE_TCHAR > const& xmi_id () const;
+    ::XMLSchema::ID< ACE_TCHAR >& xmi_id ();
+    void xmi_id (::XMLSchema::ID< ACE_TCHAR > const& );
+
+    protected:
+    ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > xmi_id_;
+
+    // label
+    // 
+    public:
+    bool label_p () const;
+    ::XMLSchema::string< ACE_TCHAR > const& label () const;
+    ::XMLSchema::string< ACE_TCHAR >& label ();
+    void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+    protected:
+    ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+    // uuid
+    // 
+    public:
+    bool uuid_p () const;
+    ::XMLSchema::string< ACE_TCHAR > const& uuid () const;
+    ::XMLSchema::string< ACE_TCHAR >& uuid ();
+    void uuid (::XMLSchema::string< ACE_TCHAR > const& );
+
+    protected:
+    ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > uuid_;
+
+    // href
+    // 
+    public:
+    bool href_p () const;
+    ::XMLSchema::string< ACE_TCHAR > const& href () const;
+    ::XMLSchema::string< ACE_TCHAR >& href ();
+    void href (::XMLSchema::string< ACE_TCHAR > const& );
+
+    protected:
+    ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
+
+    // idref
+    // 
+    public:
+    bool idref_p () const;
+    ::XMLSchema::IDREF< ACE_TCHAR > const& idref () const;
+    ::XMLSchema::IDREF< ACE_TCHAR >& idref ();
+    void idref (::XMLSchema::IDREF< ACE_TCHAR > const& );
+
+    protected:
+    ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > idref_;
+
+    // version
+    // 
+    public:
+    bool version_p () const;
+    ::XMLSchema::string< ACE_TCHAR > const& version () const;
+    ::XMLSchema::string< ACE_TCHAR >& version ();
+    void version (::XMLSchema::string< ACE_TCHAR > const& );
+
+    protected:
+    ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > version_;
+
+    // extender
+    // 
+    public:
+    bool extender_p () const;
+    ::XMLSchema::string< ACE_TCHAR > const& extender () const;
+    ::XMLSchema::string< ACE_TCHAR >& extender ();
+    void extender (::XMLSchema::string< ACE_TCHAR > const& );
+
+    protected:
+    ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > extender_;
+
+    // extenderID
+    // 
+    public:
+    bool extenderID_p () const;
+    ::XMLSchema::string< ACE_TCHAR > const& extenderID () const;
+    ::XMLSchema::string< ACE_TCHAR >& extenderID ();
+    void extenderID (::XMLSchema::string< ACE_TCHAR > const& );
+
+    protected:
+    ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > extenderID_;
+
+    public:
+    Extension ();
+
+    Extension (::XSCRT::XML::Element< ACE_TCHAR > const&);
+    Extension (Extension const& s);
+
+    Extension&
+    operator= (Extension const& s);
+
+    private:
+    char regulator__;
+  };
+}
+
+namespace XMI
+{
+  XSC_XML_Handlers_Export
+  ::XMI::Extension
+  extension (xercesc::DOMDocument const*);
+}
+
+#include "XMLSchema/Traversal.hpp"
+
+namespace XMI
+{
+  namespace Traversal
+  {
+    struct XSC_XML_Handlers_Export Extension : ::XMLSchema::Traversal::Traverser< ::XMI::Extension >
+    {
+      virtual void
+      traverse (Type&);
+
+      virtual void
+      traverse (Type const&);
+
+      virtual void
+      pre (Type&);
+
+      virtual void
+      pre (Type const&);
+
+      virtual void
+      xmi_id (Type&);
+
+      virtual void
+      xmi_id (Type const&);
+
+      virtual void
+      xmi_id_none (Type&);
+
+      virtual void
+      xmi_id_none (Type const&);
+
+      virtual void
+      label (Type&);
+
+      virtual void
+      label (Type const&);
+
+      virtual void
+      label_none (Type&);
+
+      virtual void
+      label_none (Type const&);
+
+      virtual void
+      uuid (Type&);
+
+      virtual void
+      uuid (Type const&);
+
+      virtual void
+      uuid_none (Type&);
+
+      virtual void
+      uuid_none (Type const&);
+
+      virtual void
+      href (Type&);
+
+      virtual void
+      href (Type const&);
+
+      virtual void
+      href_none (Type&);
+
+      virtual void
+      href_none (Type const&);
+
+      virtual void
+      idref (Type&);
+
+      virtual void
+      idref (Type const&);
+
+      virtual void
+      idref_none (Type&);
+
+      virtual void
+      idref_none (Type const&);
+
+      virtual void
+      version (Type&);
+
+      virtual void
+      version (Type const&);
+
+      virtual void
+      version_none (Type&);
+
+      virtual void
+      version_none (Type const&);
+
+      virtual void
+      extender (Type&);
+
+      virtual void
+      extender (Type const&);
+
+      virtual void
+      extender_none (Type&);
+
+      virtual void
+      extender_none (Type const&);
+
+      virtual void
+      extenderID (Type&);
+
+      virtual void
+      extenderID (Type const&);
+
+      virtual void
+      extenderID_none (Type&);
+
+      virtual void
+      extenderID_none (Type const&);
+
+      virtual void
+      post (Type&);
+
+      virtual void
+      post (Type const&);
+    };
+  }
+}
+
+#include "XMLSchema/Writer.hpp"
+
+namespace XMI
+{
+  namespace Writer
+  {
+    struct Extension : Traversal::Extension, 
+    virtual ::XSCRT::Writer< ACE_TCHAR >
+    {
+      typedef ::XMI::Extension Type;
+      Extension (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+      virtual void 
+      traverse (Type &o)
+      {
+
+        this->traverse (const_cast <Type const &> (o));
+      }
+
+
+      virtual void
+      traverse (Type const&);
+
+      virtual void 
+      xmi_id (Type &o)
+      {
+
+        this->xmi_id (const_cast <Type const &> (o));
+      }
+
+
+      virtual void
+      xmi_id (Type const&);
+
+      virtual void 
+      label (Type &o)
+      {
+
+        this->label (const_cast <Type const &> (o));
+      }
+
+
+      virtual void
+      label (Type const&);
+
+      virtual void 
+      uuid (Type &o)
+      {
+
+        this->uuid (const_cast <Type const &> (o));
+      }
+
+
+      virtual void
+      uuid (Type const&);
+
+      virtual void 
+      href (Type &o)
+      {
+
+        this->href (const_cast <Type const &> (o));
+      }
+
+
+      virtual void
+      href (Type const&);
+
+      virtual void 
+      idref (Type &o)
+      {
+
+        this->idref (const_cast <Type const &> (o));
+      }
+
+
+      virtual void
+      idref (Type const&);
+
+      virtual void 
+      version (Type &o)
+      {
+
+        this->version (const_cast <Type const &> (o));
+      }
+
+
+      virtual void
+      version (Type const&);
+
+      virtual void 
+      extender (Type &o)
+      {
+
+        this->extender (const_cast <Type const &> (o));
+      }
+
+
+      virtual void
+      extender (Type const&);
+
+      virtual void 
+      extenderID (Type &o)
+      {
+
+        this->extenderID (const_cast <Type const &> (o));
+      }
+
+
+      virtual void
+      extenderID (Type const&);
+
+      protected:
+      Extension ();
+    };
+  }
+}
+
+namespace XMI
+{
+  XSC_XML_Handlers_Export
+  void
+  extension (::XMI::Extension const&, xercesc::DOMDocument*);
+}
+
+#endif // XMI_HPP
diff --git a/CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.tpp b/CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.tpp
index 6ead5b8f7b2..918197937b7 100644
--- a/CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.tpp
+++ b/CIAO/tools/Config_Handlers/XMLSchema/TypeInfo.tpp
@@ -65,7 +65,8 @@ namespace XMLSchema
     add_info<NMTOKEN<C> > (map, 0);
     add_info<Name<C> > (map, 0);
     add_info<NCName<C> > (map, 0);
-
+    add_info<QName<C> > (map, 0);
+    
     add_info<ID<C> > (map, 0);
 
     // IDREF_Base
diff --git a/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp b/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp
index a23d7f2cdd9..16cd2c9d766 100644
--- a/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp
+++ b/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp
@@ -296,6 +296,45 @@ namespace XMLSchema
   };
 
   template <typename C>
+  class QName: public Name<C>
+  {
+  protected:
+    typedef typename Name<C>::Base__ Base__;
+
+  public:
+    QName()
+    {
+    }
+
+    QName(XSCRT::XML::Element<C> const& e)
+        : Name<C> (e)
+    {
+    }
+
+    QName(XSCRT::XML::Attribute<C> const& a)
+        : Name<C> (a)
+    {
+    }
+
+    QName(Base__ const& x)
+        : Name<C> (x)
+    {
+    }
+
+    QName (C const* x)
+        : Name<C> (x)
+    {
+    }
+
+    QName&
+    operator= (Base__ const& x)
+    {
+      static_cast<Base__&> (*this) = x;
+      return *this;
+    }
+  };
+
+  template <typename C>
   struct IdentityProvider : XSCRT::IdentityProvider
   {
     IdentityProvider (NCName<C> const& id)
diff --git a/CIAO/tools/Config_Handlers/XML_File_Intf.cpp b/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
index 4a6894b4a1a..f591abc89f0 100644
--- a/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
+++ b/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
@@ -1,21 +1,22 @@
 // $Id$
 
 #include "XML_File_Intf.h"
-#include "Utils/XML_Helper.h"
+#include "XML_Typedefs.h"
 #include "Deployment.hpp"
 #include "DP_Handler.h"
+#include "Common.h"
+
 #include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ciao/CIAO_common.h"
 
-
 namespace CIAO
 {
   namespace Config_Handlers
   {
     XML_File_Intf::XML_File_Intf (const char *file)
+      : file_ (file),
+        idl_dp_ (0)
     {
-      if (!this->read_process_file (file))
-        throw;
     }
 
     bool
@@ -23,43 +24,80 @@ namespace CIAO
     {
       CIAO_TRACE("XML_File_Intf::read_process_file");
 
-      XML_Helper helper;
-
-      if (!helper.is_initialized ())
-        return false;
-
-      XERCES_CPP_NAMESPACE::DOMDocument *dom =
-        helper.create_dom (ACE_TEXT_CHAR_TO_TCHAR (file));
-
-      if (!dom)
-        return false;
-
-      DeploymentPlan dp =
-        deploymentPlan (dom);
-
-
-      DP_Handler dp_handler (dp);
-
-      this->idl_dp_.reset (dp_handler.plan ());
-
-      if (this->idl_dp_.get ())
-        return true;
+      try
+        {
+          if (!XML_Helper::XML_HELPER.is_initialized ())
+            return false;
+          
+          CIAO_DEBUG ((LM_TRACE, CLINFO "XML_File_Intf::read_process_file - "
+                       "Constructing DOM\n"));
+          XERCES_CPP_NAMESPACE::DOMDocument *dom = 0;
+          dom = 
+            XML_Helper::XML_HELPER.create_dom (file);
+          
+          if (dom == 0)
+            {
+              CIAO_DEBUG ((LM_TRACE, CLINFO "XML_File_Intf::read_process_file - "
+                           "Failed to open file $s\n", file));
+              return false;
+            }
+          
+          XERCES_CPP_NAMESPACE::DOMElement *foo = dom->getDocumentElement ();
+          CIAO_DEBUG ((LM_TRACE, CLINFO "XML_File_Intf::read_process_file - "
+                       "DOMElement pointer: %u\n", foo));
+          
+          CIAO_DEBUG ((LM_TRACE, CLINFO "XML_File_Intf::read_process_file - "
+                       "Parsing XML file with XSC\n"));
+          deploymentPlan dp =
+            DeploymentPlan (dom);
+          
+          CIAO_DEBUG ((LM_TRACE, CLINFO "XML_File_Intf::read_process_file - "
+                       "Processing using config handlers\n"));
+          DP_Handler dp_handler (dp);
+          
+          this->idl_dp_.reset (dp_handler.plan ());
+          
+          if (this->idl_dp_.get ())
+            return true;
+        }
+      catch (Config_Error &ex)
+        {
+          ACE_ERROR ((LM_ERROR, "error at %s: %s\n",
+                      ex.name_.c_str (), ex.error_.c_str ()));
+        }
+      catch (...)
+        {
+          ACE_ERROR ((LM_ERROR, "caught unexpected exception whilst parsing XML into IDL."));
+        }
 
       return false;
     }
 
     ::Deployment::DeploymentPlan const *
-    XML_File_Intf::get_plan (void) const
+    XML_File_Intf::get_plan (void) 
     {
       CIAO_TRACE("get_plan");
+      if (this->idl_dp_.get () == 0 && !this->read_process_file (this->file_.c_str ()))
+        return 0;
+      
       return this->idl_dp_.get ();
     }
 
     ::Deployment::DeploymentPlan *
-    XML_File_Intf::get_plan (void)
+    XML_File_Intf::release_plan (void)
     {
       CIAO_TRACE("XML_File_Intf::get_plan");
+      if (this->idl_dp_.get () == 0 && !this->read_process_file (this->file_.c_str ()))
+        return 0;
       return this->idl_dp_.release ();
     }
+    
+    void
+    XML_File_Intf::add_search_path (const ACE_TCHAR *environment,
+                                    const ACE_TCHAR *relpath)
+    {
+      XML_Helper::_path_resolver.add_path (environment, relpath);
+    }
+    
   }
 }
diff --git a/CIAO/tools/Config_Handlers/XML_File_Intf.h b/CIAO/tools/Config_Handlers/XML_File_Intf.h
index 9f5869b20fb..94c31490143 100644
--- a/CIAO/tools/Config_Handlers/XML_File_Intf.h
+++ b/CIAO/tools/Config_Handlers/XML_File_Intf.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
-*  @file  XML_File_Intf.h
-*
-*  $Id$
-*
-*  @author Bala Natarajan <bala@dre.vanderbilt.edu>
-*/
+ *  @file  XML_File_Intf.h
+ *
+ *  $Id$
+ *
+ *  @author Bala Natarajan <bala@dre.vanderbilt.edu>
+ */
 //================================================================
 
 #ifndef CIAO_CONFIG_XML_FILE_INTF_H
@@ -20,32 +20,37 @@
 
 #include "ace/Auto_Ptr.h"
 
+#include <string>
 
 namespace Deployment
 {
-struct DeploymentPlan ;
+  struct DeploymentPlan ;
 }
 
 namespace CIAO
 {
-namespace Config_Handlers
-{
-class Config_Handlers_Export XML_File_Intf
-{
-public:
-XML_File_Intf (const char *file);
-
-::Deployment::DeploymentPlan const *get_plan (void) const;
-::Deployment::DeploymentPlan *get_plan (void);
-
-protected:
-
-bool read_process_file (const char *file);
-
-private:
-ACE_Auto_Ptr< ::Deployment::DeploymentPlan> idl_dp_;
-};
-}
+  namespace Config_Handlers
+  {
+    class Config_Handlers_Export XML_File_Intf
+    {
+    public:
+      XML_File_Intf (const char *file);
+
+      ::Deployment::DeploymentPlan const *get_plan (void);
+      ::Deployment::DeploymentPlan *release_plan (void);
+      
+      void add_search_path (const ACE_TCHAR *environment,
+                            const ACE_TCHAR *relpath);
+      
+    protected:
+
+      bool read_process_file (const char *file);
+
+    private:
+      std::string file_;
+      ACE_Auto_Ptr< ::Deployment::DeploymentPlan> idl_dp_;
+    };
+  }
 }
 #include /**/ "ace/post.h"
 #endif /*CIAO_CONFIG_XML_FILE_INTF_H*/
diff --git a/CIAO/tools/Config_Handlers/XML_Typedefs.cpp b/CIAO/tools/Config_Handlers/XML_Typedefs.cpp
new file mode 100644
index 00000000000..9d57ac17e92
--- /dev/null
+++ b/CIAO/tools/Config_Handlers/XML_Typedefs.cpp
@@ -0,0 +1,14 @@
+// $Id$
+
+#include "XML_Typedefs.h"
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    XML_Helper::PATH_RESOLVER XML_Helper::_path_resolver;
+    XML_Helper::XML_RESOLVER XML_Helper::_xml_resolver (XML_Helper::_path_resolver);
+    XML_Helper::ERROR_HANDLER XML_Helper::_xml_error_handler;
+    XML_Helper::HELPER XML_Helper::XML_HELPER (XML_Helper::_xml_resolver, XML_Helper::_xml_error_handler);
+  }
+}
diff --git a/CIAO/tools/Config_Handlers/XML_Typedefs.h b/CIAO/tools/Config_Handlers/XML_Typedefs.h
new file mode 100644
index 00000000000..f0054df2e57
--- /dev/null
+++ b/CIAO/tools/Config_Handlers/XML_Typedefs.h
@@ -0,0 +1,38 @@
+/**
+ * @file XML_Typedefs.h
+ * @author William R. Otte <wotte@dre.vanderbilt.edu>
+ * $Id$
+ * Typedefs from the XML Utilities.
+ */
+#ifndef XML_TYPEDEFS_H
+#define XML_TYPEDEFS_H
+
+#include "XSC_XML_Handlers_Export.h"
+#include "XML/XML_Helper.h"
+#include "XML/XML_Schema_Resolver.h"
+#include "XML/XML_Error_Handler.h"
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    class XSC_XML_Handlers_Export XML_Helper
+    {
+    public:
+      typedef ::CIAO::XML::Environment_Resolver PATH_RESOLVER;
+      typedef ::CIAO::XML::XML_Schema_Resolver< ::CIAO::XML::Environment_Resolver > XML_RESOLVER;
+      typedef ::CIAO::XML::XML_Error_Handler ERROR_HANDLER;
+      typedef ::CIAO::XML::XML_Helper< XML_RESOLVER, ERROR_HANDLER > HELPER;
+      
+      static PATH_RESOLVER _path_resolver;
+      static XML_RESOLVER _xml_resolver;
+      static ERROR_HANDLER _xml_error_handler;
+      
+    public:
+      static HELPER XML_HELPER;
+    };
+  }
+}
+
+
+#endif /* XML_TYPEDEFS_H */
diff --git a/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp b/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp
index 751111bf866..d5d64056a50 100644
--- a/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp
+++ b/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp
@@ -5,11 +5,11 @@
 #ifndef XSCRT_ELEMENTS_HPP
 #define XSCRT_ELEMENTS_HPP
 
-#include <memory>
 #include <map>
 #include <string>
 #include <sstream>
 #include <memory>
+// #include <iostream> //@@ tmp
 
 #include "XSCRT/Parser.hpp"
 
diff --git a/CIAO/tools/Config_Handlers/XSCRT/Traversal.hpp b/CIAO/tools/Config_Handlers/XSCRT/Traversal.hpp
index 2dc957a9e79..9c532e7693e 100644
--- a/CIAO/tools/Config_Handlers/XSCRT/Traversal.hpp
+++ b/CIAO/tools/Config_Handlers/XSCRT/Traversal.hpp
@@ -64,7 +64,7 @@ namespace XSCRT
       map (TypeId id, TraverserBase<B>& t)
       {
         //wcerr << "map for " << id.name () << " to " << &t
-        //      << " in " << &traversal_map_ << endl;
+    //      << " in " << &traversal_map_ << endl;
 
         //@@ VC6
         Traversers& traversers = traversal_map_[id];
diff --git a/CIAO/tools/Config_Handlers/XSCRT/Traversal.tpp b/CIAO/tools/Config_Handlers/XSCRT/Traversal.tpp
index b798178621b..51889c0fb9b 100644
--- a/CIAO/tools/Config_Handlers/XSCRT/Traversal.tpp
+++ b/CIAO/tools/Config_Handlers/XSCRT/Traversal.tpp
@@ -80,7 +80,7 @@ namespace XSCRT
 
         // Remove traversed types from the level map.
         //
-	//@@ VC6
+    //@@ VC6
         {
           for (typename TypeInfoSet::const_iterator i = dispatched.begin ();
                i != dispatched.end ();
@@ -88,7 +88,7 @@ namespace XSCRT
           {
             levels.erase (*i);
           }
-	}
+    }
       }
     }
 
@@ -145,7 +145,7 @@ namespace XSCRT
 
         // Remove traversed types from the level map.
         //
-	//@@ VC6
+    //@@ VC6
         {
           for (typename TypeInfoSet::const_iterator i = dispatched.begin ();
                i != dispatched.end ();
@@ -153,7 +153,7 @@ namespace XSCRT
           {
             levels.erase (*i);
           }
-	}
+    }
       }
     }
 
diff --git a/CIAO/tools/Config_Handlers/XSCRT/XML.hpp b/CIAO/tools/Config_Handlers/XSCRT/XML.hpp
index 1f11533e2bb..8f21ea8263d 100644
--- a/CIAO/tools/Config_Handlers/XSCRT/XML.hpp
+++ b/CIAO/tools/Config_Handlers/XSCRT/XML.hpp
@@ -462,8 +462,11 @@ namespace XSCRT
     {
       string xns (ns);
 
-      XMLCh const* p (
-        e.dom_element ()->lookupNamespacePrefix (xns.c_str (), false));
+#if defined(XERCES_VERSION_MAJOR) && XERCES_VERSION_MAJOR > 2
+      XMLCh const* p (e.dom_element ()->lookupPrefix (xns.c_str ()));
+#else
+      XMLCh const* p (e.dom_element ()->lookupNamespacePrefix (xns.c_str (), false));
+#endif
 
       if (p == 0)
       {
diff --git a/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp b/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp
index 6f810782953..95575267eee 100644
--- a/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp
+++ b/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp
@@ -258,6 +258,40 @@ namespace XMLSchema
   };
 
   template <typename C>
+  class QName: public Name<C>
+  {
+  protected:
+    typedef typename Name<C>::Base__ Base__;
+
+  public:
+    QName()
+    {
+    }
+
+    QName(XSCRT::XML::Element<C> const& e)
+        : Name<C> (e)
+    {
+    }
+
+    QName(XSCRT::XML::Attribute<C> const& a)
+        : Name<C> (a)
+    {
+    }
+
+    QName(Base__ const& x)
+        : Name<C> (x)
+    {
+    }
+
+    QName&
+    operator= (Base__ const& x)
+    {
+      static_cast<Base__&> (*this) = x;
+      return *this;
+    }
+  };
+
+  template <typename C>
   struct IdentityProvider : XSCRT::IdentityProvider
   {
     IdentityProvider (NCName<C> const& id)
diff --git a/CIAO/tools/Config_Handlers/XSC_XML_Handlers_Export.h b/CIAO/tools/Config_Handlers/XSC_XML_Handlers_Export.h
index 7d18280aa34..82272eb6c05 100644
--- a/CIAO/tools/Config_Handlers/XSC_XML_Handlers_Export.h
+++ b/CIAO/tools/Config_Handlers/XSC_XML_Handlers_Export.h
@@ -9,10 +9,6 @@
 
 #include "ace/config-all.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (XSC_XML_HANDLERS_HAS_DLL)
-#  define XSC_XML_HANDLERS_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && XSC_XML_HANDLERS_HAS_DLL */
-
 #if !defined (XSC_XML_HANDLERS_HAS_DLL)
 #  define XSC_XML_HANDLERS_HAS_DLL 1
 #endif /* ! XSC_XML_HANDLERS_HAS_DLL */
diff --git a/CIAO/tools/Config_Handlers/ccd.cpp b/CIAO/tools/Config_Handlers/ccd.cpp
index f519aa54a36..64e40b82567 100644
--- a/CIAO/tools/Config_Handlers/ccd.cpp
+++ b/CIAO/tools/Config_Handlers/ccd.cpp
@@ -526,61 +526,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 ("specificType"))
+        else if (n == "specificType")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           specificType (t);
         }
 
-        else if (n == ACE_TEXT ("supportedType"))
+        else if (n == "supportedType")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           add_supportedType (t);
         }
 
-        else if (n == ACE_TEXT ("idlFile"))
+        else if (n == "idlFile")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           add_idlFile (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 ("port"))
+        else if (n == "port")
         {
           ::CIAO::Config_Handlers::ComponentPortDescription t (e);
           add_port (t);
         }
 
-        else if (n == ACE_TEXT ("property"))
+        else if (n == "property")
         {
           ::CIAO::Config_Handlers::ComponentPropertyDescription t (e);
           add_property (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);
@@ -595,7 +595,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);
@@ -1366,7 +1366,7 @@ namespace CIAO
       void ComponentInterfaceDescription::
       label (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("label"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
         Traversal::ComponentInterfaceDescription::label (o);
         pop_ ();
       }
@@ -1374,7 +1374,7 @@ namespace CIAO
       void ComponentInterfaceDescription::
       UUID (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("UUID"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
         Traversal::ComponentInterfaceDescription::UUID (o);
         pop_ ();
       }
@@ -1382,7 +1382,7 @@ namespace CIAO
       void ComponentInterfaceDescription::
       specificType (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("specificType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("specificType", top_ ()));
         Traversal::ComponentInterfaceDescription::specificType (o);
         pop_ ();
       }
@@ -1390,7 +1390,7 @@ namespace CIAO
       void ComponentInterfaceDescription::
       supportedType_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("supportedType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("supportedType", top_ ()));
       }
 
       void ComponentInterfaceDescription::
@@ -1409,7 +1409,7 @@ namespace CIAO
       void ComponentInterfaceDescription::
       idlFile_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("idlFile"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("idlFile", top_ ()));
       }
 
       void ComponentInterfaceDescription::
@@ -1428,7 +1428,7 @@ namespace CIAO
       void ComponentInterfaceDescription::
       configProperty_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("configProperty"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
       }
 
       void ComponentInterfaceDescription::
@@ -1447,7 +1447,7 @@ namespace CIAO
       void ComponentInterfaceDescription::
       port_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("port"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("port", top_ ()));
       }
 
       void ComponentInterfaceDescription::
@@ -1466,7 +1466,7 @@ namespace CIAO
       void ComponentInterfaceDescription::
       property_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("property"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
       }
 
       void ComponentInterfaceDescription::
@@ -1485,7 +1485,7 @@ namespace CIAO
       void ComponentInterfaceDescription::
       infoProperty_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("infoProperty"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
       }
 
       void ComponentInterfaceDescription::
@@ -1504,7 +1504,7 @@ namespace CIAO
       void ComponentInterfaceDescription::
       contentLocation (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("contentLocation"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("contentLocation", top_ ()));
         Traversal::ComponentInterfaceDescription::contentLocation (o);
         pop_ ();
       }
@@ -1512,7 +1512,7 @@ namespace CIAO
       void ComponentInterfaceDescription::
       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::ComponentInterfaceDescription::href (o);
         attr_ (0);
diff --git a/CIAO/tools/Config_Handlers/cdd.cpp b/CIAO/tools/Config_Handlers/cdd.cpp
index 1b7373812c8..799ad5ebec7 100644
--- a/CIAO/tools/Config_Handlers/cdd.cpp
+++ b/CIAO/tools/Config_Handlers/cdd.cpp
@@ -17,10 +17,6 @@
 
 #include "cdd.hpp"
 
-// This file has no dependency on ACE, thus we turn 
-// all ACE_OS checks off
-// FUZZ: disable check_for_lack_ACE_OS
-
 namespace CIAO
 {
   namespace Config_Handlers
@@ -1100,43 +1096,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 ("UUID"))
+        if (n == "UUID")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           UUID (t);
         }
 
-        else if (n == ACE_TEXT ("label"))
+        else if (n == "label")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           label (t);
         }
 
-        else if (n == ACE_TEXT ("node"))
+        else if (n == "node")
         {
           ::CIAO::Config_Handlers::Node t (e);
           add_node (t);
         }
 
-        else if (n == ACE_TEXT ("interconnect"))
+        else if (n == "interconnect")
         {
           ::CIAO::Config_Handlers::Interconnect t (e);
           add_interconnect (t);
         }
 
-        else if (n == ACE_TEXT ("bridge"))
+        else if (n == "bridge")
         {
           ::CIAO::Config_Handlers::Bridge t (e);
           add_bridge (t);
         }
 
-        else if (n == ACE_TEXT ("sharedResource"))
+        else if (n == "sharedResource")
         {
           ::CIAO::Config_Handlers::SharedResource t (e);
           add_sharedResource (t);
         }
 
-        else if (n == ACE_TEXT ("infoProperty"))
+        else if (n == "infoProperty")
         {
           ::CIAO::Config_Handlers::Property t (e);
           add_infoProperty (t);
@@ -1163,25 +1159,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 ("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 ("label"))
+        else if (n == "label")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           label (t);
         }
 
-        else if (n == ACE_TEXT ("connect"))
+        else if (n == "connect")
         {
           ::CIAO::Config_Handlers::Interconnect t (e);
           add_connect (t);
         }
 
-        else if (n == ACE_TEXT ("resource"))
+        else if (n == "resource")
         {
           ::CIAO::Config_Handlers::Resource t (e);
           add_resource (t);
@@ -1208,31 +1204,31 @@ 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 ("label"))
+        else if (n == "label")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           label (t);
         }
 
-        else if (n == ACE_TEXT ("connection"))
+        else if (n == "connection")
         {
           ::CIAO::Config_Handlers::Bridge t (e);
           add_connection (t);
         }
 
-        else if (n == ACE_TEXT ("connect"))
+        else if (n == "connect")
         {
           ::CIAO::Config_Handlers::Node t (e);
           add_connect (t);
         }
 
-        else if (n == ACE_TEXT ("resource"))
+        else if (n == "resource")
         {
           ::CIAO::Config_Handlers::Resource t (e);
           add_resource (t);
@@ -1259,31 +1255,31 @@ 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 ("label"))
+        else if (n == "label")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           label (t);
         }
 
-        else if (n == ACE_TEXT ("connection"))
+        else if (n == "connection")
         {
           ::CIAO::Config_Handlers::Interconnect t (e);
           add_connection (t);
         }
 
-        else if (n == ACE_TEXT ("sharedResource"))
+        else if (n == "sharedResource")
         {
           ::CIAO::Config_Handlers::SharedResource t (e);
           add_sharedResource (t);
         }
 
-        else if (n == ACE_TEXT ("resource"))
+        else if (n == "resource")
         {
           ::CIAO::Config_Handlers::Resource t (e);
           add_resource (t);
@@ -1310,25 +1306,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 ("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 ("resourceType"))
+        else if (n == "resourceType")
         {
           resourceType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
           resourceType_->container (this);
         }
 
-        else if (n == ACE_TEXT ("node"))
+        else if (n == "node")
         {
           node_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Node > (new ::CIAO::Config_Handlers::Node (e));
           node_->container (this);
         }
 
-        else if (n == ACE_TEXT ("property"))
+        else if (n == "property")
         {
           property_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > (new ::CIAO::Config_Handlers::SatisfierProperty (e));
           property_->container (this);
@@ -2965,7 +2961,7 @@ namespace CIAO
       void Domain::
       UUID (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("UUID"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
         Traversal::Domain::UUID (o);
         pop_ ();
       }
@@ -2973,7 +2969,7 @@ namespace CIAO
       void Domain::
       label (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("label"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
         Traversal::Domain::label (o);
         pop_ ();
       }
@@ -2981,7 +2977,7 @@ namespace CIAO
       void Domain::
       node_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("node"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
       }
 
       void Domain::
@@ -3000,7 +2996,7 @@ namespace CIAO
       void Domain::
       interconnect_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("interconnect"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("interconnect", top_ ()));
       }
 
       void Domain::
@@ -3019,7 +3015,7 @@ namespace CIAO
       void Domain::
       bridge_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("bridge"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("bridge", top_ ()));
       }
 
       void Domain::
@@ -3038,7 +3034,7 @@ namespace CIAO
       void Domain::
       sharedResource_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("sharedResource"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("sharedResource", top_ ()));
       }
 
       void Domain::
@@ -3057,7 +3053,7 @@ namespace CIAO
       void Domain::
       infoProperty_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("infoProperty"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
       }
 
       void Domain::
@@ -3097,7 +3093,7 @@ namespace CIAO
       void Bridge::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::Bridge::name (o);
         pop_ ();
       }
@@ -3105,7 +3101,7 @@ namespace CIAO
       void Bridge::
       label (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("label"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
         Traversal::Bridge::label (o);
         pop_ ();
       }
@@ -3113,7 +3109,7 @@ namespace CIAO
       void Bridge::
       connect_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("connect"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connect", top_ ()));
       }
 
       void Bridge::
@@ -3132,7 +3128,7 @@ namespace CIAO
       void Bridge::
       resource_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resource"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resource", top_ ()));
       }
 
       void Bridge::
@@ -3172,7 +3168,7 @@ namespace CIAO
       void Interconnect::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::Interconnect::name (o);
         pop_ ();
       }
@@ -3180,7 +3176,7 @@ namespace CIAO
       void Interconnect::
       label (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("label"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
         Traversal::Interconnect::label (o);
         pop_ ();
       }
@@ -3188,7 +3184,7 @@ namespace CIAO
       void Interconnect::
       connection_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("connection"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connection", top_ ()));
       }
 
       void Interconnect::
@@ -3207,7 +3203,7 @@ namespace CIAO
       void Interconnect::
       connect_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("connect"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connect", top_ ()));
       }
 
       void Interconnect::
@@ -3226,7 +3222,7 @@ namespace CIAO
       void Interconnect::
       resource_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resource"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resource", top_ ()));
       }
 
       void Interconnect::
@@ -3266,7 +3262,7 @@ namespace CIAO
       void Node::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::Node::name (o);
         pop_ ();
       }
@@ -3274,7 +3270,7 @@ namespace CIAO
       void Node::
       label (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("label"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
         Traversal::Node::label (o);
         pop_ ();
       }
@@ -3282,7 +3278,7 @@ namespace CIAO
       void Node::
       connection_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("connection"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connection", top_ ()));
       }
 
       void Node::
@@ -3301,7 +3297,7 @@ namespace CIAO
       void Node::
       sharedResource_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("sharedResource"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("sharedResource", top_ ()));
       }
 
       void Node::
@@ -3320,7 +3316,7 @@ namespace CIAO
       void Node::
       resource_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resource"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resource", top_ ()));
       }
 
       void Node::
@@ -3360,7 +3356,7 @@ namespace CIAO
       void SharedResource::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::SharedResource::name (o);
         pop_ ();
       }
@@ -3368,7 +3364,7 @@ namespace CIAO
       void SharedResource::
       resourceType (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("resourceType"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
         Traversal::SharedResource::resourceType (o);
         pop_ ();
       }
@@ -3376,7 +3372,7 @@ namespace CIAO
       void SharedResource::
       node (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("node"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
         Traversal::SharedResource::node (o);
         pop_ ();
       }
@@ -3384,7 +3380,7 @@ namespace CIAO
       void SharedResource::
       property (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("property"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
         Traversal::SharedResource::property (o);
         pop_ ();
       }
diff --git a/CIAO/tools/Config_Handlers/cdp.cpp b/CIAO/tools/Config_Handlers/cdp.cpp
index 942e8b3a535..7200d3e3a74 100644
--- a/CIAO/tools/Config_Handlers/cdp.cpp
+++ b/CIAO/tools/Config_Handlers/cdp.cpp
@@ -21,19 +21,19 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    // DeploymentPlan
+    // deploymentPlan
     // 
 
-    DeploymentPlan::
-    DeploymentPlan ()
+    deploymentPlan::
+    deploymentPlan ()
     : 
     ::XSCRT::Type (), 
     regulator__ ()
     {
     }
 
-    DeploymentPlan::
-    DeploymentPlan (::CIAO::Config_Handlers::DeploymentPlan const& s)
+    deploymentPlan::
+    deploymentPlan (::CIAO::Config_Handlers::deploymentPlan const& s)
     :
     ::XSCRT::Type (),
     label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
@@ -67,10 +67,14 @@ namespace CIAO
       {
         for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
       }
+
+      {
+        for (localityConstraint_const_iterator i (s.localityConstraint_.begin ());i != s.localityConstraint_.end ();++i) add_localityConstraint (*i);
+      }
     }
 
-    ::CIAO::Config_Handlers::DeploymentPlan& DeploymentPlan::
-    operator= (::CIAO::Config_Handlers::DeploymentPlan const& s)
+    ::CIAO::Config_Handlers::deploymentPlan& deploymentPlan::
+    operator= (::CIAO::Config_Handlers::deploymentPlan const& s)
     {
       if (s.label_.get ()) label (*(s.label_));
       else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
@@ -111,25 +115,30 @@ namespace CIAO
         for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i);
       }
 
+      localityConstraint_.clear ();
+      {
+        for (localityConstraint_const_iterator i (s.localityConstraint_.begin ());i != s.localityConstraint_.end ();++i) add_localityConstraint (*i);
+      }
+
       return *this;
     }
 
 
-    // DeploymentPlan
+    // deploymentPlan
     // 
-    bool DeploymentPlan::
+    bool deploymentPlan::
     label_p () const
     {
       return label_.get () != 0;
     }
 
-    ::XMLSchema::string< ACE_TCHAR > const& DeploymentPlan::
+    ::XMLSchema::string< ACE_TCHAR > const& deploymentPlan::
     label () const
     {
       return *label_;
     }
 
-    void DeploymentPlan::
+    void deploymentPlan::
     label (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (label_.get ())
@@ -144,21 +153,21 @@ namespace CIAO
       }
     }
 
-    // DeploymentPlan
+    // deploymentPlan
     // 
-    bool DeploymentPlan::
+    bool deploymentPlan::
     UUID_p () const
     {
       return UUID_.get () != 0;
     }
 
-    ::XMLSchema::string< ACE_TCHAR > const& DeploymentPlan::
+    ::XMLSchema::string< ACE_TCHAR > const& deploymentPlan::
     UUID () const
     {
       return *UUID_;
     }
 
-    void DeploymentPlan::
+    void deploymentPlan::
     UUID (::XMLSchema::string< ACE_TCHAR > const& e)
     {
       if (UUID_.get ())
@@ -173,21 +182,21 @@ namespace CIAO
       }
     }
 
-    // DeploymentPlan
+    // deploymentPlan
     // 
-    bool DeploymentPlan::
+    bool deploymentPlan::
     realizes_p () const
     {
       return realizes_.get () != 0;
     }
 
-    ::CIAO::Config_Handlers::ComponentInterfaceDescription const& DeploymentPlan::
+    ::CIAO::Config_Handlers::ComponentInterfaceDescription const& deploymentPlan::
     realizes () const
     {
       return *realizes_;
     }
 
-    void DeploymentPlan::
+    void deploymentPlan::
     realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& e)
     {
       if (realizes_.get ())
@@ -202,233 +211,271 @@ namespace CIAO
       }
     }
 
-    // DeploymentPlan
+    // deploymentPlan
     // 
-    DeploymentPlan::implementation_iterator DeploymentPlan::
+    deploymentPlan::implementation_iterator deploymentPlan::
     begin_implementation ()
     {
       return implementation_.begin ();
     }
 
-    DeploymentPlan::implementation_iterator DeploymentPlan::
+    deploymentPlan::implementation_iterator deploymentPlan::
     end_implementation ()
     {
       return implementation_.end ();
     }
 
-    DeploymentPlan::implementation_const_iterator DeploymentPlan::
+    deploymentPlan::implementation_const_iterator deploymentPlan::
     begin_implementation () const
     {
       return implementation_.begin ();
     }
 
-    DeploymentPlan::implementation_const_iterator DeploymentPlan::
+    deploymentPlan::implementation_const_iterator deploymentPlan::
     end_implementation () const
     {
       return implementation_.end ();
     }
 
-    void DeploymentPlan::
+    void deploymentPlan::
     add_implementation (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& e)
     {
       implementation_.push_back (e);
     }
 
-    size_t DeploymentPlan::
+    size_t deploymentPlan::
     count_implementation(void) const
     {
       return implementation_.size ();
     }
 
-    // DeploymentPlan
+    // deploymentPlan
     // 
-    DeploymentPlan::instance_iterator DeploymentPlan::
+    deploymentPlan::instance_iterator deploymentPlan::
     begin_instance ()
     {
       return instance_.begin ();
     }
 
-    DeploymentPlan::instance_iterator DeploymentPlan::
+    deploymentPlan::instance_iterator deploymentPlan::
     end_instance ()
     {
       return instance_.end ();
     }
 
-    DeploymentPlan::instance_const_iterator DeploymentPlan::
+    deploymentPlan::instance_const_iterator deploymentPlan::
     begin_instance () const
     {
       return instance_.begin ();
     }
 
-    DeploymentPlan::instance_const_iterator DeploymentPlan::
+    deploymentPlan::instance_const_iterator deploymentPlan::
     end_instance () const
     {
       return instance_.end ();
     }
 
-    void DeploymentPlan::
+    void deploymentPlan::
     add_instance (::CIAO::Config_Handlers::InstanceDeploymentDescription const& e)
     {
       instance_.push_back (e);
     }
 
-    size_t DeploymentPlan::
+    size_t deploymentPlan::
     count_instance(void) const
     {
       return instance_.size ();
     }
 
-    // DeploymentPlan
+    // deploymentPlan
     // 
-    DeploymentPlan::connection_iterator DeploymentPlan::
+    deploymentPlan::connection_iterator deploymentPlan::
     begin_connection ()
     {
       return connection_.begin ();
     }
 
-    DeploymentPlan::connection_iterator DeploymentPlan::
+    deploymentPlan::connection_iterator deploymentPlan::
     end_connection ()
     {
       return connection_.end ();
     }
 
-    DeploymentPlan::connection_const_iterator DeploymentPlan::
+    deploymentPlan::connection_const_iterator deploymentPlan::
     begin_connection () const
     {
       return connection_.begin ();
     }
 
-    DeploymentPlan::connection_const_iterator DeploymentPlan::
+    deploymentPlan::connection_const_iterator deploymentPlan::
     end_connection () const
     {
       return connection_.end ();
     }
 
-    void DeploymentPlan::
+    void deploymentPlan::
     add_connection (::CIAO::Config_Handlers::PlanConnectionDescription const& e)
     {
       connection_.push_back (e);
     }
 
-    size_t DeploymentPlan::
+    size_t deploymentPlan::
     count_connection(void) const
     {
       return connection_.size ();
     }
 
-    // DeploymentPlan
+    // deploymentPlan
     // 
-    DeploymentPlan::dependsOn_iterator DeploymentPlan::
+    deploymentPlan::dependsOn_iterator deploymentPlan::
     begin_dependsOn ()
     {
       return dependsOn_.begin ();
     }
 
-    DeploymentPlan::dependsOn_iterator DeploymentPlan::
+    deploymentPlan::dependsOn_iterator deploymentPlan::
     end_dependsOn ()
     {
       return dependsOn_.end ();
     }
 
-    DeploymentPlan::dependsOn_const_iterator DeploymentPlan::
+    deploymentPlan::dependsOn_const_iterator deploymentPlan::
     begin_dependsOn () const
     {
       return dependsOn_.begin ();
     }
 
-    DeploymentPlan::dependsOn_const_iterator DeploymentPlan::
+    deploymentPlan::dependsOn_const_iterator deploymentPlan::
     end_dependsOn () const
     {
       return dependsOn_.end ();
     }
 
-    void DeploymentPlan::
+    void deploymentPlan::
     add_dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& e)
     {
       dependsOn_.push_back (e);
     }
 
-    size_t DeploymentPlan::
+    size_t deploymentPlan::
     count_dependsOn(void) const
     {
       return dependsOn_.size ();
     }
 
-    // DeploymentPlan
+    // deploymentPlan
     // 
-    DeploymentPlan::artifact_iterator DeploymentPlan::
+    deploymentPlan::artifact_iterator deploymentPlan::
     begin_artifact ()
     {
       return artifact_.begin ();
     }
 
-    DeploymentPlan::artifact_iterator DeploymentPlan::
+    deploymentPlan::artifact_iterator deploymentPlan::
     end_artifact ()
     {
       return artifact_.end ();
     }
 
-    DeploymentPlan::artifact_const_iterator DeploymentPlan::
+    deploymentPlan::artifact_const_iterator deploymentPlan::
     begin_artifact () const
     {
       return artifact_.begin ();
     }
 
-    DeploymentPlan::artifact_const_iterator DeploymentPlan::
+    deploymentPlan::artifact_const_iterator deploymentPlan::
     end_artifact () const
     {
       return artifact_.end ();
     }
 
-    void DeploymentPlan::
+    void deploymentPlan::
     add_artifact (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& e)
     {
       artifact_.push_back (e);
     }
 
-    size_t DeploymentPlan::
+    size_t deploymentPlan::
     count_artifact(void) const
     {
       return artifact_.size ();
     }
 
-    // DeploymentPlan
+    // deploymentPlan
     // 
-    DeploymentPlan::infoProperty_iterator DeploymentPlan::
+    deploymentPlan::infoProperty_iterator deploymentPlan::
     begin_infoProperty ()
     {
       return infoProperty_.begin ();
     }
 
-    DeploymentPlan::infoProperty_iterator DeploymentPlan::
+    deploymentPlan::infoProperty_iterator deploymentPlan::
     end_infoProperty ()
     {
       return infoProperty_.end ();
     }
 
-    DeploymentPlan::infoProperty_const_iterator DeploymentPlan::
+    deploymentPlan::infoProperty_const_iterator deploymentPlan::
     begin_infoProperty () const
     {
       return infoProperty_.begin ();
     }
 
-    DeploymentPlan::infoProperty_const_iterator DeploymentPlan::
+    deploymentPlan::infoProperty_const_iterator deploymentPlan::
     end_infoProperty () const
     {
       return infoProperty_.end ();
     }
 
-    void DeploymentPlan::
+    void deploymentPlan::
     add_infoProperty (::CIAO::Config_Handlers::Property const& e)
     {
       infoProperty_.push_back (e);
     }
 
-    size_t DeploymentPlan::
+    size_t deploymentPlan::
     count_infoProperty(void) const
     {
       return infoProperty_.size ();
     }
+
+    // deploymentPlan
+    // 
+    deploymentPlan::localityConstraint_iterator deploymentPlan::
+    begin_localityConstraint ()
+    {
+      return localityConstraint_.begin ();
+    }
+
+    deploymentPlan::localityConstraint_iterator deploymentPlan::
+    end_localityConstraint ()
+    {
+      return localityConstraint_.end ();
+    }
+
+    deploymentPlan::localityConstraint_const_iterator deploymentPlan::
+    begin_localityConstraint () const
+    {
+      return localityConstraint_.begin ();
+    }
+
+    deploymentPlan::localityConstraint_const_iterator deploymentPlan::
+    end_localityConstraint () const
+    {
+      return localityConstraint_.end ();
+    }
+
+    void deploymentPlan::
+    add_localityConstraint (::CIAO::Config_Handlers::PlanLocality const& e)
+    {
+      localityConstraint_.push_back (e);
+    }
+
+    size_t deploymentPlan::
+    count_localityConstraint(void) const
+    {
+      return localityConstraint_.size ();
+    }
   }
 }
 
@@ -436,11 +483,11 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    // DeploymentPlan
+    // deploymentPlan
     //
 
-    DeploymentPlan::
-    DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+    deploymentPlan::
+    deploymentPlan (::XSCRT::XML::Element< ACE_TCHAR > const& e)
     :Base (e), regulator__ ()
     {
 
@@ -451,60 +498,66 @@ 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 ("realizes"))
+        else if (n == "realizes")
         {
           ::CIAO::Config_Handlers::ComponentInterfaceDescription t (e);
           realizes (t);
         }
 
-        else if (n == ACE_TEXT ("implementation"))
+        else if (n == "implementation")
         {
           ::CIAO::Config_Handlers::MonolithicDeploymentDescription t (e);
           add_implementation (t);
         }
 
-        else if (n == ACE_TEXT ("instance"))
+        else if (n == "instance")
         {
           ::CIAO::Config_Handlers::InstanceDeploymentDescription t (e);
           add_instance (t);
         }
 
-        else if (n == ACE_TEXT ("connection"))
+        else if (n == "connection")
         {
           ::CIAO::Config_Handlers::PlanConnectionDescription t (e);
           add_connection (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 ("artifact"))
+        else if (n == "artifact")
         {
           ::CIAO::Config_Handlers::ArtifactDeploymentDescription t (e);
           add_artifact (t);
         }
 
-        else if (n == ACE_TEXT ("infoProperty"))
+        else if (n == "infoProperty")
         {
           ::CIAO::Config_Handlers::Property t (e);
           add_infoProperty (t);
         }
 
+        else if (n == "localityConstraint")
+        {
+          ::CIAO::Config_Handlers::PlanLocality t (e);
+          add_localityConstraint (t);
+        }
+
         else 
         {
         }
@@ -530,11 +583,11 @@ namespace CIAO
     {
       ::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
 
-      struct DeploymentPlanTypeInfoInitializer
+      struct deploymentPlanTypeInfoInitializer
       {
-        DeploymentPlanTypeInfoInitializer ()
+        deploymentPlanTypeInfoInitializer ()
         {
-          ::XSCRT::TypeId id (typeid (DeploymentPlan));
+          ::XSCRT::TypeId id (typeid (deploymentPlan));
           ::XSCRT::ExtendedTypeInfo nf (id);
 
           nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
@@ -542,7 +595,7 @@ namespace CIAO
         }
       };
 
-      DeploymentPlanTypeInfoInitializer DeploymentPlanTypeInfoInitializer_;
+      deploymentPlanTypeInfoInitializer deploymentPlanTypeInfoInitializer_;
     }
   }
 }
@@ -553,11 +606,11 @@ namespace CIAO
   {
     namespace Traversal
     {
-      // DeploymentPlan
+      // deploymentPlan
       //
       //
 
-      void DeploymentPlan::
+      void deploymentPlan::
       traverse (Type& o)
       {
         pre (o);
@@ -573,10 +626,11 @@ namespace CIAO
         dependsOn (o);
         artifact (o);
         infoProperty (o);
+        localityConstraint (o);
         post (o);
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       traverse (Type const& o)
       {
         pre (o);
@@ -592,91 +646,92 @@ namespace CIAO
         dependsOn (o);
         artifact (o);
         infoProperty (o);
+        localityConstraint (o);
         post (o);
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       pre (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       pre (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       label (Type& o)
       {
         dispatch (o.label ());
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       label (Type const& o)
       {
         dispatch (o.label ());
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       label_none (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       label_none (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       UUID (Type& o)
       {
         dispatch (o.UUID ());
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       UUID (Type const& o)
       {
         dispatch (o.UUID ());
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       UUID_none (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       UUID_none (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       realizes (Type& o)
       {
         dispatch (o.realizes ());
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       realizes (Type const& o)
       {
         dispatch (o.realizes ());
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       realizes_none (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       realizes_none (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       implementation (Type& o)
       {
         // VC6 anathema strikes again
         //
-        DeploymentPlan::Type::implementation_iterator b (o.begin_implementation()), e (o.end_implementation());
+        deploymentPlan::Type::implementation_iterator b (o.begin_implementation()), e (o.end_implementation());
 
         if (b != e)
         {
@@ -689,14 +744,16 @@ namespace CIAO
 
           implementation_post (o);
         }
+
+        else implementation_none (o);
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       implementation (Type const& o)
       {
         // VC6 anathema strikes again
         //
-        DeploymentPlan::Type::implementation_const_iterator b (o.begin_implementation()), e (o.end_implementation());
+        deploymentPlan::Type::implementation_const_iterator b (o.begin_implementation()), e (o.end_implementation());
 
         if (b != e)
         {
@@ -709,44 +766,56 @@ namespace CIAO
 
           implementation_post (o);
         }
+
+        else implementation_none (o);
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       implementation_pre (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       implementation_pre (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       implementation_next (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       implementation_next (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       implementation_post (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       implementation_post (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
+      implementation_none (Type&)
+      {
+      }
+
+      void deploymentPlan::
+      implementation_none (Type const&)
+      {
+      }
+
+      void deploymentPlan::
       instance (Type& o)
       {
         // VC6 anathema strikes again
         //
-        DeploymentPlan::Type::instance_iterator b (o.begin_instance()), e (o.end_instance());
+        deploymentPlan::Type::instance_iterator b (o.begin_instance()), e (o.end_instance());
 
         if (b != e)
         {
@@ -763,12 +832,12 @@ namespace CIAO
         else instance_none (o);
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       instance (Type const& o)
       {
         // VC6 anathema strikes again
         //
-        DeploymentPlan::Type::instance_const_iterator b (o.begin_instance()), e (o.end_instance());
+        deploymentPlan::Type::instance_const_iterator b (o.begin_instance()), e (o.end_instance());
 
         if (b != e)
         {
@@ -785,52 +854,52 @@ namespace CIAO
         else instance_none (o);
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       instance_pre (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       instance_pre (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       instance_next (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       instance_next (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       instance_post (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       instance_post (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       instance_none (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       instance_none (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       connection (Type& o)
       {
         // VC6 anathema strikes again
         //
-        DeploymentPlan::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
+        deploymentPlan::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
 
         if (b != e)
         {
@@ -847,12 +916,12 @@ namespace CIAO
         else connection_none (o);
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       connection (Type const& o)
       {
         // VC6 anathema strikes again
         //
-        DeploymentPlan::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
+        deploymentPlan::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
 
         if (b != e)
         {
@@ -869,52 +938,52 @@ namespace CIAO
         else connection_none (o);
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       connection_pre (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       connection_pre (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       connection_next (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       connection_next (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       connection_post (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       connection_post (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       connection_none (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       connection_none (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       dependsOn (Type& o)
       {
         // VC6 anathema strikes again
         //
-        DeploymentPlan::Type::dependsOn_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
+        deploymentPlan::Type::dependsOn_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
 
         if (b != e)
         {
@@ -931,12 +1000,12 @@ namespace CIAO
         else dependsOn_none (o);
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       dependsOn (Type const& o)
       {
         // VC6 anathema strikes again
         //
-        DeploymentPlan::Type::dependsOn_const_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
+        deploymentPlan::Type::dependsOn_const_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
 
         if (b != e)
         {
@@ -953,52 +1022,52 @@ namespace CIAO
         else dependsOn_none (o);
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       dependsOn_pre (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       dependsOn_pre (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       dependsOn_next (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       dependsOn_next (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       dependsOn_post (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       dependsOn_post (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       dependsOn_none (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       dependsOn_none (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       artifact (Type& o)
       {
         // VC6 anathema strikes again
         //
-        DeploymentPlan::Type::artifact_iterator b (o.begin_artifact()), e (o.end_artifact());
+        deploymentPlan::Type::artifact_iterator b (o.begin_artifact()), e (o.end_artifact());
 
         if (b != e)
         {
@@ -1015,12 +1084,12 @@ namespace CIAO
         else artifact_none (o);
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       artifact (Type const& o)
       {
         // VC6 anathema strikes again
         //
-        DeploymentPlan::Type::artifact_const_iterator b (o.begin_artifact()), e (o.end_artifact());
+        deploymentPlan::Type::artifact_const_iterator b (o.begin_artifact()), e (o.end_artifact());
 
         if (b != e)
         {
@@ -1037,52 +1106,52 @@ namespace CIAO
         else artifact_none (o);
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       artifact_pre (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       artifact_pre (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       artifact_next (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       artifact_next (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       artifact_post (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       artifact_post (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       artifact_none (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       artifact_none (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       infoProperty (Type& o)
       {
         // VC6 anathema strikes again
         //
-        DeploymentPlan::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
+        deploymentPlan::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
 
         if (b != e)
         {
@@ -1099,12 +1168,12 @@ namespace CIAO
         else infoProperty_none (o);
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       infoProperty (Type const& o)
       {
         // VC6 anathema strikes again
         //
-        DeploymentPlan::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
+        deploymentPlan::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
 
         if (b != e)
         {
@@ -1121,52 +1190,136 @@ namespace CIAO
         else infoProperty_none (o);
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       infoProperty_pre (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       infoProperty_pre (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       infoProperty_next (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       infoProperty_next (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       infoProperty_post (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       infoProperty_post (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       infoProperty_none (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       infoProperty_none (Type const&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
+      localityConstraint (Type& o)
+      {
+        // VC6 anathema strikes again
+        //
+        deploymentPlan::Type::localityConstraint_iterator b (o.begin_localityConstraint()), e (o.end_localityConstraint());
+
+        if (b != e)
+        {
+          localityConstraint_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) localityConstraint_next (o);
+          }
+
+          localityConstraint_post (o);
+        }
+
+        else localityConstraint_none (o);
+      }
+
+      void deploymentPlan::
+      localityConstraint (Type const& o)
+      {
+        // VC6 anathema strikes again
+        //
+        deploymentPlan::Type::localityConstraint_const_iterator b (o.begin_localityConstraint()), e (o.end_localityConstraint());
+
+        if (b != e)
+        {
+          localityConstraint_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) localityConstraint_next (o);
+          }
+
+          localityConstraint_post (o);
+        }
+
+        else localityConstraint_none (o);
+      }
+
+      void deploymentPlan::
+      localityConstraint_pre (Type&)
+      {
+      }
+
+      void deploymentPlan::
+      localityConstraint_pre (Type const&)
+      {
+      }
+
+      void deploymentPlan::
+      localityConstraint_next (Type&)
+      {
+      }
+
+      void deploymentPlan::
+      localityConstraint_next (Type const&)
+      {
+      }
+
+      void deploymentPlan::
+      localityConstraint_post (Type&)
+      {
+      }
+
+      void deploymentPlan::
+      localityConstraint_post (Type const&)
+      {
+      }
+
+      void deploymentPlan::
+      localityConstraint_none (Type&)
+      {
+      }
+
+      void deploymentPlan::
+      localityConstraint_none (Type const&)
+      {
+      }
+
+      void deploymentPlan::
       post (Type&)
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       post (Type const&)
       {
       }
@@ -1180,164 +1333,183 @@ namespace CIAO
   {
     namespace Writer
     {
-      // DeploymentPlan
+      // deploymentPlan
       //
       //
 
-      DeploymentPlan::
-      DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR >& e)
+      deploymentPlan::
+      deploymentPlan (::XSCRT::XML::Element< ACE_TCHAR >& e)
       : ::XSCRT::Writer< ACE_TCHAR > (e)
       {
       }
 
-      DeploymentPlan::
-      DeploymentPlan ()
+      deploymentPlan::
+      deploymentPlan ()
       {
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       traverse (Type const& o)
       {
-        Traversal::DeploymentPlan::traverse (o);
+        Traversal::deploymentPlan::traverse (o);
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       label (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("label"), top_ ()));
-        Traversal::DeploymentPlan::label (o);
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
+        Traversal::deploymentPlan::label (o);
         pop_ ();
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       UUID (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("UUID"), top_ ()));
-        Traversal::DeploymentPlan::UUID (o);
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
+        Traversal::deploymentPlan::UUID (o);
         pop_ ();
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       realizes (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("realizes"), top_ ()));
-        Traversal::DeploymentPlan::realizes (o);
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("realizes", top_ ()));
+        Traversal::deploymentPlan::realizes (o);
         pop_ ();
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       implementation_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("implementation"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("implementation", top_ ()));
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       implementation_next (Type const& o)
       {
         implementation_post (o);
         implementation_pre (o);
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       implementation_post (Type const&)
       {
         pop_ ();
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       instance_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("instance"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("instance", top_ ()));
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       instance_next (Type const& o)
       {
         instance_post (o);
         instance_pre (o);
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       instance_post (Type const&)
       {
         pop_ ();
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       connection_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("connection"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("connection", top_ ()));
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       connection_next (Type const& o)
       {
         connection_post (o);
         connection_pre (o);
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       connection_post (Type const&)
       {
         pop_ ();
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       dependsOn_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("dependsOn"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("dependsOn", top_ ()));
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       dependsOn_next (Type const& o)
       {
         dependsOn_post (o);
         dependsOn_pre (o);
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       dependsOn_post (Type const&)
       {
         pop_ ();
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       artifact_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("artifact"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("artifact", top_ ()));
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       artifact_next (Type const& o)
       {
         artifact_post (o);
         artifact_pre (o);
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       artifact_post (Type const&)
       {
         pop_ ();
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       infoProperty_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("infoProperty"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       infoProperty_next (Type const& o)
       {
         infoProperty_post (o);
         infoProperty_pre (o);
       }
 
-      void DeploymentPlan::
+      void deploymentPlan::
       infoProperty_post (Type const&)
       {
         pop_ ();
       }
+
+      void deploymentPlan::
+      localityConstraint_pre (Type const&)
+      {
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("localityConstraint", top_ ()));
+      }
+
+      void deploymentPlan::
+      localityConstraint_next (Type const& o)
+      {
+        localityConstraint_post (o);
+        localityConstraint_pre (o);
+      }
+
+      void deploymentPlan::
+      localityConstraint_post (Type const&)
+      {
+        pop_ ();
+      }
     }
   }
 }
diff --git a/CIAO/tools/Config_Handlers/cdp.hpp b/CIAO/tools/Config_Handlers/cdp.hpp
index df7d0a36ad6..4e734efe6fb 100644
--- a/CIAO/tools/Config_Handlers/cdp.hpp
+++ b/CIAO/tools/Config_Handlers/cdp.hpp
@@ -25,7 +25,7 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    class DeploymentPlan;
+    class deploymentPlan;
   }
 }
 
@@ -39,7 +39,7 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    class XSC_XML_Handlers_Export DeploymentPlan : public ::XSCRT::Type
+    class XSC_XML_Handlers_Export deploymentPlan : public ::XSCRT::Type
     {
       typedef ::XSCRT::Type Base;
 
@@ -163,14 +163,29 @@ namespace CIAO
       protected:
       ::std::list< ::CIAO::Config_Handlers::Property > infoProperty_;
 
+      // localityConstraint
+      // 
       public:
-      DeploymentPlan ();
+      typedef ::std::list< ::CIAO::Config_Handlers::PlanLocality >::iterator localityConstraint_iterator;
+      typedef ::std::list< ::CIAO::Config_Handlers::PlanLocality >::const_iterator localityConstraint_const_iterator;
+      localityConstraint_iterator begin_localityConstraint ();
+      localityConstraint_iterator end_localityConstraint ();
+      localityConstraint_const_iterator begin_localityConstraint () const;
+      localityConstraint_const_iterator end_localityConstraint () const;
+      void add_localityConstraint (::CIAO::Config_Handlers::PlanLocality const& );
+      size_t count_localityConstraint (void) const;
+
+      protected:
+      ::std::list< ::CIAO::Config_Handlers::PlanLocality > localityConstraint_;
 
-      DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      DeploymentPlan (DeploymentPlan const& s);
+      public:
+      deploymentPlan ();
 
-      DeploymentPlan&
-      operator= (DeploymentPlan const& s);
+      deploymentPlan (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      deploymentPlan (deploymentPlan const& s);
+
+      deploymentPlan&
+      operator= (deploymentPlan const& s);
 
       private:
       char regulator__;
@@ -193,7 +208,7 @@ namespace CIAO
   {
     namespace Traversal
     {
-      struct XSC_XML_Handlers_Export DeploymentPlan : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DeploymentPlan >
+      struct XSC_XML_Handlers_Export deploymentPlan : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::deploymentPlan >
       {
         virtual void
         traverse (Type&);
@@ -268,6 +283,12 @@ namespace CIAO
         implementation_post (Type const&);
 
         virtual void
+        implementation_none (Type&);
+
+        virtual void
+        implementation_none (Type const&);
+
+        virtual void
         instance (Type&);
 
         virtual void
@@ -418,6 +439,36 @@ namespace CIAO
         infoProperty_none (Type const&);
 
         virtual void
+        localityConstraint (Type&);
+
+        virtual void
+        localityConstraint (Type const&);
+
+        virtual void
+        localityConstraint_pre (Type&);
+
+        virtual void
+        localityConstraint_pre (Type const&);
+
+        virtual void
+        localityConstraint_next (Type&);
+
+        virtual void
+        localityConstraint_next (Type const&);
+
+        virtual void
+        localityConstraint_post (Type&);
+
+        virtual void
+        localityConstraint_post (Type const&);
+
+        virtual void
+        localityConstraint_none (Type&);
+
+        virtual void
+        localityConstraint_none (Type const&);
+
+        virtual void
         post (Type&);
 
         virtual void
@@ -435,11 +486,11 @@ namespace CIAO
   {
     namespace Writer
     {
-      struct DeploymentPlan : Traversal::DeploymentPlan, 
+      struct deploymentPlan : Traversal::deploymentPlan, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
-        typedef ::CIAO::Config_Handlers::DeploymentPlan Type;
-        DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR >&);
+        typedef ::CIAO::Config_Handlers::deploymentPlan Type;
+        deploymentPlan (::XSCRT::XML::Element< ACE_TCHAR >&);
 
         virtual void 
         traverse (Type &o)
@@ -683,8 +734,41 @@ namespace CIAO
         virtual void
         infoProperty_post (Type const&);
 
+        virtual void 
+        localityConstraint_pre (Type &o)
+        {
+
+          this->localityConstraint_pre (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        localityConstraint_pre (Type const&);
+
+        virtual void 
+        localityConstraint_next (Type &o)
+        {
+
+          this->localityConstraint_next (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        localityConstraint_next (Type const&);
+
+        virtual void 
+        localityConstraint_post (Type &o)
+        {
+
+          this->localityConstraint_post (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        localityConstraint_post (Type const&);
+
         protected:
-        DeploymentPlan ();
+        deploymentPlan ();
       };
     }
   }
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);
diff --git a/CIAO/tools/Config_Handlers/cid.hpp b/CIAO/tools/Config_Handlers/cid.hpp
index c0b74ebc810..5e02b1729ed 100644
--- a/CIAO/tools/Config_Handlers/cid.hpp
+++ b/CIAO/tools/Config_Handlers/cid.hpp
@@ -25,6 +25,7 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
+    class ComponentPackageReference;
     class SubcomponentInstantiationDescription;
     class SubcomponentPropertyReference;
     class AssemblyPropertyMapping;
@@ -50,6 +51,53 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
+    class XSC_XML_Handlers_Export ComponentPackageReference : public ::XSCRT::Type
+    {
+      typedef ::XSCRT::Type Base;
+
+      // requiredUUID
+      // 
+      public:
+      bool requiredUUID_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& requiredUUID () const;
+      void requiredUUID (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requiredUUID_;
+
+      // requiredName
+      // 
+      public:
+      bool requiredName_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& requiredName () const;
+      void requiredName (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requiredName_;
+
+      // requiredType
+      // 
+      public:
+      ::CIAO::Config_Handlers::ComponentInterfaceDescription const& requiredType () const;
+      void requiredType (::CIAO::Config_Handlers::ComponentInterfaceDescription const& );
+
+      protected:
+      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > requiredType_;
+
+      public:
+      ComponentPackageReference (::CIAO::Config_Handlers::ComponentInterfaceDescription const& requiredType__);
+
+      ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR > const&);
+      ComponentPackageReference (ComponentPackageReference const& s);
+
+      ComponentPackageReference&
+      operator= (ComponentPackageReference const& s);
+
+      private:
+      char regulator__;
+    };
+
+
     class XSC_XML_Handlers_Export SubcomponentInstantiationDescription : public ::XSCRT::Type
     {
       typedef ::XSCRT::Type Base;
@@ -174,15 +222,15 @@ namespace CIAO
       // instance
       // 
       public:
-      ::XMLSchema::IDREF< ACE_TCHAR > const& instance () const;
-      void instance (::XMLSchema::IDREF< ACE_TCHAR > const& );
+      ::CIAO::Config_Handlers::IdRef const& instance () const;
+      void instance (::CIAO::Config_Handlers::IdRef const& );
 
       protected:
-      ::std::auto_ptr< ::XMLSchema::IDREF< ACE_TCHAR > > instance_;
+      ::std::auto_ptr< ::CIAO::Config_Handlers::IdRef > instance_;
 
       public:
       SubcomponentPropertyReference (::XMLSchema::string< ACE_TCHAR > const& propertyName__,
-                                     ::XMLSchema::IDREF< ACE_TCHAR > const& instance__);
+                                     ::CIAO::Config_Handlers::IdRef const& instance__);
 
       SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR > const&);
       SubcomponentPropertyReference (SubcomponentPropertyReference const& s);
@@ -553,6 +601,57 @@ namespace CIAO
   {
     namespace Traversal
     {
+      struct XSC_XML_Handlers_Export ComponentPackageReference : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPackageReference >
+      {
+        virtual void
+        traverse (Type&);
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void
+        pre (Type&);
+
+        virtual void
+        pre (Type const&);
+
+        virtual void
+        requiredUUID (Type&);
+
+        virtual void
+        requiredUUID (Type const&);
+
+        virtual void
+        requiredUUID_none (Type&);
+
+        virtual void
+        requiredUUID_none (Type const&);
+
+        virtual void
+        requiredName (Type&);
+
+        virtual void
+        requiredName (Type const&);
+
+        virtual void
+        requiredName_none (Type&);
+
+        virtual void
+        requiredName_none (Type const&);
+
+        virtual void
+        requiredType (Type&);
+
+        virtual void
+        requiredType (Type const&);
+
+        virtual void
+        post (Type&);
+
+        virtual void
+        post (Type const&);
+      };
+
       struct XSC_XML_Handlers_Export SubcomponentInstantiationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >
       {
         virtual void
@@ -1266,6 +1365,60 @@ namespace CIAO
   {
     namespace Writer
     {
+      struct ComponentPackageReference : Traversal::ComponentPackageReference, 
+      virtual ::XSCRT::Writer< ACE_TCHAR >
+      {
+        typedef ::CIAO::Config_Handlers::ComponentPackageReference Type;
+        ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR >&);
+
+        virtual void 
+        traverse (Type &o)
+        {
+
+          this->traverse (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        traverse (Type const&);
+
+        virtual void 
+        requiredUUID (Type &o)
+        {
+
+          this->requiredUUID (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        requiredUUID (Type const&);
+
+        virtual void 
+        requiredName (Type &o)
+        {
+
+          this->requiredName (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        requiredName (Type const&);
+
+        virtual void 
+        requiredType (Type &o)
+        {
+
+          this->requiredType (const_cast <Type const &> (o));
+        }
+
+
+        virtual void
+        requiredType (Type const&);
+
+        protected:
+        ComponentPackageReference ();
+      };
+
       struct SubcomponentInstantiationDescription : Traversal::SubcomponentInstantiationDescription, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
diff --git a/CIAO/tools/Config_Handlers/cpd.cpp b/CIAO/tools/Config_Handlers/cpd.cpp
index 9ae5c83a9f3..c59e5e18fef 100644
--- a/CIAO/tools/Config_Handlers/cpd.cpp
+++ b/CIAO/tools/Config_Handlers/cpd.cpp
@@ -453,13 +453,13 @@ 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 ("referencedImplementation"))
+        else if (n == "referencedImplementation")
         {
           referencedImplementation_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentImplementationDescription > (new ::CIAO::Config_Handlers::ComponentImplementationDescription (e));
           referencedImplementation_->container (this);
@@ -486,43 +486,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 ("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 ("realizes"))
+        else if (n == "realizes")
         {
           ::CIAO::Config_Handlers::ComponentInterfaceDescription t (e);
           realizes (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 ("implementation"))
+        else if (n == "implementation")
         {
           ::CIAO::Config_Handlers::PackagedComponentImplementation t (e);
           add_implementation (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);
@@ -537,7 +537,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);
@@ -1130,7 +1130,7 @@ namespace CIAO
       void PackagedComponentImplementation::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::PackagedComponentImplementation::name (o);
         pop_ ();
       }
@@ -1138,7 +1138,7 @@ namespace CIAO
       void PackagedComponentImplementation::
       referencedImplementation (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("referencedImplementation"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("referencedImplementation", top_ ()));
         Traversal::PackagedComponentImplementation::referencedImplementation (o);
         pop_ ();
       }
@@ -1167,7 +1167,7 @@ namespace CIAO
       void ComponentPackageDescription::
       label (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("label"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
         Traversal::ComponentPackageDescription::label (o);
         pop_ ();
       }
@@ -1175,7 +1175,7 @@ namespace CIAO
       void ComponentPackageDescription::
       UUID (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("UUID"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
         Traversal::ComponentPackageDescription::UUID (o);
         pop_ ();
       }
@@ -1183,7 +1183,7 @@ namespace CIAO
       void ComponentPackageDescription::
       realizes (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("realizes"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("realizes", top_ ()));
         Traversal::ComponentPackageDescription::realizes (o);
         pop_ ();
       }
@@ -1191,7 +1191,7 @@ namespace CIAO
       void ComponentPackageDescription::
       configProperty_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("configProperty"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
       }
 
       void ComponentPackageDescription::
@@ -1210,7 +1210,7 @@ namespace CIAO
       void ComponentPackageDescription::
       implementation_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("implementation"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("implementation", top_ ()));
       }
 
       void ComponentPackageDescription::
@@ -1229,7 +1229,7 @@ namespace CIAO
       void ComponentPackageDescription::
       infoProperty_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("infoProperty"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
       }
 
       void ComponentPackageDescription::
@@ -1248,7 +1248,7 @@ namespace CIAO
       void ComponentPackageDescription::
       contentLocation (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("contentLocation"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("contentLocation", top_ ()));
         Traversal::ComponentPackageDescription::contentLocation (o);
         pop_ ();
       }
@@ -1256,7 +1256,7 @@ namespace CIAO
       void ComponentPackageDescription::
       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::ComponentPackageDescription::href (o);
         attr_ (0);
diff --git a/CIAO/tools/Config_Handlers/iad.cpp b/CIAO/tools/Config_Handlers/iad.cpp
index fb199c1c5ca..e05cc1272b1 100644
--- a/CIAO/tools/Config_Handlers/iad.cpp
+++ b/CIAO/tools/Config_Handlers/iad.cpp
@@ -513,13 +513,13 @@ 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 ("referencedArtifact"))
+        else if (n == "referencedArtifact")
         {
           referencedArtifact_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationArtifactDescription > (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (e));
           referencedArtifact_->container (this);
@@ -546,49 +546,49 @@ 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 ("location"))
+        else if (n == "location")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           add_location (t);
         }
 
-        else if (n == ACE_TEXT ("dependsOn"))
+        else if (n == "dependsOn")
         {
           ::CIAO::Config_Handlers::NamedImplementationArtifact t (e);
           add_dependsOn (t);
         }
 
-        else if (n == ACE_TEXT ("execParameter"))
+        else if (n == "execParameter")
         {
           ::CIAO::Config_Handlers::Property t (e);
           add_execParameter (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 ("deployRequirement"))
+        else if (n == "deployRequirement")
         {
           ::CIAO::Config_Handlers::Requirement t (e);
           add_deployRequirement (t);
         }
 
-        else if (n == ACE_TEXT ("contentLocation"))
+        else if (n == "contentLocation")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           contentLocation (t);
@@ -603,7 +603,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);
@@ -1342,7 +1342,7 @@ namespace CIAO
       void NamedImplementationArtifact::
       name (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
         Traversal::NamedImplementationArtifact::name (o);
         pop_ ();
       }
@@ -1350,7 +1350,7 @@ namespace CIAO
       void NamedImplementationArtifact::
       referencedArtifact (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("referencedArtifact"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("referencedArtifact", top_ ()));
         Traversal::NamedImplementationArtifact::referencedArtifact (o);
         pop_ ();
       }
@@ -1379,7 +1379,7 @@ namespace CIAO
       void ImplementationArtifactDescription::
       label (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("label"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
         Traversal::ImplementationArtifactDescription::label (o);
         pop_ ();
       }
@@ -1387,7 +1387,7 @@ namespace CIAO
       void ImplementationArtifactDescription::
       UUID (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("UUID"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
         Traversal::ImplementationArtifactDescription::UUID (o);
         pop_ ();
       }
@@ -1395,7 +1395,7 @@ namespace CIAO
       void ImplementationArtifactDescription::
       location_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("location"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("location", top_ ()));
       }
 
       void ImplementationArtifactDescription::
@@ -1414,7 +1414,7 @@ namespace CIAO
       void ImplementationArtifactDescription::
       dependsOn_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("dependsOn"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("dependsOn", top_ ()));
       }
 
       void ImplementationArtifactDescription::
@@ -1433,7 +1433,7 @@ namespace CIAO
       void ImplementationArtifactDescription::
       execParameter_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("execParameter"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("execParameter", top_ ()));
       }
 
       void ImplementationArtifactDescription::
@@ -1452,7 +1452,7 @@ namespace CIAO
       void ImplementationArtifactDescription::
       infoProperty_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("infoProperty"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ()));
       }
 
       void ImplementationArtifactDescription::
@@ -1471,7 +1471,7 @@ namespace CIAO
       void ImplementationArtifactDescription::
       deployRequirement_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("deployRequirement"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployRequirement", top_ ()));
       }
 
       void ImplementationArtifactDescription::
@@ -1490,7 +1490,7 @@ namespace CIAO
       void ImplementationArtifactDescription::
       contentLocation (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("contentLocation"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("contentLocation", top_ ()));
         Traversal::ImplementationArtifactDescription::contentLocation (o);
         pop_ ();
       }
@@ -1498,7 +1498,7 @@ namespace CIAO
       void ImplementationArtifactDescription::
       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::ImplementationArtifactDescription::href (o);
         attr_ (0);
diff --git a/CIAO/tools/Config_Handlers/pcd.cpp b/CIAO/tools/Config_Handlers/pcd.cpp
index 3b16717d996..b74723f1265 100644
--- a/CIAO/tools/Config_Handlers/pcd.cpp
+++ b/CIAO/tools/Config_Handlers/pcd.cpp
@@ -473,7 +473,7 @@ 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 ("location"))
+        if (n == "location")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           add_location (t);
@@ -500,55 +500,55 @@ 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 ("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 ("importedPackage"))
+        else if (n == "importedPackage")
         {
           ::CIAO::Config_Handlers::ComponentPackageImport t (e);
           importedPackage (t);
         }
 
-        else if (n == ACE_TEXT ("referencedPackage"))
+        else if (n == "referencedPackage")
         {
           ::CIAO::Config_Handlers::ComponentPackageReference t (e);
           referencedPackage (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 ("contentLocation"))
+        else if (n == "contentLocation")
         {
           ::XMLSchema::string< ACE_TCHAR > t (e);
           contentLocation (t);
@@ -1151,7 +1151,7 @@ namespace CIAO
       void ComponentPackageImport::
       location_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("location"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("location", top_ ()));
       }
 
       void ComponentPackageImport::
@@ -1191,7 +1191,7 @@ namespace CIAO
       void PackageConfiguration::
       label (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("label"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ()));
         Traversal::PackageConfiguration::label (o);
         pop_ ();
       }
@@ -1199,7 +1199,7 @@ namespace CIAO
       void PackageConfiguration::
       UUID (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("UUID"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ()));
         Traversal::PackageConfiguration::UUID (o);
         pop_ ();
       }
@@ -1207,7 +1207,7 @@ namespace CIAO
       void PackageConfiguration::
       basePackage (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("basePackage"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("basePackage", top_ ()));
         Traversal::PackageConfiguration::basePackage (o);
         pop_ ();
       }
@@ -1215,7 +1215,7 @@ namespace CIAO
       void PackageConfiguration::
       specializedConfig (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("specializedConfig"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("specializedConfig", top_ ()));
         Traversal::PackageConfiguration::specializedConfig (o);
         pop_ ();
       }
@@ -1223,7 +1223,7 @@ namespace CIAO
       void PackageConfiguration::
       importedPackage (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("importedPackage"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("importedPackage", top_ ()));
         Traversal::PackageConfiguration::importedPackage (o);
         pop_ ();
       }
@@ -1231,7 +1231,7 @@ namespace CIAO
       void PackageConfiguration::
       referencedPackage (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("referencedPackage"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("referencedPackage", top_ ()));
         Traversal::PackageConfiguration::referencedPackage (o);
         pop_ ();
       }
@@ -1239,7 +1239,7 @@ namespace CIAO
       void PackageConfiguration::
       selectRequirement_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("selectRequirement"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("selectRequirement", top_ ()));
       }
 
       void PackageConfiguration::
@@ -1258,7 +1258,7 @@ namespace CIAO
       void PackageConfiguration::
       configProperty_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("configProperty"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ()));
       }
 
       void PackageConfiguration::
@@ -1277,7 +1277,7 @@ namespace CIAO
       void PackageConfiguration::
       contentLocation (Type const& o)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("contentLocation"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("contentLocation", top_ ()));
         Traversal::PackageConfiguration::contentLocation (o);
         pop_ ();
       }
diff --git a/CIAO/tools/Config_Handlers/test.cpp b/CIAO/tools/Config_Handlers/test.cpp
index 4dddadccde6..fd50374aa7e 100644
--- a/CIAO/tools/Config_Handlers/test.cpp
+++ b/CIAO/tools/Config_Handlers/test.cpp
@@ -5,18 +5,16 @@
 #include "Deployment.hpp"
 #include "DP_Handler.h"
 #include "DAnCE/Deployment/Deployment_DataC.h"
-#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 #include "ace/Get_Opt.h"
-#include "Utils/XML_Helper.h"
-#include "DnC_Dump.h"
+#include "Utils/XML_Typedefs.h"
 #include "tao/ORB.h"
-static const ACE_TCHAR *input_file = ACE_TEXT ("BasicSP.cdp");
+static const char *input_file = "BasicSP.cdp";
 
 
 static int
-parse_args (int argc, ACE_TCHAR *argv[])
+parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("i:"));
+  ACE_Get_Opt get_opts (argc, argv, "i:");
 
   int c;
 
@@ -56,14 +54,12 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   ACE_UNUSED_ARG (orb);
 
   //Create an XML_Helper for all the file work
-  XML_Helper the_helper;
 
-  std::auto_ptr<xercesc::DOMDocument> doc (
-    the_helper.create_dom (ACE_TEXT_ALWAYS_CHAR (input_file)));
-  if (doc.get ())
+  if (xercesc::DOMDocument *doc = 
+      XML_Helper::XML_HELPER.create_dom (input_file))
     {
       //Read in the XSC type structure from the DOMDocument
-      DeploymentPlan dp = deploymentPlan (doc.get ());
+      DeploymentPlan dp = deploymentPlan (doc);
 
       //Convert the XSC to an IDL datatype
 
@@ -72,24 +68,27 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       std::cout << "Instance document import succeeded.  Dumping contents to file\n";
 
       //Retrieve the newly created IDL structure
-      std::auto_ptr<Deployment::DeploymentPlan> idl (dp_handler.plan());
+      Deployment::DeploymentPlan *idl = dp_handler.plan();
 
       // Check for server resources, if present....
-      check_srd (*idl.get());
+      check_srd (*idl);
 
       //Convert it back to an XSC structure with a new DP_Handler
-      DP_Handler reverse_handler(*idl.get());
+      DP_Handler reverse_handler(*idl);
 
       //Create a new DOMDocument for writing the XSC into XML
-      std::auto_ptr<xercesc::DOMDocument> the_xsc (the_helper.create_dom(0));
+      xercesc::DOMDocument* the_xsc 
+        (XML_Helper::XML_HELPER.create_dom(0));
 
       //Serialize the XSC into a DOMDocument
-      std::auto_ptr<DeploymentPlan> plan (reverse_handler.xsc());
-      deploymentPlan(*plan.get(), the_xsc.get());
+      deploymentPlan(*reverse_handler.xsc(), the_xsc);
 
 
       //Write it to test.xml
-      the_helper.write_DOM(the_xsc.get(), ACE_TEXT ("test.xml"));
+      XML_Helper::XML_HELPER.write_DOM(the_xsc, "test.xml");
+
+      //Cleanliness is next to Godliness
+      delete doc;
     }
 
   std::cout << "Test completed!\n";
diff --git a/CIAO/tools/Config_Handlers/toplevel.cpp b/CIAO/tools/Config_Handlers/toplevel.cpp
index c5f35c34778..4a06443d8fb 100644
--- a/CIAO/tools/Config_Handlers/toplevel.cpp
+++ b/CIAO/tools/Config_Handlers/toplevel.cpp
@@ -114,7 +114,7 @@ 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 ("basePackage"))
+        if (n == "basePackage")
         {
           ::CIAO::Config_Handlers::PackageConfiguration t (e);
           add_basePackage (t);
@@ -311,7 +311,7 @@ namespace CIAO
       void TopLevelPackageDescription::
       basePackage_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("basePackage"), top_ ()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("basePackage", top_ ()));
       }
 
       void TopLevelPackageDescription::