Fri Mar 11 13:55:17 2005 Will Otte <wotte@dre.vanderbilt.edu>

24 files changed, 135 insertions, 17260 deletions

diff --git a/TAO/CIAO/DAnCE/ChangeLog b/TAO/CIAO/DAnCE/ChangeLog
index d573ee16a44..a94e44c0535 100644
--- a/TAO/CIAO/DAnCE/ChangeLog
+++ b/TAO/CIAO/DAnCE/ChangeLog
@@ -1,3 +1,35 @@
+Fri Mar 11 13:55:17 2005  Will Otte <wotte@dre.vanderbilt.edu>
+
+	* Config_Handlers/DP_Handler.cpp
+	* Config_Handlers/IDD_Handler.cpp
+	* Config_Handlers/IDD_Handler.h
+	* Config_Handlers/PSPE_Handler.cpp
+
+	Some cosmetic fixes and silenced a couple warnings.
+	
+	* Config_Handlers/Basic_Deployment_Data.cpp
+	* Config_Handlers/Basic_Deployment_Data.hpp
+	* Config_Handlers/ccd.cpp
+	* Config_Handlers/ccd.hpp
+	* Config_Handlers/cdd.cpp
+	* Config_Handlers/cdd.hpp
+	* Config_Handlers/cdp.cpp
+	* Config_Handlers/cdp.hpp
+	* Config_Handlers/cid.cpp
+	* Config_Handlers/cid.hpp
+	* Config_Handlers/cpd.cpp
+	* Config_Handlers/cpd.hpp
+	* Config_Handlers/iad.cpp
+	* Config_Handlers/iad.hpp
+	* Config_Handlers/pcd.cpp
+	* Config_Handlers/pcd.hpp
+	* Config_Handlers/toplevel.cpp
+	* Config_Handlers/toplevel.hpp
+
+	New XSC handlers compiled using the soon to be cut 0.6.1 release of XSC.
+
+	This silences a number of warnings from GCC.
+	
 Fri Mar 11 16:29:30 (IST) 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* ciao/Container_Base.h:
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.cpp
index 31cfc01230d..f95a9408315 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.cpp
@@ -37,7 +37,7 @@ namespace CIAO
 
     DataType::
     DataType ()
-    :
+    : 
     regulator__ ()
     {
     }
@@ -45,6 +45,7 @@ namespace CIAO
     DataType::
     DataType (::CIAO::Config_Handlers::DataType const& s)
     :
+    XSCRT::Type (), 
     kind_ (s.kind_.get () ? new ::CIAO::Config_Handlers::TCKind (*s.kind_) : 0),
     regulator__ ()
     {
@@ -102,7 +103,7 @@ namespace CIAO
 
     DataValue::
     DataValue ()
-    :
+    : 
     regulator__ ()
     {
     }
@@ -110,6 +111,7 @@ namespace CIAO
     DataValue::
     DataValue (::CIAO::Config_Handlers::DataValue const& s)
     :
+    XSCRT::Type (), 
     short__ (s.short__.get () ? new ::XMLSchema::short_ (*s.short__) : 0),
     long__ (s.long__.get () ? new ::XMLSchema::int_ (*s.long__) : 0),
     ushort_ (s.ushort_.get () ? new ::XMLSchema::unsignedShort (*s.ushort_) : 0),
@@ -768,7 +770,7 @@ namespace CIAO
     Any::
     Any (::CIAO::Config_Handlers::DataType const& type__,
     ::CIAO::Config_Handlers::DataValue const& value__)
-    :
+    : 
     type_ (new ::CIAO::Config_Handlers::DataType (type__)),
     value_ (new ::CIAO::Config_Handlers::DataValue (value__)),
     regulator__ ()
@@ -780,6 +782,7 @@ namespace CIAO
     Any::
     Any (::CIAO::Config_Handlers::Any const& s)
     :
+    XSCRT::Type (), 
     type_ (new ::CIAO::Config_Handlers::DataType (*s.type_)),
     value_ (new ::CIAO::Config_Handlers::DataValue (*s.value_)),
     regulator__ ()
@@ -846,7 +849,7 @@ namespace CIAO
     Property::
     Property (::XMLSchema::string< char > const& name__,
     ::CIAO::Config_Handlers::Any const& value__)
-    :
+    : 
     name_ (new ::XMLSchema::string< char > (name__)),
     value_ (new ::CIAO::Config_Handlers::Any (value__)),
     regulator__ ()
@@ -858,6 +861,7 @@ namespace CIAO
     Property::
     Property (::CIAO::Config_Handlers::Property const& s)
     :
+    XSCRT::Type (), 
     name_ (new ::XMLSchema::string< char > (*s.name_)),
     value_ (new ::CIAO::Config_Handlers::Any (*s.value_)),
     regulator__ ()
@@ -924,7 +928,7 @@ namespace CIAO
     Node::
     Node (::XMLSchema::string< char > const& name__,
     ::XMLSchema::string< char > const& label__)
-    :
+    : 
     name_ (new ::XMLSchema::string< char > (name__)),
     label_ (new ::XMLSchema::string< char > (label__)),
     regulator__ ()
@@ -936,6 +940,7 @@ namespace CIAO
     Node::
     Node (::CIAO::Config_Handlers::Node const& s)
     :
+    XSCRT::Type (), 
     name_ (new ::XMLSchema::string< char > (*s.name_)),
     label_ (new ::XMLSchema::string< char > (*s.label_)),
     regulator__ ()
@@ -1030,7 +1035,7 @@ namespace CIAO
     SatisfierProperty (::XMLSchema::string< char > const& name__,
     ::CIAO::Config_Handlers::SatisfierPropertyKind const& kind__,
     ::CIAO::Config_Handlers::Any const& value__)
-    :
+    : 
     name_ (new ::XMLSchema::string< char > (name__)),
     kind_ (new ::CIAO::Config_Handlers::SatisfierPropertyKind (kind__)),
     value_ (new ::CIAO::Config_Handlers::Any (value__)),
@@ -1044,6 +1049,7 @@ namespace CIAO
     SatisfierProperty::
     SatisfierProperty (::CIAO::Config_Handlers::SatisfierProperty const& s)
     :
+    XSCRT::Type (), 
     name_ (new ::XMLSchema::string< char > (*s.name_)),
     kind_ (new ::CIAO::Config_Handlers::SatisfierPropertyKind (*s.kind_)),
     value_ (new ::CIAO::Config_Handlers::Any (*s.value_)),
@@ -1135,7 +1141,7 @@ namespace CIAO
     Resource (::XMLSchema::string< char > const& name__,
     ::XMLSchema::string< char > const& resourceType__,
     ::CIAO::Config_Handlers::SatisfierProperty const& property__)
-    :
+    : 
     name_ (new ::XMLSchema::string< char > (name__)),
     resourceType_ (new ::XMLSchema::string< char > (resourceType__)),
     property_ (new ::CIAO::Config_Handlers::SatisfierProperty (property__)),
@@ -1149,6 +1155,7 @@ namespace CIAO
     Resource::
     Resource (::CIAO::Config_Handlers::Resource const& s)
     :
+    XSCRT::Type (), 
     name_ (new ::XMLSchema::string< char > (*s.name_)),
     resourceType_ (new ::XMLSchema::string< char > (*s.resourceType_)),
     property_ (new ::CIAO::Config_Handlers::SatisfierProperty (*s.property_)),
@@ -1241,7 +1248,7 @@ namespace CIAO
     ::XMLSchema::string< char > const& resourceType__,
     ::CIAO::Config_Handlers::Node const& node__,
     ::CIAO::Config_Handlers::SatisfierProperty const& property__)
-    :
+    : 
     name_ (new ::XMLSchema::string< char > (name__)),
     resourceType_ (new ::XMLSchema::string< char > (resourceType__)),
     node_ (new ::CIAO::Config_Handlers::Node (node__)),
@@ -1257,6 +1264,7 @@ namespace CIAO
     SharedResource::
     SharedResource (::CIAO::Config_Handlers::SharedResource const& s)
     :
+    XSCRT::Type (), 
     name_ (new ::XMLSchema::string< char > (*s.name_)),
     resourceType_ (new ::XMLSchema::string< char > (*s.resourceType_)),
     node_ (new ::CIAO::Config_Handlers::Node (*s.node_)),
@@ -1372,7 +1380,7 @@ namespace CIAO
     Requirement (::XMLSchema::string< char > const& resourceType__,
     ::XMLSchema::string< char > const& name__,
     ::CIAO::Config_Handlers::Property const& property__)
-    :
+    : 
     resourceType_ (new ::XMLSchema::string< char > (resourceType__)),
     name_ (new ::XMLSchema::string< char > (name__)),
     property_ (new ::CIAO::Config_Handlers::Property (property__)),
@@ -1386,6 +1394,7 @@ namespace CIAO
     Requirement::
     Requirement (::CIAO::Config_Handlers::Requirement const& s)
     :
+    XSCRT::Type (), 
     resourceType_ (new ::XMLSchema::string< char > (*s.resourceType_)),
     name_ (new ::XMLSchema::string< char > (*s.name_)),
     property_ (new ::CIAO::Config_Handlers::Property (*s.property_)),
@@ -1477,7 +1486,7 @@ namespace CIAO
     ResourceDeploymentDescription (::XMLSchema::string< char > const& requirementName__,
     ::XMLSchema::string< char > const& resourceName__,
     ::CIAO::Config_Handlers::Any const& resourceValue__)
-    :
+    : 
     requirementName_ (new ::XMLSchema::string< char > (requirementName__)),
     resourceName_ (new ::XMLSchema::string< char > (resourceName__)),
     resourceValue_ (new ::CIAO::Config_Handlers::Any (resourceValue__)),
@@ -1491,6 +1500,7 @@ namespace CIAO
     ResourceDeploymentDescription::
     ResourceDeploymentDescription (::CIAO::Config_Handlers::ResourceDeploymentDescription const& s)
     :
+    XSCRT::Type (), 
     requirementName_ (new ::XMLSchema::string< char > (*s.requirementName_)),
     resourceName_ (new ::XMLSchema::string< char > (*s.resourceName_)),
     resourceValue_ (new ::CIAO::Config_Handlers::Any (*s.resourceValue_)),
@@ -1581,7 +1591,7 @@ namespace CIAO
     ArtifactDeploymentDescription::
     ArtifactDeploymentDescription (::XMLSchema::string< char > const& name__,
     ::XMLSchema::string< char > const& node__)
-    :
+    : 
     name_ (new ::XMLSchema::string< char > (name__)),
     node_ (new ::XMLSchema::string< char > (node__)),
     regulator__ ()
@@ -1593,6 +1603,7 @@ namespace CIAO
     ArtifactDeploymentDescription::
     ArtifactDeploymentDescription (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& s)
     :
+    XSCRT::Type (), 
     name_ (new ::XMLSchema::string< char > (*s.name_)),
     node_ (new ::XMLSchema::string< char > (*s.node_)),
     id_ (s.id_.get () ? new ::XMLSchema::ID< char > (*s.id_) : 0),
@@ -2028,7 +2039,7 @@ namespace CIAO
 
     MonolithicDeploymentDescription::
     MonolithicDeploymentDescription (::XMLSchema::string< char > const& name__)
-    :
+    : 
     name_ (new ::XMLSchema::string< char > (name__)),
     regulator__ ()
     {
@@ -2038,6 +2049,7 @@ namespace CIAO
     MonolithicDeploymentDescription::
     MonolithicDeploymentDescription (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& s)
     :
+    XSCRT::Type (), 
     name_ (new ::XMLSchema::string< char > (*s.name_)),
     id_ (s.id_.get () ? new ::XMLSchema::ID< char > (*s.id_) : 0),
     regulator__ ()
@@ -2413,7 +2425,7 @@ namespace CIAO
     ::XMLSchema::string< char > const& requirementName__,
     ::XMLSchema::string< char > const& resourceName__,
     ::CIAO::Config_Handlers::Any const& resourceValue__)
-    :
+    : 
     resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (resourceUsage__)),
     requirementName_ (new ::XMLSchema::string< char > (requirementName__)),
     resourceName_ (new ::XMLSchema::string< char > (resourceName__)),
@@ -2429,6 +2441,7 @@ namespace CIAO
     InstanceResourceDeploymentDescription::
     InstanceResourceDeploymentDescription (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& s)
     :
+    XSCRT::Type (), 
     resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (*s.resourceUsage_)),
     requirementName_ (new ::XMLSchema::string< char > (*s.requirementName_)),
     resourceName_ (new ::XMLSchema::string< char > (*s.resourceName_)),
@@ -2545,7 +2558,7 @@ namespace CIAO
     ::XMLSchema::string< char > const& node__,
     ::XMLSchema::string< char > const& source__,
     ::XMLSchema::IDREF< char > const& implementation__)
-    :
+    : 
     name_ (new ::XMLSchema::string< char > (name__)),
     node_ (new ::XMLSchema::string< char > (node__)),
     source_ (new ::XMLSchema::string< char > (source__)),
@@ -2561,6 +2574,7 @@ namespace CIAO
     InstanceDeploymentDescription::
     InstanceDeploymentDescription (::CIAO::Config_Handlers::InstanceDeploymentDescription const& s)
     :
+    XSCRT::Type (), 
     name_ (new ::XMLSchema::string< char > (*s.name_)),
     node_ (new ::XMLSchema::string< char > (*s.node_)),
     source_ (new ::XMLSchema::string< char > (*s.source_)),
@@ -2894,7 +2908,7 @@ namespace CIAO
     ::XMLSchema::string< char > const& exclusiveUser__,
     ::XMLSchema::string< char > const& optional__,
     ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__)
-    :
+    : 
     name_ (new ::XMLSchema::string< char > (name__)),
     specificType_ (new ::XMLSchema::string< char > (specificType__)),
     supportedType_ (new ::XMLSchema::string< char > (supportedType__)),
@@ -2918,6 +2932,7 @@ namespace CIAO
     ComponentPortDescription::
     ComponentPortDescription (::CIAO::Config_Handlers::ComponentPortDescription const& s)
     :
+    XSCRT::Type (), 
     name_ (new ::XMLSchema::string< char > (*s.name_)),
     specificType_ (new ::XMLSchema::string< char > (*s.specificType_)),
     supportedType_ (new ::XMLSchema::string< char > (*s.supportedType_)),
@@ -3128,7 +3143,7 @@ namespace CIAO
     ComponentPropertyDescription::
     ComponentPropertyDescription (::XMLSchema::string< char > const& name__,
     ::CIAO::Config_Handlers::DataType const& type__)
-    :
+    : 
     name_ (new ::XMLSchema::string< char > (name__)),
     type_ (new ::CIAO::Config_Handlers::DataType (type__)),
     regulator__ ()
@@ -3140,6 +3155,7 @@ namespace CIAO
     ComponentPropertyDescription::
     ComponentPropertyDescription (::CIAO::Config_Handlers::ComponentPropertyDescription const& s)
     :
+    XSCRT::Type (), 
     name_ (new ::XMLSchema::string< char > (*s.name_)),
     type_ (new ::CIAO::Config_Handlers::DataType (*s.type_)),
     regulator__ ()
@@ -3205,7 +3221,7 @@ namespace CIAO
 
     ComponentExternalPortEndpoint::
     ComponentExternalPortEndpoint (::XMLSchema::string< char > const& portName__)
-    :
+    : 
     portName_ (new ::XMLSchema::string< char > (portName__)),
     regulator__ ()
     {
@@ -3215,6 +3231,7 @@ namespace CIAO
     ComponentExternalPortEndpoint::
     ComponentExternalPortEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& s)
     :
+    XSCRT::Type (), 
     portName_ (new ::XMLSchema::string< char > (*s.portName_)),
     regulator__ ()
     {
@@ -3258,7 +3275,7 @@ namespace CIAO
     PlanSubcomponentPortEndpoint (::XMLSchema::string< char > const& portName__,
     ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__,
     ::XMLSchema::IDREF< char > const& instance__)
-    :
+    : 
     portName_ (new ::XMLSchema::string< char > (portName__)),
     kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (kind__)),
     instance_ (new ::XMLSchema::IDREF< char > (instance__)),
@@ -3272,6 +3289,7 @@ namespace CIAO
     PlanSubcomponentPortEndpoint::
     PlanSubcomponentPortEndpoint (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& s)
     :
+    XSCRT::Type (), 
     portName_ (new ::XMLSchema::string< char > (*s.portName_)),
     provider_ (s.provider_.get () ? new ::XMLSchema::string< char > (*s.provider_) : 0),
     kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (*s.kind_)),
@@ -3401,7 +3419,7 @@ namespace CIAO
 
     ExternalReferenceEndpoint::
     ExternalReferenceEndpoint (::XMLSchema::string< char > const& location__)
-    :
+    : 
     location_ (new ::XMLSchema::string< char > (location__)),
     regulator__ ()
     {
@@ -3411,6 +3429,7 @@ namespace CIAO
     ExternalReferenceEndpoint::
     ExternalReferenceEndpoint (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& s)
     :
+    XSCRT::Type (), 
     location_ (new ::XMLSchema::string< char > (*s.location_)),
     regulator__ ()
     {
@@ -3455,7 +3474,7 @@ namespace CIAO
     ::XMLSchema::string< char > const& requirementName__,
     ::XMLSchema::string< char > const& resourceName__,
     ::CIAO::Config_Handlers::Any const& resourceValue__)
-    :
+    : 
     targetName_ (new ::XMLSchema::string< char > (targetName__)),
     requirementName_ (new ::XMLSchema::string< char > (requirementName__)),
     resourceName_ (new ::XMLSchema::string< char > (resourceName__)),
@@ -3471,6 +3490,7 @@ namespace CIAO
     ConnectionResourceDeploymentDescription::
     ConnectionResourceDeploymentDescription (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& s)
     :
+    XSCRT::Type (), 
     targetName_ (new ::XMLSchema::string< char > (*s.targetName_)),
     requirementName_ (new ::XMLSchema::string< char > (*s.requirementName_)),
     resourceName_ (new ::XMLSchema::string< char > (*s.resourceName_)),
@@ -3584,7 +3604,7 @@ namespace CIAO
 
     PlanConnectionDescription::
     PlanConnectionDescription (::XMLSchema::string< char > const& name__)
-    :
+    : 
     name_ (new ::XMLSchema::string< char > (name__)),
     regulator__ ()
     {
@@ -3594,6 +3614,7 @@ namespace CIAO
     PlanConnectionDescription::
     PlanConnectionDescription (::CIAO::Config_Handlers::PlanConnectionDescription const& s)
     :
+    XSCRT::Type (), 
     name_ (new ::XMLSchema::string< char > (*s.name_)),
     source_ (s.source_.get () ? new ::XMLSchema::string< char > (*s.source_) : 0),
     regulator__ ()
@@ -4004,7 +4025,7 @@ namespace CIAO
 
     ImplementationDependency::
     ImplementationDependency (::XMLSchema::string< char > const& requiredType__)
-    :
+    : 
     requiredType_ (new ::XMLSchema::string< char > (requiredType__)),
     regulator__ ()
     {
@@ -4014,6 +4035,7 @@ namespace CIAO
     ImplementationDependency::
     ImplementationDependency (::CIAO::Config_Handlers::ImplementationDependency const& s)
     :
+    XSCRT::Type (), 
     requiredType_ (new ::XMLSchema::string< char > (*s.requiredType_)),
     regulator__ ()
     {
@@ -4057,7 +4079,7 @@ namespace CIAO
     Capability (::XMLSchema::string< char > const& name__,
     ::XMLSchema::string< char > const& resourceType__,
     ::CIAO::Config_Handlers::SatisfierProperty const& property__)
-    :
+    : 
     name_ (new ::XMLSchema::string< char > (name__)),
     resourceType_ (new ::XMLSchema::string< char > (resourceType__)),
     property_ (new ::CIAO::Config_Handlers::SatisfierProperty (property__)),
@@ -4071,6 +4093,7 @@ namespace CIAO
     Capability::
     Capability (::CIAO::Config_Handlers::Capability const& s)
     :
+    XSCRT::Type (), 
     name_ (new ::XMLSchema::string< char > (*s.name_)),
     resourceType_ (new ::XMLSchema::string< char > (*s.resourceType_)),
     property_ (new ::CIAO::Config_Handlers::SatisfierProperty (*s.property_)),
@@ -4165,7 +4188,7 @@ namespace CIAO
     ::XMLSchema::string< char > const& resourceType__,
     ::XMLSchema::string< char > const& name__,
     ::CIAO::Config_Handlers::Property const& property__)
-    :
+    : 
     resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (resourceUsage__)),
     resourcePort_ (new ::XMLSchema::string< char > (resourcePort__)),
     componentPort_ (new ::XMLSchema::string< char > (componentPort__)),
@@ -4185,6 +4208,7 @@ namespace CIAO
     ImplementationRequirement::
     ImplementationRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& s)
     :
+    XSCRT::Type (), 
     resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (*s.resourceUsage_)),
     resourcePort_ (new ::XMLSchema::string< char > (*s.resourcePort_)),
     componentPort_ (new ::XMLSchema::string< char > (*s.componentPort_)),
@@ -4348,7 +4372,7 @@ namespace CIAO
     ComponentPackageReference (::XMLSchema::string< char > const& requiredUUID__,
     ::XMLSchema::string< char > const& requiredName__,
     ::XMLSchema::string< char > const& requiredType__)
-    :
+    : 
     requiredUUID_ (new ::XMLSchema::string< char > (requiredUUID__)),
     requiredName_ (new ::XMLSchema::string< char > (requiredName__)),
     requiredType_ (new ::XMLSchema::string< char > (requiredType__)),
@@ -4362,6 +4386,7 @@ namespace CIAO
     ComponentPackageReference::
     ComponentPackageReference (::CIAO::Config_Handlers::ComponentPackageReference const& s)
     :
+    XSCRT::Type (), 
     requiredUUID_ (new ::XMLSchema::string< char > (*s.requiredUUID_)),
     requiredName_ (new ::XMLSchema::string< char > (*s.requiredName_)),
     requiredType_ (new ::XMLSchema::string< char > (*s.requiredType_)),
@@ -4452,7 +4477,7 @@ namespace CIAO
     SubcomponentPortEndpoint::
     SubcomponentPortEndpoint (::XMLSchema::string< char > const& portName__,
     ::XMLSchema::IDREF< char > const& instance__)
-    :
+    : 
     portName_ (new ::XMLSchema::string< char > (portName__)),
     instance_ (new ::XMLSchema::IDREF< char > (instance__)),
     regulator__ ()
@@ -4464,6 +4489,7 @@ namespace CIAO
     SubcomponentPortEndpoint::
     SubcomponentPortEndpoint (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& s)
     :
+    XSCRT::Type (), 
     portName_ (new ::XMLSchema::string< char > (*s.portName_)),
     instance_ (new ::XMLSchema::IDREF< char > (*s.instance_)),
     regulator__ ()
@@ -4529,7 +4555,7 @@ namespace CIAO
 
     AssemblyConnectionDescription::
     AssemblyConnectionDescription (::XMLSchema::string< char > const& name__)
-    :
+    : 
     name_ (new ::XMLSchema::string< char > (name__)),
     regulator__ ()
     {
@@ -4539,6 +4565,7 @@ namespace CIAO
     AssemblyConnectionDescription::
     AssemblyConnectionDescription (::CIAO::Config_Handlers::AssemblyConnectionDescription const& s)
     :
+    XSCRT::Type (), 
     name_ (new ::XMLSchema::string< char > (*s.name_)),
     deployRequirement_ (s.deployRequirement_.get () ? new ::CIAO::Config_Handlers::Requirement (*s.deployRequirement_) : 0),
     regulator__ ()
@@ -6358,6515 +6385,3 @@ namespace CIAO
   }
 }
 
