ChangeLogTag: Mon Jul 26 13:54:12 2005 Ming Xiong <mxiong@dre.vanderbilt.edu>

17 files changed, 3198 insertions, 2220 deletions

diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc b/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc
index 735be77ed79..2efa8820c75 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc
@@ -4,9 +4,9 @@ project (XSC_Config_Handlers) : acelib, ciao_deployment_stub,xerces {
   sharedname = XSC_Config_Handlers
   dynamicflags   = CONFIG_HANDLERS_BUILD_DLL
   macros   += XML_USE_PTHREADS
-  requires += exceptions 
+  requires += exceptions
   includes += $(CIAO_ROOT)/DAnCE/Config_Handlers
-  
+
   Source_Files {
     ccd.cpp
     cdd.cpp
@@ -49,6 +49,11 @@ project (XSC_Config_Handlers) : acelib, ciao_deployment_stub,xerces {
     DnC_Dump.cpp
     DnC_Dump_T.cpp
     Dump_Obj.cpp
+    STD_CID_Handler.cpp
+    STD_CPD_Handler.cpp
+    STD_IAD_Handler.cpp
+    STD_PC_Intf.cpp
+    STD_PCD_Handler.cpp
   }
 
   Header_Files {
@@ -56,7 +61,7 @@ project (XSC_Config_Handlers) : acelib, ciao_deployment_stub,xerces {
 }
 
 project (XSC_Config_Handlers_Tests) : ciao_deployment_stub,xerces {
-  
+
   requires += dummy_label
   exename = test
   after    += XSC_Config_Handlers
@@ -64,7 +69,7 @@ project (XSC_Config_Handlers_Tests) : ciao_deployment_stub,xerces {
   macros   += XML_USE_PTHREADS
   requires += exceptions
   libs     += CIAO_DnC_Server TAO_IFR_Client XSC_Config_Handlers
-                                                                                
+
   Source_Files {
     test.cpp
   }
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/STD_CID_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/STD_CID_Handler.cpp
new file mode 100644
index 00000000000..04797ccd8cd
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Config_Handlers/STD_CID_Handler.cpp
@@ -0,0 +1,180 @@
+// $Id$
+#include "STD_CID_Handler.h"
+#include "STD_CPD_Handler.h"
+#include "STD_IAD_Handler.h"
+#include "Basic_Deployment_Data.hpp"
+#include "ciao/Deployment_DataC.h"
+#include "XML_Helper.h"
+#include "Deployment.hpp"
+#include "Property_Handler.h"
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    IDREF_Base STD_CID_Handler::IDREF;
+
+    bool
+    STD_CID_Handler::component_impl_descr (
+      const ComponentImplementationDescription &desc,
+      ::Deployment::ComponentImplementationDescription &toconfig)
+    {
+      toconfig.label =
+        desc.label ().c_str ();
+
+      toconfig.UUID =
+        desc.UUID ().c_str ();
+
+
+      if (desc.assemblyImpl_p ())
+      {
+        Deployment::ComponentAssemblyDescription idl_cad;
+        ComponentAssemblyDescription cad =
+          desc.assemblyImpl ();
+
+        // @@: handle <assemblyImpl>
+        for (ComponentAssemblyDescription::instance_const_iterator iter =
+               cad.begin_instance ();
+             iter != cad.end_instance ();
+             iter++)
+        {
+          CORBA::ULong len =
+            idl_cad.instance.length ();
+          idl_cad.instance.length (len + 1);
+          idl_cad.instance [len].name =
+            (*iter).name ().c_str ();
+
+          // Bind the instance id with the index
+          if ((*iter).id_p ())
+          {
+            ACE_CString cstr ((*iter).id ().c_str ());
+            bool retval =
+              STD_CID_Handler::IDREF.bind_ref (cstr,len);
+            if (!retval)
+            {
+              return retval;
+            }
+          }
+
+          if (!this->xml_helper_->is_initialized ())
+            return false;
+
+          // parse the .cpd (ComponentPackageDescription) file
+          // that <package> links to
+          xercesc::DOMDocument* dom =
+            this->xml_helper_->create_dom (((*iter).package ()).href ().c_str ());
+
+          if (!dom)
+            return false;
+
+          ComponentPackageDescription cpd =
+            componentPackageDescription (dom);
+
+          Deployment::ComponentPackageDescription idl_cpd;
+
+          STD_CPD_Handler cpd_handler (this->xml_helper_);
+
+          cpd_handler.component_package_descr (cpd,
+                                               idl_cpd);
+
+          idl_cad.instance [len].package.length (1);
+          idl_cad.instance [len].package [0] = idl_cpd;
+        }
+
+        // @@: handle <connection>
+        for (ComponentAssemblyDescription::connection_const_iterator conn_iter =
+               cad.begin_connection ();
+             conn_iter != cad.end_connection ();
+             conn_iter++)
+        {
+          CORBA::ULong conn_len =
+            idl_cad.connection.length ();
+
+          idl_cad.connection.length (conn_len + 1);
+          idl_cad.connection [conn_len].name =
+            (*conn_iter).name ().c_str ();
+
+
+          for (AssemblyConnectionDescription::internalEndpoint_const_iterator ep_iter =
+                 (*conn_iter).begin_internalEndpoint ();
+               ep_iter != (*conn_iter).end_internalEndpoint ();
+               ep_iter++)
+          {
+            CORBA::ULong endp_len =
+              idl_cad.connection [conn_len].internalEndpoint.length ();
+            idl_cad.connection [conn_len].internalEndpoint.length (endp_len + 1);
+            idl_cad.connection [conn_len].internalEndpoint [endp_len].portName =
+              (*ep_iter).portName ().c_str ();
+
+            size_t tmp = 0;
+            bool retval =
+              STD_CID_Handler::IDREF.find_ref ((((*ep_iter).instance ()).id ()).c_str (),
+                                               tmp);
+            if (!retval)
+              return retval;
+            CORBA::ULong ref = tmp;
+            idl_cad.connection[conn_len].internalEndpoint [endp_len].instanceRef = ref;
+          }
+        }
+
+        toconfig.assemblyImpl.length (1);
+        toconfig.assemblyImpl [0] = idl_cad;
+      }
+
+      // handle <monolithicImpl>
+      if (desc.monolithicImpl_p ())
+      {
+        Deployment::MonolithicImplementationDescription idl_mid;
+        MonolithicImplementationDescription mid =
+          desc.monolithicImpl ();
+
+        for (MonolithicImplementationDescription::primaryArtifact_const_iterator iter =
+               mid.begin_primaryArtifact ();
+             iter != mid.end_primaryArtifact ();
+             iter++)
+        {
+          CORBA::ULong len =
+            idl_mid.primaryArtifact.length ();
+          idl_mid.primaryArtifact.length (len + 1);
+          idl_mid.primaryArtifact [len].name = (*iter).name ().c_str ();
+
+          if (!this->xml_helper_->is_initialized ())
+            return false;
+
+          // parse the .iad (ImplementationArtifactDescription) file
+          // that the <referencedArtifact> links to
+          xercesc::DOMDocument* dom =
+            this->xml_helper_->create_dom (((*iter).referencedArtifact ()).href ().c_str ()); // here location indicates .iad file
+
+          if (!dom)
+            return false;
+
+          ImplementationArtifactDescription iad =
+            implementationArtifactDescription (dom);
+
+          Deployment::ImplementationArtifactDescription idl_iad;
+
+          STD_IAD_Handler::impl_artifact_descr (iad,
+                                                idl_iad);
+
+          idl_mid.primaryArtifact [len].referencedArtifact = idl_iad;
+
+        }
+        toconfig.monolithicImpl.length (1);
+        toconfig.monolithicImpl [0] = idl_mid;
+      }
+
+      // handle <configProperty>
+      if (desc.configProperty_p ())
+      {
+        Property p = desc.configProperty ();
+        Deployment::Property idl_p;
+        Property_Handler::get_property (p, idl_p);
+        toconfig.configProperty.length (1);
+        toconfig.configProperty [0] = idl_p;
+      }
+
+      return true;
+    }
+  }
+}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/STD_CID_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/STD_CID_Handler.h
new file mode 100644
index 00000000000..495253b1459
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Config_Handlers/STD_CID_Handler.h
@@ -0,0 +1,82 @@
+//================================================
+/**
+ *  @file  STD_CID_Handler.h
+ *
+ *  $Id$
+ *
+ *  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
+ */
+//================================================
+
+#ifndef CIAO_CONFIG_HANDLERS_STD_CID_HANDLER_H
+#define CIAO_CONFIG_HANDLERS_STD_CID_HANDLER_H
+
+#include /**/ "ace/pre.h"
+
+#include "XML_Helper.h"
+#include "IDREF_Base.h"
+#include "Config_Handlers/Config_Handlers_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace Deployment
+{
+  struct ComponentImplementationDescription;
+}
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    class ComponentImplementationDescription;
+
+    /*
+     * @class STD_CID_Handler
+     *
+     * @brief Handler class for <CCMComponentImplementationDescription> types.
+     *
+     * This class defines handler methods to map values from
+     * XSC objects, parsed from the descriptor files, to the
+     * corresponding CORBA IDL type for the schema element.
+     *
+     */
+    class Config_Handlers_Export STD_CID_Handler
+    {
+
+    public:
+
+      STD_CID_Handler (XML_Helper *xml_helper)
+        :xml_helper_ (xml_helper)
+      {
+      }
+
+      /// Maps the values from the XSC object
+      /// <ComponentImplementationDescription> to the CORBA IDL type
+      /// <Deployment::ComponentImplementationDescription>.
+      bool component_impl_descr (
+            const ComponentImplementationDescription &desc,
+            ::Deployment::ComponentImplementationDescription &toconfig);
+
+      static IDREF_Base IDREF;
+
+//@@Note: This part has yet to be added in the future
+//    ComponentImplementationDescription
+//    component_port_description (
+//      const Deployment::ComponentImplementationDescription& src);
+
+    private:
+      // disable the default constructor
+      STD_CID_Handler ()
+        :xml_helper_ (0)
+      {
+      }
+
+      XML_Helper *xml_helper_;
+    };
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_CONFIG_HANDLERS_STD_CID_HANDLER_H*/
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/STD_CPD_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/STD_CPD_Handler.cpp
new file mode 100644
index 00000000000..ac925ad3278
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Config_Handlers/STD_CPD_Handler.cpp
@@ -0,0 +1,58 @@
+// $Id$
+#include "STD_CPD_Handler.h"
+#include "STD_CID_Handler.h"
+#include "Basic_Deployment_Data.hpp"
+#include "ciao/Deployment_DataC.h"
+#include "XML_Helper.h"
+#include "Deployment.hpp"
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    bool
+    STD_CPD_Handler::component_package_descr (
+      const ComponentPackageDescription &desc,
+      ::Deployment::ComponentPackageDescription &toconfig)
+    {
+      toconfig.label =
+        desc.label ().c_str ();
+
+      toconfig.UUID =
+        desc.UUID ().c_str ();
+
+      PackagedComponentImplementation pci = desc.implementation ();
+      Deployment::PackagedComponentImplementation idl_pci;
+      idl_pci.name =
+        pci.name ().c_str ();
+
+      if (!this->xml_helper_->is_initialized ())
+        return false;
+
+      // parse the .cid (ComponentImplementationDescription) file
+      // that <referencedImplementation> links to
+      xercesc::DOMDocument* dom =
+        this->xml_helper_->create_dom ((pci.referencedImplementation ()).href ().c_str ()); // here location indicates .pcd file
+
+      if (!dom)
+        return false;
+
+      ComponentImplementationDescription cid =
+        componentImplementationDescription (dom);
+
+      Deployment::ComponentImplementationDescription idl_cid;
+
+      STD_CID_Handler cid_handler (this->xml_helper_);
+
+      cid_handler.component_impl_descr (cid,
+                                        idl_cid);
+
+      idl_pci.referencedImplementation = idl_cid;
+
+      toconfig.implementation.length (1);
+      toconfig.implementation [0] = idl_pci;
+
+      return true;
+    }
+  }
+}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/STD_CPD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/STD_CPD_Handler.h
new file mode 100644
index 00000000000..8a3dfae0423
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Config_Handlers/STD_CPD_Handler.h
@@ -0,0 +1,78 @@
+//================================================
+/**
+ *  @file  STD_CPD_Handler.h
+ *
+ *  $Id$
+ *
+ *  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
+ */
+//================================================
+
+#ifndef CIAO_CONFIG_HANDLERS_STD_CPD_HANDLER_H
+#define CIAO_CONFIG_HANDLERS_STD_CPD_HANDLER_H
+
+#include /**/ "ace/pre.h"
+
+#include "XML_Helper.h"
+#include "Config_Handlers/Config_Handlers_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace Deployment
+{
+  struct ComponentPackageDescription;
+}
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    class ComponentPackageDescription;
+
+    /*
+     * @class STD_CPD_Handler
+     *
+     * @brief Handler class for <CCMComponentPackageDescription> types.
+     *
+     * This class defines handler methods to map values from
+     * XSC objects, parsed from the descriptor files, to the
+     * corresponding CORBA IDL type for the schema element.
+     *
+     */
+    class Config_Handlers_Export STD_CPD_Handler
+    {
+
+    public:
+
+      STD_CPD_Handler (XML_Helper *xml_helper)
+        :xml_helper_ (xml_helper)
+      {
+      }
+
+      /// Maps the values from the XSC object
+      /// <ComponentPackageDescription> to the CORBA IDL type
+      /// <Deployment::ComponentPackageDescription>.
+     bool component_package_descr(
+            const ComponentPackageDescription &desc,
+            ::Deployment::ComponentPackageDescription &toconfig);
+
+//@@Note: This part has yet to be added in the future
+//     ComponentPortDescription
+//     component_package_descr (
+//         const Deployment::ComponentPortDescription& src);
+    private:
+      // disable the default constructor
+      STD_CPD_Handler ()
+        :xml_helper_ (0)
+      {
+      }
+
+      XML_Helper *xml_helper_;
+    };
+ }
+}
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_CONFIG_HANDLERS_CPD_HANDLER_H*/
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/STD_IAD_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/STD_IAD_Handler.cpp
new file mode 100644
index 00000000000..fbd7d82db9a
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Config_Handlers/STD_IAD_Handler.cpp
@@ -0,0 +1,46 @@
+// $Id$
+#include "STD_IAD_Handler.h"
+#include "Basic_Deployment_Data.hpp"
+#include "ciao/Deployment_DataC.h"
+#include "Property_Handler.h"
+
+#include "iad.hpp"
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    bool
+    STD_IAD_Handler::impl_artifact_descr (
+      const ImplementationArtifactDescription &desc,
+      ::Deployment::ImplementationArtifactDescription &toconfig)
+    {
+      toconfig.label =
+        desc.label ().c_str ();
+
+      toconfig.UUID =
+        desc.UUID ().c_str ();
+
+      for (ImplementationArtifactDescription::location_const_iterator iter =
+             desc.begin_location ();
+           iter != desc.end_location ();
+           iter++)
+      {
+        CORBA::ULong len =
+          toconfig.location.length ();
+        toconfig.location.length (len + 1);
+        toconfig.location [len] = (*iter).c_str ();
+      }
+
+      if (desc.execParameter_p ())
+      {
+        Property p = desc.execParameter ();
+        Deployment::Property idl_p;
+        Property_Handler::get_property (p, idl_p);
+        toconfig.execParameter.length (1);
+        toconfig.execParameter [0] = idl_p;
+      }
+     return true;
+    }
+  }
+}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/STD_IAD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/STD_IAD_Handler.h
new file mode 100644
index 00000000000..1cea53ffba9
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Config_Handlers/STD_IAD_Handler.h
@@ -0,0 +1,64 @@
+//================================================
+/**
+ *  @file  CPD_Handler.h
+ *
+ *  $Id$
+ *
+ *  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
+ */
+//================================================
+
+#ifndef CIAO_CONFIG_HANDLERS_STD_IAD_HANDLER_H
+#define CIAO_CONFIG_HANDLERS_STD_IAD_HANDLER_H
+
+#include /**/ "ace/pre.h"
+
+#include "Config_Handlers/Config_Handlers_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace Deployment
+{
+  struct ImplementationArtifactDescription;
+}
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    class ImplementationArtifactDescription;
+
+    /*
+     * @class STD_IAD_Handler
+     *
+     * @brief Handler class for <CCMImplementationArtifactDescription> types.
+     *
+     * This class defines handler methods to map values from
+     * XSC objects, parsed from the descriptor files, to the
+     * corresponding CORBA IDL type for the schema element.
+     *
+     */
+    class Config_Handlers_Export STD_IAD_Handler
+    {
+
+    public:
+      /// Maps the values from the XSC object
+      /// <ImplementationArtifactDescription> to the CORBA IDL type
+      /// <Deployment::ImplementationArtifactDescription>.
+     static bool
+     impl_artifact_descr (
+       const ImplementationArtifactDescription &desc,
+       ::Deployment::ImplementationArtifactDescription &toconfig);
+
+//@@Note: The reverse part has yet to be handed in the future
+//     ImplementationArtifactDescription
+//     impl_artifact_descr (
+//         const Deployment::ComponentPortDescription& src);
+    };
+ }
+}
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_CONFIG_HANDLERS_STD_IAD_HANDLER_H*/
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/STD_PCD_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/STD_PCD_Handler.cpp
new file mode 100644
index 00000000000..c5e9cf1b128
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Config_Handlers/STD_PCD_Handler.cpp
@@ -0,0 +1,53 @@
+// $Id$
+#include "STD_PCD_Handler.h"
+#include "STD_CPD_Handler.h"
+#include "Basic_Deployment_Data.hpp"
+#include "ciao/Deployment_DataC.h"
+#include "XML_Helper.h"
+#include "Deployment.hpp"
+
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+
+    bool
+    STD_PCD_Handler::package_config (
+      const PackageConfiguration &desc,
+      ::Deployment::PackageConfiguration &toconfig)
+    {
+      toconfig.label =
+        desc.label ().c_str ();
+
+      toconfig.UUID =
+        desc.UUID ().c_str ();
+
+      if (!this->xml_helper_->is_initialized ())
+        return false;
+
+      // parse the .cpd (ComponentPackageDescription) file
+      // that <basePackage> links to
+      xercesc::DOMDocument* dom =
+        this->xml_helper_->create_dom ((desc.basePackage()).href ().c_str ());
+
+      if (!dom)
+        return false;
+
+      ComponentPackageDescription cpc =
+        componentPackageDescription (dom);
+
+      Deployment::ComponentPackageDescription idl_cpc;
+
+      STD_CPD_Handler cpd_handler (this->xml_helper_);
+
+      cpd_handler.component_package_descr (cpc,
+                                           idl_cpc);
+
+      toconfig.basePackage.length (1);
+      toconfig.basePackage [0] = idl_cpc;
+
+      return true;
+    }
+  }
+}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/STD_PCD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/STD_PCD_Handler.h
new file mode 100644
index 00000000000..bb832d2ed8b
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Config_Handlers/STD_PCD_Handler.h
@@ -0,0 +1,78 @@
+//================================================
+/**
+ *  @file  STD_PCD_Handler.h
+ *
+ *  $Id$
+ *
+ *  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
+ */
+//================================================
+
+#ifndef CIAO_CONFIG_HANDLERS_STD_PCD_HANDLER_H
+#define CIAO_CONFIG_HANDLERS_STD_PCD_HANDLER_H
+
+#include /**/ "ace/pre.h"
+#include "XML_Helper.h"
+
+#include "Config_Handlers/Config_Handlers_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace Deployment
+{
+  struct PackageConfiguration;
+}
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    class PackageConfiguration;
+
+    /*
+     * @class STD_PCD_Handler
+     *
+     * @brief Handler class for <CCMPackageConfiguration> types.
+     *
+     * This class defines handler methods to map values from
+     * XSC objects, parsed from the descriptor files, to the
+     * corresponding CORBA IDL type for the schema element.
+     *
+     */
+    class Config_Handlers_Export STD_PCD_Handler
+    {
+
+    public:
+      STD_PCD_Handler (XML_Helper *xml_helper)
+        :xml_helper_ (xml_helper)
+      {
+      }
+
+      /// Maps the values from the XSC object
+      /// <PackageConfiguration> to the CORBA IDL type
+      /// <Deployment::PackageConfiguration>.
+      bool package_config (
+            const PackageConfiguration &desc,
+            ::Deployment::PackageConfiguration &toconfig);
+
+//@@Note: This part has yet to be added in the future
+//     PackageConfiguration
+//     package_config (
+//       const Deployment::ComponentPortDescription& src);
+
+    private:
+      // Disable the default constructor
+      STD_PCD_Handler ()
+        :xml_helper_ (0)
+      {
+      }
+
+      XML_Helper *xml_helper_;
+    };
+ }
+}
+
+#include /**/ "ace/post.h"
+#endif /* CIAO_CONFIG_HANDLERS_STD_PCD_HANDLER_H*/
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/STD_PC_Intf.cpp b/TAO/CIAO/DAnCE/Config_Handlers/STD_PC_Intf.cpp
new file mode 100644
index 00000000000..9c61274b17c
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Config_Handlers/STD_PC_Intf.cpp
@@ -0,0 +1,79 @@
+// $Id$
+
+#if defined (_MSC_VER) && (_MSC_VER < 1300)
+#pragma warning (disable: 4018)
+#pragma warning (disable: 4284)
+#pragma warning (disable: 4146)
+#endif
+
+#include "STD_PC_Intf.h"
+#include "XML_Helper.h"
+#include "Deployment.hpp"
+#include "STD_PCD_Handler.h"
+#include "ciao/Deployment_DataC.h"
+
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+    STD_PC_Intf::STD_PC_Intf (const char *file)
+    {
+      if (!this->prepare_PC (file))
+        throw;
+    }
+
+    bool
+    STD_PC_Intf::prepare_PC (const char *file)
+    {
+      ACE_Auto_Ptr<XML_Helper> helper (new XML_Helper);
+
+      if (!helper->is_initialized ())
+        return false;
+
+      // parse the .pcd (PackageConfigurationDescription) file
+      xercesc::DOMDocument *dom =
+        helper->create_dom (file);
+
+      if (!dom)
+        return false;
+
+
+      PackageConfiguration pc =
+        packageConfiguration (dom);
+
+
+      Deployment::PackageConfiguration idl_pc;
+
+
+      STD_PCD_Handler pcd_handler (helper.get ());
+
+      pcd_handler.package_config (pc,
+                                  idl_pc);
+
+
+      Deployment::PackageConfiguration *p_idl_pc =
+        new Deployment::PackageConfiguration (idl_pc);
+
+      // let ACE_Auto_Ptr take over
+      this->idl_pc_.reset (p_idl_pc);
+
+      if (this->idl_pc_.get ())
+        return true;
+
+      return false;
+    }
+
+    ::Deployment::PackageConfiguration const *
+    STD_PC_Intf::get_PC (void) const
+    {
+      return this->idl_pc_.get ();
+    }
+
+    ::Deployment::PackageConfiguration *
+    STD_PC_Intf::get_PC (void)
+    {
+      return this->idl_pc_.release ();
+    }
+  }
+}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/STD_PC_Intf.h b/TAO/CIAO/DAnCE/Config_Handlers/STD_PC_Intf.h
new file mode 100644
index 00000000000..96ae4699342
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Config_Handlers/STD_PC_Intf.h
@@ -0,0 +1,62 @@
+//==============================================================
+/**
+ *  @file  STD_PC_Intf.h
+ *
+ *  $Id$
+ *
+ *  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
+ */
+//================================================================
+
+#ifndef CIAO_CONFIG_STD_PC_INTF_H
+#define CIAO_CONFIG_STD_PC_INTF_H
+#include /**/ "ace/pre.h"
+
+#include "Config_Handlers/Config_Handlers_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Auto_Ptr.h"
+
+
+namespace Deployment
+{
+  struct PackageConfiguration ;
+}
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+   /*
+    * @class STD_PC_Intf
+    *
+    * @brief Wrapper class for PackageConfiguration extraction
+    *
+    * This class defines wrapper functions for extracting
+    * PackageConfiguration IDL structures from XSC structures.
+    * It serves as the public interface used by application
+    * developers.
+    *
+    */
+    class Config_Handlers_Export STD_PC_Intf
+    {
+    public:
+      STD_PC_Intf (const char *file);
+
+      ::Deployment::PackageConfiguration const *get_PC (void) const;
+      ::Deployment::PackageConfiguration *get_PC (void);
+
+    protected:
+      bool prepare_PC (const char *file);
+
+    private:
+      ACE_Auto_Ptr< ::Deployment::PackageConfiguration> idl_pc_;
+    };
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /*CIAO_CONFIG_STD_PC_INTF_H*/
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cid.cpp b/TAO/CIAO/DAnCE/Config_Handlers/cid.cpp
index a0080522178..421372637cd 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cid.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cid.cpp
@@ -3,1541 +3,1590 @@
  *
  * Changes made to this code will most likely be overwritten
  * when the handlers are recompiled.
