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

35 files changed, 44 insertions, 44 deletions

diff --git a/ciao_core_2/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h b/ciao_core_2/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h
index af17d4357ed..cd6d13b9f0c 100644
--- a/ciao_core_2/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h
+++ b/ciao_core_2/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h
@@ -23,7 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ciao/Deployment_NodeManagerC.h"
+#include "DAnCE/Deployment/Deployment_NodeManagerC.h"
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
 #include "ace/SString.h"
diff --git a/ciao_core_2/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/ciao_core_2/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index 0b2cd68766b..ab2b073d699 100644
--- a/ciao_core_2/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/ciao_core_2/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -2,7 +2,7 @@
 
 #include "DomainApplicationManager_Impl.h"
 #include "ExecutionManager/Execution_Manager_Impl.h"
-#include "ciao/Deployment_NodeApplicationManagerC.h"
+#include "DAnCE/Deployment/Deployment_NodeApplicationManagerC.h"
 #include "ace/Null_Mutex.h"
 #include "ace/OS_NS_string.h"
 #include "ace/SString.h"
diff --git a/ciao_core_2/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h b/ciao_core_2/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
index f9ebd9dba06..d060beee707 100644
--- a/ciao_core_2/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
+++ b/ciao_core_2/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
@@ -29,14 +29,14 @@
 #include "ace/Functor.h"
 #include "ace/OS_NS_string.h"
 
-#include "ciao/Deployment_DomainApplicationManagerS.h"
-#include "ciao/Deployment_common.h"
+#include "DAnCE/Deployment/Deployment_DomainApplicationManagerS.h"
+#include "DAnCE/Deployment/Deployment_common.h"
 
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
 
 #include "ciao/CIAO_common.h"
-#include "ciao/Deployment_EventsC.h"
+#include "DAnCE/Deployment/Deployment_EventsC.h"
 
 #include "Deployment_Configuration.h"
 #include "DomainApplicationManager_Export.h"
diff --git a/ciao_core_2/CIAO/DAnCE/ExecutionManager/DAM_Map.h b/ciao_core_2/CIAO/DAnCE/ExecutionManager/DAM_Map.h
index dc4e07e5155..734b953d912 100644
--- a/ciao_core_2/CIAO/DAnCE/ExecutionManager/DAM_Map.h
+++ b/ciao_core_2/CIAO/DAnCE/ExecutionManager/DAM_Map.h
@@ -13,7 +13,7 @@
 #define CIAO_DAM_MAP_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/Deployment_DomainApplicationManagerC.h"