-#include <XMLSchema/TypeInfo.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace
-    {
-      ::XMLSchema::TypeInfoInitializer < char > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
-
-      struct TCKindTypeInfoInitializer
-      {
-        TCKindTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (TCKind));
-          ::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));
-        }
-      };
-
-      TCKindTypeInfoInitializer TCKindTypeInfoInitializer_;
-
-      struct DataTypeTypeInfoInitializer
-      {
-        DataTypeTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (DataType));
-          ::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));
-        }
-      };
-
-      DataTypeTypeInfoInitializer DataTypeTypeInfoInitializer_;
-
-      struct DataValueTypeInfoInitializer
-      {
-        DataValueTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (DataValue));
-          ::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));
-        }
-      };
-
-      DataValueTypeInfoInitializer DataValueTypeInfoInitializer_;
-
-      struct AnyTypeInfoInitializer
-      {
-        AnyTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (Any));
-          ::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));
-        }
-      };
-
-      AnyTypeInfoInitializer AnyTypeInfoInitializer_;
-
-      struct PropertyTypeInfoInitializer
-      {
-        PropertyTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (Property));
-          ::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));
-        }
-      };
-
-      PropertyTypeInfoInitializer PropertyTypeInfoInitializer_;
-
-      struct NodeTypeInfoInitializer
-      {
-        NodeTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (Node));
-          ::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));
-        }
-      };
-
-      NodeTypeInfoInitializer NodeTypeInfoInitializer_;
-
-      struct SatisfierPropertyKindTypeInfoInitializer
-      {
-        SatisfierPropertyKindTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (SatisfierPropertyKind));
-          ::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));
-        }
-      };
-
-      SatisfierPropertyKindTypeInfoInitializer SatisfierPropertyKindTypeInfoInitializer_;
-
-      struct SatisfierPropertyTypeInfoInitializer
-      {
-        SatisfierPropertyTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (SatisfierProperty));
-          ::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));
-        }
-      };
-
-      SatisfierPropertyTypeInfoInitializer SatisfierPropertyTypeInfoInitializer_;
-
-      struct ResourceTypeInfoInitializer
-      {
-        ResourceTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (Resource));
-          ::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));
-        }
-      };
-
-      ResourceTypeInfoInitializer ResourceTypeInfoInitializer_;
-
-      struct SharedResourceTypeInfoInitializer
-      {
-        SharedResourceTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (SharedResource));
-          ::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));
-        }
-      };
-
-      SharedResourceTypeInfoInitializer SharedResourceTypeInfoInitializer_;
-
-      struct RequirementTypeInfoInitializer
-      {
-        RequirementTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (Requirement));
-          ::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));
-        }
-      };
-
-      RequirementTypeInfoInitializer RequirementTypeInfoInitializer_;
-
-      struct ResourceDeploymentDescriptionTypeInfoInitializer
-      {
-        ResourceDeploymentDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ResourceDeploymentDescription));
-          ::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));
-        }
-      };
-
-      ResourceDeploymentDescriptionTypeInfoInitializer ResourceDeploymentDescriptionTypeInfoInitializer_;
-
-      struct ArtifactDeploymentDescriptionTypeInfoInitializer
-      {
-        ArtifactDeploymentDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ArtifactDeploymentDescription));
-          ::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));
-        }
-      };
-
-      ArtifactDeploymentDescriptionTypeInfoInitializer ArtifactDeploymentDescriptionTypeInfoInitializer_;
-
-      struct MonolithicDeploymentDescriptionTypeInfoInitializer
-      {
-        MonolithicDeploymentDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (MonolithicDeploymentDescription));
-          ::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));
-        }
-      };
-
-      MonolithicDeploymentDescriptionTypeInfoInitializer MonolithicDeploymentDescriptionTypeInfoInitializer_;
-
-      struct ResourceUsageKindTypeInfoInitializer
-      {
-        ResourceUsageKindTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ResourceUsageKind));
-          ::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));
-        }
-      };
-
-      ResourceUsageKindTypeInfoInitializer ResourceUsageKindTypeInfoInitializer_;
-
-      struct InstanceResourceDeploymentDescriptionTypeInfoInitializer
-      {
-        InstanceResourceDeploymentDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (InstanceResourceDeploymentDescription));
-          ::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));
-        }
-      };
-
-      InstanceResourceDeploymentDescriptionTypeInfoInitializer InstanceResourceDeploymentDescriptionTypeInfoInitializer_;
-
-      struct InstanceDeploymentDescriptionTypeInfoInitializer
-      {
-        InstanceDeploymentDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (InstanceDeploymentDescription));
-          ::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));
-        }
-      };
-
-      InstanceDeploymentDescriptionTypeInfoInitializer InstanceDeploymentDescriptionTypeInfoInitializer_;
-
-      struct CCMComponentPortKindTypeInfoInitializer
-      {
-        CCMComponentPortKindTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (CCMComponentPortKind));
-          ::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));
-        }
-      };
-
-      CCMComponentPortKindTypeInfoInitializer CCMComponentPortKindTypeInfoInitializer_;
-
-      struct ComponentPortDescriptionTypeInfoInitializer
-      {
-        ComponentPortDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ComponentPortDescription));
-          ::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));
-        }
-      };
-
-      ComponentPortDescriptionTypeInfoInitializer ComponentPortDescriptionTypeInfoInitializer_;
-
-      struct ComponentPropertyDescriptionTypeInfoInitializer
-      {
-        ComponentPropertyDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ComponentPropertyDescription));
-          ::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));
-        }
-      };
-
-      ComponentPropertyDescriptionTypeInfoInitializer ComponentPropertyDescriptionTypeInfoInitializer_;
-
-      struct ComponentExternalPortEndpointTypeInfoInitializer
-      {
-        ComponentExternalPortEndpointTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ComponentExternalPortEndpoint));
-          ::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));
-        }
-      };
-
-      ComponentExternalPortEndpointTypeInfoInitializer ComponentExternalPortEndpointTypeInfoInitializer_;
-
-      struct PlanSubcomponentPortEndpointTypeInfoInitializer
-      {
-        PlanSubcomponentPortEndpointTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (PlanSubcomponentPortEndpoint));
-          ::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));
-        }
-      };
-
-      PlanSubcomponentPortEndpointTypeInfoInitializer PlanSubcomponentPortEndpointTypeInfoInitializer_;
-
-      struct ExternalReferenceEndpointTypeInfoInitializer
-      {
-        ExternalReferenceEndpointTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ExternalReferenceEndpoint));
-          ::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));
-        }
-      };
-
-      ExternalReferenceEndpointTypeInfoInitializer ExternalReferenceEndpointTypeInfoInitializer_;
-
-      struct ConnectionResourceDeploymentDescriptionTypeInfoInitializer
-      {
-        ConnectionResourceDeploymentDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ConnectionResourceDeploymentDescription));
-          ::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));
-        }
-      };
-
-      ConnectionResourceDeploymentDescriptionTypeInfoInitializer ConnectionResourceDeploymentDescriptionTypeInfoInitializer_;
-
-      struct PlanConnectionDescriptionTypeInfoInitializer
-      {
-        PlanConnectionDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (PlanConnectionDescription));
-          ::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));
-        }
-      };
-
-      PlanConnectionDescriptionTypeInfoInitializer PlanConnectionDescriptionTypeInfoInitializer_;
-
-      struct ImplementationDependencyTypeInfoInitializer
-      {
-        ImplementationDependencyTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ImplementationDependency));
-          ::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));
-        }
-      };
-
-      ImplementationDependencyTypeInfoInitializer ImplementationDependencyTypeInfoInitializer_;
-
-      struct CapabilityTypeInfoInitializer
-      {
-        CapabilityTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (Capability));
-          ::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));
-        }
-      };
-
-      CapabilityTypeInfoInitializer CapabilityTypeInfoInitializer_;
-
-      struct ImplementationRequirementTypeInfoInitializer
-      {
-        ImplementationRequirementTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ImplementationRequirement));
-          ::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));
-        }
-      };
-
-      ImplementationRequirementTypeInfoInitializer ImplementationRequirementTypeInfoInitializer_;
-
-      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 SubcomponentPortEndpointTypeInfoInitializer
-      {
-        SubcomponentPortEndpointTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (SubcomponentPortEndpoint));
-          ::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));
-        }
-      };
-
-      SubcomponentPortEndpointTypeInfoInitializer SubcomponentPortEndpointTypeInfoInitializer_;
-
-      struct AssemblyConnectionDescriptionTypeInfoInitializer
-      {
-        AssemblyConnectionDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (AssemblyConnectionDescription));
-          ::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_;
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      // DataType
-      //
-      //
-
-      void DataType::
-      traverse (Type& o)
-      {
-        pre (o);
-        if (o.kind_p ()) kind (o);
-        else kind_none (o);
-        post (o);
-      }
-
-      void DataType::
-      traverse (Type const& o)
-      {
-        pre (o);
-        if (o.kind_p ()) kind (o);
-        else kind_none (o);
-        post (o);
-      }
-
-      void DataType::
-      pre (Type&)
-      {
-      }
-
-      void DataType::
-      pre (Type const&)
-      {
-      }
-
-      void DataType::
-      kind (Type& o)
-      {
-        dispatch (o.kind ());
-      }
-
-      void DataType::
-      kind (Type const& o)
-      {
-        dispatch (o.kind ());
-      }
-
-      void DataType::
-      kind_none (Type&)
-      {
-      }
-
-      void DataType::
-      kind_none (Type const&)
-      {
-      }
-
-      void DataType::
-      post (Type&)
-      {
-      }
-
-      void DataType::
-      post (Type const&)
-      {
-      }
-
-      // DataValue
-      //
-      //
-
-      void DataValue::
-      traverse (Type& o)
-      {
-        pre (o);
-        if (o.short_p ()) short_ (o);
-        else short_none (o);
-        if (o.long_p ()) long_ (o);
-        else long_none (o);
-        if (o.ushort_p ()) ushort (o);
-        else ushort_none (o);
-        if (o.ulong_p ()) ulong (o);
-        else ulong_none (o);
-        if (o.float_p ()) float_ (o);
-        else float_none (o);
-        if (o.double_p ()) double_ (o);
-        else double_none (o);
-        if (o.boolean_p ()) boolean (o);
-        else boolean_none (o);
-        if (o.octet_p ()) octet (o);
-        else octet_none (o);
-        if (o.objref_p ()) objref (o);
-        else objref_none (o);
-        if (o.enum_p ()) enum_ (o);
-        else enum_none (o);
-        if (o.string_p ()) string (o);
-        else string_none (o);
-        if (o.longlong_p ()) longlong (o);
-        else longlong_none (o);
-        if (o.ulonglong_p ()) ulonglong (o);
-        else ulonglong_none (o);
-        if (o.longdouble_p ()) longdouble (o);
-        else longdouble_none (o);
-        if (o.fixed_p ()) fixed (o);
-        else fixed_none (o);
-        if (o.typecode_p ()) typecode (o);
-        else typecode_none (o);
-        post (o);
-      }
-
-      void DataValue::
-      traverse (Type const& o)
-      {
-        pre (o);
-        if (o.short_p ()) short_ (o);
-        else short_none (o);
-        if (o.long_p ()) long_ (o);
-        else long_none (o);
-        if (o.ushort_p ()) ushort (o);
-        else ushort_none (o);
-        if (o.ulong_p ()) ulong (o);
-        else ulong_none (o);
-        if (o.float_p ()) float_ (o);
-        else float_none (o);
-        if (o.double_p ()) double_ (o);
-        else double_none (o);
-        if (o.boolean_p ()) boolean (o);
-        else boolean_none (o);
-        if (o.octet_p ()) octet (o);
-        else octet_none (o);
-        if (o.objref_p ()) objref (o);
-        else objref_none (o);
-        if (o.enum_p ()) enum_ (o);
-        else enum_none (o);
-        if (o.string_p ()) string (o);
-        else string_none (o);
-        if (o.longlong_p ()) longlong (o);
-        else longlong_none (o);
-        if (o.ulonglong_p ()) ulonglong (o);
-        else ulonglong_none (o);
-        if (o.longdouble_p ()) longdouble (o);
-        else longdouble_none (o);
-        if (o.fixed_p ()) fixed (o);
-        else fixed_none (o);
-        if (o.typecode_p ()) typecode (o);
-        else typecode_none (o);
-        post (o);
-      }
-
-      void DataValue::
-      pre (Type&)
-      {
-      }
-
-      void DataValue::
-      pre (Type const&)
-      {
-      }
-
-      void DataValue::
-      short_ (Type& o)
-      {
-        dispatch (o.short_ ());
-      }
-
-      void DataValue::
-      short_ (Type const& o)
-      {
-        dispatch (o.short_ ());
-      }
-
-      void DataValue::
-      short_none (Type&)
-      {
-      }
-
-      void DataValue::
-      short_none (Type const&)
-      {
-      }
-
-      void DataValue::
-      long_ (Type& o)
-      {
-        dispatch (o.long_ ());
-      }
-
-      void DataValue::
-      long_ (Type const& o)
-      {
-        dispatch (o.long_ ());
-      }
-
-      void DataValue::
-      long_none (Type&)
-      {
-      }
-
-      void DataValue::
-      long_none (Type const&)
-      {
-      }
-
-      void DataValue::
-      ushort (Type& o)
-      {
-        dispatch (o.ushort ());
-      }
-
-      void DataValue::
-      ushort (Type const& o)
-      {
-        dispatch (o.ushort ());
-      }
-
-      void DataValue::
-      ushort_none (Type&)
-      {
-      }
-
-      void DataValue::
-      ushort_none (Type const&)
-      {
-      }
-
-      void DataValue::
-      ulong (Type& o)
-      {
-        dispatch (o.ulong ());
-      }
-
-      void DataValue::
-      ulong (Type const& o)
-      {
-        dispatch (o.ulong ());
-      }
-
-      void DataValue::
-      ulong_none (Type&)
-      {
-      }
-
-      void DataValue::
-      ulong_none (Type const&)
-      {
-      }
-
-      void DataValue::
-      float_ (Type& o)
-      {
-        dispatch (o.float_ ());
-      }
-
-      void DataValue::
-      float_ (Type const& o)
-      {
-        dispatch (o.float_ ());
-      }
-
-      void DataValue::
-      float_none (Type&)
-      {
-      }
-
-      void DataValue::
-      float_none (Type const&)
-      {
-      }
-
-      void DataValue::
-      double_ (Type& o)
-      {
-        dispatch (o.double_ ());
-      }
-
-      void DataValue::
-      double_ (Type const& o)
-      {
-        dispatch (o.double_ ());
-      }
-
-      void DataValue::
-      double_none (Type&)
-      {
-      }
-
-      void DataValue::
-      double_none (Type const&)
-      {
-      }
-
-      void DataValue::
-      boolean (Type& o)
-      {
-        dispatch (o.boolean ());
-      }
-
-      void DataValue::
-      boolean (Type const& o)
-      {
-        dispatch (o.boolean ());
-      }
-
-      void DataValue::
-      boolean_none (Type&)
-      {
-      }
-
-      void DataValue::
-      boolean_none (Type const&)
-      {
-      }
-
-      void DataValue::
-      octet (Type& o)
-      {
-        dispatch (o.octet ());
-      }
-
-      void DataValue::
-      octet (Type const& o)
-      {
-        dispatch (o.octet ());
-      }
-
-      void DataValue::
-      octet_none (Type&)
-      {
-      }
-
-      void DataValue::
-      octet_none (Type const&)
-      {
-      }
-
-      void DataValue::
-      objref (Type& o)
-      {
-        dispatch (o.objref ());
-      }
-
-      void DataValue::
-      objref (Type const& o)
-      {
-        dispatch (o.objref ());
-      }
-
-      void DataValue::
-      objref_none (Type&)
-      {
-      }
-
-      void DataValue::
-      objref_none (Type const&)
-      {
-      }
-
-      void DataValue::
-      enum_ (Type& o)
-      {
-        dispatch (o.enum_ ());
-      }
-
-      void DataValue::
-      enum_ (Type const& o)
-      {
-        dispatch (o.enum_ ());
-      }
-
-      void DataValue::
-      enum_none (Type&)
-      {
-      }
-
-      void DataValue::
-      enum_none (Type const&)
-      {
-      }
-
-      void DataValue::
-      string (Type& o)
-      {
-        dispatch (o.string ());
-      }
-
-      void DataValue::
-      string (Type const& o)
-      {
-        dispatch (o.string ());
-      }
-
-      void DataValue::
-      string_none (Type&)
-      {
-      }
-
-      void DataValue::
-      string_none (Type const&)
-      {
-      }
-
-      void DataValue::
-      longlong (Type& o)
-      {
-        dispatch (o.longlong ());
-      }
-
-      void DataValue::
-      longlong (Type const& o)
-      {
-        dispatch (o.longlong ());
-      }
-
-      void DataValue::
-      longlong_none (Type&)
-      {
-      }
-
-      void DataValue::
-      longlong_none (Type const&)
-      {
-      }
-
-      void DataValue::
-      ulonglong (Type& o)
-      {
-        dispatch (o.ulonglong ());
-      }
-
-      void DataValue::
-      ulonglong (Type const& o)
-      {
-        dispatch (o.ulonglong ());
-      }
-
-      void DataValue::
-      ulonglong_none (Type&)
-      {
-      }
-
-      void DataValue::
-      ulonglong_none (Type const&)
-      {
-      }
-
-      void DataValue::
-      longdouble (Type& o)
-      {
-        dispatch (o.longdouble ());
-      }
-
-      void DataValue::
-      longdouble (Type const& o)
-      {
-        dispatch (o.longdouble ());
-      }
-
-      void DataValue::
-      longdouble_none (Type&)
-      {
-      }
-
-      void DataValue::
-      longdouble_none (Type const&)
-      {
-      }
-
-      void DataValue::
-      fixed (Type& o)
-      {
-        dispatch (o.fixed ());
-      }
-
-      void DataValue::
-      fixed (Type const& o)
-      {
-        dispatch (o.fixed ());
-      }
-
-      void DataValue::
-      fixed_none (Type&)
-      {
-      }
-
-      void DataValue::
-      fixed_none (Type const&)
-      {
-      }
-
-      void DataValue::
-      typecode (Type& o)
-      {
-        dispatch (o.typecode ());
-      }
-
-      void DataValue::
-      typecode (Type const& o)
-      {
-        dispatch (o.typecode ());
-      }
-
-      void DataValue::
-      typecode_none (Type&)
-      {
-      }
-
-      void DataValue::
-      typecode_none (Type const&)
-      {
-      }
-
-      void DataValue::
-      post (Type&)
-      {
-      }
-
-      void DataValue::
-      post (Type const&)
-      {
-      }
-
-      // Any
-      //
-      //
-
-      void Any::
-      traverse (Type& o)
-      {
-        pre (o);
-        type (o);
-        value (o);
-        post (o);
-      }
-
-      void Any::
-      traverse (Type const& o)
-      {
-        pre (o);
-        type (o);
-        value (o);
-        post (o);
-      }
-
-      void Any::
-      pre (Type&)
-      {
-      }
-
-      void Any::
-      pre (Type const&)
-      {
-      }
-
-      void Any::
-      type (Type& o)
-      {
-        dispatch (o.type ());
-      }
-
-      void Any::
-      type (Type const& o)
-      {
-        dispatch (o.type ());
-      }
-
-      void Any::
-      value (Type& o)
-      {
-        dispatch (o.value ());
-      }
-
-      void Any::
-      value (Type const& o)
-      {
-        dispatch (o.value ());
-      }
-
-      void Any::
-      post (Type&)
-      {
-      }
-
-      void Any::
-      post (Type const&)
-      {
-      }
-
-      // Property
-      //
-      //
-
-      void Property::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        value (o);
-        post (o);
-      }
-
-      void Property::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        value (o);
-        post (o);
-      }
-
-      void Property::
-      pre (Type&)
-      {
-      }
-
-      void Property::
-      pre (Type const&)
-      {
-      }
-
-      void Property::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void Property::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void Property::
-      value (Type& o)
-      {
-        dispatch (o.value ());
-      }
-
-      void Property::
-      value (Type const& o)
-      {
-        dispatch (o.value ());
-      }
-
-      void Property::
-      post (Type&)
-      {
-      }
-
-      void Property::
-      post (Type const&)
-      {
-      }
-
-      // Node
-      //
-      //
-
-      void Node::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        label (o);
-        post (o);
-      }
-
-      void Node::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        label (o);
-        post (o);
-      }
-
-      void Node::
-      pre (Type&)
-      {
-      }
-
-      void Node::
-      pre (Type const&)
-      {
-      }
-
-      void Node::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void Node::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void Node::
-      label (Type& o)
-      {
-        dispatch (o.label ());
-      }
-
-      void Node::
-      label (Type const& o)
-      {
-        dispatch (o.label ());
-      }
-
-      void Node::
-      post (Type&)
-      {
-      }
-
-      void Node::
-      post (Type const&)
-      {
-      }
-
-      // SatisfierProperty
-      //
-      //
-
-      void SatisfierProperty::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        kind (o);
-        value (o);
-        post (o);
-      }
-
-      void SatisfierProperty::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        kind (o);
-        value (o);
-        post (o);
-      }
-
-      void SatisfierProperty::
-      pre (Type&)
-      {
-      }
-
-      void SatisfierProperty::
-      pre (Type const&)
-      {
-      }
-
-      void SatisfierProperty::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void SatisfierProperty::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void SatisfierProperty::
-      kind (Type& o)
-      {
-        dispatch (o.kind ());
-      }
-
-      void SatisfierProperty::
-      kind (Type const& o)
-      {
-        dispatch (o.kind ());
-      }
-
-      void SatisfierProperty::
-      value (Type& o)
-      {
-        dispatch (o.value ());
-      }
-
-      void SatisfierProperty::
-      value (Type const& o)
-      {
-        dispatch (o.value ());
-      }
-
-      void SatisfierProperty::
-      post (Type&)
-      {
-      }
-
-      void SatisfierProperty::
-      post (Type const&)
-      {
-      }
-
-      // Resource
-      //
-      //
-
-      void Resource::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        resourceType (o);
-        property (o);
-        post (o);
-      }
-
-      void Resource::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        resourceType (o);
-        property (o);
-        post (o);
-      }
-
-      void Resource::
-      pre (Type&)
-      {
-      }
-
-      void Resource::
-      pre (Type const&)
-      {
-      }
-
-      void Resource::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void Resource::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void Resource::
-      resourceType (Type& o)
-      {
-        dispatch (o.resourceType ());
-      }
-
-      void Resource::
-      resourceType (Type const& o)
-      {
-        dispatch (o.resourceType ());
-      }
-
-      void Resource::
-      property (Type& o)
-      {
-        dispatch (o.property ());
-      }
-
-      void Resource::
-      property (Type const& o)
-      {
-        dispatch (o.property ());
-      }
-
-      void Resource::
-      post (Type&)
-      {
-      }
-
-      void Resource::
-      post (Type const&)
-      {
-      }
-
-      // SharedResource
-      //
-      //
-
-      void SharedResource::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        resourceType (o);
-        node (o);
-        property (o);
-        post (o);
-      }
-
-      void SharedResource::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        resourceType (o);
-        node (o);
-        property (o);
-        post (o);
-      }
-
-      void SharedResource::
-      pre (Type&)
-      {
-      }
-
-      void SharedResource::
-      pre (Type const&)
-      {
-      }
-
-      void SharedResource::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void SharedResource::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void SharedResource::
-      resourceType (Type& o)
-      {
-        dispatch (o.resourceType ());
-      }
-
-      void SharedResource::
-      resourceType (Type const& o)
-      {
-        dispatch (o.resourceType ());
-      }
-
-      void SharedResource::
-      node (Type& o)
-      {
-        dispatch (o.node ());
-      }
-
-      void SharedResource::
-      node (Type const& o)
-      {
-        dispatch (o.node ());
-      }
-
-      void SharedResource::
-      property (Type& o)
-      {
-        dispatch (o.property ());
-      }
-
-      void SharedResource::
-      property (Type const& o)
-      {
-        dispatch (o.property ());
-      }
-
-      void SharedResource::
-      post (Type&)
-      {
-      }
-
-      void SharedResource::
-      post (Type const&)
-      {
-      }
-
-      // Requirement
-      //
-      //
-
-      void Requirement::
-      traverse (Type& o)
-      {
-        pre (o);
-        resourceType (o);
-        name (o);
-        property (o);
-        post (o);
-      }
-
-      void Requirement::
-      traverse (Type const& o)
-      {
-        pre (o);
-        resourceType (o);
-        name (o);
-        property (o);
-        post (o);
-      }
-
-      void Requirement::
-      pre (Type&)
-      {
-      }
-
-      void Requirement::
-      pre (Type const&)
-      {
-      }
-
-      void Requirement::
-      resourceType (Type& o)
-      {
-        dispatch (o.resourceType ());
-      }
-
-      void Requirement::
-      resourceType (Type const& o)
-      {
-        dispatch (o.resourceType ());
-      }
-
-      void Requirement::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void Requirement::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void Requirement::
-      property (Type& o)
-      {
-        dispatch (o.property ());
-      }
-
-      void Requirement::
-      property (Type const& o)
-      {
-        dispatch (o.property ());
-      }
-
-      void Requirement::
-      post (Type&)
-      {
-      }
-
-      void Requirement::
-      post (Type const&)
-      {
-      }
-
-      // ResourceDeploymentDescription
-      //
-      //
-
-      void ResourceDeploymentDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        requirementName (o);
-        resourceName (o);
-        resourceValue (o);
-        post (o);
-      }
-
-      void ResourceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        requirementName (o);
-        resourceName (o);
-        resourceValue (o);
-        post (o);
-      }
-
-      void ResourceDeploymentDescription::
-      pre (Type&)
-      {
-      }
-
-      void ResourceDeploymentDescription::
-      pre (Type const&)
-      {
-      }
-
-      void ResourceDeploymentDescription::
-      requirementName (Type& o)
-      {
-        dispatch (o.requirementName ());
-      }
-
-      void ResourceDeploymentDescription::
-      requirementName (Type const& o)
-      {
-        dispatch (o.requirementName ());
-      }
-
-      void ResourceDeploymentDescription::
-      resourceName (Type& o)
-      {
-        dispatch (o.resourceName ());
-      }
-
-      void ResourceDeploymentDescription::
-      resourceName (Type const& o)
-      {
-        dispatch (o.resourceName ());
-      }
-
-      void ResourceDeploymentDescription::
-      resourceValue (Type& o)
-      {
-        dispatch (o.resourceValue ());
-      }
-
-      void ResourceDeploymentDescription::
-      resourceValue (Type const& o)
-      {
-        dispatch (o.resourceValue ());
-      }
-
-      void ResourceDeploymentDescription::
-      post (Type&)
-      {
-      }
-
-      void ResourceDeploymentDescription::
-      post (Type const&)
-      {
-      }
-
-      // ArtifactDeploymentDescription
-      //
-      //
-
-      void ArtifactDeploymentDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        source (o);
-        node (o);
-        location (o);
-        execParameter (o);
-        deployRequirement (o);
-        deployedResource (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
-        post (o);
-      }
-
-      void ArtifactDeploymentDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        source (o);
-        node (o);
-        location (o);
-        execParameter (o);
-        deployRequirement (o);
-        deployedResource (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
-        post (o);
-      }
-
-      void ArtifactDeploymentDescription::
-      pre (Type&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      pre (Type const&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void ArtifactDeploymentDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void ArtifactDeploymentDescription::
-      source (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::source_iterator b (o.begin_source()), e (o.end_source());
-
-        if (b != e)
-        {
-          source_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) source_next (o);
-          }
-
-          source_post (o);
-        }
-      }
-
-      void ArtifactDeploymentDescription::
-      source (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::source_const_iterator b (o.begin_source()), e (o.end_source());
-
-        if (b != e)
-        {
-          source_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) source_next (o);
-          }
-
-          source_post (o);
-        }
-      }
-
-      void ArtifactDeploymentDescription::
-      source_pre (Type&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      source_pre (Type const&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      source_next (Type&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      source_next (Type const&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      source_post (Type&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      source_post (Type const&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      node (Type& o)
-      {
-        dispatch (o.node ());
-      }
-
-      void ArtifactDeploymentDescription::
-      node (Type const& o)
-      {
-        dispatch (o.node ());
-      }
-
-      void ArtifactDeploymentDescription::
-      location (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::location_iterator b (o.begin_location()), e (o.end_location());
-
-        if (b != e)
-        {
-          location_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) location_next (o);
-          }
-
-          location_post (o);
-        }
-      }
-
-      void ArtifactDeploymentDescription::
-      location (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::location_const_iterator b (o.begin_location()), e (o.end_location());
-
-        if (b != e)
-        {
-          location_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) location_next (o);
-          }
-
-          location_post (o);
-        }
-      }
-
-      void ArtifactDeploymentDescription::
-      location_pre (Type&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      location_pre (Type const&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      location_next (Type&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      location_next (Type const&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      location_post (Type&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      location_post (Type const&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      execParameter (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter());
-
-        if (b != e)
-        {
-          execParameter_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) execParameter_next (o);
-          }
-
-          execParameter_post (o);
-        }
-
-        else execParameter_none (o);
-      }
-
-      void ArtifactDeploymentDescription::
-      execParameter (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::execParameter_const_iterator b (o.begin_execParameter()), e (o.end_execParameter());
-
-        if (b != e)
-        {
-          execParameter_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) execParameter_next (o);
-          }
-
-          execParameter_post (o);
-        }
-
-        else execParameter_none (o);
-      }
-
-      void ArtifactDeploymentDescription::
-      execParameter_pre (Type&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      execParameter_pre (Type const&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      execParameter_next (Type&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      execParameter_next (Type const&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      execParameter_post (Type&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      execParameter_post (Type const&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      execParameter_none (Type&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      execParameter_none (Type const&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      deployRequirement (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
-
-        if (b != e)
-        {
-          deployRequirement_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) deployRequirement_next (o);
-          }
-
-          deployRequirement_post (o);
-        }
-
-        else deployRequirement_none (o);
-      }
-
-      void ArtifactDeploymentDescription::
-      deployRequirement (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
-
-        if (b != e)
-        {
-          deployRequirement_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) deployRequirement_next (o);
-          }
-
-          deployRequirement_post (o);
-        }
-
-        else deployRequirement_none (o);
-      }
-
-      void ArtifactDeploymentDescription::
-      deployRequirement_pre (Type&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      deployRequirement_pre (Type const&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      deployRequirement_next (Type&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      deployRequirement_next (Type const&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      deployRequirement_post (Type&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      deployRequirement_post (Type const&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      deployRequirement_none (Type&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      deployRequirement_none (Type const&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      deployedResource (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
-
-        if (b != e)
-        {
-          deployedResource_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) deployedResource_next (o);
-          }
-
-          deployedResource_post (o);
-        }
-
-        else deployedResource_none (o);
-      }
-
-      void ArtifactDeploymentDescription::
-      deployedResource (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ArtifactDeploymentDescription::Type::deployedResource_const_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
-
-        if (b != e)
-        {
-          deployedResource_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) deployedResource_next (o);
-          }
-
-          deployedResource_post (o);
-        }
-
-        else deployedResource_none (o);
-      }
-
-      void ArtifactDeploymentDescription::
-      deployedResource_pre (Type&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      deployedResource_pre (Type const&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      deployedResource_next (Type&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      deployedResource_next (Type const&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      deployedResource_post (Type&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      deployedResource_post (Type const&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      deployedResource_none (Type&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      deployedResource_none (Type const&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      id (Type& o)
-      {
-        dispatch (o.id ());
-      }
-
-      void ArtifactDeploymentDescription::
-      id (Type const& o)
-      {
-        dispatch (o.id ());
-      }
-
-      void ArtifactDeploymentDescription::
-      id_none (Type&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      id_none (Type const&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      post (Type&)
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      post (Type const&)
-      {
-      }
-
-      // MonolithicDeploymentDescription
-      //
-      //
-
-      void MonolithicDeploymentDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        source (o);
-        artifact (o);
-        execParameter (o);
-        deployRequirement (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
-        post (o);
-      }
-
-      void MonolithicDeploymentDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        source (o);
-        artifact (o);
-        execParameter (o);
-        deployRequirement (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
-        post (o);
-      }
-
-      void MonolithicDeploymentDescription::
-      pre (Type&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      pre (Type const&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void MonolithicDeploymentDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void MonolithicDeploymentDescription::
-      source (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicDeploymentDescription::Type::source_iterator b (o.begin_source()), e (o.end_source());
-
-        if (b != e)
-        {
-          source_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) source_next (o);
-          }
-
-          source_post (o);
-        }
-      }
-
-      void MonolithicDeploymentDescription::
-      source (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicDeploymentDescription::Type::source_const_iterator b (o.begin_source()), e (o.end_source());
-
-        if (b != e)
-        {
-          source_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) source_next (o);
-          }
-
-          source_post (o);
-        }
-      }
-
-      void MonolithicDeploymentDescription::
-      source_pre (Type&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      source_pre (Type const&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      source_next (Type&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      source_next (Type const&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      source_post (Type&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      source_post (Type const&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      artifact (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicDeploymentDescription::Type::artifact_iterator b (o.begin_artifact()), e (o.end_artifact());
-
-        if (b != e)
-        {
-          artifact_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) artifact_next (o);
-          }
-
-          artifact_post (o);
-        }
-      }
-
-      void MonolithicDeploymentDescription::
-      artifact (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicDeploymentDescription::Type::artifact_const_iterator b (o.begin_artifact()), e (o.end_artifact());
-
-        if (b != e)
-        {
-          artifact_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) artifact_next (o);
-          }
-
-          artifact_post (o);
-        }
-      }
-
-      void MonolithicDeploymentDescription::
-      artifact_pre (Type&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      artifact_pre (Type const&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      artifact_next (Type&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      artifact_next (Type const&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      artifact_post (Type&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      artifact_post (Type const&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      execParameter (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicDeploymentDescription::Type::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter());
-
-        if (b != e)
-        {
-          execParameter_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) execParameter_next (o);
-          }
-
-          execParameter_post (o);
-        }
-      }
-
-      void MonolithicDeploymentDescription::
-      execParameter (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicDeploymentDescription::Type::execParameter_const_iterator b (o.begin_execParameter()), e (o.end_execParameter());
-
-        if (b != e)
-        {
-          execParameter_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) execParameter_next (o);
-          }
-
-          execParameter_post (o);
-        }
-      }
-
-      void MonolithicDeploymentDescription::
-      execParameter_pre (Type&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      execParameter_pre (Type const&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      execParameter_next (Type&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      execParameter_next (Type const&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      execParameter_post (Type&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      execParameter_post (Type const&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      deployRequirement (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicDeploymentDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
-
-        if (b != e)
-        {
-          deployRequirement_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) deployRequirement_next (o);
-          }
-
-          deployRequirement_post (o);
-        }
-      }
-
-      void MonolithicDeploymentDescription::
-      deployRequirement (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicDeploymentDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
-
-        if (b != e)
-        {
-          deployRequirement_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) deployRequirement_next (o);
-          }
-
-          deployRequirement_post (o);
-        }
-      }
-
-      void MonolithicDeploymentDescription::
-      deployRequirement_pre (Type&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      deployRequirement_pre (Type const&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      deployRequirement_next (Type&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      deployRequirement_next (Type const&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      deployRequirement_post (Type&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      deployRequirement_post (Type const&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      id (Type& o)
-      {
-        dispatch (o.id ());
-      }
-
-      void MonolithicDeploymentDescription::
-      id (Type const& o)
-      {
-        dispatch (o.id ());
-      }
-
-      void MonolithicDeploymentDescription::
-      id_none (Type&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      id_none (Type const&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      post (Type&)
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      post (Type const&)
-      {
-      }
-
-      // InstanceResourceDeploymentDescription
-      //
-      //
-
-      void InstanceResourceDeploymentDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        resourceUsage (o);
-        requirementName (o);
-        resourceName (o);
-        resourceValue (o);
-        post (o);
-      }
-
-      void InstanceResourceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        resourceUsage (o);
-        requirementName (o);
-        resourceName (o);
-        resourceValue (o);
-        post (o);
-      }
-
-      void InstanceResourceDeploymentDescription::
-      pre (Type&)
-      {
-      }
-
-      void InstanceResourceDeploymentDescription::
-      pre (Type const&)
-      {
-      }
-
-      void InstanceResourceDeploymentDescription::
-      resourceUsage (Type& o)
-      {
-        dispatch (o.resourceUsage ());
-      }
-
-      void InstanceResourceDeploymentDescription::
-      resourceUsage (Type const& o)
-      {
-        dispatch (o.resourceUsage ());
-      }
-
-      void InstanceResourceDeploymentDescription::
-      requirementName (Type& o)
-      {
-        dispatch (o.requirementName ());
-      }
-
-      void InstanceResourceDeploymentDescription::
-      requirementName (Type const& o)
-      {
-        dispatch (o.requirementName ());
-      }
-
-      void InstanceResourceDeploymentDescription::
-      resourceName (Type& o)
-      {
-        dispatch (o.resourceName ());
-      }
-
-      void InstanceResourceDeploymentDescription::
-      resourceName (Type const& o)
-      {
-        dispatch (o.resourceName ());
-      }
-
-      void InstanceResourceDeploymentDescription::
-      resourceValue (Type& o)
-      {
-        dispatch (o.resourceValue ());
-      }
-
-      void InstanceResourceDeploymentDescription::
-      resourceValue (Type const& o)
-      {
-        dispatch (o.resourceValue ());
-      }
-
-      void InstanceResourceDeploymentDescription::
-      post (Type&)
-      {
-      }
-
-      void InstanceResourceDeploymentDescription::
-      post (Type const&)
-      {
-      }
-
-      // InstanceDeploymentDescription
-      //
-      //
-
-      void InstanceDeploymentDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        node (o);
-        source (o);
-        implementation (o);
-        configProperty (o);
-        if (o.deployedResource_p ()) deployedResource (o);
-        else deployedResource_none (o);
-        if (o.deployedSharedResource_p ()) deployedSharedResource (o);
-        else deployedSharedResource_none (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
-        post (o);
-      }
-
-      void InstanceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        node (o);
-        source (o);
-        implementation (o);
-        configProperty (o);
-        if (o.deployedResource_p ()) deployedResource (o);
-        else deployedResource_none (o);
-        if (o.deployedSharedResource_p ()) deployedSharedResource (o);
-        else deployedSharedResource_none (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
-        post (o);
-      }
-
-      void InstanceDeploymentDescription::
-      pre (Type&)
-      {
-      }
-
-      void InstanceDeploymentDescription::
-      pre (Type const&)
-      {
-      }
-
-      void InstanceDeploymentDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void InstanceDeploymentDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void InstanceDeploymentDescription::
-      node (Type& o)
-      {
-        dispatch (o.node ());
-      }
-
-      void InstanceDeploymentDescription::
-      node (Type const& o)
-      {
-        dispatch (o.node ());
-      }
-
-      void InstanceDeploymentDescription::
-      source (Type& o)
-      {
-        dispatch (o.source ());
-      }
-
-      void InstanceDeploymentDescription::
-      source (Type const& o)
-      {
-        dispatch (o.source ());
-      }
-
-      void InstanceDeploymentDescription::
-      implementation (Type& o)
-      {
-        dispatch (o.implementation ());
-      }
-
-      void InstanceDeploymentDescription::
-      implementation (Type const& o)
-      {
-        dispatch (o.implementation ());
-      }
-
-      void InstanceDeploymentDescription::
-      configProperty (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        InstanceDeploymentDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty());
-
-        if (b != e)
-        {
-          configProperty_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) configProperty_next (o);
-          }
-
-          configProperty_post (o);
-        }
-
-        else configProperty_none (o);
-      }
-
-      void InstanceDeploymentDescription::
-      configProperty (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        InstanceDeploymentDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty());
-
-        if (b != e)
-        {
-          configProperty_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) configProperty_next (o);
-          }
-
-          configProperty_post (o);
-        }
-
-        else configProperty_none (o);
-      }
-
-      void InstanceDeploymentDescription::
-      configProperty_pre (Type&)
-      {
-      }
-
-      void InstanceDeploymentDescription::
-      configProperty_pre (Type const&)
-      {
-      }
-
-      void InstanceDeploymentDescription::
-      configProperty_next (Type&)
-      {
-      }
-
-      void InstanceDeploymentDescription::
-      configProperty_next (Type const&)
-      {
-      }
-
-      void InstanceDeploymentDescription::
-      configProperty_post (Type&)
-      {
-      }
-
-      void InstanceDeploymentDescription::
-      configProperty_post (Type const&)
-      {
-      }
-
-      void InstanceDeploymentDescription::
-      configProperty_none (Type&)
-      {
-      }
-
-      void InstanceDeploymentDescription::
-      configProperty_none (Type const&)
-      {
-      }
-
-      void InstanceDeploymentDescription::
-      deployedResource (Type& o)
-      {
-        dispatch (o.deployedResource ());
-      }
-
-      void InstanceDeploymentDescription::
-      deployedResource (Type const& o)
-      {
-        dispatch (o.deployedResource ());
-      }
-
-      void InstanceDeploymentDescription::
-      deployedResource_none (Type&)
-      {
-      }
-
-      void InstanceDeploymentDescription::
-      deployedResource_none (Type const&)
-      {
-      }
-
-      void InstanceDeploymentDescription::
-      deployedSharedResource (Type& o)
-      {
-        dispatch (o.deployedSharedResource ());
-      }
-
-      void InstanceDeploymentDescription::
-      deployedSharedResource (Type const& o)
-      {
-        dispatch (o.deployedSharedResource ());
-      }
-
-      void InstanceDeploymentDescription::
-      deployedSharedResource_none (Type&)
-      {
-      }
-
-      void InstanceDeploymentDescription::
-      deployedSharedResource_none (Type const&)
-      {
-      }
-
-      void InstanceDeploymentDescription::
-      id (Type& o)
-      {
-        dispatch (o.id ());
-      }
-
-      void InstanceDeploymentDescription::
-      id (Type const& o)
-      {
-        dispatch (o.id ());
-      }
-
-      void InstanceDeploymentDescription::
-      id_none (Type&)
-      {
-      }
-
-      void InstanceDeploymentDescription::
-      id_none (Type const&)
-      {
-      }
-
-      void InstanceDeploymentDescription::
-      post (Type&)
-      {
-      }
-
-      void InstanceDeploymentDescription::
-      post (Type const&)
-      {
-      }
-
-      // ComponentPortDescription
-      //
-      //
-
-      void ComponentPortDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        specificType (o);
-        supportedType (o);
-        provider (o);
-        exclusiveProvider (o);
-        exclusiveUser (o);
-        optional (o);
-        kind (o);
-        post (o);
-      }
-
-      void ComponentPortDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        specificType (o);
-        supportedType (o);
-        provider (o);
-        exclusiveProvider (o);
-        exclusiveUser (o);
-        optional (o);
-        kind (o);
-        post (o);
-      }
-
-      void ComponentPortDescription::
-      pre (Type&)
-      {
-      }
-
-      void ComponentPortDescription::
-      pre (Type const&)
-      {
-      }
-
-      void ComponentPortDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void ComponentPortDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void ComponentPortDescription::
-      specificType (Type& o)
-      {
-        dispatch (o.specificType ());
-      }
-
-      void ComponentPortDescription::
-      specificType (Type const& o)
-      {
-        dispatch (o.specificType ());
-      }
-
-      void ComponentPortDescription::
-      supportedType (Type& o)
-      {
-        dispatch (o.supportedType ());
-      }
-
-      void ComponentPortDescription::
-      supportedType (Type const& o)
-      {
-        dispatch (o.supportedType ());
-      }
-
-      void ComponentPortDescription::
-      provider (Type& o)
-      {
-        dispatch (o.provider ());
-      }
-
-      void ComponentPortDescription::
-      provider (Type const& o)
-      {
-        dispatch (o.provider ());
-      }
-
-      void ComponentPortDescription::
-      exclusiveProvider (Type& o)
-      {
-        dispatch (o.exclusiveProvider ());
-      }
-
-      void ComponentPortDescription::
-      exclusiveProvider (Type const& o)
-      {
-        dispatch (o.exclusiveProvider ());
-      }
-
-      void ComponentPortDescription::
-      exclusiveUser (Type& o)
-      {
-        dispatch (o.exclusiveUser ());
-      }
-
-      void ComponentPortDescription::
-      exclusiveUser (Type const& o)
-      {
-        dispatch (o.exclusiveUser ());
-      }
-
-      void ComponentPortDescription::
-      optional (Type& o)
-      {
-        dispatch (o.optional ());
-      }
-
-      void ComponentPortDescription::
-      optional (Type const& o)
-      {
-        dispatch (o.optional ());
-      }
-
-      void ComponentPortDescription::
-      kind (Type& o)
-      {
-        dispatch (o.kind ());
-      }
-
-      void ComponentPortDescription::
-      kind (Type const& o)
-      {
-        dispatch (o.kind ());
-      }
-
-      void ComponentPortDescription::
-      post (Type&)
-      {
-      }
-
-      void ComponentPortDescription::
-      post (Type const&)
-      {
-      }
-
-      // ComponentPropertyDescription
-      //
-      //
-
-      void ComponentPropertyDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        type (o);
-        post (o);
-      }
-
-      void ComponentPropertyDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        type (o);
-        post (o);
-      }
-
-      void ComponentPropertyDescription::
-      pre (Type&)
-      {
-      }
-
-      void ComponentPropertyDescription::
-      pre (Type const&)
-      {
-      }
-
-      void ComponentPropertyDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void ComponentPropertyDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void ComponentPropertyDescription::
-      type (Type& o)
-      {
-        dispatch (o.type ());
-      }
-
-      void ComponentPropertyDescription::
-      type (Type const& o)
-      {
-        dispatch (o.type ());
-      }
-
-      void ComponentPropertyDescription::
-      post (Type&)
-      {
-      }
-
-      void ComponentPropertyDescription::
-      post (Type const&)
-      {
-      }
-
-      // ComponentExternalPortEndpoint
-      //
-      //
-
-      void ComponentExternalPortEndpoint::
-      traverse (Type& o)
-      {
-        pre (o);
-        portName (o);
-        post (o);
-      }
-
-      void ComponentExternalPortEndpoint::
-      traverse (Type const& o)
-      {
-        pre (o);
-        portName (o);
-        post (o);
-      }
-
-      void ComponentExternalPortEndpoint::
-      pre (Type&)
-      {
-      }
-
-      void ComponentExternalPortEndpoint::
-      pre (Type const&)
-      {
-      }
-
-      void ComponentExternalPortEndpoint::
-      portName (Type& o)
-      {
-        dispatch (o.portName ());
-      }
-
-      void ComponentExternalPortEndpoint::
-      portName (Type const& o)
-      {
-        dispatch (o.portName ());
-      }
-
-      void ComponentExternalPortEndpoint::
-      post (Type&)
-      {
-      }
-
-      void ComponentExternalPortEndpoint::
-      post (Type const&)
-      {
-      }
-
-      // PlanSubcomponentPortEndpoint
-      //
-      //
-
-      void PlanSubcomponentPortEndpoint::
-      traverse (Type& o)
-      {
-        pre (o);
-        portName (o);
-        if (o.provider_p ()) provider (o);
-        else provider_none (o);
-        kind (o);
-        instance (o);
-        post (o);
-      }
-
-      void PlanSubcomponentPortEndpoint::
-      traverse (Type const& o)
-      {
-        pre (o);
-        portName (o);
-        if (o.provider_p ()) provider (o);
-        else provider_none (o);
-        kind (o);
-        instance (o);
-        post (o);
-      }
-
-      void PlanSubcomponentPortEndpoint::
-      pre (Type&)
-      {
-      }
-
-      void PlanSubcomponentPortEndpoint::
-      pre (Type const&)
-      {
-      }
-
-      void PlanSubcomponentPortEndpoint::
-      portName (Type& o)
-      {
-        dispatch (o.portName ());
-      }
-
-      void PlanSubcomponentPortEndpoint::
-      portName (Type const& o)
-      {
-        dispatch (o.portName ());
-      }
-
-      void PlanSubcomponentPortEndpoint::
-      provider (Type& o)
-      {
-        dispatch (o.provider ());
-      }
-
-      void PlanSubcomponentPortEndpoint::
-      provider (Type const& o)
-      {
-        dispatch (o.provider ());
-      }
-
-      void PlanSubcomponentPortEndpoint::
-      provider_none (Type&)
-      {
-      }
-
-      void PlanSubcomponentPortEndpoint::
-      provider_none (Type const&)
-      {
-      }
-
-      void PlanSubcomponentPortEndpoint::
-      kind (Type& o)
-      {
-        dispatch (o.kind ());
-      }
-
-      void PlanSubcomponentPortEndpoint::
-      kind (Type const& o)
-      {
-        dispatch (o.kind ());
-      }
-
-      void PlanSubcomponentPortEndpoint::
-      instance (Type& o)
-      {
-        dispatch (o.instance ());
-      }
-
-      void PlanSubcomponentPortEndpoint::
-      instance (Type const& o)
-      {
-        dispatch (o.instance ());
-      }
-
-      void PlanSubcomponentPortEndpoint::
-      post (Type&)
-      {
-      }
-
-      void PlanSubcomponentPortEndpoint::
-      post (Type const&)
-      {
-      }
-
-      // ExternalReferenceEndpoint
-      //
-      //
-
-      void ExternalReferenceEndpoint::
-      traverse (Type& o)
-      {
-        pre (o);
-        location (o);
-        post (o);
-      }
-
-      void ExternalReferenceEndpoint::
-      traverse (Type const& o)
-      {
-        pre (o);
-        location (o);
-        post (o);
-      }
-
-      void ExternalReferenceEndpoint::
-      pre (Type&)
-      {
-      }
-
-      void ExternalReferenceEndpoint::
-      pre (Type const&)
-      {
-      }
-
-      void ExternalReferenceEndpoint::
-      location (Type& o)
-      {
-        dispatch (o.location ());
-      }
-
-      void ExternalReferenceEndpoint::
-      location (Type const& o)
-      {
-        dispatch (o.location ());
-      }
-
-      void ExternalReferenceEndpoint::
-      post (Type&)
-      {
-      }
-
-      void ExternalReferenceEndpoint::
-      post (Type const&)
-      {
-      }
-
-      // ConnectionResourceDeploymentDescription
-      //
-      //
-
-      void ConnectionResourceDeploymentDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        targetName (o);
-        requirementName (o);
-        resourceName (o);
-        resourceValue (o);
-        post (o);
-      }
-
-      void ConnectionResourceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        targetName (o);
-        requirementName (o);
-        resourceName (o);
-        resourceValue (o);
-        post (o);
-      }
-
-      void ConnectionResourceDeploymentDescription::
-      pre (Type&)
-      {
-      }
-
-      void ConnectionResourceDeploymentDescription::
-      pre (Type const&)
-      {
-      }
-
-      void ConnectionResourceDeploymentDescription::
-      targetName (Type& o)
-      {
-        dispatch (o.targetName ());
-      }
-
-      void ConnectionResourceDeploymentDescription::
-      targetName (Type const& o)
-      {
-        dispatch (o.targetName ());
-      }
-
-      void ConnectionResourceDeploymentDescription::
-      requirementName (Type& o)
-      {
-        dispatch (o.requirementName ());
-      }
-
-      void ConnectionResourceDeploymentDescription::
-      requirementName (Type const& o)
-      {
-        dispatch (o.requirementName ());
-      }
-
-      void ConnectionResourceDeploymentDescription::
-      resourceName (Type& o)
-      {
-        dispatch (o.resourceName ());
-      }
-
-      void ConnectionResourceDeploymentDescription::
-      resourceName (Type const& o)
-      {
-        dispatch (o.resourceName ());
-      }
-
-      void ConnectionResourceDeploymentDescription::
-      resourceValue (Type& o)
-      {
-        dispatch (o.resourceValue ());
-      }
-
-      void ConnectionResourceDeploymentDescription::
-      resourceValue (Type const& o)
-      {
-        dispatch (o.resourceValue ());
-      }
-
-      void ConnectionResourceDeploymentDescription::
-      post (Type&)
-      {
-      }
-
-      void ConnectionResourceDeploymentDescription::
-      post (Type const&)
-      {
-      }
-
-      // PlanConnectionDescription
-      //
-      //
-
-      void PlanConnectionDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        if (o.source_p ()) source (o);
-        else source_none (o);
-        deployRequirement (o);
-        externalEndpoint (o);
-        internalEndpoint (o);
-        externalReference (o);
-        deployedResource (o);
-        post (o);
-      }
-
-      void PlanConnectionDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        if (o.source_p ()) source (o);
-        else source_none (o);
-        deployRequirement (o);
-        externalEndpoint (o);
-        internalEndpoint (o);
-        externalReference (o);
-        deployedResource (o);
-        post (o);
-      }
-
-      void PlanConnectionDescription::
-      pre (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      pre (Type const&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void PlanConnectionDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void PlanConnectionDescription::
-      source (Type& o)
-      {
-        dispatch (o.source ());
-      }
-
-      void PlanConnectionDescription::
-      source (Type const& o)
-      {
-        dispatch (o.source ());
-      }
-
-      void PlanConnectionDescription::
-      source_none (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      source_none (Type const&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      deployRequirement (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
-
-        if (b != e)
-        {
-          deployRequirement_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) deployRequirement_next (o);
-          }
-
-          deployRequirement_post (o);
-        }
-
-        else deployRequirement_none (o);
-      }
-
-      void PlanConnectionDescription::
-      deployRequirement (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement());
-
-        if (b != e)
-        {
-          deployRequirement_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) deployRequirement_next (o);
-          }
-
-          deployRequirement_post (o);
-        }
-
-        else deployRequirement_none (o);
-      }
-
-      void PlanConnectionDescription::
-      deployRequirement_pre (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      deployRequirement_pre (Type const&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      deployRequirement_next (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      deployRequirement_next (Type const&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      deployRequirement_post (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      deployRequirement_post (Type const&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      deployRequirement_none (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      deployRequirement_none (Type const&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      externalEndpoint (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::externalEndpoint_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
-
-        if (b != e)
-        {
-          externalEndpoint_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) externalEndpoint_next (o);
-          }
-
-          externalEndpoint_post (o);
-        }
-
-        else externalEndpoint_none (o);
-      }
-
-      void PlanConnectionDescription::
-      externalEndpoint (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::externalEndpoint_const_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
-
-        if (b != e)
-        {
-          externalEndpoint_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) externalEndpoint_next (o);
-          }
-
-          externalEndpoint_post (o);
-        }
-
-        else externalEndpoint_none (o);
-      }
-
-      void PlanConnectionDescription::
-      externalEndpoint_pre (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      externalEndpoint_pre (Type const&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      externalEndpoint_next (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      externalEndpoint_next (Type const&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      externalEndpoint_post (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      externalEndpoint_post (Type const&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      externalEndpoint_none (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      externalEndpoint_none (Type const&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      internalEndpoint (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::internalEndpoint_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
-
-        if (b != e)
-        {
-          internalEndpoint_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) internalEndpoint_next (o);
-          }
-
-          internalEndpoint_post (o);
-        }
-
-        else internalEndpoint_none (o);
-      }
-
-      void PlanConnectionDescription::
-      internalEndpoint (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::internalEndpoint_const_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
-
-        if (b != e)
-        {
-          internalEndpoint_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) internalEndpoint_next (o);
-          }
-
-          internalEndpoint_post (o);
-        }
-
-        else internalEndpoint_none (o);
-      }
-
-      void PlanConnectionDescription::
-      internalEndpoint_pre (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      internalEndpoint_pre (Type const&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      internalEndpoint_next (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      internalEndpoint_next (Type const&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      internalEndpoint_post (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      internalEndpoint_post (Type const&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      internalEndpoint_none (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      internalEndpoint_none (Type const&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      externalReference (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::externalReference_iterator b (o.begin_externalReference()), e (o.end_externalReference());
-
-        if (b != e)
-        {
-          externalReference_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) externalReference_next (o);
-          }
-
-          externalReference_post (o);
-        }
-
-        else externalReference_none (o);
-      }
-
-      void PlanConnectionDescription::
-      externalReference (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::externalReference_const_iterator b (o.begin_externalReference()), e (o.end_externalReference());
-
-        if (b != e)
-        {
-          externalReference_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) externalReference_next (o);
-          }
-
-          externalReference_post (o);
-        }
-
-        else externalReference_none (o);
-      }
-
-      void PlanConnectionDescription::
-      externalReference_pre (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      externalReference_pre (Type const&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      externalReference_next (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      externalReference_next (Type const&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      externalReference_post (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      externalReference_post (Type const&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      externalReference_none (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      externalReference_none (Type const&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      deployedResource (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
-
-        if (b != e)
-        {
-          deployedResource_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) deployedResource_next (o);
-          }
-
-          deployedResource_post (o);
-        }
-
-        else deployedResource_none (o);
-      }
-
-      void PlanConnectionDescription::
-      deployedResource (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        PlanConnectionDescription::Type::deployedResource_const_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
-
-        if (b != e)
-        {
-          deployedResource_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) deployedResource_next (o);
-          }
-
-          deployedResource_post (o);
-        }
-
-        else deployedResource_none (o);
-      }
-
-      void PlanConnectionDescription::
-      deployedResource_pre (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      deployedResource_pre (Type const&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      deployedResource_next (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      deployedResource_next (Type const&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      deployedResource_post (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      deployedResource_post (Type const&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      deployedResource_none (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      deployedResource_none (Type const&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      post (Type&)
-      {
-      }
-
-      void PlanConnectionDescription::
-      post (Type const&)
-      {
-      }
-
-      // ImplementationDependency
-      //
-      //
-
-      void ImplementationDependency::
-      traverse (Type& o)
-      {
-        pre (o);
-        requiredType (o);
-        post (o);
-      }
-
-      void ImplementationDependency::
-      traverse (Type const& o)
-      {
-        pre (o);
-        requiredType (o);
-        post (o);
-      }
-
-      void ImplementationDependency::
-      pre (Type&)
-      {
-      }
-
-      void ImplementationDependency::
-      pre (Type const&)
-      {
-      }
-
-      void ImplementationDependency::
-      requiredType (Type& o)
-      {
-        dispatch (o.requiredType ());
-      }
-
-      void ImplementationDependency::
-      requiredType (Type const& o)
-      {
-        dispatch (o.requiredType ());
-      }
-
-      void ImplementationDependency::
-      post (Type&)
-      {
-      }
-
-      void ImplementationDependency::
-      post (Type const&)
-      {
-      }
-
-      // Capability
-      //
-      //
-
-      void Capability::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        resourceType (o);
-        property (o);
-        post (o);
-      }
-
-      void Capability::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        resourceType (o);
-        property (o);
-        post (o);
-      }
-
-      void Capability::
-      pre (Type&)
-      {
-      }
-
-      void Capability::
-      pre (Type const&)
-      {
-      }
-
-      void Capability::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void Capability::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void Capability::
-      resourceType (Type& o)
-      {
-        dispatch (o.resourceType ());
-      }
-
-      void Capability::
-      resourceType (Type const& o)
-      {
-        dispatch (o.resourceType ());
-      }
-
-      void Capability::
-      property (Type& o)
-      {
-        dispatch (o.property ());
-      }
-
-      void Capability::
-      property (Type const& o)
-      {
-        dispatch (o.property ());
-      }
-
-      void Capability::
-      post (Type&)
-      {
-      }
-
-      void Capability::
-      post (Type const&)
-      {
-      }
-
-      // ImplementationRequirement
-      //
-      //
-
-      void ImplementationRequirement::
-      traverse (Type& o)
-      {
-        pre (o);
-        resourceUsage (o);
-        resourcePort (o);
-        componentPort (o);
-        resourceType (o);
-        name (o);
-        property (o);
-        post (o);
-      }
-
-      void ImplementationRequirement::
-      traverse (Type const& o)
-      {
-        pre (o);
-        resourceUsage (o);
-        resourcePort (o);
-        componentPort (o);
-        resourceType (o);
-        name (o);
-        property (o);
-        post (o);
-      }
-
-      void ImplementationRequirement::
-      pre (Type&)
-      {
-      }
-
-      void ImplementationRequirement::
-      pre (Type const&)
-      {
-      }
-
-      void ImplementationRequirement::
-      resourceUsage (Type& o)
-      {
-        dispatch (o.resourceUsage ());
-      }
-
-      void ImplementationRequirement::
-      resourceUsage (Type const& o)
-      {
-        dispatch (o.resourceUsage ());
-      }
-
-      void ImplementationRequirement::
-      resourcePort (Type& o)
-      {
-        dispatch (o.resourcePort ());
-      }
-
-      void ImplementationRequirement::
-      resourcePort (Type const& o)
-      {
-        dispatch (o.resourcePort ());
-      }
-
-      void ImplementationRequirement::
-      componentPort (Type& o)
-      {
-        dispatch (o.componentPort ());
-      }
-
-      void ImplementationRequirement::
-      componentPort (Type const& o)
-      {
-        dispatch (o.componentPort ());
-      }
-
-      void ImplementationRequirement::
-      resourceType (Type& o)
-      {
-        dispatch (o.resourceType ());
-      }
-
-      void ImplementationRequirement::
-      resourceType (Type const& o)
-      {
-        dispatch (o.resourceType ());
-      }
-
-      void ImplementationRequirement::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void ImplementationRequirement::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void ImplementationRequirement::
-      property (Type& o)
-      {
-        dispatch (o.property ());
-      }
-
-      void ImplementationRequirement::
-      property (Type const& o)
-      {
-        dispatch (o.property ());
-      }
-
-      void ImplementationRequirement::
-      post (Type&)
-      {
-      }
-
-      void ImplementationRequirement::
-      post (Type const&)
-      {
-      }
-
-      // ComponentPackageReference
-      //
-      //
-
-      void ComponentPackageReference::
-      traverse (Type& o)
-      {
-        pre (o);
-        requiredUUID (o);
-        requiredName (o);
-        requiredType (o);
-        post (o);
-      }
-
-      void ComponentPackageReference::
-      traverse (Type const& o)
-      {
-        pre (o);
-        requiredUUID (o);
-        requiredName (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::
-      requiredName (Type& o)
-      {
-        dispatch (o.requiredName ());
-      }
-
-      void ComponentPackageReference::
-      requiredName (Type const& o)
-      {
-        dispatch (o.requiredName ());
-      }
-
-      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
-      //
-      //
-
-      void SubcomponentPortEndpoint::
-      traverse (Type& o)
-      {
-        pre (o);
-        portName (o);
-        instance (o);
-        post (o);
-      }
-
-      void SubcomponentPortEndpoint::
-      traverse (Type const& o)
-      {
-        pre (o);
-        portName (o);
-        instance (o);
-        post (o);
-      }
-
-      void SubcomponentPortEndpoint::
-      pre (Type&)
-      {
-      }
-
-      void SubcomponentPortEndpoint::
-      pre (Type const&)
-      {
-      }
-
-      void SubcomponentPortEndpoint::
-      portName (Type& o)
-      {
-        dispatch (o.portName ());
-      }
-
-      void SubcomponentPortEndpoint::
-      portName (Type const& o)
-      {
-        dispatch (o.portName ());
-      }
-
-      void SubcomponentPortEndpoint::
-      instance (Type& o)
-      {
-        dispatch (o.instance ());
-      }
-
-      void SubcomponentPortEndpoint::
-      instance (Type const& o)
-      {
-        dispatch (o.instance ());
-      }
-
-      void SubcomponentPortEndpoint::
-      post (Type&)
-      {
-      }
-
-      void SubcomponentPortEndpoint::
-      post (Type const&)
-      {
-      }
-
-      // AssemblyConnectionDescription
-      //
-      //
-
-      void AssemblyConnectionDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        if (o.deployRequirement_p ()) deployRequirement (o);
-        else deployRequirement_none (o);
-        externalEndpoint (o);
-        internalEndpoint (o);
-        externalReference (o);
-        post (o);
-      }
-
-      void AssemblyConnectionDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        if (o.deployRequirement_p ()) deployRequirement (o);
-        else deployRequirement_none (o);
-        externalEndpoint (o);
-        internalEndpoint (o);
-        externalReference (o);
-        post (o);
-      }
-
-      void AssemblyConnectionDescription::
-      pre (Type&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      pre (Type const&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void AssemblyConnectionDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void AssemblyConnectionDescription::
-      deployRequirement (Type& o)
-      {
-        dispatch (o.deployRequirement ());
-      }
-
-      void AssemblyConnectionDescription::
-      deployRequirement (Type const& o)
-      {
-        dispatch (o.deployRequirement ());
-      }
-
-      void AssemblyConnectionDescription::
-      deployRequirement_none (Type&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      deployRequirement_none (Type const&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      externalEndpoint (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        AssemblyConnectionDescription::Type::externalEndpoint_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
-
-        if (b != e)
-        {
-          externalEndpoint_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) externalEndpoint_next (o);
-          }
-
-          externalEndpoint_post (o);
-        }
-
-        else externalEndpoint_none (o);
-      }
-
-      void AssemblyConnectionDescription::
-      externalEndpoint (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        AssemblyConnectionDescription::Type::externalEndpoint_const_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint());
-
-        if (b != e)
-        {
-          externalEndpoint_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) externalEndpoint_next (o);
-          }
-
-          externalEndpoint_post (o);
-        }
-
-        else externalEndpoint_none (o);
-      }
-
-      void AssemblyConnectionDescription::
-      externalEndpoint_pre (Type&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      externalEndpoint_pre (Type const&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      externalEndpoint_next (Type&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      externalEndpoint_next (Type const&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      externalEndpoint_post (Type&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      externalEndpoint_post (Type const&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      externalEndpoint_none (Type&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      externalEndpoint_none (Type const&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      internalEndpoint (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        AssemblyConnectionDescription::Type::internalEndpoint_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
-
-        if (b != e)
-        {
-          internalEndpoint_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) internalEndpoint_next (o);
-          }
-
-          internalEndpoint_post (o);
-        }
-
-        else internalEndpoint_none (o);
-      }
-
-      void AssemblyConnectionDescription::
-      internalEndpoint (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        AssemblyConnectionDescription::Type::internalEndpoint_const_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint());
-
-        if (b != e)
-        {
-          internalEndpoint_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) internalEndpoint_next (o);
-          }
-
-          internalEndpoint_post (o);
-        }
-
-        else internalEndpoint_none (o);
-      }
-
-      void AssemblyConnectionDescription::
-      internalEndpoint_pre (Type&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      internalEndpoint_pre (Type const&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      internalEndpoint_next (Type&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      internalEndpoint_next (Type const&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      internalEndpoint_post (Type&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      internalEndpoint_post (Type const&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      internalEndpoint_none (Type&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      internalEndpoint_none (Type const&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      externalReference (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        AssemblyConnectionDescription::Type::externalReference_iterator b (o.begin_externalReference()), e (o.end_externalReference());
-
-        if (b != e)
-        {
-          externalReference_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) externalReference_next (o);
-          }
-
-          externalReference_post (o);
-        }
-
-        else externalReference_none (o);
-      }
-
-      void AssemblyConnectionDescription::
-      externalReference (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        AssemblyConnectionDescription::Type::externalReference_const_iterator b (o.begin_externalReference()), e (o.end_externalReference());
-
-        if (b != e)
-        {
-          externalReference_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) externalReference_next (o);
-          }
-
-          externalReference_post (o);
-        }
-
-        else externalReference_none (o);
-      }
-
-      void AssemblyConnectionDescription::
-      externalReference_pre (Type&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      externalReference_pre (Type const&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      externalReference_next (Type&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      externalReference_next (Type const&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      externalReference_post (Type&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      externalReference_post (Type const&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      externalReference_none (Type&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      externalReference_none (Type const&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      post (Type&)
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      post (Type const&)
-      {
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      // TCKind
-      //
-      //
-
-      TCKind::
-      TCKind (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      TCKind::
-      TCKind ()
-      {
-      }
-
-      void TCKind::
-      traverse (Type const& o)
-      {
-        ::std::basic_string< char > s;
-
-        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 
-        {
-        }
-
-        if (::XSCRT::XML::Attribute< char >* a = attr_ ())
-        {
-          a->value (s);
-        }
-
-        else
-        {
-          top_().value (s);
-        }
-      }
-
-      // DataType
-      //
-      //
-
-      DataType::
-      DataType (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      DataType::
-      DataType ()
-      {
-      }
-
-      void DataType::
-      traverse (Type const& o)
-      {
-        Traversal::DataType::traverse (o);
-      }
-
-      void DataType::
-      kind (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("kind", top_ ()));
-        Traversal::DataType::kind (o);
-        pop_ ();
-      }
-
-      // DataValue
-      //
-      //
-
-      DataValue::
-      DataValue (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      DataValue::
-      DataValue ()
-      {
-      }
-
-      void DataValue::
-      traverse (Type const& o)
-      {
-        Traversal::DataValue::traverse (o);
-      }
-
-      void DataValue::
-      short_ (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("short", top_ ()));
-        Traversal::DataValue::short_ (o);
-        pop_ ();
-      }
-
-      void DataValue::
-      long_ (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("long", top_ ()));
-        Traversal::DataValue::long_ (o);
-        pop_ ();
-      }
-
-      void DataValue::
-      ushort (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("ushort", top_ ()));
-        Traversal::DataValue::ushort (o);
-        pop_ ();
-      }
-
-      void DataValue::
-      ulong (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("ulong", top_ ()));
-        Traversal::DataValue::ulong (o);
-        pop_ ();
-      }
-
-      void DataValue::
-      float_ (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("float", top_ ()));
-        Traversal::DataValue::float_ (o);
-        pop_ ();
-      }
-
-      void DataValue::
-      double_ (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("double", top_ ()));
-        Traversal::DataValue::double_ (o);
-        pop_ ();
-      }
-
-      void DataValue::
-      boolean (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("boolean", top_ ()));
-        Traversal::DataValue::boolean (o);
-        pop_ ();
-      }
-
-      void DataValue::
-      octet (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("octet", top_ ()));
-        Traversal::DataValue::octet (o);
-        pop_ ();
-      }
-
-      void DataValue::
-      objref (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("objref", top_ ()));
-        Traversal::DataValue::objref (o);
-        pop_ ();
-      }
-
-      void DataValue::
-      enum_ (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("enum", top_ ()));
-        Traversal::DataValue::enum_ (o);
-        pop_ ();
-      }
-
-      void DataValue::
-      string (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("string", top_ ()));
-        Traversal::DataValue::string (o);
-        pop_ ();
-      }
-
-      void DataValue::
-      longlong (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("longlong", top_ ()));
-        Traversal::DataValue::longlong (o);
-        pop_ ();
-      }
-
-      void DataValue::
-      ulonglong (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("ulonglong", top_ ()));
-        Traversal::DataValue::ulonglong (o);
-        pop_ ();
-      }
-
-      void DataValue::
-      longdouble (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("longdouble", top_ ()));
-        Traversal::DataValue::longdouble (o);
-        pop_ ();
-      }
-
-      void DataValue::
-      fixed (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("fixed", top_ ()));
-        Traversal::DataValue::fixed (o);
-        pop_ ();
-      }
-
-      void DataValue::
-      typecode (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("typecode", top_ ()));
-        Traversal::DataValue::typecode (o);
-        pop_ ();
-      }
-
-      // Any
-      //
-      //
-
-      Any::
-      Any (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      Any::
-      Any ()
-      {
-      }
-
-      void Any::
-      traverse (Type const& o)
-      {
-        Traversal::Any::traverse (o);
-      }
-
-      void Any::
-      type (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("type", top_ ()));
-        Traversal::Any::type (o);
-        pop_ ();
-      }
-
-      void Any::
-      value (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("value", top_ ()));
-        Traversal::Any::value (o);
-        pop_ ();
-      }
-
-      // Property
-      //
-      //
-
-      Property::
-      Property (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      Property::
-      Property ()
-      {
-      }
-
-      void Property::
-      traverse (Type const& o)
-      {
-        Traversal::Property::traverse (o);
-      }
-
-      void Property::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("name", top_ ()));
-        Traversal::Property::name (o);
-        pop_ ();
-      }
-
-      void Property::
-      value (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("value", top_ ()));
-        Traversal::Property::value (o);
-        pop_ ();
-      }
-
-      // Node
-      //
-      //
-
-      Node::
-      Node (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      Node::
-      Node ()
-      {
-      }
-
-      void Node::
-      traverse (Type const& o)
-      {
-        Traversal::Node::traverse (o);
-      }
-
-      void Node::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("name", top_ ()));
-        Traversal::Node::name (o);
-        pop_ ();
-      }
-
-      void Node::
-      label (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("label", top_ ()));
-        Traversal::Node::label (o);
-        pop_ ();
-      }
-
-      // SatisfierPropertyKind
-      //
-      //
-
-      SatisfierPropertyKind::
-      SatisfierPropertyKind (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      SatisfierPropertyKind::
-      SatisfierPropertyKind ()
-      {
-      }
-
-      void SatisfierPropertyKind::
-      traverse (Type const& o)
-      {
-        ::std::basic_string< char > s;
-
-        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 
-        {
-        }
-
-        if (::XSCRT::XML::Attribute< char >* a = attr_ ())
-        {
-          a->value (s);
-        }
-
-        else
-        {
-          top_().value (s);
-        }
-      }
-
-      // SatisfierProperty
-      //
-      //
-
-      SatisfierProperty::
-      SatisfierProperty (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      SatisfierProperty::
-      SatisfierProperty ()
-      {
-      }
-
-      void SatisfierProperty::
-      traverse (Type const& o)
-      {
-        Traversal::SatisfierProperty::traverse (o);
-      }
-
-      void SatisfierProperty::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("name", top_ ()));
-        Traversal::SatisfierProperty::name (o);
-        pop_ ();
-      }
-
-      void SatisfierProperty::
-      kind (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("kind", top_ ()));
-        Traversal::SatisfierProperty::kind (o);
-        pop_ ();
-      }
-
-      void SatisfierProperty::
-      value (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("value", top_ ()));
-        Traversal::SatisfierProperty::value (o);
-        pop_ ();
-      }
-
-      // Resource
-      //
-      //
-
-      Resource::
-      Resource (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      Resource::
-      Resource ()
-      {
-      }
-
-      void Resource::
-      traverse (Type const& o)
-      {
-        Traversal::Resource::traverse (o);
-      }
-
-      void Resource::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("name", top_ ()));
-        Traversal::Resource::name (o);
-        pop_ ();
-      }
-
-      void Resource::
-      resourceType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("resourceType", top_ ()));
-        Traversal::Resource::resourceType (o);
-        pop_ ();
-      }
-
-      void Resource::
-      property (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("property", top_ ()));
-        Traversal::Resource::property (o);
-        pop_ ();
-      }
-
-      // SharedResource
-      //
-      //
-
-      SharedResource::
-      SharedResource (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      SharedResource::
-      SharedResource ()
-      {
-      }
-
-      void SharedResource::
-      traverse (Type const& o)
-      {
-        Traversal::SharedResource::traverse (o);
-      }
-
-      void SharedResource::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("name", top_ ()));
-        Traversal::SharedResource::name (o);
-        pop_ ();
-      }
-
-      void SharedResource::
-      resourceType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("resourceType", top_ ()));
-        Traversal::SharedResource::resourceType (o);
-        pop_ ();
-      }
-
-      void SharedResource::
-      node (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("node", top_ ()));
-        Traversal::SharedResource::node (o);
-        pop_ ();
-      }
-
-      void SharedResource::
-      property (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("property", top_ ()));
-        Traversal::SharedResource::property (o);
-        pop_ ();
-      }
-
-      // Requirement
-      //
-      //
-
-      Requirement::
-      Requirement (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      Requirement::
-      Requirement ()
-      {
-      }
-
-      void Requirement::
-      traverse (Type const& o)
-      {
-        Traversal::Requirement::traverse (o);
-      }
-
-      void Requirement::
-      resourceType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("resourceType", top_ ()));
-        Traversal::Requirement::resourceType (o);
-        pop_ ();
-      }
-
-      void Requirement::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("name", top_ ()));
-        Traversal::Requirement::name (o);
-        pop_ ();
-      }
-
-      void Requirement::
-      property (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("property", top_ ()));
-        Traversal::Requirement::property (o);
-        pop_ ();
-      }
-
-      // ResourceDeploymentDescription
-      //
-      //
-
-      ResourceDeploymentDescription::
-      ResourceDeploymentDescription (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      ResourceDeploymentDescription::
-      ResourceDeploymentDescription ()
-      {
-      }
-
-      void ResourceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ResourceDeploymentDescription::traverse (o);
-      }
-
-      void ResourceDeploymentDescription::
-      requirementName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("requirementName", top_ ()));
-        Traversal::ResourceDeploymentDescription::requirementName (o);
-        pop_ ();
-      }
-
-      void ResourceDeploymentDescription::
-      resourceName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("resourceName", top_ ()));
-        Traversal::ResourceDeploymentDescription::resourceName (o);
-        pop_ ();
-      }
-
-      void ResourceDeploymentDescription::
-      resourceValue (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("resourceValue", top_ ()));
-        Traversal::ResourceDeploymentDescription::resourceValue (o);
-        pop_ ();
-      }
-
-      // ArtifactDeploymentDescription
-      //
-      //
-
-      ArtifactDeploymentDescription::
-      ArtifactDeploymentDescription (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      ArtifactDeploymentDescription::
-      ArtifactDeploymentDescription ()
-      {
-      }
-
-      void ArtifactDeploymentDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ArtifactDeploymentDescription::traverse (o);
-      }
-
-      void ArtifactDeploymentDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("name", top_ ()));
-        Traversal::ArtifactDeploymentDescription::name (o);
-        pop_ ();
-      }
-
-      void ArtifactDeploymentDescription::
-      source_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("source", top_ ()));
-      }
-
-      void ArtifactDeploymentDescription::
-      source_next (Type const& o)
-      {
-        source_post (o);
-        source_pre (o);
-      }
-
-      void ArtifactDeploymentDescription::
-      source_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void ArtifactDeploymentDescription::
-      node (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("node", top_ ()));
-        Traversal::ArtifactDeploymentDescription::node (o);
-        pop_ ();
-      }
-
-      void ArtifactDeploymentDescription::
-      location_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("location", top_ ()));
-      }
-
-      void ArtifactDeploymentDescription::
-      location_next (Type const& o)
-      {
-        location_post (o);
-        location_pre (o);
-      }
-
-      void ArtifactDeploymentDescription::
-      location_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void ArtifactDeploymentDescription::
-      execParameter_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("execParameter", top_ ()));
-      }
-
-      void ArtifactDeploymentDescription::
-      execParameter_next (Type const& o)
-      {
-        execParameter_post (o);
-        execParameter_pre (o);
-      }
-
-      void ArtifactDeploymentDescription::
-      execParameter_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void ArtifactDeploymentDescription::
-      deployRequirement_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("deployRequirement", top_ ()));
-      }
-
-      void ArtifactDeploymentDescription::
-      deployRequirement_next (Type const& o)
-      {
-        deployRequirement_post (o);
-        deployRequirement_pre (o);
-      }
-
-      void ArtifactDeploymentDescription::
-      deployRequirement_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void ArtifactDeploymentDescription::
-      deployedResource_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("deployedResource", top_ ()));
-      }
-
-      void ArtifactDeploymentDescription::
-      deployedResource_next (Type const& o)
-      {
-        deployedResource_post (o);
-        deployedResource_pre (o);
-      }
-
-      void ArtifactDeploymentDescription::
-      deployedResource_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void ArtifactDeploymentDescription::
-      id (Type const& o)
-      {
-        ::XSCRT::XML::Attribute< char > a ("id", "", top_ ());
-        attr_ (&a);
-        Traversal::ArtifactDeploymentDescription::id (o);
-        attr_ (0);
-      }
-
-      // MonolithicDeploymentDescription
-      //
-      //
-
-      MonolithicDeploymentDescription::
-      MonolithicDeploymentDescription (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      MonolithicDeploymentDescription::
-      MonolithicDeploymentDescription ()
-      {
-      }
-
-      void MonolithicDeploymentDescription::
-      traverse (Type const& o)
-      {
-        Traversal::MonolithicDeploymentDescription::traverse (o);
-      }
-
-      void MonolithicDeploymentDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("name", top_ ()));
-        Traversal::MonolithicDeploymentDescription::name (o);
-        pop_ ();
-      }
-
-      void MonolithicDeploymentDescription::
-      source_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("source", top_ ()));
-      }
-
-      void MonolithicDeploymentDescription::
-      source_next (Type const& o)
-      {
-        source_post (o);
-        source_pre (o);
-      }
-
-      void MonolithicDeploymentDescription::
-      source_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void MonolithicDeploymentDescription::
-      artifact_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("artifact", top_ ()));
-      }
-
-      void MonolithicDeploymentDescription::
-      artifact_next (Type const& o)
-      {
-        artifact_post (o);
-        artifact_pre (o);
-      }
-
-      void MonolithicDeploymentDescription::
-      artifact_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void MonolithicDeploymentDescription::
-      execParameter_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("execParameter", top_ ()));
-      }
-
-      void MonolithicDeploymentDescription::
-      execParameter_next (Type const& o)
-      {
-        execParameter_post (o);
-        execParameter_pre (o);
-      }
-
-      void MonolithicDeploymentDescription::
-      execParameter_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void MonolithicDeploymentDescription::
-      deployRequirement_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("deployRequirement", top_ ()));
-      }
-
-      void MonolithicDeploymentDescription::
-      deployRequirement_next (Type const& o)
-      {
-        deployRequirement_post (o);
-        deployRequirement_pre (o);
-      }
-
-      void MonolithicDeploymentDescription::
-      deployRequirement_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void MonolithicDeploymentDescription::
-      id (Type const& o)
-      {
-        ::XSCRT::XML::Attribute< char > a ("id", "", top_ ());
-        attr_ (&a);
-        Traversal::MonolithicDeploymentDescription::id (o);
-        attr_ (0);
-      }
-
-      // ResourceUsageKind
-      //
-      //
-
-      ResourceUsageKind::
-      ResourceUsageKind (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      ResourceUsageKind::
-      ResourceUsageKind ()
-      {
-      }
-
-      void ResourceUsageKind::
-      traverse (Type const& o)
-      {
-        ::std::basic_string< char > s;
-
-        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 
-        {
-        }
-
-        if (::XSCRT::XML::Attribute< char >* a = attr_ ())
-        {
-          a->value (s);
-        }
-
-        else
-        {
-          top_().value (s);
-        }
-      }
-
-      // InstanceResourceDeploymentDescription
-      //
-      //
-
-      InstanceResourceDeploymentDescription::
-      InstanceResourceDeploymentDescription (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      InstanceResourceDeploymentDescription::
-      InstanceResourceDeploymentDescription ()
-      {
-      }
-
-      void InstanceResourceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        Traversal::InstanceResourceDeploymentDescription::traverse (o);
-      }
-
-      void InstanceResourceDeploymentDescription::
-      resourceUsage (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("resourceUsage", top_ ()));
-        Traversal::InstanceResourceDeploymentDescription::resourceUsage (o);
-        pop_ ();
-      }
-
-      void InstanceResourceDeploymentDescription::
-      requirementName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("requirementName", top_ ()));
-        Traversal::InstanceResourceDeploymentDescription::requirementName (o);
-        pop_ ();
-      }
-
-      void InstanceResourceDeploymentDescription::
-      resourceName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("resourceName", top_ ()));
-        Traversal::InstanceResourceDeploymentDescription::resourceName (o);
-        pop_ ();
-      }
-
-      void InstanceResourceDeploymentDescription::
-      resourceValue (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("resourceValue", top_ ()));
-        Traversal::InstanceResourceDeploymentDescription::resourceValue (o);
-        pop_ ();
-      }
-
-      // InstanceDeploymentDescription
-      //
-      //
-
-      InstanceDeploymentDescription::
-      InstanceDeploymentDescription (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      InstanceDeploymentDescription::
-      InstanceDeploymentDescription ()
-      {
-      }
-
-      void InstanceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        Traversal::InstanceDeploymentDescription::traverse (o);
-      }
-
-      void InstanceDeploymentDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("name", top_ ()));
-        Traversal::InstanceDeploymentDescription::name (o);
-        pop_ ();
-      }
-
-      void InstanceDeploymentDescription::
-      node (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("node", top_ ()));
-        Traversal::InstanceDeploymentDescription::node (o);
-        pop_ ();
-      }
-
-      void InstanceDeploymentDescription::
-      source (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("source", top_ ()));
-        Traversal::InstanceDeploymentDescription::source (o);
-        pop_ ();
-      }
-
-      void InstanceDeploymentDescription::
-      implementation (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("implementation", top_ ()));
-        Traversal::InstanceDeploymentDescription::implementation (o);
-        pop_ ();
-      }
-
-      void InstanceDeploymentDescription::
-      configProperty_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("configProperty", top_ ()));
-      }
-
-      void InstanceDeploymentDescription::
-      configProperty_next (Type const& o)
-      {
-        configProperty_post (o);
-        configProperty_pre (o);
-      }
-
-      void InstanceDeploymentDescription::
-      configProperty_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void InstanceDeploymentDescription::
-      deployedResource (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("deployedResource", top_ ()));
-        Traversal::InstanceDeploymentDescription::deployedResource (o);
-        pop_ ();
-      }
-
-      void InstanceDeploymentDescription::
-      deployedSharedResource (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("deployedSharedResource", top_ ()));
-        Traversal::InstanceDeploymentDescription::deployedSharedResource (o);
-        pop_ ();
-      }
-
-      void InstanceDeploymentDescription::
-      id (Type const& o)
-      {
-        ::XSCRT::XML::Attribute< char > a ("id", "", top_ ());
-        attr_ (&a);
-        Traversal::InstanceDeploymentDescription::id (o);
-        attr_ (0);
-      }
-
-      // CCMComponentPortKind
-      //
-      //
-
-      CCMComponentPortKind::
-      CCMComponentPortKind (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      CCMComponentPortKind::
-      CCMComponentPortKind ()
-      {
-      }
-
-      void CCMComponentPortKind::
-      traverse (Type const& o)
-      {
-        ::std::basic_string< char > s;
-
-        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 
-        {
-        }
-
-        if (::XSCRT::XML::Attribute< char >* a = attr_ ())
-        {
-          a->value (s);
-        }
-
-        else
-        {
-          top_().value (s);
-        }
-      }
-
-      // ComponentPortDescription
-      //
-      //
-
-      ComponentPortDescription::
-      ComponentPortDescription (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      ComponentPortDescription::
-      ComponentPortDescription ()
-      {
-      }
-
-      void ComponentPortDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ComponentPortDescription::traverse (o);
-      }
-
-      void ComponentPortDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("name", top_ ()));
-        Traversal::ComponentPortDescription::name (o);
-        pop_ ();
-      }
-
-      void ComponentPortDescription::
-      specificType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("specificType", top_ ()));
-        Traversal::ComponentPortDescription::specificType (o);
-        pop_ ();
-      }
-
-      void ComponentPortDescription::
-      supportedType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("supportedType", top_ ()));
-        Traversal::ComponentPortDescription::supportedType (o);
-        pop_ ();
-      }
-
-      void ComponentPortDescription::
-      provider (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("provider", top_ ()));
-        Traversal::ComponentPortDescription::provider (o);
-        pop_ ();
-      }
-
-      void ComponentPortDescription::
-      exclusiveProvider (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("exclusiveProvider", top_ ()));
-        Traversal::ComponentPortDescription::exclusiveProvider (o);
-        pop_ ();
-      }
-
-      void ComponentPortDescription::
-      exclusiveUser (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("exclusiveUser", top_ ()));
-        Traversal::ComponentPortDescription::exclusiveUser (o);
-        pop_ ();
-      }
-
-      void ComponentPortDescription::
-      optional (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("optional", top_ ()));
-        Traversal::ComponentPortDescription::optional (o);
-        pop_ ();
-      }
-
-      void ComponentPortDescription::
-      kind (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("kind", top_ ()));
-        Traversal::ComponentPortDescription::kind (o);
-        pop_ ();
-      }
-
-      // ComponentPropertyDescription
-      //
-      //
-
-      ComponentPropertyDescription::
-      ComponentPropertyDescription (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      ComponentPropertyDescription::
-      ComponentPropertyDescription ()
-      {
-      }
-
-      void ComponentPropertyDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ComponentPropertyDescription::traverse (o);
-      }
-
-      void ComponentPropertyDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("name", top_ ()));
-        Traversal::ComponentPropertyDescription::name (o);
-        pop_ ();
-      }
-
-      void ComponentPropertyDescription::
-      type (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("type", top_ ()));
-        Traversal::ComponentPropertyDescription::type (o);
-        pop_ ();
-      }
-
-      // ComponentExternalPortEndpoint
-      //
-      //
-
-      ComponentExternalPortEndpoint::
-      ComponentExternalPortEndpoint (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      ComponentExternalPortEndpoint::
-      ComponentExternalPortEndpoint ()
-      {
-      }
-
-      void ComponentExternalPortEndpoint::
-      traverse (Type const& o)
-      {
-        Traversal::ComponentExternalPortEndpoint::traverse (o);
-      }
-
-      void ComponentExternalPortEndpoint::
-      portName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("portName", top_ ()));
-        Traversal::ComponentExternalPortEndpoint::portName (o);
-        pop_ ();
-      }
-
-      // PlanSubcomponentPortEndpoint
-      //
-      //
-
-      PlanSubcomponentPortEndpoint::
-      PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      PlanSubcomponentPortEndpoint::
-      PlanSubcomponentPortEndpoint ()
-      {
-      }
-
-      void PlanSubcomponentPortEndpoint::
-      traverse (Type const& o)
-      {
-        Traversal::PlanSubcomponentPortEndpoint::traverse (o);
-      }
-
-      void PlanSubcomponentPortEndpoint::
-      portName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("portName", top_ ()));
-        Traversal::PlanSubcomponentPortEndpoint::portName (o);
-        pop_ ();
-      }
-
-      void PlanSubcomponentPortEndpoint::
-      provider (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("provider", top_ ()));
-        Traversal::PlanSubcomponentPortEndpoint::provider (o);
-        pop_ ();
-      }
-
-      void PlanSubcomponentPortEndpoint::
-      kind (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("kind", top_ ()));
-        Traversal::PlanSubcomponentPortEndpoint::kind (o);
-        pop_ ();
-      }
-
-      void PlanSubcomponentPortEndpoint::
-      instance (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("instance", top_ ()));
-        Traversal::PlanSubcomponentPortEndpoint::instance (o);
-        pop_ ();
-      }
-
-      // ExternalReferenceEndpoint
-      //
-      //
-
-      ExternalReferenceEndpoint::
-      ExternalReferenceEndpoint (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      ExternalReferenceEndpoint::
-      ExternalReferenceEndpoint ()
-      {
-      }
-
-      void ExternalReferenceEndpoint::
-      traverse (Type const& o)
-      {
-        Traversal::ExternalReferenceEndpoint::traverse (o);
-      }
-
-      void ExternalReferenceEndpoint::
-      location (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("location", top_ ()));
-        Traversal::ExternalReferenceEndpoint::location (o);
-        pop_ ();
-      }
-
-      // ConnectionResourceDeploymentDescription
-      //
-      //
-
-      ConnectionResourceDeploymentDescription::
-      ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      ConnectionResourceDeploymentDescription::
-      ConnectionResourceDeploymentDescription ()
-      {
-      }
-
-      void ConnectionResourceDeploymentDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ConnectionResourceDeploymentDescription::traverse (o);
-      }
-
-      void ConnectionResourceDeploymentDescription::
-      targetName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("targetName", top_ ()));
-        Traversal::ConnectionResourceDeploymentDescription::targetName (o);
-        pop_ ();
-      }
-
-      void ConnectionResourceDeploymentDescription::
-      requirementName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("requirementName", top_ ()));
-        Traversal::ConnectionResourceDeploymentDescription::requirementName (o);
-        pop_ ();
-      }
-
-      void ConnectionResourceDeploymentDescription::
-      resourceName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("resourceName", top_ ()));
-        Traversal::ConnectionResourceDeploymentDescription::resourceName (o);
-        pop_ ();
-      }
-
-      void ConnectionResourceDeploymentDescription::
-      resourceValue (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("resourceValue", top_ ()));
-        Traversal::ConnectionResourceDeploymentDescription::resourceValue (o);
-        pop_ ();
-      }
-
-      // PlanConnectionDescription
-      //
-      //
-
-      PlanConnectionDescription::
-      PlanConnectionDescription (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      PlanConnectionDescription::
-      PlanConnectionDescription ()
-      {
-      }
-
-      void PlanConnectionDescription::
-      traverse (Type const& o)
-      {
-        Traversal::PlanConnectionDescription::traverse (o);
-      }
-
-      void PlanConnectionDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("name", top_ ()));
-        Traversal::PlanConnectionDescription::name (o);
-        pop_ ();
-      }
-
-      void PlanConnectionDescription::
-      source (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("source", top_ ()));
-        Traversal::PlanConnectionDescription::source (o);
-        pop_ ();
-      }
-
-      void PlanConnectionDescription::
-      deployRequirement_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("deployRequirement", top_ ()));
-      }
-
-      void PlanConnectionDescription::
-      deployRequirement_next (Type const& o)
-      {
-        deployRequirement_post (o);
-        deployRequirement_pre (o);
-      }
-
-      void PlanConnectionDescription::
-      deployRequirement_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void PlanConnectionDescription::
-      externalEndpoint_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("externalEndpoint", top_ ()));
-      }
-
-      void PlanConnectionDescription::
-      externalEndpoint_next (Type const& o)
-      {
-        externalEndpoint_post (o);
-        externalEndpoint_pre (o);
-      }
-
-      void PlanConnectionDescription::
-      externalEndpoint_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void PlanConnectionDescription::
-      internalEndpoint_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("internalEndpoint", top_ ()));
-      }
-
-      void PlanConnectionDescription::
-      internalEndpoint_next (Type const& o)
-      {
-        internalEndpoint_post (o);
-        internalEndpoint_pre (o);
-      }
-
-      void PlanConnectionDescription::
-      internalEndpoint_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void PlanConnectionDescription::
-      externalReference_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("externalReference", top_ ()));
-      }
-
-      void PlanConnectionDescription::
-      externalReference_next (Type const& o)
-      {
-        externalReference_post (o);
-        externalReference_pre (o);
-      }
-
-      void PlanConnectionDescription::
-      externalReference_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void PlanConnectionDescription::
-      deployedResource_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("deployedResource", top_ ()));
-      }
-
-      void PlanConnectionDescription::
-      deployedResource_next (Type const& o)
-      {
-        deployedResource_post (o);
-        deployedResource_pre (o);
-      }
-
-      void PlanConnectionDescription::
-      deployedResource_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      // ImplementationDependency
-      //
-      //
-
-      ImplementationDependency::
-      ImplementationDependency (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      ImplementationDependency::
-      ImplementationDependency ()
-      {
-      }
-
-      void ImplementationDependency::
-      traverse (Type const& o)
-      {
-        Traversal::ImplementationDependency::traverse (o);
-      }
-
-      void ImplementationDependency::
-      requiredType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("requiredType", top_ ()));
-        Traversal::ImplementationDependency::requiredType (o);
-        pop_ ();
-      }
-
-      // Capability
-      //
-      //
-
-      Capability::
-      Capability (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      Capability::
-      Capability ()
-      {
-      }
-
-      void Capability::
-      traverse (Type const& o)
-      {
-        Traversal::Capability::traverse (o);
-      }
-
-      void Capability::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("name", top_ ()));
-        Traversal::Capability::name (o);
-        pop_ ();
-      }
-
-      void Capability::
-      resourceType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("resourceType", top_ ()));
-        Traversal::Capability::resourceType (o);
-        pop_ ();
-      }
-
-      void Capability::
-      property (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("property", top_ ()));
-        Traversal::Capability::property (o);
-        pop_ ();
-      }
-
-      // ImplementationRequirement
-      //
-      //
-
-      ImplementationRequirement::
-      ImplementationRequirement (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      ImplementationRequirement::
-      ImplementationRequirement ()
-      {
-      }
-
-      void ImplementationRequirement::
-      traverse (Type const& o)
-      {
-        Traversal::ImplementationRequirement::traverse (o);
-      }
-
-      void ImplementationRequirement::
-      resourceUsage (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("resourceUsage", top_ ()));
-        Traversal::ImplementationRequirement::resourceUsage (o);
-        pop_ ();
-      }
-
-      void ImplementationRequirement::
-      resourcePort (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("resourcePort", top_ ()));
-        Traversal::ImplementationRequirement::resourcePort (o);
-        pop_ ();
-      }
-
-      void ImplementationRequirement::
-      componentPort (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("componentPort", top_ ()));
-        Traversal::ImplementationRequirement::componentPort (o);
-        pop_ ();
-      }
-
-      void ImplementationRequirement::
-      resourceType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("resourceType", top_ ()));
-        Traversal::ImplementationRequirement::resourceType (o);
-        pop_ ();
-      }
-
-      void ImplementationRequirement::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("name", top_ ()));
-        Traversal::ImplementationRequirement::name (o);
-        pop_ ();
-      }
-
-      void ImplementationRequirement::
-      property (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("property", top_ ()));
-        Traversal::ImplementationRequirement::property (o);
-        pop_ ();
-      }
-
-      // ComponentPackageReference
-      //
-      //
-
-      ComponentPackageReference::
-      ComponentPackageReference (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      ComponentPackageReference::
-      ComponentPackageReference ()
-      {
-      }
-
-      void ComponentPackageReference::
-      traverse (Type const& o)
-      {
-        Traversal::ComponentPackageReference::traverse (o);
-      }
-
-      void ComponentPackageReference::
-      requiredUUID (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("requiredUUID", top_ ()));
-        Traversal::ComponentPackageReference::requiredUUID (o);
-        pop_ ();
-      }
-
-      void ComponentPackageReference::
-      requiredName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("requiredName", top_ ()));
-        Traversal::ComponentPackageReference::requiredName (o);
-        pop_ ();
-      }
-
-      void ComponentPackageReference::
-      requiredType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("requiredType", top_ ()));
-        Traversal::ComponentPackageReference::requiredType (o);
-        pop_ ();
-      }
-
-      // SubcomponentPortEndpoint
-      //
-      //
-
-      SubcomponentPortEndpoint::
-      SubcomponentPortEndpoint (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      SubcomponentPortEndpoint::
-      SubcomponentPortEndpoint ()
-      {
-      }
-
-      void SubcomponentPortEndpoint::
-      traverse (Type const& o)
-      {
-        Traversal::SubcomponentPortEndpoint::traverse (o);
-      }
-
-      void SubcomponentPortEndpoint::
-      portName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("portName", top_ ()));
-        Traversal::SubcomponentPortEndpoint::portName (o);
-        pop_ ();
-      }
-
-      void SubcomponentPortEndpoint::
-      instance (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("instance", top_ ()));
-        Traversal::SubcomponentPortEndpoint::instance (o);
-        pop_ ();
-      }
-
-      // AssemblyConnectionDescription
-      //
-      //
-
-      AssemblyConnectionDescription::
-      AssemblyConnectionDescription (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      AssemblyConnectionDescription::
-      AssemblyConnectionDescription ()
-      {
-      }
-
-      void AssemblyConnectionDescription::
-      traverse (Type const& o)
-      {
-        Traversal::AssemblyConnectionDescription::traverse (o);
-      }
-
-      void AssemblyConnectionDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("name", top_ ()));
-        Traversal::AssemblyConnectionDescription::name (o);
-        pop_ ();
-      }
-
-      void AssemblyConnectionDescription::
-      deployRequirement (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("deployRequirement", top_ ()));
-        Traversal::AssemblyConnectionDescription::deployRequirement (o);
-        pop_ ();
-      }
-
-      void AssemblyConnectionDescription::
-      externalEndpoint_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("externalEndpoint", top_ ()));
-      }
-
-      void AssemblyConnectionDescription::
-      externalEndpoint_next (Type const& o)
-      {
-        externalEndpoint_post (o);
-        externalEndpoint_pre (o);
-      }
-
-      void AssemblyConnectionDescription::
-      externalEndpoint_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void AssemblyConnectionDescription::
-      internalEndpoint_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("internalEndpoint", top_ ()));
-      }
-
-      void AssemblyConnectionDescription::
-      internalEndpoint_next (Type const& o)
-      {
-        internalEndpoint_post (o);
-        internalEndpoint_pre (o);
-      }
-
-      void AssemblyConnectionDescription::
-      internalEndpoint_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void AssemblyConnectionDescription::
-      externalReference_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("externalReference", top_ ()));
-      }
-
-      void AssemblyConnectionDescription::
-      externalReference_next (Type const& o)
-      {
-        externalReference_post (o);
-        externalReference_pre (o);
-      }
-
-      void AssemblyConnectionDescription::
-      externalReference_post (Type const&)
-      {
-        pop_ ();
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp b/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp
index 5cb3f2ce0cd..8b945f5b30d 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Basic_Deployment_Data.hpp
@@ -2022,2677 +2022,4 @@ namespace CIAO
   }
 }
 