- * 
+ *
  * If you find errors or feel that there are bugfixes to be made,
  * please contact the current XSC maintainer:
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
- 
+
 #include "cid.hpp"
 
 namespace CIAO
 {
   namespace Config_Handlers
   {
-    // SubcomponentInstantiationDescription
-    // 
+  // SubcomponentInstantiationDescription
+  //
+
+  SubcomponentInstantiationDescription::
+  SubcomponentInstantiationDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+  ::CIAO::Config_Handlers::ComponentPackageDescription const& package__)
+  :
+  name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+  package_ (new ::CIAO::Config_Handlers::ComponentPackageDescription (package__)),
+  regulator__ ()
+  {
+    name_->container (this);
+    package_->container (this);
+  }
 
-    SubcomponentInstantiationDescription::
-    SubcomponentInstantiationDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-    ::CIAO::Config_Handlers::ComponentPackageDescription const& package__)
-    : 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    package_ (new ::CIAO::Config_Handlers::ComponentPackageDescription (package__)),
-    regulator__ ()
-    {
-      name_->container (this);
-      package_->container (this);
-    }
+  SubcomponentInstantiationDescription::
+  SubcomponentInstantiationDescription (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& s)
+  :
+  name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+  package_ (new ::CIAO::Config_Handlers::ComponentPackageDescription (*s.package_)),
+  configProperty_ (s.configProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.configProperty_) : 0),
+  selectRequirement_ (s.selectRequirement_.get () ? new ::CIAO::Config_Handlers::Requirement (*s.selectRequirement_) : 0),
+  reference_ (s.reference_.get () ? new ::CIAO::Config_Handlers::ComponentPackageReference (*s.reference_) : 0),
+  id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
+  regulator__ ()
+  {
+    name_->container (this);
+    package_->container (this);
+    if (configProperty_.get ()) configProperty_->container (this);
+    if (selectRequirement_.get ()) selectRequirement_->container (this);
+    if (reference_.get ()) reference_->container (this);
+    if (id_.get ()) id_->container (this);
+  }
 
-    SubcomponentInstantiationDescription::
-    SubcomponentInstantiationDescription (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& s)
-    :
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    package_ (new ::CIAO::Config_Handlers::ComponentPackageDescription (*s.package_)),
-    configProperty_ (s.configProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.configProperty_) : 0),
-    selectRequirement_ (s.selectRequirement_.get () ? new ::CIAO::Config_Handlers::Requirement (*s.selectRequirement_) : 0),
-    reference_ (s.reference_.get () ? new ::CIAO::Config_Handlers::ComponentPackageReference (*s.reference_) : 0),
-    id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-    regulator__ ()
-    {
-      name_->container (this);
-      package_->container (this);
-      if (configProperty_.get ()) configProperty_->container (this);
-      if (selectRequirement_.get ()) selectRequirement_->container (this);
-      if (reference_.get ()) reference_->container (this);
-      if (id_.get ()) id_->container (this);
-    }
+  ::CIAO::Config_Handlers::SubcomponentInstantiationDescription& SubcomponentInstantiationDescription::
+  operator= (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& s)
+  {
+    name (s.name ());
 
-    ::CIAO::Config_Handlers::SubcomponentInstantiationDescription& SubcomponentInstantiationDescription::
-    operator= (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& s)
-    {
-      name (s.name ());
+    package (s.package ());
 
-      package (s.package ());
+    if (s.configProperty_.get ()) configProperty (*(s.configProperty_));
+    else configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
 
-      if (s.configProperty_.get ()) configProperty (*(s.configProperty_));
-      else configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+    if (s.selectRequirement_.get ()) selectRequirement (*(s.selectRequirement_));
+    else selectRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (0);
 
-      if (s.selectRequirement_.get ()) selectRequirement (*(s.selectRequirement_));
-      else selectRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (0);
+    if (s.reference_.get ()) reference (*(s.reference_));
+    else reference_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (0);
 
-      if (s.reference_.get ()) reference (*(s.reference_));
-      else reference_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (0);
+    if (s.id_.get ()) id (*(s.id_));
+    else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
 
-      if (s.id_.get ()) id (*(s.id_));
-      else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
+    return *this;
+  }
 
-      return *this;
-    }
 
+  // SubcomponentInstantiationDescription
+  //
+  ::XMLSchema::string< ACE_TCHAR > const& SubcomponentInstantiationDescription::
+  name () const
+  {
+    return *name_;
+  }
 
-    // SubcomponentInstantiationDescription
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& SubcomponentInstantiationDescription::
-    name () const
-    {
-      return *name_;
-    }
+  ::XMLSchema::string< ACE_TCHAR >& SubcomponentInstantiationDescription::
+  name ()
+  {
+    return *name_;
+  }
 
-    ::XMLSchema::string< ACE_TCHAR >& SubcomponentInstantiationDescription::
-    name ()
-    {
-      return *name_;
-    }
+  void SubcomponentInstantiationDescription::
+  name (::XMLSchema::string< ACE_TCHAR > const& e)
+  {
+    *name_ = e;
+  }
 
-    void SubcomponentInstantiationDescription::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+  // SubcomponentInstantiationDescription
+  //
+  ::CIAO::Config_Handlers::ComponentPackageDescription const& SubcomponentInstantiationDescription::
+  package () const
+  {
+    return *package_;
+  }
 
-    // SubcomponentInstantiationDescription
-    // 
-    ::CIAO::Config_Handlers::ComponentPackageDescription const& SubcomponentInstantiationDescription::
-    package () const
-    {
-      return *package_;
-    }
+  ::CIAO::Config_Handlers::ComponentPackageDescription& SubcomponentInstantiationDescription::
+  package ()
+  {
+    return *package_;
+  }
 
-    ::CIAO::Config_Handlers::ComponentPackageDescription& SubcomponentInstantiationDescription::
-    package ()
-    {
-      return *package_;
-    }
+  void SubcomponentInstantiationDescription::
+  package (::CIAO::Config_Handlers::ComponentPackageDescription const& e)
+  {
+    *package_ = e;
+  }
 
-    void SubcomponentInstantiationDescription::
-    package (::CIAO::Config_Handlers::ComponentPackageDescription const& e)
-    {
-      *package_ = e;
-    }
+  // SubcomponentInstantiationDescription
+  //
+  bool SubcomponentInstantiationDescription::
+  configProperty_p () const
+  {
+    return configProperty_.get () != 0;
+  }
 
-    // SubcomponentInstantiationDescription
-    // 
-    bool SubcomponentInstantiationDescription::
-    configProperty_p () const
-    {
-      return configProperty_.get () != 0;
-    }
+  ::CIAO::Config_Handlers::Property const& SubcomponentInstantiationDescription::
+  configProperty () const
+  {
+    return *configProperty_;
+  }
 
-    ::CIAO::Config_Handlers::Property const& SubcomponentInstantiationDescription::
-    configProperty () const
+  ::CIAO::Config_Handlers::Property& SubcomponentInstantiationDescription::
+  configProperty ()
+  {
+    return *configProperty_;
+  }
+
+  void SubcomponentInstantiationDescription::
+  configProperty (::CIAO::Config_Handlers::Property const& e)
+  {
+    if (configProperty_.get ())
     {
-      return *configProperty_;
+      *configProperty_ = e;
     }
 
-    ::CIAO::Config_Handlers::Property& SubcomponentInstantiationDescription::
-    configProperty ()
+    else
     {
-      return *configProperty_;
+      configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
+      configProperty_->container (this);
     }
+  }
 
-    void SubcomponentInstantiationDescription::
-    configProperty (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (configProperty_.get ())
-      {
-        *configProperty_ = e;
-      }
+  // SubcomponentInstantiationDescription
+  //
+  bool SubcomponentInstantiationDescription::
+  selectRequirement_p () const
+  {
+    return selectRequirement_.get () != 0;
+  }
 
-      else
-      {
-        configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        configProperty_->container (this);
-      }
-    }
+  ::CIAO::Config_Handlers::Requirement const& SubcomponentInstantiationDescription::
+  selectRequirement () const
+  {
+    return *selectRequirement_;
+  }
 
-    // SubcomponentInstantiationDescription
-    // 
-    bool SubcomponentInstantiationDescription::
-    selectRequirement_p () const
-    {
-      return selectRequirement_.get () != 0;
-    }
+  ::CIAO::Config_Handlers::Requirement& SubcomponentInstantiationDescription::
+  selectRequirement ()
+  {
+    return *selectRequirement_;
+  }
 
-    ::CIAO::Config_Handlers::Requirement const& SubcomponentInstantiationDescription::
-    selectRequirement () const
+  void SubcomponentInstantiationDescription::
+  selectRequirement (::CIAO::Config_Handlers::Requirement const& e)
+  {
+    if (selectRequirement_.get ())
     {
-      return *selectRequirement_;
+      *selectRequirement_ = e;
     }
 
-    ::CIAO::Config_Handlers::Requirement& SubcomponentInstantiationDescription::
-    selectRequirement ()
+    else
     {
-      return *selectRequirement_;
+      selectRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (new ::CIAO::Config_Handlers::Requirement (e));
+      selectRequirement_->container (this);
     }
+  }
 
-    void SubcomponentInstantiationDescription::
-    selectRequirement (::CIAO::Config_Handlers::Requirement const& e)
-    {
-      if (selectRequirement_.get ())
-      {
-        *selectRequirement_ = e;
-      }
+  // SubcomponentInstantiationDescription
+  //
+  bool SubcomponentInstantiationDescription::
+  reference_p () const
+  {
+    return reference_.get () != 0;
+  }
 
-      else
-      {
-        selectRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (new ::CIAO::Config_Handlers::Requirement (e));
-        selectRequirement_->container (this);
-      }
-    }
+  ::CIAO::Config_Handlers::ComponentPackageReference const& SubcomponentInstantiationDescription::
+  reference () const
+  {
+    return *reference_;
+  }
 
-    // SubcomponentInstantiationDescription
-    // 
-    bool SubcomponentInstantiationDescription::
-    reference_p () const
-    {
-      return reference_.get () != 0;
-    }
+  ::CIAO::Config_Handlers::ComponentPackageReference& SubcomponentInstantiationDescription::
+  reference ()
+  {
+    return *reference_;
+  }
 
-    ::CIAO::Config_Handlers::ComponentPackageReference const& SubcomponentInstantiationDescription::
-    reference () const
+  void SubcomponentInstantiationDescription::
+  reference (::CIAO::Config_Handlers::ComponentPackageReference const& e)
+  {
+    if (reference_.get ())
     {
-      return *reference_;
+      *reference_ = e;
     }
 
-    ::CIAO::Config_Handlers::ComponentPackageReference& SubcomponentInstantiationDescription::
-    reference ()
+    else
     {
-      return *reference_;
+      reference_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (new ::CIAO::Config_Handlers::ComponentPackageReference (e));
+      reference_->container (this);
     }
+  }
 
-    void SubcomponentInstantiationDescription::
-    reference (::CIAO::Config_Handlers::ComponentPackageReference const& e)
-    {
-      if (reference_.get ())
-      {
-        *reference_ = e;
-      }
+  // SubcomponentInstantiationDescription
+  //
+  bool SubcomponentInstantiationDescription::
+  id_p () const
+  {
+    return id_.get () != 0;
+  }
 
-      else
-      {
-        reference_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (new ::CIAO::Config_Handlers::ComponentPackageReference (e));
-        reference_->container (this);
-      }
-    }
+  ::XMLSchema::ID< ACE_TCHAR > const& SubcomponentInstantiationDescription::
+  id () const
+  {
+    return *id_;
+  }
 
-    // SubcomponentInstantiationDescription
-    // 
-    bool SubcomponentInstantiationDescription::
-    id_p () const
-    {
-      return id_.get () != 0;
-    }
+  ::XMLSchema::ID< ACE_TCHAR >& SubcomponentInstantiationDescription::
+  id ()
+  {
+    return *id_;
+  }
 
-    ::XMLSchema::ID< ACE_TCHAR > const& SubcomponentInstantiationDescription::
-    id () const
+  void SubcomponentInstantiationDescription::
+  id (::XMLSchema::ID< ACE_TCHAR > const& e)
+  {
+    if (id_.get ())
     {
-      return *id_;
+      *id_ = e;
     }
 
-    ::XMLSchema::ID< ACE_TCHAR >& SubcomponentInstantiationDescription::
-    id ()
+    else
     {
-      return *id_;
+      id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
+      id_->container (this);
     }
+  }
 
-    void SubcomponentInstantiationDescription::
-    id (::XMLSchema::ID< ACE_TCHAR > const& e)
-    {
-      if (id_.get ())
-      {
-        *id_ = e;
-      }
 
-      else
-      {
-        id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-        id_->container (this);
-      }
-    }
+  // SubcomponentPropertyReference
+  //
 
+  SubcomponentPropertyReference::
+  SubcomponentPropertyReference (::XMLSchema::string< ACE_TCHAR > const& propertyName__,
+  ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance__)
+  :
+  propertyName_ (new ::XMLSchema::string< ACE_TCHAR > (propertyName__)),
+  instance_ (new ::CIAO::Config_Handlers::SubcomponentInstantiationDescription (instance__)),
+  regulator__ ()
+  {
+    propertyName_->container (this);
+    instance_->container (this);
+  }
 
-    // SubcomponentPropertyReference
-    // 
+  SubcomponentPropertyReference::
+  SubcomponentPropertyReference (::CIAO::Config_Handlers::SubcomponentPropertyReference const& s)
+  :
+  propertyName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.propertyName_)),
+  instance_ (new ::CIAO::Config_Handlers::SubcomponentInstantiationDescription (*s.instance_)),
+  regulator__ ()
+  {
+    propertyName_->container (this);
+    instance_->container (this);
+  }
 
-    SubcomponentPropertyReference::
-    SubcomponentPropertyReference (::XMLSchema::string< ACE_TCHAR > const& propertyName__,
-    ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance__)
-    : 
-    propertyName_ (new ::XMLSchema::string< ACE_TCHAR > (propertyName__)),
-    instance_ (new ::CIAO::Config_Handlers::SubcomponentInstantiationDescription (instance__)),
-    regulator__ ()
-    {
-      propertyName_->container (this);
-      instance_->container (this);
-    }
+  ::CIAO::Config_Handlers::SubcomponentPropertyReference& SubcomponentPropertyReference::
+  operator= (::CIAO::Config_Handlers::SubcomponentPropertyReference const& s)
+  {
+    propertyName (s.propertyName ());
 
-    SubcomponentPropertyReference::
-    SubcomponentPropertyReference (::CIAO::Config_Handlers::SubcomponentPropertyReference const& s)
-    :
-    ::XSCRT::Type (), 
-    propertyName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.propertyName_)),
-    instance_ (new ::CIAO::Config_Handlers::SubcomponentInstantiationDescription (*s.instance_)),
-    regulator__ ()
-    {
-      propertyName_->container (this);
-      instance_->container (this);
-    }
+    instance (s.instance ());
 
-    ::CIAO::Config_Handlers::SubcomponentPropertyReference& SubcomponentPropertyReference::
-    operator= (::CIAO::Config_Handlers::SubcomponentPropertyReference const& s)
-    {
-      propertyName (s.propertyName ());
+    return *this;
+  }
 
-      instance (s.instance ());
 
-      return *this;
-    }
+  // SubcomponentPropertyReference
+  //
+  ::XMLSchema::string< ACE_TCHAR > const& SubcomponentPropertyReference::
+  propertyName () const
+  {
+    return *propertyName_;
+  }
 
+  ::XMLSchema::string< ACE_TCHAR >& SubcomponentPropertyReference::
+  propertyName ()
+  {
+    return *propertyName_;
+  }
 
-    // SubcomponentPropertyReference
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& SubcomponentPropertyReference::
-    propertyName () const
-    {
-      return *propertyName_;
-    }
+  void SubcomponentPropertyReference::
+  propertyName (::XMLSchema::string< ACE_TCHAR > const& e)
+  {
+    *propertyName_ = e;
+  }
 
-    ::XMLSchema::string< ACE_TCHAR >& SubcomponentPropertyReference::
-    propertyName ()
-    {
-      return *propertyName_;
-    }
+  // SubcomponentPropertyReference
+  //
+  ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& SubcomponentPropertyReference::
+  instance () const
+  {
+    return *instance_;
+  }
 
-    void SubcomponentPropertyReference::
-    propertyName (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *propertyName_ = e;
-    }
+  ::CIAO::Config_Handlers::SubcomponentInstantiationDescription& SubcomponentPropertyReference::
+  instance ()
+  {
+    return *instance_;
+  }
 
-    // SubcomponentPropertyReference
-    // 
-    ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& SubcomponentPropertyReference::
-    instance () const
-    {
-      return *instance_;
-    }
+  void SubcomponentPropertyReference::
+  instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& e)
+  {
+    *instance_ = e;
+  }
 
-    ::CIAO::Config_Handlers::SubcomponentInstantiationDescription& SubcomponentPropertyReference::
-    instance ()
-    {
-      return *instance_;
-    }
 
-    void SubcomponentPropertyReference::
-    instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& e)
-    {
-      *instance_ = e;
-    }
+  // AssemblyPropertyMapping
+  //
 
+  AssemblyPropertyMapping::
+  AssemblyPropertyMapping (::XMLSchema::string< ACE_TCHAR > const& name__,
+  ::XMLSchema::string< ACE_TCHAR > const& externalName__,
+  ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo__)
+  :
+  name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+  externalName_ (new ::XMLSchema::string< ACE_TCHAR > (externalName__)),
+  delegatesTo_ (new ::CIAO::Config_Handlers::SubcomponentPropertyReference (delegatesTo__)),
+  regulator__ ()
+  {
+    name_->container (this);
+    externalName_->container (this);
+    delegatesTo_->container (this);
+  }
 
