ChangeLogTag:Mon Feb 19 21:27:11 UTC 2007 William R. Otte <wotte@dre.vanderbilt.edu>

32 files changed, 9 insertions, 2197 deletions

diff --git a/ciao_core_2/CIAO/ciao/CCM_Core.mpc b/ciao_core_2/CIAO/ciao/CCM_Core.mpc
index bd3872135fa..110282bd182 100644
--- a/ciao_core_2/CIAO/ciao/CCM_Core.mpc
+++ b/ciao_core_2/CIAO/ciao/CCM_Core.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
-project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client {
-  sharedname  = CIAO_DnC_Client
+project (CIAO_Client) : taolib_with_idl, valuetype, ifr_client {
+  sharedname  = CIAO_Client
   idlflags  += -Wb,stub_export_include=CIAO_Client_Export.h
   idlflags  += -Wb,stub_export_macro=CIAO_CLIENT_Export
   idlflags  += -Wb,skel_export_include=CIAO_Container_Export.h
@@ -80,8 +80,8 @@ project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client {
   }
 }
 
-project (CIAO_DnC_Container) : orbsvcslib, portableserver, valuetype, ifr_client, codecfactory, pi, ciao_client_dnc, avoids_corba_e_compact, avoids_corba_e_micro {
-  sharedname  = CIAO_DnC_Container
+project (CIAO_Container) : orbsvcslib, portableserver, valuetype, ifr_client, codecfactory, pi, ciao_client_dnc, avoids_corba_e_compact, avoids_corba_e_micro {
+  sharedname  = CIAO_Container
   idlflags   += -Wb,export_include=CIAO_Container_Export.h
   idlflags   += -Wb,export_macro=CIAO_CONTAINER_Export
   dynamicflags = CIAO_CONTAINER_BUILD_DLL
@@ -171,121 +171,10 @@ project (CIAO_DnC_Container) : orbsvcslib, portableserver, valuetype, ifr_client
 
 }
 
-// Valuetype library must be linked for this project.
-// Please don't remove.
-project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_base_dnc, ciao_client_dnc {
-  sharedname   =  CIAO_Deployment_stub
 
-  // This is necessary for MPC to pull in rules.ciao.GNU
-  includes += $(CIAO_ROOT)
-
-  idlflags     += -Wb,stub_export_macro=Deployment_stub_Export
-  idlflags     += -Wb,stub_export_include=Deployment_stub_export.h
-  idlflags     += -Wb,skel_export_macro=Deployment_svnt_Export
-  idlflags     += -Wb,skel_export_include=Deployment_svnt_export.h
-
-  dynamicflags =  DEPLOYMENT_STUB_BUILD_DLL
-
-  IDL_Files {
-    idlflags += -SS -Sci
-    Deployment_Packaging_Data.idl
-    Deployment_Target_Data.idl
-  }
-
-  IDL_Files {
-    idlflags += -SS
-    Deployment_Base.idl
-    Deployment_Connection.idl
-    Deployment_Data.idl
-    Deployment_DeploymentPlan.idl
-    Deployment_TargetData.idl
-    Deployment_Events.idl
-    CIAO_ServerResources.idl
-  }
-
-  IDL_Files {
-    Deployment_TargetManager.idl
-    CIAO_NodeApplication_CallBack.idl
-    Deployment_Core.idl
-    Deployment_NodeApplication.idl
-    Deployment_Application.idl
-    Deployment_Container.idl
-    Deployment.idl
-    Deployment_NodeManager.idl
-    Deployment_ApplicationManager.idl
-    Deployment_NodeApplicationManager.idl
-    Deployment_DomainApplicationManager.idl
-    Deployment_DomainApplication.idl
-    Deployment_ExecutionManager.idl
-    Deployment_RepositoryManager.idl
-  }
-
-  Source_Files {
-    Deployment_CoreC.cpp
-    Deployment_BaseC.cpp
-    Deployment_ConnectionC.cpp
-    Deployment_DataC.cpp
-    Deployment_DeploymentPlanC.cpp
-    Deployment_TargetDataC.cpp
-    Deployment_NodeApplicationC.cpp
-    Deployment_ApplicationC.cpp
-    Deployment_ContainerC.cpp
-    Deployment_Packaging_DataC.cpp
-    Deployment_Target_DataC.cpp
-    DeploymentC.cpp
-    Deployment_TargetManagerC.cpp
-    Deployment_NodeManagerC.cpp
-    Deployment_NodeApplicationManagerC.cpp
-    Deployment_ApplicationManagerC.cpp
-    Deployment_DomainApplicationManagerC.cpp
-    Deployment_DomainApplicationC.cpp
-    Deployment_ExecutionManagerC.cpp
-    Deployment_RepositoryManagerC.cpp
-    CIAO_NodeApplication_CallBackC.cpp
-    CIAO_ServerResourcesC.cpp
-    Deployment_EventsC.cpp
-  }
-}
-
-// CIAO_DnC_Client library must be linked for this project.
-// Please don't remove.
-project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_client, ciao_deployment_stub, ciao_events_dnc, ciao_client_dnc, naming {
-  sharedname   =  CIAO_Deployment_svnt
-  dynamicflags =  DEPLOYMENT_SVNT_BUILD_DLL
-  idlflags     += -Wb,stub_export_macro=Deployment_stub_Export
-  idlflags     += -Wb,stub_export_include=Deployment_stub_export.h
-  idlflags     += -Wb,skel_export_macro=Deployment_svnt_Export
-  idlflags     += -Wb,skel_export_include=Deployment_svnt_export.h
-
-  // This is necessary for MPC to pull in rules.ciao.GNU
-  includes += $(CIAO_ROOT)
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Deployment_CoreS.cpp
-    Deployment_ApplicationS.cpp
-    Deployment_NodeApplicationS.cpp
-    Deployment_ContainerS.cpp
-    DeploymentS.cpp
-    Deployment_RepositoryManagerS.cpp
-    Deployment_NodeManagerS.cpp
-    Deployment_NodeApplicationManagerS.cpp
-    Deployment_ApplicationManagerS.cpp
-    Deployment_DomainApplicationManagerS.cpp
-    Deployment_DomainApplicationS.cpp
-    Deployment_ExecutionManagerS.cpp
-    NodeApp_CB_Impl.cpp
-    Deployment_TargetManagerS.cpp
-    CIAO_NodeApplication_CallBackS.cpp
-  }
-
-}
-
-project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_client, utils, ciao_container_dnc, ciao_client_dnc, ciao_deployment_svnt, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project (CIAO_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_client, utils, ciao_container_dnc, ciao_client_dnc, ciao_deployment_svnt, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   includes     += $(CIAO_ROOT)
-  sharedname   =  CIAO_DnC_Server
+  sharedname   =  CIAO_Server
   idlflags     += -Wb,export_include=CIAO_Server_Export.h -Wb,export_macro=CIAO_SERVER_Export
   dynamicflags =  CIAO_SERVER_BUILD_DLL
 
diff --git a/ciao_core_2/CIAO/ciao/CIAO_NodeApplication_CallBack.idl b/ciao_core_2/CIAO/ciao/CIAO_NodeApplication_CallBack.idl
deleted file mode 100644
index 35cf8afabdd..00000000000
--- a/ciao_core_2/CIAO/ciao/CIAO_NodeApplication_CallBack.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-// $Id$
-
-/**
- * This IDL file is used to combine the NodeApplication
- * interface with the NodeApplicationManager interface.
- *
- * NodeApplicationManager will be spawn NodeApplication.
- * The call back object will be used to get the objectref of
- * NodeApplication.
- */
-
-#include "ciao/Deployment_NodeApplication.idl"
-#include "ciao/Deployment_NodeApplicationManager.idl"
-
-module CIAO
-{
-  interface NodeApplication_Callback
-  {
-    Deployment::NodeApplicationManager
-      register_node_application (in Deployment::NodeApplication na,
-				 out Deployment::Properties properties);
-  };
-};
diff --git a/ciao_core_2/CIAO/ciao/CIAO_ServerResources.idl b/ciao_core_2/CIAO/ciao/CIAO_ServerResources.idl
deleted file mode 100644
index de14402f835..00000000000
--- a/ciao_core_2/CIAO/ciao/CIAO_ServerResources.idl
+++ /dev/null
@@ -1,237 +0,0 @@
-// $Id$
-
-/**
- * @file CIAO_ServerResources.idl
- *
- * @brief A collection of IDL data types for
- *
- * @author Nanbor Wang
- */
-
-#if !defined (CIAO_SERVERRESOURCES_IDL)
-#define CIAO_SERVERRESOURCES_IDL
-
-#include <orb.idl>
-
-module CIAO
-{
-  module DAnCE
-  {
-    /**
-     * @brief A single command line argument corresponds to a string as
-     * in the case of "argv".
-     */
-    typedef string CommandlineArg;
-    /**
-     * @brief A list of command line arguments which a
-     * NodeApplicationManager will use to start up the NodeApplication
-     * this list is associated to.  The command line arguments will be
-     * appended to the command line in order.
-     */
-    typedef sequence<CommandlineArg> CommandlineArgs;
-
-    /**
-     * @brief A string containing the filename of the svc.conf file the
-     * NodeApplication uses.  The current approach of specifying
-     * svc.conf filename directly some harder problems such as
-     * distribution of svc.conf files and the relative/absolute path to
-     * the svc.conf file (the ServerResrouces xml document will have to
-     * assume the svc.conf file will be available at specific location.)
-     */
-    typedef string SvcconfURI;
-
-    /**
-     * @brief enumeration of ORB Resource Types (ORT) supported in RT
-     * extension.
-     */
-    enum ORBResourceType
-      {
-        ORT_THREADPOOL,
-        ORT_THREADPOOLWITHLANES,
-        ORT_CONNECTIONBANDS
-      };
-
-    typedef short Priority;
-
-    /**
-     * @brief Define a threadpool resource that an ORB must provide
-     */
-    struct ORS_Threadpool
-    {
-      string Id;
-      unsigned long stacksize;
-      unsigned long static_threads;
-      unsigned long dynamic_threads;
-      Priority default_priority;
-      boolean allow_request_buffering;
-      unsigned long max_buffered_requests;
-      unsigned long max_request_buffer_size;
-    };
-
-    typedef sequence<ORS_Threadpool> ORS_ThreadpoolSeq;
-
-    /**
-     * @brief Defines the configuration of a threadpool lane.  We need
-     * to redefine it here to avoid dependency to RTCORBA library.
-     */
-    struct ORS_ThreadpoolLane
-    {
-      Priority lane_priority;
-      unsigned long static_threads;
-      unsigned long dynamic_threads;
-    };
-
-    /**
-     * @brief Defines a set of threadpool lanes.  We need
-     * to redefine it here to avoid dependency to RTCORBA library.
-     */
-    typedef sequence<ORS_ThreadpoolLane> ORS_ThreadpoolLanes;
-
-    /**
-     * @brief Defines a Threadpool with Lanes resource that an ORB
-     * must provide.
-     */
-    struct ORS_ThreadpoolWithLanes
-    {
-      string Id;
-      unsigned long stacksize;
-      ORS_ThreadpoolLanes threadpool_lanes;
-      boolean allow_borrowing;
-      boolean allow_request_buffering;
-      unsigned long max_buffered_requests;
-      unsigned long max_request_buffer_size;
-    };
-
-    typedef sequence<ORS_ThreadpoolWithLanes> ORS_ThreadpoolWithLanesSeq;
-
-    /**
-     * @brief Define a priority band for BandedConnection policies.
-     */
-    struct ORS_PriorityBand
-    {
-      Priority low;
-      Priority high;
-    };
-    /**
-     * @brief Define a list of priority bands for BandedConnection
-     * policies.
-     */
-    typedef sequence<ORS_PriorityBand> ORS_PriorityBands;
-
-    /**
-     * @brief Define the information needed to create a
-     * BandedConnection policy.  This info can be referred to via its
-     * name (Id).
-     */
-    struct ORS_ConnectionBands
-    {
-      string Id;
-      ORS_PriorityBands bands;
-    };
-
-    typedef sequence<ORS_ConnectionBands> ORS_ConnectionBandsSeq;
-
-    /**
-     * @brief Collection of resources managed by the NodeApplication
-     * ORB.
-     */
-    struct ORBResource
-    {
-      ORS_ThreadpoolSeq threadpool_list;
-
-      ORS_ThreadpoolWithLanesSeq threadpool_with_lanes_list;
-
-      ORS_ConnectionBandsSeq connection_bands_list;
-    };
-
-    typedef sequence<ORBResource, 1> ORBResources;
-
-    // =================================================================
-
-    /**
-     * @brief PolicyType supported by DAnCE extension.  Again, we are
-     * redefining these value to avoid dependencies to various ORB
-     * modules such as RTCORBA.
-     */
-    const CORBA::PolicyType PRIORITY_MODEL_POLICY_TYPE = 40;
-    const CORBA::PolicyType THREADPOOL_POLICY_TYPE = 41;
-    const CORBA::PolicyType PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 45;
-
-    enum PriorityModel
-      {
-        CLIENT_PROPAGATED,
-        SERVER_DECLARED
-      };
-
-    /**
-     * @brief Defines data required for creating a PriorityModel Policy
-     */
-    struct PriorityModelPolicyDef
-    {
-      PriorityModel priority_model;
-      Priority server_priority;
-    };
-
-    /**
-     * @brief Define data required for creating a Threadpool policy
-     */
-    struct ThreadpoolPolicyDef
-    {
-      string Id;                // Threadpool name defined in
-                                // ORBResource
-    };
-
-    /**
-     * @brief Define data required for creating a PriorityBandedConnection
-     * policy
-     */
-    struct PriorityBandedConnectionPolicyDef
-    {
-      string Id;                // PriorityBands name defined in
-                                // ORBResource
-    };
-
-    union PolicyDef switch (CORBA::PolicyType)
-    {
-    case 40: PriorityModelPolicyDef PriorityModelDef;
-    case 41: ThreadpoolPolicyDef    ThreadpoolDef;
-    case 45: PriorityBandedConnectionPolicyDef PriorityBandedConnectionDef;
-    };
-
-    /**
-     * @brief Define a set of policy definitions.
-     */
-    typedef sequence<PolicyDef> PolicyDefs;
-
-    /**
-     * @brief A policy set is named.
-     */
-    struct PolicySet
-    {
-      string Id;                // Name of this policy set
-      PolicyDefs policies;
-    };
-
-    /**
-     * @brief A list of all policy sets.
-     */
-    typedef sequence<PolicySet> PolicySets;
-
-    struct ORBConfigs
-    {
-      ORBResources orb_resources;
-      PolicySets policy_set;
-    };
-
-    struct ServerResource
-    {
-      string Id;
-
-      CommandlineArgs args;
-      SvcconfURI svcconf;
-      ORBConfigs orb_config;
-    };
-  };
-};
-
-#endif /* CIAO_SERVERRESOURCES_IDL */
diff --git a/ciao_core_2/CIAO/ciao/Container_Base.h b/ciao_core_2/CIAO/ciao/Container_Base.h
index 551a1670d5b..1fda36a1f22 100644
--- a/ciao_core_2/CIAO/ciao/Container_Base.h
+++ b/ciao_core_2/CIAO/ciao/Container_Base.h
@@ -20,7 +20,7 @@
 #include /**/ "ace/pre.h"
 
 #include "ciao/CCM_ContainerC.h"
-#include "ciao/Deployment_CoreC.h"
+#include "DAnCE/Deployment/Deployment_CoreC.h"
 #include "ciao/CIAO_Server_Export.h"
 
 #include "tao/PortableServer/PortableServer.h"
diff --git a/ciao_core_2/CIAO/ciao/Deployment.idl b/ciao_core_2/CIAO/ciao/Deployment.idl
deleted file mode 100644
index 10d34cbedb1..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment.idl
+++ /dev/null
@@ -1,52 +0,0 @@
-// $Id$
-
-#ifndef DEPLOYMENT_IDL
-#define DEPLOYMENT_IDL
-
-#include "ciao/Deployment_Packaging_Data.idl"
-#include "ciao/Deployment_Target_Data.idl"
-
-module Deployment {
-
-  exception InvalidProperty {
-    string name;
-    string reason;
-  };
-  
-  // @@added
-  exception InvalidNodeExecParameter {
-    string name;
-    string reason;
-  };
-  
-  // @@added
-  exception InvalidComponentExecParameter {
-    string name;
-    string reason;
-  };
-  
-  // @@added
-  exception LastConfiguration {
-  };
-  
-  exception NoSuchName {
-  };
-
-  exception InvalidReference {
-  };
-
-  /// Below exception types are CIAO specific
-  exception PlanNotExist {
-  };
-
-  /// CIAO specific struct type used for shared component management
-  /// mapping the name of component to its plan_uuid
-  struct ComponentPlan
-  {
-    string name;
-    string plan_uuid;
-  };
-  typedef sequence < ComponentPlan > ComponentPlans;
-};
-
-#endif /* DEPLOYMENT_IDL */
diff --git a/ciao_core_2/CIAO/ciao/Deployment_Application.idl b/ciao_core_2/CIAO/ciao/Deployment_Application.idl
deleted file mode 100644
index 5f6f728bf09..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_Application.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-// $Id$
-
-#if !defined (DEPLOYMENT_APPLICATION_IDL)
-#define DEPLOYMENT_APPLICATION_IDL
-
-#include "ciao/Deployment_Connection.idl"
-
-module Deployment
-{
-  exception StartError
-  {
-    string name;
-    string reason;
-  };
-
-  exception InvalidConnection
-  {
-    string name;
-    string reason;
-  };
-
-  interface Application
-  {
-    // @@changed
-    //     void finishLaunch (in Connections providedReference,
-    //                        in boolean start)
-    //       raises (StartError, InvalidConnection);
-    
-    void finishLaunch (in Connections providedReference,
-                       in boolean start,
-                       in boolean is_ReDAC)
-      raises (StartError, InvalidConnection);
-    void start ()
-      raises (StartError);
-  };
-  typedef sequence < Application > Applications;
-};
-
-#endif /* DEPLOYMENT_APPLICATION_IDL */
diff --git a/ciao_core_2/CIAO/ciao/Deployment_ApplicationManager.idl b/ciao_core_2/CIAO/ciao/Deployment_ApplicationManager.idl
deleted file mode 100644
index f676a91640d..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_ApplicationManager.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-#ifndef DEPLOYMENT_APPLICATIONMANAGER_IDL
-#define DEPLOYMENT_APPLICATIONMANAGER_IDL
-
-#include "ciao/Deployment_Core.idl"
-#include "ciao/Deployment.idl"
-
-module Deployment {
-  exception ResourceNotAvailable {
-    string name;
-    string resourceType;
-    string propertyName;
-    string elementName;
-    string resourceName;
-  };
-
-  interface ApplicationManager {
-    /// @todo Spec mentions another few exceptions in the raises cluase
-    // @@changed
-    Application startLaunch (in Properties configProperty,
-                             out Connections providedReference,
-                             in boolean start)
-      raises (ResourceNotAvailable, StartError, InvalidProperty,
-              InvalidNodeExecParameter, InvalidComponentExecParameter);
-    void destroyApplication (in Application app)
-      raises (StopError);
-  };
-};
-
-#endif /* DEPLOYMENT_APPLICATIONMANAGER_IDL */
diff --git a/ciao_core_2/CIAO/ciao/Deployment_Base.idl b/ciao_core_2/CIAO/ciao/Deployment_Base.idl
deleted file mode 100644
index 0ae4a2748f6..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_Base.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-//$Id$
-
-#ifndef DEPLOYMENT_BASE_IDL
-#define DEPLOYMENT_BASE_IDL
-
-module Deployment {
-
-  struct Property
-  {
-    string name;
-    any value;
-  };
-  typedef sequence < Property > Properties;
-  
-  // @@changed element order
-  struct Requirement {
-    string name;
-    string resourceType;
-    Properties property;
-  };
-
-  typedef sequence < Requirement > Requirements;
-
-  enum SatisfierPropertyKind {
-    Quantity,
-    Capacity,
-    Minimum,
-    Maximum,
-    _Attribute,
-    Selection
-  };
-
-  struct SatisfierProperty {
-    string name;
-    SatisfierPropertyKind kind;
-    boolean dynamic;
-    any value;
-  };
-  typedef sequence < SatisfierProperty > SatisfierProperties;
-};
-
-#endif /* DEPLOYMENT_BASE_IDL */
diff --git a/ciao_core_2/CIAO/ciao/Deployment_Connection.idl b/ciao_core_2/CIAO/ciao/Deployment_Connection.idl
deleted file mode 100644
index 4fe19825a86..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_Connection.idl
+++ /dev/null
@@ -1,50 +0,0 @@
-// $Id$
-
-#if !defined (DEPLOYMENT_CONNECTION_IDL)
-#define DEPLOYMENT_CONNECTION_IDL
-
-#include "ciao/Deployment_DeploymentPlan.idl"
-#include <ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl>
-
-// *************** Packaging and Deployment ***************
-module Deployment
-{
-  typedef sequence < Object > Endpoints;
-  //typedef Object Endpoint;
-  
-  // @@changed
-  // struct Connection
-  //   {
-  //     string name;
-  //     Endpoints endpoint;
-  //   };
-  
-  // CIAO's specific <Connection> type defition.
-  // To avoid the connection info in the plan being passed to the
-  // local node and to make the implementation not very cumbersome
-  // I changed the connection struct to include some extra informations.
-  struct Connection
-  {
-    string instanceName;
-    string portName;
-    CCMComponentPortKind kind;
-
-    string endpointInstanceName; // CIAO specific extension
-    string endpointPortName;     // CIAO specific extension
-
-    // the endpoints member is change to endpoint.
-    // Since we will not have more than 1 objref in there.
-    Object endpoint;
-
-    // A wrapper facade interface to provision different event
-    // communication mechanisms, including RTEC, etc.
-    CIAO::CIAO_Event_Service event_service;
-
-    // The properties of this connection, particularly useful
-    // to speicfy QoS properties of pub/sub service connections.
-    Properties config;
-  };
-
-  typedef sequence < Connection > Connections;
-};
-#endif /* DEPLOYMENT_CONNECTION_IDL */
diff --git a/ciao_core_2/CIAO/ciao/Deployment_Container.idl b/ciao_core_2/CIAO/ciao/Deployment_Container.idl
deleted file mode 100644
index 55ac0c7dfdd..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_Container.idl
+++ /dev/null
@@ -1,93 +0,0 @@
-// $Id$
-
-#if !defined (DEPLOYMENT_CONTAINER_IDL)
-#define DEPLOYMENT_CONTAINER_IDL
-
-#include "ciao/Deployment_Application.idl"
-#include "ciao/Deployment_Core.idl"
-
-// *************** Packaging and Deployment ***************
-module Deployment
-{
-  interface NodeApplication; // Forward decl.
-
-  /// CIAO specific
-  struct Component_Info
-  {
-    string component_instance_name;
-    Components::CCMObject component_ref;
-  };
-
-  /// CIAO specific
-  typedef sequence < Component_Info > ComponentInfos;
-
-  /// CIAO specific
-  struct ComponentImplementationInfo
-  {
-    string component_instance_name;
-    string executor_dll;
-    string executor_entrypt;
-    string servant_dll;
-    string servant_entrypt;
-    Properties component_config;
-    //  Properties home_config;      //ignored for now.
-  };
-
-  /// CIAO specific
-  typedef sequence <ComponentImplementationInfo> ComponentImplementationInfos;
-
-  // ContainerImplementationInfo contains a list of components to be installed and
-  // policy configuration for the container which hosts these components
-  /// CIAO specific
-  struct ContainerImplementationInfo
-  {
-    ComponentImplementationInfos impl_infos;
-    Properties container_config;
-  };
-
-  /// CIAO specific
-  typedef sequence <ContainerImplementationInfo> ContainerImplementationInfos;
-
-  /// CIAO specific interface, which could deal with installing multiple
-  /// containers into a single NodeApplication.
-  interface Container
-  {
-    readonly attribute ::Deployment::Properties properties;
-
-    /// Get the NodeApplication which created us
-    NodeApplication get_node_application ();
-
-    /// Initialize the container with policies
-    // long init (in ::CORBA::PolicyList policies);
-
-    // NW: The following should be component specific info because the
-    // container has already been created and initialized at this
-    // time.  So there's not much container configuration to be done
-    // at this stage.
-    //@@ The container_impl_info will contain
-    //1 component instance name as the key.
-    //2 dll/so name of the exec
-    //3 entry point of the exec
-    //4 dll/so name of the svnt
-    //5 entry point of the svnt
-    //6 Poosible other configuration for container/home/component
-
-    /// Install all homes and components
-    Deployment::ComponentInfos install (in ContainerImplementationInfo container_impl_info)
-        raises (UnknownImplId,
-                ImplEntryPointNotFound,
-                InstallationFailure,
-                ::Components::InvalidConfiguration);
-
-    /// Remove all homes and components
-    void remove ()
-      raises (::Components::RemoveFailure);
-
-    /// Remove a component instance
-    void remove_component (in string inst_name)
-      raises (::Components::RemoveFailure);
-  };
-
-  typedef sequence<Container> Containers;
-};
-#endif /* DEPLOYMENT_CONTAINER_IDL */
diff --git a/ciao_core_2/CIAO/ciao/Deployment_Core.idl b/ciao_core_2/CIAO/ciao/Deployment_Core.idl
deleted file mode 100644
index fbaa5ea18c6..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_Core.idl
+++ /dev/null
@@ -1,49 +0,0 @@
-// $Id$
-
-#if !defined (DEPLOYMENT_CORE_IDL)
-#define DEPLOYMENT_CORE_IDL
-
-#include "ciao/CCM_Component.idl"
-#include "ciao/Deployment_TargetData.idl"
-#include "ciao/Deployment_Data.idl"
-#include "ciao/Deployment_Application.idl"
-
-// *************** Packaging and Deployment ***************
-module Deployment
-{
-  // Typeprefix Components "omg.org";
-  // OMG threw these things away, didn't it.
-
-  /// CIAO specific
-  exception UnknownImplId
-  {
-    string name;
-    string reason;
-  };
-
-  /// CIAO specific
-  exception InstallationFailure
-  {
-    string name;
-    string reason;
-  };
-
-  /// CIAO specific
-  exception ImplEntryPointNotFound
-  {
-    string name;
-    string reason;
-  };
-
-  /**
-   * The StopError exception is raised if a problem occurred while terminating
-   * an application, either during the terminate operation of the
-   * ApplicationManager or during the destroyManager operation of the
-   * ExecutionManager.
-   */
-  exception StopError {
-    string name;
-    string reason;
-  };
-};
-#endif /* DEPLOYMENT_CORE_IDL */
diff --git a/ciao_core_2/CIAO/ciao/Deployment_Data.idl b/ciao_core_2/CIAO/ciao/Deployment_Data.idl
deleted file mode 100644
index a8279b2b306..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_Data.idl
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id$
-
-#ifndef DEPLOYMENT_DATA_IDL
-#define DEPLOYMENT_DATA_IDL
-
-#include "ciao/Deployment_DeploymentPlan.idl"
-
-module Deployment {
-
-  struct ComponentPackageReference {
-    string requiredUUID;
-    string requiredName;
-
-    // @@changed
-    //ComponentInterfaceDescription requiredType;
-
-    string requiredType;
-  };
-
-  typedef sequence < ComponentPackageReference > ComponentPackageReferences;
-
-  typedef sequence < ResourceUsageKind > ResourceUsageKinds;
-
-  struct ImplementationRequirement {
-    ResourceUsageKinds resourceUsage;
-    string resourcePort;
-    string componentPort;
-    // @@ changed: order of name and resourceType
-    string name;
-    string resourceType;
-    Properties property;
-  };
-
-  typedef sequence < ImplementationRequirement > ImplementationRequirements;
-
-  struct Capability {
-    string name;
-    ::CORBA::StringSeq resourceType;
-    SatisfierProperties property;
-  };
-
-  typedef sequence < Capability > Capabilities;
-};
-
-#endif /* DEPLOYMENT_DATA_IDL */
diff --git a/ciao_core_2/CIAO/ciao/Deployment_DeploymentPlan.idl b/ciao_core_2/CIAO/ciao/Deployment_DeploymentPlan.idl
deleted file mode 100644
index 4173909766f..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_DeploymentPlan.idl
+++ /dev/null
@@ -1,228 +0,0 @@
-// $Id$
-
-#ifndef DEPLOYMENT_DEPLOYMENTPLAN_IDL
-#define DEPLOYMENT_DEPLOYMENTPLAN_IDL
-
-#include "ciao/Deployment_Base.idl"
-#include "tao/StringSeq.pidl"
-#include "tao/ULongSeq.pidl"
-#include "tao/Typecode_types.pidl"
-
-module Deployment {
-
-  enum CCMComponentPortKind
-  {
-    Facet,
-    SimplexReceptacle,
-    MultiplexReceptacle,
-    EventEmitter,
-    EventPublisher,
-    EventConsumer
-  };
-
-  struct ComponentPortDescription {
-    string name;
-    string specificType;
-    ::CORBA::StringSeq supportedType;
-    boolean provider;
-    boolean exclusiveProvider;
-    boolean exclusiveUser;
-    boolean optional;
-    CCMComponentPortKind kind;
-  };
-
-  typedef sequence < ComponentPortDescription > ComponentPortDescriptions;
-
-  struct ComponentPropertyDescription {
-    string name;
-    CORBA::TypeCode type;
-  };
-
-  typedef sequence < ComponentPropertyDescription > ComponentPropertyDescriptions;
-
-  struct ComponentInterfaceDescription {
-    string label;
-    string UUID;
-    string specificType;
-    ::CORBA::StringSeq supportedType;
-    ::CORBA::StringSeq idlFile;
-    Properties configProperty;
-    ComponentPortDescriptions port;
-    ComponentPropertyDescriptions property;
-    Properties infoProperty;
-  };
-
-  struct MonolithicDeploymentDescription {
-    string name;
-    ::CORBA::StringSeq source;
-    ::CORBA::ULongSeq artifactRef;
-    // @@changed 
-    // Properties nodeExecParameter;
-    Properties execParameter;
-    
-    // @@added
-    // Properties componentExecParameter;
-    
-    // @@delete:
-    Requirements deployRequirement;
-  };
-
-  typedef sequence < MonolithicDeploymentDescription > MonolithicDeploymentDescriptions;
-
-  enum ResourceUsageKind {
-    None,
-    InstanceUsesResource,
-    ResourceUsesInstance,
-    PortUsesResource,
-    ResourceUsesPort
-  };
-
-  struct InstanceResourceDeploymentDescription {
-    ResourceUsageKind resourceUsage;
-    // @@added
-    //string resourcePort;
-    // @@added
-    //string componentPort;
-    
-    string requirementName;
-    string resourceName;
-    Properties property;
-  };
-
-  typedef sequence < InstanceResourceDeploymentDescription > InstanceResourceDeploymentDescriptions;
-
-  struct InstanceDeploymentDescription {
-    string name;
-    string node;
-    ::CORBA::StringSeq source;
-    unsigned long implementationRef;
-    Properties configProperty;
-    InstanceResourceDeploymentDescriptions deployedResource;
-    InstanceResourceDeploymentDescriptions deployedSharedResource;
-  };
-
-  typedef sequence < InstanceDeploymentDescription > InstanceDeploymentDescriptions;
-
-  struct ComponentExternalPortEndpoint {
-    string portName;
-  };
-
-  typedef sequence < ComponentExternalPortEndpoint > ComponentExternalPortEndpoints;
-
-  struct PlanSubcomponentPortEndpoint {
-    string portName;
-    boolean provider;
-    CCMComponentPortKind kind;
-    unsigned long instanceRef;
-  };
-
-  typedef sequence < PlanSubcomponentPortEndpoint > PlanSubcomponentPortEndpoints;
-
-  struct ExternalReferenceEndpoint {
-    string location;
-    // @@added
-    // boolean provider;
-    // @@added
-    // string portName;
-    // @@added
-    // ::CORBA::StringSeq supportedType;
-  };
-
-  typedef sequence < ExternalReferenceEndpoint > ExternalReferenceEndpoints;
-
-  struct ConnectionResourceDeploymentDescription {
-    string targetName;
-    string requirementName;
-    string resourceName;
-    Properties property;
-  };
-
-  typedef sequence < ConnectionResourceDeploymentDescription > ConnectionResourceDeploymentDescriptions;
-
-  struct PlanConnectionDescription {
-    string name;
-    ::CORBA::StringSeq source;
-    Requirements deployRequirement;
-    ComponentExternalPortEndpoints externalEndpoint;
-    PlanSubcomponentPortEndpoints internalEndpoint;
-    ExternalReferenceEndpoints externalReference;
-    ConnectionResourceDeploymentDescriptions deployedResource;
-  };
-
-  typedef sequence < PlanConnectionDescription > PlanConnectionDescriptions;
-
-  struct PlanSubcomponentPropertyReference {
-    string propertyName;
-    unsigned long instanceRef;
-  };
-
-  typedef sequence < PlanSubcomponentPropertyReference > PlanSubcomponentPropertyReferences;
-
-  struct PlanPropertyMapping {
-    string name;
-    ::CORBA::StringSeq source;
-    string externalName;
-    PlanSubcomponentPropertyReferences delegatesTo;
-  };
-
-  typedef sequence < PlanPropertyMapping > PlanPropertyMappings;
-
-  struct ImplementationDependency {
-    string requiredType;
-  };
-
-  typedef sequence < ImplementationDependency > ImplementationDependencies;
-
-  struct ResourceDeploymentDescription {
-    string requirementName;
-    string resourceName;
-    Properties property;
-  };
-
-  typedef sequence < ResourceDeploymentDescription > ResourceDeploymentDescriptions;
-
-  struct ArtifactDeploymentDescription {
-    string name;
-    ::CORBA::StringSeq location;
-    string node;
-    ::CORBA::StringSeq source;
-    Properties execParameter;
-
-    // @@delete:
-    Requirements deployRequirement;
-
-    ResourceDeploymentDescriptions deployedResource;
-  };
-
-  typedef sequence < ArtifactDeploymentDescription > ArtifactDeploymentDescriptions;
-  
-  // @@added
-  enum PlanLocalityKind {
-    PlanSameProcess,
-    PlanDifferentProcess,
-    PlanNoConstraint
-  };
-  
-  // @@added
-  struct PlanLocality {
-    PlanLocalityKind constraint;
-    ::CORBA::ULongSeq constrainedInstanceRef;
-  };
-  
-  struct DeploymentPlan {
-    string label;
-    string UUID;
-    ComponentInterfaceDescription realizes;
-    MonolithicDeploymentDescriptions implementation;
-    InstanceDeploymentDescriptions instance;
-    PlanConnectionDescriptions connection;
-    PlanPropertyMappings externalProperty;
-    ImplementationDependencies dependsOn;
-    ArtifactDeploymentDescriptions artifact;
-    Properties infoProperty;
-    // @added
-    // PlanLocalities localityConstraint;
-  };
-};
-
-#endif /* DEPLOYMENT_DATA_IDL */
diff --git a/ciao_core_2/CIAO/ciao/Deployment_DomainApplication.idl b/ciao_core_2/CIAO/ciao/Deployment_DomainApplication.idl
deleted file mode 100644
index 7781907bafe..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_DomainApplication.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-#ifndef DEPLOYMENT_DOMAINAPPLICATION_IDL
-#define DEPLOYMENT_DOMAINAPPLICATION_IDL
-
-#include "Deployment_Application.idl"
-#include "Deployment_Core.idl"
-
-module Deployment
-{
-  // @@added
-  interface DomainApplication : 
-    Application
-  {
-  };
-};
-
-
-#endif
diff --git a/ciao_core_2/CIAO/ciao/Deployment_DomainApplicationManager.idl b/ciao_core_2/CIAO/ciao/Deployment_DomainApplicationManager.idl
deleted file mode 100644
index d313676ed26..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_DomainApplicationManager.idl
+++ /dev/null
@@ -1,73 +0,0 @@
-// $Id$
-#ifndef DOMAINAPPLICATIONMANAGER_IDL
-#define DOMAINAPPLICATIONMANAGER_IDL
-
-#include "ciao/Deployment.idl"
-#include "ciao/Deployment_NodeApplication.idl"
-#include "ciao/Deployment_ApplicationManager.idl"
-
-module Deployment {
-  // @@changed
-  // interface DomainApplicationManager :
-  //     ApplicationManager
-  //   {
-  //     Applications getApplications ();
-  //     DeploymentPlan getPlan ();
-  //   };
-  
-  /// CIAO 's DomainApplicationManager interface differs spec-defined interface
-  /// in the same that it also integrates the spec-defined interface for
-  /// DomainApplication into itself
-  /// This should be derived from ApplicationManager
-  interface DomainApplicationManager
-  {
-    DeploymentPlan getPlan ();
-
-    /// This method is missing from CIAO but in the spec
-    /// Applications getApplications ();
-
-    /// CIAO specific version of startLaunch implementation, this one
-    /// differs with spec-defined operation in the sense that it doesn't
-    /// return DomainApplication object reference.
-    void startLaunch (in Properties configProperty, in boolean start)
-      raises (ResourceNotAvailable, StartError, InvalidProperty);
-
-    /// This method has CIAO specific arguments and is not spec compliant
-    void finishLaunch (in boolean start,
-                       in boolean is_ReDAC)
-      raises (StartError, InvalidConnection);
-
-    /// CIAO specific extension
-    void start ()
-      raises (StartError);
-
-    /// CIAO specific extention
-    /// Fetch NodeApplication based on the given node name
-    NodeApplication get_node_app (in string node_name)
-      raises (NoSuchName);
-
-    /// CIAO specific extension, it differs with the spec defined one
-    /// for no input parameter.
-    void destroyApplication ()
-      raises (StopError);
-
-    /// CIAO specific extension to destroy NodeApplicationManager
-    void destroyManager ()
-      raises (StopError);
-
-    /// CIAO specific extension
-    /// Perform the actual redeployment and reconfiguration on the dommain level.
-    void perform_redeployment (in DeploymentPlan new_plan)
-      raises (PlanError,
-              InstallationFailure,
-              UnknownImplId,
-              ImplEntryPointNotFound,
-              InvalidConnection,
-              InvalidProperty,
-              ::Components::RemoveFailure);
-  };
-
-  typedef sequence < DomainApplicationManager > DomainApplicationManagers;
-};
-
-#endif /* DOMAINAPPLICATIONMANAGER_IDL */
diff --git a/ciao_core_2/CIAO/ciao/Deployment_Events.idl b/ciao_core_2/CIAO/ciao/Deployment_Events.idl
deleted file mode 100644
index b0559dfe164..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_Events.idl
+++ /dev/null
@@ -1,95 +0,0 @@
-// $Id$
-
-/**
- * @file Deployment_Events.idl
- *
- * @brief A collection of IDL data types for CIAO pub/sub services deployment.
- *
- * @author Gan Deng
- */
-
-#if !defined (CIAO_DEPLOYMENT_EVENT_SERVICES_IDL)
-#define CIAO_DEPLOYMENT_EVENT_SERVICES_IDL
-
-#include "tao/StringSeq.pidl"
-
-// EventServiceType definition
-#include <ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl>
-
-module CIAO
-{
-  module DAnCE
-  {
-    /// Each element in the EventSourceSet denotes a event source id
-    typedef string EventSourceId;
-
-    typedef sequence<EventSourceId> EventSourceSet;
-
-    /// Event Filters
-    enum FilterType
-    {
-      CONJUNCTION,
-      DISJUNCTION,
-      LOGICAL_AND,
-      NEGATE
-    };
-
-    struct EventFilter
-    {
-      string name;
-      FilterType type;
-      EventSourceSet sources;
-    };
-    typedef sequence<EventFilter> EventFilters;
-
-    struct AddrServer
-    {
-      string name;
-      unsigned short port;
-      string address;
-    };
-    typedef sequence<AddrServer> AddrServers;
-
-    struct UDPSender
-    {
-      string name;
-      string addr_serv_id;
-    };
-    typedef sequence<UDPSender> UDPSenders;
-
-    struct UPDReceiver
-    {
-      string name;
-      string addr_serv_id;
-      boolean is_multicast;
-      unsigned short listen_port;
-    };
-    typedef sequence<UPDReceiver> UPDReceivers;
-/*
-    struct EventHandler
-    {
-      string name;
-      boolean is_multicast;
-    };
-    typedef sequence<EventHandler> EventHandlers;
-    */
-
-    /// CIAO specific extension to describe pub/sub services in the deployment
-    struct EventServiceDeploymentDescription
-    {
-      string name;
-      string node;
-      EventServiceType type;
-      string svc_cfg_file;
-
-      EventFilters filters;
-      AddrServers addr_servs;
-      UDPSenders senders;
-      UPDReceivers receivers;
-    };
-    typedef sequence < EventServiceDeploymentDescription >
-      EventServiceDeploymentDescriptions;
-  };
-};
-
-#endif /* CIAO_DEPLOYMENT_EVENT_SERVICES_IDL */
diff --git a/ciao_core_2/CIAO/ciao/Deployment_ExecutionManager.idl b/ciao_core_2/CIAO/ciao/Deployment_ExecutionManager.idl
deleted file mode 100644
index 710cdd73a48..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_ExecutionManager.idl
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-#ifndef EXECUTIONMANAGER_IDL
-#define EXECUTIONMANAGER_IDL
-
-#include "ciao/Deployment.idl"
-#include "ciao/Deployment_DomainApplicationManager.idl"
-
-module Deployment {
-  // @@changed
-  //   interface ExecutionManager
-  //   {
-  //     DomainApplicationManager preparePlan (in DeploymentPlan plan,
-  //                                           in ResourceCommitmentManager resourceCommitment)
-  //       raises (ResourceNotAvailable, PlanError, StartError);
-  //     DomainApplicationManagers getManagers ();
-  //     void destroyManager (in DomainApplicationManager manager)
-  //       raises (StopError);
-  //   };
-  
-  interface ExecutionManager {
-    /// @todo ResourceCommitmentManger is missing
-    DomainApplicationManager preparePlan (in DeploymentPlan plan,
-                                          in boolean commitResources)
-      raises (ResourceNotAvailable, PlanError, StartError);
-
-    DomainApplicationManagers getManagers ();
-
-    void destroyManager (in DomainApplicationManager manager)
-      raises (StopError);
-
-    /// CIAO Specific extension
-    DomainApplicationManager getManager (in string plan_uuid)
-      raises (PlanNotExist);
-
-    /// CIAO specific extention
-    /// Destroy ApplicationManagers by plan_uuid, the unique semantics of this
-    /// operation lies in the fact that if some components are
-    /// still up and running, then the ApplicationManagers won't be destroyed.
-    void destroyManagerByPlan (in string plan_uuid)
-      raises (StopError);
-
-    /// CIAO specific extention
-    /// "Get" operation, return the DeploymentPlan
-    DeploymentPlan getPlan (in string plan_uuid);
-
-    /// CIAO specific operation to handle dynamic system redeployment
-    /// and reconfiguration
-    /// This operation could handle dynamic redeployment, and this
-    /// is the operation exposed to clients directly. Other
-    /// "perform_redeployment" operation defined on DAM and NA
-    /// are implementaion details within DAnCE.
-    void perform_redeployment (in DeploymentPlan new_plan)
-      raises (PlanError,
-              InstallationFailure,
-              UnknownImplId,
-              ImplEntryPointNotFound,
-              InvalidConnection,
-              InvalidProperty,
-              ::Components::RemoveFailure);
-  };
-};
-
-#endif /* EXECUTIONMANAGER_IDL */
diff --git a/ciao_core_2/CIAO/ciao/Deployment_NodeApplication.idl b/ciao_core_2/CIAO/ciao/Deployment_NodeApplication.idl
deleted file mode 100644
index f80dda55369..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_NodeApplication.idl
+++ /dev/null
@@ -1,127 +0,0 @@
-// $Id$
-
-#if !defined (DEPLOYMENT_NODEAPPLICATION_IDL)
-#define DEPLOYMENT_NODEAPPLICATION_IDL
-
-#include "Deployment_Application.idl"
-#include "Deployment_Core.idl"
-#include "Deployment_Container.idl"
-#include "Deployment_Events.idl"
-
-// *************** Packaging and Deployment ***************
-module Deployment
-{
-  /// CIAO specific extension
-  /// This struct captures the installation information of a particular
-  /// CIAO_Event_Service, as defined in <ciaosvcs/Events/CIAO_Events.idl>
-  struct ESInstallationInfo
-  {
-    string id;
-    CIAO::EventServiceType type;
-    string svcconf;
-    //Properties es_config;
-  };
-
-  /// CIAO specific
-  struct NodeImplementationInfo
-  {
-    ContainerImplementationInfos impl_infos;
-    Properties nodeapp_config;
-  };
-
-  /// CIAO specific
-  typedef sequence<CIAO::CIAO_Event_Service> CIAO_Event_Services;
-
-  /// CIAO specific extension
-  typedef sequence<ESInstallationInfo> ESInstallationInfos;
-  
-  // @@changed
-  //interface NodeApplication : Application
-  //{  
-  //};
-  
-  interface NodeApplication : Application
-  {
-    /// CIAO specific extensions
-    readonly attribute ::Deployment::Properties properties;
-
-    /// CIAO specific operation to handle dynamic system redeployment
-    /// and reconfiguration
-    /// @@ Initialize the nodeapplication, so it will know what
-    ///    components it will create and home many of them are
-    ///    there. However the real create action will take place when
-    ///    start launch is called on NodeApplicationManager.
-    long init ();
-
-    /// @@ This operation will be called by NodeApplicationManager
-    ///    client to really start to create homes and components.
-    /// CIAO specific extensions
-    ComponentInfos install (in NodeImplementationInfo node_impl_info)
-      raises (UnknownImplId,
-              ImplEntryPointNotFound,
-              InstallationFailure,
-              ::Components::InvalidConfiguration,
-              ::Components::RemoveFailure);
-
-    /// CIAO specific extension
-    /// This operation will create one or more CIAO_Event_Service objects
-    /// within the NodeApplication, which will be used to mediate the
-    /// communication of CCM events
-    CIAO::CIAO_Event_Service install_es (
-      in CIAO::DAnCE::EventServiceDeploymentDescription es_info)
-      raises (InstallationFailure);
-
-    /// CIAO specific extensions
-    ///@@ We know that Deployment::NodeApplicationManager will be returned,
-    ///   however to avoid the size of the shared object of CIAO_Server.
-    ///   we return an Object.
-    Object get_node_application_manager ();
-
-    /// CIAO specific extension
-    Container create_container (in ::Deployment::Properties properties)
-      raises (::Components::CreateFailure,
-              ::Components::InvalidConfiguration);
-
-    /// CIAO specific extension
-    void remove_container (in Container cref)
-      raises (::Components::RemoveFailure);
-
-    /// CIAO specific extension
-    Containers get_containers ();
-
-    /// CIAO specific extension
-    /// Remove a component instance from the NodeApplication
-    void remove_component (in string inst_name)
-      raises (::Components::RemoveFailure);
-
-    /// CIAO specific extensions
-    /// Activate a component instance from the NodeApplication
-    void activate_component (in string inst_name)
-      raises (::Deployment::StartError);
-
-    /// CIAO specific extensions
-    /// Passivate a component instance from the NodeApplication
-    void passivate_component (in string inst_name)
-      raises (::Components::RemoveFailure);
-
-    /// Remove all containers, components and component homes.
-    /// Shuts down the ORB of the NodeApplication to terminate the process.
-    oneway void remove ();
-
-    /// CIAO specific extension. This will enforce the component to
-    /// be activated (preactivate, activate, postactivated) before the assembly
-    /// is established
-    void ciao_preactivate ()
-      raises (StartError);
-
-    /// CIAO specific extension
-    void ciao_postactivate ()
-      raises (StartError);
-
-    /// CIAO specific extension
-    void ciao_passivate ()
-      raises (StopError);
-  };
-
-};
-#endif /* DEPLOYMENT_CORE_IDL */
diff --git a/ciao_core_2/CIAO/ciao/Deployment_NodeApplicationManager.idl b/ciao_core_2/CIAO/ciao/Deployment_NodeApplicationManager.idl
deleted file mode 100644
index 9fc2aa09581..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_NodeApplicationManager.idl
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-#ifndef NODEAPPLICATIONMANAGER_IDL
-#define NODEAPPLICATIONMANAGER_IDL
-
-#include "Deployment_Core.idl"
-#include "Deployment_ApplicationManager.idl"
-#include "Deployment.idl"
-
-module Deployment {
-  /**
-   * CIAO specific structure to carry the scheduling params
-   * to set the process, required by RACE
-   * @struct Sched_Params
-   * @brief Carries Scheduling Params
-   */
-  struct Sched_Params
-  {
-    long policy_;
-    long priority_;
-    long scope_;
-    long msec_;
-  };
-
-  // @@changed:
-  // interface NodeApplicationManager :
-  //     ApplicationManager
-  //   {
-  //   };
-  
-  interface NodeApplicationManager :
-    ApplicationManager
-  {
-    /// CIAO specific operation to handle dynamic system redeployment
-    /// and reconfiguration
-    /// This operation could handle dynamic redeployment for
-    /// a node-level deployment plan within a node
-    /// @param add_or_remove If true, we add new components only, vice vesa.
-    Application perform_redeployment (in Properties configProperty,
-                                      out Connections providedReference,
-                                      in boolean add_or_remove,
-                                      in boolean start)
-      raises (PlanError,
-              InstallationFailure,
-              UnknownImplId,
-              ImplEntryPointNotFound,
-              InvalidConnection,
-              InvalidProperty,
-              ::Components::RemoveFailure);
-
-    /// CIAO specific operation to reset deployment plan
-    void reset_plan (in DeploymentPlan plan);
-
-    /// CIAO specific operation to set the information of
-    /// "shared components" (through NodeManager)
-    void set_shared_components (in ComponentPlans components);
-
-    /// CIAO specific function to set priority
-    /// of component, required by RACE
-    long set_priority (in string cid , in Sched_Params params);
-  };
-};
-
-#endif /* NODEAPPLICATIONMANAGER_IDL */
diff --git a/ciao_core_2/CIAO/ciao/Deployment_NodeManager.idl b/ciao_core_2/CIAO/ciao/Deployment_NodeManager.idl
deleted file mode 100644
index 45a810b3f30..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_NodeManager.idl
+++ /dev/null
@@ -1,71 +0,0 @@
-// $Id$
-#ifndef NODEMANAGER_IDL
-#define NODEMANAGER_IDL
-
-#include "ciao/Deployment.idl"
-#include "ciao/Deployment_Core.idl"
-#include "ciao/Deployment_TargetManager.idl"
-
-module Deployment {
-
-  interface Logger {
-  };
-
-  interface NodeApplicationManager;
-  
-  //@@changed
-//   interface NodeManager {
-//     void joinDomain (in Domain theDomain, in TargetManager manager, in
-//                      Logger log, in long updateInterval);
-//     void leaveDomain ();
-//     NodeApplicationManager preparePlan (in DeploymentPlan plan, in
-//                                         ResourceCommitmentManager resourceCommitment)
-//       raises (StartError, PlanError);
-//     void destroyManager (in NodeApplicationManager appManager)
-//       raises (StopError);
-//     Resources getDynamicResources ();
-//   };
-  
-  interface NodeManager {
-    /*
-     * @todo 06-02-01 mentions a 4th argument:in long updateInterval
-     */
-    void joinDomain (in Domain ciao_domain,
-                     in TargetManager manager,
-                     in Logger log);
-
-    void leaveDomain ();
-
-    /*
-     * @todo According to 06-02-01 there should also be a ResourceCommitmentManager
-     * as second argument
-     */
-    NodeApplicationManager preparePlan (in DeploymentPlan plan)
-      raises (StartError, PlanError);
-
-    /*
-     * @todo According to 06-02-01 InvalidReference shouldn't be here
-     */
-    void destroyManager (in NodeApplicationManager appManager)
-      raises (StopError, InvalidReference);
-
-    /// CIAO specific extension
-    /// Destroy the NAM and all the associated NAs with this child_plan
-    /// We can guarantee that the input DeploymentPlan is valid, since it
-    /// is fetched from the cached DeploymentPlan of DAM, which has been
-    /// validated before.
-    void destroyPlan (in DeploymentPlan plan)
-      raises (StopError);
-
-    /// CIAO specific extension
-    /// Get all the shared components installed in this node
-    ComponentPlans get_shared_components ();
-
-    /*
-     * @todo According to 06-02-01 missing is:
-     * Resources getDynamicResources ();
-     */
-  };
-};
-
-#endif /* NODEMANAGER_IDL */
diff --git a/ciao_core_2/CIAO/ciao/Deployment_Packaging_Data.idl b/ciao_core_2/CIAO/ciao/Deployment_Packaging_Data.idl
deleted file mode 100644
index d02745195b7..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_Packaging_Data.idl
+++ /dev/null
@@ -1,171 +0,0 @@
-// $Id$
-
-#ifndef PACKAGING_DATA_IDL
-#define PACKAGING_DATA_IDL
-
-#include "ciao/Deployment_Data.idl"
-
-module Deployment
-{
-  struct ComponentPackageImport {
-    ::CORBA::StringSeq location;
-  };
-
-  typedef sequence < ComponentPackageImport > ComponentPackageImports;
-
-  struct SubcomponentPropertyReference {
-    string propertyName;
-    unsigned long instanceRef;
-  };
-
-  struct SubcomponentPortEndpoint {
-    string portName;
-    unsigned long instanceRef;
-  };
-
-  typedef sequence < SubcomponentPortEndpoint > SubcomponentPortEndpoints;
-
-  typedef sequence < SubcomponentPropertyReference > SubcomponentPropertyReferences;
-
-  struct AssemblyPropertyMapping {
-    string name;
-    string externalName;
-    SubcomponentPropertyReferences delegatesTo;
-  };
-
-  typedef sequence < AssemblyPropertyMapping > AssemblyPropertyMappings;
-
-  struct NamedImplementationArtifact;
-
-  typedef sequence < NamedImplementationArtifact > NamedImplementationArtifacts;
-
-  struct ImplementationArtifactDescription {
-    string label;
-    string UUID;
-    ::CORBA::StringSeq location;
-    Properties execParameter;
-    Requirements deployRequirement;
-    NamedImplementationArtifacts dependsOn;
-    Properties infoProperty;
-  };
-
-  struct NamedImplementationArtifact {
-    string name;
-    ImplementationArtifactDescription referencedArtifact;
-  };
-  
-  // @@changed: order of members
-  struct MonolithicImplementationDescription {
-    Properties nodeExecParameter;
-    NamedImplementationArtifacts primaryArtifact;
-    ImplementationRequirements deployRequirement;
-    Properties componentExecParameter;
-  };
-
-  typedef sequence < MonolithicImplementationDescription > MonolithicImplementationDescriptions;
-
-  struct PackageConfiguration;
-
-  typedef sequence < PackageConfiguration > PackageConfigurations;
-
-  struct ComponentPackageDescription;
-
-  typedef sequence < ComponentPackageDescription > ComponentPackageDescriptions;
-
-  struct SubcomponentInstantiationDescription {
-    string name;
-    ComponentPackageDescriptions basePackage;
-    PackageConfigurations specializedConfig;
-    Requirements selectRequirement;
-    Properties configProperty;
-    ComponentPackageReferences referencedPackage;
-    ComponentPackageImports importedPackage;
-  };
-
-  typedef sequence < SubcomponentInstantiationDescription > SubcomponentInstantiationDescriptions;
-
-  struct AssemblyConnectionDescription {
-    string name;
-    Requirements deployRequirement;
-    ComponentExternalPortEndpoints externalEndpoint;
-    SubcomponentPortEndpoints internalEndpoint;
-    ExternalReferenceEndpoints externalReference;
-  };
-
-  typedef sequence < AssemblyConnectionDescription > AssemblyConnectionDescriptions;
-  
-  // @@added
-  enum LocalityKind {
-    SameNodeAnyProcess,
-    SameNodeSameProcess,
-    SameNodeDifferentProcess,
-    DifferentNode,
-    DifferentProcess,
-    NoConstraint
-  };
-  
-  // @@added
-  struct Locality {
-    LocalityKind constraint;
-    ::CORBA::ULongSeq constrainedInstanceRef; 
-  };
-    
-  struct ComponentAssemblyDescription {
-    SubcomponentInstantiationDescriptions instance;
-    AssemblyConnectionDescriptions connection;
-    AssemblyPropertyMappings externalProperty;
-    // @@added
-    // Localities localityConstraint;
-  };
-
-  typedef sequence < ComponentAssemblyDescription > ComponentAssemblyDescriptions;
-
-  struct ComponentImplementationDescription {
-    string label;
-    string UUID;
-    ComponentInterfaceDescription implements;
-    ComponentAssemblyDescriptions assemblyImpl;
-    MonolithicImplementationDescriptions monolithicImpl;
-    Properties configProperty;
-    Capabilities capability;
-    ImplementationDependencies dependsOn;
-    Properties infoProperty;
-  };
-
-
-  struct PackagedComponentImplementation {
-    string name;
-    ComponentImplementationDescription referencedImplementation;
-  };
-
-
-  typedef sequence < PackagedComponentImplementation > PackagedComponentImplementations;
-
-  struct ComponentPackageDescription {
-    string label;
-    string UUID;
-    ComponentInterfaceDescription realizes;
-    Properties configProperty;
-    PackagedComponentImplementations implementation;
-    Properties infoProperty;
-  };
-
-
-  struct PackageConfiguration {
-    string label;
-    string UUID;
-    ComponentPackageDescriptions basePackage;
-    PackageConfigurations specializedConfig;
-    Requirements selectRequirement;
-    Properties configProperty;
-    ComponentPackageReferences reference;
-    // @@changed, delete previous
-    //ComponentPackageReferences referencedPackage;
-    // @@add
-    ComponentPackageImports importedPackage;
-  };
-
-
-};
-
-#endif /* PACKAGING_DATA_IDL */
diff --git a/ciao_core_2/CIAO/ciao/Deployment_RepositoryManager.idl b/ciao_core_2/CIAO/ciao/Deployment_RepositoryManager.idl
deleted file mode 100644
index 539d2954416..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_RepositoryManager.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// $Id$
-#ifndef REPOSITORY_MANAGER_IDL
-#define REPOSITORY_MANAGER_IDL
-
-#include "ciao/Deployment_Packaging_Data.idl"
-#include "ciao/Deployment.idl"
-
-module Deployment {
-
-  exception NameExists {
-  };
-
-  exception PackageError {
-    string source;
-    string reason;
-  };
-
-  interface RepositoryManager {
-    void installPackage (in string installationName,
-                         in string location,
-                         in boolean replace)
-      raises (NameExists, PackageError);
-    void createPackage (in string installationName,
-                        in PackageConfiguration package,
-                        in string baseLocation,
-                        in boolean replace)
-      raises (NameExists, PackageError);
-    PackageConfiguration findPackageByName (in string name)
-      raises (NoSuchName);
-    PackageConfiguration findPackageByUUID (in string UUID)
-      raises (NoSuchName);
-    ::CORBA::StringSeq findNamesByType (in string type);
-    ::CORBA::StringSeq getAllNames ();
-    ::CORBA::StringSeq getAllTypes ();
-    void deletePackage (in string installationName)
-      raises (NoSuchName);
-  };
-};
-
-#endif /* REPOSITOR_MANAGER_IDL */
diff --git a/ciao_core_2/CIAO/ciao/Deployment_TargetData.idl b/ciao_core_2/CIAO/ciao/Deployment_TargetData.idl
deleted file mode 100644
index 049c04f95b8..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_TargetData.idl
+++ /dev/null
@@ -1,65 +0,0 @@
-//$Id$
-
-#ifndef DEPLOYMENT_TARGETDATA_IDL
-#define DEPLOYMENT_TARGETDATA_IDL
-
-#include "ciao/Deployment_Base.idl"
-#include "tao/StringSeq.pidl"
-#include "tao/ULongSeq.pidl"
-
-module Deployment {
-
-  struct Resource {
-    string name;
-    ::CORBA::StringSeq resourceType;
-    SatisfierProperties property;
-  };
-
-  typedef sequence < Resource > Resources;
-
-  struct SharedResource {
-    string name;
-    ::CORBA::StringSeq resourceType;
-    ::CORBA::ULongSeq nodeRef;
-    SatisfierProperties property;
-  };
-  typedef sequence < SharedResource > SharedResources;
-
-  struct Node {
-    string name;
-    string label;
-    ::CORBA::ULongSeq sharedResourceRef;
-    ::CORBA::ULongSeq connectionRef;
-    Resources resource;
-  };
-  typedef sequence < Node > Nodes;
-
-  struct Interconnect {
-    string name;
-    string label;
-    ::CORBA::ULongSeq connectionRef;
-    ::CORBA::ULongSeq connectRef;
-    Resources resource;
-  };
-  typedef sequence < Interconnect > Interconnects;
-
-  struct Bridge {
-    string name;
-    string label;
-    ::CORBA::ULongSeq connectRef;
-    Resources resource;
-  };
-  typedef sequence < Bridge > Bridges;
-
-  struct Domain {
-    string UUID;
-    string label;
-    SharedResources sharedResource;
-    Nodes node;
-    Interconnects interconnect;
-    Bridges bridge;
-    Properties infoProperty;
-  };
-};
-
-#endif /* DEPLOYMENT_TARGETDATA_IDL */
diff --git a/ciao_core_2/CIAO/ciao/Deployment_TargetManager.idl b/ciao_core_2/CIAO/ciao/Deployment_TargetManager.idl
deleted file mode 100644
index 7eb1ccc0412..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_TargetManager.idl
+++ /dev/null
@@ -1,76 +0,0 @@
-// $Id$
-
-#ifndef TARGETMANAGER_IDL
-#define TARGETMANAGER_IDL
-
-#include "ciao/Deployment_Target_Data.idl"
-#include "ciao/Deployment_TargetData.idl"
-#include "ciao/Deployment_DeploymentPlan.idl"
-// Only needed for ResourceNotAvailable but that should go, so this include also
-#include "ciao/Deployment_ApplicationManager.idl"
-
-module Deployment {
-
-  /// @todo, UpdateAvailable is not in the spec, must be UpdateDynamic
-  enum DomainUpdateKind {
-    Add,
-    Delete,
-    UpdateAll,
-    // @@changed
-    UpdateDynamic
-  };
-
-  /**
-   * @todo The ResourceCommitmentManager is part of 06-04-01 and this is not
-   * part of the Target Manager yet
-   */
-//   // @@add for conformance to 06-02-01
-//   struct ResourceAllocation {
-//     string elementName;
-//     string resourceName;
-//     Properties property;
-//   };
-  
-//   // @@added for conformance to 06-02-01
-//   exception ResourceCommitmentFailure {
-//     string reason;
-//     long index;
-//     string propertyName;
-//     ::CORBA::AnySeq propertyValue;
-//   };
-  
-//   // @@added for conformance to 06-02-01
-//   interface ResourceCommitmentManager {    
-//     void commitResources (in ResourceAllocations resources)
-//       raises (ResourceCommitmentFailure);
-
-//     void releaseResources (in ResourceAllocations resources)
-//       raises (ResourceCommitmentFailure);
-//   };
-  
-  interface TargetManager {
-    Domain getAllResources ();
-    Domain getAvailableResources ();
-    /// @todo 06-04-01 specifies this differently
-    void commitResources (in DeploymentPlan plan)
-      raises (ResourceNotAvailable, PlanError);
-    
-    // @@changed
-    //     ResourceCommitmentManager commitResources (in ResourceAllocations
-    //                                                resources)
-    //       raises (ResourceCommitmentFailure);
-    
-    // @@added
-    // void destroyResourceCommitment (in ResourceCommitmentManager manager);
-
-    /// @todo This is not part of 06-04-01
-    // @@delete:
-    void releaseResources (in DeploymentPlan argname);
-
-    void updateDomain (in ::CORBA::StringSeq elements,
-                       in Domain domainSubset,
-                       in DomainUpdateKind updateKind);
-  };
-};
-
-#endif /* TARGETMANAGER_IDL */
diff --git a/ciao_core_2/CIAO/ciao/Deployment_Target_Data.idl b/ciao_core_2/CIAO/ciao/Deployment_Target_Data.idl
deleted file mode 100644
index 0e08248972a..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_Target_Data.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-// $Id$
-
-#ifndef TARGET_DATA_IDL
-#define TARGET_DATA_IDL
-
-module Deployment {
-
-  exception PlanError {
-    string name;
-    string reason;
-  };
-};
-
-#endif /* TARGET_DATA_IDL */
diff --git a/ciao_core_2/CIAO/ciao/Deployment_common.h b/ciao_core_2/CIAO/ciao/Deployment_common.h
deleted file mode 100644
index 725b6afd953..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_common.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// $Id$
-
-/**
- * @file Deployment_common.h
- *
- * This file collects common type definitions used across different
- * objects of DAnCE toolchain.
- *
- * @author Gan Deng <dengg@dre.vanderbilt.edu>
- */
-
-#ifndef DANCE_COMMON_H
-#define DANCE_COMMON_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined ACE_LACKS_PRAGMA_ONCE
-#pragma once
-#endif /* ! ACE_LACKS_PRAGMA_ONCE */
-
-/// A struct which captures the binding information about a component
-
-namespace CIAO
-{
-  /// A struct which captures the compnent  binding information, which
-  /// is useful for inter-assembly connection setup
-  typedef struct _component_binding
-  {
-    _component_binding ()
-    {
-      providedReference_ = 0;
-    }
-
-    ACE_CString name_;
-    ACE_CString plan_uuid_;
-    ACE_CString node_;
-
-    Deployment::Connections_var providedReference_;
-
-    bool operator==(const struct _component_binding & comp)
-    {
-      if (this->name_ == comp.name_ &&
-          this->plan_uuid_ == comp.plan_uuid_ &&
-          this->node_ == comp.node_)
-        return true;
-      else
-        return false;
-    }
-  } Component_Binding_Info;
-}
-
-#include /**/ "ace/post.h"
-#endif /* DANCE_COMMON_H */
diff --git a/ciao_core_2/CIAO/ciao/Deployment_stub_export.h b/ciao_core_2/CIAO/ciao/Deployment_stub_export.h
deleted file mode 100644
index 12985a68b5b..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -s Deployment_stub
-// ------------------------------
-#ifndef DEPLOYMENT_STUB_EXPORT_H
-#define DEPLOYMENT_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DEPLOYMENT_STUB_HAS_DLL)
-#  define DEPLOYMENT_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DEPLOYMENT_STUB_HAS_DLL */
-
-#if !defined (DEPLOYMENT_STUB_HAS_DLL)
-#  define DEPLOYMENT_STUB_HAS_DLL 1
-#endif /* ! DEPLOYMENT_STUB_HAS_DLL */
-
-#if defined (DEPLOYMENT_STUB_HAS_DLL) && (DEPLOYMENT_STUB_HAS_DLL == 1)
-#  if defined (DEPLOYMENT_STUB_BUILD_DLL)
-#    define Deployment_stub_Export ACE_Proper_Export_Flag
-#    define DEPLOYMENT_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DEPLOYMENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DEPLOYMENT_STUB_BUILD_DLL */
-#    define Deployment_stub_Export ACE_Proper_Import_Flag
-#    define DEPLOYMENT_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DEPLOYMENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DEPLOYMENT_STUB_BUILD_DLL */
-#else /* DEPLOYMENT_STUB_HAS_DLL == 1 */
-#  define Deployment_stub_Export
-#  define DEPLOYMENT_STUB_SINGLETON_DECLARATION(T)
-#  define DEPLOYMENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DEPLOYMENT_STUB_HAS_DLL == 1 */
-
-// Set DEPLOYMENT_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (DEPLOYMENT_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define DEPLOYMENT_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define DEPLOYMENT_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !DEPLOYMENT_STUB_NTRACE */
-
-#if (DEPLOYMENT_STUB_NTRACE == 1)
-#  define DEPLOYMENT_STUB_TRACE(X)
-#else /* (DEPLOYMENT_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DEPLOYMENT_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (DEPLOYMENT_STUB_NTRACE == 1) */
-
-#endif /* DEPLOYMENT_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/ciao_core_2/CIAO/ciao/Deployment_svnt_export.h b/ciao_core_2/CIAO/ciao/Deployment_svnt_export.h
deleted file mode 100644
index e403dbf0c41..00000000000
--- a/ciao_core_2/CIAO/ciao/Deployment_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -s Deployment_svnt
-// ------------------------------
-#ifndef DEPLOYMENT_SVNT_EXPORT_H
-#define DEPLOYMENT_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DEPLOYMENT_SVNT_HAS_DLL)
-#  define DEPLOYMENT_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DEPLOYMENT_SVNT_HAS_DLL */
-
-#if !defined (DEPLOYMENT_SVNT_HAS_DLL)
-#  define DEPLOYMENT_SVNT_HAS_DLL 1
-#endif /* ! DEPLOYMENT_SVNT_HAS_DLL */
-
-#if defined (DEPLOYMENT_SVNT_HAS_DLL) && (DEPLOYMENT_SVNT_HAS_DLL == 1)
-#  if defined (DEPLOYMENT_SVNT_BUILD_DLL)
-#    define Deployment_svnt_Export ACE_Proper_Export_Flag
-#    define DEPLOYMENT_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DEPLOYMENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DEPLOYMENT_SVNT_BUILD_DLL */
-#    define Deployment_svnt_Export ACE_Proper_Import_Flag
-#    define DEPLOYMENT_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DEPLOYMENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DEPLOYMENT_SVNT_BUILD_DLL */
-#else /* DEPLOYMENT_SVNT_HAS_DLL == 1 */
-#  define Deployment_svnt_Export
-#  define DEPLOYMENT_SVNT_SINGLETON_DECLARATION(T)
-#  define DEPLOYMENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DEPLOYMENT_SVNT_HAS_DLL == 1 */
-
-// Set DEPLOYMENT_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (DEPLOYMENT_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define DEPLOYMENT_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define DEPLOYMENT_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !DEPLOYMENT_SVNT_NTRACE */
-
-#if (DEPLOYMENT_SVNT_NTRACE == 1)
-#  define DEPLOYMENT_SVNT_TRACE(X)
-#else /* (DEPLOYMENT_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DEPLOYMENT_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (DEPLOYMENT_SVNT_NTRACE == 1) */
-
-#endif /* DEPLOYMENT_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/ciao_core_2/CIAO/ciao/Dynamic_Component_Activator.h b/ciao_core_2/CIAO/ciao/Dynamic_Component_Activator.h
index aec2aaf79f5..8e709703db6 100644
--- a/ciao_core_2/CIAO/ciao/Dynamic_Component_Activator.h
+++ b/ciao_core_2/CIAO/ciao/Dynamic_Component_Activator.h
@@ -22,7 +22,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ciao/CCM_ContainerC.h"
-#include "ciao/Deployment_CoreC.h"
+#include "DAnCE/Deployment/Deployment_CoreC.h"
 
 #include "tao/PortableServer/Key_Adapters.h"
 #include "tao/PortableServer/PortableServer.h"
diff --git a/ciao_core_2/CIAO/ciao/NodeApp_CB_Impl.cpp b/ciao_core_2/CIAO/ciao/NodeApp_CB_Impl.cpp
deleted file mode 100644
index c87e80f9333..00000000000
--- a/ciao_core_2/CIAO/ciao/NodeApp_CB_Impl.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// $Id$
-#include "NodeApp_CB_Impl.h"
-
-CIAO::NodeApplication_Callback_Impl::
-NodeApplication_Callback_Impl  (CORBA::ORB_ptr o,
-                                PortableServer::POA_ptr p,
-                                Deployment::NodeApplicationManager_ptr s,
-                                const Deployment::Properties &properties)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  : orb_ (CORBA::ORB::_duplicate (o)),
-    poa_ (PortableServer::POA::_duplicate (p)),
-    nam_ (Deployment::NodeApplicationManager::_duplicate (s))
-{
-  try
-  {
-    //@@ Note: this properties is useless unless
-    //   we have some specific properties for the callback obj.
-    Deployment::Properties * tmp = 0;
-    ACE_NEW_THROW_EX (tmp,
-                    Deployment::Properties (properties),
-                    CORBA::NO_MEMORY ());
-    this->properties_ = tmp;
-  }
-  catch (const CORBA::Exception& ex)
-  {
-    ex._tao_print_exception ("NodeApp_CB_Impl::Constructor\t\n");
-    throw;
-  }
-}
-
-CIAO::NodeApplication_Callback_Impl::~NodeApplication_Callback_Impl ()
-{
-}
-
-PortableServer::POA_ptr
-CIAO::NodeApplication_Callback_Impl::_default_POA (void)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-Deployment::NodeApplicationManager_ptr
-CIAO::NodeApplication_Callback_Impl::register_node_application (
-    Deployment::NodeApplication_ptr na,
-    Deployment::Properties_out properties)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  properties = this->properties_._retn ();
-
-  this->nodeapp_ = Deployment::NodeApplication::_duplicate (na);
-  return Deployment::NodeApplicationManager::_duplicate (this->nam_.in ());
-}
-
-Deployment::NodeApplication_ptr
-CIAO::NodeApplication_Callback_Impl::get_nodeapp_ref (void)
-{
-  // @@ (OO) How are you relinquishing ownership here?  Since you're
-  //         duplicating the reference you actually maintain
-  //         ownership.  Is the below comment wrong, or is the code
-  //         wrong?
-
-  // Relinquish the ownership of the nodeapplication reference.
-  //This method should only be called from the NodeApplicationManager.
-  return Deployment::NodeApplication::_duplicate (this->nodeapp_.in ());
-}
diff --git a/ciao_core_2/CIAO/ciao/NodeApp_CB_Impl.h b/ciao_core_2/CIAO/ciao/NodeApp_CB_Impl.h
deleted file mode 100644
index bd5c5fd7711..00000000000
--- a/ciao_core_2/CIAO/ciao/NodeApp_CB_Impl.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-// $Id$
-//=============================================================================
-/**
- *  @file    NodeApp_CB_Impl.h
- *
- *  @author Nanbor Wang <nanbor@cs.wustl.edu>
- *          Tao    Lu   <lu@dre.vanderbilt.edu>
- *
- //===========================================================================*/
-
-
-#ifndef NODEAPPLICATION_CALLBACK_IMPL_H
-#define NODEAPPLICATION_CALLBACK_IMPL_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "CIAO_NodeApplication_CallBackS.h"
-
-namespace CIAO
-{
-  /**
-   * @class NodeApplication_Callback_Impl
-   *
-   * @brief A call back interface for NodeApplication
-   * @Note  Here is no need to be thread safe since for every nodeapplication
-   *        we will have an unique callback object. --Tao
-   */
-  class Deployment_svnt_Export NodeApplication_Callback_Impl
-    : public virtual POA_CIAO::NodeApplication_Callback
-  {
-  public:
-    friend class NodeApplicationManager_Impl;
-
-    /// Constructor.
-    NodeApplication_Callback_Impl (CORBA::ORB_ptr o,
-                                   PortableServer::POA_ptr p,
-                                   Deployment::NodeApplicationManager_ptr s,
-                                   const Deployment::Properties &properties)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Get the containing POA.  This operation does *not* increase
-    /// the reference count of the POA.
-    virtual PortableServer::POA_ptr _default_POA (void);
-
-    /// Record the NodeApplication reference returned by the newly
-    /// spawned NodeApplication and give it back a reference to
-    /// NodeApplicationManager
-    Deployment::NodeApplicationManager_ptr
-    register_node_application (Deployment::NodeApplication_ptr na,
-                               Deployment::Properties_out properties)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    Deployment::NodeApplication_ptr get_nodeapp_ref (void);
-
-  protected:
-    /// Destructor.
-    ~NodeApplication_Callback_Impl ();
-
-    CORBA::ORB_var orb_;
-
-    PortableServer::POA_var poa_;
-
-    Deployment::NodeApplicationManager_var nam_;
-
-    Deployment::NodeApplication_var nodeapp_;
-
-    Deployment::Properties_var properties_;
-  };
-}
-
-#include /**/ "ace/post.h"
-#endif /* NODEAPPLICATION_CALLBACK_IMPL_H */
diff --git a/ciao_core_2/CIAO/ciao/Swapping_Container.h b/ciao_core_2/CIAO/ciao/Swapping_Container.h
index 98231eef33c..16a0eeaf2fb 100644
--- a/ciao_core_2/CIAO/ciao/Swapping_Container.h
+++ b/ciao_core_2/CIAO/ciao/Swapping_Container.h
@@ -25,7 +25,7 @@
 #include "tao/PortableServer/Servant_Base.h"
 #include "ciao/CCM_ContainerC.h"
 #include "ciao/Container_Base.h"
-#include "ciao/Deployment_CoreC.h"
+#include "DAnCE/Deployment/Deployment_CoreC.h"
 #include "ciao/Dynamic_Component_Activator.h"
 #include "ciao/CIAO_Server_Export.h"
 #include "ciao/Servant_Activator.h"