-#include <XMLSchema/Traversal.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      typedef
-      ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::TCKind >
-      TCKind;
-
-      struct DataType : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DataType >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (Type const&);
-
-        virtual void
-        kind (Type&);
-
-        virtual void
-        kind (Type const&);
-
-        virtual void
-        kind_none (Type&);
-
-        virtual void
-        kind_none (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct DataValue : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DataValue >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (Type const&);
-
-        virtual void
-        short_ (Type&);
-
-        virtual void
-        short_ (Type const&);
-
-        virtual void
-        short_none (Type&);
-
-        virtual void
-        short_none (Type const&);
-
-        virtual void
-        long_ (Type&);
-
-        virtual void
-        long_ (Type const&);
-
-        virtual void
-        long_none (Type&);
-
-        virtual void
-        long_none (Type const&);
-
-        virtual void
-        ushort (Type&);
-
-        virtual void
-        ushort (Type const&);
-
-        virtual void
-        ushort_none (Type&);
-
-        virtual void
-        ushort_none (Type const&);
-
-        virtual void
-        ulong (Type&);
-
-        virtual void
-        ulong (Type const&);
-
-        virtual void
-        ulong_none (Type&);
-
-        virtual void
-        ulong_none (Type const&);
-
-        virtual void
-        float_ (Type&);
-
-        virtual void
-        float_ (Type const&);
-
-        virtual void
-        float_none (Type&);
-
-        virtual void
-        float_none (Type const&);
-
-        virtual void
-        double_ (Type&);
-
-        virtual void
-        double_ (Type const&);
-
-        virtual void
-        double_none (Type&);
-
-        virtual void
-        double_none (Type const&);
-
-        virtual void
-        boolean (Type&);
-
-        virtual void
-        boolean (Type const&);
-
-        virtual void
-        boolean_none (Type&);
-
-        virtual void
-        boolean_none (Type const&);
-
-        virtual void
-        octet (Type&);
-
-        virtual void
-        octet (Type const&);
-
-        virtual void
-        octet_none (Type&);
-
-        virtual void
-        octet_none (Type const&);
-
-        virtual void
-        objref (Type&);
-
-        virtual void
-        objref (Type const&);
-
-        virtual void
-        objref_none (Type&);
-
-        virtual void
-        objref_none (Type const&);
-
-        virtual void
-        enum_ (Type&);
-
-        virtual void
-        enum_ (Type const&);
-
-        virtual void
-        enum_none (Type&);
-
-        virtual void
-        enum_none (Type const&);
-
-        virtual void
-        string (Type&);
-
-        virtual void
-        string (Type const&);
-
-        virtual void
-        string_none (Type&);
-
-        virtual void
-        string_none (Type const&);
-
-        virtual void
-        longlong (Type&);
-
-        virtual void
-        longlong (Type const&);
-
-        virtual void
-        longlong_none (Type&);
-
-        virtual void
-        longlong_none (Type const&);
-
-        virtual void
-        ulonglong (Type&);
-
-        virtual void
-        ulonglong (Type const&);
-
-        virtual void
-        ulonglong_none (Type&);
-
-        virtual void
-        ulonglong_none (Type const&);
-
-        virtual void
-        longdouble (Type&);
-
-        virtual void
-        longdouble (Type const&);
-
-        virtual void
-        longdouble_none (Type&);
-
-        virtual void
-        longdouble_none (Type const&);
-
-        virtual void
-        fixed (Type&);
-
-        virtual void
-        fixed (Type const&);
-
-        virtual void
-        fixed_none (Type&);
-
-        virtual void
-        fixed_none (Type const&);
-
-        virtual void
-        typecode (Type&);
-
-        virtual void
-        typecode (Type const&);
-
-        virtual void
-        typecode_none (Type&);
-
-        virtual void
-        typecode_none (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct Any : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Any >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (Type const&);
-
-        virtual void
-        type (Type&);
-
-        virtual void
-        type (Type const&);
-
-        virtual void
-        value (Type&);
-
-        virtual void
-        value (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct Property : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Property >
-      {
-        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
-        value (Type&);
-
-        virtual void
-        value (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct Node : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Node >
-      {
-        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
-        label (Type&);
-
-        virtual void
-        label (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      typedef
-      ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SatisfierPropertyKind >
-      SatisfierPropertyKind;
-
-      struct SatisfierProperty : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SatisfierProperty >
-      {
-        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
-        kind (Type&);
-
-        virtual void
-        kind (Type const&);
-
-        virtual void
-        value (Type&);
-
-        virtual void
-        value (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct Resource : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Resource >
-      {
-        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
-        resourceType (Type&);
-
-        virtual void
-        resourceType (Type const&);
-
-        virtual void
-        property (Type&);
-
-        virtual void
-        property (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct SharedResource : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SharedResource >
-      {
-        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
-        resourceType (Type&);
-
-        virtual void
-        resourceType (Type const&);
-
-        virtual void
-        node (Type&);
-
-        virtual void
-        node (Type const&);
-
-        virtual void
-        property (Type&);
-
-        virtual void
-        property (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct Requirement : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Requirement >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (Type const&);
-
-        virtual void
-        resourceType (Type&);
-
-        virtual void
-        resourceType (Type const&);
-
-        virtual void
-        name (Type&);
-
-        virtual void
-        name (Type const&);
-
-        virtual void
-        property (Type&);
-
-        virtual void
-        property (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct ResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ResourceDeploymentDescription >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (Type const&);
-
-        virtual void
-        requirementName (Type&);
-
-        virtual void
-        requirementName (Type const&);
-
-        virtual void
-        resourceName (Type&);
-
-        virtual void
-        resourceName (Type const&);
-
-        virtual void
-        resourceValue (Type&);
-
-        virtual void
-        resourceValue (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct ArtifactDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >
-      {
-        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
-        source (Type&);
-
-        virtual void
-        source (Type const&);
-
-        virtual void
-        source_pre (Type&);
-
-        virtual void
-        source_pre (Type const&);
-
-        virtual void
-        source_next (Type&);
-
-        virtual void
-        source_next (Type const&);
-
-        virtual void
-        source_post (Type&);
-
-        virtual void
-        source_post (Type const&);
-
-        virtual void
-        node (Type&);
-
-        virtual void
-        node (Type const&);
-
-        virtual void
-        location (Type&);
-
-        virtual void
-        location (Type const&);
-
-        virtual void
-        location_pre (Type&);
-
-        virtual void
-        location_pre (Type const&);
-
-        virtual void
-        location_next (Type&);
-
-        virtual void
-        location_next (Type const&);
-
-        virtual void
-        location_post (Type&);
-
-        virtual void
-        location_post (Type const&);
-
-        virtual void
-        execParameter (Type&);
-
-        virtual void
-        execParameter (Type const&);
-
-        virtual void
-        execParameter_pre (Type&);
-
-        virtual void
-        execParameter_pre (Type const&);
-
-        virtual void
-        execParameter_next (Type&);
-
-        virtual void
-        execParameter_next (Type const&);
-
-        virtual void
-        execParameter_post (Type&);
-
-        virtual void
-        execParameter_post (Type const&);
-
-        virtual void
-        execParameter_none (Type&);
-
-        virtual void
-        execParameter_none (Type const&);
-
-        virtual void
-        deployRequirement (Type&);
-
-        virtual void
-        deployRequirement (Type const&);
-
-        virtual void
-        deployRequirement_pre (Type&);
-
-        virtual void
-        deployRequirement_pre (Type const&);
-
-        virtual void
-        deployRequirement_next (Type&);
-
-        virtual void
-        deployRequirement_next (Type const&);
-
-        virtual void
-        deployRequirement_post (Type&);
-
-        virtual void
-        deployRequirement_post (Type const&);
-
-        virtual void
-        deployRequirement_none (Type&);
-
-        virtual void
-        deployRequirement_none (Type const&);
-
-        virtual void
-        deployedResource (Type&);
-
-        virtual void
-        deployedResource (Type const&);
-
-        virtual void
-        deployedResource_pre (Type&);
-
-        virtual void
-        deployedResource_pre (Type const&);
-
-        virtual void
-        deployedResource_next (Type&);
-
-        virtual void
-        deployedResource_next (Type const&);
-
-        virtual void
-        deployedResource_post (Type&);
-
-        virtual void
-        deployedResource_post (Type const&);
-
-        virtual void
-        deployedResource_none (Type&);
-
-        virtual void
-        deployedResource_none (Type const&);
-
-        virtual void
-        id (Type&);
-
-        virtual void
-        id (Type const&);
-
-        virtual void
-        id_none (Type&);
-
-        virtual void
-        id_none (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct MonolithicDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >
-      {
-        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
-        source (Type&);
-
-        virtual void
-        source (Type const&);
-
-        virtual void
-        source_pre (Type&);
-
-        virtual void
-        source_pre (Type const&);
-
-        virtual void
-        source_next (Type&);
-
-        virtual void
-        source_next (Type const&);
-
-        virtual void
-        source_post (Type&);
-
-        virtual void
-        source_post (Type const&);
-
-        virtual void
-        artifact (Type&);
-
-        virtual void
-        artifact (Type const&);
-
-        virtual void
-        artifact_pre (Type&);
-
-        virtual void
-        artifact_pre (Type const&);
-
-        virtual void
-        artifact_next (Type&);
-
-        virtual void
-        artifact_next (Type const&);
-
-        virtual void
-        artifact_post (Type&);
-
-        virtual void
-        artifact_post (Type const&);
-
-        virtual void
-        execParameter (Type&);
-
-        virtual void
-        execParameter (Type const&);
-
-        virtual void
-        execParameter_pre (Type&);
-
-        virtual void
-        execParameter_pre (Type const&);
-
-        virtual void
-        execParameter_next (Type&);
-
-        virtual void
-        execParameter_next (Type const&);
-
-        virtual void
-        execParameter_post (Type&);
-
-        virtual void
-        execParameter_post (Type const&);
-
-        virtual void
-        deployRequirement (Type&);
-
-        virtual void
-        deployRequirement (Type const&);
-
-        virtual void
-        deployRequirement_pre (Type&);
-
-        virtual void
-        deployRequirement_pre (Type const&);
-
-        virtual void
-        deployRequirement_next (Type&);
-
-        virtual void
-        deployRequirement_next (Type const&);
-
-        virtual void
-        deployRequirement_post (Type&);
-
-        virtual void
-        deployRequirement_post (Type const&);
-
-        virtual void
-        id (Type&);
-
-        virtual void
-        id (Type const&);
-
-        virtual void
-        id_none (Type&);
-
-        virtual void
-        id_none (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      typedef
-      ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ResourceUsageKind >
-      ResourceUsageKind;
-
-      struct InstanceResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (Type const&);
-
-        virtual void
-        resourceUsage (Type&);
-
-        virtual void
-        resourceUsage (Type const&);
-
-        virtual void
-        requirementName (Type&);
-
-        virtual void
-        requirementName (Type const&);
-
-        virtual void
-        resourceName (Type&);
-
-        virtual void
-        resourceName (Type const&);
-
-        virtual void
-        resourceValue (Type&);
-
-        virtual void
-        resourceValue (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct InstanceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::InstanceDeploymentDescription >
-      {
-        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
-        node (Type&);
-
-        virtual void
-        node (Type const&);
-
-        virtual void
-        source (Type&);
-
-        virtual void
-        source (Type const&);
-
-        virtual void
-        implementation (Type&);
-
-        virtual void
-        implementation (Type const&);
-
-        virtual void
-        configProperty (Type&);
-
-        virtual void
-        configProperty (Type const&);
-
-        virtual void
-        configProperty_pre (Type&);
-
-        virtual void
-        configProperty_pre (Type const&);
-
-        virtual void
-        configProperty_next (Type&);
-
-        virtual void
-        configProperty_next (Type const&);
-
-        virtual void
-        configProperty_post (Type&);
-
-        virtual void
-        configProperty_post (Type const&);
-
-        virtual void
-        configProperty_none (Type&);
-
-        virtual void
-        configProperty_none (Type const&);
-
-        virtual void
-        deployedResource (Type&);
-
-        virtual void
-        deployedResource (Type const&);
-
-        virtual void
-        deployedResource_none (Type&);
-
-        virtual void
-        deployedResource_none (Type const&);
-
-        virtual void
-        deployedSharedResource (Type&);
-
-        virtual void
-        deployedSharedResource (Type const&);
-
-        virtual void
-        deployedSharedResource_none (Type&);
-
-        virtual void
-        deployedSharedResource_none (Type const&);
-
-        virtual void
-        id (Type&);
-
-        virtual void
-        id (Type const&);
-
-        virtual void
-        id_none (Type&);
-
-        virtual void
-        id_none (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      typedef
-      ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::CCMComponentPortKind >
-      CCMComponentPortKind;
-
-      struct ComponentPortDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPortDescription >
-      {
-        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
-        specificType (Type&);
-
-        virtual void
-        specificType (Type const&);
-
-        virtual void
-        supportedType (Type&);
-
-        virtual void
-        supportedType (Type const&);
-
-        virtual void
-        provider (Type&);
-
-        virtual void
-        provider (Type const&);
-
-        virtual void
-        exclusiveProvider (Type&);
-
-        virtual void
-        exclusiveProvider (Type const&);
-
-        virtual void
-        exclusiveUser (Type&);
-
-        virtual void
-        exclusiveUser (Type const&);
-
-        virtual void
-        optional (Type&);
-
-        virtual void
-        optional (Type const&);
-
-        virtual void
-        kind (Type&);
-
-        virtual void
-        kind (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct ComponentPropertyDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPropertyDescription >
-      {
-        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
-        type (Type&);
-
-        virtual void
-        type (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct ComponentExternalPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (Type const&);
-
-        virtual void
-        portName (Type&);
-
-        virtual void
-        portName (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct PlanSubcomponentPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (Type const&);
-
-        virtual void
-        portName (Type&);
-
-        virtual void
-        portName (Type const&);
-
-        virtual void
-        provider (Type&);
-
-        virtual void
-        provider (Type const&);
-
-        virtual void
-        provider_none (Type&);
-
-        virtual void
-        provider_none (Type const&);
-
-        virtual void
-        kind (Type&);
-
-        virtual void
-        kind (Type const&);
-
-        virtual void
-        instance (Type&);
-
-        virtual void
-        instance (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct ExternalReferenceEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (Type const&);
-
-        virtual void
-        location (Type&);
-
-        virtual void
-        location (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct ConnectionResourceDeploymentDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (Type const&);
-
-        virtual void
-        targetName (Type&);
-
-        virtual void
-        targetName (Type const&);
-
-        virtual void
-        requirementName (Type&);
-
-        virtual void
-        requirementName (Type const&);
-
-        virtual void
-        resourceName (Type&);
-
-        virtual void
-        resourceName (Type const&);
-
-        virtual void
-        resourceValue (Type&);
-
-        virtual void
-        resourceValue (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct PlanConnectionDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PlanConnectionDescription >
-      {
-        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
-        source (Type&);
-
-        virtual void
-        source (Type const&);
-
-        virtual void
-        source_none (Type&);
-
-        virtual void
-        source_none (Type const&);
-
-        virtual void
-        deployRequirement (Type&);
-
-        virtual void
-        deployRequirement (Type const&);
-
-        virtual void
-        deployRequirement_pre (Type&);
-
-        virtual void
-        deployRequirement_pre (Type const&);
-
-        virtual void
-        deployRequirement_next (Type&);
-
-        virtual void
-        deployRequirement_next (Type const&);
-
-        virtual void
-        deployRequirement_post (Type&);
-
-        virtual void
-        deployRequirement_post (Type const&);
-
-        virtual void
-        deployRequirement_none (Type&);
-
-        virtual void
-        deployRequirement_none (Type const&);
-
-        virtual void
-        externalEndpoint (Type&);
-
-        virtual void
-        externalEndpoint (Type const&);
-
-        virtual void
-        externalEndpoint_pre (Type&);
-
-        virtual void
-        externalEndpoint_pre (Type const&);
-
-        virtual void
-        externalEndpoint_next (Type&);
-
-        virtual void
-        externalEndpoint_next (Type const&);
-
-        virtual void
-        externalEndpoint_post (Type&);
-
-        virtual void
-        externalEndpoint_post (Type const&);
-
-        virtual void
-        externalEndpoint_none (Type&);
-
-        virtual void
-        externalEndpoint_none (Type const&);
-
-        virtual void
-        internalEndpoint (Type&);
-
-        virtual void
-        internalEndpoint (Type const&);
-
-        virtual void
-        internalEndpoint_pre (Type&);
-
-        virtual void
-        internalEndpoint_pre (Type const&);
-
-        virtual void
-        internalEndpoint_next (Type&);
-
-        virtual void
-        internalEndpoint_next (Type const&);
-
-        virtual void
-        internalEndpoint_post (Type&);
-
-        virtual void
-        internalEndpoint_post (Type const&);
-
-        virtual void
-        internalEndpoint_none (Type&);
-
-        virtual void
-        internalEndpoint_none (Type const&);
-
-        virtual void
-        externalReference (Type&);
-
-        virtual void
-        externalReference (Type const&);
-
-        virtual void
-        externalReference_pre (Type&);
-
-        virtual void
-        externalReference_pre (Type const&);
-
-        virtual void
-        externalReference_next (Type&);
-
-        virtual void
-        externalReference_next (Type const&);
-
-        virtual void
-        externalReference_post (Type&);
-
-        virtual void
-        externalReference_post (Type const&);
-
-        virtual void
-        externalReference_none (Type&);
-
-        virtual void
-        externalReference_none (Type const&);
-
-        virtual void
-        deployedResource (Type&);
-
-        virtual void
-        deployedResource (Type const&);
-
-        virtual void
-        deployedResource_pre (Type&);
-
-        virtual void
-        deployedResource_pre (Type const&);
-
-        virtual void
-        deployedResource_next (Type&);
-
-        virtual void
-        deployedResource_next (Type const&);
-
-        virtual void
-        deployedResource_post (Type&);
-
-        virtual void
-        deployedResource_post (Type const&);
-
-        virtual void
-        deployedResource_none (Type&);
-
-        virtual void
-        deployedResource_none (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct ImplementationDependency : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationDependency >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (Type const&);
-
-        virtual void
-        requiredType (Type&);
-
-        virtual void
-        requiredType (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct Capability : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Capability >
-      {
-        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
-        resourceType (Type&);
-
-        virtual void
-        resourceType (Type const&);
-
-        virtual void
-        property (Type&);
-
-        virtual void
-        property (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct ImplementationRequirement : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationRequirement >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (Type const&);
-
-        virtual void
-        resourceUsage (Type&);
-
-        virtual void
-        resourceUsage (Type const&);
-
-        virtual void
-        resourcePort (Type&);
-
-        virtual void
-        resourcePort (Type const&);
-
-        virtual void
-        componentPort (Type&);
-
-        virtual void
-        componentPort (Type const&);
-
-        virtual void
-        resourceType (Type&);
-
-        virtual void
-        resourceType (Type const&);
-
-        virtual void
-        name (Type&);
-
-        virtual void
-        name (Type const&);
-
-        virtual void
-        property (Type&);
-
-        virtual void
-        property (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct 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
-        requiredName (Type&);
-
-        virtual void
-        requiredName (Type const&);
-
-        virtual void
-        requiredType (Type&);
-
-        virtual void
-        requiredType (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct SubcomponentPortEndpoint : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (Type const&);
-
-        virtual void
-        portName (Type&);
-
-        virtual void
-        portName (Type const&);
-
-        virtual void
-        instance (Type&);
-
-        virtual void
-        instance (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct AssemblyConnectionDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::AssemblyConnectionDescription >
-      {
-        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
-        deployRequirement (Type&);
-
-        virtual void
-        deployRequirement (Type const&);
-
-        virtual void
-        deployRequirement_none (Type&);
-
-        virtual void
-        deployRequirement_none (Type const&);
-
-        virtual void
-        externalEndpoint (Type&);
-
-        virtual void
-        externalEndpoint (Type const&);
-
-        virtual void
-        externalEndpoint_pre (Type&);
-
-        virtual void
-        externalEndpoint_pre (Type const&);
-
-        virtual void
-        externalEndpoint_next (Type&);
-
-        virtual void
-        externalEndpoint_next (Type const&);
-
-        virtual void
-        externalEndpoint_post (Type&);
-
-        virtual void
-        externalEndpoint_post (Type const&);
-
-        virtual void
-        externalEndpoint_none (Type&);
-
-        virtual void
-        externalEndpoint_none (Type const&);
-
-        virtual void
-        internalEndpoint (Type&);
-
-        virtual void
-        internalEndpoint (Type const&);
-
-        virtual void
-        internalEndpoint_pre (Type&);
-
-        virtual void
-        internalEndpoint_pre (Type const&);
-
-        virtual void
-        internalEndpoint_next (Type&);
-
-        virtual void
-        internalEndpoint_next (Type const&);
-
-        virtual void
-        internalEndpoint_post (Type&);
-
-        virtual void
-        internalEndpoint_post (Type const&);
-
-        virtual void
-        internalEndpoint_none (Type&);
-
-        virtual void
-        internalEndpoint_none (Type const&);
-
-        virtual void
-        externalReference (Type&);
-
-        virtual void
-        externalReference (Type const&);
-
-        virtual void
-        externalReference_pre (Type&);
-
-        virtual void
-        externalReference_pre (Type const&);
-
-        virtual void
-        externalReference_next (Type&);
-
-        virtual void
-        externalReference_next (Type const&);
-
-        virtual void
-        externalReference_post (Type&);
-
-        virtual void
-        externalReference_post (Type const&);
-
-        virtual void
-        externalReference_none (Type&);
-
-        virtual void
-        externalReference_none (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
-}
-
-#include <XMLSchema/Writer.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct TCKind : Traversal::TCKind, 
-      virtual ::XSCRT::Writer< char >
-      {
-        TCKind (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        protected:
-        TCKind ();
-      };
-
-      struct DataType : Traversal::DataType, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::DataType Type;
-        DataType (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        kind (Type const&);
-
-        protected:
-        DataType ();
-      };
-
-      struct DataValue : Traversal::DataValue, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::DataValue Type;
-        DataValue (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        short_ (Type const&);
-
-        virtual void
-        long_ (Type const&);
-
-        virtual void
-        ushort (Type const&);
-
-        virtual void
-        ulong (Type const&);
-
-        virtual void
-        float_ (Type const&);
-
-        virtual void
-        double_ (Type const&);
-
-        virtual void
-        boolean (Type const&);
-
-        virtual void
-        octet (Type const&);
-
-        virtual void
-        objref (Type const&);
-
-        virtual void
-        enum_ (Type const&);
-
-        virtual void
-        string (Type const&);
-
-        virtual void
-        longlong (Type const&);
-
-        virtual void
-        ulonglong (Type const&);
-
-        virtual void
-        longdouble (Type const&);
-
-        virtual void
-        fixed (Type const&);
-
-        virtual void
-        typecode (Type const&);
-
-        protected:
-        DataValue ();
-      };
-
-      struct Any : Traversal::Any, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::Any Type;
-        Any (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        type (Type const&);
-
-        virtual void
-        value (Type const&);
-
-        protected:
-        Any ();
-      };
-
-      struct Property : Traversal::Property, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::Property Type;
-        Property (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        name (Type const&);
-
-        virtual void
-        value (Type const&);
-
-        protected:
-        Property ();
-      };
-
-      struct Node : Traversal::Node, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::Node Type;
-        Node (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        name (Type const&);
-
-        virtual void
-        label (Type const&);
-
-        protected:
-        Node ();
-      };
-
-      struct SatisfierPropertyKind : Traversal::SatisfierPropertyKind, 
-      virtual ::XSCRT::Writer< char >
-      {
-        SatisfierPropertyKind (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        protected:
-        SatisfierPropertyKind ();
-      };
-
-      struct SatisfierProperty : Traversal::SatisfierProperty, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::SatisfierProperty Type;
-        SatisfierProperty (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        name (Type const&);
-
-        virtual void
-        kind (Type const&);
-
-        virtual void
-        value (Type const&);
-
-        protected:
-        SatisfierProperty ();
-      };
-
-      struct Resource : Traversal::Resource, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::Resource Type;
-        Resource (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        name (Type const&);
-
-        virtual void
-        resourceType (Type const&);
-
-        virtual void
-        property (Type const&);
-
-        protected:
-        Resource ();
-      };
-
-      struct SharedResource : Traversal::SharedResource, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::SharedResource Type;
-        SharedResource (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        name (Type const&);
-
-        virtual void
-        resourceType (Type const&);
-
-        virtual void
-        node (Type const&);
-
-        virtual void
-        property (Type const&);
-
-        protected:
-        SharedResource ();
-      };
-
-      struct Requirement : Traversal::Requirement, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::Requirement Type;
-        Requirement (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        resourceType (Type const&);
-
-        virtual void
-        name (Type const&);
-
-        virtual void
-        property (Type const&);
-
-        protected:
-        Requirement ();
-      };
-
-      struct ResourceDeploymentDescription : Traversal::ResourceDeploymentDescription, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::ResourceDeploymentDescription Type;
-        ResourceDeploymentDescription (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        requirementName (Type const&);
-
-        virtual void
-        resourceName (Type const&);
-
-        virtual void
-        resourceValue (Type const&);
-
-        protected:
-        ResourceDeploymentDescription ();
-      };
-
-      struct ArtifactDeploymentDescription : Traversal::ArtifactDeploymentDescription, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::ArtifactDeploymentDescription Type;
-        ArtifactDeploymentDescription (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        name (Type const&);
-
-        virtual void
-        source_pre (Type const&);
-
-        virtual void
-        source_next (Type const&);
-
-        virtual void
-        source_post (Type const&);
-
-        virtual void
-        node (Type const&);
-
-        virtual void
-        location_pre (Type const&);
-
-        virtual void
-        location_next (Type const&);
-
-        virtual void
-        location_post (Type const&);
-
-        virtual void
-        execParameter_pre (Type const&);
-
-        virtual void
-        execParameter_next (Type const&);
-
-        virtual void
-        execParameter_post (Type const&);
-
-        virtual void
-        deployRequirement_pre (Type const&);
-
-        virtual void
-        deployRequirement_next (Type const&);
-
-        virtual void
-        deployRequirement_post (Type const&);
-
-        virtual void
-        deployedResource_pre (Type const&);
-
-        virtual void
-        deployedResource_next (Type const&);
-
-        virtual void
-        deployedResource_post (Type const&);
-
-        virtual void
-        id (Type const&);
-
-        protected:
-        ArtifactDeploymentDescription ();
-      };
-
-      struct MonolithicDeploymentDescription : Traversal::MonolithicDeploymentDescription, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::MonolithicDeploymentDescription Type;
-        MonolithicDeploymentDescription (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        name (Type const&);
-
-        virtual void
-        source_pre (Type const&);
-
-        virtual void
-        source_next (Type const&);
-
-        virtual void
-        source_post (Type const&);
-
-        virtual void
-        artifact_pre (Type const&);
-
-        virtual void
-        artifact_next (Type const&);
-
-        virtual void
-        artifact_post (Type const&);
-
-        virtual void
-        execParameter_pre (Type const&);
-
-        virtual void
-        execParameter_next (Type const&);
-
-        virtual void
-        execParameter_post (Type const&);
-
-        virtual void
-        deployRequirement_pre (Type const&);
-
-        virtual void
-        deployRequirement_next (Type const&);
-
-        virtual void
-        deployRequirement_post (Type const&);
-
-        virtual void
-        id (Type const&);
-
-        protected:
-        MonolithicDeploymentDescription ();
-      };
-
-      struct ResourceUsageKind : Traversal::ResourceUsageKind, 
-      virtual ::XSCRT::Writer< char >
-      {
-        ResourceUsageKind (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        protected:
-        ResourceUsageKind ();
-      };
-
-      struct InstanceResourceDeploymentDescription : Traversal::InstanceResourceDeploymentDescription, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription Type;
-        InstanceResourceDeploymentDescription (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        resourceUsage (Type const&);
-
-        virtual void
-        requirementName (Type const&);
-
-        virtual void
-        resourceName (Type const&);
-
-        virtual void
-        resourceValue (Type const&);
-
-        protected:
-        InstanceResourceDeploymentDescription ();
-      };
-
-      struct InstanceDeploymentDescription : Traversal::InstanceDeploymentDescription, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::InstanceDeploymentDescription Type;
-        InstanceDeploymentDescription (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        name (Type const&);
-
-        virtual void
-        node (Type const&);
-
-        virtual void
-        source (Type const&);
-
-        virtual void
-        implementation (Type const&);
-
-        virtual void
-        configProperty_pre (Type const&);
-
-        virtual void
-        configProperty_next (Type const&);
-
-        virtual void
-        configProperty_post (Type const&);
-
-        virtual void
-        deployedResource (Type const&);
-
-        virtual void
-        deployedSharedResource (Type const&);
-
-        virtual void
-        id (Type const&);
-
-        protected:
-        InstanceDeploymentDescription ();
-      };
-
-      struct CCMComponentPortKind : Traversal::CCMComponentPortKind, 
-      virtual ::XSCRT::Writer< char >
-      {
-        CCMComponentPortKind (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        protected:
-        CCMComponentPortKind ();
-      };
-
-      struct ComponentPortDescription : Traversal::ComponentPortDescription, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::ComponentPortDescription Type;
-        ComponentPortDescription (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        name (Type const&);
-
-        virtual void
-        specificType (Type const&);
-
-        virtual void
-        supportedType (Type const&);
-
-        virtual void
-        provider (Type const&);
-
-        virtual void
-        exclusiveProvider (Type const&);
-
-        virtual void
-        exclusiveUser (Type const&);
-
-        virtual void
-        optional (Type const&);
-
-        virtual void
-        kind (Type const&);
-
-        protected:
-        ComponentPortDescription ();
-      };
-
-      struct ComponentPropertyDescription : Traversal::ComponentPropertyDescription, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::ComponentPropertyDescription Type;
-        ComponentPropertyDescription (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        name (Type const&);
-
-        virtual void
-        type (Type const&);
-
-        protected:
-        ComponentPropertyDescription ();
-      };
-
-      struct ComponentExternalPortEndpoint : Traversal::ComponentExternalPortEndpoint, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::ComponentExternalPortEndpoint Type;
-        ComponentExternalPortEndpoint (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        portName (Type const&);
-
-        protected:
-        ComponentExternalPortEndpoint ();
-      };
-
-      struct PlanSubcomponentPortEndpoint : Traversal::PlanSubcomponentPortEndpoint, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint Type;
-        PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        portName (Type const&);
-
-        virtual void
-        provider (Type const&);
-
-        virtual void
-        kind (Type const&);
-
-        virtual void
-        instance (Type const&);
-
-        protected:
-        PlanSubcomponentPortEndpoint ();
-      };
-
-      struct ExternalReferenceEndpoint : Traversal::ExternalReferenceEndpoint, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::ExternalReferenceEndpoint Type;
-        ExternalReferenceEndpoint (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        location (Type const&);
-
-        protected:
-        ExternalReferenceEndpoint ();
-      };
-
-      struct ConnectionResourceDeploymentDescription : Traversal::ConnectionResourceDeploymentDescription, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription Type;
-        ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        targetName (Type const&);
-
-        virtual void
-        requirementName (Type const&);
-
-        virtual void
-        resourceName (Type const&);
-
-        virtual void
-        resourceValue (Type const&);
-
-        protected:
-        ConnectionResourceDeploymentDescription ();
-      };
-
-      struct PlanConnectionDescription : Traversal::PlanConnectionDescription, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::PlanConnectionDescription Type;
-        PlanConnectionDescription (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        name (Type const&);
-
-        virtual void
-        source (Type const&);
-
-        virtual void
-        deployRequirement_pre (Type const&);
-
-        virtual void
-        deployRequirement_next (Type const&);
-
-        virtual void
-        deployRequirement_post (Type const&);
-
-        virtual void
-        externalEndpoint_pre (Type const&);
-
-        virtual void
-        externalEndpoint_next (Type const&);
-
-        virtual void
-        externalEndpoint_post (Type const&);
-
-        virtual void
-        internalEndpoint_pre (Type const&);
-
-        virtual void
-        internalEndpoint_next (Type const&);
-
-        virtual void
-        internalEndpoint_post (Type const&);
-
-        virtual void
-        externalReference_pre (Type const&);
-
-        virtual void
-        externalReference_next (Type const&);
-
-        virtual void
-        externalReference_post (Type const&);
-
-        virtual void
-        deployedResource_pre (Type const&);
-
-        virtual void
-        deployedResource_next (Type const&);
-
-        virtual void
-        deployedResource_post (Type const&);
-
-        protected:
-        PlanConnectionDescription ();
-      };
-
-      struct ImplementationDependency : Traversal::ImplementationDependency, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::ImplementationDependency Type;
-        ImplementationDependency (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        requiredType (Type const&);
-
-        protected:
-        ImplementationDependency ();
-      };
-
-      struct Capability : Traversal::Capability, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::Capability Type;
-        Capability (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        name (Type const&);
-
-        virtual void
-        resourceType (Type const&);
-
-        virtual void
-        property (Type const&);
-
-        protected:
-        Capability ();
-      };
-
-      struct ImplementationRequirement : Traversal::ImplementationRequirement, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::ImplementationRequirement Type;
-        ImplementationRequirement (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        resourceUsage (Type const&);
-
-        virtual void
-        resourcePort (Type const&);
-
-        virtual void
-        componentPort (Type const&);
-
-        virtual void
-        resourceType (Type const&);
-
-        virtual void
-        name (Type const&);
-
-        virtual void
-        property (Type const&);
-
-        protected:
-        ImplementationRequirement ();
-      };
-
-      struct ComponentPackageReference : Traversal::ComponentPackageReference, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::ComponentPackageReference Type;
-        ComponentPackageReference (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        requiredUUID (Type const&);
-
-        virtual void
-        requiredName (Type const&);
-
-        virtual void
-        requiredType (Type const&);
-
-        protected:
-        ComponentPackageReference ();
-      };
-
-      struct SubcomponentPortEndpoint : Traversal::SubcomponentPortEndpoint, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::SubcomponentPortEndpoint Type;
-        SubcomponentPortEndpoint (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        portName (Type const&);
-
-        virtual void
-        instance (Type const&);
-
-        protected:
-        SubcomponentPortEndpoint ();
-      };
-
-      struct AssemblyConnectionDescription : Traversal::AssemblyConnectionDescription, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::AssemblyConnectionDescription Type;
-        AssemblyConnectionDescription (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        name (Type const&);
-
-        virtual void
-        deployRequirement (Type const&);
-
-        virtual void
-        externalEndpoint_pre (Type const&);
-
-        virtual void
-        externalEndpoint_next (Type const&);
-
-        virtual void
-        externalEndpoint_post (Type const&);
-
-        virtual void
-        internalEndpoint_pre (Type const&);
-
-        virtual void
-        internalEndpoint_next (Type const&);
-
-        virtual void
-        internalEndpoint_post (Type const&);
-
-        virtual void
-        externalReference_pre (Type const&);
-
-        virtual void
-        externalReference_next (Type const&);
-
-        virtual void
-        externalReference_post (Type const&);
-
-        protected:
-        AssemblyConnectionDescription ();
-      };
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
 #endif // BASIC_DEPLOYMENT_DATA_HPP
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/DP_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/DP_Handler.cpp
index 08b538c53c1..a236a5328e6 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/DP_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/DP_Handler.cpp
@@ -60,10 +60,6 @@ namespace CIAO
 
       this->idl_dp_.reset (tmp);
 
-      // *************************
-      // Steve's stuff starts here
-      // *************************
-
       // Read in the label, if present, since minoccurs = 0
       if (this->dp_.label_p ())
 	{
@@ -97,7 +93,7 @@ namespace CIAO
       
       /* @@ Not needed at this time...
 
-      // ... and the property stuff
+      // ... An the property stuff
       for (DeploymentPlan::infoProperty_const_iterator pstart = this->dp_.begin_infoProperty ();
 	   pstart != this->dp_.end_infoProperty ();
 	   ++pstart)
@@ -112,9 +108,6 @@ namespace CIAO
 	    this->idl_dp_->infoProperty [len]);
 	}
       */
-      // *************************
-      // Steve's stuff ends here
-      // *************************
 
       this->retval_ =
         CCD_Handler::component_interface_descr (
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Deployment.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Deployment.cpp
index cb49c6f3728..be15143889d 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Deployment.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Deployment.cpp
@@ -149,485 +149,3 @@ namespace CIAO
   }
 }
 
-#include <XMLSchema/TypeInfo.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace
-    {
-      ::XMLSchema::TypeInfoInitializer < char > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    void
-    domain (::CIAO::Config_Handlers::Domain const& s, xercesc::DOMDocument* d)
-    {
-      ::XSCRT::XML::Element< char > e (d->getDocumentElement ());
-      if (e.name () != "domain")
-      {
-        throw 1;
-      }
-
-      struct W : virtual ::CIAO::Config_Handlers::Writer::Domain,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< char >, char >,
-      virtual ::CIAO::Config_Handlers::Writer::SharedResource,
-      virtual ::CIAO::Config_Handlers::Writer::Node,
-      virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
-      virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
-      virtual ::CIAO::Config_Handlers::Writer::Any,
-      virtual ::CIAO::Config_Handlers::Writer::DataType,
-      virtual ::CIAO::Config_Handlers::Writer::TCKind,
-      virtual ::CIAO::Config_Handlers::Writer::DataValue,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, char >,
-      virtual ::CIAO::Config_Handlers::Writer::Property,
-      virtual ::XSCRT::Writer< char >
-      {
-        W (::XSCRT::XML::Element< char >& e)
-        : ::XSCRT::Writer< char > (e)
-        {
-        }
-      };
-
-      W w (e);
-      w.dispatch (s);
-    }
-
-    void
-    deploymentPlan (::CIAO::Config_Handlers::DeploymentPlan const& s, xercesc::DOMDocument* d)
-    {
-      ::XSCRT::XML::Element< char > e (d->getDocumentElement ());
-      if (e.name () != "deploymentPlan")
-      {
-        throw 1;
-      }
-
-      struct W : virtual ::CIAO::Config_Handlers::Writer::DeploymentPlan,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< char >, char >,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
-      virtual ::CIAO::Config_Handlers::Writer::Property,
-      virtual ::CIAO::Config_Handlers::Writer::Any,
-      virtual ::CIAO::Config_Handlers::Writer::DataType,
-      virtual ::CIAO::Config_Handlers::Writer::TCKind,
-      virtual ::CIAO::Config_Handlers::Writer::DataValue,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, char >,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
-      virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
-      virtual ::CIAO::Config_Handlers::Writer::MonolithicDeploymentDescription,
-      virtual ::XMLSchema::Writer::IDREF< char >, 
-      virtual ::CIAO::Config_Handlers::Writer::Requirement,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< char >, char >,
-      virtual ::CIAO::Config_Handlers::Writer::InstanceDeploymentDescription,
-      virtual ::CIAO::Config_Handlers::Writer::InstanceResourceDeploymentDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
-      virtual ::CIAO::Config_Handlers::Writer::PlanConnectionDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::PlanSubcomponentPortEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::ConnectionResourceDeploymentDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
-      virtual ::CIAO::Config_Handlers::Writer::ArtifactDeploymentDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ResourceDeploymentDescription,
-      virtual ::XSCRT::Writer< char >
-      {
-        W (::XSCRT::XML::Element< char >& e)
-        : ::XSCRT::Writer< char > (e)
-        {
-        }
-      };
-
-      W w (e);
-      w.dispatch (s);
-    }
-
-    void
-    implementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const& s, xercesc::DOMDocument* d)
-    {
-      ::XSCRT::XML::Element< char > e (d->getDocumentElement ());
-      if (e.name () != "implementationArtifactDescription")
-      {
-        throw 1;
-      }
-
-      struct W : virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< char >, char >,
-      virtual ::CIAO::Config_Handlers::Writer::Property,
-      virtual ::CIAO::Config_Handlers::Writer::Any,
-      virtual ::CIAO::Config_Handlers::Writer::DataType,
-      virtual ::CIAO::Config_Handlers::Writer::TCKind,
-      virtual ::CIAO::Config_Handlers::Writer::DataValue,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, char >,
-      virtual ::CIAO::Config_Handlers::Writer::Requirement,
-      virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
-      virtual ::XSCRT::Writer< char >
-      {
-        W (::XSCRT::XML::Element< char >& e)
-        : ::XSCRT::Writer< char > (e)
-        {
-        }
-      };
-
-      W w (e);
-      w.dispatch (s);
-    }
-
-    void
-    componentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const& s, xercesc::DOMDocument* d)
-    {
-      ::XSCRT::XML::Element< char > e (d->getDocumentElement ());
-      if (e.name () != "componentInterfaceDescription")
-      {
-        throw 1;
-      }
-
-      struct W : virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< char >, char >,
-      virtual ::CIAO::Config_Handlers::Writer::Property,
-      virtual ::CIAO::Config_Handlers::Writer::Any,
-      virtual ::CIAO::Config_Handlers::Writer::DataType,
-      virtual ::CIAO::Config_Handlers::Writer::TCKind,
-      virtual ::CIAO::Config_Handlers::Writer::DataValue,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, char >,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
-      virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
-      virtual ::XSCRT::Writer< char >
-      {
-        W (::XSCRT::XML::Element< char >& e)
-        : ::XSCRT::Writer< char > (e)
-        {
-        }
-      };
-
-      W w (e);
-      w.dispatch (s);
-    }
-
-    void
-    componentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const& s, xercesc::DOMDocument* d)
-    {
-      ::XSCRT::XML::Element< char > e (d->getDocumentElement ());
-      if (e.name () != "componentImplementationDescription")
-      {
-        throw 1;
-      }
-
-      struct W : virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< char >, char >,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
-      virtual ::CIAO::Config_Handlers::Writer::Property,
-      virtual ::CIAO::Config_Handlers::Writer::Any,
-      virtual ::CIAO::Config_Handlers::Writer::DataType,
-      virtual ::CIAO::Config_Handlers::Writer::TCKind,
-      virtual ::CIAO::Config_Handlers::Writer::DataValue,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, char >,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
-      virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription,
-      virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation,
-      virtual ::CIAO::Config_Handlers::Writer::Requirement,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< char >, char >,
-      virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
-      virtual ::XMLSchema::Writer::IDREF< char >, 
-      virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference,
-      virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription,
-      virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
-      virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
-      virtual ::CIAO::Config_Handlers::Writer::Capability,
-      virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
-      virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
-      virtual ::XSCRT::Writer< char >
-      {
-        W (::XSCRT::XML::Element< char >& e)
-        : ::XSCRT::Writer< char > (e)
-        {
-        }
-      };
-
-      W w (e);
-      w.dispatch (s);
-    }
-
-    void
-    componentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const& s, xercesc::DOMDocument* d)
-    {
-      ::XSCRT::XML::Element< char > e (d->getDocumentElement ());
-      if (e.name () != "componentPackageDescription")
-      {
-        throw 1;
-      }
-
-      struct W : virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< char >, char >,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
-      virtual ::CIAO::Config_Handlers::Writer::Property,
-      virtual ::CIAO::Config_Handlers::Writer::Any,
-      virtual ::CIAO::Config_Handlers::Writer::DataType,
-      virtual ::CIAO::Config_Handlers::Writer::TCKind,
-      virtual ::CIAO::Config_Handlers::Writer::DataValue,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, char >,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
-      virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
-      virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription,
-      virtual ::CIAO::Config_Handlers::Writer::Requirement,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< char >, char >,
-      virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
-      virtual ::XMLSchema::Writer::IDREF< char >, 
-      virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference,
-      virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription,
-      virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
-      virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
-      virtual ::CIAO::Config_Handlers::Writer::Capability,
-      virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
-      virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
-      virtual ::XSCRT::Writer< char >
-      {
-        W (::XSCRT::XML::Element< char >& e)
-        : ::XSCRT::Writer< char > (e)
-        {
-        }
-      };
-
-      W w (e);
-      w.dispatch (s);
-    }
-
-    void
-    packageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const& s, xercesc::DOMDocument* d)
-    {
-      ::XSCRT::XML::Element< char > e (d->getDocumentElement ());
-      if (e.name () != "packageConfiguration")
-      {
-        throw 1;
-      }
-
-      struct W : virtual ::CIAO::Config_Handlers::Writer::PackageConfiguration,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< char >, char >,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
-      virtual ::CIAO::Config_Handlers::Writer::Property,
-      virtual ::CIAO::Config_Handlers::Writer::Any,
-      virtual ::CIAO::Config_Handlers::Writer::DataType,
-      virtual ::CIAO::Config_Handlers::Writer::TCKind,
-      virtual ::CIAO::Config_Handlers::Writer::DataValue,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, char >,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
-      virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
-      virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription,
-      virtual ::CIAO::Config_Handlers::Writer::Requirement,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< char >, char >,
-      virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
-      virtual ::XMLSchema::Writer::IDREF< char >, 
-      virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference,
-      virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription,
-      virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
-      virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
-      virtual ::CIAO::Config_Handlers::Writer::Capability,
-      virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
-      virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
-      virtual ::XSCRT::Writer< char >
-      {
-        W (::XSCRT::XML::Element< char >& e)
-        : ::XSCRT::Writer< char > (e)
-        {
-        }
-      };
-
-      W w (e);
-      w.dispatch (s);
-    }
-
-    void
-    topLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const& s, xercesc::DOMDocument* d)
-    {
-      ::XSCRT::XML::Element< char > e (d->getDocumentElement ());
-      if (e.name () != "topLevelPackageDescription")
-      {
-        throw 1;
-      }
-
-      struct W : virtual ::CIAO::Config_Handlers::Writer::TopLevelPackageDescription,
-      virtual ::CIAO::Config_Handlers::Writer::PackageConfiguration,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< char >, char >,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription,
-      virtual ::CIAO::Config_Handlers::Writer::Property,
-      virtual ::CIAO::Config_Handlers::Writer::Any,
-      virtual ::CIAO::Config_Handlers::Writer::DataType,
-      virtual ::CIAO::Config_Handlers::Writer::TCKind,
-      virtual ::CIAO::Config_Handlers::Writer::DataValue,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, char >,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, char >,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription,
-      virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription,
-      virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription,
-      virtual ::CIAO::Config_Handlers::Writer::Requirement,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< char >, char >,
-      virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint,
-      virtual ::XMLSchema::Writer::IDREF< char >, 
-      virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint,
-      virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping,
-      virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference,
-      virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription,
-      virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement,
-      virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind,
-      virtual ::CIAO::Config_Handlers::Writer::Capability,
-      virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty,
-      virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind,
-      virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency,
-      virtual ::XSCRT::Writer< char >
-      {
-        W (::XSCRT::XML::Element< char >& e)
-        : ::XSCRT::Writer< char > (e)
-        {
-        }
-      };
-
-      W w (e);
-      w.dispatch (s);
-    }
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Deployment.hpp b/TAO/CIAO/DAnCE/Config_Handlers/Deployment.hpp
index fa7b1d6e746..d7261b35cd8 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Deployment.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Deployment.hpp
@@ -2,8 +2,6 @@
 #ifndef DEPLOYMENT_HPP
 #define DEPLOYMENT_HPP
 
-#include "Config_Handlers/Config_Handlers_Export.h"
-
 // Forward declarations.
 //
 namespace CIAO
@@ -40,84 +38,30 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    ::CIAO::Config_Handlers::Domain Config_Handlers_Export
+    ::CIAO::Config_Handlers::Domain
     domain (xercesc::DOMDocument const*);
 
-    ::CIAO::Config_Handlers::DeploymentPlan Config_Handlers_Export
+    ::CIAO::Config_Handlers::DeploymentPlan
     deploymentPlan (xercesc::DOMDocument const*);
 
-    ::CIAO::Config_Handlers::ImplementationArtifactDescription Config_Handlers_Export
+    ::CIAO::Config_Handlers::ImplementationArtifactDescription
     implementationArtifactDescription (xercesc::DOMDocument const*);
 
-    ::CIAO::Config_Handlers::ComponentInterfaceDescription Config_Handlers_Export
+    ::CIAO::Config_Handlers::ComponentInterfaceDescription
     componentInterfaceDescription (xercesc::DOMDocument const*);
 
-    ::CIAO::Config_Handlers::ComponentImplementationDescription Config_Handlers_Export
+    ::CIAO::Config_Handlers::ComponentImplementationDescription
     componentImplementationDescription (xercesc::DOMDocument const*);
 
-    ::CIAO::Config_Handlers::ComponentPackageDescription Config_Handlers_Export
+    ::CIAO::Config_Handlers::ComponentPackageDescription
     componentPackageDescription (xercesc::DOMDocument const*);
 
-    ::CIAO::Config_Handlers::PackageConfiguration Config_Handlers_Export
+    ::CIAO::Config_Handlers::PackageConfiguration
     packageConfiguration (xercesc::DOMDocument const*);
 
-    ::CIAO::Config_Handlers::TopLevelPackageDescription Config_Handlers_Export
+    ::CIAO::Config_Handlers::TopLevelPackageDescription
     topLevelPackageDescription (xercesc::DOMDocument const*);
   }
 }
 
-#include <XMLSchema/Traversal.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-    }
-  }
-}
-
-#include <XMLSchema/Writer.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    void Config_Handlers_Export
-    domain (::CIAO::Config_Handlers::Domain const&, xercesc::DOMDocument*);
-
-    void Config_Handlers_Export
-    deploymentPlan (::CIAO::Config_Handlers::DeploymentPlan const&, xercesc::DOMDocument*);
-
-    void Config_Handlers_Export
-    implementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const&, xercesc::DOMDocument*);
-
-    void Config_Handlers_Export
-    componentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const&, xercesc::DOMDocument*);
-
-    void Config_Handlers_Export
-    componentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const&, xercesc::DOMDocument*);
-
-    void Config_Handlers_Export
-    componentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const&, xercesc::DOMDocument*);
-
-    void Config_Handlers_Export
-    packageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const&, xercesc::DOMDocument*);
-
-    void Config_Handlers_Export
-    topLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const&, xercesc::DOMDocument*);
-  }
-}
-
 #endif // DEPLOYMENT_HPP
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/IDD_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/IDD_Handler.cpp
index bbd1d5d8dd7..f51b58abbfd 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/IDD_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/IDD_Handler.cpp
@@ -80,7 +80,8 @@ namespace CIAO
       CORBA::ULong tmp = 0;
       bool r = MDD_Handler::IDREF.find_ref 
           (src.implementation ().id ().c_str (), tmp);
-
+      
+      // @@ MAJO:  What shouold we do if find_ref fails??
       dest.implementationRef = tmp;
 
       InstanceDeploymentDescription::configProperty_const_iterator pend =
@@ -141,8 +142,8 @@ namespace CIAO
     void
     IDD_Handler::instance_resource_depl_descr (
         const InstanceResourceDeploymentDescription &src,
-        ::Deployment::InstanceResourceDeploymentDescription &dest,
-        CORBA::ULong pos)
+        ::Deployment::InstanceResourceDeploymentDescription &dest
+        )
     {
       // resourceUsage is an enumerated type
       switch (src.resourceUsage ().integral ())
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/PSPE_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/PSPE_Handler.cpp
index f758476e32b..59ab8614f36 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/PSPE_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/PSPE_Handler.cpp
@@ -53,6 +53,9 @@ namespace CIAO
       CORBA::ULong tmp = 0;
       bool r = IDD_Handler::IDREF.find_ref
         (src.instance ().id ().c_str (), tmp);
+      ACE_UNUSED_ARG (r);
+      
+      // @@ MAJO:  What should we do if find_ref fails??
       dest.instanceRef = tmp;
 
       if (src.kind () == CCMComponentPortKind::Facet)
@@ -72,7 +75,7 @@ namespace CIAO
     PlanSubcomponentPortEndpoint
     PSPE_Handler::sub_component_port_endpoint (
       const Deployment::PlanSubcomponentPortEndpoint &src)
-    {/*MAJO
+    { // @@MAJO
       XMLSchema::string< char > pname ((src.portName));
       XMLSchema::string< char > tval  ("true");
       XMLSchema::string< char > prov  ("");
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ccd.cpp b/TAO/CIAO/DAnCE/Config_Handlers/ccd.cpp
index 603e2ed25d0..48469d50bd5 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/ccd.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ccd.cpp
@@ -10,7 +10,7 @@ namespace CIAO
 
     ComponentInterfaceDescription::
     ComponentInterfaceDescription ()
-    :
+    : 
     regulator__ ()
     {
     }
@@ -18,6 +18,7 @@ namespace CIAO
     ComponentInterfaceDescription::
     ComponentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const& s)
     :
+    XSCRT::Type (), 
     label_ (s.label_.get () ? new ::XMLSchema::string< char > (*s.label_) : 0),
     UUID_ (s.UUID_.get () ? new ::XMLSchema::string< char > (*s.UUID_) : 0),
     specificType_ (s.specificType_.get () ? new ::XMLSchema::string< char > (*s.specificType_) : 0),
@@ -681,904 +682,3 @@ namespace CIAO
   }
 }
 
-#include <XMLSchema/TypeInfo.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace
-    {
-      ::XMLSchema::TypeInfoInitializer < char > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
-
-      struct ComponentInterfaceDescriptionTypeInfoInitializer
-      {
-        ComponentInterfaceDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ComponentInterfaceDescription));
-          ::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));
-        }
-      };
-
-      ComponentInterfaceDescriptionTypeInfoInitializer ComponentInterfaceDescriptionTypeInfoInitializer_;
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      // ComponentInterfaceDescription
-      //
-      //
-
-      void ComponentInterfaceDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        if (o.UUID_p ()) UUID (o);
-        else UUID_none (o);
-        if (o.specificType_p ()) specificType (o);
-        else specificType_none (o);
-        supportedType (o);
-        idlFile (o);
-        configProperty (o);
-        port (o);
-        property (o);
-        infoProperty (o);
-        if (o.contentLocation_p ()) contentLocation (o);
-        else contentLocation_none (o);
-        post (o);
-      }
-
-      void ComponentInterfaceDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        if (o.UUID_p ()) UUID (o);
-        else UUID_none (o);
-        if (o.specificType_p ()) specificType (o);
-        else specificType_none (o);
-        supportedType (o);
-        idlFile (o);
-        configProperty (o);
-        port (o);
-        property (o);
-        infoProperty (o);
-        if (o.contentLocation_p ()) contentLocation (o);
-        else contentLocation_none (o);
-        post (o);
-      }
-
-      void ComponentInterfaceDescription::
-      pre (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      pre (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      label (Type& o)
-      {
-        dispatch (o.label ());
-      }
-
-      void ComponentInterfaceDescription::
-      label (Type const& o)
-      {
-        dispatch (o.label ());
-      }
-
-      void ComponentInterfaceDescription::
-      label_none (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      label_none (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      UUID (Type& o)
-      {
-        dispatch (o.UUID ());
-      }
-
-      void ComponentInterfaceDescription::
-      UUID (Type const& o)
-      {
-        dispatch (o.UUID ());
-      }
-
-      void ComponentInterfaceDescription::
-      UUID_none (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      UUID_none (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      specificType (Type& o)
-      {
-        dispatch (o.specificType ());
-      }
-
-      void ComponentInterfaceDescription::
-      specificType (Type const& o)
-      {
-        dispatch (o.specificType ());
-      }
-
-      void ComponentInterfaceDescription::
-      specificType_none (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      specificType_none (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      supportedType (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentInterfaceDescription::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);
-        }
-
-        else supportedType_none (o);
-      }
-
-      void ComponentInterfaceDescription::
-      supportedType (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentInterfaceDescription::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);
-        }
-
-        else supportedType_none (o);
-      }
-
-      void ComponentInterfaceDescription::
-      supportedType_pre (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      supportedType_pre (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      supportedType_next (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      supportedType_next (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      supportedType_post (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      supportedType_post (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      supportedType_none (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      supportedType_none (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      idlFile (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentInterfaceDescription::Type::idlFile_iterator b (o.begin_idlFile()), e (o.end_idlFile());
-
-        if (b != e)
-        {
-          idlFile_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) idlFile_next (o);
-          }
-
-          idlFile_post (o);
-        }
-
-        else idlFile_none (o);
-      }
-
-      void ComponentInterfaceDescription::
-      idlFile (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentInterfaceDescription::Type::idlFile_const_iterator b (o.begin_idlFile()), e (o.end_idlFile());
-
-        if (b != e)
-        {
-          idlFile_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) idlFile_next (o);
-          }
-
-          idlFile_post (o);
-        }
-
-        else idlFile_none (o);
-      }
-
-      void ComponentInterfaceDescription::
-      idlFile_pre (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      idlFile_pre (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      idlFile_next (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      idlFile_next (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      idlFile_post (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      idlFile_post (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      idlFile_none (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      idlFile_none (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      configProperty (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentInterfaceDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty());
-
-        if (b != e)
-        {
-          configProperty_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) configProperty_next (o);
-          }
-
-          configProperty_post (o);
-        }
-
-        else configProperty_none (o);
-      }
-
-      void ComponentInterfaceDescription::
-      configProperty (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentInterfaceDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty());
-
-        if (b != e)
-        {
-          configProperty_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) configProperty_next (o);
-          }
-
-          configProperty_post (o);
-        }
-
-        else configProperty_none (o);
-      }
-
-      void ComponentInterfaceDescription::
-      configProperty_pre (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      configProperty_pre (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      configProperty_next (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      configProperty_next (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      configProperty_post (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      configProperty_post (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      configProperty_none (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      configProperty_none (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      port (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentInterfaceDescription::Type::port_iterator b (o.begin_port()), e (o.end_port());
-
-        if (b != e)
-        {
-          port_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) port_next (o);
-          }
-
-          port_post (o);
-        }
-
-        else port_none (o);
-      }
-
-      void ComponentInterfaceDescription::
-      port (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentInterfaceDescription::Type::port_const_iterator b (o.begin_port()), e (o.end_port());
-
-        if (b != e)
-        {
-          port_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) port_next (o);
-          }
-
-          port_post (o);
-        }
-
-        else port_none (o);
-      }
-
-      void ComponentInterfaceDescription::
-      port_pre (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      port_pre (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      port_next (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      port_next (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      port_post (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      port_post (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      port_none (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      port_none (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      property (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentInterfaceDescription::Type::property_iterator b (o.begin_property()), e (o.end_property());
-
-        if (b != e)
-        {
-          property_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) property_next (o);
-          }
-
-          property_post (o);
-        }
-
-        else property_none (o);
-      }
-
-      void ComponentInterfaceDescription::
-      property (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentInterfaceDescription::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
-
-        if (b != e)
-        {
-          property_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) property_next (o);
-          }
-
-          property_post (o);
-        }
-
-        else property_none (o);
-      }
-
-      void ComponentInterfaceDescription::
-      property_pre (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      property_pre (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      property_next (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      property_next (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      property_post (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      property_post (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      property_none (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      property_none (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      infoProperty (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentInterfaceDescription::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
-
-        if (b != e)
-        {
-          infoProperty_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) infoProperty_next (o);
-          }
-
-          infoProperty_post (o);
-        }
-
-        else infoProperty_none (o);
-      }
-
-      void ComponentInterfaceDescription::
-      infoProperty (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentInterfaceDescription::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
-
-        if (b != e)
-        {
-          infoProperty_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) infoProperty_next (o);
-          }
-
-          infoProperty_post (o);
-        }
-
-        else infoProperty_none (o);
-      }
-
-      void ComponentInterfaceDescription::
-      infoProperty_pre (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      infoProperty_pre (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      infoProperty_next (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      infoProperty_next (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      infoProperty_post (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      infoProperty_post (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      infoProperty_none (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      infoProperty_none (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      contentLocation (Type& o)
-      {
-        dispatch (o.contentLocation ());
-      }
-
-      void ComponentInterfaceDescription::
-      contentLocation (Type const& o)
-      {
-        dispatch (o.contentLocation ());
-      }
-
-      void ComponentInterfaceDescription::
-      contentLocation_none (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      contentLocation_none (Type const&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      post (Type&)
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      post (Type const&)
-      {
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      // ComponentInterfaceDescription
-      //
-      //
-
-      ComponentInterfaceDescription::
-      ComponentInterfaceDescription (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      ComponentInterfaceDescription::
-      ComponentInterfaceDescription ()
-      {
-      }
-
-      void ComponentInterfaceDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ComponentInterfaceDescription::traverse (o);
-      }
-
-      void ComponentInterfaceDescription::
-      label (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("label", top_ ()));
-        Traversal::ComponentInterfaceDescription::label (o);
-        pop_ ();
-      }
-
-      void ComponentInterfaceDescription::
-      UUID (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("UUID", top_ ()));
-        Traversal::ComponentInterfaceDescription::UUID (o);
-        pop_ ();
-      }
-
-      void ComponentInterfaceDescription::
-      specificType (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("specificType", top_ ()));
-        Traversal::ComponentInterfaceDescription::specificType (o);
-        pop_ ();
-      }
-
-      void ComponentInterfaceDescription::
-      supportedType_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("supportedType", top_ ()));
-      }
-
-      void ComponentInterfaceDescription::
-      supportedType_next (Type const& o)
-      {
-        supportedType_post (o);
-        supportedType_pre (o);
-      }
-
-      void ComponentInterfaceDescription::
-      supportedType_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void ComponentInterfaceDescription::
-      idlFile_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("idlFile", top_ ()));
-      }
-
-      void ComponentInterfaceDescription::
-      idlFile_next (Type const& o)
-      {
-        idlFile_post (o);
-        idlFile_pre (o);
-      }
-
-      void ComponentInterfaceDescription::
-      idlFile_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void ComponentInterfaceDescription::
-      configProperty_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("configProperty", top_ ()));
-      }
-
-      void ComponentInterfaceDescription::
-      configProperty_next (Type const& o)
-      {
-        configProperty_post (o);
-        configProperty_pre (o);
-      }
-
-      void ComponentInterfaceDescription::
-      configProperty_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void ComponentInterfaceDescription::
-      port_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("port", top_ ()));
-      }
-
-      void ComponentInterfaceDescription::
-      port_next (Type const& o)
-      {
-        port_post (o);
-        port_pre (o);
-      }
-
-      void ComponentInterfaceDescription::
-      port_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void ComponentInterfaceDescription::
-      property_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("property", top_ ()));
-      }
-
-      void ComponentInterfaceDescription::
-      property_next (Type const& o)
-      {
-        property_post (o);
-        property_pre (o);
-      }
-
-      void ComponentInterfaceDescription::
-      property_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void ComponentInterfaceDescription::
-      infoProperty_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("infoProperty", top_ ()));
-      }
-
-      void ComponentInterfaceDescription::
-      infoProperty_next (Type const& o)
-      {
-        infoProperty_post (o);
-        infoProperty_pre (o);
-      }
-
-      void ComponentInterfaceDescription::
-      infoProperty_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void ComponentInterfaceDescription::
-      contentLocation (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("contentLocation", top_ ()));
-        Traversal::ComponentInterfaceDescription::contentLocation (o);
-        pop_ ();
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ccd.hpp b/TAO/CIAO/DAnCE/Config_Handlers/ccd.hpp
index 188a298b9e8..7393a202184 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/ccd.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ccd.hpp
@@ -177,361 +177,4 @@ namespace CIAO
   }
 }
 
-#include <XMLSchema/Traversal.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      struct ComponentInterfaceDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentInterfaceDescription >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (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
-        specificType (Type&);
-
-        virtual void
-        specificType (Type const&);
-
-        virtual void
-        specificType_none (Type&);
-
-        virtual void
-        specificType_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
-        supportedType_none (Type&);
-
-        virtual void
-        supportedType_none (Type const&);
-
-        virtual void
-        idlFile (Type&);
-
-        virtual void
-        idlFile (Type const&);
-
-        virtual void
-        idlFile_pre (Type&);
-
-        virtual void
-        idlFile_pre (Type const&);
-
-        virtual void
-        idlFile_next (Type&);
-
-        virtual void
-        idlFile_next (Type const&);
-
-        virtual void
-        idlFile_post (Type&);
-
-        virtual void
-        idlFile_post (Type const&);
-
-        virtual void
-        idlFile_none (Type&);
-
-        virtual void
-        idlFile_none (Type const&);
-
-        virtual void
-        configProperty (Type&);
-
-        virtual void
-        configProperty (Type const&);
-
-        virtual void
-        configProperty_pre (Type&);
-
-        virtual void
-        configProperty_pre (Type const&);
-
-        virtual void
-        configProperty_next (Type&);
-
-        virtual void
-        configProperty_next (Type const&);
-
-        virtual void
-        configProperty_post (Type&);
-
-        virtual void
-        configProperty_post (Type const&);
-
-        virtual void
-        configProperty_none (Type&);
-
-        virtual void
-        configProperty_none (Type const&);
-
-        virtual void
-        port (Type&);
-
-        virtual void
-        port (Type const&);
-
-        virtual void
-        port_pre (Type&);
-
-        virtual void
-        port_pre (Type const&);
-
-        virtual void
-        port_next (Type&);
-
-        virtual void
-        port_next (Type const&);
-
-        virtual void
-        port_post (Type&);
-
-        virtual void
-        port_post (Type const&);
-
-        virtual void
-        port_none (Type&);
-
-        virtual void
-        port_none (Type const&);
-
-        virtual void
-        property (Type&);
-
-        virtual void
-        property (Type const&);
-
-        virtual void
-        property_pre (Type&);
-
-        virtual void
-        property_pre (Type const&);
-
-        virtual void
-        property_next (Type&);
-
-        virtual void
-        property_next (Type const&);
-
-        virtual void
-        property_post (Type&);
-
-        virtual void
-        property_post (Type const&);
-
-        virtual void
-        property_none (Type&);
-
-        virtual void
-        property_none (Type const&);
-
-        virtual void
-        infoProperty (Type&);
-
-        virtual void
-        infoProperty (Type const&);
-
-        virtual void
-        infoProperty_pre (Type&);
-
-        virtual void
-        infoProperty_pre (Type const&);
-
-        virtual void
-        infoProperty_next (Type&);
-
-        virtual void
-        infoProperty_next (Type const&);
-
-        virtual void
-        infoProperty_post (Type&);
-
-        virtual void
-        infoProperty_post (Type const&);
-
-        virtual void
-        infoProperty_none (Type&);
-
-        virtual void
-        infoProperty_none (Type const&);
-
-        virtual void
-        contentLocation (Type&);
-
-        virtual void
-        contentLocation (Type const&);
-
-        virtual void
-        contentLocation_none (Type&);
-
-        virtual void
-        contentLocation_none (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
-}
-
-#include <XMLSchema/Writer.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct ComponentInterfaceDescription : Traversal::ComponentInterfaceDescription, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::ComponentInterfaceDescription Type;
-        ComponentInterfaceDescription (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        label (Type const&);
-
-        virtual void
-        UUID (Type const&);
-
-        virtual void
-        specificType (Type const&);
-
-        virtual void
-        supportedType_pre (Type const&);
-
-        virtual void
-        supportedType_next (Type const&);
-
-        virtual void
-        supportedType_post (Type const&);
-
-        virtual void
-        idlFile_pre (Type const&);
-
-        virtual void
-        idlFile_next (Type const&);
-
-        virtual void
-        idlFile_post (Type const&);
-
-        virtual void
-        configProperty_pre (Type const&);
-
-        virtual void
-        configProperty_next (Type const&);
-
-        virtual void
-        configProperty_post (Type const&);
-
-        virtual void
-        port_pre (Type const&);
-
-        virtual void
-        port_next (Type const&);
-
-        virtual void
-        port_post (Type const&);
-
-        virtual void
-        property_pre (Type const&);
-
-        virtual void
-        property_next (Type const&);
-
-        virtual void
-        property_post (Type const&);
-
-        virtual void
-        infoProperty_pre (Type const&);
-
-        virtual void
-        infoProperty_next (Type const&);
-
-        virtual void
-        infoProperty_post (Type const&);
-
-        virtual void
-        contentLocation (Type const&);
-
-        protected:
-        ComponentInterfaceDescription ();
-      };
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
 #endif // CCD_HPP
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cdd.cpp b/TAO/CIAO/DAnCE/Config_Handlers/cdd.cpp
index 189b0b2bb6d..9ed352a2569 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cdd.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cdd.cpp
@@ -11,7 +11,7 @@ namespace CIAO
     Domain::
     Domain (::XMLSchema::string< char > const& label__,
     ::XMLSchema::string< char > const& UUID__)
-    :
+    : 
     label_ (new ::XMLSchema::string< char > (label__)),
     UUID_ (new ::XMLSchema::string< char > (UUID__)),
     regulator__ ()
@@ -23,6 +23,7 @@ namespace CIAO
     Domain::
     Domain (::CIAO::Config_Handlers::Domain const& s)
     :
+    XSCRT::Type (), 
     label_ (new ::XMLSchema::string< char > (*s.label_)),
     UUID_ (new ::XMLSchema::string< char > (*s.UUID_)),
     sharedResource_ (s.sharedResource_.get () ? new ::CIAO::Config_Handlers::SharedResource (*s.sharedResource_) : 0),
@@ -294,321 +295,3 @@ namespace CIAO
   }
 }
 
-#include <XMLSchema/TypeInfo.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace
-    {
-      ::XMLSchema::TypeInfoInitializer < char > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
-
-      struct DomainTypeInfoInitializer
-      {
-        DomainTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (Domain));
-          ::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));
-        }
-      };
-
-      DomainTypeInfoInitializer DomainTypeInfoInitializer_;
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      // Domain
-      //
-      //
-
-      void Domain::
-      traverse (Type& o)
-      {
-        pre (o);
-        label (o);
-        UUID (o);
-        if (o.sharedResource_p ()) sharedResource (o);
-        else sharedResource_none (o);
-        node (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (o);
-        post (o);
-      }
-
-      void Domain::
-      traverse (Type const& o)
-      {
-        pre (o);
-        label (o);
-        UUID (o);
-        if (o.sharedResource_p ()) sharedResource (o);
-        else sharedResource_none (o);
-        node (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (o);
-        post (o);
-      }
-
-      void Domain::
-      pre (Type&)
-      {
-      }
-
-      void Domain::
-      pre (Type const&)
-      {
-      }
-
-      void Domain::
-      label (Type& o)
-      {
-        dispatch (o.label ());
-      }
-
-      void Domain::
-      label (Type const& o)
-      {
-        dispatch (o.label ());
-      }
-
-      void Domain::
-      UUID (Type& o)
-      {
-        dispatch (o.UUID ());
-      }
-
-      void Domain::
-      UUID (Type const& o)
-      {
-        dispatch (o.UUID ());
-      }
-
-      void Domain::
-      sharedResource (Type& o)
-      {
-        dispatch (o.sharedResource ());
-      }
-
-      void Domain::
-      sharedResource (Type const& o)
-      {
-        dispatch (o.sharedResource ());
-      }
-
-      void Domain::
-      sharedResource_none (Type&)
-      {
-      }
-
-      void Domain::
-      sharedResource_none (Type const&)
-      {
-      }
-
-      void Domain::
-      node (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Domain::Type::node_iterator b (o.begin_node()), e (o.end_node());
-
-        if (b != e)
-        {
-          node_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) node_next (o);
-          }
-
-          node_post (o);
-        }
-      }
-
-      void Domain::
-      node (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        Domain::Type::node_const_iterator b (o.begin_node()), e (o.end_node());
-
-        if (b != e)
-        {
-          node_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) node_next (o);
-          }
-
-          node_post (o);
-        }
-      }
-
-      void Domain::
-      node_pre (Type&)
-      {
-      }
-
-      void Domain::
-      node_pre (Type const&)
-      {
-      }
-
-      void Domain::
-      node_next (Type&)
-      {
-      }
-
-      void Domain::
-      node_next (Type const&)
-      {
-      }
-
-      void Domain::
-      node_post (Type&)
-      {
-      }
-
-      void Domain::
-      node_post (Type const&)
-      {
-      }
-
-      void Domain::
-      infoProperty (Type& o)
-      {
-        dispatch (o.infoProperty ());
-      }
-
-      void Domain::
-      infoProperty (Type const& o)
-      {
-        dispatch (o.infoProperty ());
-      }
-
-      void Domain::
-      infoProperty_none (Type&)
-      {
-      }
-
-      void Domain::
-      infoProperty_none (Type const&)
-      {
-      }
-
-      void Domain::
-      post (Type&)
-      {
-      }
-
-      void Domain::
-      post (Type const&)
-      {
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      // Domain
-      //
-      //
-
-      Domain::
-      Domain (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      Domain::
-      Domain ()
-      {
-      }
-
-      void Domain::
-      traverse (Type const& o)
-      {
-        Traversal::Domain::traverse (o);
-      }
-
-      void Domain::
-      label (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("label", top_ ()));
-        Traversal::Domain::label (o);
-        pop_ ();
-      }
-
-      void Domain::
-      UUID (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("UUID", top_ ()));
-        Traversal::Domain::UUID (o);
-        pop_ ();
-      }
-
-      void Domain::
-      sharedResource (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("sharedResource", top_ ()));
-        Traversal::Domain::sharedResource (o);
-        pop_ ();
-      }
-
-      void Domain::
-      node_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("node", top_ ()));
-      }
-
-      void Domain::
-      node_next (Type const& o)
-      {
-        node_post (o);
-        node_pre (o);
-      }
-
-      void Domain::
-      node_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void Domain::
-      infoProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("infoProperty", top_ ()));
-        Traversal::Domain::infoProperty (o);
-        pop_ ();
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cdd.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cdd.hpp
index 67c8333d454..1e7cb10fcee 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cdd.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cdd.hpp
@@ -106,148 +106,4 @@ namespace CIAO
   }
 }
 
-#include <XMLSchema/Traversal.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      struct Domain : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Domain >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (Type const&);
-
-        virtual void
-        label (Type&);
-
-        virtual void
-        label (Type const&);
-
-        virtual void
-        UUID (Type&);
-
-        virtual void
-        UUID (Type const&);
-
-        virtual void
-        sharedResource (Type&);
-
-        virtual void
-        sharedResource (Type const&);
-
-        virtual void
-        sharedResource_none (Type&);
-
-        virtual void
-        sharedResource_none (Type const&);
-
-        virtual void
-        node (Type&);
-
-        virtual void
-        node (Type const&);
-
-        virtual void
-        node_pre (Type&);
-
-        virtual void
-        node_pre (Type const&);
-
-        virtual void
-        node_next (Type&);
-
-        virtual void
-        node_next (Type const&);
-
-        virtual void
-        node_post (Type&);
-
-        virtual void
-        node_post (Type const&);
-
-        virtual void
-        infoProperty (Type&);
-
-        virtual void
-        infoProperty (Type const&);
-
-        virtual void
-        infoProperty_none (Type&);
-
-        virtual void
-        infoProperty_none (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
-}
-
-#include <XMLSchema/Writer.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct Domain : Traversal::Domain, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::Domain Type;
-        Domain (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        label (Type const&);
-
-        virtual void
-        UUID (Type const&);
-
-        virtual void
-        sharedResource (Type const&);
-
-        virtual void
-        node_pre (Type const&);
-
-        virtual void
-        node_next (Type const&);
-
-        virtual void
-        node_post (Type const&);
-
-        virtual void
-        infoProperty (Type const&);
-
-        protected:
-        Domain ();
-      };
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
 #endif // CDD_HPP
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cdp.cpp b/TAO/CIAO/DAnCE/Config_Handlers/cdp.cpp
index 8ffa0d21752..7a901edd9af 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cdp.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cdp.cpp
@@ -10,7 +10,7 @@ namespace CIAO
 
     DeploymentPlan::
     DeploymentPlan (::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes__)
-    :
+    : 
     realizes_ (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (realizes__)),
     regulator__ ()
     {
@@ -20,6 +20,7 @@ namespace CIAO
     DeploymentPlan::
     DeploymentPlan (::CIAO::Config_Handlers::DeploymentPlan const& s)
     :
+    XSCRT::Type (), 
     label_ (s.label_.get () ? new ::XMLSchema::string< char > (*s.label_) : 0),
     UUID_ (s.UUID_.get () ? new ::XMLSchema::string< char > (*s.UUID_) : 0),
     realizes_ (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.realizes_)),
@@ -620,844 +621,3 @@ namespace CIAO
   }
 }
 
-#include <XMLSchema/TypeInfo.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace
-    {
-      ::XMLSchema::TypeInfoInitializer < char > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
-
-      struct DeploymentPlanTypeInfoInitializer
-      {
-        DeploymentPlanTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (DeploymentPlan));
-          ::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));
-        }
-      };
-
-      DeploymentPlanTypeInfoInitializer DeploymentPlanTypeInfoInitializer_;
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      // DeploymentPlan
-      //
-      //
-
-      void DeploymentPlan::
-      traverse (Type& o)
-      {
-        pre (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        if (o.UUID_p ()) UUID (o);
-        else UUID_none (o);
-        realizes (o);
-        implementation (o);
-        instance (o);
-        connection (o);
-        dependsOn (o);
-        artifact (o);
-        infoProperty (o);
-        post (o);
-      }
-
-      void DeploymentPlan::
-      traverse (Type const& o)
-      {
-        pre (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        if (o.UUID_p ()) UUID (o);
-        else UUID_none (o);
-        realizes (o);
-        implementation (o);
-        instance (o);
-        connection (o);
-        dependsOn (o);
-        artifact (o);
-        infoProperty (o);
-        post (o);
-      }
-
-      void DeploymentPlan::
-      pre (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      pre (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      label (Type& o)
-      {
-        dispatch (o.label ());
-      }
-
-      void DeploymentPlan::
-      label (Type const& o)
-      {
-        dispatch (o.label ());
-      }
-
-      void DeploymentPlan::
-      label_none (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      label_none (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      UUID (Type& o)
-      {
-        dispatch (o.UUID ());
-      }
-
-      void DeploymentPlan::
-      UUID (Type const& o)
-      {
-        dispatch (o.UUID ());
-      }
-
-      void DeploymentPlan::
-      UUID_none (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      UUID_none (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      realizes (Type& o)
-      {
-        dispatch (o.realizes ());
-      }
-
-      void DeploymentPlan::
-      realizes (Type const& o)
-      {
-        dispatch (o.realizes ());
-      }
-
-      void DeploymentPlan::
-      implementation (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DeploymentPlan::Type::implementation_iterator b (o.begin_implementation()), e (o.end_implementation());
-
-        if (b != e)
-        {
-          implementation_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) implementation_next (o);
-          }
-
-          implementation_post (o);
-        }
-      }
-
-      void DeploymentPlan::
-      implementation (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DeploymentPlan::Type::implementation_const_iterator b (o.begin_implementation()), e (o.end_implementation());
-
-        if (b != e)
-        {
-          implementation_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) implementation_next (o);
-          }
-
-          implementation_post (o);
-        }
-      }
-
-      void DeploymentPlan::
-      implementation_pre (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      implementation_pre (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      implementation_next (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      implementation_next (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      implementation_post (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      implementation_post (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      instance (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DeploymentPlan::Type::instance_iterator b (o.begin_instance()), e (o.end_instance());
-
-        if (b != e)
-        {
-          instance_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) instance_next (o);
-          }
-
-          instance_post (o);
-        }
-
-        else instance_none (o);
-      }
-
-      void DeploymentPlan::
-      instance (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DeploymentPlan::Type::instance_const_iterator b (o.begin_instance()), e (o.end_instance());
-
-        if (b != e)
-        {
-          instance_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) instance_next (o);
-          }
-
-          instance_post (o);
-        }
-
-        else instance_none (o);
-      }
-
-      void DeploymentPlan::
-      instance_pre (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      instance_pre (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      instance_next (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      instance_next (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      instance_post (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      instance_post (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      instance_none (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      instance_none (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      connection (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DeploymentPlan::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
-
-        if (b != e)
-        {
-          connection_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) connection_next (o);
-          }
-
-          connection_post (o);
-        }
-
-        else connection_none (o);
-      }
-
-      void DeploymentPlan::
-      connection (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DeploymentPlan::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
-
-        if (b != e)
-        {
-          connection_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) connection_next (o);
-          }
-
-          connection_post (o);
-        }
-
-        else connection_none (o);
-      }
-
-      void DeploymentPlan::
-      connection_pre (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      connection_pre (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      connection_next (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      connection_next (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      connection_post (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      connection_post (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      connection_none (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      connection_none (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      dependsOn (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DeploymentPlan::Type::dependsOn_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
-
-        if (b != e)
-        {
-          dependsOn_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) dependsOn_next (o);
-          }
-
-          dependsOn_post (o);
-        }
-
-        else dependsOn_none (o);
-      }
-
-      void DeploymentPlan::
-      dependsOn (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DeploymentPlan::Type::dependsOn_const_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
-
-        if (b != e)
-        {
-          dependsOn_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) dependsOn_next (o);
-          }
-
-          dependsOn_post (o);
-        }
-
-        else dependsOn_none (o);
-      }
-
-      void DeploymentPlan::
-      dependsOn_pre (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      dependsOn_pre (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      dependsOn_next (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      dependsOn_next (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      dependsOn_post (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      dependsOn_post (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      dependsOn_none (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      dependsOn_none (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      artifact (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DeploymentPlan::Type::artifact_iterator b (o.begin_artifact()), e (o.end_artifact());
-
-        if (b != e)
-        {
-          artifact_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) artifact_next (o);
-          }
-
-          artifact_post (o);
-        }
-
-        else artifact_none (o);
-      }
-
-      void DeploymentPlan::
-      artifact (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DeploymentPlan::Type::artifact_const_iterator b (o.begin_artifact()), e (o.end_artifact());
-
-        if (b != e)
-        {
-          artifact_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) artifact_next (o);
-          }
-
-          artifact_post (o);
-        }
-
-        else artifact_none (o);
-      }
-
-      void DeploymentPlan::
-      artifact_pre (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      artifact_pre (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      artifact_next (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      artifact_next (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      artifact_post (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      artifact_post (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      artifact_none (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      artifact_none (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      infoProperty (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DeploymentPlan::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
-
-        if (b != e)
-        {
-          infoProperty_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) infoProperty_next (o);
-          }
-
-          infoProperty_post (o);
-        }
-
-        else infoProperty_none (o);
-      }
-
-      void DeploymentPlan::
-      infoProperty (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        DeploymentPlan::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty());
-
-        if (b != e)
-        {
-          infoProperty_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) infoProperty_next (o);
-          }
-
-          infoProperty_post (o);
-        }
-
-        else infoProperty_none (o);
-      }
-
-      void DeploymentPlan::
-      infoProperty_pre (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      infoProperty_pre (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      infoProperty_next (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      infoProperty_next (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      infoProperty_post (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      infoProperty_post (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      infoProperty_none (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      infoProperty_none (Type const&)
-      {
-      }
-
-      void DeploymentPlan::
-      post (Type&)
-      {
-      }
-
-      void DeploymentPlan::
-      post (Type const&)
-      {
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      // DeploymentPlan
-      //
-      //
-
-      DeploymentPlan::
-      DeploymentPlan (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      DeploymentPlan::
-      DeploymentPlan ()
-      {
-      }
-
-      void DeploymentPlan::
-      traverse (Type const& o)
-      {
-        Traversal::DeploymentPlan::traverse (o);
-      }
-
-      void DeploymentPlan::
-      label (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("label", top_ ()));
-        Traversal::DeploymentPlan::label (o);
-        pop_ ();
-      }
-
-      void DeploymentPlan::
-      UUID (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("UUID", top_ ()));
-        Traversal::DeploymentPlan::UUID (o);
-        pop_ ();
-      }
-
-      void DeploymentPlan::
-      realizes (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("realizes", top_ ()));
-        Traversal::DeploymentPlan::realizes (o);
-        pop_ ();
-      }
-
-      void DeploymentPlan::
-      implementation_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("implementation", top_ ()));
-      }
-
-      void DeploymentPlan::
-      implementation_next (Type const& o)
-      {
-        implementation_post (o);
-        implementation_pre (o);
-      }
-
-      void DeploymentPlan::
-      implementation_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void DeploymentPlan::
-      instance_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("instance", top_ ()));
-      }
-
-      void DeploymentPlan::
-      instance_next (Type const& o)
-      {
-        instance_post (o);
-        instance_pre (o);
-      }
-
-      void DeploymentPlan::
-      instance_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void DeploymentPlan::
-      connection_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("connection", top_ ()));
-      }
-
-      void DeploymentPlan::
-      connection_next (Type const& o)
-      {
-        connection_post (o);
-        connection_pre (o);
-      }
-
-      void DeploymentPlan::
-      connection_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void DeploymentPlan::
-      dependsOn_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("dependsOn", top_ ()));
-      }
-
-      void DeploymentPlan::
-      dependsOn_next (Type const& o)
-      {
-        dependsOn_post (o);
-        dependsOn_pre (o);
-      }
-
-      void DeploymentPlan::
-      dependsOn_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void DeploymentPlan::
-      artifact_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("artifact", top_ ()));
-      }
-
-      void DeploymentPlan::
-      artifact_next (Type const& o)
-      {
-        artifact_post (o);
-        artifact_pre (o);
-      }
-
-      void DeploymentPlan::
-      artifact_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void DeploymentPlan::
-      infoProperty_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("infoProperty", top_ ()));
-      }
-
-      void DeploymentPlan::
-      infoProperty_next (Type const& o)
-      {
-        infoProperty_post (o);
-        infoProperty_pre (o);
-      }
-
-      void DeploymentPlan::
-      infoProperty_post (Type const&)
-      {
-        pop_ ();
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp
index 0896a60d3a3..2800f5009fa 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cdp.hpp
@@ -165,334 +165,4 @@ namespace CIAO
   }
 }
 
-#include <XMLSchema/Traversal.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      struct DeploymentPlan : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DeploymentPlan >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (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
-        realizes (Type&);
-
-        virtual void
-        realizes (Type const&);
-
-        virtual void
-        implementation (Type&);
-
-        virtual void
-        implementation (Type const&);
-
-        virtual void
-        implementation_pre (Type&);
-
-        virtual void
-        implementation_pre (Type const&);
-
-        virtual void
-        implementation_next (Type&);
-
-        virtual void
-        implementation_next (Type const&);
-
-        virtual void
-        implementation_post (Type&);
-
-        virtual void
-        implementation_post (Type const&);
-
-        virtual void
-        instance (Type&);
-
-        virtual void
-        instance (Type const&);
-
-        virtual void
-        instance_pre (Type&);
-
-        virtual void
-        instance_pre (Type const&);
-
-        virtual void
-        instance_next (Type&);
-
-        virtual void
-        instance_next (Type const&);
-
-        virtual void
-        instance_post (Type&);
-
-        virtual void
-        instance_post (Type const&);
-
-        virtual void
-        instance_none (Type&);
-
-        virtual void
-        instance_none (Type const&);
-
-        virtual void
-        connection (Type&);
-
-        virtual void
-        connection (Type const&);
-
-        virtual void
-        connection_pre (Type&);
-
-        virtual void
-        connection_pre (Type const&);
-
-        virtual void
-        connection_next (Type&);
-
-        virtual void
-        connection_next (Type const&);
-
-        virtual void
-        connection_post (Type&);
-
-        virtual void
-        connection_post (Type const&);
-
-        virtual void
-        connection_none (Type&);
-
-        virtual void
-        connection_none (Type const&);
-
-        virtual void
-        dependsOn (Type&);
-
-        virtual void
-        dependsOn (Type const&);
-
-        virtual void
-        dependsOn_pre (Type&);
-
-        virtual void
-        dependsOn_pre (Type const&);
-
-        virtual void
-        dependsOn_next (Type&);
-
-        virtual void
-        dependsOn_next (Type const&);
-
-        virtual void
-        dependsOn_post (Type&);
-
-        virtual void
-        dependsOn_post (Type const&);
-
-        virtual void
-        dependsOn_none (Type&);
-
-        virtual void
-        dependsOn_none (Type const&);
-
-        virtual void
-        artifact (Type&);
-
-        virtual void
-        artifact (Type const&);
-
-        virtual void
-        artifact_pre (Type&);
-
-        virtual void
-        artifact_pre (Type const&);
-
-        virtual void
-        artifact_next (Type&);
-
-        virtual void
-        artifact_next (Type const&);
-
-        virtual void
-        artifact_post (Type&);
-
-        virtual void
-        artifact_post (Type const&);
-
-        virtual void
-        artifact_none (Type&);
-
-        virtual void
-        artifact_none (Type const&);
-
-        virtual void
-        infoProperty (Type&);
-
-        virtual void
-        infoProperty (Type const&);
-
-        virtual void
-        infoProperty_pre (Type&);
-
-        virtual void
-        infoProperty_pre (Type const&);
-
-        virtual void
-        infoProperty_next (Type&);
-
-        virtual void
-        infoProperty_next (Type const&);
-
-        virtual void
-        infoProperty_post (Type&);
-
-        virtual void
-        infoProperty_post (Type const&);
-
-        virtual void
-        infoProperty_none (Type&);
-
-        virtual void
-        infoProperty_none (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
-}
-
-#include <XMLSchema/Writer.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct DeploymentPlan : Traversal::DeploymentPlan, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::DeploymentPlan Type;
-        DeploymentPlan (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        label (Type const&);
-
-        virtual void
-        UUID (Type const&);
-
-        virtual void
-        realizes (Type const&);
-
-        virtual void
-        implementation_pre (Type const&);
-
-        virtual void
-        implementation_next (Type const&);
-
-        virtual void
-        implementation_post (Type const&);
-
-        virtual void
-        instance_pre (Type const&);
-
-        virtual void
-        instance_next (Type const&);
-
-        virtual void
-        instance_post (Type const&);
-
-        virtual void
-        connection_pre (Type const&);
-
-        virtual void
-        connection_next (Type const&);
-
-        virtual void
-        connection_post (Type const&);
-
-        virtual void
-        dependsOn_pre (Type const&);
-
-        virtual void
-        dependsOn_next (Type const&);
-
-        virtual void
-        dependsOn_post (Type const&);
-
-        virtual void
-        artifact_pre (Type const&);
-
-        virtual void
-        artifact_next (Type const&);
-
-        virtual void
-        artifact_post (Type const&);
-
-        virtual void
-        infoProperty_pre (Type const&);
-
-        virtual void
-        infoProperty_next (Type const&);
-
-        virtual void
-        infoProperty_post (Type const&);
-
-        protected:
-        DeploymentPlan ();
-      };
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
 #endif // CDP_HPP
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cid.cpp b/TAO/CIAO/DAnCE/Config_Handlers/cid.cpp
index d1d22b98b12..02fc295d95a 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cid.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cid.cpp
@@ -11,7 +11,7 @@ namespace CIAO
     SubcomponentInstantiationDescription::
     SubcomponentInstantiationDescription (::XMLSchema::string< char > const& name__,
     ::CIAO::Config_Handlers::ComponentPackageDescription const& package__)
-    :
+    : 
     name_ (new ::XMLSchema::string< char > (name__)),
     package_ (new ::CIAO::Config_Handlers::ComponentPackageDescription (package__)),
     regulator__ ()
@@ -23,6 +23,7 @@ namespace CIAO
     SubcomponentInstantiationDescription::
     SubcomponentInstantiationDescription (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& s)
     :
+    XSCRT::Type (), 
     name_ (new ::XMLSchema::string< char > (*s.name_)),
     package_ (new ::CIAO::Config_Handlers::ComponentPackageDescription (*s.package_)),
     configProperty_ (s.configProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.configProperty_) : 0),
@@ -249,7 +250,7 @@ namespace CIAO
     SubcomponentPropertyReference::
     SubcomponentPropertyReference (::XMLSchema::string< char > const& propertyName__,
     ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance__)
-    :
+    : 
     propertyName_ (new ::XMLSchema::string< char > (propertyName__)),
     instance_ (new ::CIAO::Config_Handlers::SubcomponentInstantiationDescription (instance__)),
     regulator__ ()
@@ -261,6 +262,7 @@ namespace CIAO
     SubcomponentPropertyReference::
     SubcomponentPropertyReference (::CIAO::Config_Handlers::SubcomponentPropertyReference const& s)
     :
+    XSCRT::Type (), 
     propertyName_ (new ::XMLSchema::string< char > (*s.propertyName_)),
     instance_ (new ::CIAO::Config_Handlers::SubcomponentInstantiationDescription (*s.instance_)),
     regulator__ ()
@@ -328,7 +330,7 @@ namespace CIAO
     AssemblyPropertyMapping (::XMLSchema::string< char > const& name__,
     ::XMLSchema::string< char > const& externalName__,
     ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo__)
-    :
+    : 
     name_ (new ::XMLSchema::string< char > (name__)),
     externalName_ (new ::XMLSchema::string< char > (externalName__)),
     delegatesTo_ (new ::CIAO::Config_Handlers::SubcomponentPropertyReference (delegatesTo__)),
@@ -342,6 +344,7 @@ namespace CIAO
     AssemblyPropertyMapping::
     AssemblyPropertyMapping (::CIAO::Config_Handlers::AssemblyPropertyMapping const& s)
     :
+    XSCRT::Type (), 
     name_ (new ::XMLSchema::string< char > (*s.name_)),
     externalName_ (new ::XMLSchema::string< char > (*s.externalName_)),
     delegatesTo_ (new ::CIAO::Config_Handlers::SubcomponentPropertyReference (*s.delegatesTo_)),
@@ -431,7 +434,7 @@ namespace CIAO
 
     ComponentAssemblyDescription::
     ComponentAssemblyDescription ()
-    :
+    : 
     regulator__ ()
     {
     }
@@ -439,6 +442,7 @@ namespace CIAO
     ComponentAssemblyDescription::
     ComponentAssemblyDescription (::CIAO::Config_Handlers::ComponentAssemblyDescription const& s)
     :
+    XSCRT::Type (), 
     externalProperty_ (s.externalProperty_.get () ? new ::CIAO::Config_Handlers::AssemblyPropertyMapping (*s.externalProperty_) : 0),
     regulator__ ()
     {
@@ -628,7 +632,7 @@ namespace CIAO
 
     MonolithicImplementationDescription::
     MonolithicImplementationDescription ()
-    :
+    : 
     regulator__ ()
     {
     }
@@ -636,6 +640,7 @@ namespace CIAO
     MonolithicImplementationDescription::
     MonolithicImplementationDescription (::CIAO::Config_Handlers::MonolithicImplementationDescription const& s)
     :
+    XSCRT::Type (), 
     execParameter_ (s.execParameter_.get () ? new ::CIAO::Config_Handlers::Property (*s.execParameter_) : 0),
     deployRequirement_ (s.deployRequirement_.get () ? new ::CIAO::Config_Handlers::ImplementationRequirement (*s.deployRequirement_) : 0),
     regulator__ ()
@@ -799,7 +804,7 @@ namespace CIAO
 
     ComponentImplementationDescription::
     ComponentImplementationDescription ()
-    :
+    : 
     regulator__ ()
     {
     }
@@ -807,6 +812,7 @@ namespace CIAO
     ComponentImplementationDescription::
     ComponentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const& s)
     :
+    XSCRT::Type (), 
     label_ (s.label_.get () ? new ::XMLSchema::string< char > (*s.label_) : 0),
     UUID_ (s.UUID_.get () ? new ::XMLSchema::string< char > (*s.UUID_) : 0),
     implements_ (s.implements_.get () ? new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.implements_) : 0),
@@ -1530,1497 +1536,3 @@ namespace CIAO
   }
 }
 
-#include <XMLSchema/TypeInfo.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace
-    {
-      ::XMLSchema::TypeInfoInitializer < char > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
-
-      struct SubcomponentInstantiationDescriptionTypeInfoInitializer
-      {
-        SubcomponentInstantiationDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (SubcomponentInstantiationDescription));
-          ::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));
-        }
-      };
-
-      SubcomponentInstantiationDescriptionTypeInfoInitializer SubcomponentInstantiationDescriptionTypeInfoInitializer_;
-
-      struct SubcomponentPropertyReferenceTypeInfoInitializer
-      {
-        SubcomponentPropertyReferenceTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (SubcomponentPropertyReference));
-          ::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));
-        }
-      };
-
-      SubcomponentPropertyReferenceTypeInfoInitializer SubcomponentPropertyReferenceTypeInfoInitializer_;
-
-      struct AssemblyPropertyMappingTypeInfoInitializer
-      {
-        AssemblyPropertyMappingTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (AssemblyPropertyMapping));
-          ::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));
-        }
-      };
-
-      AssemblyPropertyMappingTypeInfoInitializer AssemblyPropertyMappingTypeInfoInitializer_;
-
-      struct ComponentAssemblyDescriptionTypeInfoInitializer
-      {
-        ComponentAssemblyDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ComponentAssemblyDescription));
-          ::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));
-        }
-      };
-
-      ComponentAssemblyDescriptionTypeInfoInitializer ComponentAssemblyDescriptionTypeInfoInitializer_;
-
-      struct MonolithicImplementationDescriptionTypeInfoInitializer
-      {
-        MonolithicImplementationDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (MonolithicImplementationDescription));
-          ::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));
-        }
-      };
-
-      MonolithicImplementationDescriptionTypeInfoInitializer MonolithicImplementationDescriptionTypeInfoInitializer_;
-
-      struct ComponentImplementationDescriptionTypeInfoInitializer
-      {
-        ComponentImplementationDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ComponentImplementationDescription));
-          ::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));
-        }
-      };
-
-      ComponentImplementationDescriptionTypeInfoInitializer ComponentImplementationDescriptionTypeInfoInitializer_;
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      // SubcomponentInstantiationDescription
-      //
-      //
-
-      void SubcomponentInstantiationDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        package (o);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
-        if (o.selectRequirement_p ()) selectRequirement (o);
-        else selectRequirement_none (o);
-        if (o.reference_p ()) reference (o);
-        else reference_none (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
-        post (o);
-      }
-
-      void SubcomponentInstantiationDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        package (o);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
-        if (o.selectRequirement_p ()) selectRequirement (o);
-        else selectRequirement_none (o);
-        if (o.reference_p ()) reference (o);
-        else reference_none (o);
-        if (o.id_p ()) id (o);
-        else id_none (o);
-        post (o);
-      }
-
-      void SubcomponentInstantiationDescription::
-      pre (Type&)
-      {
-      }
-
-      void SubcomponentInstantiationDescription::
-      pre (Type const&)
-      {
-      }
-
-      void SubcomponentInstantiationDescription::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void SubcomponentInstantiationDescription::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void SubcomponentInstantiationDescription::
-      package (Type& o)
-      {
-        dispatch (o.package ());
-      }
-
-      void SubcomponentInstantiationDescription::
-      package (Type const& o)
-      {
-        dispatch (o.package ());
-      }
-
-      void SubcomponentInstantiationDescription::
-      configProperty (Type& o)
-      {
-        dispatch (o.configProperty ());
-      }
-
-      void SubcomponentInstantiationDescription::
-      configProperty (Type const& o)
-      {
-        dispatch (o.configProperty ());
-      }
-
-      void SubcomponentInstantiationDescription::
-      configProperty_none (Type&)
-      {
-      }
-
-      void SubcomponentInstantiationDescription::
-      configProperty_none (Type const&)
-      {
-      }
-
-      void SubcomponentInstantiationDescription::
-      selectRequirement (Type& o)
-      {
-        dispatch (o.selectRequirement ());
-      }
-
-      void SubcomponentInstantiationDescription::
-      selectRequirement (Type const& o)
-      {
-        dispatch (o.selectRequirement ());
-      }
-
-      void SubcomponentInstantiationDescription::
-      selectRequirement_none (Type&)
-      {
-      }
-
-      void SubcomponentInstantiationDescription::
-      selectRequirement_none (Type const&)
-      {
-      }
-
-      void SubcomponentInstantiationDescription::
-      reference (Type& o)
-      {
-        dispatch (o.reference ());
-      }
-
-      void SubcomponentInstantiationDescription::
-      reference (Type const& o)
-      {
-        dispatch (o.reference ());
-      }
-
-      void SubcomponentInstantiationDescription::
-      reference_none (Type&)
-      {
-      }
-
-      void SubcomponentInstantiationDescription::
-      reference_none (Type const&)
-      {
-      }
-
-      void SubcomponentInstantiationDescription::
-      id (Type& o)
-      {
-        dispatch (o.id ());
-      }
-
-      void SubcomponentInstantiationDescription::
-      id (Type const& o)
-      {
-        dispatch (o.id ());
-      }
-
-      void SubcomponentInstantiationDescription::
-      id_none (Type&)
-      {
-      }
-
-      void SubcomponentInstantiationDescription::
-      id_none (Type const&)
-      {
-      }
-
-      void SubcomponentInstantiationDescription::
-      post (Type&)
-      {
-      }
-
-      void SubcomponentInstantiationDescription::
-      post (Type const&)
-      {
-      }
-
-      // SubcomponentPropertyReference
-      //
-      //
-
-      void SubcomponentPropertyReference::
-      traverse (Type& o)
-      {
-        pre (o);
-        propertyName (o);
-        instance (o);
-        post (o);
-      }
-
-      void SubcomponentPropertyReference::
-      traverse (Type const& o)
-      {
-        pre (o);
-        propertyName (o);
-        instance (o);
-        post (o);
-      }
-
-      void SubcomponentPropertyReference::
-      pre (Type&)
-      {
-      }
-
-      void SubcomponentPropertyReference::
-      pre (Type const&)
-      {
-      }
-
-      void SubcomponentPropertyReference::
-      propertyName (Type& o)
-      {
-        dispatch (o.propertyName ());
-      }
-
-      void SubcomponentPropertyReference::
-      propertyName (Type const& o)
-      {
-        dispatch (o.propertyName ());
-      }
-
-      void SubcomponentPropertyReference::
-      instance (Type& o)
-      {
-        dispatch (o.instance ());
-      }
-
-      void SubcomponentPropertyReference::
-      instance (Type const& o)
-      {
-        dispatch (o.instance ());
-      }
-
-      void SubcomponentPropertyReference::
-      post (Type&)
-      {
-      }
-
-      void SubcomponentPropertyReference::
-      post (Type const&)
-      {
-      }
-
-      // AssemblyPropertyMapping
-      //
-      //
-
-      void AssemblyPropertyMapping::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        externalName (o);
-        delegatesTo (o);
-        post (o);
-      }
-
-      void AssemblyPropertyMapping::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        externalName (o);
-        delegatesTo (o);
-        post (o);
-      }
-
-      void AssemblyPropertyMapping::
-      pre (Type&)
-      {
-      }
-
-      void AssemblyPropertyMapping::
-      pre (Type const&)
-      {
-      }
-
-      void AssemblyPropertyMapping::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void AssemblyPropertyMapping::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void AssemblyPropertyMapping::
-      externalName (Type& o)
-      {
-        dispatch (o.externalName ());
-      }
-
-      void AssemblyPropertyMapping::
-      externalName (Type const& o)
-      {
-        dispatch (o.externalName ());
-      }
-
-      void AssemblyPropertyMapping::
-      delegatesTo (Type& o)
-      {
-        dispatch (o.delegatesTo ());
-      }
-
-      void AssemblyPropertyMapping::
-      delegatesTo (Type const& o)
-      {
-        dispatch (o.delegatesTo ());
-      }
-
-      void AssemblyPropertyMapping::
-      post (Type&)
-      {
-      }
-
-      void AssemblyPropertyMapping::
-      post (Type const&)
-      {
-      }
-
-      // ComponentAssemblyDescription
-      //
-      //
-
-      void ComponentAssemblyDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        instance (o);
-        connection (o);
-        if (o.externalProperty_p ()) externalProperty (o);
-        else externalProperty_none (o);
-        post (o);
-      }
-
-      void ComponentAssemblyDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        instance (o);
-        connection (o);
-        if (o.externalProperty_p ()) externalProperty (o);
-        else externalProperty_none (o);
-        post (o);
-      }
-
-      void ComponentAssemblyDescription::
-      pre (Type&)
-      {
-      }
-
-      void ComponentAssemblyDescription::
-      pre (Type const&)
-      {
-      }
-
-      void ComponentAssemblyDescription::
-      instance (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentAssemblyDescription::Type::instance_iterator b (o.begin_instance()), e (o.end_instance());
-
-        if (b != e)
-        {
-          instance_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) instance_next (o);
-          }
-
-          instance_post (o);
-        }
-      }
-
-      void ComponentAssemblyDescription::
-      instance (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentAssemblyDescription::Type::instance_const_iterator b (o.begin_instance()), e (o.end_instance());
-
-        if (b != e)
-        {
-          instance_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) instance_next (o);
-          }
-
-          instance_post (o);
-        }
-      }
-
-      void ComponentAssemblyDescription::
-      instance_pre (Type&)
-      {
-      }
-
-      void ComponentAssemblyDescription::
-      instance_pre (Type const&)
-      {
-      }
-
-      void ComponentAssemblyDescription::
-      instance_next (Type&)
-      {
-      }
-
-      void ComponentAssemblyDescription::
-      instance_next (Type const&)
-      {
-      }
-
-      void ComponentAssemblyDescription::
-      instance_post (Type&)
-      {
-      }
-
-      void ComponentAssemblyDescription::
-      instance_post (Type const&)
-      {
-      }
-
-      void ComponentAssemblyDescription::
-      connection (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentAssemblyDescription::Type::connection_iterator b (o.begin_connection()), e (o.end_connection());
-
-        if (b != e)
-        {
-          connection_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) connection_next (o);
-          }
-
-          connection_post (o);
-        }
-      }
-
-      void ComponentAssemblyDescription::
-      connection (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ComponentAssemblyDescription::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection());
-
-        if (b != e)
-        {
-          connection_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) connection_next (o);
-          }
-
-          connection_post (o);
-        }
-      }
-
-      void ComponentAssemblyDescription::
-      connection_pre (Type&)
-      {
-      }
-
-      void ComponentAssemblyDescription::
-      connection_pre (Type const&)
-      {
-      }
-
-      void ComponentAssemblyDescription::
-      connection_next (Type&)
-      {
-      }
-
-      void ComponentAssemblyDescription::
-      connection_next (Type const&)
-      {
-      }
-
-      void ComponentAssemblyDescription::
-      connection_post (Type&)
-      {
-      }
-
-      void ComponentAssemblyDescription::
-      connection_post (Type const&)
-      {
-      }
-
-      void ComponentAssemblyDescription::
-      externalProperty (Type& o)
-      {
-        dispatch (o.externalProperty ());
-      }
-
-      void ComponentAssemblyDescription::
-      externalProperty (Type const& o)
-      {
-        dispatch (o.externalProperty ());
-      }
-
-      void ComponentAssemblyDescription::
-      externalProperty_none (Type&)
-      {
-      }
-
-      void ComponentAssemblyDescription::
-      externalProperty_none (Type const&)
-      {
-      }
-
-      void ComponentAssemblyDescription::
-      post (Type&)
-      {
-      }
-
-      void ComponentAssemblyDescription::
-      post (Type const&)
-      {
-      }
-
-      // MonolithicImplementationDescription
-      //
-      //
-
-      void MonolithicImplementationDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        if (o.execParameter_p ()) execParameter (o);
-        else execParameter_none (o);
-        primaryArtifact (o);
-        if (o.deployRequirement_p ()) deployRequirement (o);
-        else deployRequirement_none (o);
-        post (o);
-      }
-
-      void MonolithicImplementationDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        if (o.execParameter_p ()) execParameter (o);
-        else execParameter_none (o);
-        primaryArtifact (o);
-        if (o.deployRequirement_p ()) deployRequirement (o);
-        else deployRequirement_none (o);
-        post (o);
-      }
-
-      void MonolithicImplementationDescription::
-      pre (Type&)
-      {
-      }
-
-      void MonolithicImplementationDescription::
-      pre (Type const&)
-      {
-      }
-
-      void MonolithicImplementationDescription::
-      execParameter (Type& o)
-      {
-        dispatch (o.execParameter ());
-      }
-
-      void MonolithicImplementationDescription::
-      execParameter (Type const& o)
-      {
-        dispatch (o.execParameter ());
-      }
-
-      void MonolithicImplementationDescription::
-      execParameter_none (Type&)
-      {
-      }
-
-      void MonolithicImplementationDescription::
-      execParameter_none (Type const&)
-      {
-      }
-
-      void MonolithicImplementationDescription::
-      primaryArtifact (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicImplementationDescription::Type::primaryArtifact_iterator b (o.begin_primaryArtifact()), e (o.end_primaryArtifact());
-
-        if (b != e)
-        {
-          primaryArtifact_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) primaryArtifact_next (o);
-          }
-
-          primaryArtifact_post (o);
-        }
-      }
-
-      void MonolithicImplementationDescription::
-      primaryArtifact (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        MonolithicImplementationDescription::Type::primaryArtifact_const_iterator b (o.begin_primaryArtifact()), e (o.end_primaryArtifact());
-
-        if (b != e)
-        {
-          primaryArtifact_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) primaryArtifact_next (o);
-          }
-
-          primaryArtifact_post (o);
-        }
-      }
-
-      void MonolithicImplementationDescription::
-      primaryArtifact_pre (Type&)
-      {
-      }
-
-      void MonolithicImplementationDescription::
-      primaryArtifact_pre (Type const&)
-      {
-      }
-
-      void MonolithicImplementationDescription::
-      primaryArtifact_next (Type&)
-      {
-      }
-
-      void MonolithicImplementationDescription::
-      primaryArtifact_next (Type const&)
-      {
-      }
-
-      void MonolithicImplementationDescription::
-      primaryArtifact_post (Type&)
-      {
-      }
-
-      void MonolithicImplementationDescription::
-      primaryArtifact_post (Type const&)
-      {
-      }
-
-      void MonolithicImplementationDescription::
-      deployRequirement (Type& o)
-      {
-        dispatch (o.deployRequirement ());
-      }
-
-      void MonolithicImplementationDescription::
-      deployRequirement (Type const& o)
-      {
-        dispatch (o.deployRequirement ());
-      }
-
-      void MonolithicImplementationDescription::
-      deployRequirement_none (Type&)
-      {
-      }
-
-      void MonolithicImplementationDescription::
-      deployRequirement_none (Type const&)
-      {
-      }
-
-      void MonolithicImplementationDescription::
-      post (Type&)
-      {
-      }
-
-      void MonolithicImplementationDescription::
-      post (Type const&)
-      {
-      }
-
-      // ComponentImplementationDescription
-      //
-      //
-
-      void ComponentImplementationDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        if (o.UUID_p ()) UUID (o);
-        else UUID_none (o);
-        if (o.implements_p ()) implements (o);
-        else implements_none (o);
-        if (o.assemblyImpl_p ()) assemblyImpl (o);
-        else assemblyImpl_none (o);
-        if (o.monolithicImpl_p ()) monolithicImpl (o);
-        else monolithicImpl_none (o);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
-        if (o.capability_p ()) capability (o);
-        else capability_none (o);
-        if (o.dependsOn_p ()) dependsOn (o);
-        else dependsOn_none (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (o);
-        if (o.contentLocation_p ()) contentLocation (o);
-        else contentLocation_none (o);
-        post (o);
-      }
-
-      void ComponentImplementationDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        if (o.UUID_p ()) UUID (o);
-        else UUID_none (o);
-        if (o.implements_p ()) implements (o);
-        else implements_none (o);
-        if (o.assemblyImpl_p ()) assemblyImpl (o);
-        else assemblyImpl_none (o);
-        if (o.monolithicImpl_p ()) monolithicImpl (o);
-        else monolithicImpl_none (o);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
-        if (o.capability_p ()) capability (o);
-        else capability_none (o);
-        if (o.dependsOn_p ()) dependsOn (o);
-        else dependsOn_none (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (o);
-        if (o.contentLocation_p ()) contentLocation (o);
-        else contentLocation_none (o);
-        post (o);
-      }
-
-      void ComponentImplementationDescription::
-      pre (Type&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      pre (Type const&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      label (Type& o)
-      {
-        dispatch (o.label ());
-      }
-
-      void ComponentImplementationDescription::
-      label (Type const& o)
-      {
-        dispatch (o.label ());
-      }
-
-      void ComponentImplementationDescription::
-      label_none (Type&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      label_none (Type const&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      UUID (Type& o)
-      {
-        dispatch (o.UUID ());
-      }
-
-      void ComponentImplementationDescription::
-      UUID (Type const& o)
-      {
-        dispatch (o.UUID ());
-      }
-
-      void ComponentImplementationDescription::
-      UUID_none (Type&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      UUID_none (Type const&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      implements (Type& o)
-      {
-        dispatch (o.implements ());
-      }
-
-      void ComponentImplementationDescription::
-      implements (Type const& o)
-      {
-        dispatch (o.implements ());
-      }
-
-      void ComponentImplementationDescription::
-      implements_none (Type&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      implements_none (Type const&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      assemblyImpl (Type& o)
-      {
-        dispatch (o.assemblyImpl ());
-      }
-
-      void ComponentImplementationDescription::
-      assemblyImpl (Type const& o)
-      {
-        dispatch (o.assemblyImpl ());
-      }
-
-      void ComponentImplementationDescription::
-      assemblyImpl_none (Type&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      assemblyImpl_none (Type const&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      monolithicImpl (Type& o)
-      {
-        dispatch (o.monolithicImpl ());
-      }
-
-      void ComponentImplementationDescription::
-      monolithicImpl (Type const& o)
-      {
-        dispatch (o.monolithicImpl ());
-      }
-
-      void ComponentImplementationDescription::
-      monolithicImpl_none (Type&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      monolithicImpl_none (Type const&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      configProperty (Type& o)
-      {
-        dispatch (o.configProperty ());
-      }
-
-      void ComponentImplementationDescription::
-      configProperty (Type const& o)
-      {
-        dispatch (o.configProperty ());
-      }
-
-      void ComponentImplementationDescription::
-      configProperty_none (Type&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      configProperty_none (Type const&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      capability (Type& o)
-      {
-        dispatch (o.capability ());
-      }
-
-      void ComponentImplementationDescription::
-      capability (Type const& o)
-      {
-        dispatch (o.capability ());
-      }
-
-      void ComponentImplementationDescription::
-      capability_none (Type&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      capability_none (Type const&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      dependsOn (Type& o)
-      {
-        dispatch (o.dependsOn ());
-      }
-
-      void ComponentImplementationDescription::
-      dependsOn (Type const& o)
-      {
-        dispatch (o.dependsOn ());
-      }
-
-      void ComponentImplementationDescription::
-      dependsOn_none (Type&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      dependsOn_none (Type const&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      infoProperty (Type& o)
-      {
-        dispatch (o.infoProperty ());
-      }
-
-      void ComponentImplementationDescription::
-      infoProperty (Type const& o)
-      {
-        dispatch (o.infoProperty ());
-      }
-
-      void ComponentImplementationDescription::
-      infoProperty_none (Type&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      infoProperty_none (Type const&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      contentLocation (Type& o)
-      {
-        dispatch (o.contentLocation ());
-      }
-
-      void ComponentImplementationDescription::
-      contentLocation (Type const& o)
-      {
-        dispatch (o.contentLocation ());
-      }
-
-      void ComponentImplementationDescription::
-      contentLocation_none (Type&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      contentLocation_none (Type const&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      post (Type&)
-      {
-      }
-
-      void ComponentImplementationDescription::
-      post (Type const&)
-      {
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      // SubcomponentInstantiationDescription
-      //
-      //
-
-      SubcomponentInstantiationDescription::
-      SubcomponentInstantiationDescription (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      SubcomponentInstantiationDescription::
-      SubcomponentInstantiationDescription ()
-      {
-      }
-
-      void SubcomponentInstantiationDescription::
-      traverse (Type const& o)
-      {
-        Traversal::SubcomponentInstantiationDescription::traverse (o);
-      }
-
-      void SubcomponentInstantiationDescription::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("name", top_ ()));
-        Traversal::SubcomponentInstantiationDescription::name (o);
-        pop_ ();
-      }
-
-      void SubcomponentInstantiationDescription::
-      package (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("package", top_ ()));
-        Traversal::SubcomponentInstantiationDescription::package (o);
-        pop_ ();
-      }
-
-      void SubcomponentInstantiationDescription::
-      configProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("configProperty", top_ ()));
-        Traversal::SubcomponentInstantiationDescription::configProperty (o);
-        pop_ ();
-      }
-
-      void SubcomponentInstantiationDescription::
-      selectRequirement (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("selectRequirement", top_ ()));
-        Traversal::SubcomponentInstantiationDescription::selectRequirement (o);
-        pop_ ();
-      }
-
-      void SubcomponentInstantiationDescription::
-      reference (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("reference", top_ ()));
-        Traversal::SubcomponentInstantiationDescription::reference (o);
-        pop_ ();
-      }
-
-      void SubcomponentInstantiationDescription::
-      id (Type const& o)
-      {
-        ::XSCRT::XML::Attribute< char > a ("id", "", top_ ());
-        attr_ (&a);
-        Traversal::SubcomponentInstantiationDescription::id (o);
-        attr_ (0);
-      }
-
-      // SubcomponentPropertyReference
-      //
-      //
-
-      SubcomponentPropertyReference::
-      SubcomponentPropertyReference (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      SubcomponentPropertyReference::
-      SubcomponentPropertyReference ()
-      {
-      }
-
-      void SubcomponentPropertyReference::
-      traverse (Type const& o)
-      {
-        Traversal::SubcomponentPropertyReference::traverse (o);
-      }
-
-      void SubcomponentPropertyReference::
-      propertyName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("propertyName", top_ ()));
-        Traversal::SubcomponentPropertyReference::propertyName (o);
-        pop_ ();
-      }
-
-      void SubcomponentPropertyReference::
-      instance (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("instance", top_ ()));
-        Traversal::SubcomponentPropertyReference::instance (o);
-        pop_ ();
-      }
-
-      // AssemblyPropertyMapping
-      //
-      //
-
-      AssemblyPropertyMapping::
-      AssemblyPropertyMapping (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      AssemblyPropertyMapping::
-      AssemblyPropertyMapping ()
-      {
-      }
-
-      void AssemblyPropertyMapping::
-      traverse (Type const& o)
-      {
-        Traversal::AssemblyPropertyMapping::traverse (o);
-      }
-
-      void AssemblyPropertyMapping::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("name", top_ ()));
-        Traversal::AssemblyPropertyMapping::name (o);
-        pop_ ();
-      }
-
-      void AssemblyPropertyMapping::
-      externalName (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("externalName", top_ ()));
-        Traversal::AssemblyPropertyMapping::externalName (o);
-        pop_ ();
-      }
-
-      void AssemblyPropertyMapping::
-      delegatesTo (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("delegatesTo", top_ ()));
-        Traversal::AssemblyPropertyMapping::delegatesTo (o);
-        pop_ ();
-      }
-
-      // ComponentAssemblyDescription
-      //
-      //
-
-      ComponentAssemblyDescription::
-      ComponentAssemblyDescription (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      ComponentAssemblyDescription::
-      ComponentAssemblyDescription ()
-      {
-      }
-
-      void ComponentAssemblyDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ComponentAssemblyDescription::traverse (o);
-      }
-
-      void ComponentAssemblyDescription::
-      instance_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("instance", top_ ()));
-      }
-
-      void ComponentAssemblyDescription::
-      instance_next (Type const& o)
-      {
-        instance_post (o);
-        instance_pre (o);
-      }
-
-      void ComponentAssemblyDescription::
-      instance_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void ComponentAssemblyDescription::
-      connection_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("connection", top_ ()));
-      }
-
-      void ComponentAssemblyDescription::
-      connection_next (Type const& o)
-      {
-        connection_post (o);
-        connection_pre (o);
-      }
-
-      void ComponentAssemblyDescription::
-      connection_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void ComponentAssemblyDescription::
-      externalProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("externalProperty", top_ ()));
-        Traversal::ComponentAssemblyDescription::externalProperty (o);
-        pop_ ();
-      }
-
-      // MonolithicImplementationDescription
-      //
-      //
-
-      MonolithicImplementationDescription::
-      MonolithicImplementationDescription (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      MonolithicImplementationDescription::
-      MonolithicImplementationDescription ()
-      {
-      }
-
-      void MonolithicImplementationDescription::
-      traverse (Type const& o)
-      {
-        Traversal::MonolithicImplementationDescription::traverse (o);
-      }
-
-      void MonolithicImplementationDescription::
-      execParameter (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("execParameter", top_ ()));
-        Traversal::MonolithicImplementationDescription::execParameter (o);
-        pop_ ();
-      }
-
-      void MonolithicImplementationDescription::
-      primaryArtifact_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("primaryArtifact", top_ ()));
-      }
-
-      void MonolithicImplementationDescription::
-      primaryArtifact_next (Type const& o)
-      {
-        primaryArtifact_post (o);
-        primaryArtifact_pre (o);
-      }
-
-      void MonolithicImplementationDescription::
-      primaryArtifact_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void MonolithicImplementationDescription::
-      deployRequirement (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("deployRequirement", top_ ()));
-        Traversal::MonolithicImplementationDescription::deployRequirement (o);
-        pop_ ();
-      }
-
-      // ComponentImplementationDescription
-      //
-      //
-
-      ComponentImplementationDescription::
-      ComponentImplementationDescription (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      ComponentImplementationDescription::
-      ComponentImplementationDescription ()
-      {
-      }
-
-      void ComponentImplementationDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ComponentImplementationDescription::traverse (o);
-      }
-
-      void ComponentImplementationDescription::
-      label (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("label", top_ ()));
-        Traversal::ComponentImplementationDescription::label (o);
-        pop_ ();
-      }
-
-      void ComponentImplementationDescription::
-      UUID (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("UUID", top_ ()));
-        Traversal::ComponentImplementationDescription::UUID (o);
-        pop_ ();
-      }
-
-      void ComponentImplementationDescription::
-      implements (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("implements", top_ ()));
-        Traversal::ComponentImplementationDescription::implements (o);
-        pop_ ();
-      }
-
-      void ComponentImplementationDescription::
-      assemblyImpl (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("assemblyImpl", top_ ()));
-        Traversal::ComponentImplementationDescription::assemblyImpl (o);
-        pop_ ();
-      }
-
-      void ComponentImplementationDescription::
-      monolithicImpl (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("monolithicImpl", top_ ()));
-        Traversal::ComponentImplementationDescription::monolithicImpl (o);
-        pop_ ();
-      }
-
-      void ComponentImplementationDescription::
-      configProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("configProperty", top_ ()));
-        Traversal::ComponentImplementationDescription::configProperty (o);
-        pop_ ();
-      }
-
-      void ComponentImplementationDescription::
-      capability (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("capability", top_ ()));
-        Traversal::ComponentImplementationDescription::capability (o);
-        pop_ ();
-      }
-
-      void ComponentImplementationDescription::
-      dependsOn (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("dependsOn", top_ ()));
-        Traversal::ComponentImplementationDescription::dependsOn (o);
-        pop_ ();
-      }
-
-      void ComponentImplementationDescription::
-      infoProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("infoProperty", top_ ()));
-        Traversal::ComponentImplementationDescription::infoProperty (o);
-        pop_ ();
-      }
-
-      void ComponentImplementationDescription::
-      contentLocation (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("contentLocation", top_ ()));
-        Traversal::ComponentImplementationDescription::contentLocation (o);
-        pop_ ();
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp
index eb7ef29e00c..cec4bfcfced 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp
@@ -451,654 +451,4 @@ namespace CIAO
   }
 }
 
-#include <XMLSchema/Traversal.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      struct SubcomponentInstantiationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >
-      {
-        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
-        package (Type&);
-
-        virtual void
-        package (Type const&);
-
-        virtual void
-        configProperty (Type&);
-
-        virtual void
-        configProperty (Type const&);
-
-        virtual void
-        configProperty_none (Type&);
-
-        virtual void
-        configProperty_none (Type const&);
-
-        virtual void
-        selectRequirement (Type&);
-
-        virtual void
-        selectRequirement (Type const&);
-
-        virtual void
-        selectRequirement_none (Type&);
-
-        virtual void
-        selectRequirement_none (Type const&);
-
-        virtual void
-        reference (Type&);
-
-        virtual void
-        reference (Type const&);
-
-        virtual void
-        reference_none (Type&);
-
-        virtual void
-        reference_none (Type const&);
-
-        virtual void
-        id (Type&);
-
-        virtual void
-        id (Type const&);
-
-        virtual void
-        id_none (Type&);
-
-        virtual void
-        id_none (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct SubcomponentPropertyReference : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::SubcomponentPropertyReference >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (Type const&);
-
-        virtual void
-        propertyName (Type&);
-
-        virtual void
-        propertyName (Type const&);
-
-        virtual void
-        instance (Type&);
-
-        virtual void
-        instance (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct AssemblyPropertyMapping : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::AssemblyPropertyMapping >
-      {
-        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
-        externalName (Type&);
-
-        virtual void
-        externalName (Type const&);
-
-        virtual void
-        delegatesTo (Type&);
-
-        virtual void
-        delegatesTo (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct ComponentAssemblyDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentAssemblyDescription >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (Type const&);
-
-        virtual void
-        instance (Type&);
-
-        virtual void
-        instance (Type const&);
-
-        virtual void
-        instance_pre (Type&);
-
-        virtual void
-        instance_pre (Type const&);
-
-        virtual void
-        instance_next (Type&);
-
-        virtual void
-        instance_next (Type const&);
-
-        virtual void
-        instance_post (Type&);
-
-        virtual void
-        instance_post (Type const&);
-
-        virtual void
-        connection (Type&);
-
-        virtual void
-        connection (Type const&);
-
-        virtual void
-        connection_pre (Type&);
-
-        virtual void
-        connection_pre (Type const&);
-
-        virtual void
-        connection_next (Type&);
-
-        virtual void
-        connection_next (Type const&);
-
-        virtual void
-        connection_post (Type&);
-
-        virtual void
-        connection_post (Type const&);
-
-        virtual void
-        externalProperty (Type&);
-
-        virtual void
-        externalProperty (Type const&);
-
-        virtual void
-        externalProperty_none (Type&);
-
-        virtual void
-        externalProperty_none (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct MonolithicImplementationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MonolithicImplementationDescription >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (Type const&);
-
-        virtual void
-        execParameter (Type&);
-
-        virtual void
-        execParameter (Type const&);
-
-        virtual void
-        execParameter_none (Type&);
-
-        virtual void
-        execParameter_none (Type const&);
-
-        virtual void
-        primaryArtifact (Type&);
-
-        virtual void
-        primaryArtifact (Type const&);
-
-        virtual void
-        primaryArtifact_pre (Type&);
-
-        virtual void
-        primaryArtifact_pre (Type const&);
-
-        virtual void
-        primaryArtifact_next (Type&);
-
-        virtual void
-        primaryArtifact_next (Type const&);
-
-        virtual void
-        primaryArtifact_post (Type&);
-
-        virtual void
-        primaryArtifact_post (Type const&);
-
-        virtual void
-        deployRequirement (Type&);
-
-        virtual void
-        deployRequirement (Type const&);
-
-        virtual void
-        deployRequirement_none (Type&);
-
-        virtual void
-        deployRequirement_none (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct ComponentImplementationDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentImplementationDescription >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (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
-        implements (Type&);
-
-        virtual void
-        implements (Type const&);
-
-        virtual void
-        implements_none (Type&);
-
-        virtual void
-        implements_none (Type const&);
-
-        virtual void
-        assemblyImpl (Type&);
-
-        virtual void
-        assemblyImpl (Type const&);
-
-        virtual void
-        assemblyImpl_none (Type&);
-
-        virtual void
-        assemblyImpl_none (Type const&);
-
-        virtual void
-        monolithicImpl (Type&);
-
-        virtual void
-        monolithicImpl (Type const&);
-
-        virtual void
-        monolithicImpl_none (Type&);
-
-        virtual void
-        monolithicImpl_none (Type const&);
-
-        virtual void
-        configProperty (Type&);
-
-        virtual void
-        configProperty (Type const&);
-
-        virtual void
-        configProperty_none (Type&);
-
-        virtual void
-        configProperty_none (Type const&);
-
-        virtual void
-        capability (Type&);
-
-        virtual void
-        capability (Type const&);
-
-        virtual void
-        capability_none (Type&);
-
-        virtual void
-        capability_none (Type const&);
-
-        virtual void
-        dependsOn (Type&);
-
-        virtual void
-        dependsOn (Type const&);
-
-        virtual void
-        dependsOn_none (Type&);
-
-        virtual void
-        dependsOn_none (Type const&);
-
-        virtual void
-        infoProperty (Type&);
-
-        virtual void
-        infoProperty (Type const&);
-
-        virtual void
-        infoProperty_none (Type&);
-
-        virtual void
-        infoProperty_none (Type const&);
-
-        virtual void
-        contentLocation (Type&);
-
-        virtual void
-        contentLocation (Type const&);
-
-        virtual void
-        contentLocation_none (Type&);
-
-        virtual void
-        contentLocation_none (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
-}
-
-#include <XMLSchema/Writer.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct SubcomponentInstantiationDescription : Traversal::SubcomponentInstantiationDescription, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::SubcomponentInstantiationDescription Type;
-        SubcomponentInstantiationDescription (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        name (Type const&);
-
-        virtual void
-        package (Type const&);
-
-        virtual void
-        configProperty (Type const&);
-
-        virtual void
-        selectRequirement (Type const&);
-
-        virtual void
-        reference (Type const&);
-
-        virtual void
-        id (Type const&);
-
-        protected:
-        SubcomponentInstantiationDescription ();
-      };
-
-      struct SubcomponentPropertyReference : Traversal::SubcomponentPropertyReference, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::SubcomponentPropertyReference Type;
-        SubcomponentPropertyReference (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        propertyName (Type const&);
-
-        virtual void
-        instance (Type const&);
-
-        protected:
-        SubcomponentPropertyReference ();
-      };
-
-      struct AssemblyPropertyMapping : Traversal::AssemblyPropertyMapping, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::AssemblyPropertyMapping Type;
-        AssemblyPropertyMapping (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        name (Type const&);
-
-        virtual void
-        externalName (Type const&);
-
-        virtual void
-        delegatesTo (Type const&);
-
-        protected:
-        AssemblyPropertyMapping ();
-      };
-
-      struct ComponentAssemblyDescription : Traversal::ComponentAssemblyDescription, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::ComponentAssemblyDescription Type;
-        ComponentAssemblyDescription (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        instance_pre (Type const&);
-
-        virtual void
-        instance_next (Type const&);
-
-        virtual void
-        instance_post (Type const&);
-
-        virtual void
-        connection_pre (Type const&);
-
-        virtual void
-        connection_next (Type const&);
-
-        virtual void
-        connection_post (Type const&);
-
-        virtual void
-        externalProperty (Type const&);
-
-        protected:
-        ComponentAssemblyDescription ();
-      };
-
-      struct MonolithicImplementationDescription : Traversal::MonolithicImplementationDescription, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::MonolithicImplementationDescription Type;
-        MonolithicImplementationDescription (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        execParameter (Type const&);
-
-        virtual void
-        primaryArtifact_pre (Type const&);
-
-        virtual void
-        primaryArtifact_next (Type const&);
-
-        virtual void
-        primaryArtifact_post (Type const&);
-
-        virtual void
-        deployRequirement (Type const&);
-
-        protected:
-        MonolithicImplementationDescription ();
-      };
-
-      struct ComponentImplementationDescription : Traversal::ComponentImplementationDescription, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::ComponentImplementationDescription Type;
-        ComponentImplementationDescription (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        label (Type const&);
-
-        virtual void
-        UUID (Type const&);
-
-        virtual void
-        implements (Type const&);
-
-        virtual void
-        assemblyImpl (Type const&);
-
-        virtual void
-        monolithicImpl (Type const&);
-
-        virtual void
-        configProperty (Type const&);
-
-        virtual void
-        capability (Type const&);
-
-        virtual void
-        dependsOn (Type const&);
-
-        virtual void
-        infoProperty (Type const&);
-
-        virtual void
-        contentLocation (Type const&);
-
-        protected:
-        ComponentImplementationDescription ();
-      };
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
 #endif // CID_HPP
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cpd.cpp b/TAO/CIAO/DAnCE/Config_Handlers/cpd.cpp
index ca447d7f41c..08c316f440f 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cpd.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cpd.cpp
@@ -11,7 +11,7 @@ namespace CIAO
     PackagedComponentImplementation::
     PackagedComponentImplementation (::XMLSchema::string< char > const& name__,
     ::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation__)
-    :
+    : 
     name_ (new ::XMLSchema::string< char > (name__)),
     referencedImplementation_ (new ::CIAO::Config_Handlers::ComponentImplementationDescription (referencedImplementation__)),
     regulator__ ()
@@ -23,6 +23,7 @@ namespace CIAO
     PackagedComponentImplementation::
     PackagedComponentImplementation (::CIAO::Config_Handlers::PackagedComponentImplementation const& s)
     :
+    XSCRT::Type (), 
     name_ (new ::XMLSchema::string< char > (*s.name_)),
     referencedImplementation_ (new ::CIAO::Config_Handlers::ComponentImplementationDescription (*s.referencedImplementation_)),
     regulator__ ()
@@ -88,7 +89,7 @@ namespace CIAO
 
     ComponentPackageDescription::
     ComponentPackageDescription ()
-    :
+    : 
     regulator__ ()
     {
     }
@@ -96,6 +97,7 @@ namespace CIAO
     ComponentPackageDescription::
     ComponentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const& s)
     :
+    XSCRT::Type (), 
     label_ (s.label_.get () ? new ::XMLSchema::string< char > (*s.label_) : 0),
     UUID_ (s.UUID_.get () ? new ::XMLSchema::string< char > (*s.UUID_) : 0),
     realizes_ (s.realizes_.get () ? new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.realizes_) : 0),
@@ -498,469 +500,3 @@ namespace CIAO
   }
 }
 
-#include <XMLSchema/TypeInfo.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace
-    {
-      ::XMLSchema::TypeInfoInitializer < char > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
-
-      struct PackagedComponentImplementationTypeInfoInitializer
-      {
-        PackagedComponentImplementationTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (PackagedComponentImplementation));
-          ::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));
-        }
-      };
-
-      PackagedComponentImplementationTypeInfoInitializer PackagedComponentImplementationTypeInfoInitializer_;
-
-      struct ComponentPackageDescriptionTypeInfoInitializer
-      {
-        ComponentPackageDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ComponentPackageDescription));
-          ::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));
-        }
-      };
-
-      ComponentPackageDescriptionTypeInfoInitializer ComponentPackageDescriptionTypeInfoInitializer_;
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      // PackagedComponentImplementation
-      //
-      //
-
-      void PackagedComponentImplementation::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        referencedImplementation (o);
-        post (o);
-      }
-
-      void PackagedComponentImplementation::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        referencedImplementation (o);
-        post (o);
-      }
-
-      void PackagedComponentImplementation::
-      pre (Type&)
-      {
-      }
-
-      void PackagedComponentImplementation::
-      pre (Type const&)
-      {
-      }
-
-      void PackagedComponentImplementation::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void PackagedComponentImplementation::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void PackagedComponentImplementation::
-      referencedImplementation (Type& o)
-      {
-        dispatch (o.referencedImplementation ());
-      }
-
-      void PackagedComponentImplementation::
-      referencedImplementation (Type const& o)
-      {
-        dispatch (o.referencedImplementation ());
-      }
-
-      void PackagedComponentImplementation::
-      post (Type&)
-      {
-      }
-
-      void PackagedComponentImplementation::
-      post (Type const&)
-      {
-      }
-
-      // ComponentPackageDescription
-      //
-      //
-
-      void ComponentPackageDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        if (o.UUID_p ()) UUID (o);
-        else UUID_none (o);
-        if (o.realizes_p ()) realizes (o);
-        else realizes_none (o);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
-        if (o.implementation_p ()) implementation (o);
-        else implementation_none (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (o);
-        if (o.contentLocation_p ()) contentLocation (o);
-        else contentLocation_none (o);
-        post (o);
-      }
-
-      void ComponentPackageDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        if (o.UUID_p ()) UUID (o);
-        else UUID_none (o);
-        if (o.realizes_p ()) realizes (o);
-        else realizes_none (o);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
-        if (o.implementation_p ()) implementation (o);
-        else implementation_none (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (o);
-        if (o.contentLocation_p ()) contentLocation (o);
-        else contentLocation_none (o);
-        post (o);
-      }
-
-      void ComponentPackageDescription::
-      pre (Type&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      pre (Type const&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      label (Type& o)
-      {
-        dispatch (o.label ());
-      }
-
-      void ComponentPackageDescription::
-      label (Type const& o)
-      {
-        dispatch (o.label ());
-      }
-
-      void ComponentPackageDescription::
-      label_none (Type&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      label_none (Type const&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      UUID (Type& o)
-      {
-        dispatch (o.UUID ());
-      }
-
-      void ComponentPackageDescription::
-      UUID (Type const& o)
-      {
-        dispatch (o.UUID ());
-      }
-
-      void ComponentPackageDescription::
-      UUID_none (Type&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      UUID_none (Type const&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      realizes (Type& o)
-      {
-        dispatch (o.realizes ());
-      }
-
-      void ComponentPackageDescription::
-      realizes (Type const& o)
-      {
-        dispatch (o.realizes ());
-      }
-
-      void ComponentPackageDescription::
-      realizes_none (Type&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      realizes_none (Type const&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      configProperty (Type& o)
-      {
-        dispatch (o.configProperty ());
-      }
-
-      void ComponentPackageDescription::
-      configProperty (Type const& o)
-      {
-        dispatch (o.configProperty ());
-      }
-
-      void ComponentPackageDescription::
-      configProperty_none (Type&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      configProperty_none (Type const&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      implementation (Type& o)
-      {
-        dispatch (o.implementation ());
-      }
-
-      void ComponentPackageDescription::
-      implementation (Type const& o)
-      {
-        dispatch (o.implementation ());
-      }
-
-      void ComponentPackageDescription::
-      implementation_none (Type&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      implementation_none (Type const&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      infoProperty (Type& o)
-      {
-        dispatch (o.infoProperty ());
-      }
-
-      void ComponentPackageDescription::
-      infoProperty (Type const& o)
-      {
-        dispatch (o.infoProperty ());
-      }
-
-      void ComponentPackageDescription::
-      infoProperty_none (Type&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      infoProperty_none (Type const&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      contentLocation (Type& o)
-      {
-        dispatch (o.contentLocation ());
-      }
-
-      void ComponentPackageDescription::
-      contentLocation (Type const& o)
-      {
-        dispatch (o.contentLocation ());
-      }
-
-      void ComponentPackageDescription::
-      contentLocation_none (Type&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      contentLocation_none (Type const&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      post (Type&)
-      {
-      }
-
-      void ComponentPackageDescription::
-      post (Type const&)
-      {
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      // PackagedComponentImplementation
-      //
-      //
-
-      PackagedComponentImplementation::
-      PackagedComponentImplementation (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      PackagedComponentImplementation::
-      PackagedComponentImplementation ()
-      {
-      }
-
-      void PackagedComponentImplementation::
-      traverse (Type const& o)
-      {
-        Traversal::PackagedComponentImplementation::traverse (o);
-      }
-
-      void PackagedComponentImplementation::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("name", top_ ()));
-        Traversal::PackagedComponentImplementation::name (o);
-        pop_ ();
-      }
-
-      void PackagedComponentImplementation::
-      referencedImplementation (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("referencedImplementation", top_ ()));
-        Traversal::PackagedComponentImplementation::referencedImplementation (o);
-        pop_ ();
-      }
-
-      // ComponentPackageDescription
-      //
-      //
-
-      ComponentPackageDescription::
-      ComponentPackageDescription (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      ComponentPackageDescription::
-      ComponentPackageDescription ()
-      {
-      }
-
-      void ComponentPackageDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ComponentPackageDescription::traverse (o);
-      }
-
-      void ComponentPackageDescription::
-      label (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("label", top_ ()));
-        Traversal::ComponentPackageDescription::label (o);
-        pop_ ();
-      }
-
-      void ComponentPackageDescription::
-      UUID (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("UUID", top_ ()));
-        Traversal::ComponentPackageDescription::UUID (o);
-        pop_ ();
-      }
-
-      void ComponentPackageDescription::
-      realizes (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("realizes", top_ ()));
-        Traversal::ComponentPackageDescription::realizes (o);
-        pop_ ();
-      }
-
-      void ComponentPackageDescription::
-      configProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("configProperty", top_ ()));
-        Traversal::ComponentPackageDescription::configProperty (o);
-        pop_ ();
-      }
-
-      void ComponentPackageDescription::
-      implementation (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("implementation", top_ ()));
-        Traversal::ComponentPackageDescription::implementation (o);
-        pop_ ();
-      }
-
-      void ComponentPackageDescription::
-      infoProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("infoProperty", top_ ()));
-        Traversal::ComponentPackageDescription::infoProperty (o);
-        pop_ ();
-      }
-
-      void ComponentPackageDescription::
-      contentLocation (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("contentLocation", top_ ()));
-        Traversal::ComponentPackageDescription::contentLocation (o);
-        pop_ ();
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp
index 3918d1ed38a..b2fc917ee19 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp
@@ -168,224 +168,4 @@ namespace CIAO
   }
 }
 
-#include <XMLSchema/Traversal.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      struct PackagedComponentImplementation : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PackagedComponentImplementation >
-      {
-        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
-        referencedImplementation (Type&);
-
-        virtual void
-        referencedImplementation (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct ComponentPackageDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ComponentPackageDescription >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (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
-        realizes (Type&);
-
-        virtual void
-        realizes (Type const&);
-
-        virtual void
-        realizes_none (Type&);
-
-        virtual void
-        realizes_none (Type const&);
-
-        virtual void
-        configProperty (Type&);
-
-        virtual void
-        configProperty (Type const&);
-
-        virtual void
-        configProperty_none (Type&);
-
-        virtual void
-        configProperty_none (Type const&);
-
-        virtual void
-        implementation (Type&);
-
-        virtual void
-        implementation (Type const&);
-
-        virtual void
-        implementation_none (Type&);
-
-        virtual void
-        implementation_none (Type const&);
-
-        virtual void
-        infoProperty (Type&);
-
-        virtual void
-        infoProperty (Type const&);
-
-        virtual void
-        infoProperty_none (Type&);
-
-        virtual void
-        infoProperty_none (Type const&);
-
-        virtual void
-        contentLocation (Type&);
-
-        virtual void
-        contentLocation (Type const&);
-
-        virtual void
-        contentLocation_none (Type&);
-
-        virtual void
-        contentLocation_none (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
-}
-
-#include <XMLSchema/Writer.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct PackagedComponentImplementation : Traversal::PackagedComponentImplementation, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::PackagedComponentImplementation Type;
-        PackagedComponentImplementation (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        name (Type const&);
-
-        virtual void
-        referencedImplementation (Type const&);
-
-        protected:
-        PackagedComponentImplementation ();
-      };
-
-      struct ComponentPackageDescription : Traversal::ComponentPackageDescription, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::ComponentPackageDescription Type;
-        ComponentPackageDescription (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        label (Type const&);
-
-        virtual void
-        UUID (Type const&);
-
-        virtual void
-        realizes (Type const&);
-
-        virtual void
-        configProperty (Type const&);
-
-        virtual void
-        implementation (Type const&);
-
-        virtual void
-        infoProperty (Type const&);
-
-        virtual void
-        contentLocation (Type const&);
-
-        protected:
-        ComponentPackageDescription ();
-      };
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
 #endif // CPD_HPP
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/iad.cpp b/TAO/CIAO/DAnCE/Config_Handlers/iad.cpp
index a7a8924296b..588ebfb0fab 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/iad.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/iad.cpp
@@ -1,5 +1,5 @@
-// $Id$
 #include "iad.hpp"
+// $Id$
 
 namespace CIAO
 {
@@ -11,7 +11,7 @@ namespace CIAO
     NamedImplementationArtifact::
     NamedImplementationArtifact (::XMLSchema::string< char > const& name__,
     ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact__)
-    :
+    : 
     name_ (new ::XMLSchema::string< char > (name__)),
     referencedArtifact_ (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (referencedArtifact__)),
     regulator__ ()
@@ -23,6 +23,7 @@ namespace CIAO
     NamedImplementationArtifact::
     NamedImplementationArtifact (::CIAO::Config_Handlers::NamedImplementationArtifact const& s)
     :
+    XSCRT::Type (), 
     name_ (new ::XMLSchema::string< char > (*s.name_)),
     referencedArtifact_ (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (*s.referencedArtifact_)),
     regulator__ ()
@@ -88,7 +89,7 @@ namespace CIAO
 
     ImplementationArtifactDescription::
     ImplementationArtifactDescription ()
-    :
+    : 
     regulator__ ()
     {
     }
@@ -96,6 +97,7 @@ namespace CIAO
     ImplementationArtifactDescription::
     ImplementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const& s)
     :
+    XSCRT::Type (), 
     label_ (s.label_.get () ? new ::XMLSchema::string< char > (*s.label_) : 0),
     UUID_ (s.UUID_.get () ? new ::XMLSchema::string< char > (*s.UUID_) : 0),
     execParameter_ (s.execParameter_.get () ? new ::CIAO::Config_Handlers::Property (*s.execParameter_) : 0),
@@ -596,653 +598,3 @@ namespace CIAO
   }
 }
 
-#include <XMLSchema/TypeInfo.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace
-    {
-      ::XMLSchema::TypeInfoInitializer < char > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
-
-      struct NamedImplementationArtifactTypeInfoInitializer
-      {
-        NamedImplementationArtifactTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (NamedImplementationArtifact));
-          ::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));
-        }
-      };
-
-      NamedImplementationArtifactTypeInfoInitializer NamedImplementationArtifactTypeInfoInitializer_;
-
-      struct ImplementationArtifactDescriptionTypeInfoInitializer
-      {
-        ImplementationArtifactDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (ImplementationArtifactDescription));
-          ::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));
-        }
-      };
-
-      ImplementationArtifactDescriptionTypeInfoInitializer ImplementationArtifactDescriptionTypeInfoInitializer_;
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      // NamedImplementationArtifact
-      //
-      //
-
-      void NamedImplementationArtifact::
-      traverse (Type& o)
-      {
-        pre (o);
-        name (o);
-        referencedArtifact (o);
-        post (o);
-      }
-
-      void NamedImplementationArtifact::
-      traverse (Type const& o)
-      {
-        pre (o);
-        name (o);
-        referencedArtifact (o);
-        post (o);
-      }
-
-      void NamedImplementationArtifact::
-      pre (Type&)
-      {
-      }
-
-      void NamedImplementationArtifact::
-      pre (Type const&)
-      {
-      }
-
-      void NamedImplementationArtifact::
-      name (Type& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void NamedImplementationArtifact::
-      name (Type const& o)
-      {
-        dispatch (o.name ());
-      }
-
-      void NamedImplementationArtifact::
-      referencedArtifact (Type& o)
-      {
-        dispatch (o.referencedArtifact ());
-      }
-
-      void NamedImplementationArtifact::
-      referencedArtifact (Type const& o)
-      {
-        dispatch (o.referencedArtifact ());
-      }
-
-      void NamedImplementationArtifact::
-      post (Type&)
-      {
-      }
-
-      void NamedImplementationArtifact::
-      post (Type const&)
-      {
-      }
-
-      // ImplementationArtifactDescription
-      //
-      //
-
-      void ImplementationArtifactDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        if (o.UUID_p ()) UUID (o);
-        else UUID_none (o);
-        location (o);
-        if (o.execParameter_p ()) execParameter (o);
-        else execParameter_none (o);
-        if (o.deployRequirement_p ()) deployRequirement (o);
-        else deployRequirement_none (o);
-        dependsOn (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (o);
-        if (o.contentLocation_p ()) contentLocation (o);
-        else contentLocation_none (o);
-        post (o);
-      }
-
-      void ImplementationArtifactDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        if (o.UUID_p ()) UUID (o);
-        else UUID_none (o);
-        location (o);
-        if (o.execParameter_p ()) execParameter (o);
-        else execParameter_none (o);
-        if (o.deployRequirement_p ()) deployRequirement (o);
-        else deployRequirement_none (o);
-        dependsOn (o);
-        if (o.infoProperty_p ()) infoProperty (o);
-        else infoProperty_none (o);
-        if (o.contentLocation_p ()) contentLocation (o);
-        else contentLocation_none (o);
-        post (o);
-      }
-
-      void ImplementationArtifactDescription::
-      pre (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      pre (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      label (Type& o)
-      {
-        dispatch (o.label ());
-      }
-
-      void ImplementationArtifactDescription::
-      label (Type const& o)
-      {
-        dispatch (o.label ());
-      }
-
-      void ImplementationArtifactDescription::
-      label_none (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      label_none (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      UUID (Type& o)
-      {
-        dispatch (o.UUID ());
-      }
-
-      void ImplementationArtifactDescription::
-      UUID (Type const& o)
-      {
-        dispatch (o.UUID ());
-      }
-
-      void ImplementationArtifactDescription::
-      UUID_none (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      UUID_none (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      location (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ImplementationArtifactDescription::Type::location_iterator b (o.begin_location()), e (o.end_location());
-
-        if (b != e)
-        {
-          location_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) location_next (o);
-          }
-
-          location_post (o);
-        }
-
-        else location_none (o);
-      }
-
-      void ImplementationArtifactDescription::
-      location (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ImplementationArtifactDescription::Type::location_const_iterator b (o.begin_location()), e (o.end_location());
-
-        if (b != e)
-        {
-          location_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) location_next (o);
-          }
-
-          location_post (o);
-        }
-
-        else location_none (o);
-      }
-
-      void ImplementationArtifactDescription::
-      location_pre (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      location_pre (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      location_next (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      location_next (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      location_post (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      location_post (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      location_none (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      location_none (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      execParameter (Type& o)
-      {
-        dispatch (o.execParameter ());
-      }
-
-      void ImplementationArtifactDescription::
-      execParameter (Type const& o)
-      {
-        dispatch (o.execParameter ());
-      }
-
-      void ImplementationArtifactDescription::
-      execParameter_none (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      execParameter_none (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      deployRequirement (Type& o)
-      {
-        dispatch (o.deployRequirement ());
-      }
-
-      void ImplementationArtifactDescription::
-      deployRequirement (Type const& o)
-      {
-        dispatch (o.deployRequirement ());
-      }
-
-      void ImplementationArtifactDescription::
-      deployRequirement_none (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      deployRequirement_none (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ImplementationArtifactDescription::Type::dependsOn_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
-
-        if (b != e)
-        {
-          dependsOn_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) dependsOn_next (o);
-          }
-
-          dependsOn_post (o);
-        }
-
-        else dependsOn_none (o);
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        ImplementationArtifactDescription::Type::dependsOn_const_iterator b (o.begin_dependsOn()), e (o.end_dependsOn());
-
-        if (b != e)
-        {
-          dependsOn_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) dependsOn_next (o);
-          }
-
-          dependsOn_post (o);
-        }
-
-        else dependsOn_none (o);
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn_pre (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn_pre (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn_next (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn_next (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn_post (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn_post (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn_none (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn_none (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      infoProperty (Type& o)
-      {
-        dispatch (o.infoProperty ());
-      }
-
-      void ImplementationArtifactDescription::
-      infoProperty (Type const& o)
-      {
-        dispatch (o.infoProperty ());
-      }
-
-      void ImplementationArtifactDescription::
-      infoProperty_none (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      infoProperty_none (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      contentLocation (Type& o)
-      {
-        dispatch (o.contentLocation ());
-      }
-
-      void ImplementationArtifactDescription::
-      contentLocation (Type const& o)
-      {
-        dispatch (o.contentLocation ());
-      }
-
-      void ImplementationArtifactDescription::
-      contentLocation_none (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      contentLocation_none (Type const&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      post (Type&)
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      post (Type const&)
-      {
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      // NamedImplementationArtifact
-      //
-      //
-
-      NamedImplementationArtifact::
-      NamedImplementationArtifact (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      NamedImplementationArtifact::
-      NamedImplementationArtifact ()
-      {
-      }
-
-      void NamedImplementationArtifact::
-      traverse (Type const& o)
-      {
-        Traversal::NamedImplementationArtifact::traverse (o);
-      }
-
-      void NamedImplementationArtifact::
-      name (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("name", top_ ()));
-        Traversal::NamedImplementationArtifact::name (o);
-        pop_ ();
-      }
-
-      void NamedImplementationArtifact::
-      referencedArtifact (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("referencedArtifact", top_ ()));
-        Traversal::NamedImplementationArtifact::referencedArtifact (o);
-        pop_ ();
-      }
-
-      // ImplementationArtifactDescription
-      //
-      //
-
-      ImplementationArtifactDescription::
-      ImplementationArtifactDescription (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      ImplementationArtifactDescription::
-      ImplementationArtifactDescription ()
-      {
-      }
-
-      void ImplementationArtifactDescription::
-      traverse (Type const& o)
-      {
-        Traversal::ImplementationArtifactDescription::traverse (o);
-      }
-
-      void ImplementationArtifactDescription::
-      label (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("label", top_ ()));
-        Traversal::ImplementationArtifactDescription::label (o);
-        pop_ ();
-      }
-
-      void ImplementationArtifactDescription::
-      UUID (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("UUID", top_ ()));
-        Traversal::ImplementationArtifactDescription::UUID (o);
-        pop_ ();
-      }
-
-      void ImplementationArtifactDescription::
-      location_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("location", top_ ()));
-      }
-
-      void ImplementationArtifactDescription::
-      location_next (Type const& o)
-      {
-        location_post (o);
-        location_pre (o);
-      }
-
-      void ImplementationArtifactDescription::
-      location_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void ImplementationArtifactDescription::
-      execParameter (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("execParameter", top_ ()));
-        Traversal::ImplementationArtifactDescription::execParameter (o);
-        pop_ ();
-      }
-
-      void ImplementationArtifactDescription::
-      deployRequirement (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("deployRequirement", top_ ()));
-        Traversal::ImplementationArtifactDescription::deployRequirement (o);
-        pop_ ();
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("dependsOn", top_ ()));
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn_next (Type const& o)
-      {
-        dependsOn_post (o);
-        dependsOn_pre (o);
-      }
-
-      void ImplementationArtifactDescription::
-      dependsOn_post (Type const&)
-      {
-        pop_ ();
-      }
-
-      void ImplementationArtifactDescription::
-      infoProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("infoProperty", top_ ()));
-        Traversal::ImplementationArtifactDescription::infoProperty (o);
-        pop_ ();
-      }
-
-      void ImplementationArtifactDescription::
-      contentLocation (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("contentLocation", top_ ()));
-        Traversal::ImplementationArtifactDescription::contentLocation (o);
-        pop_ ();
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp b/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp
index be7a95314a3..72236c41f24 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp
@@ -183,287 +183,4 @@ namespace CIAO
   }
 }
 
-#include <XMLSchema/Traversal.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      struct NamedImplementationArtifact : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::NamedImplementationArtifact >
-      {
-        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
-        referencedArtifact (Type&);
-
-        virtual void
-        referencedArtifact (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-
-      struct ImplementationArtifactDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::ImplementationArtifactDescription >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (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
-        location (Type&);
-
-        virtual void
-        location (Type const&);
-
-        virtual void
-        location_pre (Type&);
-
-        virtual void
-        location_pre (Type const&);
-
-        virtual void
-        location_next (Type&);
-
-        virtual void
-        location_next (Type const&);
-
-        virtual void
-        location_post (Type&);
-
-        virtual void
-        location_post (Type const&);
-
-        virtual void
-        location_none (Type&);
-
-        virtual void
-        location_none (Type const&);
-
-        virtual void
-        execParameter (Type&);
-
-        virtual void
-        execParameter (Type const&);
-
-        virtual void
-        execParameter_none (Type&);
-
-        virtual void
-        execParameter_none (Type const&);
-
-        virtual void
-        deployRequirement (Type&);
-
-        virtual void
-        deployRequirement (Type const&);
-
-        virtual void
-        deployRequirement_none (Type&);
-
-        virtual void
-        deployRequirement_none (Type const&);
-
-        virtual void
-        dependsOn (Type&);
-
-        virtual void
-        dependsOn (Type const&);
-
-        virtual void
-        dependsOn_pre (Type&);
-
-        virtual void
-        dependsOn_pre (Type const&);
-
-        virtual void
-        dependsOn_next (Type&);
-
-        virtual void
-        dependsOn_next (Type const&);
-
-        virtual void
-        dependsOn_post (Type&);
-
-        virtual void
-        dependsOn_post (Type const&);
-
-        virtual void
-        dependsOn_none (Type&);
-
-        virtual void
-        dependsOn_none (Type const&);
-
-        virtual void
-        infoProperty (Type&);
-
-        virtual void
-        infoProperty (Type const&);
-
-        virtual void
-        infoProperty_none (Type&);
-
-        virtual void
-        infoProperty_none (Type const&);
-
-        virtual void
-        contentLocation (Type&);
-
-        virtual void
-        contentLocation (Type const&);
-
-        virtual void
-        contentLocation_none (Type&);
-
-        virtual void
-        contentLocation_none (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
-}
-
-#include <XMLSchema/Writer.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct NamedImplementationArtifact : Traversal::NamedImplementationArtifact, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::NamedImplementationArtifact Type;
-        NamedImplementationArtifact (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        name (Type const&);
-
-        virtual void
-        referencedArtifact (Type const&);
-
-        protected:
-        NamedImplementationArtifact ();
-      };
-
-      struct ImplementationArtifactDescription : Traversal::ImplementationArtifactDescription, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::ImplementationArtifactDescription Type;
-        ImplementationArtifactDescription (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        label (Type const&);
-
-        virtual void
-        UUID (Type const&);
-
-        virtual void
-        location_pre (Type const&);
-
-        virtual void
-        location_next (Type const&);
-
-        virtual void
-        location_post (Type const&);
-
-        virtual void
-        execParameter (Type const&);
-
-        virtual void
-        deployRequirement (Type const&);
-
-        virtual void
-        dependsOn_pre (Type const&);
-
-        virtual void
-        dependsOn_next (Type const&);
-
-        virtual void
-        dependsOn_post (Type const&);
-
-        virtual void
-        infoProperty (Type const&);
-
-        virtual void
-        contentLocation (Type const&);
-
-        protected:
-        ImplementationArtifactDescription ();
-      };
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
 #endif // IAD_HPP
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/pcd.cpp b/TAO/CIAO/DAnCE/Config_Handlers/pcd.cpp
index c80a8aa1ed0..f0cd5a54bda 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/pcd.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/pcd.cpp
@@ -1,5 +1,5 @@
-// $Id$
 #include "pcd.hpp"
+// $Id$
 
 namespace CIAO
 {
@@ -10,7 +10,7 @@ namespace CIAO
 
     PackageConfiguration::
     PackageConfiguration ()
-    :
+    : 
     regulator__ ()
     {
     }
@@ -18,6 +18,7 @@ namespace CIAO
     PackageConfiguration::
     PackageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const& s)
     :
+    XSCRT::Type (), 
     label_ (s.label_.get () ? new ::XMLSchema::string< char > (*s.label_) : 0),
     UUID_ (s.UUID_.get () ? new ::XMLSchema::string< char > (*s.UUID_) : 0),
     basePackage_ (s.basePackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageDescription (*s.basePackage_) : 0),
@@ -387,352 +388,3 @@ namespace CIAO
   }
 }
 
-#include <XMLSchema/TypeInfo.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace
-    {
-      ::XMLSchema::TypeInfoInitializer < char > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
-
-      struct PackageConfigurationTypeInfoInitializer
-      {
-        PackageConfigurationTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (PackageConfiguration));
-          ::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));
-        }
-      };
-
-      PackageConfigurationTypeInfoInitializer PackageConfigurationTypeInfoInitializer_;
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      // PackageConfiguration
-      //
-      //
-
-      void PackageConfiguration::
-      traverse (Type& o)
-      {
-        pre (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        if (o.UUID_p ()) UUID (o);
-        else UUID_none (o);
-        if (o.basePackage_p ()) basePackage (o);
-        else basePackage_none (o);
-        if (o.reference_p ()) reference (o);
-        else reference_none (o);
-        if (o.selectRequirement_p ()) selectRequirement (o);
-        else selectRequirement_none (o);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
-        if (o.contentLocation_p ()) contentLocation (o);
-        else contentLocation_none (o);
-        post (o);
-      }
-
-      void PackageConfiguration::
-      traverse (Type const& o)
-      {
-        pre (o);
-        if (o.label_p ()) label (o);
-        else label_none (o);
-        if (o.UUID_p ()) UUID (o);
-        else UUID_none (o);
-        if (o.basePackage_p ()) basePackage (o);
-        else basePackage_none (o);
-        if (o.reference_p ()) reference (o);
-        else reference_none (o);
-        if (o.selectRequirement_p ()) selectRequirement (o);
-        else selectRequirement_none (o);
-        if (o.configProperty_p ()) configProperty (o);
-        else configProperty_none (o);
-        if (o.contentLocation_p ()) contentLocation (o);
-        else contentLocation_none (o);
-        post (o);
-      }
-
-      void PackageConfiguration::
-      pre (Type&)
-      {
-      }
-
-      void PackageConfiguration::
-      pre (Type const&)
-      {
-      }
-
-      void PackageConfiguration::
-      label (Type& o)
-      {
-        dispatch (o.label ());
-      }
-
-      void PackageConfiguration::
-      label (Type const& o)
-      {
-        dispatch (o.label ());
-      }
-
-      void PackageConfiguration::
-      label_none (Type&)
-      {
-      }
-
-      void PackageConfiguration::
-      label_none (Type const&)
-      {
-      }
-
-      void PackageConfiguration::
-      UUID (Type& o)
-      {
-        dispatch (o.UUID ());
-      }
-
-      void PackageConfiguration::
-      UUID (Type const& o)
-      {
-        dispatch (o.UUID ());
-      }
-
-      void PackageConfiguration::
-      UUID_none (Type&)
-      {
-      }
-
-      void PackageConfiguration::
-      UUID_none (Type const&)
-      {
-      }
-
-      void PackageConfiguration::
-      basePackage (Type& o)
-      {
-        dispatch (o.basePackage ());
-      }
-
-      void PackageConfiguration::
-      basePackage (Type const& o)
-      {
-        dispatch (o.basePackage ());
-      }
-
-      void PackageConfiguration::
-      basePackage_none (Type&)
-      {
-      }
-
-      void PackageConfiguration::
-      basePackage_none (Type const&)
-      {
-      }
-
-      void PackageConfiguration::
-      reference (Type& o)
-      {
-        dispatch (o.reference ());
-      }
-
-      void PackageConfiguration::
-      reference (Type const& o)
-      {
-        dispatch (o.reference ());
-      }
-
-      void PackageConfiguration::
-      reference_none (Type&)
-      {
-      }
-
-      void PackageConfiguration::
-      reference_none (Type const&)
-      {
-      }
-
-      void PackageConfiguration::
-      selectRequirement (Type& o)
-      {
-        dispatch (o.selectRequirement ());
-      }
-
-      void PackageConfiguration::
-      selectRequirement (Type const& o)
-      {
-        dispatch (o.selectRequirement ());
-      }
-
-      void PackageConfiguration::
-      selectRequirement_none (Type&)
-      {
-      }
-
-      void PackageConfiguration::
-      selectRequirement_none (Type const&)
-      {
-      }
-
-      void PackageConfiguration::
-      configProperty (Type& o)
-      {
-        dispatch (o.configProperty ());
-      }
-
-      void PackageConfiguration::
-      configProperty (Type const& o)
-      {
-        dispatch (o.configProperty ());
-      }
-
-      void PackageConfiguration::
-      configProperty_none (Type&)
-      {
-      }
-
-      void PackageConfiguration::
-      configProperty_none (Type const&)
-      {
-      }
-
-      void PackageConfiguration::
-      contentLocation (Type& o)
-      {
-        dispatch (o.contentLocation ());
-      }
-
-      void PackageConfiguration::
-      contentLocation (Type const& o)
-      {
-        dispatch (o.contentLocation ());
-      }
-
-      void PackageConfiguration::
-      contentLocation_none (Type&)
-      {
-      }
-
-      void PackageConfiguration::
-      contentLocation_none (Type const&)
-      {
-      }
-
-      void PackageConfiguration::
-      post (Type&)
-      {
-      }
-
-      void PackageConfiguration::
-      post (Type const&)
-      {
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      // PackageConfiguration
-      //
-      //
-
-      PackageConfiguration::
-      PackageConfiguration (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      PackageConfiguration::
-      PackageConfiguration ()
-      {
-      }
-
-      void PackageConfiguration::
-      traverse (Type const& o)
-      {
-        Traversal::PackageConfiguration::traverse (o);
-      }
-
-      void PackageConfiguration::
-      label (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("label", top_ ()));
-        Traversal::PackageConfiguration::label (o);
-        pop_ ();
-      }
-
-      void PackageConfiguration::
-      UUID (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("UUID", top_ ()));
-        Traversal::PackageConfiguration::UUID (o);
-        pop_ ();
-      }
-
-      void PackageConfiguration::
-      basePackage (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("basePackage", top_ ()));
-        Traversal::PackageConfiguration::basePackage (o);
-        pop_ ();
-      }
-
-      void PackageConfiguration::
-      reference (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("reference", top_ ()));
-        Traversal::PackageConfiguration::reference (o);
-        pop_ ();
-      }
-
-      void PackageConfiguration::
-      selectRequirement (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("selectRequirement", top_ ()));
-        Traversal::PackageConfiguration::selectRequirement (o);
-        pop_ ();
-      }
-
-      void PackageConfiguration::
-      configProperty (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("configProperty", top_ ()));
-        Traversal::PackageConfiguration::configProperty (o);
-        pop_ ();
-      }
-
-      void PackageConfiguration::
-      contentLocation (Type const& o)
-      {
-        push_ (::XSCRT::XML::Element< char > ("contentLocation", top_ ()));
-        Traversal::PackageConfiguration::contentLocation (o);
-        pop_ ();
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/pcd.hpp b/TAO/CIAO/DAnCE/Config_Handlers/pcd.hpp
index 9e88a88a8ad..7b8116f8ae7 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/pcd.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/pcd.hpp
@@ -128,172 +128,4 @@ namespace CIAO
   }
 }
 
-#include <XMLSchema/Traversal.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      struct PackageConfiguration : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::PackageConfiguration >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (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
-        basePackage (Type&);
-
-        virtual void
-        basePackage (Type const&);
-
-        virtual void
-        basePackage_none (Type&);
-
-        virtual void
-        basePackage_none (Type const&);
-
-        virtual void
-        reference (Type&);
-
-        virtual void
-        reference (Type const&);
-
-        virtual void
-        reference_none (Type&);
-
-        virtual void
-        reference_none (Type const&);
-
-        virtual void
-        selectRequirement (Type&);
-
-        virtual void
-        selectRequirement (Type const&);
-
-        virtual void
-        selectRequirement_none (Type&);
-
-        virtual void
-        selectRequirement_none (Type const&);
-
-        virtual void
-        configProperty (Type&);
-
-        virtual void
-        configProperty (Type const&);
-
-        virtual void
-        configProperty_none (Type&);
-
-        virtual void
-        configProperty_none (Type const&);
-
-        virtual void
-        contentLocation (Type&);
-
-        virtual void
-        contentLocation (Type const&);
-
-        virtual void
-        contentLocation_none (Type&);
-
-        virtual void
-        contentLocation_none (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
-}
-
-#include <XMLSchema/Writer.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct PackageConfiguration : Traversal::PackageConfiguration, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::PackageConfiguration Type;
-        PackageConfiguration (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        label (Type const&);
-
-        virtual void
-        UUID (Type const&);
-
-        virtual void
-        basePackage (Type const&);
-
-        virtual void
-        reference (Type const&);
-
-        virtual void
-        selectRequirement (Type const&);
-
-        virtual void
-        configProperty (Type const&);
-
-        virtual void
-        contentLocation (Type const&);
-
-        protected:
-        PackageConfiguration ();
-      };
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
 #endif // PCD_HPP
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/toplevel.cpp b/TAO/CIAO/DAnCE/Config_Handlers/toplevel.cpp
index b044c19743c..87591a94ab4 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/toplevel.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/toplevel.cpp
@@ -10,7 +10,7 @@ namespace CIAO
 
     TopLevelPackageDescription::
     TopLevelPackageDescription ()
-    :
+    : 
     regulator__ ()
     {
     }
@@ -18,6 +18,7 @@ namespace CIAO
     TopLevelPackageDescription::
     TopLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const& s)
     :
+    XSCRT::Type (), 
     regulator__ ()
     {
       package_.reserve (s.package_.size ());
@@ -136,209 +137,3 @@ namespace CIAO
   }
 }
 
-#include <XMLSchema/TypeInfo.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace
-    {
-      ::XMLSchema::TypeInfoInitializer < char > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
-
-      struct TopLevelPackageDescriptionTypeInfoInitializer
-      {
-        TopLevelPackageDescriptionTypeInfoInitializer ()
-        {
-          ::XSCRT::TypeId id (typeid (TopLevelPackageDescription));
-          ::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));
-        }
-      };
-
-      TopLevelPackageDescriptionTypeInfoInitializer TopLevelPackageDescriptionTypeInfoInitializer_;
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      // TopLevelPackageDescription
-      //
-      //
-
-      void TopLevelPackageDescription::
-      traverse (Type& o)
-      {
-        pre (o);
-        package (o);
-        post (o);
-      }
-
-      void TopLevelPackageDescription::
-      traverse (Type const& o)
-      {
-        pre (o);
-        package (o);
-        post (o);
-      }
-
-      void TopLevelPackageDescription::
-      pre (Type&)
-      {
-      }
-
-      void TopLevelPackageDescription::
-      pre (Type const&)
-      {
-      }
-
-      void TopLevelPackageDescription::
-      package (Type& o)
-      {
-        // VC6 anathema strikes again
-        //
-        TopLevelPackageDescription::Type::package_iterator b (o.begin_package()), e (o.end_package());
-
-        if (b != e)
-        {
-          package_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) package_next (o);
-          }
-
-          package_post (o);
-        }
-      }
-
-      void TopLevelPackageDescription::
-      package (Type const& o)
-      {
-        // VC6 anathema strikes again
-        //
-        TopLevelPackageDescription::Type::package_const_iterator b (o.begin_package()), e (o.end_package());
-
-        if (b != e)
-        {
-          package_pre (o);
-          for (;
-           b != e;
-          )
-          {
-            dispatch (*b);
-            if (++b != e) package_next (o);
-          }
-
-          package_post (o);
-        }
-      }
-
-      void TopLevelPackageDescription::
-      package_pre (Type&)
-      {
-      }
-
-      void TopLevelPackageDescription::
-      package_pre (Type const&)
-      {
-      }
-
-      void TopLevelPackageDescription::
-      package_next (Type&)
-      {
-      }
-
-      void TopLevelPackageDescription::
-      package_next (Type const&)
-      {
-      }
-
-      void TopLevelPackageDescription::
-      package_post (Type&)
-      {
-      }
-
-      void TopLevelPackageDescription::
-      package_post (Type const&)
-      {
-      }
-
-      void TopLevelPackageDescription::
-      post (Type&)
-      {
-      }
-
-      void TopLevelPackageDescription::
-      post (Type const&)
-      {
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      // TopLevelPackageDescription
-      //
-      //
-
-      TopLevelPackageDescription::
-      TopLevelPackageDescription (::XSCRT::XML::Element< char >& e)
-      : ::XSCRT::Writer< char > (e)
-      {
-      }
-
-      TopLevelPackageDescription::
-      TopLevelPackageDescription ()
-      {
-      }
-
-      void TopLevelPackageDescription::
-      traverse (Type const& o)
-      {
-        Traversal::TopLevelPackageDescription::traverse (o);
-      }
-
-      void TopLevelPackageDescription::
-      package_pre (Type const&)
-      {
-        push_ (::XSCRT::XML::Element< char > ("package", top_ ()));
-      }
-
-      void TopLevelPackageDescription::
-      package_next (Type const& o)
-      {
-        package_post (o);
-        package_pre (o);
-      }
-
-      void TopLevelPackageDescription::
-      package_post (Type const&)
-      {
-        pop_ ();
-      }
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/toplevel.hpp b/TAO/CIAO/DAnCE/Config_Handlers/toplevel.hpp
index ae3a2b1bdea..daad8ea0e54 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/toplevel.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/toplevel.hpp
@@ -63,100 +63,4 @@ namespace CIAO
   }
 }
 
-#include <XMLSchema/Traversal.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      struct TopLevelPackageDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::TopLevelPackageDescription >
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        pre (Type const&);
-
-        virtual void
-        package (Type&);
-
-        virtual void
-        package (Type const&);
-
-        virtual void
-        package_pre (Type&);
-
-        virtual void
-        package_pre (Type const&);
-
-        virtual void
-        package_next (Type&);
-
-        virtual void
-        package_next (Type const&);
-
-        virtual void
-        package_post (Type&);
-
-        virtual void
-        package_post (Type const&);
-
-        virtual void
-        post (Type&);
-
-        virtual void
-        post (Type const&);
-      };
-    }
-  }
-}
-
-#include <XMLSchema/Writer.hpp>
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct TopLevelPackageDescription : Traversal::TopLevelPackageDescription, 
-      virtual ::XSCRT::Writer< char >
-      {
-        typedef ::CIAO::Config_Handlers::TopLevelPackageDescription Type;
-        TopLevelPackageDescription (::XSCRT::XML::Element< char >&);
-
-        virtual void
-        traverse (Type const&);
-
-        virtual void
-        package_pre (Type const&);
-
-        virtual void
-        package_next (Type const&);
-
-        virtual void
-        package_post (Type const&);
-
-        protected:
-        TopLevelPackageDescription ();
-      };
-    }
-  }
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-  }
-}
-
 #endif // TOPLEVEL_HPP