-    // AssemblyPropertyMapping
-    // 
+  AssemblyPropertyMapping::
+  AssemblyPropertyMapping (::CIAO::Config_Handlers::AssemblyPropertyMapping const& s)
+  :
+  name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+  externalName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.externalName_)),
+  delegatesTo_ (new ::CIAO::Config_Handlers::SubcomponentPropertyReference (*s.delegatesTo_)),
+  regulator__ ()
+  {
+    name_->container (this);
+    externalName_->container (this);
+    delegatesTo_->container (this);
+  }
 
-    AssemblyPropertyMapping::
-    AssemblyPropertyMapping (::XMLSchema::string< ACE_TCHAR > const& name__,
-    ::XMLSchema::string< ACE_TCHAR > const& externalName__,
-    ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo__)
-    : 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    externalName_ (new ::XMLSchema::string< ACE_TCHAR > (externalName__)),
-    delegatesTo_ (new ::CIAO::Config_Handlers::SubcomponentPropertyReference (delegatesTo__)),
-    regulator__ ()
-    {
-      name_->container (this);
-      externalName_->container (this);
-      delegatesTo_->container (this);
-    }
+  ::CIAO::Config_Handlers::AssemblyPropertyMapping& AssemblyPropertyMapping::
+  operator= (::CIAO::Config_Handlers::AssemblyPropertyMapping const& s)
+  {
+    name (s.name ());
 
-    AssemblyPropertyMapping::
-    AssemblyPropertyMapping (::CIAO::Config_Handlers::AssemblyPropertyMapping const& s)
-    :
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    externalName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.externalName_)),
-    delegatesTo_ (new ::CIAO::Config_Handlers::SubcomponentPropertyReference (*s.delegatesTo_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      externalName_->container (this);
-      delegatesTo_->container (this);
-    }
+    externalName (s.externalName ());
 
-    ::CIAO::Config_Handlers::AssemblyPropertyMapping& AssemblyPropertyMapping::
-    operator= (::CIAO::Config_Handlers::AssemblyPropertyMapping const& s)
-    {
-      name (s.name ());
+    delegatesTo (s.delegatesTo ());
 
-      externalName (s.externalName ());
+    return *this;
+  }
 
-      delegatesTo (s.delegatesTo ());
 
-      return *this;
-    }
+  // AssemblyPropertyMapping
+  //
+  ::XMLSchema::string< ACE_TCHAR > const& AssemblyPropertyMapping::
+  name () const
+  {
+    return *name_;
+  }
 
+  ::XMLSchema::string< ACE_TCHAR >& AssemblyPropertyMapping::
+  name ()
+  {
+    return *name_;
+  }
 
-    // AssemblyPropertyMapping
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& AssemblyPropertyMapping::
-    name () const
-    {
-      return *name_;
-    }
+  void AssemblyPropertyMapping::
+  name (::XMLSchema::string< ACE_TCHAR > const& e)
+  {
+    *name_ = e;
+  }
 
-    ::XMLSchema::string< ACE_TCHAR >& AssemblyPropertyMapping::
-    name ()
-    {
-      return *name_;
-    }
+  // AssemblyPropertyMapping
+  //
+  ::XMLSchema::string< ACE_TCHAR > const& AssemblyPropertyMapping::
+  externalName () const
+  {
+    return *externalName_;
+  }
 
-    void AssemblyPropertyMapping::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+  ::XMLSchema::string< ACE_TCHAR >& AssemblyPropertyMapping::
+  externalName ()
+  {
+    return *externalName_;
+  }
 
-    // AssemblyPropertyMapping
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& AssemblyPropertyMapping::
-    externalName () const
-    {
-      return *externalName_;
-    }
+  void AssemblyPropertyMapping::
+  externalName (::XMLSchema::string< ACE_TCHAR > const& e)
+  {
+    *externalName_ = e;
+  }
 
-    ::XMLSchema::string< ACE_TCHAR >& AssemblyPropertyMapping::
-    externalName ()
-    {
-      return *externalName_;
-    }
+  // AssemblyPropertyMapping
+  //
+  ::CIAO::Config_Handlers::SubcomponentPropertyReference const& AssemblyPropertyMapping::
+  delegatesTo () const
+  {
+    return *delegatesTo_;
+  }
+
+  ::CIAO::Config_Handlers::SubcomponentPropertyReference& AssemblyPropertyMapping::
+  delegatesTo ()
+  {
+    return *delegatesTo_;
+  }
 
-    void AssemblyPropertyMapping::
-    externalName (::XMLSchema::string< ACE_TCHAR > const& e)
+  void AssemblyPropertyMapping::
+  delegatesTo (::CIAO::Config_Handlers::SubcomponentPropertyReference const& e)
+  {
+    *delegatesTo_ = e;
+  }
+
+
+  // ComponentAssemblyDescription
+  //
+
+  ComponentAssemblyDescription::
+  ComponentAssemblyDescription ()
+  :
+  regulator__ ()
+  {
+  }
+
+  ComponentAssemblyDescription::
+  ComponentAssemblyDescription (::CIAO::Config_Handlers::ComponentAssemblyDescription const& s)
+  :
+  externalProperty_ (s.externalProperty_.get () ? new ::CIAO::Config_Handlers::AssemblyPropertyMapping (*s.externalProperty_) : 0),
+  regulator__ ()
+  {
+    instance_.reserve (s.instance_.size ());
     {
-      *externalName_ = e;
+      for (instance_const_iterator i (s.instance_.begin ());
+      i != s.instance_.end ();
+      ++i) add_instance (*i);
     }
 
-    // AssemblyPropertyMapping
-    // 
-    ::CIAO::Config_Handlers::SubcomponentPropertyReference const& AssemblyPropertyMapping::
-    delegatesTo () const
+    connection_.reserve (s.connection_.size ());
     {
-      return *delegatesTo_;
+      for (connection_const_iterator i (s.connection_.begin ());
+      i != s.connection_.end ();
+      ++i) add_connection (*i);
     }
 
-    ::CIAO::Config_Handlers::SubcomponentPropertyReference& AssemblyPropertyMapping::
-    delegatesTo ()
+    if (externalProperty_.get ()) externalProperty_->container (this);
+  }
+
+  ::CIAO::Config_Handlers::ComponentAssemblyDescription& ComponentAssemblyDescription::
+  operator= (::CIAO::Config_Handlers::ComponentAssemblyDescription const& s)
+  {
+    instance_.clear ();
+    instance_.reserve (s.instance_.size ());
     {
-      return *delegatesTo_;
+      for (instance_const_iterator i (s.instance_.begin ());
+      i != s.instance_.end ();
+      ++i) add_instance (*i);
     }
 
-    void AssemblyPropertyMapping::
-    delegatesTo (::CIAO::Config_Handlers::SubcomponentPropertyReference const& e)
+    connection_.clear ();
+    connection_.reserve (s.connection_.size ());
     {
-      *delegatesTo_ = e;
+      for (connection_const_iterator i (s.connection_.begin ());
+      i != s.connection_.end ();
+      ++i) add_connection (*i);
     }
 
+    if (s.externalProperty_.get ()) externalProperty (*(s.externalProperty_));
+    else externalProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::AssemblyPropertyMapping > (0);
 
-    // ComponentAssemblyDescription
-    // 
+    return *this;
+  }
 
-    ComponentAssemblyDescription::
-    ComponentAssemblyDescription ()
-    : 
-    regulator__ ()
-    {
-    }
 
-    ComponentAssemblyDescription::
-    ComponentAssemblyDescription (::CIAO::Config_Handlers::ComponentAssemblyDescription const& s)
-    :
-    ::XSCRT::Type (), 
-    externalProperty_ (s.externalProperty_.get () ? new ::CIAO::Config_Handlers::AssemblyPropertyMapping (*s.externalProperty_) : 0),
-    regulator__ ()
+  // ComponentAssemblyDescription
+  //
+  ComponentAssemblyDescription::instance_iterator ComponentAssemblyDescription::
+  begin_instance ()
+  {
+    return instance_.begin ();
+  }
+
+  ComponentAssemblyDescription::instance_iterator ComponentAssemblyDescription::
+  end_instance ()
+  {
+    return instance_.end ();
+  }
+
+  ComponentAssemblyDescription::instance_const_iterator ComponentAssemblyDescription::
+  begin_instance () const
+  {
+    return instance_.begin ();
+  }
+
+  ComponentAssemblyDescription::instance_const_iterator ComponentAssemblyDescription::
+  end_instance () const
+  {
+    return instance_.end ();
+  }
+
+  void ComponentAssemblyDescription::
+  add_instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& e)
+  {
+    if (instance_.capacity () < instance_.size () + 1)
     {
-      instance_.reserve (s.instance_.size ());
-      {
-        for (instance_const_iterator i (s.instance_.begin ());
-        i != s.instance_.end ();
-        ++i) add_instance (*i);
-      }
+      ::std::vector< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > v;
+      v.reserve (instance_.size () + 1);
 
-      connection_.reserve (s.connection_.size ());
+      while (instance_.size ())
       {
-        for (connection_const_iterator i (s.connection_.begin ());
-        i != s.connection_.end ();
-        ++i) add_connection (*i);
+        //@@ VC6
+        ::CIAO::Config_Handlers::SubcomponentInstantiationDescription& t = instance_.back ();
+        t.container (0);
+        v.push_back (t);
+        v.back ().container (this);
+        instance_.pop_back ();
       }
 
-      if (externalProperty_.get ()) externalProperty_->container (this);
+      instance_.swap (v);
     }
 
-    ::CIAO::Config_Handlers::ComponentAssemblyDescription& ComponentAssemblyDescription::
-    operator= (::CIAO::Config_Handlers::ComponentAssemblyDescription const& s)
+    instance_.push_back (e);
+    instance_.back ().container (this);
+  }
+
+  // ComponentAssemblyDescription
+  //
+  ComponentAssemblyDescription::connection_iterator ComponentAssemblyDescription::
+  begin_connection ()
+  {
+    return connection_.begin ();
+  }
+
+  ComponentAssemblyDescription::connection_iterator ComponentAssemblyDescription::
+  end_connection ()
+  {
+    return connection_.end ();
+  }
+
+  ComponentAssemblyDescription::connection_const_iterator ComponentAssemblyDescription::
+  begin_connection () const
+  {
+    return connection_.begin ();
+  }
+
+  ComponentAssemblyDescription::connection_const_iterator ComponentAssemblyDescription::
+  end_connection () const
+  {
+    return connection_.end ();
+  }
+
+  void ComponentAssemblyDescription::
+  add_connection (::CIAO::Config_Handlers::AssemblyConnectionDescription const& e)
+  {
+    if (connection_.capacity () < connection_.size () + 1)
     {
-      instance_.clear ();
-      instance_.reserve (s.instance_.size ());
-      {
-        for (instance_const_iterator i (s.instance_.begin ());
-        i != s.instance_.end ();
-        ++i) add_instance (*i);
-      }
+      ::std::vector< ::CIAO::Config_Handlers::AssemblyConnectionDescription > v;
+      v.reserve (connection_.size () + 1);
 
-      connection_.clear ();
-      connection_.reserve (s.connection_.size ());
+      while (connection_.size ())
       {
-        for (connection_const_iterator i (s.connection_.begin ());
-        i != s.connection_.end ();
-        ++i) add_connection (*i);
+        //@@ VC6
+        ::CIAO::Config_Handlers::AssemblyConnectionDescription& t = connection_.back ();
+        t.container (0);
+        v.push_back (t);
+        v.back ().container (this);
+        connection_.pop_back ();
       }
 
-      if (s.externalProperty_.get ()) externalProperty (*(s.externalProperty_));
-      else externalProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::AssemblyPropertyMapping > (0);
-
-      return *this;
+      connection_.swap (v);
     }
 
+    connection_.push_back (e);
+    connection_.back ().container (this);
+  }
 
-    // ComponentAssemblyDescription
-    // 
-    ComponentAssemblyDescription::instance_iterator ComponentAssemblyDescription::
-    begin_instance ()
-    {
-      return instance_.begin ();
-    }
+  // ComponentAssemblyDescription
+  //
+  bool ComponentAssemblyDescription::
+  externalProperty_p () const
+  {
+    return externalProperty_.get () != 0;
+  }
 
-    ComponentAssemblyDescription::instance_iterator ComponentAssemblyDescription::
-    end_instance ()
-    {
-      return instance_.end ();
-    }
+  ::CIAO::Config_Handlers::AssemblyPropertyMapping const& ComponentAssemblyDescription::
+  externalProperty () const
+  {
+    return *externalProperty_;
+  }
 
-    ComponentAssemblyDescription::instance_const_iterator ComponentAssemblyDescription::
-    begin_instance () const
+  ::CIAO::Config_Handlers::AssemblyPropertyMapping& ComponentAssemblyDescription::
+  externalProperty ()
+  {
+    return *externalProperty_;
+  }
+
+  void ComponentAssemblyDescription::
+  externalProperty (::CIAO::Config_Handlers::AssemblyPropertyMapping const& e)
+  {
+    if (externalProperty_.get ())
     {
-      return instance_.begin ();
+      *externalProperty_ = e;
     }
 
-    ComponentAssemblyDescription::instance_const_iterator ComponentAssemblyDescription::
-    end_instance () const
+    else
     {
-      return instance_.end ();
+      externalProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::AssemblyPropertyMapping > (new ::CIAO::Config_Handlers::AssemblyPropertyMapping (e));
+      externalProperty_->container (this);
     }
+  }
 
-    void ComponentAssemblyDescription::
-    add_instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& e)
-    {
-      if (instance_.capacity () < instance_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > v;
-        v.reserve (instance_.size () + 1);
-
-        while (instance_.size ())
-        {
-          //@@ VC6
-          ::CIAO::Config_Handlers::SubcomponentInstantiationDescription& t = instance_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          instance_.pop_back ();
-        }
-
-        instance_.swap (v);
-      }
 
-      instance_.push_back (e);
-      instance_.back ().container (this);
-    }
+  // MonolithicImplementationDescription
+  //
 
-    // ComponentAssemblyDescription
-    // 
-    ComponentAssemblyDescription::connection_iterator ComponentAssemblyDescription::
-    begin_connection ()
+  MonolithicImplementationDescription::
+  MonolithicImplementationDescription ()
+  :
+  regulator__ ()
+  {
+  }
+
+  MonolithicImplementationDescription::
+  MonolithicImplementationDescription (::CIAO::Config_Handlers::MonolithicImplementationDescription const& s)
+  :
+  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__ ()
+  {
+    if (execParameter_.get ()) execParameter_->container (this);
+    primaryArtifact_.reserve (s.primaryArtifact_.size ());
     {
-      return connection_.begin ();
+      for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());
+      i != s.primaryArtifact_.end ();
+      ++i) add_primaryArtifact (*i);
     }
 
-    ComponentAssemblyDescription::connection_iterator ComponentAssemblyDescription::
-    end_connection ()
+    if (deployRequirement_.get ()) deployRequirement_->container (this);
+  }
+
+  ::CIAO::Config_Handlers::MonolithicImplementationDescription& MonolithicImplementationDescription::
+  operator= (::CIAO::Config_Handlers::MonolithicImplementationDescription const& s)
+  {
+    if (s.execParameter_.get ()) execParameter (*(s.execParameter_));
+    else execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+
+    primaryArtifact_.clear ();
+    primaryArtifact_.reserve (s.primaryArtifact_.size ());
     {
-      return connection_.end ();
+      for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());
+      i != s.primaryArtifact_.end ();
+      ++i) add_primaryArtifact (*i);
     }
 
-    ComponentAssemblyDescription::connection_const_iterator ComponentAssemblyDescription::
-    begin_connection () const
+    if (s.deployRequirement_.get ()) deployRequirement (*(s.deployRequirement_));
+    else deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationRequirement > (0);
+
+    return *this;
+  }
+
+
+  // MonolithicImplementationDescription
+  //
+  bool MonolithicImplementationDescription::
+  execParameter_p () const
+  {
+    return execParameter_.get () != 0;
+  }
+
+  ::CIAO::Config_Handlers::Property const& MonolithicImplementationDescription::
+  execParameter () const
+  {
+    return *execParameter_;
+  }
+
+  ::CIAO::Config_Handlers::Property& MonolithicImplementationDescription::
+  execParameter ()
+  {
+    return *execParameter_;
+  }
+
+  void MonolithicImplementationDescription::
+  execParameter (::CIAO::Config_Handlers::Property const& e)
+  {
+    if (execParameter_.get ())
     {
-      return connection_.begin ();
+      *execParameter_ = e;
     }
 
-    ComponentAssemblyDescription::connection_const_iterator ComponentAssemblyDescription::
-    end_connection () const
+    else
     {
-      return connection_.end ();
+      execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
+      execParameter_->container (this);
     }
+  }
+
+  // MonolithicImplementationDescription
+  //
+  MonolithicImplementationDescription::primaryArtifact_iterator MonolithicImplementationDescription::
+  begin_primaryArtifact ()
+  {
+    return primaryArtifact_.begin ();
+  }
+
+  MonolithicImplementationDescription::primaryArtifact_iterator MonolithicImplementationDescription::
+  end_primaryArtifact ()
+  {
+    return primaryArtifact_.end ();
+  }
 
-    void ComponentAssemblyDescription::
-    add_connection (::CIAO::Config_Handlers::AssemblyConnectionDescription const& e)
+  MonolithicImplementationDescription::primaryArtifact_const_iterator MonolithicImplementationDescription::
+  begin_primaryArtifact () const
+  {
+    return primaryArtifact_.begin ();
+  }
+
+  MonolithicImplementationDescription::primaryArtifact_const_iterator MonolithicImplementationDescription::
+  end_primaryArtifact () const
+  {
+    return primaryArtifact_.end ();
+  }
+
+  void MonolithicImplementationDescription::
+  add_primaryArtifact (::CIAO::Config_Handlers::NamedImplementationArtifact const& e)
+  {
+    if (primaryArtifact_.capacity () < primaryArtifact_.size () + 1)
     {
-      if (connection_.capacity () < connection_.size () + 1)
+      ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact > v;
+      v.reserve (primaryArtifact_.size () + 1);
+
+      while (primaryArtifact_.size ())
       {
-        ::std::vector< ::CIAO::Config_Handlers::AssemblyConnectionDescription > v;
-        v.reserve (connection_.size () + 1);
-
-        while (connection_.size ())
-        {
-          //@@ VC6
-          ::CIAO::Config_Handlers::AssemblyConnectionDescription& t = connection_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          connection_.pop_back ();
-        }
-
-        connection_.swap (v);
+        //@@ VC6
+        ::CIAO::Config_Handlers::NamedImplementationArtifact& t = primaryArtifact_.back ();
+        t.container (0);
+        v.push_back (t);
+        v.back ().container (this);
+        primaryArtifact_.pop_back ();
       }
 
-      connection_.push_back (e);
-      connection_.back ().container (this);
+      primaryArtifact_.swap (v);
     }
 
-    // ComponentAssemblyDescription
-    // 
-    bool ComponentAssemblyDescription::
-    externalProperty_p () const
-    {
-      return externalProperty_.get () != 0;
-    }
+    primaryArtifact_.push_back (e);
+    primaryArtifact_.back ().container (this);
+  }
+
+  // MonolithicImplementationDescription
+  //
+  bool MonolithicImplementationDescription::
+  deployRequirement_p () const
+  {
+    return deployRequirement_.get () != 0;
+  }
 
-    ::CIAO::Config_Handlers::AssemblyPropertyMapping const& ComponentAssemblyDescription::
-    externalProperty () const
+  ::CIAO::Config_Handlers::ImplementationRequirement const& MonolithicImplementationDescription::
+  deployRequirement () const
+  {
+    return *deployRequirement_;
+  }
+
+  ::CIAO::Config_Handlers::ImplementationRequirement& MonolithicImplementationDescription::
+  deployRequirement ()
+  {
+    return *deployRequirement_;
+  }
+
+  void MonolithicImplementationDescription::
+  deployRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& e)
+  {
+    if (deployRequirement_.get ())
     {
-      return *externalProperty_;
+      *deployRequirement_ = e;
     }
 
-    ::CIAO::Config_Handlers::AssemblyPropertyMapping& ComponentAssemblyDescription::
-    externalProperty ()
+    else
     {
-      return *externalProperty_;
+      deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationRequirement > (new ::CIAO::Config_Handlers::ImplementationRequirement (e));
+      deployRequirement_->container (this);
     }
+  }
 
-    void ComponentAssemblyDescription::
-    externalProperty (::CIAO::Config_Handlers::AssemblyPropertyMapping const& e)
-    {
-      if (externalProperty_.get ())
-      {
-        *externalProperty_ = e;
-      }
 
-      else
-      {
-        externalProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::AssemblyPropertyMapping > (new ::CIAO::Config_Handlers::AssemblyPropertyMapping (e));
-        externalProperty_->container (this);
-      }
-    }
+  // ComponentImplementationDescription
+  //
 
+  ComponentImplementationDescription::
+  ComponentImplementationDescription ()
+  :
+  regulator__ ()
+  {
+  }
 
