ChangeLogTag:

34 files changed, 39 insertions, 3061 deletions

diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.h
deleted file mode 100644
index be6dbcd591f..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.h
+++ /dev/null
@@ -1,59 +0,0 @@
-//==================================================================
-/**
- *  @file  Any_Handler.h
- *
- *  $Id$
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef ANY_HANDLER_H
-#define ANY_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLString;
-using xercesc::DOMText;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /**
-     * @class Any_Handler
-     *
-     * @brief Handler class for <Deployment:Any> type
-     *
-     * This class defines handler methods to parse Implementation
-     * Dependency types in the descriptor files. The corresponding
-     * CORBA IDL type for the schema element is returned.
-     *
-     */
-    class Config_Handler_Export Any_Handler
-    {
-    public:
-      static void process_Any (DOMNodeIterator * iter,
-                               ::CORBA::Any &any_obj);
-      // process elements of type Deployment:Any in the descriptor files
-
-    private:
-      static void validate_ValueNode (DOMNodeIterator * iter,
-                                      const char * name);
-      // validate <value> .. </value> node present in the XML schema
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ID_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Basic_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Basic_Handler.h
deleted file mode 100644
index a8d31ea54f1..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/Basic_Handler.h
+++ /dev/null
@@ -1,93 +0,0 @@
-//==================================================================
-/**
- *  @file  Basic_Handler.h
- *
- *  $Id$
- *
- *  @author Emre Turkay <emre.turkay@vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef BASIC_HANDLER_H
-#define BASIC_HANDLER_H
-
-#include "Config.h"
-
-#include "ace/SString.h"
-#include "ace/Null_Mutex.h"
-#include "ace/Hash_Map_Manager.h"
-#include "Config_Handler_export.h"
-
-#include <xercesc/dom/DOM.hpp>
-
-using xercesc::DOMDocument;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNode;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class Basic_Handler
- *
- * @brief The base class for all the Handler classes
- *
- * This class provides the functionalities common to all handler classes.
- * Keeps variables for basic XML document handling,
- *       initialization/uninitialization,
- *       and required get/set methods.
- */
-
-class Config_Handler_Export Basic_Handler {
-public:
-  typedef ACE_Hash_Map_Manager<ACE_TString, int, ACE_Null_Mutex> REF_MAP;
-  typedef ACE_Hash_Map_Iterator<ACE_TString, int, ACE_Null_Mutex> REF_ITER;
-  typedef ACE_Hash_Map_Manager<int, ACE_TString, ACE_Null_Mutex> IDREF_MAP;
-
-  Basic_Handler (DOMDocument* doc, unsigned long filter_);
-
-  Basic_Handler (DOMNodeIterator* iter, bool release = false);
-
-  Basic_Handler (DOMDocument* doc, DOMNodeIterator* iter, 
-                 bool release = false);
-
-  ~Basic_Handler (void);
-
-  REF_MAP& id_map()
-  {
-    return this->id_map_;
-  }
-
-  void set_iter (DOMNodeIterator* iter)
-    {
-      iter_ = iter;
-    }
-
-  void set_doc (DOMDocument* doc)
-    {
-      doc_ = doc;
-    }
-
-protected:
-  DOMDocumentTraversal* traverse_;
-
-  DOMDocument* doc_;
-
-  DOMNode* root_;
-
-  unsigned long filter_;
-
-  DOMNodeIterator* iter_;
-
-  bool release_;
-
-  int index_;
-
-  REF_MAP id_map_;
-
-  IDREF_MAP idref_map_;
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#endif // BASIC_HANDLER_H
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CAD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CAD_Handler.h
deleted file mode 100644
index 515a59d70c2..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/CAD_Handler.h
+++ /dev/null
@@ -1,129 +0,0 @@
-//==================================================================
-/**
- *  @file  CAD_Handler.h
- *
- *  $Id$
- *
- *  @author Aniruddha S. Gokhale <gokhale@dre.vanderbilt.edu>
- */
-//=====================================================================
-#ifndef CAD_HANDLER_H
-#define CAD_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Basic_Handler.h"
-#include "Config_Handler_export.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Null_Mutex.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_main.h"
-#include "tao/Exception.h"
-#include "XercesString.h"
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/XMLURL.hpp>
-#include <xercesc/util/XMLUri.hpp>
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLUri;
-using xercesc::XMLURL;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMInputSource;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-using xercesc::DOMNamedNodeMap;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class CAD_Handler
- *
- * @brief Handler class for <ComponentAssemblyDescription> type 
- *
- * This class is within the Component Data Model subpackage of the
- * Deployment & Configuration package.
- *
- * This class defines handler methods to parse the aforementioned type
- * in the descriptor files. The corresponding CORBA IDL type for this
- * element is returned.
- */
-
-class Config_Handler_Export CAD_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  CAD_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  CAD_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  CAD_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the component assembly description
-  void process_ComponentAssemblyDescription (::Deployment::ComponentAssemblyDescription &cad);
-  
-  /// process instance
-  void process_instance (DOMNodeIterator* iter,
-                         Deployment::SubcomponentInstantiationDescription& sid);
-
-  /// process connection element
-  void process_connection (DOMNodeIterator* iter,
-                           Deployment::AssemblyConnectionDescription& acd);
-
-  /// process property element
-  void process_property (DOMNodeIterator* iter,
-                         Deployment::AssemblyPropertyMapping& acd);
-
-  /// process spe element
-  void process_spe (DOMNodeIterator* iter,
-                    Deployment::SubcomponentPortEndpoint& spe);
-
-  /// process spr element
-  void process_spr (DOMNodeIterator* iter,
-                    Deployment::SubcomponentPropertyReference& spr);
-
-  /// process CPD
-  void process_package (DOMNodeIterator* iter,
-                        Deployment::ComponentPackageDescription& sid_package);
-
-  /// update spe refs
-  void update_spe_refs (Deployment::ComponentAssemblyDescription& cad);
-
-  /// update spr refs
-  void update_spr_refs (Deployment::ComponentAssemblyDescription& cad);
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* CAD_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CEPE_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CEPE_Handler.h
deleted file mode 100644
index 18eabeff80e..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/CEPE_Handler.h
+++ /dev/null
@@ -1,62 +0,0 @@
-//==================================================================
-/**
- *  @file  CEPE_Handler.h
- *
- *  $Id$
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- */
-//=====================================================================
-#ifndef CEPE_HANDLER_H
-#define CEPE_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Config_Handler_export.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLString;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /**
-     * @class ID_Handler
-     *
-     * @brief Handler class for <ComponentExternalPortEndpoint> type
-     *
-     * This class defines handler methods to parse the aforementioned type
-     * in the descriptor files. The corresponding CORBA IDL type for this
-     * element is returned.
-     */
-
-    class Config_Handler_Export CEPE_Handler
-    {
-    public:
-      static void
-        process_ComponentExternalPortEndpoint (DOMNodeIterator * iter,
-                                               Deployment::ComponentExternalPortEndpoint &ret_struct);
-      // process <ComponentExternalPortEndPoint> definitions in the descriptor
-      // files
-
-    };
-  }
-
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CEPE_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CPK_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CPK_Handler.h
deleted file mode 100644
index 2c34055e08e..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/CPK_Handler.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//==================================================================
-/**
- *  @file  CPK_Handler.h
- *
- *  $Id$
- *
- *  @author Emre Turkay <emre.turkay@vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef CPK_HANDLER_H
-#define CPK_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLString;
-using xercesc::DOMText;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /**
-     * @class CPK_Handler
-     *
-     * @brief Handler class for <CCMComponentPortKind> type
-     *
-     * This class defines handler methods to parse Implementation
-     * Dependency types in the descriptor files. The corresponding
-     * CORBA IDL type for the schema element is returned.
-     *
-     */
-    class Config_Handler_Export CPK_Handler
-    {
-    public:
-      static void process_CCMComponentPortKind (DOMNodeIterator * iter,
-                                                Deployment::CCMComponentPortKind &kind);
-      // process elements of type CCMComponentPortKind definitions in
-      // the descriptor files
-
-    };
-  }
-
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CPK_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CPR_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CPR_Handler.h
deleted file mode 100644
index 8e9c8132f17..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/CPR_Handler.h
+++ /dev/null
@@ -1,87 +0,0 @@
-//==================================================================
-/**
- *  @file  CPR_Handler.h
- *
- *  $Id$
- *
- *  @author Aniruddha S. Gokhale <gokhale@dre.vanderbilt.edu>
- */
-//=====================================================================
-#ifndef CPR_HANDLER_H
-#define CPR_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Config_Handler_export.h"
-#include "ace/SString.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-#include "Basic_Handler.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class CPR_Handler
- *
- * @brief Handler class for <ComponentPackageReference> type 
- *
- * This class is within the Execution Data Model subpackage of the
- * Deployment & Configuration package.
- *
- * This class defines handler methods to parse the aforementioned type
- * in the descriptor files. The corresponding CORBA IDL type for this
- * element is returned.
- */
-
-class Config_Handler_Export CPR_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  CPR_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  CPR_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  CPR_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the component package reference
-  void process_ComponentPackageReference (::Deployment::ComponentPackageReference &cpr);
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* CPR_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Cap_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Cap_Handler.h
deleted file mode 100644
index f680961f75d..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/Cap_Handler.h
+++ /dev/null
@@ -1,97 +0,0 @@
-//==================================================================
-/**
- *  @file  Cap_Handler.h
- *
- *  $Id$
- *
- *  @author Emre Turkay <turkaye@dre.vanderbilt.edu>
- */
-//==================================================================
-
-#ifndef CAP_HANDLER_H
-#define CAP_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Null_Mutex.h"
-#include "Basic_Handler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_main.h"
-#include "tao/Exception.h"
-#include "XercesString.h"
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/XMLURL.hpp>
-#include <xercesc/util/XMLUri.hpp>
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLUri;
-using xercesc::XMLURL;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMInputSource;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-using xercesc::DOMNamedNodeMap;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class CAP_Handler
- *
- * @brief Handler class for <Capability> type
- *
- * This class defines handler methods to parse Capability
- * types in the descriptor files. The corresponding
- * CORBA IDL type for the schema element is returned.
- *
- */
-class Config_Handler_Export CAP_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  CAP_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  CAP_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  CAP_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  void process_Capability (Deployment::Capability &ret_struct);
-  // process elements of type Capability definitions in
-  // the descriptor files
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* ID_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog b/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog
index 0e08c2b023a..50db79faaeb 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog
@@ -1,3 +1,42 @@
+Wed Sep  8 17:19:41 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+ 	* DAnCE/Config_Handlers/Any_Handler.h:
+	* DAnCE/Config_Handlers/Basic_Handler.h:
+	* DAnCE/Config_Handlers/CAD_Handler.h:
+	* DAnCE/Config_Handlers/CEPE_Handler.h:
+	* DAnCE/Config_Handlers/CPK_Handler.h:
+	* DAnCE/Config_Handlers/CPR_Handler.h:
+	* DAnCE/Config_Handlers/Cap_Handler.h:
+	* DAnCE/Config_Handlers/CompImplDesc_Handler.h:
+	* DAnCE/Config_Handlers/CompIntrDesc_Handler.h:
+	* DAnCE/Config_Handlers/CompPkgDesc_Handler.h:
+	* DAnCE/Config_Handlers/Config_Error_Handler.h:
+	* DAnCE/Config_Handlers/DT_Handler.h:
+	* DAnCE/Config_Handlers/DnC_Dump.h:
+	* DAnCE/Config_Handlers/Domain_Handler.h:
+	* DAnCE/Config_Handlers/ERE_Handler.h:
+	* DAnCE/Config_Handlers/IAD_Handler.h:
+	* DAnCE/Config_Handlers/ID_Handler.h:
+	* DAnCE/Config_Handlers/IR_Handler.h:
+	* DAnCE/Config_Handlers/MID_Handler.h:
+	* DAnCE/Config_Handlers/NIA_Handler.h:
+	* DAnCE/Config_Handlers/PCI_Handler.h:
+	* DAnCE/Config_Handlers/PC_Handler.h:
+	* DAnCE/Config_Handlers/Plan_Handler.h:
+	* DAnCE/Config_Handlers/Process_Element.h:
+	* DAnCE/Config_Handlers/Property_Handler.h:
+	* DAnCE/Config_Handlers/RS_Handler.h:
+	* DAnCE/Config_Handlers/RUK_Handler.h:
+	* DAnCE/Config_Handlers/Requirement_Handler.h:
+	* DAnCE/Config_Handlers/SPK_Handler.h:
+	* DAnCE/Config_Handlers/SP_Handler.h:
+	* DAnCE/Config_Handlers/TPD_Handler.h:
+	* DAnCE/Config_Handlers/Utils.h:
+	* DAnCE/Config_Handlers/XercesString.h:
+	  
+  	  Removed all the old files from this branch. This is simply
+	  confusing to see what is usable and what is not. 	  
+
 Wed Sep  8 17:09:51 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
  	* DAnCE/Config_Handlers/Any_Handler.cpp:
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CompImplDesc_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CompImplDesc_Handler.h
deleted file mode 100644
index c7918732628..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/CompImplDesc_Handler.h
+++ /dev/null
@@ -1,87 +0,0 @@
-//==================================================================
-/**
- *  @file  CompImplDesc_Handler.h
- *
- *  $Id$
- *
- *  @author Aniruddha S. Gokhale <gokhale@dre.vanderbilt.edu>
- */
-//=====================================================================
-#ifndef CompImplDesc_HANDLER_H
-#define CompImplDesc_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-#include "Basic_Handler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SString.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class CompImplDesc_Handler
- *
- * @brief Handler class for <ComponentImplementationDescription> type
- *
- * This class is within the Execution Data Model subpackage of the
- * Deployment & Configuration package.
- *
- * This class defines handler methods to parse the aforementioned type
- * in the description files. The corresponding CORBA IDL type for this
- * element is returned.
- */
-
-class Config_Handler_Export CompImplDesc_Handler: public Basic_Handler
-{
- public:
-
-  /// constructor
-  CompImplDesc_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  CompImplDesc_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  CompImplDesc_Handler (DOMDocument* doc,
-                        DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the monolithic deployment description
-  void process_ComponentImplementationDescription (::Deployment::ComponentImplementationDescription &cid);
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* CompImplDesc_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CompIntrDesc_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CompIntrDesc_Handler.h
deleted file mode 100644
index 7c4e2e22898..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/CompIntrDesc_Handler.h
+++ /dev/null
@@ -1,89 +0,0 @@
-//$Id$
-
-#ifndef COMPINTRDESC_HANDLER_H
-#define COMPINTRDESC_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Null_Mutex.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_main.h"
-#include "tao/Exception.h"
-#include "XercesString.h"
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/XMLURL.hpp>
-#include <xercesc/util/XMLUri.hpp>
-
-#include "Basic_Handler.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLUri;
-using xercesc::XMLURL;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMInputSource;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-using xercesc::DOMNamedNodeMap;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-class Config_Handler_Export CompIntrDesc_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  CompIntrDesc_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  CompIntrDesc_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { };
-
-  /// constructor
-  CompIntrDesc_Handler (DOMDocument* doc, 
-                        DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { };
-
-  /// Process the component package description
-  void process_ComponentInterfaceDescription (::Deployment::ComponentInterfaceDescription &CompIntrDesc);
-
-protected:
-  /// process port element
-  void process_port (DOMNodeIterator* iter,
-                     Deployment::ComponentPortDescription& port);
-
-  /// process component property element
-  void process_comp_property (DOMNodeIterator* iter,
-                              Deployment::ComponentPropertyDescription& property);
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif // COMPINTRDESC_HANDLER_H
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CompPkgDesc_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/CompPkgDesc_Handler.h
deleted file mode 100644
index 9cd81ffa5f5..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/CompPkgDesc_Handler.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//==================================================================
-/**
- *  @file  CompPkgDesc_Handler.h
- *
- *  $Id$
- *
- *  @author George Edwards <g.edwards@vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef COMPPKGDESC_HANDLER_H
-#define COMPPKGDESC_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SString.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-#include "Basic_Handler.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class CompPkgDesc_Handler
- *
- * @brief Handler class for <ComponentPackageDescription> type 
- *
- * This class is within the Component Data Model subpackage of the
- * Deployment & Configuration package.
- *
- * This class defines handler methods to parse the aforementioned type
- * in the description files. The corresponding CORBA IDL type for this
- * element is returned.
- */
-
-class Config_Handler_Export CompPkgDesc_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  CompPkgDesc_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  CompPkgDesc_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  CompPkgDesc_Handler (DOMDocument* doc, 
-                       DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the component package description
-  void process_ComponentPackageDescription (::Deployment::ComponentPackageDescription &comppkgdesc);
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* COMPPKGDESC_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Config_Error_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Config_Error_Handler.h
deleted file mode 100644
index ba1b8b5514c..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/Config_Error_Handler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// $Id$
-
-#ifndef CONFIG_ERROR_HANDLER_H
-#define CONFIG_ERROR_HANDLER_H
-
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include <xercesc/dom/DOMErrorHandler.hpp>
-#include "Config_Handler_export.h"
-
-using xercesc::DOMErrorHandler;
-using xercesc::DOMError;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    class Config_Handler_Export Config_Error_Handler : public DOMErrorHandler
-    {
-    public:
-
-      Config_Error_Handler ();
-
-      ~Config_Error_Handler ();
-
-      bool handleError (const DOMError& domError);
-
-      void resetErrors ();
-
-      bool getErrors() const;
-
-    private :
-      // Disallow copying
-      Config_Error_Handler (const Config_Error_Handler&);
-      Config_Error_Handler& operator= (const Config_Error_Handler&);
-
-      bool errors_;
-
-    };
-
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CONFIG_ERROR_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/DT_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/DT_Handler.h
deleted file mode 100644
index 8cd04c66650..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/DT_Handler.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//==================================================================
-/**
- *  @file  DT_Handler.h
- *
- *  $Id$
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef DT_HANDLER_H
-#define DT_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "Config_Handler_export.h"
-#include "tao/ORB.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLString;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /**
-     * @class DT_Handler
-     *
-     * @brief Handler class for <type> tag
-     *
-     * This class defines handler methods to parse the aforementioned type
-     * in the descriptor files. The corresponding CORBA IDL mapped type in this
-     * a CORBA::Typecode is created and returned. Dynamic creation of typecodes
-     * also requires operations defined on the ORB interface, hence the
-     * process_DataType requires an ORB_ptr as a formal parameter.
-     */
-
-    class Config_Handler_Export DT_Handler
-    {
-    public:
-      static void process_DataType (DOMNodeIterator * iter,
-                                    ::CORBA::TypeCode_ptr &type,
-                                    ::CORBA::ORB_ptr orb);
-      // process <type> definitions in the descriptor files
-    private:
-      static void process_basic_tc (DOMNodeIterator * iter,
-                                    ::CORBA::TypeCode_ptr &type);
-      // process <Deployment:TCKind> definitions in the descriptor
-      // files
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* DT_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.h b/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.h
deleted file mode 100644
index b20b98469e9..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/DnC_Dump.h
+++ /dev/null
@@ -1,176 +0,0 @@
-//==================================================================
-/**
- *  @file  DnC_Dump.h
- *
- *  $Id$
- *
- *  @author Gan Deng <gan.deng@vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef DNC_DUMP_H
-#define DNC_DUMP_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-namespace Deployment
-{
-  /**
-   * @class DnC_Dump
-   *
-   * @brief This class defines a set of overloaded "dump" methods to print
-   * the contents of various IDL data types, which passed as input.
-   */
-  class Config_Handler_Export DnC_Dump
-    {
-/*
- *  If the compiler has broken nested templates exclude dumping functionality.
- */
-#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES
-
-    public:
-      /// Dump functions for CORBA sequences
-      static void dump (const char* caption,
-                        const ::CORBA::StringSeq &str_seq);
-
-      template <typename SEQUENCE>
-        static void dump_sequence (const char* caption, const SEQUENCE &seq);
-
-      template <typename ROOT, typename SEQUENCE,
-                typename DATA_TYPE, typename CLASS>
-        static void dump_ref_seq (const char* caption, SEQUENCE& seq,
-                                  const char* root, DATA_TYPE CLASS::*data);
-
-      template <typename ROOT, typename REFERENCE, typename DATA_TYPE,
-                typename CLASS>
-        static void dump_ref (const char* caption, REFERENCE& ref,
-                              const char* root, DATA_TYPE CLASS::*data);
-
-      static void dump (const char* caption, const TAO_String_Manager& str);
-
-      static void dump (const char* caption, const CORBA::Boolean& val);
-
-      /// A whole slew of overloaded dump routines for different IDL data types.
-
-      static void dump(const Deployment::SatisfierProperty &sp);
-
-      static void dump (const Deployment::SharedResource& sr);
-
-      static void dump (const Deployment::Node& node);
-
-      static void dump (const Deployment::Resource& resource);
-
-      static void dump (const Deployment::Interconnect& conn);
-
-      static void dump (const Deployment::Bridge& bridge);
-
-      static void dump (const ::Deployment::Property &property);
-
-      static void dump (const ::Deployment::AssemblyConnectionDescription &acd);
-
-      static void dump (const ::Deployment::AssemblyPropertyMapping &apm);
-
-      static void dump (const ::Deployment::ComponentPackageDescription
-                             &comppkgdesc);
-
-      static void dump (const ::Deployment::ComponentPortDescription
-                             &compportdesc);
-
-      static void dump (const ::Deployment::ComponentPropertyDescription
-                             &comppropdesc);
-
-      static void dump (const ::Deployment::MonolithicImplementationDescription
-                             &mid);
-
-      static void dump (const ::Deployment::PackageConfiguration &pc);
-
-      static void dump (const ::Deployment::PackagedComponentImplementation
-                             &pci);
-
-      static void dump (const ::Deployment::SubcomponentPortEndpoint &spe);
-
-      static void dump (const ::Deployment::Requirement &requirement);
-
-      static void dump (const ::Deployment::ComponentExternalPortEndpoint
-                             &cepe);
-
-      static void dump (const ::Deployment::ComponentPackageReference &cpr);
-
-      static void dump (const ::Deployment::ComponentImplementationDescription
-                             &cid);
-
-      static void dump (const ::Deployment::SubcomponentInstantiationDescription
-                             &sid);
-
-      static void dump (const ::Deployment::NamedImplementationArtifact
-                             &named_implementation);
-
-      static void dump (const ::Deployment::ComponentInterfaceDescription &cid);
-
-      static void dump (const ::Deployment::SubcomponentPropertyReference
-                             &scpr);
-
-      static void dump (const ::Deployment::ExternalReferenceEndpoint &ere);
-
-      static void dump (const ::Deployment::Domain &domain);
-
-      static void dump (const ::Deployment::Capability &capability);
-
-      static void dump (const ::Deployment::ImplementationArtifactDescription
-                             &iad);
-
-      static void dump (const ::Deployment::ImplementationRequirement &ir);
-
-      static void dump(const Deployment::ResourceUsageKind &ruk);
-
-      static void dump(const Deployment::DeploymentPlan &plan);
-
-      static void dump(const Deployment::MonolithicDeploymentDescription &mdd);
-
-      static void dump(const Deployment::InstanceDeploymentDescription &idd);
-
-      static void dump(const Deployment::PlanConnectionDescription &pcd);
-
-      static void dump(const Deployment::PlanPropertyMapping &ppm);
-
-      static void dump(const Deployment::ImplementationDependency &id);
-
-      static void dump(const Deployment::ArtifactDeploymentDescription &add);
-
-      static void dump(const Deployment::InstanceResourceDeploymentDescription
-                             &irdd);
-
-      static void dump(const PlanSubcomponentPortEndpoint &pspe);
-
-      static void dump(const ConnectionResourceDeploymentDescription &crdd);
-
-      static void dump(const PlanSubcomponentPropertyReference &pspr);
-
-      static void dump(const ResourceDeploymentDescription &rdd);
-
-      static void dump (const ::Deployment::ComponentAssemblyDescription& cad);
-
-      static void dump (const Deployment::RequirementSatisfier& rs);
-
-    private:
-      static void dump (const ::CORBA::Any &any);
-      // Helper function to print an Any
-
-#else // ACE_HAS_BROKEN_NESTED_TEMPLATES
-    public:
-      static void dump(const Deployment::DeploymentPlan &plan) { }
-
-#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES
-    };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* DNC_DUMP_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Domain_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Domain_Handler.h
deleted file mode 100644
index 327bfe54bba..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/Domain_Handler.h
+++ /dev/null
@@ -1,127 +0,0 @@
-//==================================================================
-/**
- *  @file  Domain_Handler.h
- *
- *  $Id$
- *
- *  @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu>
- */
-//=====================================================================
-#ifndef DOMAIN_HANDLER_H
-#define DOMAIN_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-#include "Basic_Handler.h"
-#include "XercesString.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_main.h"
-#include "tao/Exception.h"
-#include "XercesString.h"
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/util/XMLURL.hpp>
-#include <xercesc/util/XMLUri.hpp>
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLUri;
-using xercesc::XMLURL;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMInputSource;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMNodeFilter;
-using xercesc::DOMNamedNodeMap;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class Domain_Handler
- *
- * @brief Handler class for <Domain> type
- *
- * This class is within the Target Data Model subpackage of the
- * Deployment & Configuration package.
- *
- * This class defines handler methods to parse the aforementioned type
- * in the description files. The corresponding CORBA IDL type for this
- * element is returned.
- */
-
-class Config_Handler_Export Domain_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  Domain_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  Domain_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  Domain_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the Domain type
-  void process_domain (Deployment::Domain& domain);
-
-  /// process the node attribute
-  void process_node (DOMNodeIterator* iter,
-                     Deployment::Node& domain_node);
-
-  /// process the node attribute
-  void process_bridge (DOMNodeIterator* iter,
-                       Deployment::Bridge& domain_bridge);
-
-  /// process the node attribute
-  void process_interconnect (DOMNodeIterator* iter,
-                             Deployment::Interconnect& domain_ic);
-
-  /// process the resource attribute
-  void process_resource (DOMNodeIterator* iter,
-                         Deployment::Resource& domain_resource);
-
-  /// process the node attribute
-  void process_sr (DOMNodeIterator* iter,
-                   Deployment::SharedResource& domain_sr);
-
-  /// update node refs
-  void update_node_refs (Deployment::Domain& domain);
-
-  /// update ic refs
-  void update_ic_refs (Deployment::Domain& domain);
-
-  /// update bridge refs
-  void update_bridge_refs (Deployment::Domain& domain);
-
-  /// update sr refs
-  void update_sr_refs (Deployment::Domain& domain);
-
-  /// process IDREFs
-  void process_refs (DOMNamedNodeMap* named_node_map);
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* DOMAIN_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ERE_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/ERE_Handler.h
deleted file mode 100644
index 272bd8ecc63..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/ERE_Handler.h
+++ /dev/null
@@ -1,63 +0,0 @@
-
-//==================================================================
-/**
- *  @file  ERE_Handler.h
- *
- *  $Id$
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef ERE_HANDLER_H
-#define ERE_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Config_Handler_export.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLString;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /**
-     * @class ERE_Handler
-     *
-     * @brief Handler class for <ExternalReferenceEndpoint> tag
-     *
-     * This class defines handler methods to parse the aforementioned type
-     * in the descriptor files. The corresponding CORBA IDL type for this
-     * element is returned.
-     */
-
-    class Config_Handler_Export ERE_Handler
-    {
-    public:
-      static void  
-        process_ExternalReferenceEndpoint (DOMNodeIterator * iter,
-                                           Deployment::ExternalReferenceEndpoint &ret_struct);
-      // process <ExternalReferenceEndpoint> definitions in the descriptor
-      // files
-
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ERE_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/IAD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/IAD_Handler.h
deleted file mode 100644
index 8cbfabd510e..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/IAD_Handler.h
+++ /dev/null
@@ -1,99 +0,0 @@
-//==================================================================
-/**
- *  @file  IAD_Handler.h
- *
- *  $Id$
- *
- *  @author Emre Turkay  <turkaye@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef IAD_HANDLER_H
-#define IAD_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Null_Mutex.h"
-#include "Basic_Handler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_main.h"
-#include "tao/Exception.h"
-#include "XercesString.h"
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/XMLURL.hpp>
-#include <xercesc/util/XMLUri.hpp>
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLUri;
-using xercesc::XMLURL;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMInputSource;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-using xercesc::DOMNamedNodeMap;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class IAD_Handler
- *
- * @brief Handler class for <ImplementationArtifactDescription> tag
- *
- * This class defines handler methods to parse the
- * ImplementationArtifactDescription type
- * in the descriptor files. The corresponding CORBA IDL type for this
- * element is returned.
- */
-
-class Config_Handler_Export IAD_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  IAD_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  IAD_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  IAD_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the component package description
-  void process_ImplementationArtifactDescription
-    (::Deployment::ImplementationArtifactDescription &iad);
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* IAD_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.h
deleted file mode 100644
index c2142cfb706..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/ID_Handler.h
+++ /dev/null
@@ -1,64 +0,0 @@
-//==================================================================
-/**
- *  @file  ID_Handler.h
- *
- *  $Id$
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef ID_HANDLER_H
-#define ID_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLString;
-using xercesc::DOMText;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /**
-     * @class ID_Handler
-     *
-     * @brief Handler class for <ImplementationDependency> type
-     *
-     * This class defines handler methods to parse Implementation
-     * Dependency types in the descriptor files. The corresponding
-     * CORBA IDL type for the schema element is returned.
-     *
-     * KNOWN ISSUE:
-     * The IDL mapping for this type defines a struct containing a
-     * string type. However, the schema defines an unbounded string.
-     * Currently, this Handler handles what the IDL requires as this is
-     * valid via the schema definition also.
-     *
-     */
-    class Config_Handler_Export ID_Handler
-    {
-    public:
-      static void
-        process_ImplementationDependency (DOMNodeIterator * iter,
-                                          Deployment::ImplementationDependency &ret_struct);
-      // process elements of type Implementation Dependency definitions in
-      // the descriptor files
-
-    };
-  }
-
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ID_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/IR_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/IR_Handler.h
deleted file mode 100644
index d7ff20f1c99..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/IR_Handler.h
+++ /dev/null
@@ -1,106 +0,0 @@
-//==================================================================
-/**
- *  @file  IR_Handler.h
- *
- *  $Id$
- *
- *  @author Emre Turkay  <turkaye@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef IR_HANDLER_H
-#define IR_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-#include "Basic_Handler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SString.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-#include "RUK_Handler.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class IR_Handler
- *
- * @brief Handler class for <ImplementationRequirement> type
- *
- * This class defines handler methods to parse Implementation
- * Requirement types in the descriptor files. The corresponding
- * CORBA IDL type for the schema element is returned.
- *
- */
-
-class Config_Handler_Export IR_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  IR_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  IR_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  IR_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the package configuration
-  void process_ImplementationRequirement (::Deployment::ImplementationRequirement &ir);
-
-protected:
-  /// Process the resourceUsage attribute
-  void process_resourceUsage (const XMLCh* name, ::Deployment::ImplementationRequirement &ir);
-
-  /// Process the resourcePort attribute
-  void process_resourcePort (const XMLCh* name, ::Deployment::ImplementationRequirement &ir);
-
-  /// Process the componentPort attribute
-  void process_componentPort (const XMLCh* name, ::Deployment::ImplementationRequirement &ir);
-
-  /*
-   * Derived from Requirement
-   */
-
-  /// Process the label attribute
-  void process_name (const XMLCh* name, ::Deployment::ImplementationRequirement &ir);
-
-  /// Process the label attribute
-  void process_resourceType (const XMLCh* name, ::Deployment::ImplementationRequirement &ir);
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* IR_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/MID_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/MID_Handler.h
deleted file mode 100644
index 4c99ef81621..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/MID_Handler.h
+++ /dev/null
@@ -1,116 +0,0 @@
-// $Id$
-
-#ifndef MID_HANDLER_H
-#define MID_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Null_Mutex.h"
-#include "Basic_Handler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_main.h"
-#include "tao/Exception.h"
-#include "XercesString.h"
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/XMLURL.hpp>
-#include <xercesc/util/XMLUri.hpp>
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLUri;
-using xercesc::XMLURL;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMInputSource;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-using xercesc::DOMNamedNodeMap;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class MID_Handler
- *
- * @brief Handler class for <MonolithicImplementationDescription> type
- *
- * This class defines handler methods to parse Monolithic Implementation
- * Descroption types in the descriptor files. The corresponding
- * CORBA IDL type for the schema element is returned.
- *
- */
-
-class Config_Handler_Export MID_Handler: public Basic_Handler
-{
-public:
-
-  MID_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  MID_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  MID_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  void process_MonolithicImplementationDescription (::Deployment::MonolithicImplementationDescription &mid);
-
-protected:
-  /// process exec parameter element
-  void process_exec_parameter_element (DOMNode* node,
-                                       DOMDocument* doc, DOMNodeIterator* iter,
-                                       Deployment::MonolithicImplementationDescription& mid);
-
-  /// process attributes for property element
-  void process_attributes_for_property (DOMNamedNodeMap* named_node_map,
-                                        DOMDocument* doc,
-                                        DOMNodeIterator* iter,
-                                        int value,
-                                        Deployment::Property& ccd_property);
-
-  /// process attributes for deploy requirement
-  void process_attributes_for_deploy_requirement (DOMNamedNodeMap* nm,
-                                                  DOMDocument* doc,
-                                                  DOMNodeIterator* iter,
-                                                  int value,
-                                                  Deployment::ImplementationRequirement& req);
-
-  /// process attributes for NIA
-  void process_attributes_for_nia (DOMNamedNodeMap* nm,
-                                   DOMDocument* doc,
-                                   DOMNodeIterator* iter,
-                                   int value,
-                                   Deployment::NamedImplementationArtifact& nia);
-
-  /// process IDREFS
-  void process_refs (DOMNamedNodeMap* named_node_map);
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* MID_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/NIA_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/NIA_Handler.h
deleted file mode 100644
index cc3b1fd2a11..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/NIA_Handler.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//==================================================================
-/**
- *  @file  NIA_Handler.h
- *
- *  $Id$
- *
- *  @author Emre Turkay  <turkaye@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef NIA_HANDLER_H
-#define NIA_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-#include "Basic_Handler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SString.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class NIA_Handler
- *
- * @brief Handler class for <NamedImplementationArtifact> type
- *
- * This class defines handler methods to parse Named Implementation
- * Artifact types in the descriptor files. The corresponding
- * CORBA IDL type for the schema element is returned.
- *
- */
-
-class Config_Handler_Export NIA_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  NIA_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  NIA_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  NIA_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the package configuration
-  void process_NamedImplementationArtifact (::Deployment::NamedImplementationArtifact &nia);
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* NIA_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/PCI_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/PCI_Handler.h
deleted file mode 100644
index 95cefcf5a90..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/PCI_Handler.h
+++ /dev/null
@@ -1,87 +0,0 @@
-//==================================================================
-/**
- *  @file  PCI_Handler.h
- *
- *  $Id$
- *
- *  @author George Edwards <g.edwards@vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef PCI_HANDLER_H
-#define PCI_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SString.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-#include "Basic_Handler.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class PCI_Handler
- *
- * @brief Handler class for <PackagedComponentImplementation> type 
- *
- * This class is within the Component Data Model subpackage of the
- * Deployment & Configuration package.
- *
- * This class defines handler methods to parse the aforementioned type
- * in the description files. The corresponding CORBA IDL type for this
- * element is returned.
- */
-
-class Config_Handler_Export PCI_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  PCI_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  PCI_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  PCI_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the package configuration
-  void process_PackagedComponentImplementation (::Deployment::PackagedComponentImplementation &pci);
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* PCI_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/PC_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/PC_Handler.h
deleted file mode 100644
index 9dfa24dd354..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/PC_Handler.h
+++ /dev/null
@@ -1,91 +0,0 @@
-//==================================================================
-/**
- *  @file  PC_Handler.h
- *
- *  $Id$
- *
- *  @author George Edwards <g.edwards@vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef PC_HANDLER_H
-#define PC_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-#include "Basic_Handler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SString.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class PC_Handler
- *
- * @brief Handler class for <PackageConfiguration> type 
- *
- * This class is within the Component Data Model subpackage of the
- * Deployment & Configuration package.
- *
- * This class defines handler methods to parse the aforementioned type
- * in the description files. The corresponding CORBA IDL type for this
- * element is returned.
- */
-
-class Config_Handler_Export PC_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  PC_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  PC_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  PC_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the package configuration
-  void process_PackageConfiguration (::Deployment::PackageConfiguration &pc);
-
-  /// Process the specializedConfig attribute
-  void process_specializedConfig
-  (const XMLCh* specializedConfig, ::Deployment::PackageConfiguration &pc);
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* PC_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Plan_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Plan_Handler.h
deleted file mode 100644
index c4994e4255d..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/Plan_Handler.h
+++ /dev/null
@@ -1,251 +0,0 @@
-//==================================================================
-/**
- *  @file  Plan_Handler.h
- *
- *  $Id$
- *
- *  @author Jaiganesh Balasubramanian <jai@dre.vanderbilt.edu>
- */
-//=====================================================================
-#ifndef PLAN_HANDLER_H
-#define PLAN_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Basic_Handler.h"
-#include "Config_Handler_export.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Null_Mutex.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_main.h"
-#include "tao/Exception.h"
-#include "XercesString.h"
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/XMLURL.hpp>
-#include <xercesc/util/XMLUri.hpp>
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLUri;
-using xercesc::XMLURL;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMInputSource;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-using xercesc::DOMNamedNodeMap;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class Plan_Handler
- *
- * @brief Handler class for <DeploymentPlan> type
- *
- */
-
-class Config_Handler_Export Plan_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  Plan_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  Plan_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  Plan_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the plan type
-  void process_plan (Deployment::DeploymentPlan& plan);
-
-  /// process cid
-  void process_ccd (DOMNodeIterator* iter,
-                    Deployment::ComponentInterfaceDescription& cid);
-
-  /// process pspr
-  void process_pspr (DOMNodeIterator* iter,
-                     Deployment::PlanSubcomponentPropertyReference& pspr);
-
-  /// process pspe
-  void process_pspe (DOMNodeIterator* iter,
-                     Deployment::PlanSubcomponentPortEndpoint& pspe);
-
-  /// process add
-  void process_add (DOMNodeIterator* iter,
-                    Deployment::ArtifactDeploymentDescription& add);
-
-  /// process con
-  void process_pcd (DOMNodeIterator* iter,
-                    Deployment::PlanConnectionDescription& con);
-
-  /// process external property
-  void process_ppm (DOMNodeIterator* iter,
-                    Deployment::PlanPropertyMapping& ppm);
-
-  /// process idd
-  void process_idd (DOMNodeIterator* iter,
-                    Deployment::InstanceDeploymentDescription& idd);
-
-  /// process mdd
-  void process_mdd (DOMNodeIterator* iter,
-                    Deployment::MonolithicDeploymentDescription& mdd);
-
-  /// process rdd
-  void process_rdd (DOMNodeIterator* iter,
-                    Deployment::ResourceDeploymentDescription& rdd);
-
-  /// process crdd
-  void process_crdd (DOMNodeIterator* iter,
-                     Deployment::ConnectionResourceDeploymentDescription& crdd);
-  /// process irdd
-  void process_irdd (DOMNodeIterator* iter,
-                     Deployment::InstanceResourceDeploymentDescription &irdd);
-
-  /// process the add name
-  void process_add_name (const XMLCh* name,
-                         Deployment::ArtifactDeploymentDescription& add);
-
-  /// process the pspr property name
-  void process_pspr_prop_name (const XMLCh* name,
-                               Deployment::PlanSubcomponentPropertyReference& pspr);
-
-  /// process the pspe port name
-  void process_pspe_port_name (const XMLCh* name,
-                               Deployment::PlanSubcomponentPortEndpoint& pspe);
-
-  /// process the pspe provider
-  void process_pspe_provider (const XMLCh* value,
-                              Deployment::PlanSubcomponentPortEndpoint& pspe);
-
-  /// process the idd name
-  void process_idd_name (const XMLCh* name,
-                         Deployment::InstanceDeploymentDescription& idd);
-
-  /// process the ppm  name
-  void process_ppm_name (const XMLCh* name,
-                         Deployment::PlanPropertyMapping& ppm);
-
-  /// process the ppm external name
-  void process_ppm_ext_name (const XMLCh* name,
-                             Deployment::PlanPropertyMapping& ppm);
-
-  /// process the idd node
-  void process_idd_node (const XMLCh* node,
-                         Deployment::InstanceDeploymentDescription& idd);
-
-  /// process the idd source
-  void process_idd_source (const XMLCh* source,
-                           Deployment::InstanceDeploymentDescription& idd);
-
-  /// process the add location
-  void process_add_location (const XMLCh* location,
-                             Deployment::ArtifactDeploymentDescription& add);
-
-  /// process the add source
-  void process_add_source (const XMLCh* source,
-                           Deployment::ArtifactDeploymentDescription& add);
-
-  /// process the add node
-  void process_add_node (const XMLCh* node,
-                         Deployment::ArtifactDeploymentDescription& add);
-
-  /// process the mdd source
-  void process_mdd_source (const XMLCh* source,
-                           Deployment::MonolithicDeploymentDescription& mdd);
-
-  /// process the ppm source
-  void process_ppm_source (const XMLCh* source,
-                           Deployment::PlanPropertyMapping& ppm);
-
-  /// process the pcd source
-  void process_pcd_source (const XMLCh* source,
-                           Deployment::PlanConnectionDescription& pcd);
-
-  /// process the pcd name
-  void process_pcd_name (const XMLCh* name,
-                         Deployment::PlanConnectionDescription& pcd);
-
-  /// process the add node
-  void process_mdd_name (const XMLCh* name,
-                         Deployment::MonolithicDeploymentDescription& mdd);
-
-  /// process the rdd req name
-  void process_rdd_req_name (const XMLCh* name,
-                             Deployment::ResourceDeploymentDescription& rdd);
-
-  /// process the rdd res name
-  void process_rdd_res_name (const XMLCh* name,
-                             Deployment::ResourceDeploymentDescription& rdd);
-
-  /// process the irdd res name
-  void process_irdd_res_name (const XMLCh* name,
-                              Deployment::InstanceResourceDeploymentDescription &irdd);
-
-  /// process the crdd res name
-  void process_crdd_res_name (const XMLCh* name,
-                              Deployment::ConnectionResourceDeploymentDescription& crdd);
-
-  /// process the crdd req name
-  void process_crdd_req_name (const XMLCh* name,
-                              Deployment::ConnectionResourceDeploymentDescription& crdd);
-
-  /// process the crdd target name
-  void process_crdd_target_name (const XMLCh* name,
-                                 Deployment::ConnectionResourceDeploymentDescription& crdd);
-
-  /// process the irdd req name
-  void process_irdd_req_name (const XMLCh* name,
-                              Deployment::InstanceResourceDeploymentDescription &irdd);
-
-  /// process the irdd res usage
-  void process_irdd_res_usage (const XMLCh* name,
-                               Deployment::InstanceResourceDeploymentDescription &irdd);
-
-  /// process references
-  void process_refs (DOMNamedNodeMap* named_node_map);
-
-  /// update mdd refs
-  void update_mdd_refs (Deployment::DeploymentPlan& plan);
-
-  /// update idd refs
-  void update_idd_refs (Deployment::DeploymentPlan& plan);
-
-  /// update pspe refs
-  void update_pspe_refs (Deployment::DeploymentPlan& plan);
-
-  /// update pspr refs
-  void update_pspr_refs (Deployment::DeploymentPlan& plan);
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* PLAN_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Process_Element.h b/TAO/CIAO/DAnCE/Config_Handlers/Process_Element.h
deleted file mode 100644
index bec9e523fe4..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/Process_Element.h
+++ /dev/null
@@ -1,192 +0,0 @@
-//==================================================================
-/**
- *  @file Process_Element.h
- *
- *  $Id$
- *
- *  @author Emre Turkay  <turkaye@dre.vanderbilt.edu>
- *          Jaiganesh Balasubramanian  <jai@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef PROCESS_ELEMENT_H
-#define PROCESS_ELEMENT_H
-
-#include "ciao/DeploymentC.h"
-#include "Config.h"
-#include "Basic_Handler.h"
-#include "Config_Handler_export.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Null_Mutex.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_main.h"
-#include "tao/Exception.h"
-#include "XercesString.h"
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/XMLURL.hpp>
-#include <xercesc/util/XMLUri.hpp>
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLUri;
-using xercesc::XMLURL;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMInputSource;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-using xercesc::DOMNamedNodeMap;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-// ID map type definition
-typedef ACE_Hash_Map_Manager<ACE_TString, int, ACE_Null_Mutex> REF_MAP;
-typedef ACE_Hash_Map_Iterator<ACE_TString, int, ACE_Null_Mutex> REF_ITER;
-typedef ACE_Hash_Map_Manager<int, ACE_TString, ACE_Null_Mutex> IDREF_MAP;
-
-template <typename DATA>
-class Process_Function 
-{
-public:
-  virtual void call(DOMDocument*, DOMNodeIterator*, DATA&)=0;
-
-  void operator() (DOMDocument* doc, DOMNodeIterator* iter, DATA& data)
-  {
-    call(doc, iter, data);
-  }
-};
-
-/*
- *  Wrapper class for the process member functions.
- */
-
-template <typename OBJ, typename DATA>
-class Process_Member_Function: public Process_Function<DATA> 
-{
-public:
-  typedef void (OBJ::*func_type) (DOMNodeIterator*, DATA&);
-  typedef DATA data_type;
-
-  Process_Member_Function(OBJ& obj, func_type f)
-    : obj_(&obj), f_(f)
-  {
-  }
-
-  Process_Member_Function(OBJ* obj, func_type f)
-    : obj_(obj), f_(f)
-  {
-  }
-
-  virtual void call(DOMDocument* doc, DOMNodeIterator* iter, DATA& data)
-  {
-    obj_->set_doc (doc);
-    obj_->set_iter (iter);
-    (obj_->*f_) (iter, data);
-  }
-
-private:
-  OBJ* obj_;
-  func_type f_;
-};
-
-/*
- *  Wrapper class for the process member functions which does not have 
-    DOMNodeIterator parameter
- */
-
-template <typename OBJ, typename DATA>
-class Process_Member_Function_Remote: public Process_Function<DATA> 
-{
-public:
-  typedef void (OBJ::*func_type) (DATA&);
-  typedef DATA data_type;
-
-  Process_Member_Function_Remote(OBJ& obj, func_type f)
-    : obj_(&obj), f_(f)
-  {
-  }
-
-  Process_Member_Function_Remote(OBJ* obj, func_type f)
-    : obj_(obj), f_(f)
-  {
-  }
-
-  virtual void call(DOMDocument* doc, DOMNodeIterator* iter, DATA& data)
-  {
-    obj_->set_iter(iter);
-    obj_->set_doc(doc);
-    (obj_->*f_) (data);
-  }
-
-private:
-  OBJ* obj_;
-  func_type f_;
-};
-
-/*
- *  Wrapper class for the static process member functions.
- */
-
-template <typename DATA>
-class Process_Static_Function: public Process_Function<DATA> 
-{
-public:
-  typedef void (*func_type) (DOMNodeIterator*, DATA&);
-  typedef DATA data_type;
-
-  Process_Static_Function(func_type f)
-    : f_(f)
-  {
-  }
-
-  virtual void call(DOMDocument*, DOMNodeIterator* iter, DATA& data)
-  {
-    (*f_) (iter, data);
-  }
-
-private:
-  func_type f_;
-};
-
-// Processes reference sequences
-bool
-process_reference_seq (DOMNode* node,
-                       XStr& node_name, const char* name,
-                       CORBA::ULongSeq& seq,
-                       int& index,
-                       IDREF_MAP& idref_map);
-
-// Process reference
-bool
-process_reference (DOMNode* node,
-                   XStr& node_name, const char* name,
-                   CORBA::ULong& ref,
-                   int& index,
-                   IDREF_MAP& idref_map);
-
-END_DEPLOYMENT_NAMESPACE
-
-#include "Process_Element_T.h"
-
-#endif // PROCESS_ELEMENT_H
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.h
deleted file mode 100644
index 1e392aea185..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/Property_Handler.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//==================================================================
-/**
- *  @file  Property_Handler.h
- *
- *  $Id$
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- */
-//===================================================================
-
-#ifndef PROPERTY_HANDLER_H
-#define PROPERTY_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-
-#include "Config_Handler_export.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-using Config_Handler::XStr;
-using xercesc::XMLString;
-using xercesc::DOMText;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /**
-     * @class Property_Handler
-     *
-     * @brief Handler class for <Property> type
-     *
-     * This class defines handler methods to parse Property
-     * types in the descriptor files. The corresponding
-     * CORBA IDL type for the schema element is returned.
-     *
-     */
-    class Config_Handler_Export Property_Handler
-    {
-    public:
-      static void process_Property (DOMNodeIterator * iter,
-                                    Deployment::Property &property);
-      // process elements of type Property definitions in
-      // the descriptor files
-
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* PROPERTY_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/RS_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/RS_Handler.h
deleted file mode 100644
index dff3a6e149d..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/RS_Handler.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//==================================================================
-/**
- *  @file  RS_Handler.h
- *
- *  $Id$
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- */
-//==================================================================
-
-#ifndef RS_HANDLER_H
-#define RS_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLString;
-using xercesc::DOMText;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /**
-     * @class RS_Handler
-     *
-     * @brief Handler class for <RequirementSatisfier> type
-     *
-     * This class defines handler methods to parse RequirementSatisfier
-     * types in the descriptor files. The corresponding
-     * CORBA IDL type for the schema element is returned.
-     *
-     */
-    class Config_Handler_Export RS_Handler
-    {
-    public:
-      static void
-        process_RequirementSatisfier (DOMNodeIterator * iter,
-                                      Deployment::RequirementSatisfier &ret_struct);
-      // process elements of type RequirementSatisfier definitions in
-      // the descriptor files
-
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ID_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/RUK_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/RUK_Handler.h
deleted file mode 100644
index b988eead549..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/RUK_Handler.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//==================================================================
-/**
- *  @file  RUK_Handler.h
- *
- *  $Id$
- *
- *  @author Emre Turkay  <turkaye@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef RUK_HANDLER_H
-#define RUK_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SString.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-
-namespace CIAO 
-{
-  namespace Config_Handler
-  {
-
-    /**
-     * @class RUK_Handler
-     *
-     * @brief Handler class for <ResourceUsageKind> type
-     *
-     * This class defines handler methods to parse ResourceUsage
-     * Kind types in the descriptor files. The corresponding
-     * CORBA IDL type for the schema element is returned.
-     *
-     */
-
-    class Config_Handler_Export RUK_Handler {
-    public:
-
-      /// Process elements of type ResourceUsageKind definitions in
-      /// the description files.
-      static void
-	process_ResourceUsageKind (DOMNodeIterator *iter, ::Deployment::ResourceUsageKind &kind);
-    };
-    
-  }
-
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* RUK_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Requirement_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Requirement_Handler.h
deleted file mode 100644
index c01ead11cab..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/Requirement_Handler.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//==================================================================
-/**
- *  @file  Requirement_Handler.h
- *
- *  $Id$
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef REQUIREMENT_HANDLER_H
-#define REQUIREMENT_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLString;
-using xercesc::DOMText;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /**
-     * @class Requirement_Handler
-     *
-     * @brief Handler class for <ImplementationDependency> type
-     *
-     * This class defines handler methods to parse Implementation
-     * Dependency types in the descriptor files. The corresponding
-     * CORBA IDL type for the schema element is returned.
-     *
-     */
-    class Config_Handler_Export Requirement_Handler
-    {
-    public:
-      static void
-        process_Requirement (DOMNodeIterator * iter,
-                             Deployment::Requirement &ret_struct);
-      // process elements of type Requirement in the descriptor files
-
-    };
-  }
-
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* REQUIREMENT_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/SPK_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/SPK_Handler.h
deleted file mode 100644
index 7a9caa3c2a0..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/SPK_Handler.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//==================================================================
-/**
- *  @file  SPK_Handler.h
- *
- *  $Id$
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef SPK_HANDLER_H
-#define SPK_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLString;
-using xercesc::DOMText;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /**
-     * @class SPK_Handler
-     *
-     * @brief Handler class for <SatisfierPropertyKind> type
-     *
-     * This class defines handler methods to parse Implementation
-     * Dependency types in the descriptor files. The corresponding
-     * CORBA IDL type for the schema element is returned.
-     *
-     */
-    class Config_Handler_Export SPK_Handler
-    {
-    public:
-      static void process_SatisfierPropertyKind (DOMNodeIterator * iter,
-                                                 Deployment::SatisfierPropertyKind &kind);
-      // process elements of type SatisfierPropertyKind definitions in
-      // the descriptor files
-
-    };
-  }
-
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* SPK_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/SP_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/SP_Handler.h
deleted file mode 100644
index a45dcf7d508..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/SP_Handler.h
+++ /dev/null
@@ -1,56 +0,0 @@
-//==================================================================
-/**
- *  @file  SP_Handler.h
- *
- *  $Id$
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef SP_HANDLER_H
-#define SP_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLString;
-using xercesc::DOMText;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-
-namespace CIAO
-{
-  namespace Config_Handler
-  {
-    /**
-     * @class SP_Handler
-     *
-     * @brief Handler class for <SatisfierProperty> type
-     *
-     * This class defines handler methods to parse Implementation
-     * Dependency types in the descriptor files. The corresponding
-     * CORBA IDL type for the schema element is returned.
-     *
-     */
-    class Config_Handler_Export SP_Handler
-    {
-    public:
-      static void process_SatisfierProperty (DOMNodeIterator * iter,
-                                             Deployment::SatisfierProperty &property);
-      // process elements of type SatisfierProperty definitions in
-      // the descriptor files
-
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ID_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/TPD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/TPD_Handler.h
deleted file mode 100644
index 20b7020bd58..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/TPD_Handler.h
+++ /dev/null
@@ -1,87 +0,0 @@
-//==================================================================
-/**
- *  @file  TPD_Handler.h
- *
- *  $Id$
- *
- *  @author Emre Turkay <turkaye@dre.vanderbilt.edu>
- */
-//=====================================================================
-
-#ifndef TPD_HANDLER_H
-#define TPD_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "ciao/DeploymentC.h"
-#include "Config_Handler_export.h"
-#include "Basic_Handler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SString.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include "XercesString.h"
-
-using Config_Handler::XStr;
-using xercesc::XMLUni;
-using xercesc::XMLString;
-using xercesc::XMLException;
-using xercesc::DOMException;
-using xercesc::DOMBuilder;
-using xercesc::DOMImplementationRegistry;
-using xercesc::DOMImplementationLS;
-using xercesc::DOMImplementation;
-using xercesc::DOMText;
-using xercesc::DOMNamedNodeMap;
-using xercesc::DOMLocator;
-using xercesc::DOMError;
-using xercesc::DOMDocument;
-using xercesc::DOMDocumentTraversal;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMNodeFilter;
-
-BEGIN_DEPLOYMENT_NAMESPACE
-
-/**
- * @class TPD_Handler
- *
- * @brief Handler class for <TopLevelPackageConfiguration> type 
- *
- * This class is within the Component Data Model subpackage of the
- * Deployment & Configuration package.
- *
- * This class defines handler methods to parse the aforementioned type
- * in the description files. The corresponding CORBA IDL type for this
- * element is returned.
- */
-
-class Config_Handler_Export TPD_Handler: public Basic_Handler
-{
-public:
-
-  /// constructor
-  TPD_Handler (DOMDocument* doc, unsigned long filter_)
-    : Basic_Handler (doc, filter_) { }
-
-  /// constructor
-  TPD_Handler (DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (iter, release) { }
-
-  /// constructor
-  TPD_Handler (DOMDocument* doc, DOMNodeIterator* iter, bool release = false)
-    : Basic_Handler (doc, iter, release) { }
-
-  /// Process the package configuration
-  ACE_TString process_TopLevelPackageDescription ();
-
-};
-
-END_DEPLOYMENT_NAMESPACE
-
-#include /**/ "ace/post.h"
-
-#endif /* TPD_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Utils.h b/TAO/CIAO/DAnCE/Config_Handlers/Utils.h
deleted file mode 100644
index c47cd4a37c2..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/Utils.h
+++ /dev/null
@@ -1,118 +0,0 @@
-//====================================================================
-/**
- *  @file  Utils.h
- *
- *  $Id$
- *
- *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- *  @author Tao Lu <lu@dre.vanderbilt.edu>,
- *  @author Boris <boris@dre.vanderbilt.edu>
- *
- */
-//=====================================================================
-
-#ifndef UTILS_H
-#define UTILS_H
-
-#include /**/ "ace/pre.h"
-
-#include "Config_Handler_export.h"
-#include "ciao/DeploymentC.h"
-
-#include "tao/Basic_Types.h"
-#include "XercesString.h"
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/XMLURL.hpp>
-
-using xercesc::XMLURL;
-using xercesc::DOMNodeIterator;
-using xercesc::DOMNode;
-using xercesc::DOMText;
-using xercesc::DOMBuilder;
-using xercesc::XMLString;
-using xercesc::DOMDocument;
-using Config_Handler::XStr;
-
-namespace CIAO {
-
-  namespace Config_Handler
-  {
-
-    /**
-     * @class Utils
-     *
-     * @brief Utility class for parsing basic types such as string float
-     * double etc.
-     *
-     * Helper methods for each type are defined as parse_<type> where type
-     * equals string, float, double etc. The corresponding C++ types are
-     * returned. These follow the IDL to C++ mapping defined by the CORBA
-     * specification.
-     *
-     */
-
-    class Config_Handler_Export Utils
-    {
-    public:
-      static char * parse_string (DOMNodeIterator * iter);
-      // Parse string type
-
-      static CORBA::ULong parse_ulong (DOMNodeIterator * iter);
-      // Parse ulong type
-
-      static CORBA::Long parse_long (DOMNodeIterator * iter);
-      // Parse long type
-
-      static CORBA::Short parse_short (DOMNodeIterator * iter);
-      // Parse short type
-
-      static CORBA::Float parse_float (DOMNodeIterator * iter);
-      // Parse float type
-
-      static CORBA::Double parse_double (DOMNodeIterator * iter);
-      // Parse double type
-
-      static CORBA::Boolean parse_bool (DOMNodeIterator * iter);
-      // Parse bool type
-
-      static CORBA::Char parse_char (DOMNodeIterator * iter);
-      // Parse char type
-
-      static CORBA::Octet parse_octet (DOMNodeIterator * iter);
-      // Parse octect type
-
-      static DOMDocument* create_document (const char * url);
-      // Create a document from the URL
-
-      static DOMBuilder* create_parser ();
-      // Create a parser from the URL
-
-      static bool process_string (DOMNodeIterator* iter, const XStr& node_name, 
-                                  const char* name, TAO_String_Manager& var);
-      // process strings
-
-      static bool process_string_seq (DOMNodeIterator* iter, 
-                                      const XStr& node_name, 
-                                      const char* name, CORBA::StringSeq& seq);
-      // process string sequence
-
-      static bool process_boolean (DOMNodeIterator* iter, 
-                                   const XStr& node_name, 
-                                   const char* name, CORBA::Boolean& var);
-      // process strings
-
-      static bool process_ulong (DOMNodeIterator* iter, const XStr& node_name, 
-                                 const char* name, CORBA::ULong& var);
-      // process ulong
-
-
-      static DOMNodeIterator * parse_href_tag (XMLURL xml_url,
-                                               DOMDocument * doc);
-      // Process the <href = "URL"> and return an iterator to the
-      // new document
-    };
-  }
-
-}
-#endif /* UTILS_H */
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/XercesString.h b/TAO/CIAO/DAnCE/Config_Handlers/XercesString.h
deleted file mode 100644
index 87ef31c3c2c..00000000000
--- a/TAO/CIAO/DAnCE/Config_Handlers/XercesString.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// $Id$
-
-#ifndef _XERCESSTRING_H
-#define _XERCESSTRING_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Swap.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include <iosfwd>
-
-#include <xercesc/util/XMLString.hpp>
-
-// Utility class that provides a std::string like facade to XMLString.
-// Doesn't implement all of the methods of std::string.
-
-namespace Config_Handler
-{
-
-  class XStr
-  {
-  public:
-    XStr() : _wstr(0L) { };
-
-    XStr (const char* str);
-
-    XStr (XMLCh* wstr);
-
-    XStr (const XMLCh* wstr);
-
-    XStr (const XStr& copy);
-
-    XStr& operator= (const XStr& rhs);
-
-    ~XStr();
-
-    const XMLCh* begin() const;
-
-    const XMLCh* end() const;
-
-    bool append(const XMLCh* tail);
-
-    bool erase(const XMLCh* head, const XMLCh* tail);
-
-    int size() const;
-
-    XMLCh operator [] (const int i);
-
-    const XMLCh operator [] (const int i) const;
-
-    operator const XMLCh* () const { return _wstr; };
-
-    bool operator== (const XMLCh* wstr) const;
-
-
-  private:
-
-    XMLCh* _wstr; // Internal representation
-
-  };
-
-  bool operator== (const XStr& lhs, const XStr& rhs);
-  bool operator!= (const XStr& lhs, const XStr& rhs);
-
-  std::ostream&
-  operator<< (std::ostream& o, XStr const& str);
-  
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* _XERCESSTRING_H */