ChangeLogTag:

34 files changed, 58 insertions, 4996 deletions

diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.cpp
deleted file mode 100644
index 49ba1e531d1..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-//$Id$
-
-#include "Any_Handler.h"
-#include "DT_Handler.h"
-#include "tao/Exception.h"
-#include "Utils.h"
-
-void
-CIAO::Config_Handler::Any_Handler::validate_ValueNode (DOMNodeIterator * iter,
-                                                       const char * name)
-{
-  DOMNode * node = iter->nextNode ();
-  XStr temp_name (node->getNodeName ());
-  if (temp_name != XStr (ACE_TEXT (name)))
-    {
-      ACE_DEBUG ((LM_DEBUG, "CIAO::Config_Handler::Any_Handler::validate\
-                             valueNode (), element mismatch expected \
-                             <%s> \n", name));
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-}
-
-void
-CIAO::Config_Handler::Any_Handler::process_Any (DOMNodeIterator * iter,
-                                                ::CORBA::Any &any_obj)
-{
-  // Process the name value definitions within the Any
-  DOMNode * node = iter->nextNode ();
-
-  // Get name of the current element
-  XStr name (node->getNodeName ());
-
-  // Initialize the ORB so that CORBA::Any will work
-  int argc = 0;
-  char ** argv = 0;
-  CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv, "");
-
-  if (name == XStr (ACE_TEXT ("type")))
-    {
-      // Process DataType
-      ::CORBA::TypeCode_var type;
-      DT_Handler::process_DataType (iter, type.out (), orb);
-
-      //Switch on the type of the BasicType
-      switch (type->kind ())
-        {
-        case CORBA::tk_short:
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <short> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "short");
-          // Process the short value
-          any_obj <<= ACE_static_cast(CORBA::Short,
-                                      Utils::parse_long (iter));
-          break;
-
-        case CORBA::tk_ushort:
-
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <short> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "ushort");
-          // Process the ushort value
-          any_obj <<= ACE_static_cast (CORBA::UShort,
-                                       Utils::parse_ulong (iter));
-          break;
-
-        case CORBA::tk_long:
-
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <long> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "long");
-          // Process the long value
-          any_obj <<= ACE_static_cast (CORBA::Long,
-                                       Utils::parse_long (iter));
-          break;
-
-        case CORBA::tk_ulong:
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <ulong> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "ulong");
-          // Process the ulong value
-          any_obj <<= ACE_static_cast (CORBA::ULong,
-                                       Utils::parse_long (iter));
-          break;
-
-        case CORBA::tk_float:
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <float> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "float");
-          // Process the float value
-          any_obj <<= ACE_static_cast (CORBA::Float,
-                                       Utils::parse_float (iter));
-          break;
-
-        case CORBA::tk_double:
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <short> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "double");
-          // Process the double value
-          any_obj <<= ACE_static_cast (CORBA::Double,
-                                       Utils::parse_double (iter));
-          break;
-
-        case CORBA::tk_boolean:
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <short> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "bool");
-          // Process the bool value
-          any_obj <<= CORBA::Any::from_boolean (Utils::parse_bool (iter));
-          break;
-
-        case CORBA::tk_char:
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <short> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "char");
-          // Process the char value
-          any_obj <<= CORBA::Any::from_char (Utils::parse_char (iter));
-          break;
-
-        case CORBA::tk_octet:
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <short> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "octet");
-          // Process the octet value
-          any_obj <<= CORBA::Any::from_octet (Utils::parse_octet (iter));
-          break;
-
-        case CORBA::tk_string:
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <short> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "string");
-          // Process the string value
-          {
-            char * temp = Utils::parse_string (iter);
-            any_obj <<= temp;
-            XMLString::release (&temp); 
-          }
-          break;
-
-        case CORBA::tk_longlong:
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <short> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "longlong");
-          // Process the longlong value
-          any_obj <<= ACE_static_cast (CORBA::LongLong,
-                                       Utils::parse_long (iter));
-          break;
-
-        case CORBA::tk_ulonglong:
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <short> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "ulonglong");
-          // Process the longlong value
-          any_obj <<= ACE_static_cast (CORBA::ULongLong,
-                                       Utils::parse_ulong (iter));
-          break;
-
-        case CORBA::tk_longdouble:
-          // Check if next node is a <value> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "value");
-          // Check if the next node is a <short> node
-          CIAO::Config_Handler::Any_Handler::validate_ValueNode (iter,
-                                                                 "longdouble");
-          // Process the longlong value -- Create a scope to define the
-          // lifetime for the ret_val object created within the case statement.
-          {
-#if ACE_SIZEOF_LONG_DOUBLE == 16
-            CORBA::LongDouble ret_str = Utils::parse_double (iter);
-#else
-            CORBA::LongDouble ret_str;
-            char * ret_val = Utils::parse_string (iter);
-            ACE_OS::memcpy (&ret_str.ld, ret_val, 16);
-            XMLString::release (&ret_val);
-#endif
-            any_obj <<= ret_str;
-          }
-          break;
-
-        default:
-          ACE_DEBUG ((LM_DEBUG, "Currently the DnC handlers support only \
-                                basic types, complex and recusive type \
-                                support will be added\n"));
-        }
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "Config_Handlers::Any_Handler::process_ \
-                         Any element mismatch expected <type>"));
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-    // Release ORB resource
-    CORBA::release (orb);
-}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Basic_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Basic_Handler.cpp
deleted file mode 100644
index 205ad62a83a..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/Basic_Handler.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// $Id$
-
-#include "Basic_Handler.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-Basic_Handler::Basic_Handler (DOMDocument* doc, unsigned long filter)
-  : traverse_ (doc),
-    doc_ (doc),
-    root_ (doc->getDocumentElement()),
-    filter_ (filter),
-    iter_ (traverse_->createNodeIterator (this->root_,
-                                          this->filter_,
-                                          0,
-                                          true)),
-    release_ (true),
-    index_ (0)
-{
-}
-
-Basic_Handler::Basic_Handler (DOMNodeIterator* iter, bool release)
-  : traverse_ (0), doc_ (0), root_ (0), filter_ (0), iter_ (iter),
-    release_ (release)
-{
-}
-
-Basic_Handler::Basic_Handler (DOMDocument* doc, DOMNodeIterator* iter, 
-                              bool release)
-  : traverse_ (0), doc_ (doc), root_ (0), filter_ (0), iter_ (iter),
-    release_ (release)
-{
-}
-
-Basic_Handler::~Basic_Handler()
-{
-  if (this->release_)
-    this->iter_->release();
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CAD_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/CAD_Handler.cpp
deleted file mode 100644
index 1f6464e6102..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/CAD_Handler.cpp
+++ /dev/null
@@ -1,310 +0,0 @@
-// $Id$
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "ERE_Handler.h"
-#include "CEPE_Handler.h"
-#include "CPR_Handler.h"
-#include "CAD_Handler.h"
-#include "Property_Handler.h"
-#include "Requirement_Handler.h"
-#include "CompPkgDesc_Handler.h"
-#include "Utils.h"
-#include "Process_Element.h"
-#include <iostream>
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the connection resource deployment description and populate it
-void CAD_Handler::process_ComponentAssemblyDescription
-           (::Deployment::ComponentAssemblyDescription& cad)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-            (ACE_TEXT ("Deployment:ComponentAssemblyDescription")))
-        {
-        }
-      else if
-        (process_sequence_local
-           <Deployment::SubcomponentInstantiationDescription>
-              (this->doc_, this->iter_, node,
-               node_name, "instance", cad.instance,
-               this, &CAD_Handler::process_instance));
-      else if
-        (process_sequence_local<Deployment::AssemblyConnectionDescription>
-           (this->doc_, this->iter_, node,
-            node_name, "connection", cad.connection,
-            this, &CAD_Handler::process_connection));
-      else if
-        (process_sequence_local<Deployment::AssemblyPropertyMapping>
-           (this->doc_, this->iter_, node,
-            node_name, "externalProperty", cad.externalProperty,
-            this, &CAD_Handler::process_property));
-      else
-        {
-          this->iter_->previousNode ();
-          return;
-        }
-    }
-
-  this->update_spe_refs (cad);
-  this->update_spr_refs (cad);
-
-  return;
-}
-
-void CAD_Handler::update_spe_refs (Deployment::
-                                   ComponentAssemblyDescription& cad)
-{
-  CORBA::ULong x;
-  CORBA::ULong y;
-  int ref_value;
-  int value;
-  ACE_TString ref_name;
-
-  for (x = 0; x < cad.connection.length (); ++x)
-    {
-      for (y = 0; y < cad.connection[x].internalEndpoint.length (); ++y)
-        {
-          ref_value = cad.connection[x].internalEndpoint[y].instanceRef;
-          if (idref_map_.find (ref_value, ref_name) == 0)
-            {
-              if (id_map_.find (ref_name, value) == 0)
-                {
-                  cad.connection[x].internalEndpoint[y].instanceRef= value;
-                }
-            }
-        }
-    }
-}
-
-void CAD_Handler::update_spr_refs (Deployment::
-                                   ComponentAssemblyDescription& cad)
-{
-  CORBA::ULong x;
-  CORBA::ULong y;
-  int ref_value;
-  int value;
-  ACE_TString ref_name;
-
-  for (x = 0; x < cad.externalProperty.length (); ++x)
-    {
-      for (y = 0; y < cad.externalProperty[x].delegatesTo.length (); ++y)
-        {
-          ref_value = cad.externalProperty[x].delegatesTo[y].instanceRef;
-          if (idref_map_.find (ref_value, ref_name) == 0)
-            {
-              if (id_map_.find (ref_name, value) == 0)
-                {
-                  cad.externalProperty[x].delegatesTo[y].instanceRef = value;
-                }
-            }
-        }
-    }
-}
-
-void CAD_Handler::process_instance (DOMNodeIterator* iter,
-                                    Deployment::
-                                    SubcomponentInstantiationDescription& sid)
-{
-  char* root_node_name_ch = XMLString::transcode
-    (this->doc_->getDocumentElement ()->getNodeName ());
-  ACE_TString root_node_name (root_node_name_ch);
-
-  XMLString::release (&root_node_name_ch);
-
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-                (ACE_TEXT ("Deployment:SubcomponentInstantiationDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-                 (iter, node_name, "name", sid.name));
-      else if
-        (process_sequence_remote<Deployment::ComponentPackageDescription, 
-                                 CompPkgDesc_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "package", sid.package,
-            &CompPkgDesc_Handler::process_ComponentPackageDescription, 
-            this->id_map_));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "configProperty", sid.configProperty,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else if
-        (process_sequence_common<Deployment::Requirement>
-           (this->doc_, this->iter_, node,
-            node_name, "selectRequirement", sid.selectRequirement,
-            &Requirement_Handler::process_Requirement,
-            this->id_map_));
-      else if
-        (process_sequence_remote<Deployment::ComponentPackageReference, 
-                                 CPR_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "reference", sid.reference,
-            &CPR_Handler::process_ComponentPackageReference, this->id_map_));
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void CAD_Handler::process_connection (DOMNodeIterator* iter,
-                                      Deployment::
-                                      AssemblyConnectionDescription& acd)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-                (ACE_TEXT ("Deployment:AssemblyConnectionDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-               (iter, node_name, "name", acd.name));
-      else if
-        (process_sequence_common<Deployment::Requirement>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "deployRequirement", acd.deployRequirement,
-            &Requirement_Handler::process_Requirement,
-            this->id_map_));
-      else if
-        (process_sequence_common<Deployment::ComponentExternalPortEndpoint>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "externalEndpoint", acd.externalEndpoint,
-            &CEPE_Handler::process_ComponentExternalPortEndpoint,
-            this->id_map_));
-      else if
-        (process_sequence_local<Deployment::SubcomponentPortEndpoint>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "internalEndpoint", acd.internalEndpoint,
-            this, &CAD_Handler::process_spe));
-      else if
-        (process_sequence_common<Deployment::ExternalReferenceEndpoint>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "externalReference", acd.externalReference,
-            &ERE_Handler::process_ExternalReferenceEndpoint,
-            this->id_map_));
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-      
-void CAD_Handler::process_spe (DOMNodeIterator* iter,
-                               Deployment::SubcomponentPortEndpoint& spe)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-                (ACE_TEXT ("Deployment:SubcomponentPortEndpoint")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "portName", spe.portName));
-      else if
-        (process_reference(node, node_name, "instance",
-                           spe.instanceRef,
-                           this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void CAD_Handler::process_spr (DOMNodeIterator* iter,
-                               Deployment::SubcomponentPropertyReference& spr)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-                (ACE_TEXT ("Deployment:SubcomponentPropertyReference")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (iter, node_name, "propertyName", spr.propertyName));
-      else if
-        (process_reference(node, node_name, "instance",
-                           spr.instanceRef,
-                           this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void CAD_Handler::process_property(DOMNodeIterator* iter,
-                                   Deployment::AssemblyPropertyMapping& apm)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-                (ACE_TEXT ("Deployment:AssemblyPropertyMapping")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "name", apm.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-            (iter, node_name, "externalName", apm.externalName));
-      else if
-        (process_sequence_local<Deployment::SubcomponentPropertyReference>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "delegatesTo", apm.delegatesTo,
-            this, &CAD_Handler::process_spr));
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-      
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CEPE_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/CEPE_Handler.cpp
deleted file mode 100644
index 27152ba8c1d..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/CEPE_Handler.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-//$Id$
-
-#include "CEPE_Handler.h"
-#include "tao/Exception.h"
-#include "Utils.h"
-
-using CIAO::Config_Handler::Utils;
-
-void
-CIAO::Config_Handler::CEPE_Handler::
-process_ComponentExternalPortEndpoint (DOMNodeIterator * iter,
-                                       Deployment::ComponentExternalPortEndpoint
-                                       &ret_struct)
-{
-  //Check if the Schema IDs for both the elements match
-  DOMNode * node = iter->nextNode ();
-  XStr name (node->getNodeName ());
-
-  if (name != XStr (ACE_TEXT ("portName")))
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Config_Handlers:: \
-                   CEPE_Handler::process_ComponentExtPortEndPoint \
-                   element mismatch expected <portName>"));
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-  // Populate the structure
-  ret_struct.portName = Utils::parse_string (iter);
-}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CPK_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/CPK_Handler.cpp
deleted file mode 100644
index d2fee81d7ce..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/CPK_Handler.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//$Id$
-
-#include "CPK_Handler.h"
-#include "tao/Exception.h"
-#include "Utils.h"
-
-using CIAO::Config_Handler::Utils;
-
-void
-CIAO::Config_Handler::CPK_Handler::
-process_CCMComponentPortKind (DOMNodeIterator * iter,
-                              Deployment::CCMComponentPortKind &kind)
-{
-  char* facet = XMLString::transcode (XStr ("Facet"));
-  char* simplex_receptacle = XMLString::transcode (XStr ("SimplexReceptacle"));
-  char* multiplex_receptacle = XMLString::transcode 
-                                 (XStr ("MultiplexReceptacle"));
-  char* event_emitter = XMLString::transcode (XStr ("EventEmitter"));
-  char* event_publisher = XMLString::transcode (XStr ("EventPublisher"));
-  char* event_consumer = XMLString::transcode (XStr ("EventConsumer"));
-  char * temp = Utils::parse_string (iter);
-  XStr kind_str = XStr (temp);
-  XMLString::release (&temp);
-
-  char* kind_str_tr = XMLString::transcode (kind_str);
-
-  if ((ACE_OS::strcmp (kind_str_tr, facet)) == 0)
-    {
-      kind = Deployment::Facet;
-    }
-  else if ((ACE_OS::strcmp (kind_str_tr, simplex_receptacle)) == 0)
-    {
-      kind = Deployment::SimplexReceptacle;
-    }
-  else if ((ACE_OS::strcmp (kind_str_tr, multiplex_receptacle)) == 0)
-    {
-      kind = Deployment::MultiplexReceptacle;
-    }
-  else if ((ACE_OS::strcmp (kind_str_tr, event_emitter)) == 0)
-    {
-      kind = Deployment::EventEmitter;
-    }
-  else if ((ACE_OS::strcmp (kind_str_tr, event_publisher)) == 0)
-    {
-      kind = Deployment::EventPublisher;
-    }
-  else if ((ACE_OS::strcmp (kind_str_tr, event_consumer)) == 0)
-    {
-      kind = Deployment::EventConsumer;
-    }
-  else
-    {
-      // Something wrong here.. Throw exception
-      XMLString::release (&kind_str_tr);
-      XMLString::release (&facet);
-      XMLString::release (&simplex_receptacle);
-      XMLString::release (&multiplex_receptacle);
-      XMLString::release (&event_emitter);
-      XMLString::release (&event_publisher);
-      XMLString::release (&event_consumer);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Config_Handler::CPK_Handler::process_CCMComponentPortKing \
-                   illegal <CCMComponentPortKind> value found \n"));
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-  XMLString::release (&kind_str_tr);
-  XMLString::release (&facet);
-  XMLString::release (&simplex_receptacle);
-  XMLString::release (&multiplex_receptacle);
-  XMLString::release (&event_emitter);
-  XMLString::release (&event_publisher);
-  XMLString::release (&event_consumer);
-}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CPR_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/CPR_Handler.cpp
deleted file mode 100644
index 424e6246e28..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/CPR_Handler.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// $Id$
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "CPR_Handler.h"
-#include "Utils.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the connection resource deployment description and populate it
-void CPR_Handler::process_ComponentPackageReference
-(::Deployment::ComponentPackageReference &cpr)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (false);
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-               (this->iter_, node_name, "requiredUUID", 
-                        cpr.requiredUUID));
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-               (this->iter_, node_name, "requiredName", cpr.requiredName));
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-               (this->iter_, node_name, "requiredType", cpr.requiredType));
-      else
-        {
-          this->iter_->previousNode ();
-          return;
-        }
-    }
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Cap_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Cap_Handler.cpp
deleted file mode 100644
index d357bc03ec8..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/Cap_Handler.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-//==================================================================
-/**
- *  @file  Cap_Handler.cpp
- *
- *  $Id$
- *
- *  @author Emre Turkay <turkaye@dre.vanderbilt.edu>
- */
-//==================================================================
-
-#include "Cap_Handler.h"
-#include "SP_Handler.h"
-#include "tao/Exception.h"
-#include "Utils.h"
-#include <iostream>
-#include "string.h"
-#include "Utils.h"
-#include "Process_Element.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-void
-CAP_Handler::process_Capability (Deployment::Capability &cap)
-{
-  //Check if the Schema IDs for both the elements match
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName ());
-
-      if (node_name == XStr
-               (ACE_TEXT ("Deployment:Capability")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (this->iter_, node_name, "name", cap.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq 
-              (this->iter_, node_name, "resourceType", 
-                             cap.resourceType));
-      else if
-        (process_sequence_common<Deployment::SatisfierProperty>
-           (this->doc_, this->iter_, node,
-            node_name, "property", cap.property,
-            &SP_Handler::process_SatisfierProperty,
-            this->id_map_));
-      else
-        {
-          this->iter_->previousNode ();
-          break;
-        }
-    }
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog b/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog
index b99373d38e0..0e08c2b023a 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog
@@ -1,28 +1,67 @@
+Wed Sep  8 17:09:51 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+ 	* DAnCE/Config_Handlers/Any_Handler.cpp:
+	* DAnCE/Config_Handlers/Basic_Handler.cpp:
+	* DAnCE/Config_Handlers/CAD_Handler.cpp:
+	* DAnCE/Config_Handlers/CEPE_Handler.cpp:
+	* DAnCE/Config_Handlers/CPK_Handler.cpp:
+	* DAnCE/Config_Handlers/CPR_Handler.cpp:
+	* DAnCE/Config_Handlers/Cap_Handler.cpp:
+	* DAnCE/Config_Handlers/CompImplDesc_Handler.cpp:
+	* DAnCE/Config_Handlers/CompIntrDesc_Handler.cpp:
+	* DAnCE/Config_Handlers/CompPkgDesc_Handler.cpp:
+	* DAnCE/Config_Handlers/Config_Error_Handler.cpp:
+	* DAnCE/Config_Handlers/DT_Handler.cpp:
+	* DAnCE/Config_Handlers/DnC_Dump.cpp:
+	* DAnCE/Config_Handlers/Domain_Handler.cpp:
+	* DAnCE/Config_Handlers/ERE_Handler.cpp:
+	* DAnCE/Config_Handlers/IAD_Handler.cpp:
+	* DAnCE/Config_Handlers/ID_Handler.cpp:
+	* DAnCE/Config_Handlers/IR_Handler.cpp:
+	* DAnCE/Config_Handlers/MID_Handler.cpp:
+	* DAnCE/Config_Handlers/NIA_Handler.cpp:
+	* DAnCE/Config_Handlers/PCI_Handler.cpp:
+	* DAnCE/Config_Handlers/PC_Handler.cpp:
+	* DAnCE/Config_Handlers/Plan_Handler.cpp:
+	* DAnCE/Config_Handlers/Process_Element.cpp:
+	* DAnCE/Config_Handlers/Property_Handler.cpp:
+	* DAnCE/Config_Handlers/RS_Handler.cpp:
+	* DAnCE/Config_Handlers/RUK_Handler.cpp:
+	* DAnCE/Config_Handlers/Requirement_Handler.cpp:
+	* DAnCE/Config_Handlers/SPK_Handler.cpp:
+	* DAnCE/Config_Handlers/SP_Handler.cpp:
+	* DAnCE/Config_Handlers/TPD_Handler.cpp:
+	* DAnCE/Config_Handlers/Utils.cpp:
+	* DAnCE/Config_Handlers/XercesString.cpp:
+
+	  Removed all the old files from this branch. This is simply
+	  confusing to see what is usable and what is not. 
+
 Tue Sep 07 18:23:02 2004  Jules White  <jules@dre.vanderbilt.edu>
 				
-				* Config_Handlers/MDD_Handler.h
-				* Config_Handlers/MDD_Handler.cpp
-				* Config_Handlers/Req_Handler.h
-				* Config_Handlers/Req_Handler.cpp
+       * DAnCE/Config_Handlers/MDD_Handler.h
+       * DAnCE/Config_Handlers/MDD_Handler.cpp
+       * DAnCE/Config_Handlers/Req_Handler.h
+       * DAnCE/Config_Handlers/Req_Handler.cpp
 				
-				Created classes to handled mapping values from
-				XSC MonolithicDeploymentDescription and 
-				Requirement to the corresponding IDL types.
+	 Created classes to handled mapping values from XSC
+	 MonolithicDeploymentDescription and Requirement to the
+	 corresponding IDL types. 
 				
 Thu Sep 02 15:01:21 2004  Jules White  <jules@dre.vanderbilt.edu>
                                                                                 
-        * Config_Handlers/ANY_Handler.h:
-        * Config_Handlers/ANY_Handler.cpp:
-        * Config_Handlers/CID_Handler.h:
-        * Config_Handlers/CID_Handler.cpp:
-        * Config_Handlers/ComponentPropertyDescription_Handler.h:
-        * Config_Handlers/ComponentPropertyDescription_Handler.cpp:
-        * Config_Handlers/CPD_Handler.h:
-        * Config_Handlers/CPD_Handler.cpp:
-        * Config_Handlers/DataType_Handler.h:
-        * Config_Handlers/DataType_Handler.cpp:
-        * Config_Handlers/Prop_Handler.h:
-        * Config_Handlers/Prop_Handler.cpp:
+        * DAnCE/Config_Handlers/ANY_Handler.h:
+        * DAnCE/Config_Handlers/ANY_Handler.cpp:
+        * DAnCE/Config_Handlers/CID_Handler.h:
+        * DAnCE/Config_Handlers/CID_Handler.cpp:
+        * DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.h:
+        * DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp:
+        * DAnCE/Config_Handlers/CPD_Handler.h:
+        * DAnCE/Config_Handlers/CPD_Handler.cpp:
+        * DAnCE/Config_Handlers/DataType_Handler.h:
+        * DAnCE/Config_Handlers/DataType_Handler.cpp:
+        * DAnCE/Config_Handlers/Prop_Handler.h:
+        * DAnCE/Config_Handlers/Prop_Handler.cpp:
         
           Created classes to copy the values from XSC objects
           into their corresponding IDL types.
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CompImplDesc_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/CompImplDesc_Handler.cpp
deleted file mode 100644
index afccc0c5f0b..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/CompImplDesc_Handler.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-// $Id$
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "Property_Handler.h"
-#include "Requirement_Handler.h"
-#include "CAD_Handler.h"
-#include "MID_Handler.h"
-#include "ID_Handler.h"
-#include "Cap_Handler.h"
-#include "CompIntrDesc_Handler.h"
-#include "CompImplDesc_Handler.h"
-#include "Utils.h"
-#include "Process_Element.h"
-#include <iostream>
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the component implementation description and populate it
-void CompImplDesc_Handler::process_ComponentImplementationDescription
-                   (::Deployment::ComponentImplementationDescription &cid)
-{
-  char* root_node_name_ch = XMLString::transcode
-    (this->doc_->getDocumentElement ()->getNodeName ());
-  ACE_TString root_node_name (root_node_name_ch);
-  XMLString::release (&root_node_name_ch);
-
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName());
-      if (node_name == XStr
-          (ACE_TEXT ("Deployment:ComponentImplementationDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (this->iter_, node_name, "label", cid.label));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (this->iter_, node_name, "UUID", cid.UUID));
-      else if
-        (process_element_remote<Deployment::ComponentInterfaceDescription, 
-                                CompIntrDesc_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "implements", cid.implements,
-            &CompIntrDesc_Handler::process_ComponentInterfaceDescription, 
-            this->id_map_));
-      else if
-        (process_sequence_remote<Deployment::ComponentAssemblyDescription, 
-                                 CAD_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "assemblyImpl", cid.assemblyImpl,
-            &CAD_Handler::process_ComponentAssemblyDescription, 
-            this->id_map_));
-      else if
-        (process_sequence_remote<Deployment::
-                                 MonolithicImplementationDescription, 
-                                 MID_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "monolithicImpl", cid.monolithicImpl,
-            &MID_Handler::process_MonolithicImplementationDescription, 
-            this->id_map_));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "configProperty", cid.configProperty,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else if
-        (process_sequence_remote<Deployment::Capability, CAP_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "capability", cid.capability,
-            &CAP_Handler::process_Capability, this->id_map_));
-      else if
-        (process_sequence_common<Deployment::ImplementationDependency>
-           (this->doc_, this->iter_, node,
-            node_name, "dependsOn", cid.dependsOn,
-            &ID_Handler::process_ImplementationDependency,
-            this->id_map_));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "infoProperty", cid.infoProperty,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else
-        {
-          this->iter_->previousNode ();
-          return;
-        }
-    }
-  return;
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CompIntrDesc_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/CompIntrDesc_Handler.cpp
deleted file mode 100644
index 25ca99733fc..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/CompIntrDesc_Handler.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-//$Id$
-
-#ifndef CompIntrDesc_HANDLER_C
-#define CompIntrDesc_HANDLER_C
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "Utils.h"
-#include "Process_Element.h"
-#include "Property_Handler.h"
-#include "CompIntrDesc_Handler.h"
-#include "DT_Handler.h"
-#include "CPK_Handler.h"
-#include <iostream>
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the package configuration and populate it
-void CompIntrDesc_Handler::process_ComponentInterfaceDescription
-(::Deployment::ComponentInterfaceDescription &ccd)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-               (ACE_TEXT ("Deployment:ComponentInterfaceDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-              (this->iter_, node_name, "label", ccd.label));
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-              (this->iter_, node_name, "UUID", ccd.UUID));
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-              (this->iter_, node_name, "specificType", 
-                        ccd.specificType));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq
-              (this->iter_, node_name, "supportedType", 
-                            ccd.supportedType));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq
-              (this->iter_, node_name, "idlFile", ccd.idlFile));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "configProperty", ccd.configProperty,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else if
-        (process_sequence_local<Deployment::ComponentPortDescription>
-           (this->doc_, this->iter_, node,
-            node_name, "port", ccd.port,
-            this, &CompIntrDesc_Handler::process_port));
-      else if
-        (process_sequence_local<Deployment::ComponentPropertyDescription>
-           (this->doc_, this->iter_, node,
-            node_name, "property", ccd.property,
-            this, &CompIntrDesc_Handler::process_comp_property));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "infoProperty", ccd.infoProperty,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else
-        {
-          this->iter_->previousNode ();
-          return;
-        }
-    }
-  return;
-}
-
-/// process component property element
-void CompIntrDesc_Handler::process_comp_property (DOMNodeIterator* iter,
-                                                  Deployment::
-                                                  ComponentPropertyDescription&
-                                                  property)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-               (ACE_TEXT ("Deployment:ComponentPropertyDescription")))
-        {
-        }
-      else if (CIAO::Config_Handler::Utils::process_string
-                  (iter, node_name, "name", property.name));
-      else if (node_name == XStr (ACE_TEXT ("type")))
-        {
-          int argc = 0;
-          char ** argv = 0;
-          CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv, "");
-          DT_Handler::process_DataType (iter, property.type.out (), orb);
-        }
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-/// process port element
-void CompIntrDesc_Handler::process_port (DOMNodeIterator* iter,
-                                         Deployment::
-                                         ComponentPortDescription& port)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-               (ACE_TEXT ("Deployment:ComponentPortDescription")))
-        {
-        }
-      else if (CIAO::Config_Handler::Utils::process_string
-                   (iter, node_name, "name", port.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-                   (iter, node_name, "specificType", port.specificType));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq
-                   (iter, node_name, "supportedType", port.supportedType));
-      else if
-        (CIAO::Config_Handler::Utils::process_boolean
-                   (iter, node_name, "provider", port.provider));
-      else if
-        (CIAO::Config_Handler::Utils::process_boolean
-                   (iter, node_name, "exclusiveProvider", 
-                         port.exclusiveProvider));
-      else if
-        (CIAO::Config_Handler::Utils::process_boolean
-                  (iter, node_name, "exclusiveUser", port.exclusiveUser));
-      else if
-        (CIAO::Config_Handler::Utils::process_boolean
-                 (iter, node_name, "optional", port.optional));
-      else if (node_name == XStr(ACE_TEXT("kind")))
-        {
-          CPK_Handler::process_CCMComponentPortKind (iter, port.kind);
-        }
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-END_DEPLOYMENT_NAMESPACE
-
-#endif /* CompIntrDesc_HANDLER_C */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CompPkgDesc_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/CompPkgDesc_Handler.cpp
deleted file mode 100644
index c60201535cb..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/CompPkgDesc_Handler.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-// $Id$
-
-#ifndef COMPPKGDESC_HANDLER_C
-#define COMPPKGDESC_HANDLER_C
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "Utils.h"
-#include "CompPkgDesc_Handler.h"
-#include "Property_Handler.h"
-#include "PCI_Handler.h"
-#include "CompIntrDesc_Handler.h"
-#include "Process_Element.h"
-#include <iostream>
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the package configuration and populate it
-void CompPkgDesc_Handler::process_ComponentPackageDescription
-(::Deployment::ComponentPackageDescription &comppkgdesc)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-          (ACE_TEXT ("Deployment:ComponentPackageDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (this->iter_, node_name, "label", comppkgdesc.label));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (this->iter_, node_name, "UUID", comppkgdesc.UUID));
-      else if
-        (process_element_remote<Deployment::ComponentInterfaceDescription, 
-                                CompIntrDesc_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "realizes", comppkgdesc.realizes,
-            &CompIntrDesc_Handler::process_ComponentInterfaceDescription,
-            this->id_map_));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "configProperty", comppkgdesc.configProperty,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else if
-        (process_sequence_remote<Deployment::PackagedComponentImplementation, 
-                                 PCI_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "implementation", comppkgdesc.implementation,
-            &PCI_Handler::process_PackagedComponentImplementation,
-            this->id_map_));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "infoProperty", comppkgdesc.infoProperty,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else
-        {
-          this->iter_->previousNode ();
-          return;
-        }
-    }
-}
-
-END_DEPLOYMENT_NAMESPACE
-
-#endif /* COMPPKGDESC_HANDLER_C */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Config_Error_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Config_Error_Handler.cpp
deleted file mode 100644
index de938a2ce0e..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/Config_Error_Handler.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-
-#include "ace/Log_Msg.h"
-#include "ace/Auto_Ptr.h"
-#include <xercesc/util/XMLString.hpp>
-#include <xercesc/dom/DOMLocator.hpp>
-#include "Config_Error_Handler.h"
-#include "XercesString.h"
-
-using xercesc::XMLString;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    Config_Error_Handler::Config_Error_Handler()
-      : errors_ (false)
-    {}
-
-    Config_Error_Handler::~Config_Error_Handler()
-    {}
-
-
-    bool Config_Error_Handler::handleError (const DOMError& domError)
-    {
-      this->errors_ = true;
-      if (domError.getSeverity() == DOMError::DOM_SEVERITY_WARNING)
-        {
-          ACE_ERROR ((LM_ERROR, "Warning "));
-        }
-      else if (domError.getSeverity() == DOMError::DOM_SEVERITY_ERROR)
-        {
-          ACE_ERROR ((LM_ERROR, "Error "));
-        }
-      else
-        {
-          ACE_ERROR ((LM_ERROR, "FatalError "));
-        }
-
-      char *msg = XMLString::transcode(domError.getMessage());
-      char *url = XMLString::transcode (domError.getLocation()->getURI());
-      ACE_Auto_Basic_Array_Ptr<char> cleanup_msg (msg);
-      ACE_ERROR ((LM_ERROR, "while processing resource '%s', "
-                  "Line %d, Position %d : %s\n",
-                  url,
-                  domError.getLocation()->getLineNumber(),
-                  domError.getLocation()->getColumnNumber(),
-                  msg));
-      return true;
-    }
-
-    void Config_Error_Handler::resetErrors()
-    {
-      this->errors_ = false;
-    }
-
-    bool Config_Error_Handler::getErrors() const
-    {
-      return this->errors_;
-    }
-  }
-
-}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/DT_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/DT_Handler.cpp
deleted file mode 100644
index 7840e86caa2..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/DT_Handler.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-//$Id$
-
-#include "DT_Handler.h"
-#include "tao/Typecode.h"
-#include "ace/Auto_Ptr.h"
-#include "Utils.h"
-
-void
-CIAO::Config_Handler::DT_Handler::process_basic_tc (DOMNodeIterator * iter,
-                                                    ::CORBA::TypeCode_ptr &type)
-{
-
-    // For all types defined return the appropriate typecode
-    char * code_value = Utils::parse_string (iter);
-    auto_ptr<char> cleanup_char (code_value);
-
-    // For this piece of code to work, it is necessary that ORB_init
-    // be called by the top level handler which calls the
-    // process_DataType common handler.
-    if (ACE_OS::strcmp (code_value,
-                        "tk_null") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_null);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_short") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_short);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_long") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_long);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_ushort") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_ushort);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_ulong") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_ulong);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_float") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_float);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_double") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_double);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_boolean") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_boolean);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_char") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_char);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_octet") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_octet);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_string") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_string);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_longlong") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_longlong);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_ulonglong") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_ulonglong);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_longdouble") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_longdouble);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_wchar") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_wchar);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_wstring") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_wstring);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_any") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_any);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_TypeCode") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_TypeCode);
-    else if (ACE_OS::strcmp (code_value,
-                             "tk_Object") == 0)
-      type = CORBA::TypeCode::_duplicate (CORBA::_tc_Object);
-    else
-    {
-      ACE_DEBUG ((LM_DEBUG, "Config_Handlers::DT_Handler::process_Datatype \
-                            unsupported TCkind value %s encountered \
-                            abortingi\n", type));
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-}
-
-void
-CIAO::Config_Handler::DT_Handler::process_DataType (DOMNodeIterator * iter,
-                                                    ::CORBA::TypeCode_ptr &type,
-                                                    ::CORBA::ORB_ptr )
-{
-  DOMNode * node = iter->nextNode ();
-  XStr name (node->getNodeName ());
-  if (name == XStr (ACE_TEXT ("kind")))
-    DT_Handler::process_basic_tc (iter, type);
-  else
-  {
-    ACE_DEBUG ((LM_DEBUG, "Config_Handlers::Property_Handler::process_ \
-                           DataType supports only TCKind types\
-                           support for recursive types will be added later\n"));
-    ACE_THROW (CORBA::INTERNAL ());
-
-  }
-}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.cpp b/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.cpp
deleted file mode 100644
index e0f0fc87c36..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.cpp
+++ /dev/null
@@ -1,1049 +0,0 @@
-// $Id$
-
-#ifndef DNC_DUMP_C
-#define DNC_DUMP_C
-
-#include "ace/Log_Msg.h"
-
-#include "DnC_Dump.h"
-#include <iostream>
-#include <string>
-#include <map>
-
-namespace Deployment
-{
-#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES
-  /*
-   *  Generic dump functions
-   */
-
-  /*
-   *  class Dump_Obj handles the indentation and keeps a map of 
-      structures for reference look-up.
-   */
-  class Dump_Obj {
-  public:
-    // Exception thrown when there is a node with the same name in the map
-    class Node_Exist { };
-    // Exception thrown when there is no node with the name given in the map
-    class Node_Not_Exist { };
-
-    // Constructor prints out the caption and increases indent
-    Dump_Obj(const char* caption)
-      : desc_()
-    {
-      ACE_DEBUG ((LM_DEBUG, "%s%s:\n", indent_.c_str(), caption));
-      indent_.append("  ");
-    }
-
-    // Constructor prints out the caption, increases indent and inserts 
-    // the given desc into the map
-    template <typename DESC>
-    Dump_Obj(const char* caption, DESC &desc)
-      : desc_(caption)
-    {
-      ACE_DEBUG ((LM_DEBUG, "%s%s:\n", indent_.c_str(), caption));
-      indent_.append("   ");
-
-      if (desc_map_.find(std::string(caption)) != desc_map_.end())
-        {
-          ACE_DEBUG ((LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \
-                      The item with name %s is already in \
-                      the node map.\n", caption));
-          throw Node_Exist();
-        }
-      else
-        {
-          CORBA::Any val;
-          val <<= desc;
-          desc_map_[std::string(caption)] = val;
-        }
-    }
-
-    // Destructor
-    ~Dump_Obj()
-    {
-      indent_.erase(indent_.size() - 2, 2);
-      if (desc_.size() != 0)
-        {
-          if (desc_map_.find(desc_) != desc_map_.end())
-            {
-              desc_map_.erase(desc_map_.find(desc_));
-            }
-          else
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \
-                          The item with name %s is not in the node map.\n",
-                          desc_.c_str()));
-              throw Node_Not_Exist();
-            }
-        }
-    }
-
-    // return the indent string
-    static const char* indent()
-    {
-      return indent_.c_str();
-    }
-
-    // reference lookup within the map
-    template <typename DESC>
-    static const DESC& desc(const char* caption)
-    {
-      static DESC* val;
-      desc_map_[caption] >>= val;
-      return *val;
-    }
-
-  private:
-    // indent string
-    static std::string indent_;
-    // map for reference lookup
-    static std::map<std::string, CORBA::Any> desc_map_;
-    // descriptor - used by destructor for deleting the 
-    // correct descriptor from the map
-    std::string desc_;
-  };
-
-  // static member initialization
-  std::string Dump_Obj::indent_ = "-";
-  std::map<std::string, CORBA::Any> Dump_Obj::desc_map_;
-
-  // Dumps a string sequence
-  void DnC_Dump::dump (const char* caption, const ::CORBA::StringSeq &str_seq)
-  {
-    CORBA::ULong size = str_seq.length ();
-
-    if (size != 0)
-      {
-        Dump_Obj dump_obj (caption);
-        
-        for (CORBA::ULong i = 0; i < size; ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, "%s%s %d: \n",
-                        Dump_Obj::indent(), caption, i));
-            ACE_DEBUG ((LM_DEBUG, "%s  %s: \n",
-                        Dump_Obj::indent(), str_seq[i].in ()));
-          }
-      }
-  }
-
-  // Dumps a sequence
-  template <typename SEQUENCE>
-  void DnC_Dump::dump_sequence (const char* caption, const SEQUENCE &seq)
-  {
-    CORBA::ULong size = seq.length ();
-
-    if (size != 0)
-      {
-        Dump_Obj dump_obj(caption);
-        
-        for (CORBA::ULong i = 0; i < size; ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, "%s%s %d: \n", Dump_Obj::indent(), 
-                        caption, i));
-            DnC_Dump::dump (seq[i]);
-          }
-      }
-  }
-
-  // Dumps a string
-  void DnC_Dump::dump (const char* caption, const TAO_String_Manager& str)
-  {
-    ACE_DEBUG ((LM_DEBUG, "%s%s: %s\n", Dump_Obj::indent(), 
-                caption, str.in()));
-  }
-
-  // Dumps a boolean
-  void DnC_Dump::dump (const char* caption, const CORBA::Boolean& val)
-  {
-    ACE_DEBUG ((LM_DEBUG, "%s%s: %s\n", Dump_Obj::indent(), 
-                caption, val ? "true" : "false"));
-  }
-
-  // Dumps a reference
-  template <typename ROOT, typename REFERENCE, typename DATA_TYPE, 
-            typename CLASS>
-  void DnC_Dump::dump_ref (const char* caption, REFERENCE& ref, 
-                           const char* root, DATA_TYPE CLASS::*data)
-  {
-    ACE_DEBUG ((LM_DEBUG, "%s%s:\n", Dump_Obj::indent(), caption));
-    const ROOT &root_obj = Dump_Obj::desc<ROOT>(root);
-
-    int value = ref;
-    ACE_DEBUG ((LM_DEBUG, "%s%s.name: %s\n",
-                Dump_Obj::indent(), caption,
-                (root_obj.*data)[value].name.in()));
-  }
-
-  // Dumps a reference sequence
-  template <typename ROOT, typename SEQUENCE, typename DATA_TYPE, 
-            typename CLASS>
-  void DnC_Dump::dump_ref_seq (const char* caption, SEQUENCE& seq, 
-                               const char* root, DATA_TYPE CLASS::*data)
-  {
-    ACE_DEBUG ((LM_DEBUG, "%s%s:\n", Dump_Obj::indent(), caption));
-    for (size_t i = 0; i < seq.length(); ++i)
-      {
-        const ROOT &root_obj = Dump_Obj::desc<ROOT>(root);
-
-        int value = seq[i];
-        ACE_DEBUG ((LM_DEBUG, "%s%s[%d].name: %s\n",
-                    Dump_Obj::indent(), caption, i,
-                    (root_obj.*data)[value].name.in()));
-      }
-  }
-
-  /*
-   *  Object dump methods
-   */
-
-  // SatisfierProperty
-  void DnC_Dump::dump (const Deployment::SatisfierProperty& sp)
-  {
-    Dump_Obj dump_obj("SatisfierProperty");
-    dump ("name", sp.name);
-
-    ACE_DEBUG ((LM_DEBUG, "%skind: ", Dump_Obj::indent()));
-    switch (sp.kind) {
-    case Quantity: ACE_DEBUG ((LM_DEBUG, "Quantity\n")); break;
-    case Capacity: ACE_DEBUG ((LM_DEBUG, "Capacity\n")); break;
-    case Minimum: ACE_DEBUG ((LM_DEBUG, "Minimum\n")); break;
-    case Maximum: ACE_DEBUG ((LM_DEBUG, "Maximum\n")); break;
-    case Attribute: ACE_DEBUG ((LM_DEBUG, "Attribute\n")); break;
-    case Selection: ACE_DEBUG ((LM_DEBUG, "Selection\n")); break;
-    }
-
-    ACE_DEBUG ((LM_DEBUG, "%svalue:\n", Dump_Obj::indent()));
-    dump (sp.value);
-  }
-
-  // SharedResource
-  void DnC_Dump::dump (const Deployment::SharedResource& sr)
-  {
-    Dump_Obj dump_obj("SharedResource");
-    dump ("name", sr.name);
-    dump ("resourceType", sr.resourceType);
-    dump_ref_seq<Deployment::Domain> ("nodeRef", sr.nodeRef, 
-                                      "Domain", &Domain::node);
-    dump_sequence ("property", sr.property);
-  }
-
-  // Resource
-  void DnC_Dump::dump (const Deployment::Resource& resource)
-  {
-    Dump_Obj dump_obj("Resource");
-    dump ("name", resource.name);
-    dump ("resourceType", resource.resourceType);
-    dump_sequence ("property", resource.property);
-  }
-
-  // Node
-  void DnC_Dump::dump (const Deployment::Node& node)
-  {
-    Dump_Obj dump_obj("Node");
-    dump ("name", node.name);
-    dump ("label", node.label);
-    dump_ref_seq<Deployment::Domain> ("sharedResourceRef", 
-                                      node.sharedResourceRef, "Domain", 
-                                      &Domain::sharedResource);
-    dump_ref_seq<Deployment::Domain> ("connectionRef", node.connectionRef, 
-                                      "Domain", &Domain::interconnect);
-    dump_sequence ("resource", node.resource);
-  }
-
-  // Interconnect
-  void DnC_Dump::dump (const Deployment::Interconnect& conn)
-  {
-    Dump_Obj dump_obj("Interconnect");
-    dump ("name", conn.name);
-    dump ("label", conn.label);
-    dump_ref_seq<Deployment::Domain> ("connectionRef", conn.connectionRef, 
-                                      "Domain", &Domain::bridge);
-    dump_ref_seq<Deployment::Domain> ("connectRef", conn.connectRef, 
-                                      "Domain", &Domain::node);
-    dump_sequence ("resource", conn.resource);
-  }
-
-  // Bridge
-  void DnC_Dump::dump (const Deployment::Bridge& bridge)
-  {
-    Dump_Obj dump_obj("Bridge");
-    dump ("name", bridge.name);
-    dump ("label", bridge.label);
-    dump_ref_seq<Deployment::Domain> ("connectRef", bridge.connectRef,
-                                      "Domain", &Domain::interconnect);
-    dump_sequence ("resource", bridge.resource);
-  }
-
-  void DnC_Dump::dump (const ::Deployment::Domain &domain)
-  {
-    Dump_Obj dump_obj("Domain", domain);
-    dump ("UUID", domain.UUID);
-    dump ("label", domain.label);
-
-    dump_sequence ("sharedResource", domain.sharedResource);
-    dump_sequence ("node", domain.node);
-    dump_sequence ("interconnect", domain.interconnect);
-    dump_sequence ("bridge", domain.bridge);
-    dump_sequence ("infoProperty", domain.infoProperty);
-  }
-
-  // ComponentPortDescription
-
-  void DnC_Dump::dump (const ::Deployment::ComponentPortDescription 
-                         &compportdesc)
-  {
-    Dump_Obj dump_obj("ComponentPortDescription");
-
-    dump ("name", compportdesc.name);
-    dump ("specificType", compportdesc.specificType);
-    dump ("supportedType", compportdesc.supportedType);
-    dump ("provider", compportdesc.provider);
-    dump ("exclusiveProvider", compportdesc.exclusiveProvider);
-    dump ("exclusiveUser", compportdesc.exclusiveUser);
-    dump ("optional", compportdesc.optional);
-
-    ACE_DEBUG ((LM_DEBUG, "%skind: ", Dump_Obj::indent()));
-    switch (compportdesc.kind) {
-    case Facet: ACE_DEBUG ((LM_DEBUG, "Facet\n")); break;
-    case SimplexReceptacle: ACE_DEBUG ((LM_DEBUG, "SimplexReceptacle\n")); break;
-    case MultiplexReceptacle: ACE_DEBUG ((LM_DEBUG, "MultiplexReceptacle\n")); break;
-    case EventEmitter: ACE_DEBUG ((LM_DEBUG, "EventEmitter\n")); break;
-    case EventPublisher: ACE_DEBUG ((LM_DEBUG, "EventPublisher\n")); break;
-    case EventConsumer: ACE_DEBUG ((LM_DEBUG, "EventConsumer\n")); break;
-    }
-  }
-
-  // ComponentPropertyDescription
-
-  void DnC_Dump::dump (const ::Deployment::ComponentPropertyDescription &comppropdesc)
-  {
-    Dump_Obj dump_obj("ComponentPropertyDescription");
-    
-    dump ("name", comppropdesc.name);
-
-    ACE_DEBUG ((LM_DEBUG, "%stype: ", Dump_Obj::indent()));
-    switch (comppropdesc.type.in()->kind()) {
-    case ::CORBA::tk_null: ACE_DEBUG ((LM_DEBUG, "tk_null\n")); break;
-    case ::CORBA::tk_void: ACE_DEBUG ((LM_DEBUG, "tk_void\n")); break;
-    case ::CORBA::tk_short: ACE_DEBUG ((LM_DEBUG, "tk_short\n")); break;
-    case ::CORBA::tk_long: ACE_DEBUG ((LM_DEBUG, "tk_long\n")); break;
-    case ::CORBA::tk_ushort: ACE_DEBUG ((LM_DEBUG, "tk_ushort\n")); break;
-    case ::CORBA::tk_ulong: ACE_DEBUG ((LM_DEBUG, "tk_ulong\n")); break;
-    case ::CORBA::tk_float: ACE_DEBUG ((LM_DEBUG, "tk_float\n")); break;
-    case ::CORBA::tk_double: ACE_DEBUG ((LM_DEBUG, "tk_double\n")); break;
-    case ::CORBA::tk_boolean: ACE_DEBUG ((LM_DEBUG, "tk_boolean\n")); break;
-    case ::CORBA::tk_char: ACE_DEBUG ((LM_DEBUG, "tk_char\n")); break;
-    case ::CORBA::tk_octet: ACE_DEBUG ((LM_DEBUG, "tk_octet\n")); break;
-    case ::CORBA::tk_any: ACE_DEBUG ((LM_DEBUG, "tk_any\n")); break;
-    case ::CORBA::tk_TypeCode: ACE_DEBUG ((LM_DEBUG, "tk_TypeCode\n")); break;
-    case ::CORBA::tk_Principal: ACE_DEBUG ((LM_DEBUG, "tk_Principal\n")); break;
-    case ::CORBA::tk_objref: ACE_DEBUG ((LM_DEBUG, "tk_objref\n")); break;
-    case ::CORBA::tk_struct: ACE_DEBUG ((LM_DEBUG, "tk_struct\n")); break;
-    case ::CORBA::tk_union: ACE_DEBUG ((LM_DEBUG, "tk_union\n")); break;
-    case ::CORBA::tk_enum: ACE_DEBUG ((LM_DEBUG, "tk_enum\n")); break;
-    case ::CORBA::tk_string: ACE_DEBUG ((LM_DEBUG, "tk_string\n")); break;
-    case ::CORBA::tk_sequence: ACE_DEBUG ((LM_DEBUG, "tk_sequence\n")); break;
-    case ::CORBA::tk_array: ACE_DEBUG ((LM_DEBUG, "tk_array\n")); break;
-    case ::CORBA::tk_alias: ACE_DEBUG ((LM_DEBUG, "tk_alias\n")); break;
-    case ::CORBA::tk_except: ACE_DEBUG ((LM_DEBUG, "tk_except\n")); break;
-    case ::CORBA::tk_longlong: ACE_DEBUG ((LM_DEBUG, "tk_longlong\n")); break;
-    case ::CORBA::tk_ulonglong: ACE_DEBUG ((LM_DEBUG, "tk_ulonglong\n")); break;
-    case ::CORBA::tk_longdouble: ACE_DEBUG ((LM_DEBUG, "tk_longdouble\n")); break;
-    case ::CORBA::tk_wchar: ACE_DEBUG ((LM_DEBUG, "tk_wchar\n")); break;
-    case ::CORBA::tk_wstring: ACE_DEBUG ((LM_DEBUG, "tk_wstring\n")); break;
-    case ::CORBA::tk_fixed: ACE_DEBUG ((LM_DEBUG, "tk_fixed\n")); break;
-    case ::CORBA::tk_value: ACE_DEBUG ((LM_DEBUG, "tk_value\n")); break;
-    case ::CORBA::tk_value_box: ACE_DEBUG ((LM_DEBUG, "tk_value_box\n")); break;
-    case ::CORBA::tk_native: ACE_DEBUG ((LM_DEBUG, "tk_native\n")); break;
-    case ::CORBA::tk_abstract_interface: ACE_DEBUG ((LM_DEBUG, "tk_abstract_interface\n")); break;
-    case ::CORBA::tk_local_interface: ACE_DEBUG ((LM_DEBUG, "tk_local_interface\n")); break;
-    case ::CORBA::tk_component: ACE_DEBUG ((LM_DEBUG, "tk_component\n")); break;
-    case ::CORBA::tk_home: ACE_DEBUG ((LM_DEBUG, "tk_home\n")); break;
-    case ::CORBA::tk_event: ACE_DEBUG ((LM_DEBUG, "tk_event\n")); break;
-    default:
-      break;
-    };
-  }
-
-  // ComponentInterfaceDescription
-
-  void DnC_Dump::dump (const ::Deployment::ComponentInterfaceDescription &cid)
-  {
-    Dump_Obj dump_obj("ComponentInterfaceDescription");
-    dump ("label", cid.label);
-    dump ("UUID", cid.UUID);
-    dump ("specificType", cid.specificType);
-    dump ("supportedType", cid.supportedType);
-    dump ("idlFile", cid.idlFile);
-    dump_sequence ("configProperty", cid.configProperty);
-    dump_sequence ("port", cid.port);
-    dump_sequence ("property", cid.property);
-    dump_sequence ("infoProperty", cid.infoProperty);
-  }
-
-  // Requirement
-
-  void DnC_Dump::dump (const ::Deployment::Requirement &req)
-  {
-    Dump_Obj dump_obj("Requirement");
-    
-    dump ("resourceType", req.resourceType);
-    dump ("name", req.name);
-    dump_sequence ("property", req.property);
-  }
-
-  // MonolithicDeploymentDescription
-
-  void DnC_Dump::dump(const Deployment::MonolithicDeploymentDescription &mdd)
-  {
-    Dump_Obj dump_obj("MonolithicDeploymentDescription");
-
-    dump ("name", mdd.name);
-    dump ("source", mdd.source);
-    dump_ref_seq<Deployment::DeploymentPlan> ("artifactRef", mdd.artifactRef,
-                                              "DeploymentPlan",
-                                              &DeploymentPlan::artifact);
-    dump_sequence ("execParameter", mdd.execParameter);
-    dump_sequence ("deployRequirement", mdd.deployRequirement);
-  }
-
-  // ResourceUsageKind
-
-  void DnC_Dump::dump(const Deployment::ResourceUsageKind &ruk)
-  {
-    ACE_DEBUG ((LM_DEBUG, "%sresourceUsage: ", Dump_Obj::indent()));
-    switch (ruk) {
-    case None: ACE_DEBUG ((LM_DEBUG, "None\n")); break;
-    case InstanceUsesResource: ACE_DEBUG ((LM_DEBUG, "InstanceUsesResource\n")); break;
-    case ResourceUsesInstance: ACE_DEBUG ((LM_DEBUG, "ResourceUsesInstance\n")); break;
-    case PortUsesResource: ACE_DEBUG ((LM_DEBUG, "PortUsesResource\n")); break;
-    case ResourceUsesPort: ACE_DEBUG ((LM_DEBUG, "ResourceUsesPort\n")); break;
-    }
-  }
-
-  // InstanceResourceDeploymentDescription
-
-  void DnC_Dump::dump(const Deployment::InstanceResourceDeploymentDescription &irdd)
-  {
-    Dump_Obj dump_obj("InstanceResourceDeploymentDescription");
-
-    dump (irdd.resourceUsage);
-    dump ("requirementName", irdd.requirementName);
-    dump ("resourceName", irdd.resourceName);
-    ACE_DEBUG ((LM_DEBUG, "%sresourceValue:\n", Dump_Obj::indent()));
-    dump (irdd.resourceValue);
-  }
-
-  // InstanceDeploymentDescription
-
-  void DnC_Dump::dump(const Deployment::InstanceDeploymentDescription &idd)
-  {
-    Dump_Obj dump_obj("InstanceDeploymentDescription");
-
-    dump ("name", idd.name);
-    dump ("node", idd.node);
-    dump ("source", idd.source);
-    dump_ref<Deployment::DeploymentPlan> ("implementationRef",
-                                          idd.implementationRef,
-                                          "DeploymentPlan",
-                                          &DeploymentPlan::implementation);
-    dump_sequence ("configProperty", idd.configProperty);
-    dump_sequence ("deployedResource", idd.deployedResource);
-    dump_sequence ("deployedSharedResource", idd.deployedSharedResource);
-  }
-
-  // ComponentExternalPortEndpoint
-
-  void DnC_Dump::dump (const ::Deployment::ComponentExternalPortEndpoint &cepe)
-  {
-    Dump_Obj dump_obj("ComponentExternalPortEndpoint");
-
-    dump ("portName", cepe.portName);
-  }
-
-  // PlanSubcomponentPortEndpoint
-
-  void DnC_Dump::dump(const Deployment::PlanSubcomponentPortEndpoint &pspe)
-  {
-    Dump_Obj dump_obj("PlanSubcomponentPortEndpoint");
-
-    dump ("portName", pspe.portName);
-    dump ("provider", pspe.provider);
-    ACE_DEBUG ((LM_DEBUG, "%skind: ", Dump_Obj::indent()));
-    switch (pspe.kind) {
-    case Facet: ACE_DEBUG ((LM_DEBUG, "Facet\n")); break;
-    case SimplexReceptacle: ACE_DEBUG ((LM_DEBUG, "SimplexReceptacle\n")); break;
-    case MultiplexReceptacle: ACE_DEBUG ((LM_DEBUG, "MultiplexReceptacle\n")); break;
-    case EventEmitter: ACE_DEBUG ((LM_DEBUG, "EventEmitter\n")); break;
-    case EventPublisher: ACE_DEBUG ((LM_DEBUG, "EventPublisher\n")); break;
-    case EventConsumer: ACE_DEBUG ((LM_DEBUG, "EventConsumer\n")); break;
-    }
-    dump_ref<Deployment::DeploymentPlan> ("instanceRef", pspe.instanceRef,
-                                          "DeploymentPlan",
-                                          &DeploymentPlan::instance);
-  }
-
-  // ExternalReferenceEndpoint
-
-  void DnC_Dump::dump (const ::Deployment::ExternalReferenceEndpoint &ere)
-  {
-    Dump_Obj dump_obj("ExternalReferenceEndpoint");
-
-    dump ("location", ere.location);
-  }
-
-  // ConnectionResourceDeploymentDescription
-
-  void DnC_Dump::dump(const Deployment::ConnectionResourceDeploymentDescription &crdd)
-  {
-    Dump_Obj dump_obj("ConnectionResourceDeploymentDescription");
-
-    dump ("targetName", crdd.targetName);
-    dump ("requirementName", crdd.requirementName);
-    dump ("resourceName", crdd.resourceName);
-    ACE_DEBUG ((LM_DEBUG, "%sresourceValue:\n", Dump_Obj::indent()));
-    dump (crdd.resourceValue);
-  }
-
-  // PlanConnectionDescription
-
-  void DnC_Dump::dump(const Deployment::PlanConnectionDescription &pcd)
-  {
-    Dump_Obj dump_obj("PlanConnectionDescription");
-
-    dump ("name", pcd.name);
-    dump ("source", pcd.source);
-    dump_sequence ("deployRequirement", pcd.deployRequirement);
-    dump_sequence ("externalEndpoint", pcd.externalEndpoint);
-    dump_sequence ("internalEndpoint", pcd.internalEndpoint);
-    dump_sequence ("externalReference", pcd.externalReference);
-    dump_sequence ("deployedResource", pcd.deployedResource);
-  }
-
-  // PlanSubcomponentPropertyReference
-
-  void DnC_Dump::dump(const Deployment::PlanSubcomponentPropertyReference &pspr)
-  {
-    Dump_Obj dump_obj("PlanSubcomponentPropertyReference");
-
-    dump ("propertyName", pspr.propertyName);
-
-    dump_ref<Deployment::DeploymentPlan> ("instanceRef", pspr.instanceRef,
-                                          "DeploymentPlan",
-                                          &DeploymentPlan::instance);
-  }
-
-  // PlanPropertyMapping
-
-  void DnC_Dump::dump(const Deployment::PlanPropertyMapping &ppm)
-  {
-    Dump_Obj dump_obj("PlanPropertyMapping");
-
-    dump ("name", ppm.name);
-    dump ("source", ppm.source);
-    dump ("externalName", ppm.externalName);
-    dump_sequence ("delegatesTo", ppm.delegatesTo);
-  }
-
-  // ImplementationDependency
-
-  void DnC_Dump::dump(const Deployment::ImplementationDependency &id)
-  {
-    Dump_Obj dump_obj("ImplementationDependency");
-
-    dump ("requiredType", id.requiredType);
-  }
-
-  // ResourceDeploymentDescription
-
-  void DnC_Dump::dump(const Deployment::ResourceDeploymentDescription &rdd)
-  {
-    Dump_Obj dump_obj("ResourceDeploymentDescription");
-
-    dump ("requirementName", rdd.requirementName);
-    dump ("resourceName", rdd.resourceName);
-    ACE_DEBUG ((LM_DEBUG, "%sresourceValue:\n", Dump_Obj::indent()));
-    dump (rdd.resourceValue);
-  }
-
-  // ArtifactDeploymentDescription
-
-  void DnC_Dump::dump(const Deployment::ArtifactDeploymentDescription &add)
-  {
-    Dump_Obj dump_obj("ArtifactDeploymentDescription");
-
-    dump ("name", add.name);
-    dump ("location", add.location);
-    dump ("node", add.node);
-    dump ("source", add.source); 
-    dump_sequence ("execParameter", add.execParameter);
-    dump_sequence ("deployRequirement", add.deployRequirement);
-    dump_sequence ("deployedResource", add.deployedResource);
-  }
-
-  void DnC_Dump::dump(const Deployment::DeploymentPlan &plan)
-  {
-    Dump_Obj dump_obj("DeploymentPlan", plan);
-
-    dump ("label", plan.label);
-    dump ("UUID", plan.UUID);
-    dump (plan.realizes);
-    dump_sequence ("implementation", plan.implementation);
-    dump_sequence ("instance", plan.instance);
-    dump_sequence ("connection", plan.connection);
-    dump_sequence ("externalProperty", plan.externalProperty);
-    dump_sequence ("dependsOn", plan.dependsOn);
-    dump_sequence ("artifact", plan.artifact);
-    dump_sequence ("infoProperty", plan.infoProperty);
-  }
-
-  // ComponentPackageReference
-
-  void DnC_Dump::dump (const ::Deployment::ComponentPackageReference &cpr)
-  {
-    Dump_Obj dump_obj("ComponentPackageReference");
-
-    dump ("requiredUUID", cpr.requiredUUID);
-    dump ("requiredName", cpr.requiredName);
-    dump ("requiredType", cpr.requiredType);
-  }
-
-  // SubcomponentInstantiationDescription
-
-  void DnC_Dump::dump (const ::Deployment::SubcomponentInstantiationDescription &sid)
-  {
-    Dump_Obj dump_obj("SubcomponentInstantiationDescription");
-
-    dump ("name", sid.name);
-    dump_sequence ("package", sid.package);
-    dump_sequence ("configProperty", sid.configProperty);
-    dump_sequence ("selectRequirement", sid.selectRequirement);
-    dump_sequence ("reference", sid.reference);
-  }
-
-  // SubcomponentPortEndpoint
-
-  void DnC_Dump::dump (const ::Deployment::SubcomponentPortEndpoint& spe)
-  {
-    Dump_Obj dump_obj("SubcomponentPortEndpoint");
-
-    dump ("portName", spe.portName);
-    int value = spe.instanceRef;
-    ACE_DEBUG ((LM_DEBUG, "%sinstance: %s \n", Dump_Obj::indent (),
-                Dump_Obj::desc<Deployment::ComponentAssemblyDescription>
-                ("ComponentAssemblyDescription").instance[value].name.in ()));
-  }
-
-  // AssemblyConnectionDescription
-
-  void DnC_Dump::dump (const ::Deployment::AssemblyConnectionDescription &acd)
-  {
-    Dump_Obj dump_obj("AssemblyConnectionDescription");
-
-    dump ("name", acd.name);
-    dump_sequence ("deployRequirement", acd.deployRequirement);
-    dump_sequence ("externalEndpoint", acd.externalEndpoint);
-    dump_sequence ("internalEndpoint", acd.internalEndpoint);
-    dump_sequence ("externalReference", acd.externalReference);
-  }
-
-  // SubcomponentPropertyReference
-
-  void DnC_Dump::dump (const ::Deployment::SubcomponentPropertyReference &spr)
-  {
-    Dump_Obj dump_obj("SubcomponentPropertyReference");
-
-    dump ("propertyName", spr.propertyName);
-    int value = spr.instanceRef;
-    ACE_DEBUG ((LM_DEBUG, "%sinstance: %s \n", Dump_Obj::indent (),
-                Dump_Obj::desc<Deployment::ComponentAssemblyDescription>
-                ("ComponentAssemblyDescription").instance[value].name.in ()));
-  }
-
-  // AssemblyPropertyMapping
-
-  void DnC_Dump::dump (const ::Deployment::AssemblyPropertyMapping &apm)
-  {
-    Dump_Obj dump_obj("AssemblyPropertyMapping");
-
-    dump ("name", apm.name);
-    dump ("externalName", apm.externalName);
-    dump_sequence ("delegatesTo", apm.delegatesTo);
-  }
-
-  // ComponentAssemblyDescription
- 
-  void DnC_Dump::dump (const ::Deployment::ComponentAssemblyDescription& cad)
-  {
-    Dump_Obj dump_obj("ComponentAssemblyDescription", cad);
-    
-    dump_sequence ("instance", cad.instance);
-    dump_sequence ("connection", cad.connection);
-    dump_sequence ("externalProperty", cad.externalProperty);
-  }
-
-  // ImplementationArtifactDescription
-
-  void DnC_Dump::dump (const ::Deployment::ImplementationArtifactDescription &iad)
-  {
-    Dump_Obj dump_obj("ImplementationArtifactDescription");
-
-    dump ("label", iad.label);
-    dump ("UUID", iad.UUID);
-    dump ("location", iad.location);
-    dump_sequence ("execParameter", iad.execParameter);
-    dump_sequence ("deployRequirement", iad.deployRequirement); 
-    dump_sequence ("dependsOn", iad.dependsOn); 
-    dump_sequence ("infoProperty", iad.infoProperty); 
-  }
-
-  // NamedImplementationArtifact
-
-  void DnC_Dump::dump (const ::Deployment::NamedImplementationArtifact &nia)
-  {
-    Dump_Obj dump_obj("NamedImplementationArtifact");
-
-    dump ("name", nia.name);
-    dump (nia.referencedArtifact);
-  }
-
-  // ImplementationRequirement
-
-  void DnC_Dump::dump (const ::Deployment::ImplementationRequirement &ir)
-  {
-    Dump_Obj dump_obj("ImplementationRequirement");
-    
-    dump_sequence ("resourceUsage", ir.resourceUsage);
-    dump ("resourcePort", ir.resourcePort);
-    dump ("componentPort", ir.componentPort);
-    dump ("resourceType", ir.resourceType);
-    dump ("name", ir.name);
-    dump_sequence ("property", ir.property);
-  }
-
-  // MonolithicImplementationDescription
-
-  void DnC_Dump::dump (const ::Deployment::MonolithicImplementationDescription 
-                         &mid)
-  {
-    Dump_Obj dump_obj("MonolithicImplementationDescription");
-
-    dump_sequence ("execParameter", mid.execParameter);
-    dump_sequence ("primaryArtifact", mid.primaryArtifact);
-    dump_sequence ("deployRequirement", mid.deployRequirement);
-  }
-
-  // Capability
-
-  void DnC_Dump::dump (const ::Deployment::Capability &capability)
-  {
-    Dump_Obj dump_obj("Capability");
-    
-    dump ("name", capability.name);
-    DnC_Dump::dump ("resourceType", capability.resourceType); 
-    DnC_Dump::dump_sequence ("property", capability.property);
-  }
-
-  // ComponentImplementationDescription
-
-  void DnC_Dump::dump (
-        const ::Deployment::ComponentImplementationDescription &cid)
-  {
-    Dump_Obj dump_obj("ComponentImplementationDescription");
-
-    dump ("label", cid.label);
-    dump ("UUID", cid.UUID);
-    ACE_DEBUG ((LM_DEBUG, "%sImplements:\n", Dump_Obj::indent()));
-    dump (cid.implements);
-    dump_sequence ("assemblyImpl", cid.assemblyImpl);
-    dump_sequence ("monolithicImpl", cid.monolithicImpl);
-    dump_sequence ("configProperty", cid.configProperty);
-    dump_sequence ("capability", cid.capability);
-    dump_sequence ("dependsOn", cid.dependsOn);
-    dump_sequence ("infoProperty", cid.infoProperty);
-  }
-
-  // PackagedComponentImplementation
-
-  void DnC_Dump::dump (const ::Deployment::PackagedComponentImplementation &pci)
-  {
-    Dump_Obj dump_obj("PackagedComponentImplementation");
-
-    dump ("Name", pci.name);
-    ACE_DEBUG ((LM_DEBUG, 
-                "%sreferencedImplementation: \n", Dump_Obj::indent()));
-    DnC_Dump::dump (pci.referencedImplementation); 
-  }
-
-  // ComponentPackageDescription
-
-  void DnC_Dump::dump (const ::Deployment::ComponentPackageDescription 
-                         &comppkgdesc)
-  {
-    Dump_Obj dump_obj("ComponentPackageDescription");
-
-    dump ("label", comppkgdesc.label);
-    dump ("UUID", comppkgdesc.UUID);
-    ACE_DEBUG ((LM_DEBUG, "%srealizes: \n", Dump_Obj::indent ()));
-    DnC_Dump::dump (comppkgdesc.realizes); // ComponentInterfaceDescription
-    dump_sequence ("configProperty", comppkgdesc.configProperty);
-    dump_sequence ("implementation", comppkgdesc.implementation);
-    dump_sequence ("infoProperty", comppkgdesc.infoProperty);
-  }
-
-  // PackageConfiguration
-
-  void DnC_Dump::dump (const ::Deployment::PackageConfiguration &pc)
-  {
-    Dump_Obj dump_obj("PackageConfiguration");
-
-    dump ("label", pc.label);
-    dump ("UUID", pc.UUID);
-    dump_sequence ("specializedConfig", pc.specializedConfig);
-    dump_sequence ("basePackage", pc.basePackage);
-    dump_sequence ("reference", pc.reference);
-    dump_sequence ("selectRequirement", pc.selectRequirement);
-    dump_sequence ("configProperty", pc.configProperty);
-  }
-
-  // Requirement Satisfier
-  void DnC_Dump::dump (const Deployment::RequirementSatisfier& rs)
-  {
-    Dump_Obj dump_obj("RequirementSatisfier");
-    
-    dump ("name", rs.name);
-    dump ("resourceType", rs.resourceType);
-    dump_sequence ("property", rs.property);
-  }
-
-  // Property
-  void DnC_Dump::dump (const Deployment::Property& property)
-  {
-    Dump_Obj dump_obj("Property");
-    dump ("name", property.name);
-    ACE_DEBUG ((LM_DEBUG, "%svalue:\n", Dump_Obj::indent()));
-    dump (property.value);
-  }
-
-  // CORBA::Any
-
-  void DnC_Dump::dump (const ::CORBA::Any &any)
-  {
-    ::CORBA::TypeCode * type = any.type ();
-    switch (type->kind ())
-      {
-      case CORBA::tk_short:
-        {
-          CORBA::Short temp;
-          if (! (any >>= temp))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC_Dump::dump (CORBA::Any), expected short\
-                                  encoded different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-
-      case CORBA::tk_null:
-        ACE_DEBUG ((LM_DEBUG, "%sAny value: null value encoded\n",
-                    Dump_Obj::indent ()));
-        break;
-
-      case CORBA::tk_void:
-        ACE_DEBUG ((LM_DEBUG, "Any value: void type encoded \n"));
-        break;
-      case CORBA::tk_long:
-        {
-          CORBA::Long temp;
-          if (! (any >>= temp))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected long\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-
-      case CORBA::tk_ushort:
-        {
-          CORBA::UShort temp;
-          if (! (any >>= temp))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected u short\
-                                   encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %u \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-
-      case CORBA::tk_ulong:
-        {
-          CORBA::ULong temp;
-          if (! (any >>= temp))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected ulong\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %u \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-
-      case CORBA::tk_float:
-        {
-          CORBA::Float temp;
-          if (! (any >>= temp))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected float\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %f \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-      case CORBA::tk_double:
-        {
-          CORBA::Double temp;
-          if (! (any >>= temp))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected double\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %f \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-      case CORBA::tk_boolean:
-        {
-          CORBA::Boolean temp;
-          if (! (any >>= CORBA::Any::to_boolean (temp)))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected bool\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-
-          if (temp)
-            ACE_DEBUG ((LM_DEBUG, "Any value: True \n"));
-          else
-            ACE_DEBUG ((LM_DEBUG, "Any value: False \n"));
-        }
-        break;
-
-      case CORBA::tk_char:
-        {
-          CORBA::Char temp;
-          if (! (any >>= CORBA::Any::to_char (temp)))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected char\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %c \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-
-      case CORBA::tk_octet:
-        {
-          CORBA::Octet temp;
-          if (! (any >>= CORBA::Any::to_octet (temp)))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected octet\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-
-      case CORBA::tk_string:
-        {
-          const char * temp = 0;
-          if (! (any >>= temp))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected string\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %s \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-      case CORBA::tk_longlong:
-        {
-          CORBA::LongLong temp;
-          if (! (any >>= temp))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected longlong\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %l \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-
-      case CORBA::tk_longdouble:
-        {
-          CORBA::LongDouble temp;
-          if (! (any >>= temp))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected longdouble\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
-                      temp));
-        }
-
-        break;
-      case CORBA::tk_wchar:
-        {
-          CORBA::WChar temp;
-          if (! (any >>= CORBA::Any::to_wchar (temp)))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected wchar\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %c \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-
-      case CORBA::tk_wstring:
-        {
-          const CORBA::WChar * temp;
-          if (! (any >>= temp))
-            {
-              ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected wstring\
-                                    encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %s \n", Dump_Obj::indent (),
-                      temp));
-        }
-        break;
-
-      default:
-        ACE_DEBUG ((LM_DEBUG, "Unknown type encoded in Any\n"));
-        ACE_THROW (CORBA::INTERNAL ());
-      }
-  }
-#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES
-}
-
-#endif /* DNC_DUMP_C */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Domain_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Domain_Handler.cpp
deleted file mode 100644
index 5d6d1456e07..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/Domain_Handler.cpp
+++ /dev/null
@@ -1,403 +0,0 @@
-// $Id$
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "Domain_Handler.h"
-#include "Property_Handler.h"
-#include "SP_Handler.h"
-#include "Process_Element.h"
-#include "Utils.h"
-#include <iostream>
-#include "string.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the Domain type and populate the IDL structure
-void Domain_Handler::process_domain (Deployment::Domain& domain)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName ());
-
-      if (node_name == XStr (ACE_TEXT ("Deployment:Domain")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-             (this->iter_, node_name, "UUID", domain.UUID));
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-             (this->iter_, node_name, "label", domain.label));
-      else if
-        (process_sequence_local<Deployment::SharedResource>
-           (this->doc_, this->iter_, node,
-            node_name, "sharedResource", domain.sharedResource,
-            this, &Domain_Handler::process_sr));
-      else if
-        (process_sequence_local<Deployment::Node>
-           (this->doc_, this->iter_, node,
-            node_name, "node", domain.node,
-            this, &Domain_Handler::process_node));
-      else if
-        (process_sequence_local<Deployment::Interconnect>
-           (this->doc_, this->iter_, node,
-            node_name, "interconnect", domain.interconnect,
-            this, &Domain_Handler::process_interconnect));
-      else if
-        (process_sequence_local<Deployment::Bridge>
-           (this->doc_, this->iter_, node,
-            node_name, "bridge", domain.bridge,
-            this, &Domain_Handler::process_bridge));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "infoProperty", domain.infoProperty,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else
-        {
-          // ??? How did we get here ???
-          ACE_THROW (CORBA::INTERNAL());
-        }
-    }
-
-  this->update_node_refs (domain);
-  this->update_ic_refs (domain);
-  this->update_bridge_refs (domain);
-  this->update_sr_refs (domain);
-
-  return;
-}
-
-void Domain_Handler::process_node (DOMNodeIterator* iter,
-                                   Deployment::Node& domain_node)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-               (ACE_TEXT ("Deployment:Node")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-               (iter, node_name, "name", domain_node.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-               (iter, node_name, "label", domain_node.label));
-      else if
-        (process_sequence_local<Deployment::Resource>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "resource", domain_node.resource,
-            this, &Domain_Handler::process_resource));
-      else if
-        (process_reference_seq (node, node_name, "connection",
-                                domain_node.connectionRef,
-                                this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else if
-        (process_reference_seq (node, node_name, "sharedResource",
-                                domain_node.sharedResourceRef,
-                                this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void Domain_Handler::process_resource (DOMNodeIterator* iter,
-                                       Deployment::Resource& domain_resource)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-               (ACE_TEXT ("Deployment:Resource")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string
-             (iter, node_name, "name", domain_resource.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq
-           (iter, node_name, "resourceType", domain_resource.resourceType));
-      else if
-        (process_sequence_common<Deployment::SatisfierProperty>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "property", domain_resource.property,
-            &SP_Handler::process_SatisfierProperty,
-            this->id_map_));
-      else
-        {
-          node = iter->previousNode ();
-          break;
-        }
-    }
-}
-
-void Domain_Handler::process_bridge (DOMNodeIterator* iter,
-                                     Deployment::Bridge& domain_bridge)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-          
-      if (node_name == XStr
-               (ACE_TEXT ("Deployment:Bridge")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (iter, node_name, "name", domain_bridge.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (iter, node_name, "label", domain_bridge.label));
-      else if
-        (process_reference_seq (node, node_name, "connect",
-                                domain_bridge.connectRef,
-                                this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else if
-        (process_sequence_local<Deployment::Resource>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "resource", domain_bridge.resource,
-            this, &Domain_Handler::process_resource));
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-
-void Domain_Handler::process_interconnect (DOMNodeIterator* iter,
-                                           Deployment::Interconnect& domain_ic)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr
-               (ACE_TEXT ("Deployment:Interconnect")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "name", domain_ic.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "label", domain_ic.label));
-      else if
-        (process_reference_seq (node, node_name, "connect",
-                                domain_ic.connectRef,
-                                this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else if
-        (process_reference_seq (node, node_name, "connection",
-                                domain_ic.connectionRef,
-                                this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else if
-        (process_sequence_local<Deployment::Resource>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "resource", domain_ic.resource,
-            this, &Domain_Handler::process_resource));
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-
-void Domain_Handler::process_sr (DOMNodeIterator* iter,
-                                 Deployment::SharedResource& domain_sr)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-          
-      if (node_name == XStr
-               (ACE_TEXT ("Deployment:SharedResource")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "name", domain_sr.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq 
-              (iter, node_name, "resourceType", 
-               domain_sr.resourceType));
-      else if
-        (process_reference_seq (node, node_name, "node",
-                                domain_sr.nodeRef,
-                                this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else if
-        (process_sequence_common<Deployment::SatisfierProperty>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "property", domain_sr.property,
-            &SP_Handler::process_SatisfierProperty,
-            this->id_map_));
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void Domain_Handler::update_node_refs (Deployment::Domain& domain)
-{
-  CORBA::ULong x;
-  CORBA::ULong y;
-  int ref_value;
-  int orig_value;
-  ACE_TString ref_name;
-
-  for (x = 0; x < domain.node.length (); ++x)
-    {
-      for (y = 0; y < domain.node[x].connectionRef.length (); ++y)
-        {
-          ref_value =  domain.node[x].connectionRef[y];
-          if (idref_map_.find (ref_value, ref_name) == 0)
-            {
-              if (id_map_.find (ref_name, orig_value) == 0)
-                {
-                  domain.node[x].connectionRef[y] = orig_value;
-                }
-            }
-        }
-
-      for (y = 0; y < domain.node[x].sharedResourceRef.length (); ++y)
-        {
-          ref_value = domain.node[x].sharedResourceRef[y];
-          if (idref_map_.find (ref_value, ref_name) == 0)
-            {
-              if (id_map_.find (ref_name, orig_value) == 0)
-                {
-                  domain.node[x].sharedResourceRef[y] = orig_value;
-                }
-            }
-        }
-
-    }
-}
-
-void Domain_Handler::update_ic_refs (Deployment::Domain& domain)
-{
-  CORBA::ULong x;
-  CORBA::ULong y;
-  int ref_value;
-  int orig_value;
-  ACE_TString ref_name;
-
-  for (x = 0; x < domain.interconnect.length (); ++x)
-    {
-      for (y = 0; y < domain.interconnect[x].connectionRef.length (); ++y)
-        {
-          ref_value = domain.interconnect[x].connectionRef[y];
-          if (idref_map_.find (ref_value, ref_name) == 0)
-            {
-              if (id_map_.find (ref_name, orig_value) == 0)
-                {
-                  domain.interconnect[x].connectionRef[y] = orig_value;
-                }
-            }
-        }
-
-      for (y = 0; y < domain.interconnect[x].connectRef.length (); ++y)
-        {
-          ref_value = domain.interconnect[x].connectRef[y];
-          if (idref_map_.find (ref_value, ref_name) == 0)
-            {
-              if (id_map_.find (ref_name, orig_value) == 0)
-                {
-                  domain.interconnect[x].connectRef[y] = orig_value;
-                }
-            }
-        }
-    }
-}
-
-void Domain_Handler::update_bridge_refs (Deployment::Domain& domain)
-{
-  CORBA::ULong x;
-  CORBA::ULong y;
-  int ref_value;
-  int orig_value;
-  ACE_TString ref_name;
-
-  for (x = 0; x < domain.bridge.length (); ++x)
-    {
-      for (y = 0; y < domain.bridge[x].connectRef.length (); ++y)
-        {
-          ref_value = domain.bridge[x].connectRef[y];
-          if (idref_map_.find (ref_value, ref_name) == 0)
-            {
-              if (id_map_.find (ref_name, orig_value) == 0)
-                {
-                  domain.bridge[x].connectRef[y] = orig_value;
-                }
-            }
-        }
-    }
-}
-
-void Domain_Handler::update_sr_refs (Deployment::Domain& domain)
-{
-  CORBA::ULong x;
-  CORBA::ULong y;
-  int ref_value;
-  int orig_value;
-  ACE_TString ref_name;
-
-  for (x = 0; x < domain.sharedResource.length (); ++x)
-    {
-      for (y = 0; y < domain.sharedResource[x].nodeRef.length (); ++y)
-        {
-          ref_value = domain.sharedResource[x].nodeRef[y];
-          if (idref_map_.find (ref_value, ref_name) == 0)
-            {
-              if (id_map_.find (ref_name, orig_value) == 0)
-                {
-                  domain.sharedResource[x].nodeRef[y] = orig_value;
-                }
-            }
-        }
-    }
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ERE_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/ERE_Handler.cpp
deleted file mode 100644
index 9251ab3adb5..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/ERE_Handler.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-//$Id$
-
-#include "ERE_Handler.h"
-#include "Utils.h"
-
-using CIAO::Config_Handler::Utils;
-
-void
-CIAO::Config_Handler::ERE_Handler::
-process_ExternalReferenceEndpoint (DOMNodeIterator * iter,
-                                   Deployment::ExternalReferenceEndpoint &ret_struct)
-{
-  //Check if the Schema IDs for both the elements match
-  DOMNode * node = iter->nextNode ();
-  XStr name (node->getNodeName ());
-
-  if (name != XStr (ACE_TEXT ("location")))
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Config_Handlers::ERE_Handler::process_ExternalRefEndPoint \
-                   element mismatch expected <location>"));
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-  // Populate the structure
-  ret_struct.location = Utils::parse_string (iter);
-}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/IAD_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/IAD_Handler.cpp
deleted file mode 100644
index 9e4ff47cf28..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/IAD_Handler.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//$Id$
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "Property_Handler.h"
-#include "Requirement_Handler.h"
-#include "NIA_Handler.h"
-#include "IAD_Handler.h"
-#include "Utils.h"
-#include "Process_Element.h"
-#include <iostream>
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the package configuration and populate it
-void IAD_Handler::process_ImplementationArtifactDescription
-(::Deployment::ImplementationArtifactDescription &iad)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-             (ACE_TEXT ("Deployment:ImplementationArtifactDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (this->iter_, node_name, "label", iad.label));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (this->iter_, node_name, "UUID", iad.UUID));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq 
-              (this->iter_, node_name, "location", 
-               iad.location));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "execParameter", iad.execParameter,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else if
-        (process_sequence_common<Deployment::Requirement>
-           (node->getOwnerDocument(), this->iter_, node,
-            node_name, "deployRequirement", iad.deployRequirement,
-            &Requirement_Handler::process_Requirement,
-            this->id_map_));
-      else if
-        (process_sequence_remote<Deployment::NamedImplementationArtifact, 
-                                 NIA_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "dependsOn", iad.dependsOn,
-            &NIA_Handler::process_NamedImplementationArtifact, this->id_map_));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "infoProperty", iad.infoProperty,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else
-        {
-          this->iter_->previousNode ();
-          return;
-        }
-    }
-  return;
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.cpp
deleted file mode 100644
index 71f700f596e..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-//$Id$
-
-#include "ID_Handler.h"
-#include "tao/Exception.h"
-#include "Utils.h"
-
-using CIAO::Config_Handler::Utils;
-
-void
-CIAO::Config_Handler::ID_Handler::
-process_ImplementationDependency (DOMNodeIterator * iter,
-                                  Deployment::ImplementationDependency &ret_struct)
-{
-  //Check if the Schema IDs for both the elements match
-  DOMNode * node = iter->nextNode ();
-  XStr name (node->getNodeName ());
-
-  if (name != XStr (ACE_TEXT ("elementType")))
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Config_Handlers::ID_Handler::process_ImplDependency \
-                   element mismatch expected <elementType>"));
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-  // Populate the structure
-  ret_struct.requiredType = Utils::parse_string (iter);
-}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/IR_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/IR_Handler.cpp
deleted file mode 100644
index d4255b5555e..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/IR_Handler.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-//$Id$
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "IAD_Handler.h"
-#include "IR_Handler.h"
-#include "RUK_Handler.h"
-#include "Utils.h"
-#include "Utils.h"
-#include "Process_Element.h"
-#include "Property_Handler.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the package configuration and populate it
-void IR_Handler::process_ImplementationRequirement
-(::Deployment::ImplementationRequirement &ir)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-        (ACE_TEXT ("Deployment:ImplementationRequirement")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (this->iter_, node_name, "resourcePort", 
-              ir.resourcePort));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (this->iter_, node_name, "componentPort", 
-               ir.componentPort));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (this->iter_, node_name, "resourceType", 
-               ir.resourceType));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (this->iter_, node_name, "name", ir.name));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "Property", ir.property,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else
-        {
-          this->iter_->previousNode ();
-          return;
-        }
-    }
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/MID_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/MID_Handler.cpp
deleted file mode 100644
index bce6afd2e7a..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/MID_Handler.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// $Id$
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "Property_Handler.h"
-#include "Requirement_Handler.h"
-#include "NIA_Handler.h"
-#include "MID_Handler.h"
-#include "IR_Handler.h"
-#include "Process_Element.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-void MID_Handler::process_MonolithicImplementationDescription
-              (::Deployment::MonolithicImplementationDescription &mid)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName());
-      if (node_name == XStr 
-               (ACE_TEXT ("Deployment:MonolithicImplementationDescription")))
-        {
-        }
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "execParameter", mid.execParameter,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else if
-        (process_sequence_remote<Deployment::NamedImplementationArtifact, 
-                                 NIA_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "primaryArtifact", mid.primaryArtifact,
-            &NIA_Handler::process_NamedImplementationArtifact, 
-            this->id_map_));
-      else if
-        (process_sequence_remote<Deployment::ImplementationRequirement, 
-                                 IR_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "deployRequirement", mid.deployRequirement,
-            &IR_Handler::process_ImplementationRequirement, this->id_map_));
-      else
-        {
-          this->iter_->previousNode ();
-          return;
-        }
-    }
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/NIA_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/NIA_Handler.cpp
deleted file mode 100644
index 11db8839207..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/NIA_Handler.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-//$Id$
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "IAD_Handler.h"
-#include "NIA_Handler.h"
-#include "Utils.h"
-#include "Process_Element.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the package configuration and populate it
-void NIA_Handler::process_NamedImplementationArtifact
-(::Deployment::NamedImplementationArtifact &nia)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName());
-      if (node_name == XStr 
-               (ACE_TEXT ("Deployment:NamedImplementationArtifact")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-               (this->iter_, node_name, "name", nia.name));
-      else if
-        (process_element_remote<Deployment::ImplementationArtifactDescription,
-                                IAD_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "referencedArtifact", nia.referencedArtifact,
-            &IAD_Handler::process_ImplementationArtifactDescription, 
-            this->id_map_));
-      else
-       {
-         this->iter_->previousNode ();
-         return;
-       }
-    }
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/PCI_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/PCI_Handler.cpp
deleted file mode 100644
index e26a73dab27..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/PCI_Handler.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// $Id$
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "CompImplDesc_Handler.h"
-#include "PCI_Handler.h"
-#include "Utils.h"
-#include "Process_Element.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the package configuration and populate it
-void PCI_Handler::process_PackagedComponentImplementation
-                      (::Deployment::PackagedComponentImplementation &pci)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-            (ACE_TEXT ("Deployment:PackagedComponentImplementation")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (this->iter_, node_name, "name", pci.name));
-      else if
-        (process_element_remote<Deployment::ComponentImplementationDescription,
-                                CompImplDesc_Handler>
-           (this->doc_, this->iter_, node,
-            node_name, "referencedImplementation", 
-            pci.referencedImplementation,
-            &CompImplDesc_Handler::process_ComponentImplementationDescription, 
-            this->id_map_));
-      else
-        {
-          this->iter_->previousNode ();
-          return;
-        }
-    }
-  return;
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/PC_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/PC_Handler.cpp
deleted file mode 100644
index 25804bd71c3..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/PC_Handler.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-// $Id$
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "Property_Handler.h"
-#include "Requirement_Handler.h"
-#include "CPR_Handler.h"
-#include "CompPkgDesc_Handler.h"
-#include "PC_Handler.h"
-#include "Process_Element.h"
-#include "Utils.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the package configuration and populate it
-void PC_Handler::process_PackageConfiguration
-                    (::Deployment::PackageConfiguration &pc)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName());
-      if (node_name == XStr 
-                    (ACE_TEXT ("Deployment:PackageConfiguration")))
-        {
-        }
-      else if (CIAO::Config_Handler::Utils::process_string 
-                  (this->iter_, node_name, "label", pc.label))
-        {
-        }
-      else if (CIAO::Config_Handler::Utils::process_string 
-                  (this->iter_, node_name, "UUID", pc.UUID))
-        {
-        }
-      else if (process_sequence_remote
-                 <Deployment::ComponentPackageDescription,
-                  CompPkgDesc_Handler>
-                     (this->doc_, this->iter_, node,
-                      node_name, "basePackage", pc.basePackage,
-                     &CompPkgDesc_Handler::process_ComponentPackageDescription,
-                      this->id_map_))
-        {
-        }
-      else if (process_sequence_remote
-                <Deployment::ComponentPackageReference, CPR_Handler>
-                   (this->doc_, this->iter_, node,
-                    node_name, "reference", pc.reference,
-                    &CPR_Handler::process_ComponentPackageReference,
-                    this->id_map_))
-        {
-        }
-      else if (process_sequence_common
-             <Deployment::Requirement>
-                (this->doc_, this->iter_, node,
-                 node_name, "selectRequirement", pc.selectRequirement,
-                 &Requirement_Handler::process_Requirement,this->id_map_))
-        {
-        }
-      else if (process_sequence_common<Deployment::Property>
-            (this->doc_, this->iter_, node,
-             node_name, "configProperty", pc.configProperty,
-             &Property_Handler::process_Property, this->id_map_))
-        {
-        }
-      else
-        {
-          ACE_THROW (CORBA::INTERNAL());
-        }
-    }
-    return;
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Plan_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Plan_Handler.cpp
deleted file mode 100644
index bf4b22c2c3f..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/Plan_Handler.cpp
+++ /dev/null
@@ -1,624 +0,0 @@
-// $Id$
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "Plan_Handler.h"
-#include "ID_Handler.h"
-#include "CompIntrDesc_Handler.h"
-#include "Property_Handler.h"
-#include "SP_Handler.h"
-#include "Requirement_Handler.h"
-#include "Any_Handler.h"
-#include "RUK_Handler.h"
-#include "CEPE_Handler.h"
-#include "ERE_Handler.h"
-#include "CPK_Handler.h"
-#include "Process_Element.h"
-#include "Utils.h"
-#include <iostream>
-#include "string.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the DeploymentPlan type and populate the IDL structure
-void Plan_Handler::process_plan(Deployment::DeploymentPlan& plan)
-{
-  for (DOMNode* node = this->iter_->nextNode();
-       node != 0;
-       node = this->iter_->nextNode())
-    {
-      XStr node_name (node->getNodeName ());
-
-
-      if (node_name == XStr
-          (ACE_TEXT ("Deployment:DeploymentPlan")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (this->iter_, node_name, "label", plan.label));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (this->iter_, node_name, "UUID", plan.UUID));
-      else if
-        (process_element<Deployment::ComponentInterfaceDescription>
-           (this->doc_, this->iter_, node,
-            node_name, "realizes", plan.realizes,
-            this, &Plan_Handler::process_ccd,
-            this->id_map_));
-      else if
-        (process_sequence_local<Deployment::MonolithicDeploymentDescription>
-           (this->doc_, this->iter_, node,
-            node_name, "implementation", plan.implementation,
-            this, &Plan_Handler::process_mdd));
-      else if
-        (process_sequence_local<Deployment::InstanceDeploymentDescription>
-           (this->doc_, this->iter_, node,
-            node_name, "instance", plan.instance,
-            this, &Plan_Handler::process_idd));
-      else if
-        (process_sequence_local<Deployment::PlanConnectionDescription>
-           (this->doc_, this->iter_, node,
-            node_name, "connection", plan.connection,
-            this, &Plan_Handler::process_pcd));
-      else if
-        (process_sequence_local<Deployment::PlanPropertyMapping>
-           (this->doc_, this->iter_, node,
-            node_name, "externalProperty", plan.externalProperty,
-            this, &Plan_Handler::process_ppm));
-      else if
-        (process_sequence_common<Deployment::ImplementationDependency>
-           (this->doc_, this->iter_, node,
-            node_name, "dependsOn", plan.dependsOn,
-            &ID_Handler::process_ImplementationDependency, this->id_map_));
-      else if
-        (process_sequence_local<Deployment::ArtifactDeploymentDescription>
-           (this->doc_, this->iter_, node,
-            node_name, "artifact", plan.artifact,
-            this, &Plan_Handler::process_add));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (this->doc_, this->iter_, node,
-            node_name, "infoProperty", plan.infoProperty,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else
-        {
-          // ??? How did we get here ???
-          ACE_THROW (CORBA::INTERNAL());
-        }
-    }
-
-  this->update_mdd_refs (plan);
-  this->update_idd_refs (plan);
-  this->update_pspe_refs (plan);
-  this->update_pspr_refs (plan);
-  return;
-}
-
-void Plan_Handler::process_rdd (DOMNodeIterator* iter,
-                                Deployment::
-                                ResourceDeploymentDescription& rdd)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-                  (ACE_TEXT ("Deployment:ResourceDeploymentDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "requirementName", 
-               rdd.requirementName));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "resourceName", rdd.resourceName));
-      else if (node_name == XStr (ACE_TEXT ("resourceValue")))
-        {
-          Any_Handler::process_Any (iter, rdd.resourceValue);
-        }
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void Plan_Handler::process_irdd (DOMNodeIterator* iter,
-                                 Deployment::
-                                 InstanceResourceDeploymentDescription &irdd)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-                (ACE_TEXT ("Deployment:InstanceResourceDeploymentDescription")))
-        {
-        }
-      else if (node_name == "resourceUsage")
-        {
-          RUK_Handler::process_ResourceUsageKind (iter, irdd.resourceUsage);
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-            (iter, node_name, "requirementName", 
-             irdd.requirementName));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (iter, node_name, "resourceName", irdd.resourceName));
-      else if (node_name == XStr (ACE_TEXT ("resourceValue")))
-        {
-          Any_Handler::process_Any (iter, irdd.resourceValue);
-        }
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void Plan_Handler::process_add (DOMNodeIterator* iter,
-                                Deployment::ArtifactDeploymentDescription& add)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-          (ACE_TEXT ("Deployment:ArtifactDeploymentDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-               (iter, node_name, "name", add.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq 
-               (iter, node_name, "location", add.location));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-               (iter, node_name, "node", add.node));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq 
-               (iter, node_name, "source", add.source));
-      else if
-        (process_sequence_common<Deployment::Property>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "execParameter", add.execParameter,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else if
-        (process_sequence_common<Deployment::Requirement>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "deployRequirement", add.deployRequirement,
-            &Requirement_Handler::process_Requirement,
-            this->id_map_));
-      else if
-        (process_sequence_local<Deployment::ResourceDeploymentDescription>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "deployedResource", add.deployedResource,
-            this, &Plan_Handler::process_rdd));
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void Plan_Handler::process_idd (DOMNodeIterator* iter,
-                                Deployment::InstanceDeploymentDescription& idd)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-                    (ACE_TEXT ("Deployment:InstanceDeploymentDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "name", idd.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "node", idd.node));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq 
-              (iter, node_name, "source", idd.source));
-      else if
-        (process_reference (node, node_name, "implementation",
-                            idd.implementationRef, 
-                            this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else if
-        (process_sequence_common<Deployment::Property>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "configProperty", idd.configProperty,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else if
-        (process_sequence_local<Deployment::
-                                InstanceResourceDeploymentDescription>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "deployedResource", idd.deployedResource,
-            this, &Plan_Handler::process_irdd));
-      else if
-        (process_sequence_local<Deployment::
-                                InstanceResourceDeploymentDescription>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "deployedSharedResource", idd.deployedSharedResource,
-            this, &Plan_Handler::process_irdd));
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void Plan_Handler::process_mdd (DOMNodeIterator* iter,
-                                Deployment::MonolithicDeploymentDescription&
-                                mdd)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-                 (ACE_TEXT ("Deployment:MonolithicDeploymentDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (iter, node_name, "name", mdd.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq 
-             (iter, node_name, "source", mdd.source));
-      else if
-        (process_reference_seq (node, node_name, "artifact",
-                                mdd.artifactRef,
-                                this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else if
-        (process_sequence_common<Deployment::Property>
-           (node->getOwnerDocument(), this->iter_, node,
-            node_name, "execParameter", mdd.execParameter,
-            &Property_Handler::process_Property,
-            this->id_map_));
-      else if
-        (process_sequence_common<Deployment::Requirement>
-           (node->getOwnerDocument(), this->iter_, node,
-            node_name, "deployRequirement", mdd.deployRequirement,
-            &Requirement_Handler::process_Requirement,
-            this->id_map_));
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void Plan_Handler::process_ccd (DOMNodeIterator* iter,
-                                Deployment::ComponentInterfaceDescription&
-                                cid)
-{
-  CompIntrDesc_Handler handler (iter, false);
-  handler.process_ComponentInterfaceDescription (cid);
-}
-
-void Plan_Handler::process_pspr (DOMNodeIterator* iter,
-                                 Deployment::PlanSubcomponentPropertyReference&                                  pspr)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-             (ACE_TEXT ("Deployment:PlanSubcomponentPropertyReference")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (iter, node_name, "propertyName", pspr.propertyName));
-      else if
-        (process_reference (node, node_name, "instance", pspr.instanceRef, 
-                            this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void Plan_Handler::process_pspe (DOMNodeIterator* iter,
-                                 Deployment::PlanSubcomponentPortEndpoint& pspe)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-            (ACE_TEXT ("Deployment:PlanSubcomponentPortEndpoint")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "portName", pspe.portName));
-      else if
-        (CIAO::Config_Handler::Utils::process_boolean 
-              (iter, node_name, "provider", pspe.provider));
-      else if (node_name == XStr (ACE_TEXT ("kind")))
-        {
-          CPK_Handler::process_CCMComponentPortKind (iter, pspe.kind);
-        }
-      else if
-        (process_reference (node, node_name, "instance",
-                            pspe.instanceRef,
-                            this->index_, this->idref_map_))
-        {
-          this->index_ = this->index_ + 1;
-        }
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-    
-void Plan_Handler::process_ppm(DOMNodeIterator* iter,
-                               Deployment::PlanPropertyMapping& ppm)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-            (ACE_TEXT ("Deployment:PlanPropertyMapping")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "name", ppm.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq 
-              (iter, node_name, "source", ppm.source));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "externalName", ppm.externalName));
-      else if
-        (process_sequence_local<Deployment::PlanSubcomponentPropertyReference>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "delegatesTo", ppm.delegatesTo,
-            this, &Plan_Handler::process_pspr));
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void Plan_Handler::process_crdd (DOMNodeIterator* iter,
-                                 Deployment::
-                                 ConnectionResourceDeploymentDescription& crdd)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-            (ACE_TEXT ("Deployment:ConnectionResourceDeploymentDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (iter, node_name, "targetName", crdd.targetName));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-             (iter, node_name, "requirementName", 
-              crdd.requirementName));
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-            (iter, node_name, "resourceName", crdd.resourceName));
-      else if (node_name == XStr (ACE_TEXT ("resourceValue")))
-        {
-          Any_Handler::process_Any (iter, crdd.resourceValue);
-        }
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void Plan_Handler::process_pcd (DOMNodeIterator* iter,
-                                Deployment::PlanConnectionDescription& pcd)
-{
-  for (DOMNode* node = iter->nextNode();
-       node != 0;
-       node = iter->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-
-      if (node_name == XStr 
-             (ACE_TEXT ("Deployment:PlanConnectionDescription")))
-        {
-        }
-      else if
-        (CIAO::Config_Handler::Utils::process_string 
-              (iter, node_name, "name", pcd.name));
-      else if
-        (CIAO::Config_Handler::Utils::process_string_seq 
-              (iter, node_name, "source", pcd.source));
-      else if
-        (process_sequence_common<Deployment::Requirement>
-           (node->getOwnerDocument(), this->iter_, node,
-            node_name, "deployRequirement", pcd.deployRequirement,
-            &Requirement_Handler::process_Requirement,
-            this->id_map_));
-      else if
-        (process_sequence_common<Deployment::ComponentExternalPortEndpoint>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "externalEndpoint", pcd.externalEndpoint,
-            &CEPE_Handler::process_ComponentExternalPortEndpoint,
-            this->id_map_));
-      else if
-        (process_sequence_local<Deployment::PlanSubcomponentPortEndpoint>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "internalEndpoint", pcd.internalEndpoint,
-            this, &Plan_Handler::process_pspe));
-      else if
-        (process_sequence_common<Deployment::ExternalReferenceEndpoint>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "externalReference", pcd.externalReference,
-            &ERE_Handler::process_ExternalReferenceEndpoint,
-            this->id_map_));
-      else if
-        (process_sequence_local<Deployment::
-                                ConnectionResourceDeploymentDescription>
-           (node->getOwnerDocument(), iter, node,
-            node_name, "deployedResource", pcd.deployedResource,
-            this, &Plan_Handler::process_crdd));
-      else
-        {
-          iter->previousNode();
-          return;
-        }
-    }
-}
-
-void Plan_Handler::update_mdd_refs (Deployment::DeploymentPlan& plan)
-{
-  CORBA::ULong x;
-  CORBA::ULong y;
-  int ref_value;
-  int orig_value;
-  ACE_TString ref_name;
-
-  for (x = 0; x < plan.implementation.length (); ++x)
-    {
-      for (y = 0; y < plan.implementation[x].artifactRef.length (); ++y)
-        {
-          ref_value = plan.implementation[x].artifactRef[y];
-          //ACE_DEBUG ((LM_DEBUG, "ref_value in ADD is %d \n", ref_value));
-          if (idref_map_.find (ref_value, ref_name) == 0)
-            {
-              if (id_map_.find (ref_name, orig_value) == 0)
-                {
-                  plan.implementation[x].artifactRef[y] = orig_value;
-                }
-            }
-        }
-    }
-}
-
-void Plan_Handler::update_idd_refs (Deployment::DeploymentPlan& plan)
-{
-  CORBA::ULong x;
-  int ref_value;
-  int orig_value;
-  ACE_TString ref_name;
-
-  for (x = 0; x < plan.instance.length (); ++x)
-    {
-      ref_value = plan.instance[x].implementationRef;
-          //ACE_DEBUG ((LM_DEBUG, "ref_value in MDD is %d \n", ref_value));
-      if (idref_map_.find (ref_value, ref_name) == 0)
-        {
-          if (id_map_.find (ref_name, orig_value) == 0)
-            {
-              plan.instance[x].implementationRef = orig_value;
-            }
-        }
-    }
-}
-
-void Plan_Handler::update_pspe_refs (Deployment::DeploymentPlan& plan)
-{
-  CORBA::ULong x;
-  CORBA::ULong y;
-  int ref_value;
-  int orig_value;
-  ACE_TString ref_name;
-
-  for (x = 0; x < plan.connection.length (); ++x)
-    {
-      for (y = 0; y < plan.connection[x].internalEndpoint.length (); ++y)
-        {
-          ref_value = plan.connection[x].internalEndpoint[y].
-            instanceRef;
-          //ACE_DEBUG ((LM_DEBUG, "ref_value in IDD is %d \n", ref_value));
-          if (idref_map_.find (ref_value, ref_name) == 0)
-            {
-              if (id_map_.find (ref_name, orig_value) == 0)
-                {
-                  plan.connection[x].internalEndpoint[y].
-                    instanceRef = orig_value;
-                }
-            }
-        }
-    }
-}
-
-void Plan_Handler::update_pspr_refs (Deployment::DeploymentPlan& plan)
-{
-  CORBA::ULong x;
-  CORBA::ULong y;
-  int ref_value;
-  int orig_value;
-  ACE_TString ref_name;
-
-  for (x = 0; x < plan.externalProperty.length (); ++x)
-    {
-      for (y = 0; y < plan.externalProperty[x].delegatesTo.length (); ++y)
-        {
-          ref_value = plan.externalProperty[x].delegatesTo[y].
-            instanceRef;
-          if (idref_map_.find (ref_value, ref_name) == 0)
-            {
-              if (id_map_.find (ref_name, orig_value) == 0)
-                {
-                  plan.externalProperty[x].delegatesTo[y].
-                    instanceRef = orig_value;
-                }
-            }
-        }
-    }
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Process_Element.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Process_Element.cpp
deleted file mode 100644
index 9bfb99b7cb2..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/Process_Element.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-//==================================================================
-/**
- *  @file Process_Element.cpp
- *
- *  $Id$
- *
- *  @author Emre Turkay  <turkaye@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#include "Process_Element.h"
-#include "ace/Auto_Ptr.h"
-#include "Utils.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/*
- *  Process references
- */
-
-void
-process_refs(DOMNode*& node,
-             CORBA::ULongSeq& seq,
-             int& index,
-             IDREF_MAP& idref_map)
-{
-  CORBA::ULong i (seq.length ());
-  seq.length (i + 1);
-  seq[i] = index;
-  if (node->hasAttributes())
-    {
-      DOMNamedNodeMap* named_node_map = node->getAttributes ();
-      //auto_ptr<DOMNamedNodeMap> cleanup_nodemap (named_node_map);
-      
-      int length = named_node_map->getLength ();
-      
-      for (int j = 0; j < length; j++)
-        {
-          DOMNode* attribute_node = named_node_map->item (j);
-          XStr strattrnodename (attribute_node->getNodeName ());
-          char* aceattrnodevalue_ch = XMLString::transcode
-            (attribute_node->getNodeValue ());
-          ACE_TString aceattrnodevalue = aceattrnodevalue_ch;
-          XMLString::release (&aceattrnodevalue_ch);
-          if (strattrnodename == XStr (ACE_TEXT ("xmi:idref")))
-            {
-              //index = index + 1;
-              idref_map.bind (index, aceattrnodevalue);
-            }
-        }
-    }
-}
-
-void
-process_ref(DOMNode*& node,
-            CORBA::ULong& ref,
-            int& index,
-            IDREF_MAP& idref_map)
-{
-  ref = index;
-  if (node->hasAttributes ())
-    {
-      DOMNamedNodeMap* named_node_map = node->getAttributes ();
-      //auto_ptr<DOMNamedNodeMap> cleanup_nodemap (named_node_map);
-      
-      int length = named_node_map->getLength ();
-      
-      for (int j = 0; j < length; j++)
-        {
-          DOMNode* attribute_node = named_node_map->item (j);
-          XStr strattrnodename (attribute_node->getNodeName ());
-          char* aceattrnodevalue_ch = XMLString::transcode
-            (attribute_node->getNodeValue ());
-          ACE_TString aceattrnodevalue = aceattrnodevalue_ch;
-          XMLString::release (&aceattrnodevalue_ch);
-          if (strattrnodename == XStr (ACE_TEXT ("xmi:idref")))
-            {
-              //index = index + 1;
-              idref_map.bind (index, aceattrnodevalue);
-            }
-        }
-    }
-}
-
-/*
- *  Process function for references
- */
-
-bool
-process_reference_seq (DOMNode* node,
-                      XStr& node_name, const char* name,
-                      CORBA::ULongSeq& seq,
-                      int& index,
-                      IDREF_MAP& idref_map)
-{
-  bool result = (node_name == XStr (ACE_TEXT (name)));
-
-  if (result == true)
-      process_refs (node, seq, index, idref_map);
-
-  return result;
-}
-
-// Process reference
-bool
-process_reference (DOMNode* node,
-                   XStr& node_name, const char* name,
-                   CORBA::ULong& ref,
-                   int& index,
-                   IDREF_MAP& idref_map)
-{
-  bool result = (node_name == XStr (ACE_TEXT (name)));
-  
-  if (result == true)
-    process_ref (node, ref, index, idref_map);
-
-  return result;
-}
-
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.cpp
deleted file mode 100644
index 1272ad9dcc6..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-//$Id$
-
-#include "Property_Handler.h"
-#include "Any_Handler.h"
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "Utils.h"
-
-using CIAO::Config_Handler::Utils;
-using CIAO::Config_Handler::Any_Handler;
-
-void
-CIAO::Config_Handler::Property_Handler::process_Property (DOMNodeIterator * iter,
-                                                          Deployment::Property &property)
-{
-  int valid_name = 0, valid_value = 0;
-  for (DOMNode * node = iter->nextNode (); node != 0; node = iter->nextNode ())
-    {
-      //Check if the Schema IDs for both the elements match
-      XStr name (node->getNodeName ());
-      if (name == XStr (ACE_TEXT ("name")))
-        {
-          valid_name = 1;
-          property.name = Utils::parse_string (iter);
-        }
-      else if (name == XStr (ACE_TEXT ("value")))
-        {
-          valid_value = 1;
-          if (node->hasAttributes ())
-            {
-              xercesc::DOMNamedNodeMap * named_node_map = 
-                node->getAttributes ();
-              int length = named_node_map->getLength ();
-              if (length > 1)
-                {
-                  for (int j = 0; j < length; j++)
-                    {
-                      DOMNode * attr_node = named_node_map->item (j);
-                      XStr attr_node_name = attr_node->getNodeName ();
-                      char*  attr_node_value_ch = 
-                        XMLString::transcode (attr_node->getNodeValue ());
-                      ACE_TString attr_node_value = attr_node_value_ch;
-                      XMLString::release (&attr_node_value_ch);
-                      if (attr_node_name = XStr (ACE_TEXT ("href")))
-                        {
-                          XMLURL url (attr_node_value.c_str ());
-                          DOMNodeIterator * value_iter = 
-                            Utils::parse_href_tag (url, 
-                                                   node->getOwnerDocument ());
-                          // Get to the root-node
-                          value_iter->nextNode ();
-
-                          // Process the value node present there
-                          Any_Handler::process_Any (value_iter, 
-                                                    property.value);
-                        }
-                    }
-                }
-              else if (length == 1)
-                Any_Handler::process_Any (iter, property.value);
-            }
-          else
-            // Process the value associated
-            Any_Handler::process_Any (iter, property.value);
-        }
-      else 
-        {
-          if (! valid_name || ! valid_value)
-            {
-              ACE_DEBUG ((LM_DEBUG, "Config_Handlers::Property_Handler::\
-                          process_Property element mismatch expected <name> \
-                          or <value>"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-
-          // Processed one element more go back one and exit
-          iter->previousNode ();
-          break;
-        }
-    }/* End Outer for */
-}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/RS_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/RS_Handler.cpp
deleted file mode 100644
index f27f02c2d7b..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/RS_Handler.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-//$Id$
-
-#include "RS_Handler.h"
-#include "SP_Handler.h"
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "Utils.h"
-
-void
-CIAO::Config_Handler::RS_Handler::
-process_RequirementSatisfier (DOMNodeIterator * iter,
-                              Deployment::RequirementSatisfier &ret_struct)
-{
-  // boolean to represent valid <RequirementSatisfier> definition
-  int valid_name = 0, valid_resourceType = 0, valid_property  = 0;
-
-  for (DOMNode * node = iter->nextNode (); ; node = iter->nextNode ())
-    {
-      XStr name (node->getNodeName ());
-      if (name == XStr (ACE_TEXT ("name")))
-        {
-          ret_struct.name = CIAO::Config_Handler::Utils::parse_string (iter);
-          valid_name = 1;
-        }
-      else if (name == XStr (ACE_TEXT ("resourceType")))
-        {
-          valid_resourceType = 1;
-          // Requirement: Atleast one <resourceType> definition present
-          ::CORBA::StringSeq_var res_seq = 0;
-          ACE_NEW_THROW_EX (res_seq,
-                            ::CORBA::StringSeq (1),
-                            CORBA::NO_MEMORY ());
-          res_seq->length (0);
-
-          while (name == XStr (ACE_TEXT ("resourceType")))
-            {
-              ::CORBA::ULong index = res_seq->length ();
-              res_seq->length (res_seq->length () + 1);
-              res_seq [index] = 
-                CIAO::Config_Handler::Utils::parse_string (iter);
-              name = node->getNodeName ();
-            }
-
-          // On exit go one step back to faciliate parsing next tag
-          iter->previousNode ();
-
-          // Assign this sequence to the Return Structure
-          ret_struct.resourceType = res_seq;
-        }
-
-      else if (name == XStr (ACE_TEXT ("property")))
-        {
-          valid_property = 1;
-          Deployment::SatisfierProperties_var property_seq = 0;
-          DOMNodeIterator * property_iter = 0;
-          ACE_NEW_THROW_EX (property_seq,
-                            Deployment::SatisfierProperties,
-                            CORBA::NO_MEMORY ());
-          property_seq->length (0);
-          while (name == XStr (ACE_TEXT ("property")))
-            {
-              // Check for <href> tags 
-              if (node->hasAttributes ())
-                {
-                  xercesc::DOMNamedNodeMap * named_node_map = 
-                    node->getAttributes ();
-                  int length = named_node_map->getLength ();
-                  if (length > 1)
-                    {
-                      for (int j = 0; j < length; j++)
-                        {
-                          DOMNode * attr_node = named_node_map->item (j);
-                          XStr attr_node_name = attr_node->getNodeName ();
-                          char*  attr_node_value_ch =
-                            XMLString::transcode (attr_node->getNodeValue ());
-                          ACE_TString attr_node_value = attr_node_value_ch;
-                          XMLString::release (&attr_node_value_ch);
-                          if (attr_node_name = XStr (ACE_TEXT ("href")))
-                            {
-                              XMLURL url (attr_node_value.c_str ());
-                              DOMNodeIterator * value_iter =
-                                Utils::parse_href_tag (url, 
-                                                       node->getOwnerDocument ());
-                              // Get to the root-node
-                              value_iter->nextNode ();
-
-                              // Process the property href tag
-                              property_iter = value_iter;
-                            }
-                        }
-                    } 
-                } 
-              else
-                property_iter = iter;
-
-              // Copy the property onto the sequence
-              ::CORBA::ULong index = property_seq->length ();
-              property_seq->length (property_seq->length () + 1);
-              CIAO::Config_Handler::SP_Handler::
-                process_SatisfierProperty (property_iter,
-                                           property_seq [index]);
-
-              // Get next node
-              iter->nextNode ();
-              name = node->getNodeName ();
-            }
-
-          // On exit go one step back to faciliate parsing next tag
-          iter->previousNode ();
-
-          // Copy the sequence to return structure
-          ret_struct.property = property_seq;
-        }
-      else
-        {
-          if (! valid_name || ! valid_resourceType || ! valid_property)
-            ACE_DEBUG ((LM_DEBUG, "Config_Handlers::RS_Handler::process_ \
-                        RequirementSatisfier element mismatch expected <name>,\
-                        <resourceType> <property>\n"));
-          // On exit go one step back as one might have processed the next 
-          // valid tag
-          iter->previousNode ();
-
-          // Exit out of the for loop
-          break;
-        }
-    }
-}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/RUK_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/RUK_Handler.cpp
deleted file mode 100644
index 08f390824dc..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/RUK_Handler.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-//==================================================================
-/**
- *  @file  RUK_Handler.cpp
- *
- *  $Id$
- *
- *  @author Emre Turkay  <turkaye@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-
-#include "IAD_Handler.h"
-#include "RUK_Handler.h"
-#include "Utils.h"
-
-#include <iostream>
-
-using std::cerr;
-using std::endl;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /*
-     * Class ResourceUsageKind_Handler
-     */
-
-     void RUK_Handler::process_ResourceUsageKind
-        (DOMNodeIterator *iter, ::Deployment::ResourceUsageKind &kind)
-     {
-       // -- ResourceUsageKind enum
-       XStr none                    ("None");
-       XStr instance_uses_resource  ("InstanceUsesResource");
-       XStr resource_uses_instance  ("ResourceUsesInstance");
-       XStr port_uses_resource      ("PortUsesResource");
-       XStr resource_uses_port      ("ResourceUsesPort");
-       
-       XStr kind_str = XStr (Utils::parse_string (iter));
-       if (kind_str == none)
-	 kind = Deployment::None;
-       else if (kind_str = instance_uses_resource)
-	 kind = Deployment::InstanceUsesResource;
-       else if (kind_str == resource_uses_instance)
-	 kind = Deployment::ResourceUsesInstance;
-       else if (kind_str == port_uses_resource)
-	 kind = Deployment::PortUsesResource;
-       else if (kind_str == resource_uses_port)
-	 kind = Deployment::ResourceUsesPort;
-       
-       // Something wrong here.. Throw exception
-       ACE_DEBUG ((LM_DEBUG,
-		   "Config_Handler::RUK_Handler::process_ResourceUsageKind \
-                    illegal <ResourceUsageKind> value found \n"));
-       ACE_THROW (CORBA::INTERNAL ());
-     }
-  }
-}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Requirement_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Requirement_Handler.cpp
deleted file mode 100644
index bc5b1fcb56a..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/Requirement_Handler.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-//$Id$
-
-#include "Requirement_Handler.h"
-#include "Property_Handler.h"
-#include "tao/Exception.h"
-#include "Utils.h"
-
-using CIAO::Config_Handler::Property_Handler;
-
-void
-CIAO::Config_Handler::Requirement_Handler::process_Requirement (DOMNodeIterator * iter,
-                                                                Deployment::Requirement &ret_struct)
-{
-  int valid_resourceType = 0, valid_property = 0, valid_name = 0;
-  for (DOMNode * node = iter->nextNode (); 
-       node != 0; 
-       node = iter->nextNode ())
-    {
-      XStr name (node->getNodeName ());
-      if (name == XStr (ACE_TEXT ("resourceType")))
-        {
-          valid_resourceType = 1;
-          // Populate the structure
-          ret_struct.resourceType = 
-            CIAO::Config_Handler::Utils::parse_string (iter);
-        }
-      else if (name == XStr (ACE_TEXT ("property")))
-        {
-          Deployment::Properties_var properties = 0;
-          ACE_NEW_THROW_EX (properties,
-                            Deployment::Properties,
-                            CORBA::NO_MEMORY ());
-          properties->length (0);
-
-          for (node = iter->nextNode ();
-               name == XStr (ACE_TEXT ("property"));
-               iter->nextNode ())
-            {
-              // Increment length of sequence
-              ::CORBA::ULong index = properties->length ();
-              properties->length (properties->length () + 1);
-              DOMNodeIterator * property_iter = 0;
-
-              // Check for <href> tags
-              if (node->hasAttributes ())
-                {
-                  xercesc::DOMNamedNodeMap * named_node_map =
-                    node->getAttributes ();
-                  int length = named_node_map->getLength ();
-
-                  if (length > 1)
-                    {
-                      for (int j = 0; j < length; j++)
-                        {
-                          DOMNode * attr_node = named_node_map->item (j);
-                          XStr attr_node_name = attr_node->getNodeName ();
-                          char*  attr_node_value_ch =
-                            XMLString::transcode (attr_node->getNodeValue ());
-                          ACE_TString attr_node_value = attr_node_value_ch;
-                          auto_ptr<char> cleanup_char (attr_node_value_ch);
-                          if (attr_node_name = XStr (ACE_TEXT ("href")))
-                            {
-                              XMLURL url (attr_node_value.c_str ());
-                              DOMNodeIterator * value_iter =
-                                Utils::parse_href_tag (url, 
-                                                       node->getOwnerDocument ());
-                              // Get to the root-node
-                              value_iter->nextNode ();
-
-                              // Process the property href tag
-                              property_iter = value_iter;
-                            }
-                        }
-                    }
-                  else
-                    property_iter = iter;
-
-                  // Deep copy the value
-                  CIAO::Config_Handler::Property_Handler::
-                    process_Property (property_iter, properties [index]);
-                }  
-            }
-          valid_property = 1;
-
-          // On exit go one step back to faciliate parsing next tag
-          iter->previousNode ();
-
-          // Copy sequence on to return struct
-          ret_struct.property = properties;
-        }
-      else if (name == XStr (ACE_TEXT ("name")))
-        {
-          valid_name = 1;
-          ret_struct.name = CIAO::Config_Handler::Utils::parse_string (iter);
-        }
-      else 
-        {
-          if (! valid_resourceType || 
-              ! valid_property     ||
-              ! valid_name)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "Config_Handlers::Requirement_Handler::process_\
-                          Requirement element mismatch expected <resourceType>\
-                          , <property> or <name>"));
-              ACE_THROW (CORBA::INTERNAL ());
-            }
-          // On exit go one step back as we have read one too many
-          iter->previousNode ();
-          break;
-        }
-    }
-}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/SPK_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/SPK_Handler.cpp
deleted file mode 100644
index e7731252994..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/SPK_Handler.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//$Id$
-
-#include "SPK_Handler.h"
-#include "tao/Exception.h"
-#include "Utils.h"
-
-using CIAO::Config_Handler::Utils;
-
-void
-CIAO::Config_Handler::SPK_Handler::
-process_SatisfierPropertyKind (DOMNodeIterator * iter,
-                               Deployment::SatisfierPropertyKind &kind)
-{
-  // -- SatisfierPropertyKind enum
-  XStr quantity  ("Quantity");
-  XStr capacity  ("Capacity");
-  XStr minimum   ("Minimum");
-  XStr maximum   ("Maximum");
-  XStr attribute ("Attribute");
-  XStr selection ("Selection");
-
-  XStr kind_str = XStr (Utils::parse_string (iter));
-  if (kind_str == quantity)
-     kind = Deployment::Quantity;
-  else if (kind_str = capacity)
-     kind = Deployment::Capacity;
-  else if (kind_str == minimum)
-     kind = Deployment::Minimum;
-  else if (kind_str == maximum)
-     kind = Deployment::Maximum;
-  else if (kind_str == attribute)
-     kind = Deployment::Attribute;
-  else if (kind_str == selection)
-     kind = Deployment::Selection;
-
-  // Something wrong here.. Throw exception
-  ACE_DEBUG ((LM_DEBUG,
-              "Config_Handler::SPK_Handler::process_SPK \
-               illegal <SatisfierPropertyKind> value found \n"));
-  ACE_THROW (CORBA::INTERNAL ());
-}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/SP_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/SP_Handler.cpp
deleted file mode 100644
index 842912db9ca..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/SP_Handler.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-//$Id$
-
-#include "SP_Handler.h"
-#include "Any_Handler.h"
-#include "SPK_Handler.h"
-#include "tao/Exception.h"
-#include "ace/Auto_Ptr.h"
-#include "Utils.h"
-
-using CIAO::Config_Handler::Utils;
-using CIAO::Config_Handler::Any_Handler;
-
-void
-CIAO::Config_Handler::SP_Handler::
-process_SatisfierProperty (DOMNodeIterator * iter,
-                           Deployment::SatisfierProperty &property)
-{
-  for (DOMNode * node = iter->nextNode (); ; node = iter->nextNode ())
-    {
-      // Get name of the current element
-      XStr name (node->getNodeName ());
-
-      if (name == XStr (ACE_TEXT ("name")))
-        property.name = Utils::parse_string (iter);
-      else if (name == XStr (ACE_TEXT ("kind")))
-        SPK_Handler::process_SatisfierPropertyKind (iter, property.kind);
-      else if (name == XStr (ACE_TEXT ("value")))
-        {
-          // Check for <href> tags
-          if (node->hasAttributes ())
-            {
-              xercesc::DOMNamedNodeMap * named_node_map =
-                node->getAttributes ();
-              int length = named_node_map->getLength ();
-              if (length > 1)
-                {
-                  for (int j = 0; j < length; j++)
-                    {
-                      DOMNode * attr_node = named_node_map->item (j);
-                      XStr attr_node_name = attr_node->getNodeName ();
-                      char*  attr_node_value_ch =
-                        XMLString::transcode (attr_node->getNodeValue ());
-                      ACE_TString attr_node_value = attr_node_value_ch;
-                      XMLString::release (&attr_node_value_ch);
-                      if (attr_node_name = XStr (ACE_TEXT ("href")))
-                        {
-                          XMLURL url (attr_node_value.c_str ());
-                          DOMNodeIterator * value_iter =
-                            Utils::parse_href_tag (url, 
-                                                   node->getOwnerDocument ());
-
-                          // Get to the root-node
-                          value_iter->nextNode ();
-
-                          // Process the property href tag
-                          Any_Handler::process_Any (value_iter, 
-                                                    property.value);
-                        }
-                    }
-                }
-            }
-          else
-            // Populate value for the Property
-            Any_Handler::process_Any (iter, property.value);
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "Config_Handlers::SP_Handler::process_ \
-                      RequirementSatisfier element mismatch expected <name> \
-                      or <PropertyKind> <Deployment:Any>"));
-
-          // Get the previous iterator
-          iter->previousNode ();
-
-          // Exit from the for loop
-          break;
-        }
-    }
-}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/TPD_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/TPD_Handler.cpp
deleted file mode 100644
index d145106bae5..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/TPD_Handler.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-// $Id$
-
-#include "tao/Exception.h"
-#include "ace/Log_Msg.h"
-#include "Property_Handler.h"
-#include "Requirement_Handler.h"
-#include "CPR_Handler.h"
-#include "CompPkgDesc_Handler.h"
-#include "TPD_Handler.h"
-#include "Process_Element.h"
-#include "Utils.h"
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/// handle the package configuration and populate it
-ACE_TString TPD_Handler::process_TopLevelPackageDescription()
-{
-  for (DOMNode* node = this->iter_->nextNode ();
-       node != 0;
-       node = this->iter_->nextNode ())
-    {
-      XStr node_name (node->getNodeName());
-      if (node_name == XStr
-              (ACE_TEXT ("Deployment:TopLevelPackageDescription")))
-        {
-        }
-      else if (node_name == XStr(ACE_TEXT ("package")))
-        {
-          if (node->hasAttributes ())
-            {
-              DOMNamedNodeMap* named_node_map = node->getAttributes ();
-
-              // the number of attributes
-              int length = named_node_map->getLength();
-              // iterate the attributes
-              for (int j = 0; j < length; ++j)
-                {
-                  DOMNode* attribute_node = named_node_map->item (j);
-                  XStr strattrnodename (attribute_node->getNodeName ());
-
-                  char * temp =
-                    XMLString::transcode (attribute_node->getNodeValue ());
-                  ACE_TString aceattrnodevalue = temp;
-                  XMLString::release (&temp);
-
-                  // if href is given find out the referenced position
-                  // and process the element
-                  if (strattrnodename == XStr (ACE_TEXT ("href")))
-                    {
-                      XMLURL xml_url (aceattrnodevalue.c_str ());
-                      XMLURL result (aceattrnodevalue.c_str ());
-                      ACE_TString url_string = aceattrnodevalue.c_str ();
-
-                      char * temp =
-                        XMLString::transcode ( doc_->getDocumentURI ());
-                      ACE_TString doc_path = temp;
-                      XMLString::release (&temp);
-
-                      XMLCh * relative_path =
-                        XMLString::transcode (doc_path.c_str ());
-                      result.makeRelativeTo (relative_path);
-                      XMLString::release (&relative_path);
-
-                      temp = XMLString::transcode (result.getURLText ());
-                      ACE_TString final_url = temp;
-                      XMLString::release (&temp);
-
-                      if (xml_url.isRelative ())
-                        {
-                          return final_url;
-                        }
-                      else
-                        {
-                          return url_string;
-                        }
-                    }
-                }
-            }
-        }
-      else
-        {
-          break;
-        }
-    }
-  ACE_THROW (CORBA::INTERNAL());
-}
-
-END_DEPLOYMENT_NAMESPACE
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Utils.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Utils.cpp
deleted file mode 100644
index 526d757dbd9..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/Utils.cpp
+++ /dev/null
@@ -1,353 +0,0 @@
-//$Id$
-
-#include "Utils.h"
-#include "ace/OS_NS_stdlib.h"
-#include "ace/Log_Msg.h"
-#include "ace/SString.h"
-#include "ace/Auto_Ptr.h"
-
-#include "XercesString.h"
-#include <xercesc/util/XMLURL.hpp>
-#include <xercesc/util/XMLUri.hpp>
-#include <xercesc/util/XMLUniDefs.hpp>
-
-using xercesc::XMLUri;
-using xercesc::XMLURL;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::XMLUni;
-using xercesc::DOMImplementation;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMNodeFilter;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationLS;
-
-char *
-CIAO::Config_Handler::Utils::parse_string (DOMNodeIterator * iter)
-{
-  DOMNode * node = iter->nextNode();
-  DOMText* text = ACE_reinterpret_cast (DOMText*, node);
-  return XMLString::transcode (text->getNodeValue ());
-}
-
-CORBA::Short
-CIAO::Config_Handler::Utils::parse_short (DOMNodeIterator * iter)
-{
-  char *temp = Config_Handler::Utils::parse_string (iter);
-  CORBA::Short ret_val = ACE_OS::atoi (temp);
-  XMLString::release (&temp);
-  return ret_val;
-}
-
-CORBA::ULong
-CIAO::Config_Handler::Utils::parse_ulong (DOMNodeIterator * iter)
-{
-  char *temp = Config_Handler::Utils::parse_string (iter);
-  CORBA::ULong ret_val = ACE_OS::strtoul (temp, 0, 10);
-  XMLString::release (&temp);
-  return ret_val;
-}
-
-CORBA::Long
-CIAO::Config_Handler::Utils::parse_long (DOMNodeIterator * iter)
-{
-  char *temp = Config_Handler::Utils::parse_string (iter);
-  CORBA::ULong ret_val = ACE_OS::strtol (temp, 0, 10);
-  XMLString::release (&temp);
-  return ret_val;
-}
-
-CORBA::Double
-CIAO::Config_Handler::Utils::parse_double (DOMNodeIterator * iter)
-{
-  char *temp = Config_Handler::Utils::parse_string (iter);
-  CORBA::Double ret_val = ACE_OS::strtod (temp, 0);
-  XMLString::release (&temp);
-  return ret_val;
-}
-
-CORBA::Float
-CIAO::Config_Handler::Utils::parse_float (DOMNodeIterator * iter)
-{
-  return ACE_static_cast (CORBA::Float, Utils::parse_double (iter));
-}
-
-CORBA::Boolean
-CIAO::Config_Handler::Utils::parse_bool (DOMNodeIterator * iter)
-{
-  XStr true_val ("true");
-  XStr true_cap_val ("TRUE");
-
-  DOMText * text = ACE_reinterpret_cast (DOMText *, iter->nextNode ());
-  XStr value (text->getNodeValue ());
-
-  if (value == true_val || value == true_cap_val)
-    return 1;
-  else
-    return 0;
-}
-
-CORBA::Char
-CIAO::Config_Handler::Utils::parse_char (DOMNodeIterator * iter)
-{
-  DOMText * text = ACE_reinterpret_cast (DOMText *, iter->nextNode ());
-  char * temp_string = XMLString::transcode (text->getNodeValue ());
-
-  // Should be non-null
-  ACE_ASSERT (temp_string != 0);
-
-  // Return the first character in the node as char value
-  char ret_char = temp_string [0];
-  XMLString::release (&temp_string);
-  return ret_char;
-}
-
-CORBA::Octet
-CIAO::Config_Handler::Utils::parse_octet (DOMNodeIterator * iter)
-{
-  return Utils::parse_char (iter);
-}
-
-bool
-CIAO::Config_Handler::Utils::process_string (DOMNodeIterator* iter,
-                const XStr& node_name, const char* name,
-                TAO_String_Manager& var)
-{
-  bool result = (node_name == XStr(ACE_TEXT (name)));
-  if (result == true)
-    {
-      DOMNode* node = iter->nextNode();
-      const XMLCh* text = ACE_reinterpret_cast(DOMText*, node)->getNodeValue
-();
-      if (text)
-        var = XMLString::transcode (text);
-    }
-  return result;
-}
-
-bool
-CIAO::Config_Handler::Utils::process_string_seq (DOMNodeIterator* iter,
-                    const XStr& node_name, const char* name,
-                    CORBA::StringSeq& seq)
-{
-  bool result = (node_name == XStr (ACE_TEXT (name)));
-
-  if (result == true)
-    {
-      DOMNode* node = iter->nextNode ();
-      const XMLCh* text = ACE_reinterpret_cast
-                            (DOMText*, node)->getNodeValue ();
-
-      if (text)
-        {
-          CORBA::ULong i (seq.length ());
-          seq.length (i + 1);
-          seq[i] = XMLString::transcode (text);
-        }
-    }
-
-  return result;
-}
-
-bool
-CIAO::Config_Handler::Utils::process_ulong (DOMNodeIterator* iter,
-               const XStr& node_name, const char* name,
-               CORBA::ULong& var)
-{
-  bool result = (node_name == XStr (ACE_TEXT (name)));
-
-  if (result == true)
-    {
-      DOMNode* node = iter->nextNode ();
-      const XMLCh* text = ACE_reinterpret_cast
-                            (DOMText*, node)->getNodeValue ();
-
-      if (text)
-        {
-          CORBA::String_var temp = XMLString::transcode (text);
-          var = ACE_static_cast (CORBA::ULong, ACE_OS::strtol (temp.in (),
-                                 0, 10));
-        }
-    }
-
-  return result;
-}
-
-bool
-CIAO::Config_Handler::Utils::process_boolean (DOMNodeIterator* iter,
-                 const XStr& node_name, const char* name,
-                 CORBA::Boolean& var)
-{
-  bool result = (node_name == XStr (ACE_TEXT (name)));
-
-  if (result == true)
-    {
-      DOMNode* node = iter->nextNode ();
-      const XMLCh* text = ACE_reinterpret_cast
-                            (DOMText*, node)->getNodeValue ();
-
-      if (text)
-        {
-          CORBA::String_var temp = XMLString::transcode (text);
-          var = ACE_static_cast (CORBA::Boolean, ACE_OS::strtol (temp.in (),
-                                 0, 10));
-        }
-    }
-
-  return result;
-}
-
-DOMDocument*
-CIAO::Config_Handler::Utils::create_document (const char * url)
-{
-  xercesc::XMLPlatformUtils::Initialize();
-  static const XMLCh gLS[] = { xercesc::chLatin_L,
-                               xercesc::chLatin_S,
-                               xercesc::chNull };
-
-  DOMImplementation* impl
-    = DOMImplementationRegistry::getDOMImplementation(gLS);
-  //auto_ptr<DOMImplementation> cleanup_impl (impl);
-
-  DOMBuilder* parser =
-    ((DOMImplementationLS*)impl)->
-    createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
-  //auto_ptr<DOMBuilder> cleanup_parser (parser);
-
-  // Discard comment nodes in the document
-  parser->setFeature (XMLUni::fgDOMComments, false);
-
-  // Disable datatype normalization. The XML 1.0 attribute value
-  // normalization always occurs though.
-  parser->setFeature (XMLUni::fgDOMDatatypeNormalization, true);
-
-  // Do not create EntityReference nodes in the DOM tree. No
-  // EntityReference nodes will be created, only the nodes
-  // corresponding to their fully expanded sustitution text will be
-  // created.
-  parser->setFeature (XMLUni::fgDOMEntities, false);
-
-  // Perform Namespace processing.
-  parser->setFeature (XMLUni::fgDOMNamespaces, true);
-
-  // Perform Validation
-  parser->setFeature (XMLUni::fgDOMValidation, true);
-
-  // Do not include ignorable whitespace in the DOM tree.
-  parser->setFeature (XMLUni::fgDOMWhitespaceInElementContent, false);
-
-  // Enable the parser's schema support.
-  parser->setFeature (XMLUni::fgXercesSchema, true);
-
-  // Enable full schema constraint checking, including checking which
-  // may be time-consuming or memory intensive. Currently, particle
-  // unique attribution constraint checking and particle derivation
-  // restriction checking are controlled by this option.
-  parser->setFeature (XMLUni::fgXercesSchemaFullChecking, true);
-
-  // The parser will treat validation error as fatal and will exit.
-  parser->setFeature (XMLUni::fgXercesValidationErrorAsFatal, true);
-
-
-  DOMDocument* doc = parser->parseURI (url);
-  //auto_ptr<DOMDocument> cleanup_doc (doc);
-
-  return doc;
-}
-
-DOMBuilder*
-CIAO::Config_Handler::Utils::create_parser ()
-{
-  xercesc::XMLPlatformUtils::Initialize();
-  static const XMLCh gLS[] = { xercesc::chLatin_L,
-                               xercesc::chLatin_S,
-                               xercesc::chNull };
-
-  DOMImplementation* impl
-    = DOMImplementationRegistry::getDOMImplementation(gLS);
-  //auto_ptr<DOMImplementation> cleanup_impl (impl);
-
-  DOMBuilder* parser =
-    ((DOMImplementationLS*)impl)->
-    createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
-  //auto_ptr<DOMBuilder> cleanup_parser (parser);
-
-  // Discard comment nodes in the document
-  parser->setFeature (XMLUni::fgDOMComments, false);
-
-  // Disable datatype normalization. The XML 1.0 attribute value
-  // normalization always occurs though.
-  parser->setFeature (XMLUni::fgDOMDatatypeNormalization, true);
-
-  // Do not create EntityReference nodes in the DOM tree. No
-  // EntityReference nodes will be created, only the nodes
-  // corresponding to their fully expanded sustitution text will be
-  // created.
-  parser->setFeature (XMLUni::fgDOMEntities, false);
-
-  // Perform Namespace processing.
-  parser->setFeature (XMLUni::fgDOMNamespaces, true);
-
-  // Perform Validation
-  parser->setFeature (XMLUni::fgDOMValidation, true);
-
-  // Do not include ignorable whitespace in the DOM tree.
-  parser->setFeature (XMLUni::fgDOMWhitespaceInElementContent, false);
-
-  // Enable the parser's schema support.
-  parser->setFeature (XMLUni::fgXercesSchema, true);
-
-  // Enable full schema constraint checking, including checking which
-  // may be time-consuming or memory intensive. Currently, particle
-  // unique attribution constraint checking and particle derivation
-  // restriction checking are controlled by this option.
-  parser->setFeature (XMLUni::fgXercesSchemaFullChecking, true);
-
-  // The parser will treat validation error as fatal and will exit.
-  parser->setFeature (XMLUni::fgXercesValidationErrorAsFatal, true);
-
-
-  //DOMDocument* doc = parser->parseURI (url);
-  //auto_ptr<DOMDocument> cleanup_doc (doc);
-
-  return parser;
-}
-
-DOMNodeIterator *
-CIAO::Config_Handler::Utils::parse_href_tag (XMLURL url, DOMDocument * doc)
-{
-  char * document_path = 0;
-  if (url.isRelative ())
-  {
-    char * doc_path = XMLString::transcode (doc->getDocumentURI ());
-    XMLCh * temp = XMLString::transcode (doc_path);
-    url.makeRelativeTo (temp);
-    document_path = XMLString::transcode (url.getURLText ());
-
-    // Release allocated memory
-    XMLString::release (&doc_path);
-    XMLString::release (&temp);
-  }
-  else
-  {
-    document_path = XMLString::transcode (url.getURLText ());
-
-  }
-
-  DOMDocument* href_doc =
-    CIAO::Config_Handler::Utils::create_document (document_path);
-  //auto_ptr<DOMDocument> cleanup_doc (href_doc);
-
-  DOMDocumentTraversal* traverse = href_doc;
-  DOMNode* root = (href_doc->getDocumentElement ());
-  unsigned long filter = DOMNodeFilter::SHOW_ELEMENT |
-                         DOMNodeFilter::SHOW_TEXT;
-
-  // release allocated memory
-  XMLString::release (&document_path);
-
-  return traverse->createNodeIterator (root,
-                                       filter,
-                                       0,
-                                       true);
-}
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/XercesString.cpp b/TAO/CIAO/DAnCE/Config_Handlers/XercesString.cpp
deleted file mode 100644
index 7b719e4dc80..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/XercesString.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-// $Id$
-
-#include <ostream>
-
-#include "XercesString.h"
-using xercesc::XMLString;
-
-namespace Config_Handler
-{
-
-  XStr::XStr (const char* str)
-    : _wstr(0)
-  {
-    _wstr = XMLString::transcode(str);
-  }
-
-  XStr::XStr (XMLCh *wstr)
-    : _wstr(wstr)
-  {
-
-  }
-
-  XStr::XStr (const XMLCh* wstr)
-    : _wstr(0)
-  {
-    _wstr = XMLString::replicate(wstr);
-  }
-
-  XStr::XStr (const XStr &right)
-    : _wstr(0)
-  {
-    _wstr = XMLString::replicate(right._wstr);
-  }
-
-  XStr& XStr::operator= (const XStr& rhs)
-  {
-    if (&rhs == this)
-      return *this;
-    XStr temp (rhs);
-    ACE_Swap<XMLCh*>::swap (this->_wstr, temp._wstr);
-    return *this;
-  }
-
-  XStr::~XStr ()
-  {
-    if (_wstr)
-      XMLString::release(&_wstr);
-  }
-
-  const XMLCh* XStr::begin () const
-  {
-    return _wstr;
-  }
-
-  const XMLCh* XStr::end () const
-  {
-    return _wstr + size();
-  }
-
-  bool XStr::append(const XMLCh *tail)
-  {
-    int iTailLen = XMLString::stringLen(tail);
-    int iWorkLen = XMLString::stringLen(_wstr);
-    XMLCh *result = new XMLCh[ iWorkLen + iTailLen + 1 ];
-    bool bOK = result != 0;
-    if (bOK)
-      {
-        XMLCh *target = result;
-        XMLString::moveChars(target, _wstr, iWorkLen);
-        target += iWorkLen;
-        XMLString::moveChars(target, tail, iTailLen);
-        target += iTailLen;
-        *target++ = 0;
-        XMLString::release(&_wstr);
-        _wstr = result;
-      }
-    return bOK;
-  }
-
-  bool XStr::erase(const XMLCh *head, const XMLCh *tail)
-  {
-    bool bOK = head <= tail && head >= begin() && tail <= end();
-    if (bOK)
-      {
-        XMLCh *result = new XMLCh[ size() - (tail - head) + 1 ];
-        XMLCh *target = result;
-        bOK = target != NULL;
-        if (bOK)
-          {
-            const XMLCh *cursor = begin();
-
-            while (cursor != head) *target++ = *cursor++;
-            cursor = tail;
-            while ( cursor != end() ) *target++ = *cursor++;
-            *target ++ = 0;
-            XMLString::release(&_wstr);
-            _wstr = result;
-          }
-      }
-    return bOK;
-  }
-
-  int XStr::size () const
-  {
-    return XMLString::stringLen(_wstr);
-  }
-
-  XMLCh XStr::operator [] (const int i)
-  {
-    return _wstr[i];
-  }
-
-  const XMLCh XStr::operator [] (const int i) const
-  {
-    return _wstr[i];
-  }
-
-  bool XStr::operator== (const XMLCh* wstr) const
-  {
-    return XMLString::compareIString (wstr, this->_wstr) == 0;
-  }
-
-  bool operator== (const XStr& lhs, const XStr& rhs)
-  {
-    return XMLString::compareIString (lhs,rhs) == 0;
-  }
-
-  bool operator!= (const XStr& lhs, const XStr& rhs)
-  {
-    return !operator==(lhs, rhs);
-  }
-
-
-  std::ostream&
-  operator<< (std::ostream& o, XStr const& str)
-  {
-    char* s = XMLString::transcode (str);
-
-    o << s;
-
-    XMLString::release (&s); // idiots?
-    return o;
-  }
-
-}