-    // MonolithicImplementationDescription
-    // 
+  ComponentImplementationDescription::
+  ComponentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const& s)
+  :
+  label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+  UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
+  implements_ (s.implements_.get () ? new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.implements_) : 0),
+  assemblyImpl_ (s.assemblyImpl_.get () ? new ::CIAO::Config_Handlers::ComponentAssemblyDescription (*s.assemblyImpl_) : 0),
+  monolithicImpl_ (s.monolithicImpl_.get () ? new ::CIAO::Config_Handlers::MonolithicImplementationDescription (*s.monolithicImpl_) : 0),
+  configProperty_ (s.configProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.configProperty_) : 0),
+  capability_ (s.capability_.get () ? new ::CIAO::Config_Handlers::Capability (*s.capability_) : 0),
+  dependsOn_ (s.dependsOn_.get () ? new ::CIAO::Config_Handlers::ImplementationDependency (*s.dependsOn_) : 0),
+  infoProperty_ (s.infoProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.infoProperty_) : 0),
+  contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
+  href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
+  regulator__ ()
+  {
+    if (label_.get ()) label_->container (this);
+    if (UUID_.get ()) UUID_->container (this);
+    if (implements_.get ()) implements_->container (this);
+    if (assemblyImpl_.get ()) assemblyImpl_->container (this);
+    if (monolithicImpl_.get ()) monolithicImpl_->container (this);
+    if (configProperty_.get ()) configProperty_->container (this);
+    if (capability_.get ()) capability_->container (this);
+    if (dependsOn_.get ()) dependsOn_->container (this);
+    if (infoProperty_.get ()) infoProperty_->container (this);
+    if (contentLocation_.get ()) contentLocation_->container (this);
+    if (href_.get ()) href_->container (this);
+  }
 
-    MonolithicImplementationDescription::
-    MonolithicImplementationDescription ()
-    : 
-    regulator__ ()
-    {
-    }
+  ::CIAO::Config_Handlers::ComponentImplementationDescription& ComponentImplementationDescription::
+  operator= (::CIAO::Config_Handlers::ComponentImplementationDescription const& s)
+  {
+    if (s.label_.get ()) label (*(s.label_));
+    else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    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__ ()
-    {
-      if (execParameter_.get ()) execParameter_->container (this);
-      primaryArtifact_.reserve (s.primaryArtifact_.size ());
-      {
-        for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());
-        i != s.primaryArtifact_.end ();
-        ++i) add_primaryArtifact (*i);
-      }
+    if (s.UUID_.get ()) UUID (*(s.UUID_));
+    else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-      if (deployRequirement_.get ()) deployRequirement_->container (this);
-    }
+    if (s.implements_.get ()) implements (*(s.implements_));
+    else implements_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (0);
 
-    ::CIAO::Config_Handlers::MonolithicImplementationDescription& MonolithicImplementationDescription::
-    operator= (::CIAO::Config_Handlers::MonolithicImplementationDescription const& s)
-    {
-      if (s.execParameter_.get ()) execParameter (*(s.execParameter_));
-      else execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+    if (s.assemblyImpl_.get ()) assemblyImpl (*(s.assemblyImpl_));
+    else assemblyImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > (0);
 
-      primaryArtifact_.clear ();
-      primaryArtifact_.reserve (s.primaryArtifact_.size ());
-      {
-        for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());
-        i != s.primaryArtifact_.end ();
-        ++i) add_primaryArtifact (*i);
-      }
+    if (s.monolithicImpl_.get ()) monolithicImpl (*(s.monolithicImpl_));
+    else monolithicImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > (0);
 
-      if (s.deployRequirement_.get ()) deployRequirement (*(s.deployRequirement_));
-      else deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationRequirement > (0);
+    if (s.configProperty_.get ()) configProperty (*(s.configProperty_));
+    else configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
 
-      return *this;
-    }
+    if (s.capability_.get ()) capability (*(s.capability_));
+    else capability_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Capability > (0);
 
+    if (s.dependsOn_.get ()) dependsOn (*(s.dependsOn_));
+    else dependsOn_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationDependency > (0);
 
-    // MonolithicImplementationDescription
-    // 
-    bool MonolithicImplementationDescription::
-    execParameter_p () const
-    {
-      return execParameter_.get () != 0;
-    }
+    if (s.infoProperty_.get ()) infoProperty (*(s.infoProperty_));
+    else infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+
+    if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
+    else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    ::CIAO::Config_Handlers::Property const& MonolithicImplementationDescription::
-    execParameter () const
+    if (s.href_.get ()) href (*(s.href_));
+    else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+
+    return *this;
+  }
+
+
+  // ComponentImplementationDescription
+  //
+  bool ComponentImplementationDescription::
+  label_p () const
+  {
+    return label_.get () != 0;
+  }
+
+  ::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
+  label () const
+  {
+    return *label_;
+  }
+
+  ::XMLSchema::string< ACE_TCHAR >& ComponentImplementationDescription::
+  label ()
+  {
+    return *label_;
+  }
+
+  void ComponentImplementationDescription::
+  label (::XMLSchema::string< ACE_TCHAR > const& e)
+  {
+    if (label_.get ())
     {
-      return *execParameter_;
+      *label_ = e;
     }
 
-    ::CIAO::Config_Handlers::Property& MonolithicImplementationDescription::
-    execParameter ()
+    else
     {
-      return *execParameter_;
+      label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+      label_->container (this);
     }
+  }
 
-    void MonolithicImplementationDescription::
-    execParameter (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (execParameter_.get ())
-      {
-        *execParameter_ = e;
-      }
+  // ComponentImplementationDescription
+  //
+  bool ComponentImplementationDescription::
+  UUID_p () const
+  {
+    return UUID_.get () != 0;
+  }
 
-      else
-      {
-        execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        execParameter_->container (this);
-      }
-    }
+  ::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
+  UUID () const
+  {
+    return *UUID_;
+  }
+
+  ::XMLSchema::string< ACE_TCHAR >& ComponentImplementationDescription::
+  UUID ()
+  {
+    return *UUID_;
+  }
 
-    // MonolithicImplementationDescription
-    // 
-    MonolithicImplementationDescription::primaryArtifact_iterator MonolithicImplementationDescription::
-    begin_primaryArtifact ()
+  void ComponentImplementationDescription::
+  UUID (::XMLSchema::string< ACE_TCHAR > const& e)
+  {
+    if (UUID_.get ())
     {
-      return primaryArtifact_.begin ();
+      *UUID_ = e;
     }
 
-    MonolithicImplementationDescription::primaryArtifact_iterator MonolithicImplementationDescription::
-    end_primaryArtifact ()
+    else
     {
-      return primaryArtifact_.end ();
+      UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+      UUID_->container (this);
     }
+  }
+
+  // ComponentImplementationDescription
+  //
+  bool ComponentImplementationDescription::
+  implements_p () const
+  {
+    return implements_.get () != 0;
+  }
+
+  ::CIAO::Config_Handlers::ComponentInterfaceDescription const& ComponentImplementationDescription::
+  implements () const
+  {
+    return *implements_;
+  }
+
+  ::CIAO::Config_Handlers::ComponentInterfaceDescription& ComponentImplementationDescription::
+  implements ()
+  {
+    return *implements_;
+  }
 
-    MonolithicImplementationDescription::primaryArtifact_const_iterator MonolithicImplementationDescription::
-    begin_primaryArtifact () const
+  void ComponentImplementationDescription::
+  implements (::CIAO::Config_Handlers::ComponentInterfaceDescription const& e)
+  {
+    if (implements_.get ())
     {
-      return primaryArtifact_.begin ();
+      *implements_ = e;
     }
 
-    MonolithicImplementationDescription::primaryArtifact_const_iterator MonolithicImplementationDescription::
-    end_primaryArtifact () const
+    else
     {
-      return primaryArtifact_.end ();
+      implements_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (e));
+      implements_->container (this);
     }
+  }
 
-    void MonolithicImplementationDescription::
-    add_primaryArtifact (::CIAO::Config_Handlers::NamedImplementationArtifact const& e)
-    {
-      if (primaryArtifact_.capacity () < primaryArtifact_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact > v;
-        v.reserve (primaryArtifact_.size () + 1);
-
-        while (primaryArtifact_.size ())
-        {
-          //@@ VC6
-          ::CIAO::Config_Handlers::NamedImplementationArtifact& t = primaryArtifact_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          primaryArtifact_.pop_back ();
-        }
-
-        primaryArtifact_.swap (v);
-      }
+  // ComponentImplementationDescription
+  //
+  bool ComponentImplementationDescription::
+  assemblyImpl_p () const
+  {
+    return assemblyImpl_.get () != 0;
+  }
 
-      primaryArtifact_.push_back (e);
-      primaryArtifact_.back ().container (this);
-    }
+  ::CIAO::Config_Handlers::ComponentAssemblyDescription const& ComponentImplementationDescription::
+  assemblyImpl () const
+  {
+    return *assemblyImpl_;
+  }
+
+  ::CIAO::Config_Handlers::ComponentAssemblyDescription& ComponentImplementationDescription::
+  assemblyImpl ()
+  {
+    return *assemblyImpl_;
+  }
 
-    // MonolithicImplementationDescription
-    // 
-    bool MonolithicImplementationDescription::
-    deployRequirement_p () const
+  void ComponentImplementationDescription::
+  assemblyImpl (::CIAO::Config_Handlers::ComponentAssemblyDescription const& e)
+  {
+    if (assemblyImpl_.get ())
     {
-      return deployRequirement_.get () != 0;
+      *assemblyImpl_ = e;
     }
 
-    ::CIAO::Config_Handlers::ImplementationRequirement const& MonolithicImplementationDescription::
-    deployRequirement () const
+    else
     {
-      return *deployRequirement_;
+      assemblyImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > (new ::CIAO::Config_Handlers::ComponentAssemblyDescription (e));
+      assemblyImpl_->container (this);
     }
+  }
+
+  // ComponentImplementationDescription
+  //
+  bool ComponentImplementationDescription::
+  monolithicImpl_p () const
+  {
+    return monolithicImpl_.get () != 0;
+  }
+
+  ::CIAO::Config_Handlers::MonolithicImplementationDescription const& ComponentImplementationDescription::
+  monolithicImpl () const
+  {
+    return *monolithicImpl_;
+  }
+
+  ::CIAO::Config_Handlers::MonolithicImplementationDescription& ComponentImplementationDescription::
+  monolithicImpl ()
+  {
+    return *monolithicImpl_;
+  }
 
-    ::CIAO::Config_Handlers::ImplementationRequirement& MonolithicImplementationDescription::
-    deployRequirement ()
+  void ComponentImplementationDescription::
+  monolithicImpl (::CIAO::Config_Handlers::MonolithicImplementationDescription const& e)
+  {
+    if (monolithicImpl_.get ())
     {
-      return *deployRequirement_;
+      *monolithicImpl_ = e;
     }
 
-    void MonolithicImplementationDescription::
-    deployRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& e)
+    else
     {
-      if (deployRequirement_.get ())
-      {
-        *deployRequirement_ = e;
-      }
-
-      else
-      {
-        deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationRequirement > (new ::CIAO::Config_Handlers::ImplementationRequirement (e));
-        deployRequirement_->container (this);
-      }
+      monolithicImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > (new ::CIAO::Config_Handlers::MonolithicImplementationDescription (e));
+      monolithicImpl_->container (this);
     }
+  }
 
+  // ComponentImplementationDescription
+  //
+  bool ComponentImplementationDescription::
+  configProperty_p () const
+  {
+    return configProperty_.get () != 0;
+  }
+
+  ::CIAO::Config_Handlers::Property const& ComponentImplementationDescription::
+  configProperty () const
+  {
+    return *configProperty_;
+  }
 
-    // ComponentImplementationDescription
-    // 
+  ::CIAO::Config_Handlers::Property& ComponentImplementationDescription::
+  configProperty ()
+  {
+    return *configProperty_;
+  }
 
-    ComponentImplementationDescription::
-    ComponentImplementationDescription ()
-    : 
-    regulator__ ()
+  void ComponentImplementationDescription::
+  configProperty (::CIAO::Config_Handlers::Property const& e)
+  {
+    if (configProperty_.get ())
     {
+      *configProperty_ = e;
     }
 
-    ComponentImplementationDescription::
-    ComponentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const& s)
-    :
-    ::XSCRT::Type (), 
-    label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
-    UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
-    implements_ (s.implements_.get () ? new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.implements_) : 0),
-    assemblyImpl_ (s.assemblyImpl_.get () ? new ::CIAO::Config_Handlers::ComponentAssemblyDescription (*s.assemblyImpl_) : 0),
-    monolithicImpl_ (s.monolithicImpl_.get () ? new ::CIAO::Config_Handlers::MonolithicImplementationDescription (*s.monolithicImpl_) : 0),
-    configProperty_ (s.configProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.configProperty_) : 0),
-    capability_ (s.capability_.get () ? new ::CIAO::Config_Handlers::Capability (*s.capability_) : 0),
-    dependsOn_ (s.dependsOn_.get () ? new ::CIAO::Config_Handlers::ImplementationDependency (*s.dependsOn_) : 0),
-    infoProperty_ (s.infoProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.infoProperty_) : 0),
-    contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
-    regulator__ ()
+    else
     {
-      if (label_.get ()) label_->container (this);
-      if (UUID_.get ()) UUID_->container (this);
-      if (implements_.get ()) implements_->container (this);
-      if (assemblyImpl_.get ()) assemblyImpl_->container (this);
-      if (monolithicImpl_.get ()) monolithicImpl_->container (this);
-      if (configProperty_.get ()) configProperty_->container (this);
-      if (capability_.get ()) capability_->container (this);
-      if (dependsOn_.get ()) dependsOn_->container (this);
-      if (infoProperty_.get ()) infoProperty_->container (this);
-      if (contentLocation_.get ()) contentLocation_->container (this);
+      configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
+      configProperty_->container (this);
     }
+  }
 
-    ::CIAO::Config_Handlers::ComponentImplementationDescription& ComponentImplementationDescription::
-    operator= (::CIAO::Config_Handlers::ComponentImplementationDescription const& s)
-    {
-      if (s.label_.get ()) label (*(s.label_));
-      else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
-
-      if (s.UUID_.get ()) UUID (*(s.UUID_));
-      else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
-
-      if (s.implements_.get ()) implements (*(s.implements_));
-      else implements_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (0);
+  // ComponentImplementationDescription
+  //
+  bool ComponentImplementationDescription::
+  capability_p () const
+  {
+    return capability_.get () != 0;
+  }
 
-      if (s.assemblyImpl_.get ()) assemblyImpl (*(s.assemblyImpl_));
-      else assemblyImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > (0);
+  ::CIAO::Config_Handlers::Capability const& ComponentImplementationDescription::
+  capability () const
+  {
+    return *capability_;
+  }
 
-      if (s.monolithicImpl_.get ()) monolithicImpl (*(s.monolithicImpl_));
-      else monolithicImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > (0);
+  ::CIAO::Config_Handlers::Capability& ComponentImplementationDescription::
+  capability ()
+  {
+    return *capability_;
+  }
 
-      if (s.configProperty_.get ()) configProperty (*(s.configProperty_));
-      else configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+  void ComponentImplementationDescription::
+  capability (::CIAO::Config_Handlers::Capability const& e)
+  {
+    if (capability_.get ())
+    {
+      *capability_ = e;
+    }
 
-      if (s.capability_.get ()) capability (*(s.capability_));
-      else capability_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Capability > (0);
+    else
+    {
+      capability_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Capability > (new ::CIAO::Config_Handlers::Capability (e));
+      capability_->container (this);
+    }
+  }
 
-      if (s.dependsOn_.get ()) dependsOn (*(s.dependsOn_));
-      else dependsOn_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationDependency > (0);
+  // ComponentImplementationDescription
+  //
+  bool ComponentImplementationDescription::
+  dependsOn_p () const
+  {
+    return dependsOn_.get () != 0;
+  }
 
-      if (s.infoProperty_.get ()) infoProperty (*(s.infoProperty_));
-      else infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+  ::CIAO::Config_Handlers::ImplementationDependency const& ComponentImplementationDescription::
+  dependsOn () const
+  {
+    return *dependsOn_;
+  }
 
-      if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
-      else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+  ::CIAO::Config_Handlers::ImplementationDependency& ComponentImplementationDescription::
+  dependsOn ()
+  {
+    return *dependsOn_;
+  }
 
-      return *this;
+  void ComponentImplementationDescription::
+  dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& e)
+  {
+    if (dependsOn_.get ())
+    {
+      *dependsOn_ = e;
     }
 
-
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    label_p () const
+    else
     {
-      return label_.get () != 0;
+      dependsOn_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationDependency > (new ::CIAO::Config_Handlers::ImplementationDependency (e));
+      dependsOn_->container (this);
     }
+  }
+
+  // ComponentImplementationDescription
+  //
+  bool ComponentImplementationDescription::
+  infoProperty_p () const
+  {
+    return infoProperty_.get () != 0;
+  }
+
+  ::CIAO::Config_Handlers::Property const& ComponentImplementationDescription::
+  infoProperty () const
+  {
+    return *infoProperty_;
+  }
+
+  ::CIAO::Config_Handlers::Property& ComponentImplementationDescription::
+  infoProperty ()
+  {
+    return *infoProperty_;
+  }
 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
-    label () const
+  void ComponentImplementationDescription::
+  infoProperty (::CIAO::Config_Handlers::Property const& e)
+  {
+    if (infoProperty_.get ())
     {
-      return *label_;
+      *infoProperty_ = e;
     }
 
-    ::XMLSchema::string< ACE_TCHAR >& ComponentImplementationDescription::
-    label ()
+    else
     {
-      return *label_;
+      infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
+      infoProperty_->container (this);
     }
+  }
 
-    void ComponentImplementationDescription::
-    label (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (label_.get ())
-      {
-        *label_ = e;
-      }
+  // ComponentImplementationDescription
+  //
+  bool ComponentImplementationDescription::
+  contentLocation_p () const
+  {
+    return contentLocation_.get () != 0;
+  }
 
-      else
-      {
-        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        label_->container (this);
-      }
-    }
+  ::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
+  contentLocation () const
+  {
+    return *contentLocation_;
+  }
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    UUID_p () const
-    {
-      return UUID_.get () != 0;
-    }
+  ::XMLSchema::string< ACE_TCHAR >& ComponentImplementationDescription::
+  contentLocation ()
+  {
+    return *contentLocation_;
+  }
 
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
-    UUID () const
+  void ComponentImplementationDescription::
+  contentLocation (::XMLSchema::string< ACE_TCHAR > const& e)
+  {
+    if (contentLocation_.get ())
     {
-      return *UUID_;
+      *contentLocation_ = e;
     }
 
-    ::XMLSchema::string< ACE_TCHAR >& ComponentImplementationDescription::
-    UUID ()
+    else
     {
-      return *UUID_;
+      contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+      contentLocation_->container (this);
     }
+  }
 
-    void ComponentImplementationDescription::
-    UUID (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (UUID_.get ())
-      {
-        *UUID_ = e;
-      }
+  // ComponentImplementationDescription
+  //
+  bool ComponentImplementationDescription::
+  href_p () const
+  {
+    return href_.get () != 0;
+  }
 
-      else
-      {
-        UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        UUID_->container (this);
-      }
-    }
+  ::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
+  href () const
+  {
+    return *href_;
+  }
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    implements_p () const
-    {
-      return implements_.get () != 0;
-    }
+  ::XMLSchema::string< ACE_TCHAR >& ComponentImplementationDescription::
+  href ()
+  {
+    return *href_;
+  }
 