+#include "DAnCE/Deployment/Deployment_DomainApplicationManagerC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ciao_core_2/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc b/ciao_core_2/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
index 736eaa5f885..2e2ce4693eb 100644
--- a/ciao_core_2/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
+++ b/ciao_core_2/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(ExecutionManager): ciao_server_dnc, dance_extension_stub, ciao_domainapplicationmanager_dnc, ciao_executionmanager_stub {
+project(ExecutionManager): ciao_server_dnc, dance_extension_stub, ciao_domainapplicationmanager_dnc, ciao_executionmanager_stub, ciaoexe {
   exename = Execution_Manager
 
   IDL_Files {
diff --git a/ciao_core_2/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h b/ciao_core_2/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h
index 9da6d172565..1be6c56e6dc 100644
--- a/ciao_core_2/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h
+++ b/ciao_core_2/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h
@@ -24,7 +24,7 @@
 
 #include "DAM_Map.h"
 #include "ace/SString.h"
-#include "ciao/Deployment_common.h"
+#include "DAnCE/Deployment/Deployment_common.h"
 
 namespace CIAO
 {
@@ -48,7 +48,7 @@ namespace CIAO
                               const char * init_file);
 
       /// Template methods from ExecutionManagerDaemon, please see
-      /// $CIAO_ROOT/ciao/Deployment.idl for documentation
+      /// $CIAO_ROOT/DAnCE/Deployment/Deployment.idl for documentation
       virtual Deployment::DomainApplicationManager_ptr
       preparePlan (const Deployment::DeploymentPlan & plan,
                    CORBA::Boolean commitResources)
diff --git a/ciao_core_2/CIAO/DAnCE/Interfaces/ExecutionManagerDaemon.idl b/ciao_core_2/CIAO/DAnCE/Interfaces/ExecutionManagerDaemon.idl
index 01942fd3afa..6bc330ff25e 100644
--- a/ciao_core_2/CIAO/DAnCE/Interfaces/ExecutionManagerDaemon.idl
+++ b/ciao_core_2/CIAO/DAnCE/Interfaces/ExecutionManagerDaemon.idl
@@ -8,7 +8,7 @@
  * to terminate the process cleanly.
  */
 
-#include "ciao/Deployment_ExecutionManager.idl"
+#include "DAnCE/Deployment/Deployment_ExecutionManager.idl"
 
 module CIAO
 {
diff --git a/ciao_core_2/CIAO/DAnCE/Interfaces/NodeManagerDaemon.idl b/ciao_core_2/CIAO/DAnCE/Interfaces/NodeManagerDaemon.idl
index 617df0f080f..2daf535031a 100644
--- a/ciao_core_2/CIAO/DAnCE/Interfaces/NodeManagerDaemon.idl
+++ b/ciao_core_2/CIAO/DAnCE/Interfaces/NodeManagerDaemon.idl
@@ -6,8 +6,8 @@
  * @brief Controling interface for managing and controling CIAO daemon.
  */
 
-#include "ciao/Deployment_NodeManager.idl"
-#include "ciao/Deployment_NodeApplicationManager.idl"
+#include "DAnCE/Deployment/Deployment_NodeManager.idl"
+#include "DAnCE/Deployment/Deployment_NodeApplicationManager.idl"
 
 module CIAO
 {
diff --git a/ciao_core_2/CIAO/DAnCE/NodeApplication/Container_Impl.h b/ciao_core_2/CIAO/DAnCE/NodeApplication/Container_Impl.h
index 7becc7b8e9e..fd2f0ad45eb 100644
--- a/ciao_core_2/CIAO/DAnCE/NodeApplication/Container_Impl.h
+++ b/ciao_core_2/CIAO/DAnCE/NodeApplication/Container_Impl.h
@@ -25,8 +25,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ciao/Deployment_ContainerS.h"
-#include "ciao/Deployment_NodeApplicationC.h"
+#include "DAnCE/Deployment/Deployment_ContainerS.h"
+#include "DAnCE/Deployment/Deployment_NodeApplicationC.h"
 #include "ciao/Container_Base.h"
 #include "ace/SString.h"
 #include "ciao/Server_init.h"  // write_IOR function & NameUtility
diff --git a/ciao_core_2/CIAO/DAnCE/NodeApplication/NodeApp_Configurator.h b/ciao_core_2/CIAO/DAnCE/NodeApplication/NodeApp_Configurator.h
index b3eb92b4482..918dbb1d860 100644
--- a/ciao_core_2/CIAO/DAnCE/NodeApplication/NodeApp_Configurator.h
+++ b/ciao_core_2/CIAO/DAnCE/NodeApplication/NodeApp_Configurator.h
@@ -20,7 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ciao/Deployment_CoreC.h"
+#include "DAnCE/Deployment/Deployment_CoreC.h"
 
 namespace CIAO
 {
diff --git a/ciao_core_2/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp b/ciao_core_2/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp
index eef577b2cfd..fc7a8a380ea 100644
--- a/ciao_core_2/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp
+++ b/ciao_core_2/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ciao/CIAO_NodeApplication_CallBackC.h"
+#include "DAnCE/Deployment/CIAO_NodeApplication_CallBackC.h"
 #include "ace/Sched_Params.h"
 #include "NodeApplication_Impl.h"
 #include "NodeApplication_Core.h"
diff --git a/ciao_core_2/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/ciao_core_2/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index 97c29a67882..255765d1bae 100644
--- a/ciao_core_2/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/ciao_core_2/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -3,7 +3,7 @@
 #include "NodeApplication_Impl.h"
 #include "ace/SString.h"
 #include "Container_Impl.h"
-#include "Deployment_EventsC.h"
+#include "DAnCE/Deployment/Deployment_EventsC.h"
 #include "ciaosvcs/Events/CIAO_RTEC/CIAO_RTEventC.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/ciao_core_2/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h b/ciao_core_2/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
index c412b1aa9f5..649c0d7c652 100644
--- a/ciao_core_2/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
+++ b/ciao_core_2/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
@@ -26,7 +26,7 @@
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager_T.h"
 #include "tao/ORB.h"
-#include "ciao/Deployment_NodeApplicationS.h"
+#include "DAnCE/Deployment/Deployment_NodeApplicationS.h"
 #include "ciao/Server_init.h"
 #include "ciao/CIAO_common.h"
 #include "ciao/Object_Set_T.h"
diff --git a/ciao_core_2/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h b/ciao_core_2/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h
index 514a13cb797..4ab25f9d301 100644
--- a/ciao_core_2/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h
+++ b/ciao_core_2/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h
@@ -25,7 +25,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/RTCORBA/RTCORBA.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 #include "ace/Null_Mutex.h"
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager_T.h"
diff --git a/ciao_core_2/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.cpp b/ciao_core_2/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.cpp
index 741d4263188..04e7bd91f74 100644
--- a/ciao_core_2/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.cpp
+++ b/ciao_core_2/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "RTNodeApp_Configurator.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
 
 CIAO::RTNodeApp_Configurator::~RTNodeApp_Configurator ()
diff --git a/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp b/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
index e31a2e6bc91..a433c9e180b 100644
--- a/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
+++ b/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
@@ -3,7 +3,7 @@
 #include "Containers_Info_Map.h"
 #include "ciao/CIAO_Config.h"
 #include "ciao/CIAO_common.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 
 //Added for HTTP
 #include "URL_Parser.h"              //for parsing the URL
diff --git a/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h b/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
index 93f6b70c5cc..237ecf07c86 100644
--- a/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
+++ b/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
@@ -19,8 +19,8 @@
 //added for the HTTP support
 #include "ace/Message_Block.h"      //for ACE_Message_Block
 
-#include "ciao/Deployment_ContainerC.h"
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/Deployment_ContainerC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 #include "ace/SString.h"
 #include "CIAO_NAM_Export.h"
 
diff --git a/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp b/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
index af905369dcf..0ae9f9b0175 100644
--- a/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
+++ b/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
@@ -3,7 +3,7 @@
 #define CIAO_IMPLEMENTATION_INFO_CPP
 
 #include "ImplementationInfo.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 #include "ace/SString.h"
 
 CIAO::NodeImplementationInfoHandler::
diff --git a/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h b/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h
index 2b935d9d637..4109fee1a21 100644
--- a/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h
+++ b/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h
@@ -21,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ciao/Deployment_NodeApplicationC.h"
+#include "DAnCE/Deployment/Deployment_NodeApplicationC.h"
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager.h"
 #include "Containers_Info_Map.h"
diff --git a/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
index 3c26013ef9f..fdc5ba34149 100644
--- a/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+++ b/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
@@ -8,7 +8,7 @@
 #include "ace/Sched_Params.h"
 #include "ace/Vector_T.h"
 #include "ciao/Container_Base.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 #include "NodeApplication/NodeApplication_Impl.h"
 #include "ace/Reactor.h"
 
diff --git a/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h b/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
index 5ea55596f1b..670c41c237f 100644
--- a/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
+++ b/ciao_core_2/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
@@ -29,8 +29,8 @@
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/OS_NS_sys_wait.h"
 #include "ace/Process_Manager.h"
-#include "ciao/NodeApp_CB_Impl.h"
-#include "ciao/Deployment_NodeApplicationManagerS.h"
+#include "DAnCE/Deployment/NodeApp_CB_Impl.h"
+#include "DAnCE/Deployment/Deployment_NodeApplicationManagerS.h"
 #include "ciao/CIAO_common.h"
 #include "CIAO_NAM_Export.h"
 #include "ImplementationInfo.h"
diff --git a/ciao_core_2/CIAO/DAnCE/NodeManager/BaseMonitor.h b/ciao_core_2/CIAO/DAnCE/NodeManager/BaseMonitor.h
index d05e798b523..5fe6a950908 100644
--- a/ciao_core_2/CIAO/DAnCE/NodeManager/BaseMonitor.h
+++ b/ciao_core_2/CIAO/DAnCE/NodeManager/BaseMonitor.h
@@ -13,7 +13,7 @@
 #ifndef MONITOR_BASEH
 #define MONITOR_BASEH
 #include "tao/ORB.h"
-#include "ciao/Deployment_TargetManagerC.h"
+#include "DAnCE/Deployment/Deployment_TargetManagerC.h"
 
 namespace CIAO
 {
diff --git a/ciao_core_2/CIAO/DAnCE/NodeManager/MonitorCB.h b/ciao_core_2/CIAO/DAnCE/NodeManager/MonitorCB.h
index 777625bc9e0..5d4f2d8a58a 100644
--- a/ciao_core_2/CIAO/DAnCE/NodeManager/MonitorCB.h
+++ b/ciao_core_2/CIAO/DAnCE/NodeManager/MonitorCB.h
@@ -14,7 +14,7 @@
 #ifndef MONITOR_CBH
 #define MONITOR_CBH
 
-#include "ciao/Deployment_TargetManagerC.h"
+#include "DAnCE/Deployment/Deployment_TargetManagerC.h"
 
 /**
  * @namespace CIAO
diff --git a/ciao_core_2/CIAO/DAnCE/NodeManager/MonitorController.h b/ciao_core_2/CIAO/DAnCE/NodeManager/MonitorController.h
index 4da2dfb322f..85d82c2cf3b 100644
--- a/ciao_core_2/CIAO/DAnCE/NodeManager/MonitorController.h
+++ b/ciao_core_2/CIAO/DAnCE/NodeManager/MonitorController.h
@@ -16,9 +16,9 @@
 #define MONITOR_CONTROLLER_H
 
 #include "NodeManager_svnt_export.h"
-#include "Deployment_BaseC.h"
+#include "DAnCE/Deployment/Deployment_BaseC.h"
 
-#include "TargetManager/TargetManagerImplC.h"
+#include "DAnCE/TargetManager/TargetManagerImplC.h"
 #include "ace/Task.h"
 #include "ace/Auto_Ptr.h"
 
diff --git a/ciao_core_2/CIAO/DAnCE/Plan_Generator/PCVisitorBase.h b/ciao_core_2/CIAO/DAnCE/Plan_Generator/PCVisitorBase.h
index ac34dc4d261..a8bd64ad939 100644
--- a/ciao_core_2/CIAO/DAnCE/Plan_Generator/PCVisitorBase.h
+++ b/ciao_core_2/CIAO/DAnCE/Plan_Generator/PCVisitorBase.h
@@ -21,7 +21,7 @@
 #define PC_VISITOR_BASE_H
 
 #include /**/ "ace/pre.h"
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 
 //========================================================================
 /**
diff --git a/ciao_core_2/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.h b/ciao_core_2/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.h
index 3fbfef3a9c6..98392e4f549 100644
--- a/ciao_core_2/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.h
+++ b/ciao_core_2/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.h
@@ -10,7 +10,7 @@
 #ifndef PLAN_GENERATOR_IMPL_H
 #define PLAN_GENERATOR_IMPL_H
 
-#include "ciao/Deployment_RepositoryManagerC.h"
+#include "DAnCE/Deployment/Deployment_RepositoryManagerC.h"
 #include "Plan_Generator_Impl_Export.h"
 
 namespace CIAO
diff --git a/ciao_core_2/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp b/ciao_core_2/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
index d2ce75e8666..1acd3d8c4b9 100644
--- a/ciao_core_2/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
+++ b/ciao_core_2/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "ace/Log_Msg.h"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "PC_Updater.h"
 #include "PC_Updater_T.h"
 #include "ace/Containers_T.h"        //for ACE_Double_Linked_List
diff --git a/ciao_core_2/CIAO/DAnCE/RepositoryManager/PC_Updater.h b/ciao_core_2/CIAO/DAnCE/RepositoryManager/PC_Updater.h
index 9c6d326f54d..5b22e249331 100644
--- a/ciao_core_2/CIAO/DAnCE/RepositoryManager/PC_Updater.h
+++ b/ciao_core_2/CIAO/DAnCE/RepositoryManager/PC_Updater.h
@@ -19,7 +19,7 @@
 #define PC_UPDATER_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 #include "ace/SString.h"             //for the ACE_CString
 
 #include "ZIP_Wrapper.h"             //Wrapper around zzip
diff --git a/ciao_core_2/CIAO/DAnCE/RepositoryManager/RM_Helper.h b/ciao_core_2/CIAO/DAnCE/RepositoryManager/RM_Helper.h
index f76764e3b11..47e46d35a6f 100644
--- a/ciao_core_2/CIAO/DAnCE/RepositoryManager/RM_Helper.h
+++ b/ciao_core_2/CIAO/DAnCE/RepositoryManager/RM_Helper.h
@@ -19,7 +19,7 @@
 #define RM_HELPER_H_
 
 
-#include "ciao/Deployment_Packaging_DataC.h"
+#include "DAnCE/Deployment/Deployment_Packaging_DataC.h"
 #include "tao/CDR.h"
 #include "ace/Message_Block.h"
 
diff --git a/ciao_core_2/CIAO/DAnCE/RepositoryManager/RepositoryManagerDaemon.idl b/ciao_core_2/CIAO/DAnCE/RepositoryManager/RepositoryManagerDaemon.idl
index 7f28e7d5683..9deac4abd0e 100644
--- a/ciao_core_2/CIAO/DAnCE/RepositoryManager/RepositoryManagerDaemon.idl
+++ b/ciao_core_2/CIAO/DAnCE/RepositoryManager/RepositoryManagerDaemon.idl
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ciao/Deployment_RepositoryManager.idl"
+#include "DAnCE/Deployment/Deployment_RepositoryManager.idl"
 
 module CIAO
 {
diff --git a/ciao_core_2/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp b/ciao_core_2/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
index d98d9405588..21daa8bce27 100644
--- a/ciao_core_2/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+++ b/ciao_core_2/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
@@ -31,8 +31,8 @@
 #include "ace/Malloc_Allocator.h"       //for ACE_New_Allocator
 
 //for the PackageConfiguration parsing
-#include "ciao/Deployment_DataC.h"
-#include "ciao/Deployment_Packaging_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_Packaging_DataC.h"
 #include "Package_Handlers/PCD_Handler.h"
 
 #include "RM_Helper.h"            //to be able to externalize/internalize a PackageConfiguration
diff --git a/ciao_core_2/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp b/ciao_core_2/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
index 74183901b80..0c4da950558 100644
--- a/ciao_core_2/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
+++ b/ciao_core_2/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
@@ -3,7 +3,7 @@
 // This test tries to install a set of components in 2 different containers, which
 // is hosted in the same NodeApplication.
 
-#include "Deployment_NodeApplicationC.h"
+#include "DAnCE/Deployment/Deployment_NodeApplicationC.h"
 #include "Client_init.h"
 #include "NodeAppTest_RoundTripC.h"
 #include "ace/Get_Opt.h"
diff --git a/ciao_core_2/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp b/ciao_core_2/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp
index 366435fcd53..4feda3109de 100644
--- a/ciao_core_2/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp
+++ b/ciao_core_2/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Deployment_NodeApplicationC.h"
+#include "DAnCE/Deployment/Deployment_NodeApplicationC.h"
 #include "Client_init.h"
 #include "NodeAppTest_RoundTripC.h"
 #include "ace/Get_Opt.h"
diff --git a/ciao_core_2/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp b/ciao_core_2/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
index 73f0e5a9e85..28cf0fdc557 100644
--- a/ciao_core_2/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
+++ b/ciao_core_2/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ciao/Deployment_NodeApplicationC.h"
+#include "DAnCE/Deployment/Deployment_NodeApplicationC.h"
 #include "ciao/Client_init.h"
 #include "NodeAppTest_RoundTripC.h"
 #include "ace/Get_Opt.h"
diff --git a/ciao_core_2/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp b/ciao_core_2/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
index e754e9e7d74..1670995ad58 100644
--- a/ciao_core_2/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
+++ b/ciao_core_2/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Deployment_NodeApplicationC.h"
+#include "DAnCE/Deployment/Deployment_NodeApplicationC.h"
 #include "Client_init.h"
 #include "NodeAppTest_RoundTripC.h"
 #include "ace/Get_Opt.h"