*** empty log message ***

18 files changed, 42 insertions, 820 deletions

diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index 97a3918d263..028e522c7cb 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -91,9 +91,7 @@ CIAO::NodeApplication_Impl::finishLaunch_i (
       // For every connection struct we finish the connection.
       for (CORBA::ULong i = 0; i < length; ++i)
         {
-          ACE_CString name = providedReference[i].instanceName.in ();
-
-          Components::CCMObject_var comp;
+          ACE_CString name = connections[i].instanceName.in ();
 
           // For ES_to_Consumer connection, we simply call
           // handle_es_consumer_connection method.
@@ -107,7 +105,6 @@ CIAO::NodeApplication_Impl::finishLaunch_i (
 
           // For other type of connections, we need to fetch the
           // objref of the source component
-          ACE_CString name = connections[i].instanceName.in ();
           Component_State_Info comp_state;
 
           if (this->component_state_map_.find (name, comp_state) != 0)
@@ -121,16 +118,16 @@ CIAO::NodeApplication_Impl::finishLaunch_i (
               ACE_TRY_THROW (Deployment::InvalidConnection ());
             }
 
+          Components::EventConsumerBase_var consumer;
+
+          Components::CCMObject_var comp = comp_state.objref_;
+          
           if (CORBA::is_nil (comp.in ()))
             {
               ACE_DEBUG ((LM_DEBUG, "comp is nil\n"));
               throw Deployment::InvalidConnection ();
             }
 
-          Components::EventConsumerBase_var consumer;
-
-          Components::CCMObject_var comp = comp_state.objref_;
-
           switch (connections[i].kind)
             {
               case Deployment::SimplexReceptacle:
@@ -413,9 +410,9 @@ CIAO::NodeApplication_Impl::passivate_component (const char * name
   ACE_THROW_SPEC ((::CORBA::SystemException,
                    ::Components::RemoveFailure))
 {
-  Components::CCMObject_var comp;
+  Component_State_Info comp_state;
 
-  if (this->component_objref_map_.find (name, comp) != 0)
+  if (this->component_state_map_.find (name, comp_state) != 0)
     {
       ACE_ERROR ((LM_ERROR,
                   "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
@@ -425,13 +422,13 @@ CIAO::NodeApplication_Impl::passivate_component (const char * name
       ACE_TRY_THROW (Deployment::StartError ());
     }
 
-  if (CORBA::is_nil (comp.in ()))
+  if (CORBA::is_nil (comp_state.objref_.in ()))
     {
       ACE_DEBUG ((LM_DEBUG, "comp is nil\n"));
       throw Deployment::StartError ();
     }
 
-  comp->ciao_passivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+  comp_state.objref_->ciao_passivate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -441,9 +438,9 @@ CIAO::NodeApplication_Impl::activate_component (const char * name
   ACE_THROW_SPEC ((::CORBA::SystemException,
                    ::Components::RemoveFailure))
 {
-  Components::CCMObject_var comp;
+  Component_State_Info comp_state;
 
-  if (this->component_objref_map_.find (name, comp) != 0)
+  if (this->component_state_map_.find (name, comp_state) != 0)
     {
       ACE_ERROR ((LM_ERROR,
                   "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
@@ -453,19 +450,19 @@ CIAO::NodeApplication_Impl::activate_component (const char * name
       ACE_TRY_THROW (Deployment::StartError ());
     }
 
-  if (CORBA::is_nil (comp.in ()))
+  if (CORBA::is_nil (comp_state.objref_.in ()))
     {
       ACE_DEBUG ((LM_DEBUG, "comp is nil\n"));
       throw Deployment::StartError ();
     }
 
-  comp->ciao_preactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+  comp_state.objref_->ciao_preactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  comp->ciao_activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+  comp_state.objref_->ciao_activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  comp->ciao_postactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+  comp_state.objref_->ciao_postactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
index 88c6769eee9..03e2f530251 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
@@ -6,7 +6,7 @@
 #include "ace/SString.h"
 
 CIAO::NodeImplementationInfoHandler::
-NodeImplementationInfoHandler (::Deployment::DeploymentPlan & plan,
+NodeImplementationInfoHandler (const ::Deployment::DeploymentPlan & plan,
                                const Deployment::ComponentPlans & shared_components) :
   plan_ (plan),
   node_info_ (0),
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
index 53a1484454b..7516d42fcf6 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
@@ -77,28 +77,21 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL)
       // Get all the facets first
       Components::FacetDescriptions_var facets;
 
-    if (CIAO::debug_level () > 20)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                  "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
-                  "CIAO::NodeApplicationManager_Impl::create_connections -"
-                  "success getting facets for the component "
-                  "instance [%s] \n",
-                  comp_name.c_str ()));
-      }
-
-    // Get all the event consumers
-    Components::ConsumerDescriptions_var consumers;
-
-    if (is_shared_component (comp_name))
-      consumers = this->node_manager_->get_all_consumers (comp_name);
-    else
-      {
-        consumers =
-          ((*iter).int_id_)->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-        this->node_manager_->set_all_consumers (comp_name, consumers);
-      }
-
+      if (is_shared_component (comp_name))
+        {
+          ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Componsnt %s is shared\n",
+                      comp_name.c_str ()));
+          facets = this->node_manager_->get_all_facets (comp_name);
+        }
+      else
+        {
+          ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Component %s is not shared, getting and setting"
+                      "all facets\n",
+                      comp_name.c_str ()));
+          facets = ((*iter).int_id_)->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->node_manager_->set_all_facets (comp_name, facets);
+        }
+      
       if (CIAO::debug_level () > 9)
         {
           ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.cpp b/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
index 8ed23efe863..9ea1944ba19 100644
--- a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
+++ b/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
@@ -234,7 +234,7 @@ CIAO::Host_NodeManager_seq * CIAO::DomainDataManager::get_node_managers ()
           deployment_config_.get_node_manager (initial_domain_.node[i].name);
       //      if (node_manager.in () != 0)
         {
-          (*node_mgr_seq)[i].node_mgr_ = ::CIAO::NodeManager::_narrow (node_manager.in ());
+          (*node_mgr_seq)[i].node_mgr_ = ::CIAO::NodeManagerDaemon::_narrow (node_manager.in ());
         }
     }
   return node_mgr_seq;
diff --git a/TAO/CIAO/DAnCE/TargetManager/TargetManagerExt.idl b/TAO/CIAO/DAnCE/TargetManager/TargetManagerExt.idl
index 17311a60120..3336f3ffe5c 100644
--- a/TAO/CIAO/DAnCE/TargetManager/TargetManagerExt.idl
+++ b/TAO/CIAO/DAnCE/TargetManager/TargetManagerExt.idl
@@ -19,7 +19,7 @@
  */
 
 //#include <ciao/Deployment.idl>
-#include <DAnCE/Interfaces/NodeManager.idl>
+#include "DAnCE/Interfaces/NodeManagerDaemon.idl"
 
 module CIAO
 {
@@ -57,7 +57,7 @@ module CIAO
   struct Host_NodeManager
   {
     string host_;
-    ::CIAO::NodeManager node_mgr_;
+    ::CIAO::NodeManagerDaemon node_mgr_;
   };
 
   /// Sequence of NodeManager.
diff --git a/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc b/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc
index c7dd58e9472..c007c2d868a 100644
--- a/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc
+++ b/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc
@@ -74,14 +74,10 @@ project (XSC_Config_Handlers) : ciao_deployment_stub, xerces, dynamicany, typeco
     DnC_Dump.cpp
     DnC_Dump_T.cpp
     Dump_Obj.cpp
-    STD_CID_Handler.cpp
-    STD_CPD_Handler.cpp
-    STD_IAD_Handler.cpp
-    STD_PC_Intf.cpp
-    STD_PCD_Handler.cpp
     PCD_Handler.cpp
     IRDD_Handler.cpp
     DD_Handler.cpp
+    SatisfierProperty_Handler.cpp
   }
 
   Header_Files {
diff --git a/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp
index 56a08c967db..9006956d2de 100644
--- a/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp
@@ -7,6 +7,7 @@
 #include "Property_Handler.h"
 #include "Req_Handler.h"
 #include "cdp.hpp"
+#include "ace/UUID.h"
 
 namespace CIAO
 {
diff --git a/TAO/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp
deleted file mode 100644
index dee1dbda326..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-// $Id$
-#include "STD_CID_Handler.h"
-#include "STD_CPD_Handler.h"
-#include "STD_IAD_Handler.h"
-#include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
-#include "Utils/XML_Helper.h"
-#include "Deployment.hpp"
-#include "Property_Handler.h"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    IDREF_Base<CORBA::ULong> STD_CID_Handler::IDREF;
-
-    bool
-    STD_CID_Handler::component_impl_descr (
-                                           const ComponentImplementationDescription &desc,
-                                           ::Deployment::ComponentImplementationDescription &toconfig)
-    {
-      toconfig.label =
-        desc.label ().c_str ();
-
-      toconfig.UUID =
-        desc.UUID ().c_str ();
-
-
-      if (desc.assemblyImpl_p ())
-        {
-          Deployment::ComponentAssemblyDescription idl_cad;
-          ComponentAssemblyDescription cad =
-            desc.assemblyImpl ();
-
-          // @@: handle <assemblyImpl>
-          for (ComponentAssemblyDescription::instance_const_iterator iter =
-                 cad.begin_instance ();
-               iter != cad.end_instance ();
-               iter++)
-            {
-              CORBA::ULong len =
-                idl_cad.instance.length ();
-              idl_cad.instance.length (len + 1);
-              idl_cad.instance [len].name =
-                (*iter).name ().c_str ();
-
-              // Bind the instance id with the index
-              if ((*iter).id_p ())
-                {
-                  ACE_CString cstr ((*iter).id ().c_str ());
-
-                  STD_CID_Handler::IDREF.bind_ref (cstr,len);
-                }
-
-              if (!this->xml_helper_->is_initialized ())
-                return false;
-
-              // parse the .cpd (ComponentPackageDescription) file
-              // that <package> links to
-              xercesc::DOMDocument* dom =
-                this->xml_helper_->create_dom (((*iter).package ()).href ().c_str ());
-
-              if (!dom)
-                return false;
-
-              ComponentPackageDescription cpd =
-                componentPackageDescription (dom);
-
-              Deployment::ComponentPackageDescription idl_cpd;
-
-              STD_CPD_Handler cpd_handler (this->xml_helper_);
-
-              cpd_handler.component_package_descr (cpd,
-                                                   idl_cpd);
-
-              idl_cad.instance [len].package.length (1);
-              idl_cad.instance [len].package [0] = idl_cpd;
-            }
-
-          // @@: handle <connection>
-          for (ComponentAssemblyDescription::connection_const_iterator conn_iter =
-                 cad.begin_connection ();
-               conn_iter != cad.end_connection ();
-               conn_iter++)
-            {
-              CORBA::ULong conn_len =
-                idl_cad.connection.length ();
-
-              idl_cad.connection.length (conn_len + 1);
-              idl_cad.connection [conn_len].name =
-                (*conn_iter).name ().c_str ();
-
-
-              for (AssemblyConnectionDescription::internalEndpoint_const_iterator ep_iter =
-                     (*conn_iter).begin_internalEndpoint ();
-                   ep_iter != (*conn_iter).end_internalEndpoint ();
-                   ep_iter++)
-                {
-                  CORBA::ULong endp_len =
-                    idl_cad.connection [conn_len].internalEndpoint.length ();
-                  idl_cad.connection [conn_len].internalEndpoint.length (endp_len + 1);
-                  idl_cad.connection [conn_len].internalEndpoint [endp_len].portName =
-                    (*ep_iter).portName ().c_str ();
-
-                  CORBA::ULong tmp = 0;
-                  STD_CID_Handler::IDREF.find_ref (ACE_CString ((((*ep_iter).instance ()).id ()).c_str ()),
-                                                   tmp);
-                  CORBA::ULong ref = tmp;
-                  idl_cad.connection[conn_len].internalEndpoint [endp_len].instanceRef = ref;
-                }
-            }
-
-          toconfig.assemblyImpl.length (1);
-          toconfig.assemblyImpl [0] = idl_cad;
-        }
-
-      // handle <monolithicImpl>
-      if (desc.monolithicImpl_p ())
-        {
-          Deployment::MonolithicImplementationDescription idl_mid;
-          MonolithicImplementationDescription mid =
-            desc.monolithicImpl ();
-
-          for (MonolithicImplementationDescription::primaryArtifact_const_iterator iter =
-                 mid.begin_primaryArtifact ();
-               iter != mid.end_primaryArtifact ();
-               iter++)
-            {
-              CORBA::ULong len =
-                idl_mid.primaryArtifact.length ();
-              idl_mid.primaryArtifact.length (len + 1);
-              idl_mid.primaryArtifact [len].name = (*iter).name ().c_str ();
-
-              if (!this->xml_helper_->is_initialized ())
-                return false;
-
-              // parse the .iad (ImplementationArtifactDescription) file
-              // that the <referencedArtifact> links to
-              xercesc::DOMDocument* dom =
-                this->xml_helper_->create_dom (((*iter).referencedArtifact ()).href ().c_str ()); // here location indicates .iad file
-
-              if (!dom)
-                return false;
-
-              ImplementationArtifactDescription iad =
-                implementationArtifactDescription (dom);
-
-              Deployment::ImplementationArtifactDescription idl_iad;
-
-              STD_IAD_Handler::impl_artifact_descr (iad,
-                                                    idl_iad);
-
-              idl_mid.primaryArtifact [len].referencedArtifact = idl_iad;
-
-            }
-          toconfig.monolithicImpl.length (1);
-          toconfig.monolithicImpl [0] = idl_mid;
-        }
-
-      // handle <configProperty>
-      if (desc.configProperty_p ())
-        {
-          Property p = desc.configProperty ();
-          Deployment::Property idl_p;
-          Property_Handler::get_property (p, idl_p);
-          toconfig.configProperty.length (1);
-          toconfig.configProperty [0] = idl_p;
-        }
-
-      return true;
-    }
-  }
-}
diff --git a/TAO/CIAO/tools/Config_Handlers/STD_CID_Handler.h b/TAO/CIAO/tools/Config_Handlers/STD_CID_Handler.h
deleted file mode 100644
index ff812efc949..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/STD_CID_Handler.h
+++ /dev/null
@@ -1,79 +0,0 @@
-//================================================
-/**
-*  @file  STD_CID_Handler.h
-*
-*  $Id$
-*
-*  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
-*/
-//================================================
-
-#ifndef CIAO_CONFIG_HANDLERS_STD_CID_HANDLER_H
-#define CIAO_CONFIG_HANDLERS_STD_CID_HANDLER_H
-
-#include /**/ "ace/pre.h"
-
-#include "Utils/XML_Helper.h"
-#include "IDREF_Base.h"
-#include "Config_Handlers_Export.h"
-#include "ciao/DeploymentC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-namespace CIAO
-{
-namespace Config_Handlers
-{
-class ComponentImplementationDescription;
-
-/*
-* @class STD_CID_Handler
-*
-* @brief Handler class for <CCMComponentImplementationDescription> types.
-*
-* This class defines handler methods to map values from
-* XSC objects, parsed from the descriptor files, to the
-* corresponding CORBA IDL type for the schema element.
-*
-*/
-class Config_Handlers_Export STD_CID_Handler
-{
-
-public:
-
-STD_CID_Handler (XML_Helper *xml_helper)
-:xml_helper_ (xml_helper)
-{
-}
-
-/// Maps the values from the XSC object
-/// <ComponentImplementationDescription> to the CORBA IDL type
-/// <Deployment::ComponentImplementationDescription>.
-bool component_impl_descr (
-const ComponentImplementationDescription &desc,
-::Deployment::ComponentImplementationDescription &toconfig);
-
-static IDREF_Base<CORBA::ULong> IDREF;
-
-//@@Note: This part has yet to be added in the future
-//    ComponentImplementationDescription
-//    component_port_description (
-//      const Deployment::ComponentImplementationDescription& src);
-
-private:
-// disable the default constructor
-STD_CID_Handler ()
-:xml_helper_ (0)
-{
-}
-
-XML_Helper *xml_helper_;
-};
-}
-}
-
-#include /**/ "ace/post.h"
-#endif /* CIAO_CONFIG_HANDLERS_STD_CID_HANDLER_H*/
diff --git a/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp
deleted file mode 100644
index e5d097750f1..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-// $Id$
-#include "STD_CPD_Handler.h"
-#include "STD_CID_Handler.h"
-#include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
-#include "Deployment.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    bool
-    STD_CPD_Handler::component_package_descr (
-                                              const ComponentPackageDescription &desc,
-                                              ::Deployment::ComponentPackageDescription &toconfig)
-    {
-      toconfig.label =
-        desc.label ().c_str ();
-
-      toconfig.UUID =
-        desc.UUID ().c_str ();
-
-      PackagedComponentImplementation pci = desc.implementation ();
-      Deployment::PackagedComponentImplementation idl_pci;
-      idl_pci.name =
-        pci.name ().c_str ();
-
-      if (!this->xml_helper_->is_initialized ())
-        return false;
-
-      // parse the .cid (ComponentImplementationDescription) file
-      // that <referencedImplementation> links to
-      xercesc::DOMDocument* dom =
-        this->xml_helper_->create_dom ((pci.referencedImplementation ()).href ().c_str ()); // here location indicates .pcd file
-
-      if (!dom)
-        return false;
-
-      ComponentImplementationDescription cid =
-        componentImplementationDescription (dom);
-
-      Deployment::ComponentImplementationDescription idl_cid;
-
-      STD_CID_Handler cid_handler (this->xml_helper_);
-
-      cid_handler.component_impl_descr (cid,
-                                        idl_cid);
-
-      idl_pci.referencedImplementation = idl_cid;
-
-      toconfig.implementation.length (1);
-      toconfig.implementation [0] = idl_pci;
-
-      return true;
-    }
-  }
-}
diff --git a/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.h b/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.h
deleted file mode 100644
index 785847a7bcd..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.h
+++ /dev/null
@@ -1,78 +0,0 @@
-//================================================
-/**
-*  @file  STD_CPD_Handler.h
-*
-*  $Id$
-*
-*  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
-*/
-//================================================
-
-#ifndef CIAO_CONFIG_HANDLERS_STD_CPD_HANDLER_H
-#define CIAO_CONFIG_HANDLERS_STD_CPD_HANDLER_H
-
-#include /**/ "ace/pre.h"
-
-#include "Utils/XML_Helper.h"
-#include "Config_Handlers_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace Deployment
-{
-struct ComponentPackageDescription;
-}
-
-namespace CIAO
-{
-namespace Config_Handlers
-{
-class ComponentPackageDescription;
-
-/*
-* @class STD_CPD_Handler
-*
-* @brief Handler class for <CCMComponentPackageDescription> types.
-*
-* This class defines handler methods to map values from
-* XSC objects, parsed from the descriptor files, to the
-* corresponding CORBA IDL type for the schema element.
-*
-*/
-class Config_Handlers_Export STD_CPD_Handler
-{
-
-public:
-
-STD_CPD_Handler (XML_Helper *xml_helper)
-:xml_helper_ (xml_helper)
-{
-}
-
-/// Maps the values from the XSC object
-/// <ComponentPackageDescription> to the CORBA IDL type
-/// <Deployment::ComponentPackageDescription>.
-bool component_package_descr(
-const ComponentPackageDescription &desc,
-::Deployment::ComponentPackageDescription &toconfig);
-
-//@@Note: This part has yet to be added in the future
-//     ComponentPortDescription
-//     component_package_descr (
-//         const Deployment::ComponentPortDescription& src);
-private:
-// disable the default constructor
-STD_CPD_Handler ()
-:xml_helper_ (0)
-{
-}
-
-XML_Helper *xml_helper_;
-};
-}
-}
-
-#include /**/ "ace/post.h"
-#endif /* CIAO_CONFIG_HANDLERS_CPD_HANDLER_H*/
diff --git a/TAO/CIAO/tools/Config_Handlers/STD_IAD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/STD_IAD_Handler.cpp
deleted file mode 100644
index 48f95b99dbe..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/STD_IAD_Handler.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// $Id$
-#include "STD_IAD_Handler.h"
-#include "Basic_Deployment_Data.hpp"
-#include "ciao/Packaging_DataC.h"
-#include "Property_Handler.h"
-
-#include "iad.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    bool
-    STD_IAD_Handler::impl_artifact_descr (
-                                          const ImplementationArtifactDescription &desc,
-                                          ::Deployment::ImplementationArtifactDescription &toconfig)
-    {
-      toconfig.label =
-        desc.label ().c_str ();
-
-      toconfig.UUID =
-        desc.UUID ().c_str ();
-
-      for (ImplementationArtifactDescription::location_const_iterator iter =
-             desc.begin_location ();
-           iter != desc.end_location ();
-           iter++)
-        {
-          CORBA::ULong len =
-            toconfig.location.length ();
-          toconfig.location.length (len + 1);
-          toconfig.location [len] = (*iter).c_str ();
-        }
-
-      if (desc.execParameter_p ())
-        {
-          Property p = desc.execParameter ();
-          Deployment::Property idl_p;
-          Property_Handler::get_property (p, idl_p);
-          toconfig.execParameter.length (1);
-          toconfig.execParameter [0] = idl_p;
-        }
-      return true;
-    }
-  }
-}
diff --git a/TAO/CIAO/tools/Config_Handlers/STD_IAD_Handler.h b/TAO/CIAO/tools/Config_Handlers/STD_IAD_Handler.h
deleted file mode 100644
index 872afe5693b..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/STD_IAD_Handler.h
+++ /dev/null
@@ -1,64 +0,0 @@
-//================================================
-/**
-*  @file  STD_IAD_Handler.h
-*
-*  $Id$
-*
-*  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
-*/
-//================================================
-
-#ifndef CIAO_CONFIG_HANDLERS_STD_IAD_HANDLER_H
-#define CIAO_CONFIG_HANDLERS_STD_IAD_HANDLER_H
-
-#include /**/ "ace/pre.h"
-
-#include "Config_Handlers_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace Deployment
-{
-struct ImplementationArtifactDescription;
-}
-
-namespace CIAO
-{
-namespace Config_Handlers
-{
-class ImplementationArtifactDescription;
-
-/*
-* @class STD_IAD_Handler
-*
-* @brief Handler class for <CCMImplementationArtifactDescription> types.
-*
-* This class defines handler methods to map values from
-* XSC objects, parsed from the descriptor files, to the
-* corresponding CORBA IDL type for the schema element.
-*
-*/
-class Config_Handlers_Export STD_IAD_Handler
-{
-
-public:
-/// Maps the values from the XSC object
-/// <ImplementationArtifactDescription> to the CORBA IDL type
-/// <Deployment::ImplementationArtifactDescription>.
-static bool
-impl_artifact_descr (
-const ImplementationArtifactDescription &desc,
-::Deployment::ImplementationArtifactDescription &toconfig);
-
-//@@Note: The reverse part has yet to be handed in the future
-//     ImplementationArtifactDescription
-//     impl_artifact_descr (
-//         const Deployment::ComponentPortDescription& src);
-};
-}
-}
-
-#include /**/ "ace/post.h"
-#endif /* CIAO_CONFIG_HANDLERS_STD_IAD_HANDLER_H*/
diff --git a/TAO/CIAO/tools/Config_Handlers/STD_PCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/STD_PCD_Handler.cpp
deleted file mode 100644
index e37b0059181..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/STD_PCD_Handler.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// $Id$
-#include "STD_PCD_Handler.h"
-#include "STD_CPD_Handler.h"
-#include "Basic_Deployment_Data.hpp"
-#include "ciao/Packaging_DataC.h"
-#include "Deployment.hpp"
-
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-
-    bool
-    STD_PCD_Handler::package_config (
-                                     const PackageConfiguration &desc,
-                                     ::Deployment::PackageConfiguration &toconfig)
-    {
-      toconfig.label =
-        desc.label ().c_str ();
-
-      toconfig.UUID =
-        desc.UUID ().c_str ();
-
-      if (!this->xml_helper_->is_initialized ())
-        return false;
-
-      // parse the .cpd (ComponentPackageDescription) file
-      // that <basePackage> links to
-      xercesc::DOMDocument* dom =
-        this->xml_helper_->create_dom ((desc.basePackage()).href ().c_str ());
-
-      if (!dom)
-        return false;
-
-      ComponentPackageDescription cpc =
-        componentPackageDescription (dom);
-
-      Deployment::ComponentPackageDescription idl_cpc;
-
-      STD_CPD_Handler cpd_handler (this->xml_helper_);
-
-      cpd_handler.component_package_descr (cpc,
-                                           idl_cpc);
-
-      toconfig.basePackage.length (1);
-      toconfig.basePackage [0] = idl_cpc;
-
-      return true;
-    }
-  }
-}
diff --git a/TAO/CIAO/tools/Config_Handlers/STD_PCD_Handler.h b/TAO/CIAO/tools/Config_Handlers/STD_PCD_Handler.h
deleted file mode 100644
index c4082d9a5eb..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/STD_PCD_Handler.h
+++ /dev/null
@@ -1,78 +0,0 @@
-//================================================
-/**
-*  @file  STD_PCD_Handler.h
-*
-*  $Id$
-*
-*  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
-*/
-//================================================
-
-#ifndef CIAO_CONFIG_HANDLERS_STD_PCD_HANDLER_H
-#define CIAO_CONFIG_HANDLERS_STD_PCD_HANDLER_H
-
-#include /**/ "ace/pre.h"
-#include "Utils/XML_Helper.h"
-
-#include "Config_Handlers_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace Deployment
-{
-struct PackageConfiguration;
-}
-
-namespace CIAO
-{
-namespace Config_Handlers
-{
-class PackageConfiguration;
-
-/*
-* @class STD_PCD_Handler
-*
-* @brief Handler class for <CCMPackageConfiguration> types.
-*
-* This class defines handler methods to map values from
-* XSC objects, parsed from the descriptor files, to the
-* corresponding CORBA IDL type for the schema element.
-*
-*/
-class Config_Handlers_Export STD_PCD_Handler
-{
-
-public:
-STD_PCD_Handler (XML_Helper *xml_helper)
-:xml_helper_ (xml_helper)
-{
-}
-
-/// Maps the values from the XSC object
-/// <PackageConfiguration> to the CORBA IDL type
-/// <Deployment::PackageConfiguration>.
-bool package_config (
-const PackageConfiguration &desc,
-::Deployment::PackageConfiguration &toconfig);
-
-//@@Note: This part has yet to be added in the future
-//     PackageConfiguration
-//     package_config (
-//       const Deployment::ComponentPortDescription& src);
-
-private:
-// Disable the default constructor
-STD_PCD_Handler ()
-:xml_helper_ (0)
-{
-}
-
-XML_Helper *xml_helper_;
-};
-}
-}
-
-#include /**/ "ace/post.h"
-#endif /* CIAO_CONFIG_HANDLERS_STD_PCD_HANDLER_H*/
diff --git a/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp b/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp
deleted file mode 100644
index 6d4095a810b..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-// $Id$
-
-#if defined (_MSC_VER) && (_MSC_VER < 1300)
-#pragma warning (disable: 4018)
-#pragma warning (disable: 4284)
-#pragma warning (disable: 4146)
-#endif
-
-#include "STD_PC_Intf.h"
-#include "Utils/XML_Helper.h"
-#include "Deployment.hpp"
-#include "STD_PCD_Handler.h"
-#include "ciao/Packaging_DataC.h"
-#include "ciao/CIAO_common.h"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    STD_PC_Intf::STD_PC_Intf (const char *file)
-    {
-      if (!this->prepare_PC (file))
-        throw;
-    }
-
-    bool
-    STD_PC_Intf::prepare_PC (const char *file)
-    {
-      CIAO_TRACE("STD_PC_Intf::prepare_PC");
-      
-      ACE_Auto_Ptr<XML_Helper> helper (new XML_Helper);
-
-      if (!helper->is_initialized ())
-        return false;
-
-      // parse the .pcd (PackageConfigurationDescription) file
-      xercesc::DOMDocument *dom =
-        helper->create_dom (file);
-
-      if (!dom)
-        return false;
-
-
-      PackageConfiguration pc =
-        packageConfiguration (dom);
-
-
-      Deployment::PackageConfiguration idl_pc;
-
-
-      STD_PCD_Handler pcd_handler (helper.get ());
-
-      pcd_handler.package_config (pc,
-                                  idl_pc);
-
-
-      Deployment::PackageConfiguration *p_idl_pc =
-        new Deployment::PackageConfiguration (idl_pc);
-
-      // let ACE_Auto_Ptr take over
-      this->idl_pc_.reset (p_idl_pc);
-
-      if (this->idl_pc_.get ())
-        return true;
-
-      return false;
-    }
-
-    ::Deployment::PackageConfiguration const *
-    STD_PC_Intf::get_PC (void) const
-    {
-      return this->idl_pc_.get ();
-    }
-
-    ::Deployment::PackageConfiguration *
-    STD_PC_Intf::get_PC (void)
-    {
-      return this->idl_pc_.release ();
-    }
-  }
-}
diff --git a/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.h b/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.h
deleted file mode 100644
index 303224a387b..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.h
+++ /dev/null
@@ -1,62 +0,0 @@
-//==============================================================
-/**
-*  @file  STD_PC_Intf.h
-*
-*  $Id$
-*
-*  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
-*/
-//================================================================
-
-#ifndef CIAO_CONFIG_STD_PC_INTF_H
-#define CIAO_CONFIG_STD_PC_INTF_H
-#include /**/ "ace/pre.h"
-
-#include "Config_Handlers_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Auto_Ptr.h"
-
-
-namespace Deployment
-{
-struct PackageConfiguration ;
-}
-
-namespace CIAO
-{
-namespace Config_Handlers
-{
-/*
-* @class STD_PC_Intf
-*
-* @brief Wrapper class for PackageConfiguration extraction
-*
-* This class defines wrapper functions for extracting
-* PackageConfiguration IDL structures from XSC structures.
-* It serves as the public interface used by application
-* developers.
-*
-*/
-class Config_Handlers_Export STD_PC_Intf
-{
-public:
-STD_PC_Intf (const char *file);
-
-::Deployment::PackageConfiguration const *get_PC (void) const;
-::Deployment::PackageConfiguration *get_PC (void);
-
-protected:
-bool prepare_PC (const char *file);
-
-private:
-ACE_Auto_Ptr< ::Deployment::PackageConfiguration> idl_pc_;
-};
-}
-}
-
-#include /**/ "ace/post.h"
-#endif /*CIAO_CONFIG_STD_PC_INTF_H*/
diff --git a/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
index ef29bc86272..0a50d889b0b 100644
--- a/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
@@ -53,6 +53,11 @@ namespace CIAO
         case SatisfierPropertyKind::Selection_l:
           toconfig.kind = Deployment::Selection;
           break;
+          
+        default:
+          ACE_ERROR ((LM_ERROR, "Unknown SatisfierPropertyKind\n"));
+          throw 1;
+          
         }
 
       toconfig.dynamic = desc.dynamic ();
@@ -70,7 +75,7 @@ namespace CIAO
       ::XMLSchema::string< ACE_TCHAR > name ((src.name));
       SatisfierPropertyKind::Value kind;
 
-      const SatisfierPropertyKind *spk;
+      const SatisfierPropertyKind *spk = 0;
 
       switch (src.kind)
         {