-    ::CIAO::Config_Handlers::ComponentInterfaceDescription const& ComponentImplementationDescription::
-    implements () const
+  void ComponentImplementationDescription::
+  href (::XMLSchema::string< ACE_TCHAR > const& e)
+  {
+    if (href_.get ())
     {
-      return *implements_;
+      *href_ = e;
     }
 
-    ::CIAO::Config_Handlers::ComponentInterfaceDescription& ComponentImplementationDescription::
-    implements ()
+    else
     {
-      return *implements_;
+      href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+      href_->container (this);
     }
+  }
+}
+}
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+  // SubcomponentInstantiationDescription
+  //
+
+  SubcomponentInstantiationDescription::
+  SubcomponentInstantiationDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+  :Base__ (e), regulator__ ()
+  {
 
-    void ComponentImplementationDescription::
-    implements (::CIAO::Config_Handlers::ComponentInterfaceDescription const& e)
+    ::XSCRT::Parser< ACE_TCHAR > p (e);
+
+    while (p.more_elements ())
     {
-      if (implements_.get ())
+      ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+      ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+      if (n == "name")
       {
-        *implements_ = e;
+        name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        name_->container (this);
       }
 
-      else
+      else if (n == "package")
       {
-        implements_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (new ::CIAO::Config_Handlers::ComponentInterfaceDescription (e));
-        implements_->container (this);
+        package_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > (new ::CIAO::Config_Handlers::ComponentPackageDescription (e));
+        package_->container (this);
       }
-    }
-
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    assemblyImpl_p () const
-    {
-      return assemblyImpl_.get () != 0;
-    }
 
-    ::CIAO::Config_Handlers::ComponentAssemblyDescription const& ComponentImplementationDescription::
-    assemblyImpl () const
-    {
-      return *assemblyImpl_;
-    }
+      else if (n == "configProperty")
+      {
+        ::CIAO::Config_Handlers::Property t (e);
+        configProperty (t);
+      }
 
-    ::CIAO::Config_Handlers::ComponentAssemblyDescription& ComponentImplementationDescription::
-    assemblyImpl ()
-    {
-      return *assemblyImpl_;
-    }
+      else if (n == "selectRequirement")
+      {
+        ::CIAO::Config_Handlers::Requirement t (e);
+        selectRequirement (t);
+      }
 
-    void ComponentImplementationDescription::
-    assemblyImpl (::CIAO::Config_Handlers::ComponentAssemblyDescription const& e)
-    {
-      if (assemblyImpl_.get ())
+      else if (n == "reference")
       {
-        *assemblyImpl_ = e;
+        ::CIAO::Config_Handlers::ComponentPackageReference t (e);
+        reference (t);
       }
 
       else
       {
-        assemblyImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > (new ::CIAO::Config_Handlers::ComponentAssemblyDescription (e));
-        assemblyImpl_->container (this);
       }
     }
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    monolithicImpl_p () const
+    while (p.more_attributes ())
     {
-      return monolithicImpl_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::MonolithicImplementationDescription const& ComponentImplementationDescription::
-    monolithicImpl () const
-    {
-      return *monolithicImpl_;
-    }
-
-    ::CIAO::Config_Handlers::MonolithicImplementationDescription& ComponentImplementationDescription::
-    monolithicImpl ()
-    {
-      return *monolithicImpl_;
-    }
-
-    void ComponentImplementationDescription::
-    monolithicImpl (::CIAO::Config_Handlers::MonolithicImplementationDescription const& e)
-    {
-      if (monolithicImpl_.get ())
+      ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+      ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+      if (n == "id")
       {
-        *monolithicImpl_ = e;
+        ::XMLSchema::ID< ACE_TCHAR > t (a);
+        id (t);
       }
 
       else
       {
-        monolithicImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > (new ::CIAO::Config_Handlers::MonolithicImplementationDescription (e));
-        monolithicImpl_->container (this);
       }
     }
+  }
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    configProperty_p () const
-    {
-      return configProperty_.get () != 0;
-    }
+  // SubcomponentPropertyReference
+  //
 
-    ::CIAO::Config_Handlers::Property const& ComponentImplementationDescription::
-    configProperty () const
-    {
-      return *configProperty_;
-    }
+  SubcomponentPropertyReference::
+  SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+  :Base__ (e), regulator__ ()
+  {
 
-    ::CIAO::Config_Handlers::Property& ComponentImplementationDescription::
-    configProperty ()
-    {
-      return *configProperty_;
-    }
+    ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-    void ComponentImplementationDescription::
-    configProperty (::CIAO::Config_Handlers::Property const& e)
+    while (p.more_elements ())
     {
-      if (configProperty_.get ())
+      ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+      ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+      if (n == "propertyName")
+      {
+        propertyName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        propertyName_->container (this);
+      }
+
+      else if (n == "instance")
       {
-        *configProperty_ = e;
+        instance_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > (new ::CIAO::Config_Handlers::SubcomponentInstantiationDescription (e));
+        instance_->container (this);
       }
 
       else
       {
-        configProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        configProperty_->container (this);
       }
     }
+  }
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    capability_p () const
-    {
-      return capability_.get () != 0;
-    }
+  // AssemblyPropertyMapping
+  //
 
-    ::CIAO::Config_Handlers::Capability const& ComponentImplementationDescription::
-    capability () const
-    {
-      return *capability_;
-    }
+  AssemblyPropertyMapping::
+  AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+  :Base__ (e), regulator__ ()
+  {
 
-    ::CIAO::Config_Handlers::Capability& ComponentImplementationDescription::
-    capability ()
-    {
-      return *capability_;
-    }
+    ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-    void ComponentImplementationDescription::
-    capability (::CIAO::Config_Handlers::Capability const& e)
+    while (p.more_elements ())
     {
-      if (capability_.get ())
+      ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+      ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+      if (n == "name")
       {
-        *capability_ = e;
+        name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        name_->container (this);
       }
 
-      else
+      else if (n == "externalName")
       {
-        capability_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Capability > (new ::CIAO::Config_Handlers::Capability (e));
-        capability_->container (this);
+        externalName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        externalName_->container (this);
       }
-    }
-
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    dependsOn_p () const
-    {
-      return dependsOn_.get () != 0;
-    }
-
-    ::CIAO::Config_Handlers::ImplementationDependency const& ComponentImplementationDescription::
-    dependsOn () const
-    {
-      return *dependsOn_;
-    }
 
-    ::CIAO::Config_Handlers::ImplementationDependency& ComponentImplementationDescription::
-    dependsOn ()
-    {
-      return *dependsOn_;
-    }
-
-    void ComponentImplementationDescription::
-    dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& e)
-    {
-      if (dependsOn_.get ())
+      else if (n == "delegatesTo")
       {
-        *dependsOn_ = e;
+        delegatesTo_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SubcomponentPropertyReference > (new ::CIAO::Config_Handlers::SubcomponentPropertyReference (e));
+        delegatesTo_->container (this);
       }
 
       else
       {
-        dependsOn_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationDependency > (new ::CIAO::Config_Handlers::ImplementationDependency (e));
-        dependsOn_->container (this);
       }
     }
+  }
 
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    infoProperty_p () const
-    {
-      return infoProperty_.get () != 0;
-    }
+  // ComponentAssemblyDescription
+  //
 
-    ::CIAO::Config_Handlers::Property const& ComponentImplementationDescription::
-    infoProperty () const
-    {
-      return *infoProperty_;
-    }
+  ComponentAssemblyDescription::
+  ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+  :Base__ (e), regulator__ ()
+  {
 
-    ::CIAO::Config_Handlers::Property& ComponentImplementationDescription::
-    infoProperty ()
-    {
-      return *infoProperty_;
-    }
+    ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-    void ComponentImplementationDescription::
-    infoProperty (::CIAO::Config_Handlers::Property const& e)
+    while (p.more_elements ())
     {
-      if (infoProperty_.get ())
+      ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+      ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+      if (n == "instance")
       {
-        *infoProperty_ = e;
+        ::CIAO::Config_Handlers::SubcomponentInstantiationDescription t (e);
+        add_instance (t);
       }
 
-      else
+      else if (n == "connection")
       {
-        infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        infoProperty_->container (this);
+        ::CIAO::Config_Handlers::AssemblyConnectionDescription t (e);
+        add_connection (t);
       }
-    }
-
-    // ComponentImplementationDescription
-    // 
-    bool ComponentImplementationDescription::
-    contentLocation_p () const
-    {
-      return contentLocation_.get () != 0;
-    }
-
-    ::XMLSchema::string< ACE_TCHAR > const& ComponentImplementationDescription::
-    contentLocation () const
-    {
-      return *contentLocation_;
-    }
-
-    ::XMLSchema::string< ACE_TCHAR >& ComponentImplementationDescription::
-    contentLocation ()
-    {
-      return *contentLocation_;
-    }
 
-    void ComponentImplementationDescription::
-    contentLocation (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (contentLocation_.get ())
+      else if (n == "externalProperty")
       {
-        *contentLocation_ = e;
+        ::CIAO::Config_Handlers::AssemblyPropertyMapping t (e);
+        externalProperty (t);
       }
 
       else
       {
-        contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        contentLocation_->container (this);
       }
     }
   }
-}
 
-namespace CIAO
-{
-  namespace Config_Handlers
+  // MonolithicImplementationDescription
+  //
+
+  MonolithicImplementationDescription::
+  MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+  :Base__ (e), regulator__ ()
   {
-    // SubcomponentInstantiationDescription
-    //
 
-    SubcomponentInstantiationDescription::
-    SubcomponentInstantiationDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+    ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+    while (p.more_elements ())
+    {
+      ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+      ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-      while (p.more_elements ())
+      if (n == "execParameter")
       {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
-
-        else if (n == "package")
-        {
-          package_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > (new ::CIAO::Config_Handlers::ComponentPackageDescription (e));
-          package_->container (this);
-        }
-
-        else if (n == "configProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          configProperty (t);
-        }
-
-        else if (n == "selectRequirement")
-        {
-          ::CIAO::Config_Handlers::Requirement t (e);
-          selectRequirement (t);
-        }
-
-        else if (n == "reference")
-        {
-          ::CIAO::Config_Handlers::ComponentPackageReference t (e);
-          reference (t);
-        }
-
-        else 
-        {
-        }
+        ::CIAO::Config_Handlers::Property t (e);
+        execParameter (t);
       }
 
-      while (p.more_attributes ())
+      else if (n == "primaryArtifact")
       {
-        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
-        if (n == "id")
-        {
-          ::XMLSchema::ID< ACE_TCHAR > t (a);
-          id (t);
-        }
-
-        else 
-        {
-        }
+        ::CIAO::Config_Handlers::NamedImplementationArtifact t (e);
+        add_primaryArtifact (t);
       }
-    }
 
-    // SubcomponentPropertyReference
-    //
-
-    SubcomponentPropertyReference::
-    SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
-
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+      else if (n == "deployRequirement")
+      {
+        ::CIAO::Config_Handlers::ImplementationRequirement t (e);
+        deployRequirement (t);
+      }
 
-      while (p.more_elements ())
+      else
       {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "propertyName")
-        {
-          propertyName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          propertyName_->container (this);
-        }
-
-        else if (n == "instance")
-        {
-          instance_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > (new ::CIAO::Config_Handlers::SubcomponentInstantiationDescription (e));
-          instance_->container (this);
-        }
-
-        else 
-        {
-        }
       }
     }
+  }
+
+  // ComponentImplementationDescription
+  //
+
+  ComponentImplementationDescription::
+  ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+  :Base__ (e), regulator__ ()
+  {
 
-    // AssemblyPropertyMapping
-    //
+    ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-    AssemblyPropertyMapping::
-    AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+    while (p.more_elements ())
     {
+      ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+      ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+      if (n == "label")
+      {
+        ::XMLSchema::string< ACE_TCHAR > t (e);
+        label (t);
+      }
 
-      while (p.more_elements ())
+      else if (n == "UUID")
       {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
-
-        else if (n == "externalName")
-        {
-          externalName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          externalName_->container (this);
-        }
-
-        else if (n == "delegatesTo")
-        {
-          delegatesTo_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SubcomponentPropertyReference > (new ::CIAO::Config_Handlers::SubcomponentPropertyReference (e));
-          delegatesTo_->container (this);
-        }
-
-        else 
-        {
-        }
+        ::XMLSchema::string< ACE_TCHAR > t (e);
+        UUID (t);
       }
-    }
 
-    // ComponentAssemblyDescription
-    //
+      else if (n == "implements")
+      {
+        ::CIAO::Config_Handlers::ComponentInterfaceDescription t (e);
+        implements (t);
+      }
 
-    ComponentAssemblyDescription::
-    ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+      else if (n == "assemblyImpl")
+      {
+        ::CIAO::Config_Handlers::ComponentAssemblyDescription t (e);
+        assemblyImpl (t);
+      }
+
+      else if (n == "monolithicImpl")
+      {
+        ::CIAO::Config_Handlers::MonolithicImplementationDescription t (e);
+        monolithicImpl (t);
+      }
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+      else if (n == "configProperty")
+      {
+        ::CIAO::Config_Handlers::Property t (e);
+        configProperty (t);
+      }
 
-      while (p.more_elements ())
+      else if (n == "capability")
       {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "instance")
-        {
-          ::CIAO::Config_Handlers::SubcomponentInstantiationDescription t (e);
-          add_instance (t);
-        }
-
-        else if (n == "connection")
-        {
-          ::CIAO::Config_Handlers::AssemblyConnectionDescription t (e);
-          add_connection (t);
-        }
-
-        else if (n == "externalProperty")
-        {
-          ::CIAO::Config_Handlers::AssemblyPropertyMapping t (e);
-          externalProperty (t);
-        }
-
-        else 
-        {
-        }
+        ::CIAO::Config_Handlers::Capability t (e);
+        capability (t);
       }
-    }
 
-    // MonolithicImplementationDescription
-    //
+      else if (n == "dependsOn")
+      {
+        ::CIAO::Config_Handlers::ImplementationDependency t (e);
+        dependsOn (t);
+      }
 
-    MonolithicImplementationDescription::
-    MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+      else if (n == "infoProperty")
+      {
+        ::CIAO::Config_Handlers::Property t (e);
+        infoProperty (t);
+      }
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+      else if (n == "contentLocation")
+      {
+        ::XMLSchema::string< ACE_TCHAR > t (e);
+        contentLocation (t);
+      }
 
-      while (p.more_elements ())
+      else
       {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "execParameter")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          execParameter (t);
-        }
-
-        else if (n == "primaryArtifact")
-        {
-          ::CIAO::Config_Handlers::NamedImplementationArtifact t (e);
-          add_primaryArtifact (t);
-        }
-
-        else if (n == "deployRequirement")
-        {
-          ::CIAO::Config_Handlers::ImplementationRequirement t (e);
-          deployRequirement (t);
-        }
-
-        else 
-        {
-        }
       }
     }
 
-    // ComponentImplementationDescription
-    //
-
-    ComponentImplementationDescription::
-    ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
+    while (p.more_attributes ())
     {
+      ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+      ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+      if (n == "href")
+      {
+        ::XMLSchema::string< ACE_TCHAR > t (a);
+        href (t);
+      }
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
-
-      while (p.more_elements ())
+      else
       {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "label")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          label (t);
-        }
-
-        else if (n == "UUID")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          UUID (t);
-        }
-
-        else if (n == "implements")
-        {
-          ::CIAO::Config_Handlers::ComponentInterfaceDescription t (e);
-          implements (t);
-        }
-
-        else if (n == "assemblyImpl")
-        {
-          ::CIAO::Config_Handlers::ComponentAssemblyDescription t (e);
-          assemblyImpl (t);
-        }
-
-        else if (n == "monolithicImpl")
-        {
-          ::CIAO::Config_Handlers::MonolithicImplementationDescription t (e);
-          monolithicImpl (t);
-        }
-
-        else if (n == "configProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          configProperty (t);
-        }
-
-        else if (n == "capability")
-        {
-          ::CIAO::Config_Handlers::Capability t (e);
-          capability (t);
-        }
-
-        else if (n == "dependsOn")
-        {
-          ::CIAO::Config_Handlers::ImplementationDependency t (e);
-          dependsOn (t);
-        }
-
-        else if (n == "infoProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          infoProperty (t);
-        }
-
-        else if (n == "contentLocation")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          contentLocation (t);
-        }
-
-        else 
-        {
-        }
       }
     }
   }
 }
