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

51 files changed, 55 insertions, 55 deletions

diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/ADD_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/ADD_Handler.cpp
index d844226c9ef..cc1fe6fc020 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/ADD_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/ADD_Handler.cpp
@@ -1,7 +1,7 @@
 // $Id$
 #include "ADD_Handler.h"
 #include "cdp.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "Property_Handler.h"
 #include "ace/UUID.h"
 
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/CCD_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/CCD_Handler.cpp
index f7e4a7e82d3..8256f089f68 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/CCD_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/CCD_Handler.cpp
@@ -8,7 +8,7 @@
 #include "Property_Handler.h"
 #include "CPD_Handler.h"
 #include "ComponentPropertyDescription_Handler.h"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 
 namespace CIAO
 {
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/CEPE_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
index 3131ce5735b..4c93545f2c6 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "CEPE_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ciao/CIAO_common.h"
 namespace CIAO
 {
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp
index fd7cb12a464..e95c0656506 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp
@@ -2,7 +2,7 @@
 #include "Utils/XML_Helper.h"
 #include "CIAOEvents_Handler.h"
 #include "CIAOEvents.hpp"
-#include "ciao/Deployment_EventsC.h"
+#include "DAnCE/Deployment/Deployment_EventsC.h"
 
 namespace CIAO
 {
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h b/ciao_core_2/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h
index 7a27aa76a64..f45ff89afb4 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h
@@ -14,9 +14,9 @@
 #include /**/ "ace/pre.h"
 
 #include "Utils/XML_Helper.h"
-#include "ciao/Deployment_EventsC.h"
+#include "DAnCE/Deployment/Deployment_EventsC.h"
 #include "CIAO_Events_Handlers_Export.h"
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/CIAO_Events/test.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/CIAO_Events/test.cpp
index 63c024a0a89..d4f92a9a990 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/CIAO_Events/test.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/CIAO_Events/test.cpp
@@ -4,7 +4,7 @@
 
 #include "CIAOEvents.hpp"
 #include "CIAOEvents_Handler.h"
-#include "ciao/Deployment_EventsC.h"
+#include "DAnCE/Deployment/Deployment_EventsC.h"
 
 #include "ace/Get_Opt.h"
 #include "tao/ORB.h"
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/CPD_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/CPD_Handler.cpp
index 0b7b54d1adf..97a9e50ae23 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/CPD_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/CPD_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "CPD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ciao/CIAO_common.h"
 
 namespace CIAO
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/CRDD_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/CRDD_Handler.cpp
index 03da34467eb..87d1b6511e5 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/CRDD_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/CRDD_Handler.cpp
@@ -3,7 +3,7 @@
 #include "CRDD_Handler.h"
 #include "Any_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "Property_Handler.h"
 
 #include "ciao/CIAO_common.h"
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
index e7f9fa0266d..d916bf8076f 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "ComponentPropertyDescription_Handler.h"
 #include "DataType_Handler.h"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ciao/CIAO_common.h"
 namespace CIAO
 {
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/DD_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/DD_Handler.cpp
index d6de22ee29e..18ed4013c8c 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/DD_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/DD_Handler.cpp
@@ -5,7 +5,7 @@
 #include "DD_Handler.h"
 #include "Any_Handler.h"
 #include "Deployment.hpp"
-#include "ciao/Deployment_TargetDataC.h"
+#include "DAnCE/Deployment/Deployment_TargetDataC.h"
 #include "CIAO_common.h"
 
 using namespace std;
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/DP_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/DP_Handler.cpp
index ff26719d544..c5ff32d9c35 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/DP_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/DP_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "DP_Handler.h"
 #include "ace/UUID.h"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 
 #include "CCD_Handler.h"
 #include "ADD_Handler.h"
@@ -266,7 +266,7 @@ ACE_RCSID (Config_Handlers,
 
         // We are assuming there is a realizes for the moment
         // @@ We may want to change this at a later date by creating a sequence of
-        // @@ ComponentInterfaceDescriptions in the DeploymentPlan in ../ciao/Deployment_Data.idl
+        // @@ ComponentInterfaceDescriptions in the DeploymentPlan in ../DAnCE/Deployment/Deployment_Data.idl
         // @@ so we can check for length
         this->xsc_dp_->realizes(CCD_Handler::component_interface_descr(plan.realizes));
         if (!this->xsc_dp_->realizes_p())
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp
index 22512ec15a5..2be43fb3b5b 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp
@@ -8,7 +8,7 @@
 #include "PCD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "cdp.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ciao/CIAO_common.h"
 namespace CIAO
 {
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/DataType_Handler.h b/ciao_core_2/CIAO/tools/Config_Handlers/DataType_Handler.h
index 5991c949f3a..b2a3240fbec 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/DataType_Handler.h
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/DataType_Handler.h
@@ -13,7 +13,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 #include "Basic_Deployment_Data.hpp"
 
 #include "Config_Handlers_Common_Export.h"
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/DnC_Dump.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/DnC_Dump.cpp
index 18a1f4bac94..1a33d3f35d6 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/DnC_Dump.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/DnC_Dump.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "ace/Log_Msg.h"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "DnC_Dump.h"
 #include "DnC_Dump_T.h"
 #include <iostream>
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/DnC_Dump.h b/ciao_core_2/CIAO/tools/Config_Handlers/DnC_Dump.h
index ae8b587ff62..17fb49377de 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/DnC_Dump.h
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/DnC_Dump.h
@@ -12,8 +12,8 @@
 #define DNC_DUMP_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
-#include "ciao/Deployment_TargetDataC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
+#include "DAnCE/Deployment/Deployment_TargetDataC.h"
 #include "Config_Handlers_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/Dump_Obj.h b/ciao_core_2/CIAO/tools/Config_Handlers/Dump_Obj.h
index d8e90351ad1..bb5d0139ce8 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/Dump_Obj.h
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/Dump_Obj.h
@@ -12,7 +12,7 @@
 #define CIAO_DUMP_OBJ_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/ERE_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/ERE_Handler.cpp
index d64528cfdeb..17c9bd2b34e 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/ERE_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/ERE_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "ERE_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ciao/CIAO_common.h"
 namespace CIAO
 {
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/ESD_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/ESD_Handler.cpp
index 1ae8a526842..4bb1134ae44 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/ESD_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/ESD_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "ESD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "cdp.hpp"
 
 namespace CIAO
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/IDD_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/IDD_Handler.cpp
index 7c7c315f324..f82413cad6b 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/IDD_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/IDD_Handler.cpp
@@ -7,7 +7,7 @@
 #include "Property_Handler.h"
 #include "Any_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "cdp.hpp"
 
 namespace CIAO
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/ID_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/ID_Handler.cpp
index 5d3cad169a6..b2e888338e0 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/ID_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/ID_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "ID_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ciao/CIAO_common.h"
 namespace CIAO
 {
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/IRDD_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/IRDD_Handler.cpp
index 34318ee8d4c..39a7ea09754 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/IRDD_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/IRDD_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "IRDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "Property_Handler.h"
 #include "ciao/CIAO_common.h"
 
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/MDD_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/MDD_Handler.cpp
index c86d6dc1da1..b0c5f7cfe94 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/MDD_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/MDD_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "MDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ADD_Handler.h"
 #include "Property_Handler.h"
 #include "Req_Handler.h"
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/PCD_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/PCD_Handler.cpp
index 23b332d471e..071194d778a 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/PCD_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/PCD_Handler.cpp
@@ -7,7 +7,7 @@
 #include "ERE_Handler.h"
 #include "CRDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ciao/CIAO_common.h"
 
 namespace CIAO
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/PSPE_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
index 24d55cecf36..0da66acefd4 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
@@ -3,7 +3,7 @@
 #include "PSPE_Handler.h"
 #include "IDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 
 namespace CIAO
 {
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
index 7d24f381f73..8907ce0b0b1 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
@@ -3,7 +3,7 @@
 #include "Package_Handlers/CAD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "cid.hpp"
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 #include "Req_Handler.h"
 #include "CEPE_Handler.h"
 #include "ERE_Handler.h"
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.h b/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.h
index b4c0b790fc0..139c24936ce 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.h
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.h
@@ -11,7 +11,7 @@
 #include /**/ "ace/pre.h"
 
 #include "Utils/XML_Helper.h"
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 #include "Package_Handlers/Packaging_Handlers_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
index bb066b0e383..78d865eb366 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
@@ -10,7 +10,7 @@
 #include "Req_Handler.h"
 
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "Utils/XML_Helper.h"
 #include "Utils/Exceptions.h"
 
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
index ee68c3a627f..b857c893bf8 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
@@ -4,7 +4,7 @@
 #include "Package_Handlers/CID_Handler.h"
 #include "Package_Handlers/Comp_Intf_Descr_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_Packaging_DataC.h"
+#include "DAnCE/Deployment/Deployment_Packaging_DataC.h"
 #include "Deployment.hpp"
 #include "Utils/Exceptions.h"
 #include "Property_Handler.h"
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h b/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h
index e4eb2b0af58..02f07fbb438 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h
@@ -11,7 +11,7 @@
 #include /**/ "ace/pre.h"
 
 #include "Utils/XML_Helper.h"
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 #include "Package_Handlers/Packaging_Handlers_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h b/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
index 2c4db4eddf2..2f3f2845343 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
@@ -10,7 +10,7 @@
 #include /**/ "ace/pre.h"
 #include "Package_Handlers/Packaging_Handlers_Export.h"
 #include "Utils/Functors.h"
-#include "ciao/Deployment_Packaging_DataC.h"
+#include "DAnCE/Deployment/Deployment_Packaging_DataC.h"
 #include "iad.hpp"
 
 namespace Deployment
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
index 3f8985d49c6..93537901779 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
@@ -1,7 +1,7 @@
 // $Id$
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "ciao/CIAO_common.h"
-#include "ciao/Deployment_Packaging_DataC.h"
+#include "DAnCE/Deployment/Deployment_Packaging_DataC.h"
 #include "Utils/XML_Helper.h"
 #include "Utils/XercesString.h"
 #include "Utils/Exceptions.h"
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
index 99c29bd0450..c89325ed467 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
@@ -2,7 +2,7 @@
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "Package_Handlers/SID_Handler.h"
 #include "cid.hpp"
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 #include "Package_Handlers/CPD_Handler.h"
 #include "Package_Handlers/PCD_Handler.h"
 #include "Req_Handler.h"
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp
index a8505419ffd..6812dc20114 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp
@@ -4,7 +4,7 @@
 
 #include "Deployment.hpp"
 #include "PCD_Handler.h"
-#include "ciao/Deployment_Packaging_DataC.h"
+#include "DAnCE/Deployment/Deployment_Packaging_DataC.h"
 #include "SID_Handler.h"
 #include "ace/Get_Opt.h"
 #include "Utils/XML_Helper.h"
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/Property_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/Property_Handler.cpp
index 41129007618..ef077426a16 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/Property_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/Property_Handler.cpp
@@ -3,7 +3,7 @@
 #include "Property_Handler.h"
 #include "Any_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ciao/CIAO_common.h"
 namespace CIAO
 {
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/RDD_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/RDD_Handler.cpp
index 374c0e4993f..28ddc5ec7cf 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/RDD_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/RDD_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "RDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "Any_Handler.h"
 #include "ciao/CIAO_common.h"
 #include "Property_Handler.h"
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h b/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h
index 7272b830fb7..9c1363ab420 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.h
@@ -13,7 +13,7 @@
 #include /**/ "ace/pre.h"
 
 #include "RT_CCM_Handlers_Export.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 #include "IDREF_Base.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h b/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h
index 1c3469e617e..e8676b54772 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/CLA_Handler.h
@@ -14,7 +14,7 @@
 #include /**/ "ace/pre.h"
 
 #include "RT_CCM_Handlers_Export.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h b/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h
index 8aa7db84e77..abcd2c0a3c5 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/OC_Handler.h
@@ -15,7 +15,7 @@
 #include /**/ "ace/pre.h"
 
 #include "RT_CCM_Handlers_Export.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h b/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h
index 2790e149320..5209aea7da4 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 #include "RT_CCM_Handlers_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h b/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h
index 6c35612536c..2063eec449a 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/PM_Handler.h
@@ -12,7 +12,7 @@
 #include /**/ "ace/pre.h"
 
 #include "RT_CCM_Handlers_Export.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h b/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h
index 5bd9b9237c2..5c3cb4ae996 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.h
@@ -12,7 +12,7 @@
 #include /**/ "ace/pre.h"
 
 #include "RT_CCM_Handlers_Export.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h b/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h
index 3a5ad3128ed..e0347fcbb8a 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h
@@ -14,7 +14,7 @@
 #include /**/ "ace/pre.h"
 
 #include "RT_CCM_Handlers_Export.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 #include "ace/Auto_Ptr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h b/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h
index 9a129302c05..dab5646e32b 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 
 #include "RT_CCM_Handlers_Export.h"
 
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h b/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h
index f0e27e2cef5..34172995405 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/RT-CCM/TP_Handler.h
@@ -14,7 +14,7 @@
 #include /**/ "ace/pre.h"
 
 #include "RT_CCM_Handlers_Export.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/Req_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/Req_Handler.cpp
index c20d5e428f2..76d0d5b7791 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/Req_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/Req_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "Req_Handler.h"
 #include "Property_Handler.h"
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 #include "ciao/CIAO_common.h"
 namespace CIAO
 {
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp
index 4eeb7377b29..607c964d700 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp
@@ -3,7 +3,7 @@
 #include "STD_CPD_Handler.h"
 #include "STD_IAD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "Utils/XML_Helper.h"
 #include "Deployment.hpp"
 #include "Property_Handler.h"
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/STD_CID_Handler.h b/ciao_core_2/CIAO/tools/Config_Handlers/STD_CID_Handler.h
index c8fb2954a6f..475c1c1b471 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/STD_CID_Handler.h
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/STD_CID_Handler.h
@@ -16,7 +16,7 @@
 #include "Utils/XML_Helper.h"
 #include "IDREF_Base.h"
 #include "Config_Handlers_Export.h"
-#include "ciao/DeploymentC.h"
+#include "DAnCE/Deployment/DeploymentC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp
index d79a4ea5d39..1ad0d109fa5 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp
@@ -2,7 +2,7 @@
 #include "STD_CPD_Handler.h"
 #include "STD_CID_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "Deployment.hpp"
 
 namespace CIAO
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
index 31f4d937a49..d01f0d7f6f4 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
@@ -3,7 +3,7 @@
 #include "SatisfierProperty_Handler.h"
 #include "Any_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ciao/CIAO_common.h"
 #include "Utils/Exceptions.h"
 namespace CIAO
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/XML_File_Intf.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
index d7d55058b25..53e8ac1e801 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
@@ -4,7 +4,7 @@
 #include "Utils/XML_Helper.h"
 #include "Deployment.hpp"
 #include "DP_Handler.h"
-#include "ciao/Deployment_DataC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
 #include "ciao/CIAO_common.h"
 
 
diff --git a/ciao_core_2/CIAO/tools/Config_Handlers/test.cpp b/ciao_core_2/CIAO/tools/Config_Handlers/test.cpp
index 46dabd4697b..88a7d8f2a24 100644
--- a/ciao_core_2/CIAO/tools/Config_Handlers/test.cpp
+++ b/ciao_core_2/CIAO/tools/Config_Handlers/test.cpp
@@ -4,8 +4,8 @@
 
 #include "Deployment.hpp"
 #include "DP_Handler.h"
-#include "ciao/Deployment_DataC.h"
-#include "ciao/CIAO_ServerResourcesC.h"
+#include "DAnCE/Deployment/Deployment_DataC.h"
+#include "DAnCE/Deployment/CIAO_ServerResourcesC.h"
 #include "ace/Get_Opt.h"
 #include "Utils/XML_Helper.h"
 #include "DnC_Dump.h"