+}
 
 namespace CIAO
 {
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp
index 872605e4cb2..2d5c71b0911 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cid.hpp
@@ -3,7 +3,7 @@
  *
  * Changes made to this code will most likely be overwritten
  * when the handlers are recompiled.
- * 
+ *
  * If you find errors or feel that there are bugfixes to be made,
  * please contact the current XSC maintainer:
  *             Will Otte <wotte@dre.vanderbilt.edu>
@@ -12,7 +12,7 @@
 
 // Fixes the VC6 warning 4786.
 #include "vc6-4786.h"
- 
+
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
@@ -52,417 +52,429 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
-    class Config_Handlers_Export SubcomponentInstantiationDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      ::XMLSchema::string< ACE_TCHAR >& name ();
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // package
-      // 
-      public:
-      ::CIAO::Config_Handlers::ComponentPackageDescription const& package () const;
-      ::CIAO::Config_Handlers::ComponentPackageDescription& package ();
-      void package (::CIAO::Config_Handlers::ComponentPackageDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > package_;
-
-      // configProperty
-      // 
-      public:
-      bool configProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& configProperty () const;
-      ::CIAO::Config_Handlers::Property& configProperty ();
-      void configProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
-
-      // selectRequirement
-      // 
-      public:
-      bool selectRequirement_p () const;
-      ::CIAO::Config_Handlers::Requirement const& selectRequirement () const;
-      ::CIAO::Config_Handlers::Requirement& selectRequirement ();
-      void selectRequirement (::CIAO::Config_Handlers::Requirement const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > selectRequirement_;
-
-      // reference
-      // 
-      public:
-      bool reference_p () const;
-      ::CIAO::Config_Handlers::ComponentPackageReference const& reference () const;
-      ::CIAO::Config_Handlers::ComponentPackageReference& reference ();
-      void reference (::CIAO::Config_Handlers::ComponentPackageReference const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > reference_;
-
-      // id
-      // 
-      public:
-      bool id_p () const;
-      ::XMLSchema::ID< ACE_TCHAR > const& id () const;
-      ::XMLSchema::ID< ACE_TCHAR >& id ();
-      void id (::XMLSchema::ID< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
-
-      public:
-      SubcomponentInstantiationDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-      ::CIAO::Config_Handlers::ComponentPackageDescription const& package__);
-
-      SubcomponentInstantiationDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      SubcomponentInstantiationDescription (SubcomponentInstantiationDescription const& s);
-
-      SubcomponentInstantiationDescription&
-      operator= (SubcomponentInstantiationDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class Config_Handlers_Export SubcomponentPropertyReference : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // propertyName
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& propertyName () const;
-      ::XMLSchema::string< ACE_TCHAR >& propertyName ();
-      void propertyName (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > propertyName_;
-
-      // instance
-      // 
-      public:
-      ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance () const;
-      ::CIAO::Config_Handlers::SubcomponentInstantiationDescription& instance ();
-      void instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > instance_;
-
-      public:
-      SubcomponentPropertyReference (::XMLSchema::string< ACE_TCHAR > const& propertyName__,
-      ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance__);
-
-      SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      SubcomponentPropertyReference (SubcomponentPropertyReference const& s);
-
-      SubcomponentPropertyReference&
-      operator= (SubcomponentPropertyReference const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class Config_Handlers_Export AssemblyPropertyMapping : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      ::XMLSchema::string< ACE_TCHAR >& name ();
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // externalName
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& externalName () const;
-      ::XMLSchema::string< ACE_TCHAR >& externalName ();
-      void externalName (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > externalName_;
-
-      // delegatesTo
-      // 
-      public:
-      ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo () const;
-      ::CIAO::Config_Handlers::SubcomponentPropertyReference& delegatesTo ();
-      void delegatesTo (::CIAO::Config_Handlers::SubcomponentPropertyReference const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::SubcomponentPropertyReference > delegatesTo_;
-
-      public:
-      AssemblyPropertyMapping (::XMLSchema::string< ACE_TCHAR > const& name__,
-      ::XMLSchema::string< ACE_TCHAR > const& externalName__,
-      ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo__);
-
-      AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      AssemblyPropertyMapping (AssemblyPropertyMapping const& s);
-
-      AssemblyPropertyMapping&
-      operator= (AssemblyPropertyMapping const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class Config_Handlers_Export ComponentAssemblyDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // instance
-      // 
-      public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >::iterator instance_iterator;
-      typedef ::std::vector< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >::const_iterator instance_const_iterator;
-      instance_iterator begin_instance ();
-      instance_iterator end_instance ();
-      instance_const_iterator begin_instance () const;
-      instance_const_iterator end_instance () const;
-      void add_instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& );
-
-      protected:
-      ::std::vector< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > instance_;
-
-      // connection
-      // 
-      public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::AssemblyConnectionDescription >::iterator connection_iterator;
-      typedef ::std::vector< ::CIAO::Config_Handlers::AssemblyConnectionDescription >::const_iterator connection_const_iterator;
-      connection_iterator begin_connection ();
-      connection_iterator end_connection ();
-      connection_const_iterator begin_connection () const;
-      connection_const_iterator end_connection () const;
-      void add_connection (::CIAO::Config_Handlers::AssemblyConnectionDescription const& );
-
-      protected:
-      ::std::vector< ::CIAO::Config_Handlers::AssemblyConnectionDescription > connection_;
-
-      // externalProperty
-      // 
-      public:
-      bool externalProperty_p () const;
-      ::CIAO::Config_Handlers::AssemblyPropertyMapping const& externalProperty () const;
-      ::CIAO::Config_Handlers::AssemblyPropertyMapping& externalProperty ();
-      void externalProperty (::CIAO::Config_Handlers::AssemblyPropertyMapping const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::AssemblyPropertyMapping > externalProperty_;
-
-      public:
-      ComponentAssemblyDescription ();
-
-      ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ComponentAssemblyDescription (ComponentAssemblyDescription const& s);
-
-      ComponentAssemblyDescription&
-      operator= (ComponentAssemblyDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class Config_Handlers_Export MonolithicImplementationDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // execParameter
-      // 
-      public:
-      bool execParameter_p () const;
-      ::CIAO::Config_Handlers::Property const& execParameter () const;
-      ::CIAO::Config_Handlers::Property& execParameter ();
-      void execParameter (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > execParameter_;
-
-      // primaryArtifact
-      // 
-      public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact >::iterator primaryArtifact_iterator;
-      typedef ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact >::const_iterator primaryArtifact_const_iterator;
-      primaryArtifact_iterator begin_primaryArtifact ();
-      primaryArtifact_iterator end_primaryArtifact ();
-      primaryArtifact_const_iterator begin_primaryArtifact () const;
-      primaryArtifact_const_iterator end_primaryArtifact () const;
-      void add_primaryArtifact (::CIAO::Config_Handlers::NamedImplementationArtifact const& );
-
-      protected:
-      ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact > primaryArtifact_;
-
-      // deployRequirement
-      // 
-      public:
-      bool deployRequirement_p () const;
-      ::CIAO::Config_Handlers::ImplementationRequirement const& deployRequirement () const;
-      ::CIAO::Config_Handlers::ImplementationRequirement& deployRequirement ();
-      void deployRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationRequirement > deployRequirement_;
-
-      public:
-      MonolithicImplementationDescription ();
-
-      MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      MonolithicImplementationDescription (MonolithicImplementationDescription const& s);
-
-      MonolithicImplementationDescription&
-      operator= (MonolithicImplementationDescription const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class Config_Handlers_Export ComponentImplementationDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // label
-      // 
-      public:
-      bool label_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& label () const;
-      ::XMLSchema::string< ACE_TCHAR >& label ();
-      void label (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
-
-      // UUID
-      // 
-      public:
-      bool UUID_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& UUID () const;
-      ::XMLSchema::string< ACE_TCHAR >& UUID ();
-      void UUID (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
-
-      // implements
-      // 
-      public:
-      bool implements_p () const;
-      ::CIAO::Config_Handlers::ComponentInterfaceDescription const& implements () const;
-      ::CIAO::Config_Handlers::ComponentInterfaceDescription& implements ();
-      void implements (::CIAO::Config_Handlers::ComponentInterfaceDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > implements_;
-
-      // assemblyImpl
-      // 
-      public:
-      bool assemblyImpl_p () const;
-      ::CIAO::Config_Handlers::ComponentAssemblyDescription const& assemblyImpl () const;
-      ::CIAO::Config_Handlers::ComponentAssemblyDescription& assemblyImpl ();
-      void assemblyImpl (::CIAO::Config_Handlers::ComponentAssemblyDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > assemblyImpl_;
-
-      // monolithicImpl
-      // 
-      public:
-      bool monolithicImpl_p () const;
-      ::CIAO::Config_Handlers::MonolithicImplementationDescription const& monolithicImpl () const;
-      ::CIAO::Config_Handlers::MonolithicImplementationDescription& monolithicImpl ();
-      void monolithicImpl (::CIAO::Config_Handlers::MonolithicImplementationDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > monolithicImpl_;
-
-      // configProperty
-      // 
-      public:
-      bool configProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& configProperty () const;
-      ::CIAO::Config_Handlers::Property& configProperty ();
-      void configProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
-
-      // capability
-      // 
-      public:
-      bool capability_p () const;
-      ::CIAO::Config_Handlers::Capability const& capability () const;
-      ::CIAO::Config_Handlers::Capability& capability ();
-      void capability (::CIAO::Config_Handlers::Capability const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Capability > capability_;
-
-      // dependsOn
-      // 
-      public:
-      bool dependsOn_p () const;
-      ::CIAO::Config_Handlers::ImplementationDependency const& dependsOn () const;
-      ::CIAO::Config_Handlers::ImplementationDependency& dependsOn ();
-      void dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationDependency > dependsOn_;
-
-      // infoProperty
-      // 
-      public:
-      bool infoProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& infoProperty () const;
-      ::CIAO::Config_Handlers::Property& infoProperty ();
-      void infoProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
-
-      // contentLocation
-      // 
-      public:
-      bool contentLocation_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
-      ::XMLSchema::string< ACE_TCHAR >& contentLocation ();
-      void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
-
-      public:
-      ComponentImplementationDescription ();
-
-      ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ComponentImplementationDescription (ComponentImplementationDescription const& s);
-
-      ComponentImplementationDescription&
-      operator= (ComponentImplementationDescription const& s);
-
-      private:
-      char regulator__;
-    };
-  }
+
+  class Config_Handlers_Export SubcomponentInstantiationDescription : public ::XSCRT::Type
+  {
+    //@@ VC6 anathema
+    typedef ::XSCRT::Type Base__;
+
+    // name
+    //
+    public:
+    ::XMLSchema::string< ACE_TCHAR > const& name () const;
+    ::XMLSchema::string< ACE_TCHAR >& name ();
+    void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+    protected:
+    ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+    // package
+    //
+    public:
+    ::CIAO::Config_Handlers::ComponentPackageDescription const& package () const;
+    ::CIAO::Config_Handlers::ComponentPackageDescription& package ();
+    void package (::CIAO::Config_Handlers::ComponentPackageDescription const& );
+
+    protected:
+    ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > package_;
+
+    // configProperty
+    //
+    public:
+    bool configProperty_p () const;
+    ::CIAO::Config_Handlers::Property const& configProperty () const;
+    ::CIAO::Config_Handlers::Property& configProperty ();
+    void configProperty (::CIAO::Config_Handlers::Property const& );
+
+    protected:
+    ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
+
+    // selectRequirement
+    //
+    public:
+    bool selectRequirement_p () const;
+    ::CIAO::Config_Handlers::Requirement const& selectRequirement () const;
+    ::CIAO::Config_Handlers::Requirement& selectRequirement ();
+    void selectRequirement (::CIAO::Config_Handlers::Requirement const& );
+
+    protected:
+    ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > selectRequirement_;
+
+    // reference
+    //
+    public:
+    bool reference_p () const;
+    ::CIAO::Config_Handlers::ComponentPackageReference const& reference () const;
+    ::CIAO::Config_Handlers::ComponentPackageReference& reference ();
+    void reference (::CIAO::Config_Handlers::ComponentPackageReference const& );
+
+    protected:
+    ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > reference_;
+
+    // id
+    //
+    public:
+    bool id_p () const;
+    ::XMLSchema::ID< ACE_TCHAR > const& id () const;
+    ::XMLSchema::ID< ACE_TCHAR >& id ();
+    void id (::XMLSchema::ID< ACE_TCHAR > const& );
+
+    protected:
+    ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_;
+
+    public:
+    SubcomponentInstantiationDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
+    ::CIAO::Config_Handlers::ComponentPackageDescription const& package__);
+
+    SubcomponentInstantiationDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+    SubcomponentInstantiationDescription (SubcomponentInstantiationDescription const& s);
+
+    SubcomponentInstantiationDescription&
+    operator= (SubcomponentInstantiationDescription const& s);
+
+    private:
+    char regulator__;
+  };
+
+  class Config_Handlers_Export SubcomponentPropertyReference : public ::XSCRT::Type
+  {
+    //@@ VC6 anathema
+    typedef ::XSCRT::Type Base__;
+
+    // propertyName
+    //
+    public:
+    ::XMLSchema::string< ACE_TCHAR > const& propertyName () const;
+    ::XMLSchema::string< ACE_TCHAR >& propertyName ();
+    void propertyName (::XMLSchema::string< ACE_TCHAR > const& );
+
+    protected:
+    ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > propertyName_;
+
+    // instance
+    //
+    public:
+    ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance () const;
+    ::CIAO::Config_Handlers::SubcomponentInstantiationDescription& instance ();
+    void instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& );
+
+    protected:
+    ::std::auto_ptr< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > instance_;
+
+    public:
+    SubcomponentPropertyReference (::XMLSchema::string< ACE_TCHAR > const& propertyName__,
+    ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance__);
+
+    SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR > const&);
+    SubcomponentPropertyReference (SubcomponentPropertyReference const& s);
+
+    SubcomponentPropertyReference&
+    operator= (SubcomponentPropertyReference const& s);
+
+    private:
+    char regulator__;
+  };
+
+  class Config_Handlers_Export AssemblyPropertyMapping : public ::XSCRT::Type
+  {
+    //@@ VC6 anathema
+    typedef ::XSCRT::Type Base__;
+
+    // name
+    //
+    public:
+    ::XMLSchema::string< ACE_TCHAR > const& name () const;
+    ::XMLSchema::string< ACE_TCHAR >& name ();
+    void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+    protected:
+    ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+    // externalName
+    //
+    public:
+    ::XMLSchema::string< ACE_TCHAR > const& externalName () const;
+    ::XMLSchema::string< ACE_TCHAR >& externalName ();
+    void externalName (::XMLSchema::string< ACE_TCHAR > const& );
+
+    protected:
+    ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > externalName_;
+
+    // delegatesTo
+    //
+    public:
+    ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo () const;
+    ::CIAO::Config_Handlers::SubcomponentPropertyReference& delegatesTo ();
+    void delegatesTo (::CIAO::Config_Handlers::SubcomponentPropertyReference const& );
+
+    protected:
+    ::std::auto_ptr< ::CIAO::Config_Handlers::SubcomponentPropertyReference > delegatesTo_;
+
+    public:
+    AssemblyPropertyMapping (::XMLSchema::string< ACE_TCHAR > const& name__,
+    ::XMLSchema::string< ACE_TCHAR > const& externalName__,
+    ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo__);
+
+    AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR > const&);
+    AssemblyPropertyMapping (AssemblyPropertyMapping const& s);
+
+    AssemblyPropertyMapping&
+    operator= (AssemblyPropertyMapping const& s);
+
+    private:
+    char regulator__;
+  };
+
+  class Config_Handlers_Export ComponentAssemblyDescription : public ::XSCRT::Type
+  {
+    //@@ VC6 anathema
+    typedef ::XSCRT::Type Base__;
+
+    // instance
+    //
+    public:
+    typedef ::std::vector< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >::iterator instance_iterator;
+    typedef ::std::vector< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription >::const_iterator instance_const_iterator;
+    instance_iterator begin_instance ();
+    instance_iterator end_instance ();
+    instance_const_iterator begin_instance () const;
+    instance_const_iterator end_instance () const;
+    void add_instance (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& );
+
+    protected:
+    ::std::vector< ::CIAO::Config_Handlers::SubcomponentInstantiationDescription > instance_;
+
+    // connection
+    //
+    public:
+    typedef ::std::vector< ::CIAO::Config_Handlers::AssemblyConnectionDescription >::iterator connection_iterator;
+    typedef ::std::vector< ::CIAO::Config_Handlers::AssemblyConnectionDescription >::const_iterator connection_const_iterator;
+    connection_iterator begin_connection ();
+    connection_iterator end_connection ();
+    connection_const_iterator begin_connection () const;
+    connection_const_iterator end_connection () const;
+    void add_connection (::CIAO::Config_Handlers::AssemblyConnectionDescription const& );
+
+    protected:
+    ::std::vector< ::CIAO::Config_Handlers::AssemblyConnectionDescription > connection_;
+
+    // externalProperty
+    //
+    public:
+    bool externalProperty_p () const;
+    ::CIAO::Config_Handlers::AssemblyPropertyMapping const& externalProperty () const;
+    ::CIAO::Config_Handlers::AssemblyPropertyMapping& externalProperty ();
+    void externalProperty (::CIAO::Config_Handlers::AssemblyPropertyMapping const& );
+
+    protected:
+    ::std::auto_ptr< ::CIAO::Config_Handlers::AssemblyPropertyMapping > externalProperty_;
+
+    public:
+    ComponentAssemblyDescription ();
+
+    ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+    ComponentAssemblyDescription (ComponentAssemblyDescription const& s);
+
+    ComponentAssemblyDescription&
+    operator= (ComponentAssemblyDescription const& s);
+
+    private:
+    char regulator__;
+  };
+
+  class Config_Handlers_Export MonolithicImplementationDescription : public ::XSCRT::Type
+  {
+    //@@ VC6 anathema
+    typedef ::XSCRT::Type Base__;
+
+    // execParameter
+    //
+    public:
+    bool execParameter_p () const;
+    ::CIAO::Config_Handlers::Property const& execParameter () const;
+    ::CIAO::Config_Handlers::Property& execParameter ();
+    void execParameter (::CIAO::Config_Handlers::Property const& );
+
+    protected:
+    ::std::auto_ptr< ::CIAO::Config_Handlers::Property > execParameter_;
+
+    // primaryArtifact
+    //
+    public:
+    typedef ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact >::iterator primaryArtifact_iterator;
+    typedef ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact >::const_iterator primaryArtifact_const_iterator;
+    primaryArtifact_iterator begin_primaryArtifact ();
+    primaryArtifact_iterator end_primaryArtifact ();
+    primaryArtifact_const_iterator begin_primaryArtifact () const;
+    primaryArtifact_const_iterator end_primaryArtifact () const;
+    void add_primaryArtifact (::CIAO::Config_Handlers::NamedImplementationArtifact const& );
+
+    protected:
+    ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact > primaryArtifact_;
+
+    // deployRequirement
+    //
+    public:
+    bool deployRequirement_p () const;
+    ::CIAO::Config_Handlers::ImplementationRequirement const& deployRequirement () const;
+    ::CIAO::Config_Handlers::ImplementationRequirement& deployRequirement ();
+    void deployRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& );
+
+    protected:
+    ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationRequirement > deployRequirement_;
+
+    public:
+    MonolithicImplementationDescription ();
+
+    MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+    MonolithicImplementationDescription (MonolithicImplementationDescription const& s);
+
+    MonolithicImplementationDescription&
+    operator= (MonolithicImplementationDescription const& s);
+
+    private:
+    char regulator__;
+  };
+
+  class Config_Handlers_Export ComponentImplementationDescription : public ::XSCRT::Type
+  {
+    //@@ VC6 anathema
+    typedef ::XSCRT::Type Base__;
+
+    // label
+    //
+    public:
+    bool label_p () const;
+    ::XMLSchema::string< ACE_TCHAR > const& label () const;
+    ::XMLSchema::string< ACE_TCHAR >& label ();
+    void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+    protected:
+    ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+    // UUID
+    //
+    public:
+    bool UUID_p () const;
+    ::XMLSchema::string< ACE_TCHAR > const& UUID () const;
+    ::XMLSchema::string< ACE_TCHAR >& UUID ();
+    void UUID (::XMLSchema::string< ACE_TCHAR > const& );
+
+    protected:
+    ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
+
+    // implements
+    //
+    public:
+    bool implements_p () const;
+    ::CIAO::Config_Handlers::ComponentInterfaceDescription const& implements () const;
+    ::CIAO::Config_Handlers::ComponentInterfaceDescription& implements ();
+    void implements (::CIAO::Config_Handlers::ComponentInterfaceDescription const& );
+
+    protected:
+    ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > implements_;
+
+    // assemblyImpl
+    //
+    public:
+    bool assemblyImpl_p () const;
+    ::CIAO::Config_Handlers::ComponentAssemblyDescription const& assemblyImpl () const;
+    ::CIAO::Config_Handlers::ComponentAssemblyDescription& assemblyImpl ();
+    void assemblyImpl (::CIAO::Config_Handlers::ComponentAssemblyDescription const& );
+
+    protected:
+    ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > assemblyImpl_;
+
+    // monolithicImpl
+    //
+    public:
+    bool monolithicImpl_p () const;
+    ::CIAO::Config_Handlers::MonolithicImplementationDescription const& monolithicImpl () const;
+    ::CIAO::Config_Handlers::MonolithicImplementationDescription& monolithicImpl ();
+    void monolithicImpl (::CIAO::Config_Handlers::MonolithicImplementationDescription const& );
+
+    protected:
+    ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > monolithicImpl_;
+
+    // configProperty
+    //
+    public:
+    bool configProperty_p () const;
+    ::CIAO::Config_Handlers::Property const& configProperty () const;
+    ::CIAO::Config_Handlers::Property& configProperty ();
+    void configProperty (::CIAO::Config_Handlers::Property const& );
+
+    protected:
+    ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
+
+    // capability
+    //
+    public:
+    bool capability_p () const;
+    ::CIAO::Config_Handlers::Capability const& capability () const;
+    ::CIAO::Config_Handlers::Capability& capability ();
+    void capability (::CIAO::Config_Handlers::Capability const& );
+
+    protected:
+    ::std::auto_ptr< ::CIAO::Config_Handlers::Capability > capability_;
+
+    // dependsOn
+    //
+    public:
+    bool dependsOn_p () const;
+    ::CIAO::Config_Handlers::ImplementationDependency const& dependsOn () const;
+    ::CIAO::Config_Handlers::ImplementationDependency& dependsOn ();
+    void dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& );
+
+    protected:
+    ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationDependency > dependsOn_;
+
+    // infoProperty
+    //
+    public:
+    bool infoProperty_p () const;
+    ::CIAO::Config_Handlers::Property const& infoProperty () const;
+    ::CIAO::Config_Handlers::Property& infoProperty ();
+    void infoProperty (::CIAO::Config_Handlers::Property const& );
+
+    protected:
+    ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
+
+    // contentLocation
+    //
+    public:
+    bool contentLocation_p () const;
+    ::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
+    ::XMLSchema::string< ACE_TCHAR >& contentLocation ();
+    void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
+
+    protected:
+    ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
+
+    // href
+    //
+    public:
+    bool href_p () const;
+    ::XMLSchema::string< ACE_TCHAR > const& href () const;
+    ::XMLSchema::string< ACE_TCHAR >& href ();
+    void href (::XMLSchema::string< ACE_TCHAR > const& );
+
+    protected:
+    ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
+
+    public:
+    ComponentImplementationDescription ();
+
+    ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+    ComponentImplementationDescription (ComponentImplementationDescription const& s);
+
+    ComponentImplementationDescription&
+    operator= (ComponentImplementationDescription const& s);
+
+    private:
+    char regulator__;
+  };
+}
 }
 
 namespace CIAO
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cpd.cpp b/TAO/CIAO/DAnCE/Config_Handlers/cpd.cpp
index ea26d110127..75d77230d5b 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cpd.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cpd.cpp
@@ -3,25 +3,26 @@
  *
  * Changes made to this code will most likely be overwritten
  * when the handlers are recompiled.
- * 
+ *
  * If you find errors or feel that there are bugfixes to be made,
  * please contact the current XSC maintainer:
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
- 
+
 #include "cpd.hpp"
 
 namespace CIAO
 {
   namespace Config_Handlers
   {
+
     // PackagedComponentImplementation
-    // 
+    //
 
     PackagedComponentImplementation::
     PackagedComponentImplementation (::XMLSchema::string< ACE_TCHAR > const& name__,
     ::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation__)
-    : 
+    :
     name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
     referencedImplementation_ (new ::CIAO::Config_Handlers::ComponentImplementationDescription (referencedImplementation__)),
     regulator__ ()
@@ -33,7 +34,6 @@ namespace CIAO
     PackagedComponentImplementation::
     PackagedComponentImplementation (::CIAO::Config_Handlers::PackagedComponentImplementation const& s)
     :
-    ::XSCRT::Type (), 
     name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
     referencedImplementation_ (new ::CIAO::Config_Handlers::ComponentImplementationDescription (*s.referencedImplementation_)),
     regulator__ ()
@@ -54,7 +54,7 @@ namespace CIAO
 
 
     // PackagedComponentImplementation
-    // 
+    //
     ::XMLSchema::string< ACE_TCHAR > const& PackagedComponentImplementation::
     name () const
     {
@@ -74,7 +74,7 @@ namespace CIAO
     }
 
     // PackagedComponentImplementation
-    // 
+    //
     ::CIAO::Config_Handlers::ComponentImplementationDescription const& PackagedComponentImplementation::
     referencedImplementation () const
     {
@@ -95,11 +95,11 @@ namespace CIAO
 
 
     // ComponentPackageDescription
-    // 
+    //
 
     ComponentPackageDescription::
     ComponentPackageDescription ()
-    : 
+    :
     regulator__ ()
     {
     }
@@ -107,7 +107,6 @@ namespace CIAO
     ComponentPackageDescription::
     ComponentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const& s)
     :
-    ::XSCRT::Type (), 
     label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
     UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
     realizes_ (s.realizes_.get () ? new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.realizes_) : 0),
@@ -115,6 +114,7 @@ namespace CIAO
     implementation_ (s.implementation_.get () ? new ::CIAO::Config_Handlers::PackagedComponentImplementation (*s.implementation_) : 0),
     infoProperty_ (s.infoProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.infoProperty_) : 0),
     contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
+    href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
     regulator__ ()
     {
       if (label_.get ()) label_->container (this);
@@ -124,6 +124,7 @@ namespace CIAO
       if (implementation_.get ()) implementation_->container (this);
       if (infoProperty_.get ()) infoProperty_->container (this);
       if (contentLocation_.get ()) contentLocation_->container (this);
+      if (href_.get ()) href_->container (this);
     }
 
     ::CIAO::Config_Handlers::ComponentPackageDescription& ComponentPackageDescription::
@@ -150,12 +151,15 @@ namespace CIAO
       if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
       else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
+      if (s.href_.get ()) href (*(s.href_));
+      else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+
       return *this;
     }
 
 
     // ComponentPackageDescription
-    // 
+    //
     bool ComponentPackageDescription::
     label_p () const
     {
@@ -190,7 +194,7 @@ namespace CIAO
     }
 
     // ComponentPackageDescription
-    // 
+    //
     bool ComponentPackageDescription::
     UUID_p () const
     {
@@ -225,7 +229,7 @@ namespace CIAO
     }
 
     // ComponentPackageDescription
-    // 
+    //
     bool ComponentPackageDescription::
     realizes_p () const
     {
@@ -260,7 +264,7 @@ namespace CIAO
     }
 
     // ComponentPackageDescription
-    // 
+    //
     bool ComponentPackageDescription::
     configProperty_p () const
     {
@@ -295,7 +299,7 @@ namespace CIAO
     }
 
     // ComponentPackageDescription
-    // 
+    //
     bool ComponentPackageDescription::
     implementation_p () const
     {
@@ -330,7 +334,7 @@ namespace CIAO
     }
 
     // ComponentPackageDescription
-    // 
+    //
     bool ComponentPackageDescription::
     infoProperty_p () const
     {
@@ -365,7 +369,7 @@ namespace CIAO
     }
 
     // ComponentPackageDescription
-    // 
+    //
     bool ComponentPackageDescription::
     contentLocation_p () const
     {
@@ -398,6 +402,41 @@ namespace CIAO
         contentLocation_->container (this);
       }
     }
+
+    // ComponentPackageDescription
+    //
+    bool ComponentPackageDescription::
+    href_p () const
+    {
+      return href_.get () != 0;
+    }
+
+    ::XMLSchema::string< ACE_TCHAR > const& ComponentPackageDescription::
+    href () const
+    {
+      return *href_;
+    }
+
+    ::XMLSchema::string< ACE_TCHAR >& ComponentPackageDescription::
+    href ()
+    {
+      return *href_;
+    }
+
+    void ComponentPackageDescription::
+    href (::XMLSchema::string< ACE_TCHAR > const& e)
+    {
+      if (href_.get ())
+      {
+        *href_ = e;
+      }
+
+      else
+      {
+        href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        href_->container (this);
+      }
+    }
   }
 }
 
@@ -405,6 +444,7 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
+
     // PackagedComponentImplementation
     //
 
@@ -432,7 +472,7 @@ namespace CIAO
           referencedImplementation_->container (this);
         }
 
-        else 
+        else
         {
         }
       }
@@ -495,7 +535,22 @@ namespace CIAO
           contentLocation (t);
         }
 
-        else 
+        else
+        {
+        }
+      }
+
+      while (p.more_attributes ())
+      {
+        ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+        if (n == "href")
+        {
+          ::XMLSchema::string< ACE_TCHAR > t (a);
+          href (t);
+        }
+
+        else
         {
         }
       }
@@ -509,4 +564,3 @@ namespace CIAO
   {
   }
 }
-
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp b/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp
index 74ffd0cc335..7a1d27aec6f 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/cpd.hpp
@@ -3,7 +3,7 @@
  *
  * Changes made to this code will most likely be overwritten
  * when the handlers are recompiled.
- * 
+ *
  * If you find errors or feel that there are bugfixes to be made,
  * please contact the current XSC maintainer:
  *             Will Otte <wotte@dre.vanderbilt.edu>
@@ -12,7 +12,7 @@
 
 // Fixes the VC6 warning 4786.
 #include "vc6-4786.h"
- 
+
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
@@ -46,13 +46,14 @@ namespace CIAO
 {
   namespace Config_Handlers
   {
+
     class Config_Handlers_Export PackagedComponentImplementation : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
 
       // name
-      // 
+      //
       public:
       ::XMLSchema::string< ACE_TCHAR > const& name () const;
       ::XMLSchema::string< ACE_TCHAR >& name ();
@@ -62,7 +63,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
       // referencedImplementation
-      // 
+      //
       public:
       ::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation () const;
       ::CIAO::Config_Handlers::ComponentImplementationDescription& referencedImplementation ();
@@ -91,7 +92,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // label
-      // 
+      //
       public:
       bool label_p () const;
       ::XMLSchema::string< ACE_TCHAR > const& label () const;
@@ -102,7 +103,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
 
       // UUID
-      // 
+      //
       public:
       bool UUID_p () const;
       ::XMLSchema::string< ACE_TCHAR > const& UUID () const;
@@ -113,7 +114,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
 
       // realizes
-      // 
+      //
       public:
       bool realizes_p () const;
       ::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes () const;
@@ -124,7 +125,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > realizes_;
 
       // configProperty
-      // 
+      //
       public:
       bool configProperty_p () const;
       ::CIAO::Config_Handlers::Property const& configProperty () const;
@@ -135,7 +136,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > configProperty_;
 
       // implementation
-      // 
+      //
       public:
       bool implementation_p () const;
       ::CIAO::Config_Handlers::PackagedComponentImplementation const& implementation () const;
@@ -146,7 +147,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::PackagedComponentImplementation > implementation_;
 
       // infoProperty
-      // 
+      //
       public:
       bool infoProperty_p () const;
       ::CIAO::Config_Handlers::Property const& infoProperty () const;
@@ -157,7 +158,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
 
       // contentLocation
-      // 
+      //
       public:
       bool contentLocation_p () const;
       ::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
@@ -167,6 +168,17 @@ namespace CIAO
       protected:
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
 
+      // href
+      //
+      public:
+      bool href_p () const;
+      ::XMLSchema::string< ACE_TCHAR > const& href () const;
+      ::XMLSchema::string< ACE_TCHAR >& href ();
+      void href (::XMLSchema::string< ACE_TCHAR > const& );
+
+      protected:
+      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
+
       public:
       ComponentPackageDescription ();
 
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/iad.cpp b/TAO/CIAO/DAnCE/Config_Handlers/iad.cpp
index 1e4d3acfca7..bf382f1dc26 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/iad.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/iad.cpp
@@ -3,603 +3,655 @@
  *
  * Changes made to this code will most likely be overwritten
  * when the handlers are recompiled.
- * 
+ *
  * If you find errors or feel that there are bugfixes to be made,
  * please contact the current XSC maintainer:
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
- 
 #include "iad.hpp"
 
 namespace CIAO
 {
   namespace Config_Handlers
   {
-    // NamedImplementationArtifact
-    // 
+  // NamedImplementationArtifact
+  //
+
+  NamedImplementationArtifact::
+  NamedImplementationArtifact (::XMLSchema::string< ACE_TCHAR > const& name__,
+  ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact__)
+  :
+  name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
+  referencedArtifact_ (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (referencedArtifact__)),
+  regulator__ ()
+  {
+    name_->container (this);
+    referencedArtifact_->container (this);
+  }
 
-    NamedImplementationArtifact::
-    NamedImplementationArtifact (::XMLSchema::string< ACE_TCHAR > const& name__,
-    ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact__)
-    : 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-    referencedArtifact_ (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (referencedArtifact__)),
-    regulator__ ()
-    {
-      name_->container (this);
-      referencedArtifact_->container (this);
-    }
+  NamedImplementationArtifact::
+  NamedImplementationArtifact (::CIAO::Config_Handlers::NamedImplementationArtifact const& s)
+  :
+  name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
+  referencedArtifact_ (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (*s.referencedArtifact_)),
+  regulator__ ()
+  {
+    name_->container (this);
+    referencedArtifact_->container (this);
+  }
 
-    NamedImplementationArtifact::
-    NamedImplementationArtifact (::CIAO::Config_Handlers::NamedImplementationArtifact const& s)
-    :
-    ::XSCRT::Type (), 
-    name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-    referencedArtifact_ (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (*s.referencedArtifact_)),
-    regulator__ ()
-    {
-      name_->container (this);
-      referencedArtifact_->container (this);
-    }
+  ::CIAO::Config_Handlers::NamedImplementationArtifact& NamedImplementationArtifact::
+  operator= (::CIAO::Config_Handlers::NamedImplementationArtifact const& s)
+  {
+    name (s.name ());
 
-    ::CIAO::Config_Handlers::NamedImplementationArtifact& NamedImplementationArtifact::
-    operator= (::CIAO::Config_Handlers::NamedImplementationArtifact const& s)
-    {
-      name (s.name ());
+    referencedArtifact (s.referencedArtifact ());
 
-      referencedArtifact (s.referencedArtifact ());
+    return *this;
+  }
 
-      return *this;
-    }
 
+  // NamedImplementationArtifact
+  //
+  ::XMLSchema::string< ACE_TCHAR > const& NamedImplementationArtifact::
+  name () const
+  {
+    return *name_;
+  }
 
-    // NamedImplementationArtifact
-    // 
-    ::XMLSchema::string< ACE_TCHAR > const& NamedImplementationArtifact::
-    name () const
-    {
-      return *name_;
-    }
+  ::XMLSchema::string< ACE_TCHAR >& NamedImplementationArtifact::
+  name ()
+  {
+    return *name_;
+  }
 
-    ::XMLSchema::string< ACE_TCHAR >& NamedImplementationArtifact::
-    name ()
-    {
-      return *name_;
-    }
+  void NamedImplementationArtifact::
+  name (::XMLSchema::string< ACE_TCHAR > const& e)
+  {
+    *name_ = e;
+  }
 
-    void NamedImplementationArtifact::
-    name (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      *name_ = e;
-    }
+  // NamedImplementationArtifact
+  //
+  ::CIAO::Config_Handlers::ImplementationArtifactDescription const& NamedImplementationArtifact::
+  referencedArtifact () const
+  {
+    return *referencedArtifact_;
+  }
 
-    // NamedImplementationArtifact
-    // 
-    ::CIAO::Config_Handlers::ImplementationArtifactDescription const& NamedImplementationArtifact::
-    referencedArtifact () const
-    {
-      return *referencedArtifact_;
-    }
+  ::CIAO::Config_Handlers::ImplementationArtifactDescription& NamedImplementationArtifact::
+  referencedArtifact ()
+  {
+    return *referencedArtifact_;
+  }
 
-    ::CIAO::Config_Handlers::ImplementationArtifactDescription& NamedImplementationArtifact::
-    referencedArtifact ()
+  void NamedImplementationArtifact::
+  referencedArtifact (::CIAO::Config_Handlers::ImplementationArtifactDescription const& e)
+  {
+    *referencedArtifact_ = e;
+  }
+
+
+  // ImplementationArtifactDescription
+  //
+
+  ImplementationArtifactDescription::
+  ImplementationArtifactDescription ()
+  :
+  regulator__ ()
+  {
+  }
+
+  ImplementationArtifactDescription::
+  ImplementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const& s)
+  :
+  label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
+  UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
+  execParameter_ (s.execParameter_.get () ? new ::CIAO::Config_Handlers::Property (*s.execParameter_) : 0),
+  deployRequirement_ (s.deployRequirement_.get () ? new ::CIAO::Config_Handlers::Requirement (*s.deployRequirement_) : 0),
+  infoProperty_ (s.infoProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.infoProperty_) : 0),
+  contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
+  href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0),
+  regulator__ ()
+  {
+    if (label_.get ()) label_->container (this);
+    if (UUID_.get ()) UUID_->container (this);
+    location_.reserve (s.location_.size ());
     {
-      return *referencedArtifact_;
+      for (location_const_iterator i (s.location_.begin ());
+      i != s.location_.end ();
+      ++i) add_location (*i);
     }
 
-    void NamedImplementationArtifact::
-    referencedArtifact (::CIAO::Config_Handlers::ImplementationArtifactDescription const& e)
+    if (execParameter_.get ()) execParameter_->container (this);
+    if (deployRequirement_.get ()) deployRequirement_->container (this);
+    dependsOn_.reserve (s.dependsOn_.size ());
     {
-      *referencedArtifact_ = e;
+      for (dependsOn_const_iterator i (s.dependsOn_.begin ());
+      i != s.dependsOn_.end ();
+      ++i) add_dependsOn (*i);
     }
 
+    if (infoProperty_.get ()) infoProperty_->container (this);
+    if (contentLocation_.get ()) contentLocation_->container (this);
+    if (href_.get ()) href_->container (this);
+  }
+
+  ::CIAO::Config_Handlers::ImplementationArtifactDescription& ImplementationArtifactDescription::
+  operator= (::CIAO::Config_Handlers::ImplementationArtifactDescription const& s)
+  {
+    if (s.label_.get ()) label (*(s.label_));
+    else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    // ImplementationArtifactDescription
-    // 
+    if (s.UUID_.get ()) UUID (*(s.UUID_));
+    else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-    ImplementationArtifactDescription::
-    ImplementationArtifactDescription ()
-    : 
-    regulator__ ()
+    location_.clear ();
+    location_.reserve (s.location_.size ());
     {
+      for (location_const_iterator i (s.location_.begin ());
+      i != s.location_.end ();
+      ++i) add_location (*i);
     }
 
-    ImplementationArtifactDescription::
-    ImplementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const& s)
-    :
-    ::XSCRT::Type (), 
-    label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0),
-    UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0),
-    execParameter_ (s.execParameter_.get () ? new ::CIAO::Config_Handlers::Property (*s.execParameter_) : 0),
-    deployRequirement_ (s.deployRequirement_.get () ? new ::CIAO::Config_Handlers::Requirement (*s.deployRequirement_) : 0),
-    infoProperty_ (s.infoProperty_.get () ? new ::CIAO::Config_Handlers::Property (*s.infoProperty_) : 0),
-    contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0),
-    regulator__ ()
-    {
-      if (label_.get ()) label_->container (this);
-      if (UUID_.get ()) UUID_->container (this);
-      location_.reserve (s.location_.size ());
-      {
-        for (location_const_iterator i (s.location_.begin ());
-        i != s.location_.end ();
-        ++i) add_location (*i);
-      }
+    if (s.execParameter_.get ()) execParameter (*(s.execParameter_));
+    else execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
 
-      if (execParameter_.get ()) execParameter_->container (this);
-      if (deployRequirement_.get ()) deployRequirement_->container (this);
-      dependsOn_.reserve (s.dependsOn_.size ());
-      {
-        for (dependsOn_const_iterator i (s.dependsOn_.begin ());
-        i != s.dependsOn_.end ();
-        ++i) add_dependsOn (*i);
-      }
-
-      if (infoProperty_.get ()) infoProperty_->container (this);
-      if (contentLocation_.get ()) contentLocation_->container (this);
-    }
+    if (s.deployRequirement_.get ()) deployRequirement (*(s.deployRequirement_));
+    else deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (0);
 
-    ::CIAO::Config_Handlers::ImplementationArtifactDescription& ImplementationArtifactDescription::
-    operator= (::CIAO::Config_Handlers::ImplementationArtifactDescription const& s)
+    dependsOn_.clear ();
+    dependsOn_.reserve (s.dependsOn_.size ());
     {
-      if (s.label_.get ()) label (*(s.label_));
-      else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
-
-      if (s.UUID_.get ()) UUID (*(s.UUID_));
-      else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+      for (dependsOn_const_iterator i (s.dependsOn_.begin ());
+      i != s.dependsOn_.end ();
+      ++i) add_dependsOn (*i);
+    }
 
-      location_.clear ();
-      location_.reserve (s.location_.size ());
-      {
-        for (location_const_iterator i (s.location_.begin ());
-        i != s.location_.end ();
-        ++i) add_location (*i);
-      }
+    if (s.infoProperty_.get ()) infoProperty (*(s.infoProperty_));
+    else infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
 
-      if (s.execParameter_.get ()) execParameter (*(s.execParameter_));
-      else execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
+    if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
+    else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-      if (s.deployRequirement_.get ()) deployRequirement (*(s.deployRequirement_));
-      else deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (0);
+    if (s.href_.get ()) href (*(s.href_));
+    else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
 
-      dependsOn_.clear ();
-      dependsOn_.reserve (s.dependsOn_.size ());
-      {
-        for (dependsOn_const_iterator i (s.dependsOn_.begin ());
-        i != s.dependsOn_.end ();
-        ++i) add_dependsOn (*i);
-      }
+    return *this;
+  }
 
-      if (s.infoProperty_.get ()) infoProperty (*(s.infoProperty_));
-      else infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (0);
 
-      if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_));
-      else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0);
+  // ImplementationArtifactDescription
+  //
+  bool ImplementationArtifactDescription::
+  label_p () const
+  {
+    return label_.get () != 0;
+  }
 
-      return *this;
-    }
+  ::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
+  label () const
+  {
+    return *label_;
+  }
 
+  ::XMLSchema::string< ACE_TCHAR >& ImplementationArtifactDescription::
+  label ()
+  {
+    return *label_;
+  }
 
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    label_p () const
+  void ImplementationArtifactDescription::
+  label (::XMLSchema::string< ACE_TCHAR > const& e)
+  {
+    if (label_.get ())
     {
-      return label_.get () != 0;
+      *label_ = e;
     }
 
-    ::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
-    label () const
+    else
     {
-      return *label_;
+      label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+      label_->container (this);
     }
+  }
 
-    ::XMLSchema::string< ACE_TCHAR >& ImplementationArtifactDescription::
-    label ()
-    {
-      return *label_;
-    }
+  // ImplementationArtifactDescription
+  //
+  bool ImplementationArtifactDescription::
+  UUID_p () const
+  {
+    return UUID_.get () != 0;
+  }
 
-    void ImplementationArtifactDescription::
-    label (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (label_.get ())
-      {
-        *label_ = e;
-      }
+  ::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
+  UUID () const
+  {
+    return *UUID_;
+  }
 
-      else
-      {
-        label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        label_->container (this);
-      }
-    }
+  ::XMLSchema::string< ACE_TCHAR >& ImplementationArtifactDescription::
+  UUID ()
+  {
+    return *UUID_;
+  }
 
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    UUID_p () const
+  void ImplementationArtifactDescription::
+  UUID (::XMLSchema::string< ACE_TCHAR > const& e)
+  {
+    if (UUID_.get ())
     {
-      return UUID_.get () != 0;
+      *UUID_ = e;
     }
 
-    ::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
-    UUID () const
+    else
     {
-      return *UUID_;
+      UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+      UUID_->container (this);
     }
+  }
 
-    ::XMLSchema::string< ACE_TCHAR >& ImplementationArtifactDescription::
-    UUID ()
-    {
-      return *UUID_;
-    }
+  // ImplementationArtifactDescription
+  //
+  ImplementationArtifactDescription::location_iterator ImplementationArtifactDescription::
+  begin_location ()
+  {
+    return location_.begin ();
+  }
+
+  ImplementationArtifactDescription::location_iterator ImplementationArtifactDescription::
+  end_location ()
+  {
+    return location_.end ();
+  }
+
+  ImplementationArtifactDescription::location_const_iterator ImplementationArtifactDescription::
+  begin_location () const
+  {
+    return location_.begin ();
+  }
 
-    void ImplementationArtifactDescription::
-    UUID (::XMLSchema::string< ACE_TCHAR > const& e)
+  ImplementationArtifactDescription::location_const_iterator ImplementationArtifactDescription::
+  end_location () const
+  {
+    return location_.end ();
+  }
+
+  void ImplementationArtifactDescription::
+  add_location (::XMLSchema::string< ACE_TCHAR > const& e)
+  {
+    if (location_.capacity () < location_.size () + 1)
     {
-      if (UUID_.get ())
-      {
-        *UUID_ = e;
-      }
+      ::std::vector< ::XMLSchema::string< ACE_TCHAR > > v;
+      v.reserve (location_.size () + 1);
 
-      else
+      while (location_.size ())
       {
-        UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        UUID_->container (this);
+        //@@ VC6
+        ::XMLSchema::string< ACE_TCHAR >& t = location_.back ();
+        t.container (0);
+        v.push_back (t);
+        v.back ().container (this);
+        location_.pop_back ();
       }
-    }
 
-    // ImplementationArtifactDescription
-    // 
-    ImplementationArtifactDescription::location_iterator ImplementationArtifactDescription::
-    begin_location ()
-    {
-      return location_.begin ();
+      location_.swap (v);
     }
 
-    ImplementationArtifactDescription::location_iterator ImplementationArtifactDescription::
-    end_location ()
-    {
-      return location_.end ();
-    }
+    location_.push_back (e);
+    location_.back ().container (this);
+  }
 
-    ImplementationArtifactDescription::location_const_iterator ImplementationArtifactDescription::
-    begin_location () const
+  // ImplementationArtifactDescription
+  //
+  bool ImplementationArtifactDescription::
+  execParameter_p () const
+  {
+    return execParameter_.get () != 0;
+  }
+
+  ::CIAO::Config_Handlers::Property const& ImplementationArtifactDescription::
+  execParameter () const
+  {
+    return *execParameter_;
+  }
+
+  ::CIAO::Config_Handlers::Property& ImplementationArtifactDescription::
+  execParameter ()
+  {
+    return *execParameter_;
+  }
+
+  void ImplementationArtifactDescription::
+  execParameter (::CIAO::Config_Handlers::Property const& e)
+  {
+    if (execParameter_.get ())
     {
-      return location_.begin ();
+      *execParameter_ = e;
     }
 
-    ImplementationArtifactDescription::location_const_iterator ImplementationArtifactDescription::
-    end_location () const
+    else
     {
-      return location_.end ();
+      execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
+      execParameter_->container (this);
     }
+  }
 
-    void ImplementationArtifactDescription::
-    add_location (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      if (location_.capacity () < location_.size () + 1)
-      {
-        ::std::vector< ::XMLSchema::string< ACE_TCHAR > > v;
-        v.reserve (location_.size () + 1);
-
-        while (location_.size ())
-        {
-          //@@ VC6
-          ::XMLSchema::string< ACE_TCHAR >& t = location_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          location_.pop_back ();
-        }
-
-        location_.swap (v);
-      }
+  // ImplementationArtifactDescription
+  //
+  bool ImplementationArtifactDescription::
+  deployRequirement_p () const
+  {
+    return deployRequirement_.get () != 0;
+  }
 
-      location_.push_back (e);
-      location_.back ().container (this);
-    }
+  ::CIAO::Config_Handlers::Requirement const& ImplementationArtifactDescription::
+  deployRequirement () const
+  {
+    return *deployRequirement_;
+  }
 
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    execParameter_p () const
-    {
-      return execParameter_.get () != 0;
-    }
+  ::CIAO::Config_Handlers::Requirement& ImplementationArtifactDescription::
+  deployRequirement ()
+  {
+    return *deployRequirement_;
+  }
 
-    ::CIAO::Config_Handlers::Property const& ImplementationArtifactDescription::
-    execParameter () const
+  void ImplementationArtifactDescription::
+  deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
+  {
+    if (deployRequirement_.get ())
     {
-      return *execParameter_;
+      *deployRequirement_ = e;
     }
 
-    ::CIAO::Config_Handlers::Property& ImplementationArtifactDescription::
-    execParameter ()
+    else
     {
-      return *execParameter_;
+      deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (new ::CIAO::Config_Handlers::Requirement (e));
+      deployRequirement_->container (this);
     }
+  }
 
-    void ImplementationArtifactDescription::
-    execParameter (::CIAO::Config_Handlers::Property const& e)
-    {
-      if (execParameter_.get ())
-      {
-        *execParameter_ = e;
-      }
+  // ImplementationArtifactDescription
+  //
+  ImplementationArtifactDescription::dependsOn_iterator ImplementationArtifactDescription::
+  begin_dependsOn ()
+  {
+    return dependsOn_.begin ();
+  }
 
-      else
-      {
-        execParameter_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        execParameter_->container (this);
-      }
-    }
+  ImplementationArtifactDescription::dependsOn_iterator ImplementationArtifactDescription::
+  end_dependsOn ()
+  {
+    return dependsOn_.end ();
+  }
 
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    deployRequirement_p () const
-    {
-      return deployRequirement_.get () != 0;
-    }
+  ImplementationArtifactDescription::dependsOn_const_iterator ImplementationArtifactDescription::
+  begin_dependsOn () const
+  {
+    return dependsOn_.begin ();
+  }
 
-    ::CIAO::Config_Handlers::Requirement const& ImplementationArtifactDescription::
-    deployRequirement () const
-    {
-      return *deployRequirement_;
-    }
+  ImplementationArtifactDescription::dependsOn_const_iterator ImplementationArtifactDescription::
+  end_dependsOn () const
+  {
+    return dependsOn_.end ();
+  }
 
-    ::CIAO::Config_Handlers::Requirement& ImplementationArtifactDescription::
-    deployRequirement ()
+  void ImplementationArtifactDescription::
+  add_dependsOn (::CIAO::Config_Handlers::NamedImplementationArtifact const& e)
+  {
+    if (dependsOn_.capacity () < dependsOn_.size () + 1)
     {
-      return *deployRequirement_;
-    }
+      ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact > v;
+      v.reserve (dependsOn_.size () + 1);
 
-    void ImplementationArtifactDescription::
-    deployRequirement (::CIAO::Config_Handlers::Requirement const& e)
-    {
-      if (deployRequirement_.get ())
+      while (dependsOn_.size ())
       {
-        *deployRequirement_ = e;
+        //@@ VC6
+        ::CIAO::Config_Handlers::NamedImplementationArtifact& t = dependsOn_.back ();
+        t.container (0);
+        v.push_back (t);
+        v.back ().container (this);
+        dependsOn_.pop_back ();
       }
 
-      else
-      {
-        deployRequirement_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > (new ::CIAO::Config_Handlers::Requirement (e));
-        deployRequirement_->container (this);
-      }
+      dependsOn_.swap (v);
     }
 
-    // ImplementationArtifactDescription
-    // 
-    ImplementationArtifactDescription::dependsOn_iterator ImplementationArtifactDescription::
-    begin_dependsOn ()
+    dependsOn_.push_back (e);
+    dependsOn_.back ().container (this);
+  }
+
+  // ImplementationArtifactDescription
+  //
+  bool ImplementationArtifactDescription::
+  infoProperty_p () const
+  {
+    return infoProperty_.get () != 0;
+  }
+
+  ::CIAO::Config_Handlers::Property const& ImplementationArtifactDescription::
+  infoProperty () const
+  {
+    return *infoProperty_;
+  }
+
+  ::CIAO::Config_Handlers::Property& ImplementationArtifactDescription::
+  infoProperty ()
+  {
+    return *infoProperty_;
+  }
+
+  void ImplementationArtifactDescription::
+  infoProperty (::CIAO::Config_Handlers::Property const& e)
+  {
+    if (infoProperty_.get ())
     {
-      return dependsOn_.begin ();
+      *infoProperty_ = e;
     }
 
-    ImplementationArtifactDescription::dependsOn_iterator ImplementationArtifactDescription::
-    end_dependsOn ()
+    else
     {
-      return dependsOn_.end ();
+      infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
+      infoProperty_->container (this);
     }
+  }
+
+  // ImplementationArtifactDescription
+  //
+  bool ImplementationArtifactDescription::
+  contentLocation_p () const
+  {
+    return contentLocation_.get () != 0;
+  }
 
-    ImplementationArtifactDescription::dependsOn_const_iterator ImplementationArtifactDescription::
-    begin_dependsOn () const
+  ::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
+  contentLocation () const
+  {
+    return *contentLocation_;
+  }
+
+  ::XMLSchema::string< ACE_TCHAR >& ImplementationArtifactDescription::
+  contentLocation ()
+  {
+    return *contentLocation_;
+  }
+
+  void ImplementationArtifactDescription::
+  contentLocation (::XMLSchema::string< ACE_TCHAR > const& e)
+  {
+    if (contentLocation_.get ())
     {
-      return dependsOn_.begin ();
+      *contentLocation_ = e;
     }
 
-    ImplementationArtifactDescription::dependsOn_const_iterator ImplementationArtifactDescription::
-    end_dependsOn () const
+    else
     {
-      return dependsOn_.end ();
+      contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+      contentLocation_->container (this);
     }
+  }
 
-    void ImplementationArtifactDescription::
-    add_dependsOn (::CIAO::Config_Handlers::NamedImplementationArtifact const& e)
-    {
-      if (dependsOn_.capacity () < dependsOn_.size () + 1)
-      {
-        ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact > v;
-        v.reserve (dependsOn_.size () + 1);
-
-        while (dependsOn_.size ())
-        {
-          //@@ VC6
-          ::CIAO::Config_Handlers::NamedImplementationArtifact& t = dependsOn_.back ();
-          t.container (0);
-          v.push_back (t);
-          v.back ().container (this);
-          dependsOn_.pop_back ();
-        }
-
-        dependsOn_.swap (v);
-      }
+  // ImplementationArtifactDescription
+  //
+  bool ImplementationArtifactDescription::
+  href_p () const
+  {
+    return href_.get () != 0;
+  }
 
-      dependsOn_.push_back (e);
-      dependsOn_.back ().container (this);
-    }
+  ::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
+  href () const
+  {
+    return *href_;
+  }
 
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    infoProperty_p () const
-    {
-      return infoProperty_.get () != 0;
-    }
+  ::XMLSchema::string< ACE_TCHAR >& ImplementationArtifactDescription::
+  href ()
+  {
+    return *href_;
+  }
 
-    ::CIAO::Config_Handlers::Property const& ImplementationArtifactDescription::
-    infoProperty () const
+  void ImplementationArtifactDescription::
+  href (::XMLSchema::string< ACE_TCHAR > const& e)
+  {
+    if (href_.get ())
     {
-      return *infoProperty_;
+      *href_ = e;
     }
 
-    ::CIAO::Config_Handlers::Property& ImplementationArtifactDescription::
-    infoProperty ()
+    else
     {
-      return *infoProperty_;
+      href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+      href_->container (this);
     }
+  }
+}
+}
+
+namespace CIAO
+{
+  namespace Config_Handlers
+  {
+  // NamedImplementationArtifact
+  //
+
+  NamedImplementationArtifact::
+  NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+  :Base__ (e), regulator__ ()
+  {
 
-    void ImplementationArtifactDescription::
-    infoProperty (::CIAO::Config_Handlers::Property const& e)
+    ::XSCRT::Parser< ACE_TCHAR > p (e);
+
+    while (p.more_elements ())
     {
-      if (infoProperty_.get ())
+      ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+      ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+      if (n == "name")
+      {
+        name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+        name_->container (this);
+      }
+
+      else if (n == "referencedArtifact")
       {
-        *infoProperty_ = e;
+        referencedArtifact_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationArtifactDescription > (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (e));
+        referencedArtifact_->container (this);
       }
 
       else
       {
-        infoProperty_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Property > (new ::CIAO::Config_Handlers::Property (e));
-        infoProperty_->container (this);
       }
     }
+  }
 
-    // ImplementationArtifactDescription
-    // 
-    bool ImplementationArtifactDescription::
-    contentLocation_p () const
-    {
-      return contentLocation_.get () != 0;
-    }
+  // ImplementationArtifactDescription
+  //
 
-    ::XMLSchema::string< ACE_TCHAR > const& ImplementationArtifactDescription::
-    contentLocation () const
-    {
-      return *contentLocation_;
-    }
+  ImplementationArtifactDescription::
+  ImplementationArtifactDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
+  :Base__ (e), regulator__ ()
+  {
 
-    ::XMLSchema::string< ACE_TCHAR >& ImplementationArtifactDescription::
-    contentLocation ()
-    {
-      return *contentLocation_;
-    }
+    ::XSCRT::Parser< ACE_TCHAR > p (e);
 
-    void ImplementationArtifactDescription::
-    contentLocation (::XMLSchema::string< ACE_TCHAR > const& e)
+    while (p.more_elements ())
     {
-      if (contentLocation_.get ())
+      ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
+      ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
+
+      if (n == "label")
       {
-        *contentLocation_ = e;
+        ::XMLSchema::string< ACE_TCHAR > t (e);
+        label (t);
       }
 
-      else
+      else if (n == "UUID")
       {
-        contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-        contentLocation_->container (this);
+        ::XMLSchema::string< ACE_TCHAR > t (e);
+        UUID (t);
       }
-    }
-  }
-}
 
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    // NamedImplementationArtifact
-    //
+      else if (n == "location")
+      {
+        ::XMLSchema::string< ACE_TCHAR > t (e);
+        add_location (t);
+      }
 
-    NamedImplementationArtifact::
-    NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+      else if (n == "execParameter")
+      {
+        ::CIAO::Config_Handlers::Property t (e);
+        execParameter (t);
+      }
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+      else if (n == "deployRequirement")
+      {
+        ::CIAO::Config_Handlers::Requirement t (e);
+        deployRequirement (t);
+      }
 
-      while (p.more_elements ())
+      else if (n == "dependsOn")
       {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "name")
-        {
-          name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-          name_->container (this);
-        }
-
-        else if (n == "referencedArtifact")
-        {
-          referencedArtifact_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationArtifactDescription > (new ::CIAO::Config_Handlers::ImplementationArtifactDescription (e));
-          referencedArtifact_->container (this);
-        }
-
-        else 
-        {
-        }
+        ::CIAO::Config_Handlers::NamedImplementationArtifact t (e);
+        add_dependsOn (t);
       }
-    }
 
-    // ImplementationArtifactDescription
-    //
+      else if (n == "infoProperty")
+      {
+        ::CIAO::Config_Handlers::Property t (e);
+        infoProperty (t);
+      }
 
-    ImplementationArtifactDescription::
-    ImplementationArtifactDescription (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-    :Base__ (e), regulator__ ()
-    {
+      else if (n == "contentLocation")
+      {
+        ::XMLSchema::string< ACE_TCHAR > t (e);
+        contentLocation (t);
+      }
 
-      ::XSCRT::Parser< ACE_TCHAR > p (e);
+      else
+      {
+      }
+    }
 
-      while (p.more_elements ())
+    while (p.more_attributes ())
+    {
+      ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ());
+      ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ()));
+      if (n == "href")
+      {
+        ::XMLSchema::string< ACE_TCHAR > t (a);
+        href (t);
+      }
+
+      else
       {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ());
-        ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ()));
-
-        if (n == "label")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          label (t);
-        }
-
-        else if (n == "UUID")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          UUID (t);
-        }
-
-        else if (n == "location")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          add_location (t);
-        }
-
-        else if (n == "execParameter")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          execParameter (t);
-        }
-
-        else if (n == "deployRequirement")
-        {
-          ::CIAO::Config_Handlers::Requirement t (e);
-          deployRequirement (t);
-        }
-
-        else if (n == "dependsOn")
-        {
-          ::CIAO::Config_Handlers::NamedImplementationArtifact t (e);
-          add_dependsOn (t);
-        }
-
-        else if (n == "infoProperty")
-        {
-          ::CIAO::Config_Handlers::Property t (e);
-          infoProperty (t);
-        }
-
-        else if (n == "contentLocation")
-        {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          contentLocation (t);
-        }
-
-        else 
-        {
-        }
       }
     }
   }
 }
+}
 
 namespace CIAO
 {
@@ -608,3 +660,4 @@ namespace CIAO
   }
 }
 
+
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp b/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp
index fb8b1bb14b8..a462c0c6dc7 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/iad.hpp
@@ -3,7 +3,7 @@
  *
  * Changes made to this code will most likely be overwritten
  * when the handlers are recompiled.
- * 
+ *
  * If you find errors or feel that there are bugfixes to be made,
  * please contact the current XSC maintainer:
  *             Will Otte <wotte@dre.vanderbilt.edu>
@@ -12,7 +12,7 @@
 
 // Fixes the VC6 warning 4786.
 #include "vc6-4786.h"
- 
+
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
@@ -40,161 +40,174 @@ namespace CIAO
 
 #include "Basic_Deployment_Data.hpp"
 
+
 namespace CIAO
 {
   namespace Config_Handlers
   {
-    class Config_Handlers_Export NamedImplementationArtifact : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // name
-      // 
-      public:
-      ::XMLSchema::string< ACE_TCHAR > const& name () const;
-      ::XMLSchema::string< ACE_TCHAR >& name ();
-      void name (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
-
-      // referencedArtifact
-      // 
-      public:
-      ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact () const;
-      ::CIAO::Config_Handlers::ImplementationArtifactDescription& referencedArtifact ();
-      void referencedArtifact (::CIAO::Config_Handlers::ImplementationArtifactDescription const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationArtifactDescription > referencedArtifact_;
-
-      public:
-      NamedImplementationArtifact (::XMLSchema::string< ACE_TCHAR > const& name__,
-      ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact__);
-
-      NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      NamedImplementationArtifact (NamedImplementationArtifact const& s);
-
-      NamedImplementationArtifact&
-      operator= (NamedImplementationArtifact const& s);
-
-      private:
-      char regulator__;
-    };
-
-    class Config_Handlers_Export ImplementationArtifactDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // label
-      // 
-      public:
-      bool label_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& label () const;
-      ::XMLSchema::string< ACE_TCHAR >& label ();
-      void label (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
-
-      // UUID
-      // 
-      public:
-      bool UUID_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& UUID () const;
-      ::XMLSchema::string< ACE_TCHAR >& UUID ();
-      void UUID (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
-
-      // location
-      // 
-      public:
-      typedef ::std::vector< ::XMLSchema::string< ACE_TCHAR > >::iterator location_iterator;
-      typedef ::std::vector< ::XMLSchema::string< ACE_TCHAR > >::const_iterator location_const_iterator;
-      location_iterator begin_location ();
-      location_iterator end_location ();
-      location_const_iterator begin_location () const;
-      location_const_iterator end_location () const;
-      void add_location (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::vector< ::XMLSchema::string< ACE_TCHAR > > location_;
-
-      // execParameter
-      // 
-      public:
-      bool execParameter_p () const;
-      ::CIAO::Config_Handlers::Property const& execParameter () const;
-      ::CIAO::Config_Handlers::Property& execParameter ();
-      void execParameter (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > execParameter_;
-
-      // deployRequirement
-      // 
-      public:
-      bool deployRequirement_p () const;
-      ::CIAO::Config_Handlers::Requirement const& deployRequirement () const;
-      ::CIAO::Config_Handlers::Requirement& deployRequirement ();
-      void deployRequirement (::CIAO::Config_Handlers::Requirement const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
-
-      // dependsOn
-      // 
-      public:
-      typedef ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact >::iterator dependsOn_iterator;
-      typedef ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact >::const_iterator dependsOn_const_iterator;
-      dependsOn_iterator begin_dependsOn ();
-      dependsOn_iterator end_dependsOn ();
-      dependsOn_const_iterator begin_dependsOn () const;
-      dependsOn_const_iterator end_dependsOn () const;
-      void add_dependsOn (::CIAO::Config_Handlers::NamedImplementationArtifact const& );
-
-      protected:
-      ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact > dependsOn_;
-
-      // infoProperty
-      // 
-      public:
-      bool infoProperty_p () const;
-      ::CIAO::Config_Handlers::Property const& infoProperty () const;
-      ::CIAO::Config_Handlers::Property& infoProperty ();
-      void infoProperty (::CIAO::Config_Handlers::Property const& );
-
-      protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
-
-      // contentLocation
-      // 
-      public:
-      bool contentLocation_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
-      ::XMLSchema::string< ACE_TCHAR >& contentLocation ();
-      void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
-
-      protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
-
-      public:
-      ImplementationArtifactDescription ();
-
-      ImplementationArtifactDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      ImplementationArtifactDescription (ImplementationArtifactDescription const& s);
-
-      ImplementationArtifactDescription&
-      operator= (ImplementationArtifactDescription const& s);
-
-      private:
-      char regulator__;
-    };
-  }
+
+  class Config_Handlers_Export NamedImplementationArtifact : public ::XSCRT::Type
+  {
+    //@@ VC6 anathema
+    typedef ::XSCRT::Type Base__;
+
+    // name
+    //
+    public:
+    ::XMLSchema::string< ACE_TCHAR > const& name () const;
+    ::XMLSchema::string< ACE_TCHAR >& name ();
+    void name (::XMLSchema::string< ACE_TCHAR > const& );
+
+    protected:
+    ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
+
+    // referencedArtifact
+    //
+    public:
+    ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact () const;
+    ::CIAO::Config_Handlers::ImplementationArtifactDescription& referencedArtifact ();
+    void referencedArtifact (::CIAO::Config_Handlers::ImplementationArtifactDescription const& );
+
+    protected:
+    ::std::auto_ptr< ::CIAO::Config_Handlers::ImplementationArtifactDescription > referencedArtifact_;
+
+    public:
+    NamedImplementationArtifact (::XMLSchema::string< ACE_TCHAR > const& name__,
+    ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact__);
+
+    NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR > const&);
+    NamedImplementationArtifact (NamedImplementationArtifact const& s);
+
+    NamedImplementationArtifact&
+    operator= (NamedImplementationArtifact const& s);
+
+    private:
+    char regulator__;
+  };
+
+  class Config_Handlers_Export ImplementationArtifactDescription : public ::XSCRT::Type
+  {
+    //@@ VC6 anathema
+    typedef ::XSCRT::Type Base__;
+
+    // label
+    //
+    public:
+    bool label_p () const;
+    ::XMLSchema::string< ACE_TCHAR > const& label () const;
+    ::XMLSchema::string< ACE_TCHAR >& label ();
+    void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+    protected:
+    ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+    // UUID
+    //
+    public:
+    bool UUID_p () const;
+    ::XMLSchema::string< ACE_TCHAR > const& UUID () const;
+    ::XMLSchema::string< ACE_TCHAR >& UUID ();
+    void UUID (::XMLSchema::string< ACE_TCHAR > const& );
+
+    protected:
+    ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
+
+    // location
+    //
+    public:
+    typedef ::std::vector< ::XMLSchema::string< ACE_TCHAR > >::iterator location_iterator;
+    typedef ::std::vector< ::XMLSchema::string< ACE_TCHAR > >::const_iterator location_const_iterator;
+    location_iterator begin_location ();
+    location_iterator end_location ();
+    location_const_iterator begin_location () const;
+    location_const_iterator end_location () const;
+    void add_location (::XMLSchema::string< ACE_TCHAR > const& );
+
+    protected:
+    ::std::vector< ::XMLSchema::string< ACE_TCHAR > > location_;
+
+    // execParameter
+    //
+    public:
+    bool execParameter_p () const;
+    ::CIAO::Config_Handlers::Property const& execParameter () const;
+    ::CIAO::Config_Handlers::Property& execParameter ();
+    void execParameter (::CIAO::Config_Handlers::Property const& );
+
+    protected:
+    ::std::auto_ptr< ::CIAO::Config_Handlers::Property > execParameter_;
+
+    // deployRequirement
+    //
+    public:
+    bool deployRequirement_p () const;
+    ::CIAO::Config_Handlers::Requirement const& deployRequirement () const;
+    ::CIAO::Config_Handlers::Requirement& deployRequirement ();
+    void deployRequirement (::CIAO::Config_Handlers::Requirement const& );
+
+    protected:
+    ::std::auto_ptr< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
+
+    // dependsOn
+    //
+    public:
+    typedef ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact >::iterator dependsOn_iterator;
+    typedef ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact >::const_iterator dependsOn_const_iterator;
+    dependsOn_iterator begin_dependsOn ();
+    dependsOn_iterator end_dependsOn ();
+    dependsOn_const_iterator begin_dependsOn () const;
+    dependsOn_const_iterator end_dependsOn () const;
+    void add_dependsOn (::CIAO::Config_Handlers::NamedImplementationArtifact const& );
+
+    protected:
+    ::std::vector< ::CIAO::Config_Handlers::NamedImplementationArtifact > dependsOn_;
+
+    // infoProperty
+    //
+    public:
+    bool infoProperty_p () const;
+    ::CIAO::Config_Handlers::Property const& infoProperty () const;
+    ::CIAO::Config_Handlers::Property& infoProperty ();
+    void infoProperty (::CIAO::Config_Handlers::Property const& );
+
+    protected:
+    ::std::auto_ptr< ::CIAO::Config_Handlers::Property > infoProperty_;
+
+    // contentLocation
+    //
+    public:
+    bool contentLocation_p () const;
+    ::XMLSchema::string< ACE_TCHAR > const& contentLocation () const;
+    ::XMLSchema::string< ACE_TCHAR >& contentLocation ();
+    void contentLocation (::XMLSchema::string< ACE_TCHAR > const& );
+
+    protected:
+    ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > contentLocation_;
+
+    // href
+    //
+    public:
+    bool href_p () const;
+    ::XMLSchema::string< ACE_TCHAR > const& href () const;
+    ::XMLSchema::string< ACE_TCHAR >& href ();
+    void href (::XMLSchema::string< ACE_TCHAR > const& );
+
+    protected:
+    ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_;
+
+    public:
+    ImplementationArtifactDescription ();
+
+    ImplementationArtifactDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+    ImplementationArtifactDescription (ImplementationArtifactDescription const& s);
+
+    ImplementationArtifactDescription&
+    operator= (ImplementationArtifactDescription const& s);
+
+    private:
+    char regulator__;
+  };
+}
 }
 
 namespace CIAO