Fri Sep 10 15:40:42 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>

* Config_Handlers/ADD_Handler.cpp: * Config_Handlers/Any_Handler.cpp: * Config_Handlers/CCD_Handler.cpp: * Config_Handlers/CEPE_Handler.cpp: * Config_Handlers/CPD_Handler.cpp: * Config_Handlers/CRDD_Handler.cpp: * Config_Handlers/ComponentPropertyDescription_Handler.cpp: * Config_Handlers/DD_Handler.cpp: * Config_Handlers/DP_Handler.cpp: * Config_Handlers/DP_PCD_Handler.cpp: * Config_Handlers/DataType_Handler.h: * Config_Handlers/DataType_Handler.cpp: * Config_Handlers/DnC_Dump.h: * Config_Handlers/DnC_Dump.cpp: * Config_Handlers/Dump_Obj.h: * Config_Handlers/ERE_Handler.cpp: * Config_Handlers/ESD_Handler.cpp: * Config_Handlers/IDD_Handler.cpp: * Config_Handlers/IDREF_Base.cpp: * Config_Handlers/ID_Handler.cpp: * Config_Handlers/IRDD_Handler.cpp: * Config_Handlers/MDD_Handler.cpp: * Config_Handlers/PCD_Handler.cpp: * Config_Handlers/PL_Handler.cpp: * Config_Handlers/PSPE_Handler.cpp: * Config_Handlers/Package_Handlers/CAD_Handler.h: * Config_Handlers/Package_Handlers/CAD_Handler.cpp: * Config_Handlers/Package_Handlers/CID_Handler.cpp: * Config_Handlers/Package_Handlers/CPD_Handler.cpp: * Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h: * Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp: * Config_Handlers/Package_Handlers/IAD_Handler.cpp: * Config_Handlers/Package_Handlers/NIA_Handler.h: * Config_Handlers/Package_Handlers/PCD_Handler.cpp: * Config_Handlers/Package_Handlers/PC_Intf.cpp: * Config_Handlers/Package_Handlers/SID_Handler.cpp: * Config_Handlers/Property_Handler.cpp: * Config_Handlers/RDD_Handler.cpp: * Config_Handlers/Req_Handler.cpp: * Config_Handlers/STD_CID_Handler.h: * Config_Handlers/STD_CID_Handler.cpp: * Config_Handlers/STD_CPD_Handler.cpp: * Config_Handlers/STD_PC_Intf.cpp: * Config_Handlers/SatisfierProperty_Handler.cpp: * Config_Handlers/XML_File_Intf.cpp: * DAnCE/DAnCE_ArtifactInstallation.idl: * DAnCE/DAnCE_Utility.h: * Deployment/Deployment_Application.idl: * Deployment/Deployment_ApplicationManager.idl: * Deployment/Deployment_Connection.idl: * Deployment/Deployment_Data.idl: * Deployment/Deployment_DeploymentPlan.idl: * Deployment/Deployment_DomainApplication.idl: * Deployment/Deployment_DomainApplicationManager.idl: * Deployment/Deployment_ExecutionManager.idl: * Deployment/Deployment_NodeApplication.idl: * Deployment/Deployment_NodeApplicationManager.idl: * Deployment/Deployment_NodeManager.idl: * Deployment/Deployment_Packaging_Data.idl: * Deployment/Deployment_RepositoryManager.idl: * Deployment/Deployment_ResourceCommitmentManager.idl: * Deployment/Deployment_TargetData.idl: * Deployment/Deployment_TargetManager.idl: * DomainApplication/Domain_Application_Impl.cpp: * DomainApplicationManager/DomainApplicationManager_Impl.cpp: * DomainApplicationManager/Node_Locator.h: * DomainApplicationManager/Node_Locator.cpp: * ExecutionManager/ExecutionManager_Impl.cpp: * ExecutionManager/ExecutionManager_Module.cpp: * ExecutionManager/Execution_Manager.cpp: * LocalityManager/Configuration/CPU_Affinity.cpp: * LocalityManager/Configuration/Process_Name.cpp: * LocalityManager/Configuration/Process_Priority.cpp: * LocalityManager/Daemon/Locality_Manager.cpp: * LocalityManager/Daemon/Locality_Manager_Task.cpp: * LocalityManager/Handler/LocalityActivator_Impl.cpp: * LocalityManager/Handler/Plugin_Conf.cpp: * LocalityManager/Interceptors/Best_Effort.cpp: * LocalityManager/Interceptors/Standard_Error.cpp: * LocalityManager/Scheduler/Events/Action_Base.cpp: * NodeApplication/NodeApplication_Impl.cpp: * NodeApplicationManager/NodeApplicationManager_Impl.cpp: * NodeManager/NodeManager_Impl.cpp: * NodeManager/Node_Manager.cpp: * NodeManager/Node_Manager_Module.h: * NodeManager/Node_Manager_Module.cpp: * Plan_Launcher/Daemon/PL_Daemon.cpp: * Plan_Launcher/EM_Launcher.h: * Plan_Launcher/NM_Launcher.h: * Plan_Launcher/Plan_Launcher.cpp: * Plan_Launcher/Plan_Launcher_Base.h: * Plan_Launcher/Plan_Launcher_Base_Impl_T.h: * Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp: * RepositoryManager/PC_Updater.h: * RepositoryManager/PC_Updater.cpp: * RepositoryManager/RM_Helper.h: * RepositoryManager/RM_Helper.cpp: * RepositoryManager/RepositoryManager.mpc: * RepositoryManager/RepositoryManagerDaemon.idl: * RepositoryManager/RepositoryManager_Impl.cpp: * RepositoryManager/Repository_Manager.cpp: * RepositoryManager/Repository_Manager_Module.cpp: * RepositoryManager/URL_Parser.cpp: * RepositoryManager/ZIP_Wrapper.cpp: * RepositoryManager/repository_manager_admin.cpp: * RepositoryManager/repository_manager_admin_exec.cpp: * TargetManager/DomainDataManager.cpp: * TargetManager/ResourceCommitmentManager.h: * TargetManager/ResourceCommitmentManager.cpp: * TargetManager/Target_Manager.cpp: * TargetManager/Target_Manager_Module.cpp: * tests/Config_Handlers/DynAny_Handler/test.cpp: * tests/Config_Handlers/Package_Handlers/test.cpp: * tests/Config_Handlers/test.cpp: * tests/DeploymentPlanDump/test.cpp: * tests/DeploymentPlanTestReferences/test.cpp: * tests/DeploymentTest1/test.cpp: * tests/NodeApplicationManager-NodeApplication/test.cpp: * tests/NodeManager-NodeApplicationManager/test.cpp: * tests/Parsing/domain.cpp: * tests/Parsing/test.cpp: * tests/TargetManager/CmpClient.cpp: * tools/Artifact_Installation/Artifact_Installation.mpc: * tools/Artifact_Installation/Artifact_Installation_Handler_Svc.cpp: * tools/Artifact_Installation/Artifact_Installation_Impl.cpp: * tools/Artifact_Installation/Artifact_Installation_exec.cpp: * tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.idl: * tools/Artifact_Installation/File_Installation_Handler.cpp: * tools/Artifact_Installation/Http_Installation_Handler.cpp: * tools/Artifact_Installation/Installation_Repository_Manager.cpp: * tools/Artifact_Installation/Installation_Repository_Manager_Impl.cpp: * tools/Convert_Plan/Convert_Plan.cpp: * tools/Split_Plan/Locality_Splitter.cpp: * tools/Split_Plan/Node_Splitter.cpp: * tools/Split_Plan/Split_Plan.cpp: * tools/Split_Plan/Split_Plan_exec.cpp: * tools/System_Health/Daemon/SHS_Daemon.cpp: * tools/System_Health/Daemon/SHS_Daemon_Impl.cpp: * tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp: * tools/System_Health/Interceptors/SHS_Interceptor.cpp: Fixed includes such as DAnCE/Deployment and DAnCE/Logger to drop DAnCE prefix. Also removed CIAO logger initialization.
author: William R. Otte <wotte@dre.vanderbilt.edu> 2010-09-10 15:44:03 +0000
committer: William R. Otte <wotte@dre.vanderbilt.edu> 2010-09-10 15:44:03 +0000
commit: e22348bf1e5f45c2ff3a0b5142df89e1da2819eb (patch)
tree: 7fd0ef70fa5e320715b66b0452b1eb1b640c637e
parent: 9e9a872ceb4fbc1185fd59c6f1f4298f716a8880 (diff)
download: ATCD-e22348bf1e5f45c2ff3a0b5142df89e1da2819eb.tar.gz
141 files changed, 386 insertions, 271 deletions
diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog
index 53ffeed8015..753740f51e2 100644
--- a/DAnCE/ChangeLog
+++ b/DAnCE/ChangeLog
@@ -1,3 +1,149 @@
+Fri Sep 10 15:40:42 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * Config_Handlers/ADD_Handler.cpp:
+        * Config_Handlers/Any_Handler.cpp:
+        * Config_Handlers/CCD_Handler.cpp:
+        * Config_Handlers/CEPE_Handler.cpp:
+        * Config_Handlers/CPD_Handler.cpp:
+        * Config_Handlers/CRDD_Handler.cpp:
+        * Config_Handlers/ComponentPropertyDescription_Handler.cpp:
+        * Config_Handlers/DD_Handler.cpp:
+        * Config_Handlers/DP_Handler.cpp:
+        * Config_Handlers/DP_PCD_Handler.cpp:
+        * Config_Handlers/DataType_Handler.h:
+        * Config_Handlers/DataType_Handler.cpp:
+        * Config_Handlers/DnC_Dump.h:
+        * Config_Handlers/DnC_Dump.cpp:
+        * Config_Handlers/Dump_Obj.h:
+        * Config_Handlers/ERE_Handler.cpp:
+        * Config_Handlers/ESD_Handler.cpp:
+        * Config_Handlers/IDD_Handler.cpp:
+        * Config_Handlers/IDREF_Base.cpp:
+        * Config_Handlers/ID_Handler.cpp:
+        * Config_Handlers/IRDD_Handler.cpp:
+        * Config_Handlers/MDD_Handler.cpp:
+        * Config_Handlers/PCD_Handler.cpp:
+        * Config_Handlers/PL_Handler.cpp:
+        * Config_Handlers/PSPE_Handler.cpp:
+        * Config_Handlers/Package_Handlers/CAD_Handler.h:
+        * Config_Handlers/Package_Handlers/CAD_Handler.cpp:
+        * Config_Handlers/Package_Handlers/CID_Handler.cpp:
+        * Config_Handlers/Package_Handlers/CPD_Handler.cpp:
+        * Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h:
+        * Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp:
+        * Config_Handlers/Package_Handlers/IAD_Handler.cpp:
+        * Config_Handlers/Package_Handlers/NIA_Handler.h:
+        * Config_Handlers/Package_Handlers/PCD_Handler.cpp:
+        * Config_Handlers/Package_Handlers/PC_Intf.cpp:
+        * Config_Handlers/Package_Handlers/SID_Handler.cpp:
+        * Config_Handlers/Property_Handler.cpp:
+        * Config_Handlers/RDD_Handler.cpp:
+        * Config_Handlers/Req_Handler.cpp:
+        * Config_Handlers/STD_CID_Handler.h:
+        * Config_Handlers/STD_CID_Handler.cpp:
+        * Config_Handlers/STD_CPD_Handler.cpp:
+        * Config_Handlers/STD_PC_Intf.cpp:
+        * Config_Handlers/SatisfierProperty_Handler.cpp:
+        * Config_Handlers/XML_File_Intf.cpp:
+        * DAnCE/DAnCE_ArtifactInstallation.idl:
+        * DAnCE/DAnCE_Utility.h:
+        * Deployment/Deployment_Application.idl:
+        * Deployment/Deployment_ApplicationManager.idl:
+        * Deployment/Deployment_Connection.idl:
+        * Deployment/Deployment_Data.idl:
+        * Deployment/Deployment_DeploymentPlan.idl:
+        * Deployment/Deployment_DomainApplication.idl:
+        * Deployment/Deployment_DomainApplicationManager.idl:
+        * Deployment/Deployment_ExecutionManager.idl:
+        * Deployment/Deployment_NodeApplication.idl:
+        * Deployment/Deployment_NodeApplicationManager.idl:
+        * Deployment/Deployment_NodeManager.idl:
+        * Deployment/Deployment_Packaging_Data.idl:
+        * Deployment/Deployment_RepositoryManager.idl:
+        * Deployment/Deployment_ResourceCommitmentManager.idl:
+        * Deployment/Deployment_TargetData.idl:
+        * Deployment/Deployment_TargetManager.idl:
+        * DomainApplication/Domain_Application_Impl.cpp:
+        * DomainApplicationManager/DomainApplicationManager_Impl.cpp:
+        * DomainApplicationManager/Node_Locator.h:
+        * DomainApplicationManager/Node_Locator.cpp:
+        * ExecutionManager/ExecutionManager_Impl.cpp:
+        * ExecutionManager/ExecutionManager_Module.cpp:
+        * ExecutionManager/Execution_Manager.cpp:
+        * LocalityManager/Configuration/CPU_Affinity.cpp:
+        * LocalityManager/Configuration/Process_Name.cpp:
+        * LocalityManager/Configuration/Process_Priority.cpp:
+        * LocalityManager/Daemon/Locality_Manager.cpp:
+        * LocalityManager/Daemon/Locality_Manager_Task.cpp:
+        * LocalityManager/Handler/LocalityActivator_Impl.cpp:
+        * LocalityManager/Handler/Plugin_Conf.cpp:
+        * LocalityManager/Interceptors/Best_Effort.cpp:
+        * LocalityManager/Interceptors/Standard_Error.cpp:
+        * LocalityManager/Scheduler/Events/Action_Base.cpp:
+        * NodeApplication/NodeApplication_Impl.cpp:
+        * NodeApplicationManager/NodeApplicationManager_Impl.cpp:
+        * NodeManager/NodeManager_Impl.cpp:
+        * NodeManager/Node_Manager.cpp:
+        * NodeManager/Node_Manager_Module.h:
+        * NodeManager/Node_Manager_Module.cpp:
+        * Plan_Launcher/Daemon/PL_Daemon.cpp:
+        * Plan_Launcher/EM_Launcher.h:
+        * Plan_Launcher/NM_Launcher.h:
+        * Plan_Launcher/Plan_Launcher.cpp:
+        * Plan_Launcher/Plan_Launcher_Base.h:
+        * Plan_Launcher/Plan_Launcher_Base_Impl_T.h:
+        * Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp:
+        * RepositoryManager/PC_Updater.h:
+        * RepositoryManager/PC_Updater.cpp:
+        * RepositoryManager/RM_Helper.h:
+        * RepositoryManager/RM_Helper.cpp:
+        * RepositoryManager/RepositoryManager.mpc:
+        * RepositoryManager/RepositoryManagerDaemon.idl:
+        * RepositoryManager/RepositoryManager_Impl.cpp:
+        * RepositoryManager/Repository_Manager.cpp:
+        * RepositoryManager/Repository_Manager_Module.cpp:
+        * RepositoryManager/URL_Parser.cpp:
+        * RepositoryManager/ZIP_Wrapper.cpp:
+        * RepositoryManager/repository_manager_admin.cpp:
+        * RepositoryManager/repository_manager_admin_exec.cpp:
+        * TargetManager/DomainDataManager.cpp:
+        * TargetManager/ResourceCommitmentManager.h:
+        * TargetManager/ResourceCommitmentManager.cpp:
+        * TargetManager/Target_Manager.cpp:
+        * TargetManager/Target_Manager_Module.cpp:
+        * tests/Config_Handlers/DynAny_Handler/test.cpp:
+        * tests/Config_Handlers/Package_Handlers/test.cpp:
+        * tests/Config_Handlers/test.cpp:
+        * tests/DeploymentPlanDump/test.cpp:
+        * tests/DeploymentPlanTestReferences/test.cpp:
+        * tests/DeploymentTest1/test.cpp:
+        * tests/NodeApplicationManager-NodeApplication/test.cpp:
+        * tests/NodeManager-NodeApplicationManager/test.cpp:
+        * tests/Parsing/domain.cpp:
+        * tests/Parsing/test.cpp:
+        * tests/TargetManager/CmpClient.cpp:
+        * tools/Artifact_Installation/Artifact_Installation.mpc:
+        * tools/Artifact_Installation/Artifact_Installation_Handler_Svc.cpp:
+        * tools/Artifact_Installation/Artifact_Installation_Impl.cpp:
+        * tools/Artifact_Installation/Artifact_Installation_exec.cpp:
+        * tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.idl:
+        * tools/Artifact_Installation/File_Installation_Handler.cpp:
+        * tools/Artifact_Installation/Http_Installation_Handler.cpp:
+        * tools/Artifact_Installation/Installation_Repository_Manager.cpp:
+        * tools/Artifact_Installation/Installation_Repository_Manager_Impl.cpp:
+        * tools/Convert_Plan/Convert_Plan.cpp:
+        * tools/Split_Plan/Locality_Splitter.cpp:
+        * tools/Split_Plan/Node_Splitter.cpp:
+        * tools/Split_Plan/Split_Plan.cpp:
+        * tools/Split_Plan/Split_Plan_exec.cpp:
+        * tools/System_Health/Daemon/SHS_Daemon.cpp:
+        * tools/System_Health/Daemon/SHS_Daemon_Impl.cpp:
+        * tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp:
+        * tools/System_Health/Interceptors/SHS_Interceptor.cpp:
+
+          Fixed includes such as DAnCE/Deployment and DAnCE/Logger to
+          drop DAnCE prefix.  Also removed CIAO logger initialization.
+
 Fri Sep 10 15:37:10 UTC 2010  William Otte  <wotte@zifnab>
 
         * tools/IDL3_to_XMI:
diff --git a/DAnCE/Config_Handlers/ADD_Handler.cpp b/DAnCE/Config_Handlers/ADD_Handler.cpp
index 3d61a6678bb..fe5ab795f58 100644
--- a/DAnCE/Config_Handlers/ADD_Handler.cpp
+++ b/DAnCE/Config_Handlers/ADD_Handler.cpp
@@ -1,7 +1,7 @@
 // $Id$
 #include "ADD_Handler.h"
 #include "cdp.hpp"
-#include "DAnCE/Deployment/Deployment_DataC.h"
+#include "Deployment/Deployment_DataC.h"
 #include "Property_Handler.h"
 #include "ace/UUID.h"
 
diff --git a/DAnCE/Config_Handlers/Any_Handler.cpp b/DAnCE/Config_Handlers/Any_Handler.cpp
index 20be7539426..08562e4c3ef 100644
--- a/DAnCE/Config_Handlers/Any_Handler.cpp
+++ b/DAnCE/Config_Handlers/Any_Handler.cpp
@@ -6,7 +6,7 @@
 #include "DataType_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "tao/AnyTypeCode/Any.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 #include "DynAny_Handler/DynAny_Handler.h"
 
 #include "ace/Null_Mutex.h"
diff --git a/DAnCE/Config_Handlers/CCD_Handler.cpp b/DAnCE/Config_Handlers/CCD_Handler.cpp
index 4aa5fa1732f..2c3442a61f9 100644
--- a/DAnCE/Config_Handlers/CCD_Handler.cpp
+++ b/DAnCE/Config_Handlers/CCD_Handler.cpp
@@ -2,13 +2,13 @@
 
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 #include "CCD_Handler.h"
 #include "ccd.hpp"
 #include "Property_Handler.h"
 #include "CPD_Handler.h"
 #include "ComponentPropertyDescription_Handler.h"
-#include "DAnCE/Deployment/Deployment_DataC.h"
+#include "Deployment/Deployment_DataC.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/Config_Handlers/CEPE_Handler.cpp b/DAnCE/Config_Handlers/CEPE_Handler.cpp
index 22839be8bab..2605d7698d8 100644
--- a/DAnCE/Config_Handlers/CEPE_Handler.cpp
+++ b/DAnCE/Config_Handlers/CEPE_Handler.cpp
@@ -2,8 +2,8 @@
 
 #include "CEPE_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "DAnCE/Deployment/Deployment_DataC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Deployment/Deployment_DataC.h"
+#include "Logger/Log_Macros.h"
 namespace DAnCE
 {
   namespace Config_Handlers
diff --git a/DAnCE/Config_Handlers/CPD_Handler.cpp b/DAnCE/Config_Handlers/CPD_Handler.cpp
index f87b2a22ddc..583d27dc775 100644
--- a/DAnCE/Config_Handlers/CPD_Handler.cpp
+++ b/DAnCE/Config_Handlers/CPD_Handler.cpp
@@ -2,8 +2,8 @@
 
 #include "CPD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "DAnCE/Deployment/Deployment_DataC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Deployment/Deployment_DataC.h"
+#include "Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/Config_Handlers/CRDD_Handler.cpp b/DAnCE/Config_Handlers/CRDD_Handler.cpp
index c08b1784b66..2c1773d5aec 100644
--- a/DAnCE/Config_Handlers/CRDD_Handler.cpp
+++ b/DAnCE/Config_Handlers/CRDD_Handler.cpp
@@ -3,10 +3,10 @@
 #include "CRDD_Handler.h"
 #include "Any_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "DAnCE/Deployment/Deployment_DataC.h"
+#include "Deployment/Deployment_DataC.h"
 #include "Property_Handler.h"
 
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp b/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp
index 96a1fde4e73..78b2ee49a83 100644
--- a/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp
+++ b/DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp
@@ -2,8 +2,8 @@
 
 #include "ComponentPropertyDescription_Handler.h"
 #include "DataType_Handler.h"
-#include "DAnCE/Deployment/Deployment_DataC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Deployment/Deployment_DataC.h"
+#include "Logger/Log_Macros.h"
 namespace DAnCE
 {
   namespace Config_Handlers
diff --git a/DAnCE/Config_Handlers/DD_Handler.cpp b/DAnCE/Config_Handlers/DD_Handler.cpp
index 732d5f4cd86..5aeadabfc39 100644
--- a/DAnCE/Config_Handlers/DD_Handler.cpp
+++ b/DAnCE/Config_Handlers/DD_Handler.cpp
@@ -5,8 +5,8 @@
 #include "DD_Handler.h"
 #include "Any_Handler.h"
 #include "Deployment.hpp"
-#include "DAnCE/Deployment/Deployment_TargetDataC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Deployment/Deployment_TargetDataC.h"
+#include "Logger/Log_Macros.h"
 
 using namespace std;
 
diff --git a/DAnCE/Config_Handlers/DP_Handler.cpp b/DAnCE/Config_Handlers/DP_Handler.cpp
index 4a7736e7e2b..acd3de84046 100644
--- a/DAnCE/Config_Handlers/DP_Handler.cpp
+++ b/DAnCE/Config_Handlers/DP_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "DP_Handler.h"
 #include "ace/UUID.h"
-#include "DAnCE/Deployment/Deployment_DataC.h"
+#include "Deployment/Deployment_DataC.h"
 
 #include "CCD_Handler.h"
 #include "ADD_Handler.h"
@@ -220,7 +220,7 @@ namespace DAnCE
 
       // 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 ../DAnCE/Deployment/Deployment_Data.idl
+      // @@ ComponentInterfaceDescriptions in the DeploymentPlan in ../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/DAnCE/Config_Handlers/DP_PCD_Handler.cpp b/DAnCE/Config_Handlers/DP_PCD_Handler.cpp
index 206e232445a..ef112a782f0 100644
--- a/DAnCE/Config_Handlers/DP_PCD_Handler.cpp
+++ b/DAnCE/Config_Handlers/DP_PCD_Handler.cpp
@@ -8,8 +8,8 @@
 #include "PCD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "cdp.hpp"
-#include "DAnCE/Deployment/Deployment_DataC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Deployment/Deployment_DataC.h"
+#include "Logger/Log_Macros.h"
 namespace DAnCE
 {
   namespace Config_Handlers
diff --git a/DAnCE/Config_Handlers/DataType_Handler.cpp b/DAnCE/Config_Handlers/DataType_Handler.cpp
index 3a74aabfb7b..655af6e79d0 100644
--- a/DAnCE/Config_Handlers/DataType_Handler.cpp
+++ b/DAnCE/Config_Handlers/DataType_Handler.cpp
@@ -3,7 +3,7 @@
 #include "DataType_Handler.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 namespace DAnCE
 {
   namespace Config_Handlers
diff --git a/DAnCE/Config_Handlers/DataType_Handler.h b/DAnCE/Config_Handlers/DataType_Handler.h
index 57103dec105..66713e99008 100644
--- a/DAnCE/Config_Handlers/DataType_Handler.h
+++ b/DAnCE/Config_Handlers/DataType_Handler.h
@@ -13,7 +13,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "DAnCE/Deployment/DeploymentC.h"
+#include "Deployment/DeploymentC.h"
 #include "Basic_Deployment_Data.hpp"
 
 #include "Config_Handlers_Common_Export.h"
diff --git a/DAnCE/Config_Handlers/DnC_Dump.cpp b/DAnCE/Config_Handlers/DnC_Dump.cpp
index 1a5c4d8b57e..3e4d1a0043f 100644
--- a/DAnCE/Config_Handlers/DnC_Dump.cpp
+++ b/DAnCE/Config_Handlers/DnC_Dump.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/Log_Msg.h"
 #include "tao/SystemException.h"
-#include "DAnCE/Deployment/Deployment_DataC.h"
+#include "Deployment/Deployment_DataC.h"
 #include "DnC_Dump.h"
 #include "DnC_Dump_T.h"
 #include <iostream>
diff --git a/DAnCE/Config_Handlers/DnC_Dump.h b/DAnCE/Config_Handlers/DnC_Dump.h
index 4cddf38cc31..d82dc2936c6 100644
--- a/DAnCE/Config_Handlers/DnC_Dump.h
+++ b/DAnCE/Config_Handlers/DnC_Dump.h
@@ -12,8 +12,8 @@
 #define DNC_DUMP_H
 #include /**/ "ace/pre.h"
 
-#include "DAnCE/Deployment/Deployment_Packaging_DataC.h"
-#include "DAnCE/Deployment/Deployment_TargetDataC.h"
+#include "Deployment/Deployment_Packaging_DataC.h"
+#include "Deployment/Deployment_TargetDataC.h"
 #include "Config_Handlers_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/DAnCE/Config_Handlers/Dump_Obj.h b/DAnCE/Config_Handlers/Dump_Obj.h
index babffe43bac..b2312677399 100644
--- a/DAnCE/Config_Handlers/Dump_Obj.h
+++ b/DAnCE/Config_Handlers/Dump_Obj.h
@@ -12,7 +12,7 @@
 #define CIAO_DUMP_OBJ_H
 #include /**/ "ace/pre.h"
 
-#include "DAnCE/Deployment/DeploymentC.h"
+#include "Deployment/DeploymentC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/DAnCE/Config_Handlers/ERE_Handler.cpp b/DAnCE/Config_Handlers/ERE_Handler.cpp
index 6bcee167aa4..eb1ccf0b937 100644
--- a/DAnCE/Config_Handlers/ERE_Handler.cpp
+++ b/DAnCE/Config_Handlers/ERE_Handler.cpp
@@ -2,8 +2,8 @@
 
 #include "ERE_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "DAnCE/Deployment/Deployment_DataC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Deployment/Deployment_DataC.h"
+#include "Logger/Log_Macros.h"
 namespace DAnCE
 {
   namespace Config_Handlers
diff --git a/DAnCE/Config_Handlers/ESD_Handler.cpp b/DAnCE/Config_Handlers/ESD_Handler.cpp
index a61bb47f6c4..becdf5d3a4c 100644
--- a/DAnCE/Config_Handlers/ESD_Handler.cpp
+++ b/DAnCE/Config_Handlers/ESD_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "ESD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "DAnCE/Deployment/Deployment_DataC.h"
+#include "Deployment/Deployment_DataC.h"
 #include "cdp.hpp"
 
 namespace DAnCE
diff --git a/DAnCE/Config_Handlers/IDD_Handler.cpp b/DAnCE/Config_Handlers/IDD_Handler.cpp
index 152077cf293..7165dbe679e 100644
--- a/DAnCE/Config_Handlers/IDD_Handler.cpp
+++ b/DAnCE/Config_Handlers/IDD_Handler.cpp
@@ -7,7 +7,7 @@
 #include "Property_Handler.h"
 #include "Any_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "DAnCE/Deployment/Deployment_DataC.h"
+#include "Deployment/Deployment_DataC.h"
 #include "cdp.hpp"
 
 namespace DAnCE
diff --git a/DAnCE/Config_Handlers/IDREF_Base.cpp b/DAnCE/Config_Handlers/IDREF_Base.cpp
index 96470574521..a6196358881 100644
--- a/DAnCE/Config_Handlers/IDREF_Base.cpp
+++ b/DAnCE/Config_Handlers/IDREF_Base.cpp
@@ -3,7 +3,7 @@
 #ifndef IDREF_BASE_CPP
 #define IDREF_BASE_CPP
 
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 #include "IDREF_Base.h"
 #include <iostream>
 
diff --git a/DAnCE/Config_Handlers/ID_Handler.cpp b/DAnCE/Config_Handlers/ID_Handler.cpp
index de7bdea0c9b..62da0271157 100644
--- a/DAnCE/Config_Handlers/ID_Handler.cpp
+++ b/DAnCE/Config_Handlers/ID_Handler.cpp
@@ -2,8 +2,8 @@
 
 #include "ID_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "DAnCE/Deployment/Deployment_DataC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Deployment/Deployment_DataC.h"
+#include "Logger/Log_Macros.h"
 namespace DAnCE
 {
   namespace Config_Handlers
diff --git a/DAnCE/Config_Handlers/IRDD_Handler.cpp b/DAnCE/Config_Handlers/IRDD_Handler.cpp
index afc1c4fd3c2..3aaf045919e 100644
--- a/DAnCE/Config_Handlers/IRDD_Handler.cpp
+++ b/DAnCE/Config_Handlers/IRDD_Handler.cpp
@@ -2,9 +2,9 @@
 
 #include "IRDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "DAnCE/Deployment/Deployment_DataC.h"
+#include "Deployment/Deployment_DataC.h"
 #include "Property_Handler.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 
 namespace DAnCE
diff --git a/DAnCE/Config_Handlers/MDD_Handler.cpp b/DAnCE/Config_Handlers/MDD_Handler.cpp
index b7f34c7e298..b89014c7a5e 100644
--- a/DAnCE/Config_Handlers/MDD_Handler.cpp
+++ b/DAnCE/Config_Handlers/MDD_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "MDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "DAnCE/Deployment/Deployment_DataC.h"
+#include "Deployment/Deployment_DataC.h"
 #include "ADD_Handler.h"
 #include "Property_Handler.h"
 #include "Req_Handler.h"
diff --git a/DAnCE/Config_Handlers/PCD_Handler.cpp b/DAnCE/Config_Handlers/PCD_Handler.cpp
index 8b70c9a216f..1c6a57ee64e 100644
--- a/DAnCE/Config_Handlers/PCD_Handler.cpp
+++ b/DAnCE/Config_Handlers/PCD_Handler.cpp
@@ -7,8 +7,8 @@
 #include "ERE_Handler.h"
 #include "CRDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "DAnCE/Deployment/Deployment_DataC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Deployment/Deployment_DataC.h"
+#include "Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/Config_Handlers/PL_Handler.cpp b/DAnCE/Config_Handlers/PL_Handler.cpp
index 4dac9a7c612..610566f1903 100644
--- a/DAnCE/Config_Handlers/PL_Handler.cpp
+++ b/DAnCE/Config_Handlers/PL_Handler.cpp
@@ -3,8 +3,8 @@
 #include "PL_Handler.h"
 #include "IDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "DAnCE/Deployment/Deployment_DataC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Deployment/Deployment_DataC.h"
+#include "Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/Config_Handlers/PSPE_Handler.cpp b/DAnCE/Config_Handlers/PSPE_Handler.cpp
index 3568ab64813..84dbe5a017d 100644
--- a/DAnCE/Config_Handlers/PSPE_Handler.cpp
+++ b/DAnCE/Config_Handlers/PSPE_Handler.cpp
@@ -3,7 +3,7 @@
 #include "PSPE_Handler.h"
 #include "IDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "DAnCE/Deployment/Deployment_DataC.h"
+#include "Deployment/Deployment_DataC.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/Config_Handlers/Package_Handlers/CAD_Handler.cpp b/DAnCE/Config_Handlers/Package_Handlers/CAD_Handler.cpp
index 3994e8325f6..b7b235f2267 100644
--- a/DAnCE/Config_Handlers/Package_Handlers/CAD_Handler.cpp
+++ b/DAnCE/Config_Handlers/Package_Handlers/CAD_Handler.cpp
@@ -4,7 +4,7 @@
 #include "Package_Handlers/CAD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "cid.hpp"
-#include "DAnCE/Deployment/Deployment_Packaging_DataC.h"
+#include "Deployment/Deployment_Packaging_DataC.h"
 #include "Req_Handler.h"
 #include "CEPE_Handler.h"
 #include "ERE_Handler.h"
diff --git a/DAnCE/Config_Handlers/Package_Handlers/CAD_Handler.h b/DAnCE/Config_Handlers/Package_Handlers/CAD_Handler.h
index cffaa264c60..8fb6ccbf68a 100644
--- a/DAnCE/Config_Handlers/Package_Handlers/CAD_Handler.h
+++ b/DAnCE/Config_Handlers/Package_Handlers/CAD_Handler.h
@@ -11,7 +11,7 @@
 #include /**/ "ace/pre.h"
 
 #include "XML_Typedefs.h"
-#include "DAnCE/Deployment/DeploymentC.h"
+#include "Deployment/DeploymentC.h"
 #include "Package_Handlers/Packaging_Handlers_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/DAnCE/Config_Handlers/Package_Handlers/CID_Handler.cpp b/DAnCE/Config_Handlers/Package_Handlers/CID_Handler.cpp
index e947d41bc1f..544a6bb802c 100644
--- a/DAnCE/Config_Handlers/Package_Handlers/CID_Handler.cpp
+++ b/DAnCE/Config_Handlers/Package_Handlers/CID_Handler.cpp
@@ -10,7 +10,7 @@
 #include "Req_Handler.h"
 
 #include "Basic_Deployment_Data.hpp"
-#include "DAnCE/Deployment/Deployment_DataC.h"
+#include "Deployment/Deployment_DataC.h"
 #include "XML_Typedefs.h"
 #include "Utils/Exceptions.h"
 
diff --git a/DAnCE/Config_Handlers/Package_Handlers/CPD_Handler.cpp b/DAnCE/Config_Handlers/Package_Handlers/CPD_Handler.cpp
index 87305de07de..58d6825314e 100644
--- a/DAnCE/Config_Handlers/Package_Handlers/CPD_Handler.cpp
+++ b/DAnCE/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 "DAnCE/Deployment/Deployment_Packaging_DataC.h"
+#include "Deployment/Deployment_Packaging_DataC.h"
 #include "Deployment.hpp"
 #include "Utils/Exceptions.h"
 #include "Property_Handler.h"
diff --git a/DAnCE/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp b/DAnCE/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
index 789a5bcc63c..af8e3402c21 100644
--- a/DAnCE/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
+++ b/DAnCE/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
@@ -9,7 +9,7 @@
 #include "Deployment.hpp"
 #include "Package_Handlers/CPD_Handler.h"
 #include "Config_Handlers/CPD_Handler.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 namespace DAnCE
 {
   namespace Config_Handlers
diff --git a/DAnCE/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h b/DAnCE/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h
index c6c611c0fbc..75364a69097 100644
--- a/DAnCE/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h
+++ b/DAnCE/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h
@@ -11,7 +11,7 @@
 #include /**/ "ace/pre.h"
 
 #include "XML_Typedefs.h"
-#include "DAnCE/Deployment/Deployment_Packaging_DataC.h"
+#include "Deployment/Deployment_Packaging_DataC.h"
 #include "Package_Handlers/Packaging_Handlers_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/DAnCE/Config_Handlers/Package_Handlers/IAD_Handler.cpp b/DAnCE/Config_Handlers/Package_Handlers/IAD_Handler.cpp
index dad0878df02..b004d118f31 100644
--- a/DAnCE/Config_Handlers/Package_Handlers/IAD_Handler.cpp
+++ b/DAnCE/Config_Handlers/Package_Handlers/IAD_Handler.cpp
@@ -9,7 +9,7 @@
 #include "XML_Typedefs.h"
 
 #include "Deployment.hpp"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/Config_Handlers/Package_Handlers/NIA_Handler.h b/DAnCE/Config_Handlers/Package_Handlers/NIA_Handler.h
index 08e76518b8b..ff6018e199e 100644
--- a/DAnCE/Config_Handlers/Package_Handlers/NIA_Handler.h
+++ b/DAnCE/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 "DAnCE/Deployment/Deployment_Packaging_DataC.h"
+#include "Deployment/Deployment_Packaging_DataC.h"
 #include "iad.hpp"
 
 namespace Deployment
diff --git a/DAnCE/Config_Handlers/Package_Handlers/PCD_Handler.cpp b/DAnCE/Config_Handlers/Package_Handlers/PCD_Handler.cpp
index e960f17ce41..145507f8bc6 100644
--- a/DAnCE/Config_Handlers/Package_Handlers/PCD_Handler.cpp
+++ b/DAnCE/Config_Handlers/Package_Handlers/PCD_Handler.cpp
@@ -1,7 +1,7 @@
 // $Id$
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/Deployment/Deployment_Packaging_DataC.h"
+#include "Logger/Log_Macros.h"
+#include "Deployment/Deployment_Packaging_DataC.h"
 #include "XML_Typedefs.h"
 #include "XML/XercesString.h"
 #include "Utils/Exceptions.h"
diff --git a/DAnCE/Config_Handlers/Package_Handlers/PC_Intf.cpp b/DAnCE/Config_Handlers/Package_Handlers/PC_Intf.cpp
index 08aac17ed44..331ec9a0380 100644
--- a/DAnCE/Config_Handlers/Package_Handlers/PC_Intf.cpp
+++ b/DAnCE/Config_Handlers/Package_Handlers/PC_Intf.cpp
@@ -5,7 +5,7 @@
 #include "Deployment.hpp"
 #include "STD_PCD_Handler.h"
 #include "ciao/Packaging_DataC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/Config_Handlers/Package_Handlers/SID_Handler.cpp b/DAnCE/Config_Handlers/Package_Handlers/SID_Handler.cpp
index b3860c4d6fb..12eb82d6aa7 100644
--- a/DAnCE/Config_Handlers/Package_Handlers/SID_Handler.cpp
+++ b/DAnCE/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 "DAnCE/Deployment/DeploymentC.h"
+#include "Deployment/DeploymentC.h"
 #include "Package_Handlers/CPD_Handler.h"
 #include "Package_Handlers/PCD_Handler.h"
 #include "Package_Handlers/Comp_Intf_Descr_Handler.h"
diff --git a/DAnCE/Config_Handlers/Property_Handler.cpp b/DAnCE/Config_Handlers/Property_Handler.cpp
index 194b67eeebc..f3a24e90b90 100644
--- a/DAnCE/Config_Handlers/Property_Handler.cpp
+++ b/DAnCE/Config_Handlers/Property_Handler.cpp
@@ -3,8 +3,8 @@
 #include "Property_Handler.h"
 #include "Any_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "DAnCE/Deployment/Deployment_DataC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Deployment/Deployment_DataC.h"
+#include "Logger/Log_Macros.h"
 namespace DAnCE
 {
   namespace Config_Handlers
diff --git a/DAnCE/Config_Handlers/RDD_Handler.cpp b/DAnCE/Config_Handlers/RDD_Handler.cpp
index cf740234800..c18413892bc 100644
--- a/DAnCE/Config_Handlers/RDD_Handler.cpp
+++ b/DAnCE/Config_Handlers/RDD_Handler.cpp
@@ -2,9 +2,9 @@
 
 #include "RDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "DAnCE/Deployment/Deployment_DataC.h"
+#include "Deployment/Deployment_DataC.h"
 #include "Any_Handler.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 #include "Property_Handler.h"
 
 namespace DAnCE
diff --git a/DAnCE/Config_Handlers/Req_Handler.cpp b/DAnCE/Config_Handlers/Req_Handler.cpp
index 0fa001ff5c5..db47fefb195 100644
--- a/DAnCE/Config_Handlers/Req_Handler.cpp
+++ b/DAnCE/Config_Handlers/Req_Handler.cpp
@@ -2,8 +2,8 @@
 
 #include "Req_Handler.h"
 #include "Property_Handler.h"
-#include "DAnCE/Deployment/Deployment_BaseC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Deployment/Deployment_BaseC.h"
+#include "Logger/Log_Macros.h"
 namespace DAnCE
 {
   namespace Config_Handlers
diff --git a/DAnCE/Config_Handlers/STD_CID_Handler.cpp b/DAnCE/Config_Handlers/STD_CID_Handler.cpp
index a9eb75919ef..dce92883fe4 100644
--- a/DAnCE/Config_Handlers/STD_CID_Handler.cpp
+++ b/DAnCE/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 "DAnCE/Deployment/Deployment_DataC.h"
+#include "Deployment/Deployment_DataC.h"
 #include "Utils/XML_Helper.h"
 #include "Deployment.hpp"
 #include "Property_Handler.h"
diff --git a/DAnCE/Config_Handlers/STD_CID_Handler.h b/DAnCE/Config_Handlers/STD_CID_Handler.h
index cc1d7310421..b176f5d0656 100644
--- a/DAnCE/Config_Handlers/STD_CID_Handler.h
+++ b/DAnCE/Config_Handlers/STD_CID_Handler.h
@@ -15,7 +15,7 @@
 
 #include "IDREF_Base.h"
 #include "Config_Handlers_Export.h"
-#include "DAnCE/Deployment/DeploymentC.h"
+#include "Deployment/DeploymentC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/DAnCE/Config_Handlers/STD_CPD_Handler.cpp b/DAnCE/Config_Handlers/STD_CPD_Handler.cpp
index 010a2d13603..8d455e1d369 100644
--- a/DAnCE/Config_Handlers/STD_CPD_Handler.cpp
+++ b/DAnCE/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 "DAnCE/Deployment/Deployment_DataC.h"
+#include "Deployment/Deployment_DataC.h"
 #include "Deployment.hpp"
 #include "Utils/XML_Typedefs.h"
 
diff --git a/DAnCE/Config_Handlers/STD_PC_Intf.cpp b/DAnCE/Config_Handlers/STD_PC_Intf.cpp
index 1ab61a5cdf5..0f8a9352066 100644
--- a/DAnCE/Config_Handlers/STD_PC_Intf.cpp
+++ b/DAnCE/Config_Handlers/STD_PC_Intf.cpp
@@ -5,7 +5,7 @@
 #include "Deployment.hpp"
 #include "STD_PCD_Handler.h"
 #include "ciao/Packaging_DataC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/Config_Handlers/SatisfierProperty_Handler.cpp b/DAnCE/Config_Handlers/SatisfierProperty_Handler.cpp
index 3c1f8361978..6304d0c6797 100644
--- a/DAnCE/Config_Handlers/SatisfierProperty_Handler.cpp
+++ b/DAnCE/Config_Handlers/SatisfierProperty_Handler.cpp
@@ -3,8 +3,8 @@
 #include "SatisfierProperty_Handler.h"
 #include "Any_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "DAnCE/Deployment/Deployment_DataC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Deployment/Deployment_DataC.h"
+#include "Logger/Log_Macros.h"
 #include "Utils/Exceptions.h"
 #include "Logger/Log_Macros.h"
 
diff --git a/DAnCE/Config_Handlers/XML_File_Intf.cpp b/DAnCE/Config_Handlers/XML_File_Intf.cpp
index 48fa3542c42..76e317d80da 100644
--- a/DAnCE/Config_Handlers/XML_File_Intf.cpp
+++ b/DAnCE/Config_Handlers/XML_File_Intf.cpp
@@ -7,9 +7,9 @@
 #include "DD_Handler.h"
 #include "Common.h"
 
-#include "DAnCE/Deployment/Deployment_DataC.h"
-#include "DAnCE/Deployment/Deployment_TargetDataC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Deployment/Deployment_DataC.h"
+#include "Deployment/Deployment_TargetDataC.h"
+#include "Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/DAnCE/DAnCE_ArtifactInstallation.idl b/DAnCE/DAnCE/DAnCE_ArtifactInstallation.idl
index b22283290e9..a284d589e3c 100644
--- a/DAnCE/DAnCE/DAnCE_ArtifactInstallation.idl
+++ b/DAnCE/DAnCE/DAnCE_ArtifactInstallation.idl
@@ -3,8 +3,8 @@
 #ifndef DANCE_ARTIFACT_INSTALLATION_IDL
 #define DANCE_ARTIFACT_INSTALLATION_IDL
 
-#include "DAnCE/Deployment/Deployment_DeploymentPlan.idl"
-#include "DAnCE/Deployment/Deployment_PlanError.idl"
+#include "Deployment/Deployment_DeploymentPlan.idl"
+#include "Deployment/Deployment_PlanError.idl"
 
 module DAnCE
 {
diff --git a/DAnCE/DAnCE/DAnCE_Utility.h b/DAnCE/DAnCE/DAnCE_Utility.h
index 2cf4bfc5f57..b8a62dc62fe 100644
--- a/DAnCE/DAnCE/DAnCE_Utility.h
+++ b/DAnCE/DAnCE/DAnCE_Utility.h
@@ -20,7 +20,7 @@
 #include "ace/Refcounted_Auto_Ptr.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "Deployment/Deployment_DeploymentPlanC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/Deployment/Deployment_Application.idl b/DAnCE/Deployment/Deployment_Application.idl
index 3bd73105718..19059996e59 100644
--- a/DAnCE/Deployment/Deployment_Application.idl
+++ b/DAnCE/Deployment/Deployment_Application.idl
@@ -3,10 +3,10 @@
 #ifndef DEPLOYMENT_APPLICATION_IDL
 #define DEPLOYMENT_APPLICATION_IDL
 
-#include "DAnCE/Deployment/Deployment_Connection.idl"
-#include "DAnCE/Deployment/Deployment_StartError.idl"
-#include "DAnCE/Deployment/Deployment_StopError.idl"
-#include "DAnCE/Deployment/Deployment_InvalidConnection.idl"
+#include "Deployment/Deployment_Connection.idl"
+#include "Deployment/Deployment_StartError.idl"
+#include "Deployment/Deployment_StopError.idl"
+#include "Deployment/Deployment_InvalidConnection.idl"
 
 module Deployment
 {
diff --git a/DAnCE/Deployment/Deployment_ApplicationManager.idl b/DAnCE/Deployment/Deployment_ApplicationManager.idl
index 4b1dd46fb91..dfad8b4176e 100644
--- a/DAnCE/Deployment/Deployment_ApplicationManager.idl
+++ b/DAnCE/Deployment/Deployment_ApplicationManager.idl
@@ -4,13 +4,13 @@
 #ifndef DEPLOYMENT_APPLICATIONMANAGER_IDL
 #define DEPLOYMENT_APPLICATIONMANAGER_IDL
 
-#include "DAnCE/Deployment/Deployment.idl"
-#include "DAnCE/Deployment/Deployment_InvalidProperty.idl"
-#include "DAnCE/Deployment/Deployment_Application.idl"
-#include "DAnCE/Deployment/Deployment_Connection.idl"
-#include "DAnCE/Deployment/Deployment_ResourceNotAvailable.idl"
-#include "DAnCE/Deployment/Deployment_InvalidNodeExecParameter.idl"
-#include "DAnCE/Deployment/Deployment_InvalidComponentExecParameter.idl"
+#include "Deployment/Deployment.idl"
+#include "Deployment/Deployment_InvalidProperty.idl"
+#include "Deployment/Deployment_Application.idl"
+#include "Deployment/Deployment_Connection.idl"
+#include "Deployment/Deployment_ResourceNotAvailable.idl"
+#include "Deployment/Deployment_InvalidNodeExecParameter.idl"
+#include "Deployment/Deployment_InvalidComponentExecParameter.idl"
 
 module Deployment {
 
diff --git a/DAnCE/Deployment/Deployment_Connection.idl b/DAnCE/Deployment/Deployment_Connection.idl
index a07cd7990a4..e7c2a49cebf 100644
--- a/DAnCE/Deployment/Deployment_Connection.idl
+++ b/DAnCE/Deployment/Deployment_Connection.idl
@@ -3,7 +3,7 @@
 #ifndef DEPLOYMENT_CONNECTION_IDL
 #define DEPLOYMENT_CONNECTION_IDL
 
-#include "DAnCE/Deployment/Deployment_DeploymentPlan.idl"
+#include "Deployment/Deployment_DeploymentPlan.idl"
 
 module Deployment
 {
diff --git a/DAnCE/Deployment/Deployment_Data.idl b/DAnCE/Deployment/Deployment_Data.idl
index ec21e4715f1..edef317d6c2 100644
--- a/DAnCE/Deployment/Deployment_Data.idl
+++ b/DAnCE/Deployment/Deployment_Data.idl
@@ -3,7 +3,7 @@
 #ifndef DEPLOYMENT_DATA_IDL
 #define DEPLOYMENT_DATA_IDL
 
-#include "DAnCE/Deployment/Deployment_DeploymentPlan.idl"
+#include "Deployment/Deployment_DeploymentPlan.idl"
 
 module Deployment {
   struct ComponentPackageReference {
diff --git a/DAnCE/Deployment/Deployment_DeploymentPlan.idl b/DAnCE/Deployment/Deployment_DeploymentPlan.idl
index b594e535400..5d93ce7c84e 100644
--- a/DAnCE/Deployment/Deployment_DeploymentPlan.idl
+++ b/DAnCE/Deployment/Deployment_DeploymentPlan.idl
@@ -3,7 +3,7 @@
 #ifndef DEPLOYMENT_DEPLOYMENTPLAN_IDL
 #define DEPLOYMENT_DEPLOYMENTPLAN_IDL
 
-#include "DAnCE/Deployment/Deployment_Base.idl"
+#include "Deployment/Deployment_Base.idl"
 #include "tao/StringSeq.pidl"
 #include "tao/ULongSeq.pidl"
 #include "tao/Typecode_types.pidl"
diff --git a/DAnCE/Deployment/Deployment_DomainApplication.idl b/DAnCE/Deployment/Deployment_DomainApplication.idl
index 4d8b1c94ba3..cede03681d5 100644
--- a/DAnCE/Deployment/Deployment_DomainApplication.idl
+++ b/DAnCE/Deployment/Deployment_DomainApplication.idl
@@ -3,7 +3,7 @@
 #ifndef DEPLOYMENT_DOMAINAPPLICATION_IDL
 #define DEPLOYMENT_DOMAINAPPLICATION_IDL
 
-#include "DAnCE/Deployment/Deployment_Application.idl"
+#include "Deployment/Deployment_Application.idl"
 
 module Deployment
 {
diff --git a/DAnCE/Deployment/Deployment_DomainApplicationManager.idl b/DAnCE/Deployment/Deployment_DomainApplicationManager.idl
index d8d12e3af40..c72526dec0e 100644
--- a/DAnCE/Deployment/Deployment_DomainApplicationManager.idl
+++ b/DAnCE/Deployment/Deployment_DomainApplicationManager.idl
@@ -3,8 +3,8 @@
 #ifndef DOMAINAPPLICATIONMANAGER_IDL
 #define DOMAINAPPLICATIONMANAGER_IDL
 
-#include "DAnCE/Deployment/Deployment_DeploymentPlan.idl"
-#include "DAnCE/Deployment/Deployment_ApplicationManager.idl"
+#include "Deployment/Deployment_DeploymentPlan.idl"
+#include "Deployment/Deployment_ApplicationManager.idl"
 
 module Deployment {
   interface DomainApplicationManager : ApplicationManager
diff --git a/DAnCE/Deployment/Deployment_ExecutionManager.idl b/DAnCE/Deployment/Deployment_ExecutionManager.idl
index 8a60dbb2ccf..b6c89971312 100644
--- a/DAnCE/Deployment/Deployment_ExecutionManager.idl
+++ b/DAnCE/Deployment/Deployment_ExecutionManager.idl
@@ -2,9 +2,9 @@
 #ifndef EXECUTIONMANAGER_IDL
 #define EXECUTIONMANAGER_IDL
 
-#include "DAnCE/Deployment/Deployment_DomainApplicationManager.idl"
-#include "DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl"
-#include "DAnCE/Deployment/Deployment_PlanError.idl"
+#include "Deployment/Deployment_DomainApplicationManager.idl"
+#include "Deployment/Deployment_ResourceCommitmentManager.idl"
+#include "Deployment/Deployment_PlanError.idl"
 
 module Deployment {
   interface ExecutionManager {
diff --git a/DAnCE/Deployment/Deployment_NodeApplication.idl b/DAnCE/Deployment/Deployment_NodeApplication.idl
index 73677e40f4d..d1edc791401 100644
--- a/DAnCE/Deployment/Deployment_NodeApplication.idl
+++ b/DAnCE/Deployment/Deployment_NodeApplication.idl
@@ -3,7 +3,7 @@
 #ifndef DEPLOYMENT_NODEAPPLICATION_IDL
 #define DEPLOYMENT_NODEAPPLICATION_IDL
 
-#include "DAnCE/Deployment/Deployment_Application.idl"
+#include "Deployment/Deployment_Application.idl"
 
 module Deployment {
   interface NodeApplication : Application
diff --git a/DAnCE/Deployment/Deployment_NodeApplicationManager.idl b/DAnCE/Deployment/Deployment_NodeApplicationManager.idl
index 2e7ea458a1d..61eacba7826 100644
--- a/DAnCE/Deployment/Deployment_NodeApplicationManager.idl
+++ b/DAnCE/Deployment/Deployment_NodeApplicationManager.idl
@@ -2,7 +2,7 @@
 #ifndef NODEAPPLICATIONMANAGER_IDL
 #define NODEAPPLICATIONMANAGER_IDL
 
-#include "DAnCE/Deployment/Deployment_ApplicationManager.idl"
+#include "Deployment/Deployment_ApplicationManager.idl"
 
 module Deployment {
   interface NodeApplicationManager :
diff --git a/DAnCE/Deployment/Deployment_NodeManager.idl b/DAnCE/Deployment/Deployment_NodeManager.idl
index ba488013c00..b7e14963f39 100644
--- a/DAnCE/Deployment/Deployment_NodeManager.idl
+++ b/DAnCE/Deployment/Deployment_NodeManager.idl
@@ -2,10 +2,10 @@
 #ifndef DEPLOYMENT_NODEMANAGER_IDL
 #define DEPLOYMENT_NODEMANAGER_IDL
 
-#include "DAnCE/Deployment/Deployment.idl"
-#include "DAnCE/Deployment/Deployment_TargetManager.idl"
-#include "DAnCE/Deployment/Deployment_NodeApplicationManager.idl"
-#include "DAnCE/Deployment/Deployment_PlanError.idl"
+#include "Deployment/Deployment.idl"
+#include "Deployment/Deployment_TargetManager.idl"
+#include "Deployment/Deployment_NodeApplicationManager.idl"
+#include "Deployment/Deployment_PlanError.idl"
 
 module Deployment {
 
diff --git a/DAnCE/Deployment/Deployment_Packaging_Data.idl b/DAnCE/Deployment/Deployment_Packaging_Data.idl
index 266bb0a8481..a535fb33687 100644
--- a/DAnCE/Deployment/Deployment_Packaging_Data.idl
+++ b/DAnCE/Deployment/Deployment_Packaging_Data.idl
@@ -3,7 +3,7 @@
 #ifndef PACKAGING_DATA_IDL
 #define PACKAGING_DATA_IDL
 
-#include "DAnCE/Deployment/Deployment_Data.idl"
+#include "Deployment/Deployment_Data.idl"
 
 module Deployment {
 
diff --git a/DAnCE/Deployment/Deployment_RepositoryManager.idl b/DAnCE/Deployment/Deployment_RepositoryManager.idl
index 6c5f055b484..9262b961327 100644
--- a/DAnCE/Deployment/Deployment_RepositoryManager.idl
+++ b/DAnCE/Deployment/Deployment_RepositoryManager.idl
@@ -2,8 +2,8 @@
 #ifndef REPOSITORY_MANAGER_IDL
 #define REPOSITORY_MANAGER_IDL
 
-#include "DAnCE/Deployment/Deployment_Packaging_Data.idl"
-#include "DAnCE/Deployment/Deployment.idl"
+#include "Deployment/Deployment_Packaging_Data.idl"
+#include "Deployment/Deployment.idl"
 
 module Deployment {
 
diff --git a/DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl b/DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl
index 9f534d9a364..c7193167ffd 100644
--- a/DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl
+++ b/DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl
@@ -3,7 +3,7 @@
 #ifndef RESOURCE_COMMITMENT_MANAGER_IDL
 #define RESOURCE_COMMITMENT_MANAGER_IDL
 
-#include "DAnCE/Deployment/Deployment_Base.idl"
+#include "Deployment/Deployment_Base.idl"
 #include "tao/AnyTypeCode/AnySeq.pidl"
 
 module Deployment {
diff --git a/DAnCE/Deployment/Deployment_TargetData.idl b/DAnCE/Deployment/Deployment_TargetData.idl
index 4a48b613853..e2e1d024719 100644
--- a/DAnCE/Deployment/Deployment_TargetData.idl
+++ b/DAnCE/Deployment/Deployment_TargetData.idl
@@ -3,7 +3,7 @@
 #ifndef DEPLOYMENT_TARGETDATA_IDL
 #define DEPLOYMENT_TARGETDATA_IDL
 
-#include "DAnCE/Deployment/Deployment_Base.idl"
+#include "Deployment/Deployment_Base.idl"
 #include "tao/StringSeq.pidl"
 #include "tao/ULongSeq.pidl"
 
diff --git a/DAnCE/Deployment/Deployment_TargetManager.idl b/DAnCE/Deployment/Deployment_TargetManager.idl
index 32de3a9f0e9..a317cb93e09 100644
--- a/DAnCE/Deployment/Deployment_TargetManager.idl
+++ b/DAnCE/Deployment/Deployment_TargetManager.idl
@@ -3,9 +3,9 @@
 #ifndef TARGETMANAGER_IDL
 #define TARGETMANAGER_IDL
 
-#include "DAnCE/Deployment/Deployment_TargetData.idl"
-#include "DAnCE/Deployment/Deployment_DeploymentPlan.idl"
-#include "DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl"
+#include "Deployment/Deployment_TargetData.idl"
+#include "Deployment/Deployment_DeploymentPlan.idl"
+#include "Deployment/Deployment_ResourceCommitmentManager.idl"
 
 module Deployment {
   enum DomainUpdateKind {
diff --git a/DAnCE/DomainApplication/Domain_Application_Impl.cpp b/DAnCE/DomainApplication/Domain_Application_Impl.cpp
index 7851c3048b2..abcd0ba40bd 100644
--- a/DAnCE/DomainApplication/Domain_Application_Impl.cpp
+++ b/DAnCE/DomainApplication/Domain_Application_Impl.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "Domain_Application_Impl.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 #include <sstream>
 
 namespace DAnCE
diff --git a/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index 46f3709c8a8..bdaa7a65f26 100644
--- a/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -2,7 +2,7 @@
 
 #include "DomainApplicationManager_Impl.h"
 #include "Deployment/Deployment_ConnectionC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 #include "Split_Plan/Split_Plan.h"
 #include "Split_Plan/Node_Splitter.h"
 #include <sstream>
diff --git a/DAnCE/DomainApplicationManager/Node_Locator.cpp b/DAnCE/DomainApplicationManager/Node_Locator.cpp
index 123854b3a16..4c75a69167f 100644
--- a/DAnCE/DomainApplicationManager/Node_Locator.cpp
+++ b/DAnCE/DomainApplicationManager/Node_Locator.cpp
@@ -2,7 +2,7 @@
 
 #include "Node_Locator.h"
 #include "ace/Read_Buffer.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/DomainApplicationManager/Node_Locator.h b/DAnCE/DomainApplicationManager/Node_Locator.h
index 2d82acc9750..b17d507a0fa 100644
--- a/DAnCE/DomainApplicationManager/Node_Locator.h
+++ b/DAnCE/DomainApplicationManager/Node_Locator.h
@@ -18,7 +18,7 @@
 #include "ace/Map_Manager.h"
 #include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "tao/ORB.h"
-#include "DAnCE/Deployment/Deployment_NodeManagerC.h"
+#include "Deployment/Deployment_NodeManagerC.h"
 #include "DomainApplicationManager/DomainApplicationManager_Export.h"
 
 namespace DAnCE
diff --git a/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp b/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp
index 9ebec98d70b..38fa61abfa9 100644
--- a/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp
+++ b/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp
@@ -4,7 +4,7 @@
 #include "ExecutionManager_Impl.h"
 
 #include "Config_Handlers/DnC_Dump.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 using namespace DAnCE;
 
diff --git a/DAnCE/ExecutionManager/ExecutionManager_Module.cpp b/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
index c5d6a06f6d1..1d5f818746b 100644
--- a/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
+++ b/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
@@ -7,10 +7,9 @@
 #include "tao/IORTable/IORTable.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
 #include "orbsvcs/CosNamingC.h"
-#include "ciao/Valuetype_Factories/Cookies.h"
 #include "ExecutionManager_Module.h"
 #include "ExecutionManager_Impl.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 namespace DAnCE
 {
@@ -192,15 +191,6 @@ DAnCE_ExecutionManager_Module::init (CORBA::ORB_ptr orb,
       if (!this->parse_args (argc, argv))
         return CORBA::Object::_nil ();
 
-      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
-                    ACE_TEXT("before creating value factory.\n")));
-      CORBA::ValueFactory_var vf = new Components::Cookie_init();
-      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
-                    ACE_TEXT("before registering value factory.\n")));
-      vf = orb->register_value_factory ("IDL:omg.org/Components/Cookie:1.0", vf.in());
-
-      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
-                    ACE_TEXT("after creating value factory.\n")));
       // Get reference to Root POA.
       CORBA::Object_var poa_obj
         = orb->resolve_initial_references ("RootPOA");
diff --git a/DAnCE/ExecutionManager/Execution_Manager.cpp b/DAnCE/ExecutionManager/Execution_Manager.cpp
index 878db84fffe..da37f826334 100644
--- a/DAnCE/ExecutionManager/Execution_Manager.cpp
+++ b/DAnCE/ExecutionManager/Execution_Manager.cpp
@@ -3,8 +3,8 @@
 #include "ace/Dynamic_Service.h"
 #include "tao/ORB.h"
 #include "tao/Object.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/Logger/Logger_Service.h"
+#include "Logger/Log_Macros.h"
+#include "Logger/Logger_Service.h"
 #include "ExecutionManager_Module.h"
 
 int
diff --git a/DAnCE/LocalityManager/Configuration/CPU_Affinity.cpp b/DAnCE/LocalityManager/Configuration/CPU_Affinity.cpp
index 64b1995edee..a896d5d95e3 100644
--- a/DAnCE/LocalityManager/Configuration/CPU_Affinity.cpp
+++ b/DAnCE/LocalityManager/Configuration/CPU_Affinity.cpp
@@ -4,7 +4,7 @@
 #include "DAnCE/DAnCE_PropertiesC.h"
 #include "Deployment/Deployment_StartErrorC.h"
 
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 #if defined (LINUX_VERSION_CODE) && defined (KERNEL_VERSION)
 # if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,8))
diff --git a/DAnCE/LocalityManager/Configuration/Process_Name.cpp b/DAnCE/LocalityManager/Configuration/Process_Name.cpp
index 97bcbbf0864..f1904ba85bc 100644
--- a/DAnCE/LocalityManager/Configuration/Process_Name.cpp
+++ b/DAnCE/LocalityManager/Configuration/Process_Name.cpp
@@ -4,7 +4,7 @@
 #include "DAnCE/DAnCE_PropertiesC.h"
 #include "Deployment/Deployment_StartErrorC.h"
 
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 #if defined (LINUX_VERSION_CODE) && defined (KERNEL_VERSION)
 # if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9))
diff --git a/DAnCE/LocalityManager/Configuration/Process_Priority.cpp b/DAnCE/LocalityManager/Configuration/Process_Priority.cpp
index 30b133fdc2e..ec156ece927 100644
--- a/DAnCE/LocalityManager/Configuration/Process_Priority.cpp
+++ b/DAnCE/LocalityManager/Configuration/Process_Priority.cpp
@@ -4,7 +4,7 @@
 #include "DAnCE/DAnCE_PropertiesC.h"
 #include "Deployment/Deployment_StartErrorC.h"
 
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 #include <sstream>
 #include "ace/Auto_Ptr.h"
diff --git a/DAnCE/LocalityManager/Daemon/Locality_Manager.cpp b/DAnCE/LocalityManager/Daemon/Locality_Manager.cpp
index 5964c3fda79..7c3e9c06c2a 100644
--- a/DAnCE/LocalityManager/Daemon/Locality_Manager.cpp
+++ b/DAnCE/LocalityManager/Daemon/Locality_Manager.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "Locality_Manager_Task.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 int ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
diff --git a/DAnCE/LocalityManager/Daemon/Locality_Manager_Task.cpp b/DAnCE/LocalityManager/Daemon/Locality_Manager_Task.cpp
index 3299cff5b58..79cc45555e0 100644
--- a/DAnCE/LocalityManager/Daemon/Locality_Manager_Task.cpp
+++ b/DAnCE/LocalityManager/Daemon/Locality_Manager_Task.cpp
@@ -14,11 +14,9 @@
 #include "ace/Env_Value_T.h"
 #include "tao/ORB.h"
 #include "tao/PortableServer/PortableServer.h"
-#include "DAnCE/Logger/Logger_Service.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Logger_Service.h"
+#include "Logger/Log_Macros.h"
 #include "DAnCE/DAnCE_Utility.h"
-#include "ciao/Logger/Log_Macros.h"
-#include "ciao/Logger/Logger_Service.h"
 #include "LocalityManager/Daemon/Locality_Manager_Impl.h"
 
 namespace DAnCE
@@ -39,15 +37,6 @@ namespace DAnCE
         dlf->init (argc, argv);
       }
     
-    // Also initialize CIAO logger since we reuse parts of CIAO in the locality manager
-    CIAO::Logger_Service
-      * clf = ACE_Dynamic_Service<CIAO::Logger_Service>::instance ("CIAO_Logger");
-    
-    if (clf)
-      {
-        clf->init (argc, argv);
-      }
-    
     DANCE_DEBUG (9, (LM_TRACE, DLINFO
                      ACE_TEXT ("DAnCE_LocalityManager_Task::DAnCE_LocalityManager_Task - ")
                      ACE_TEXT ("Creating ORB\n")));
diff --git a/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp b/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp
index f9d1a7567d8..230c39b14e5 100644
--- a/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp
+++ b/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.cpp
@@ -3,7 +3,7 @@
 #include "LocalityActivator_Impl.h"
 #include "ace/Log_Msg.h"
 #include "ace/UUID.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 #include "DAnCE/DAnCE_PropertiesC.h"
 #include "tao/ORB_Core.h"
 #include "LocalityManager/Scheduler/Plugin_Manager.h"
diff --git a/DAnCE/LocalityManager/Handler/Plugin_Conf.cpp b/DAnCE/LocalityManager/Handler/Plugin_Conf.cpp
index 621ad1a0ab9..f2b10b58cb8 100644
--- a/DAnCE/LocalityManager/Handler/Plugin_Conf.cpp
+++ b/DAnCE/LocalityManager/Handler/Plugin_Conf.cpp
@@ -3,7 +3,7 @@
 #include "Plugin_Conf.h"
 #include "ace/Read_Buffer.h"
 #include "ace/Tokenizer_T.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 #include "DAnCE/DAnCE_PropertiesC.h"
 
 #include "Inst_Handler_Impl.h"
diff --git a/DAnCE/LocalityManager/Interceptors/Best_Effort.cpp b/DAnCE/LocalityManager/Interceptors/Best_Effort.cpp
index 50c2051a3fc..f4619c84ee6 100644
--- a/DAnCE/LocalityManager/Interceptors/Best_Effort.cpp
+++ b/DAnCE/LocalityManager/Interceptors/Best_Effort.cpp
@@ -4,7 +4,7 @@
 #include "Deployment/Deployment_StartErrorC.h"
 #include "DAnCE/DAnCE_PropertiesC.h"
 #include "DAnCE/DAnCE_Utility.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/LocalityManager/Interceptors/Standard_Error.cpp b/DAnCE/LocalityManager/Interceptors/Standard_Error.cpp
index 37577f85c7e..5772869c4a1 100644
--- a/DAnCE/LocalityManager/Interceptors/Standard_Error.cpp
+++ b/DAnCE/LocalityManager/Interceptors/Standard_Error.cpp
@@ -4,7 +4,7 @@
 #include "Deployment/Deployment_StartErrorC.h"
 #include "DAnCE/DAnCE_PropertiesC.h"
 #include "DAnCE/DAnCE_Utility.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/LocalityManager/Scheduler/Events/Action_Base.cpp b/DAnCE/LocalityManager/Scheduler/Events/Action_Base.cpp
index bf3d9ec7c81..f71ce6d1cc7 100644
--- a/DAnCE/LocalityManager/Scheduler/Events/Action_Base.cpp
+++ b/DAnCE/LocalityManager/Scheduler/Events/Action_Base.cpp
@@ -2,7 +2,7 @@
 #include "Action_Base.h"
 
 #include "tao/AnyTypeCode/ExceptionA.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 #include "DAnCE/DAnCE_Utility.h"
 
 namespace DAnCE
diff --git a/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index 96fb4b8ff75..14e24ab1962 100644
--- a/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -8,7 +8,7 @@
 #include "tao/Object.h"
 #include "tao/ORB.h"
 #include "tao/AnyTypeCode/TypeCode.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 #include "Deployment/Deployment_BaseC.h"
 #include "Deployment/Deployment_ApplicationC.h"
 #include "Deployment/Deployment_PlanErrorC.h"
@@ -16,8 +16,8 @@
 #include "DAnCE/DAnCE_Utility.h"
 #include "DAnCE/DAnCE_PropertiesC.h"
 #include "DAnCE/DAnCE_LocalityManagerC.h"
-#include "DAnCE/LocalityManager/Scheduler/Plugin_Manager.h"
-#include "DAnCE/LocalityManager/Scheduler/Deployment_Completion.h"
+#include "LocalityManager/Scheduler/Plugin_Manager.h"
+#include "LocalityManager/Scheduler/Deployment_Completion.h"
 #include "LocalityManager/Scheduler/Events/Install.h"
 #include "LocalityManager/Scheduler/Events/Remove.h"
 #include "Split_Plan/Locality_Splitter.h"
diff --git a/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
index 3fbca976327..fe6c13478de 100644
--- a/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+++ b/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
@@ -2,12 +2,12 @@
 
 
 #include "ace/streams.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 #include "NodeApplicationManager_Impl.h"
 #include "NodeApplication/NodeApplication_Impl.h"
-#include "DAnCE/DAnCE/DAnCE_PropertiesC.h"
-#include "DAnCE/DAnCE/DAnCE_Utility.h"
+#include "DAnCE/DAnCE_PropertiesC.h"
+#include "DAnCE/DAnCE_Utility.h"
 #include "ace/Unbounded_Set.h"
 #include "tao/ORB.h"
 #include "tao/Object.h"
diff --git a/DAnCE/NodeManager/NodeManager_Impl.cpp b/DAnCE/NodeManager/NodeManager_Impl.cpp
index 253a63fd739..e4c17adf134 100644
--- a/DAnCE/NodeManager/NodeManager_Impl.cpp
+++ b/DAnCE/NodeManager/NodeManager_Impl.cpp
@@ -2,11 +2,11 @@
 
 #include "NodeManager_Impl.h"
 #include "ace/streams.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 #include "ace/OS_Memory.h"
 
 #include "DAnCE/DAnCE_PropertiesC.h"
-#include "DAnCE/LocalityManager/Scheduler/Plugin_Manager.h"
+#include "LocalityManager/Scheduler/Plugin_Manager.h"
 
 #ifdef GEN_OSTREAM_OPS
 #include <iostream>
diff --git a/DAnCE/NodeManager/Node_Manager.cpp b/DAnCE/NodeManager/Node_Manager.cpp
index 76fffc8369a..00395452beb 100644
--- a/DAnCE/NodeManager/Node_Manager.cpp
+++ b/DAnCE/NodeManager/Node_Manager.cpp
@@ -3,9 +3,8 @@
 #include "ace/Dynamic_Service.h"
 #include "tao/ORB.h"
 #include "tao/Object.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/Logger/Logger_Service.h"
-#include "ciao/Logger/Logger_Service.h"
+#include "Logger/Log_Macros.h"
+#include "Logger/Logger_Service.h"
 #include "Node_Manager_Module.h"
 
 int
@@ -25,15 +24,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           dlf->init (argc, argv);
         }
 
-      // Also initialize CIAO logger since we reuse parts of CIAO in the nodemanager
-      CIAO::Logger_Service
-        * clf = ACE_Dynamic_Service<CIAO::Logger_Service>::instance ("CIAO_Logger");
-
-      if (clf)
-        {
-          clf->init (argc, argv);
-        }
-        
       DANCE_DEBUG (6, (LM_TRACE, DLINFO
                     ACE_TEXT("NodeManager - initializing ORB\n")));
 
diff --git a/DAnCE/NodeManager/Node_Manager_Module.cpp b/DAnCE/NodeManager/Node_Manager_Module.cpp
index 7880dfc5276..28bfd5c7723 100644
--- a/DAnCE/NodeManager/Node_Manager_Module.cpp
+++ b/DAnCE/NodeManager/Node_Manager_Module.cpp
@@ -8,8 +8,8 @@
 #include "tao/IORTable/IORTable.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
 #include "orbsvcs/CosNamingC.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/DAnCE/DAnCE_PropertiesC.h"
+#include "Logger/Log_Macros.h"
+#include "DAnCE/DAnCE_PropertiesC.h"
 #include "Node_Manager_Module.h"
 #include "NodeManager_Impl.h"
 #include "Artifact_Installation/Artifact_Installation_Impl.h"
diff --git a/DAnCE/NodeManager/Node_Manager_Module.h b/DAnCE/NodeManager/Node_Manager_Module.h
index 44de1cb092d..50279ca616f 100644
--- a/DAnCE/NodeManager/Node_Manager_Module.h
+++ b/DAnCE/NodeManager/Node_Manager_Module.h
@@ -30,7 +30,7 @@
 #include "tao/ORB.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "orbsvcs/CosNamingC.h"
-#include "DAnCE/DAnCE/DAnCE_Utility.h"
+#include "DAnCE/DAnCE_Utility.h"
 #include "DAnCE/DAnCE_ArtifactInstallationC.h"
 
 namespace DAnCE
diff --git a/DAnCE/Plan_Launcher/Daemon/PL_Daemon.cpp b/DAnCE/Plan_Launcher/Daemon/PL_Daemon.cpp
index 159512a0b6e..4d83daf64fc 100644
--- a/DAnCE/Plan_Launcher/Daemon/PL_Daemon.cpp
+++ b/DAnCE/Plan_Launcher/Daemon/PL_Daemon.cpp
@@ -4,8 +4,8 @@
 #include "tao/Object.h"
 #include "tao/Utils/ORB_Destroyer.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/Logger/Logger_Service.h"
+#include "Logger/Log_Macros.h"
+#include "Logger/Logger_Service.h"
 #include "DAnCE/DAnCE_Utility.h"
 
 #include "PL_Daemon_Impl.h"
diff --git a/DAnCE/Plan_Launcher/EM_Launcher.h b/DAnCE/Plan_Launcher/EM_Launcher.h
index 09579c87214..b8e9b67f0be 100644
--- a/DAnCE/Plan_Launcher/EM_Launcher.h
+++ b/DAnCE/Plan_Launcher/EM_Launcher.h
@@ -12,10 +12,10 @@
 
 #include "Plan_Launcher_Base_Impl_T.h"
 
-#include "DAnCE/Deployment/Deployment_DomainApplicationC.h"
-#include "DAnCE/Deployment/Deployment_DomainApplicationManagerC.h"
-#include "DAnCE/Deployment/Deployment_ExecutionManagerC.h"
-#include "DAnCE/Plan_Launcher/Plan_Launcher_Export.h"
+#include "Deployment/Deployment_DomainApplicationC.h"
+#include "Deployment/Deployment_DomainApplicationManagerC.h"
+#include "Deployment/Deployment_ExecutionManagerC.h"
+#include "Plan_Launcher/Plan_Launcher_Export.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/Plan_Launcher/NM_Launcher.h b/DAnCE/Plan_Launcher/NM_Launcher.h
index 9767632e872..7730ac8fd73 100644
--- a/DAnCE/Plan_Launcher/NM_Launcher.h
+++ b/DAnCE/Plan_Launcher/NM_Launcher.h
@@ -12,10 +12,10 @@
 
 #include "Plan_Launcher_Base_Impl_T.h"
 
-#include "DAnCE/Deployment/Deployment_NodeApplicationC.h"
-#include "DAnCE/Deployment/Deployment_NodeApplicationManagerC.h"
-#include "DAnCE/Deployment/Deployment_NodeManagerC.h"
-#include "DAnCE/Plan_Launcher/Plan_Launcher_Export.h"
+#include "Deployment/Deployment_NodeApplicationC.h"
+#include "Deployment/Deployment_NodeApplicationManagerC.h"
+#include "Deployment/Deployment_NodeManagerC.h"
+#include "Plan_Launcher/Plan_Launcher_Export.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/Plan_Launcher/Plan_Launcher.cpp b/DAnCE/Plan_Launcher/Plan_Launcher.cpp
index 4439a7badc0..428ea242840 100644
--- a/DAnCE/Plan_Launcher/Plan_Launcher.cpp
+++ b/DAnCE/Plan_Launcher/Plan_Launcher.cpp
@@ -5,9 +5,9 @@
 #include "ace/Get_Opt.h"
 #include "tao/ORB.h"
 #include "tao/Object.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/Logger/Logger_Service.h"
-#include "DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h"
+#include "Logger/Log_Macros.h"
+#include "Logger/Logger_Service.h"
+#include "tools/Convert_Plan/Convert_Plan_Impl.h"
 
 #include "EM_Launcher.h"
 #include "NM_Launcher.h"
diff --git a/DAnCE/Plan_Launcher/Plan_Launcher_Base.h b/DAnCE/Plan_Launcher/Plan_Launcher_Base.h
index af5059e3b6a..024556fc324 100644
--- a/DAnCE/Plan_Launcher/Plan_Launcher_Base.h
+++ b/DAnCE/Plan_Launcher/Plan_Launcher_Base.h
@@ -12,7 +12,7 @@
 
 #include "Deployment/Deployment_DeploymentPlanC.h"
 #include "Deployment/Deployment_ConnectionC.h"
-#include "DAnCE/Plan_Launcher/Plan_Launcher_Export.h"
+#include "Plan_Launcher/Plan_Launcher_Export.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp b/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp
index 593fe2b2aed..fa4b0d1343c 100644
--- a/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp
+++ b/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp
@@ -12,7 +12,7 @@
 #include "Deployment/Deployment_PlanErrorC.h"
 #include "Deployment/Deployment_ApplicationC.h"
 #include "Deployment/Deployment_ApplicationManagerC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 #include "Deployment_Failure.h"
 
diff --git a/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.h b/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.h
index 2cf14cf1515..7dc43c4c468 100644
--- a/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.h
+++ b/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.h
@@ -10,8 +10,8 @@
 #ifndef PLAN_LAUNCHER_BASE_IMPL_H
 #define PLAN_LAUNCHER_BASE_IMPL_H
 
-#include "DAnCE/Deployment/Deployment_ConnectionC.h"
-#include "DAnCE/Deployment/Deployment_DeploymentPlanC.h"
+#include "Deployment/Deployment_ConnectionC.h"
+#include "Deployment/Deployment_DeploymentPlanC.h"
 
 #include "Plan_Launcher_Base.h"
 
diff --git a/DAnCE/RepositoryManager/PC_Updater.cpp b/DAnCE/RepositoryManager/PC_Updater.cpp
index 18cf23e96c8..c2ad28ed67f 100644
--- a/DAnCE/RepositoryManager/PC_Updater.cpp
+++ b/DAnCE/RepositoryManager/PC_Updater.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/Deployment/Deployment_DataC.h"
+#include "Logger/Log_Macros.h"
+#include "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/DAnCE/RepositoryManager/PC_Updater.h b/DAnCE/RepositoryManager/PC_Updater.h
index 87cd4b2249e..9af644a4523 100644
--- a/DAnCE/RepositoryManager/PC_Updater.h
+++ b/DAnCE/RepositoryManager/PC_Updater.h
@@ -19,8 +19,8 @@
 #define PC_UPDATER_H
 #include /**/ "ace/pre.h"
 
-#include "DAnCE/Deployment/DeploymentC.h"
-#include "DAnCE/Deployment/Deployment_Packaging_DataC.h"
+#include "Deployment/DeploymentC.h"
+#include "Deployment/Deployment_Packaging_DataC.h"
 #include "ace/SString.h"             //for the ACE_CString
 
 #include "ZIP_Wrapper.h"             //Wrapper around zzip
diff --git a/DAnCE/RepositoryManager/RM_Helper.cpp b/DAnCE/RepositoryManager/RM_Helper.cpp
index 8610547a828..906c2e95b5e 100644
--- a/DAnCE/RepositoryManager/RM_Helper.cpp
+++ b/DAnCE/RepositoryManager/RM_Helper.cpp
@@ -6,7 +6,7 @@
 #include "ace/OS_NS_unistd.h"        //for close
 #include "ace/OS_NS_sys_stat.h"      //for filesize and mkdir
 #include "ace/OS_NS_string.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 void
 RM_Helper::pc_to_cdr (const Deployment::PackageConfiguration& pc, TAO_OutputCDR& cdr)
diff --git a/DAnCE/RepositoryManager/RM_Helper.h b/DAnCE/RepositoryManager/RM_Helper.h
index bf234440a30..2aceb46162b 100644
--- a/DAnCE/RepositoryManager/RM_Helper.h
+++ b/DAnCE/RepositoryManager/RM_Helper.h
@@ -17,7 +17,7 @@
 #ifndef RM_HELPER_H_
 #define RM_HELPER_H_
 
-#include "DAnCE/Deployment/Deployment_Packaging_DataC.h"
+#include "Deployment/Deployment_Packaging_DataC.h"
 #include "tao/CDR.h"
 #include "ace/Message_Block.h"
 
diff --git a/DAnCE/RepositoryManager/RepositoryManager.mpc b/DAnCE/RepositoryManager/RepositoryManager.mpc
index cbf890d07e0..e80d61e4946 100644
--- a/DAnCE/RepositoryManager/RepositoryManager.mpc
+++ b/DAnCE/RepositoryManager/RepositoryManager.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project (DAnCE_RepositoryManagerDaemon_IDL) : install, taoidldefaults {
+project (DAnCE_RepositoryManagerDaemon_IDL) : install, danceidldefaults {
   custom_only = 1
   IDL_Files {
     RepositoryManagerDaemon.idl
diff --git a/DAnCE/RepositoryManager/RepositoryManagerDaemon.idl b/DAnCE/RepositoryManager/RepositoryManagerDaemon.idl
index 9deac4abd0e..d3fc4aafaeb 100644
--- a/DAnCE/RepositoryManager/RepositoryManagerDaemon.idl
+++ b/DAnCE/RepositoryManager/RepositoryManagerDaemon.idl
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "DAnCE/Deployment/Deployment_RepositoryManager.idl"
+#include "Deployment/Deployment_RepositoryManager.idl"
 
 module CIAO
 {
diff --git a/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp b/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
index b57d14a837e..6777eb33b83 100644
--- a/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+++ b/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
@@ -31,9 +31,9 @@
 #include "ace/Malloc_Allocator.h"       //for ACE_New_Allocator
 
 //for the PackageConfiguration parsing
-#include "DAnCE/Deployment/Deployment_DataC.h"
-#include "DAnCE/Deployment/Deployment_Packaging_DataC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Deployment/Deployment_DataC.h"
+#include "Deployment/Deployment_Packaging_DataC.h"
+#include "Logger/Log_Macros.h"
 
 #include "Package_Handlers/PCD_Handler.h"
 #include "XML_Typedefs.h"
diff --git a/DAnCE/RepositoryManager/Repository_Manager.cpp b/DAnCE/RepositoryManager/Repository_Manager.cpp
index 7f28328a406..ecc7ff2b9c6 100644
--- a/DAnCE/RepositoryManager/Repository_Manager.cpp
+++ b/DAnCE/RepositoryManager/Repository_Manager.cpp
@@ -3,8 +3,8 @@
 #include "ace/Dynamic_Service.h"
 #include "tao/ORB.h"
 #include "tao/Object.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/Logger/Logger_Service.h"
+#include "Logger/Log_Macros.h"
+#include "Logger/Logger_Service.h"
 #include "Repository_Manager_Module.h"
 
 int
diff --git a/DAnCE/RepositoryManager/Repository_Manager_Module.cpp b/DAnCE/RepositoryManager/Repository_Manager_Module.cpp
index a702aa311ca..cb01871285f 100644
--- a/DAnCE/RepositoryManager/Repository_Manager_Module.cpp
+++ b/DAnCE/RepositoryManager/Repository_Manager_Module.cpp
@@ -9,7 +9,7 @@
 #include "tao/IORTable/IORTable.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
 #include "orbsvcs/CosNamingC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 #include "DAnCE/DAnCE/DAnCE_PropertiesC.h"
 
 #ifdef DANCE_RM_USES_JAWS
diff --git a/DAnCE/RepositoryManager/URL_Parser.cpp b/DAnCE/RepositoryManager/URL_Parser.cpp
index 90d36abaf99..cc0f96e1426 100644
--- a/DAnCE/RepositoryManager/URL_Parser.cpp
+++ b/DAnCE/RepositoryManager/URL_Parser.cpp
@@ -5,7 +5,7 @@
 #include "URL_Parser.h"
 #include "ace/ACE.h"
 
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 bool
 URL_Parser::parse_args (int argc, ACE_TCHAR *argv[])
diff --git a/DAnCE/RepositoryManager/ZIP_Wrapper.cpp b/DAnCE/RepositoryManager/ZIP_Wrapper.cpp
index e1a2345cebf..9d16398ad3c 100644
--- a/DAnCE/RepositoryManager/ZIP_Wrapper.cpp
+++ b/DAnCE/RepositoryManager/ZIP_Wrapper.cpp
@@ -21,7 +21,7 @@
 #include "ace/OS_NS_sys_stat.h"    //for stat
 #include "ace/OS_NS_sys_stat.h"    //for filesize and mkdir
 #include "ace/OS_Memory.h"         //for ACE_NEW* macros
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 #include <string>
 #include "minizip/unzip.h"
diff --git a/DAnCE/RepositoryManager/repository_manager_admin.cpp b/DAnCE/RepositoryManager/repository_manager_admin.cpp
index 3065c2bfe33..6598dde0354 100644
--- a/DAnCE/RepositoryManager/repository_manager_admin.cpp
+++ b/DAnCE/RepositoryManager/repository_manager_admin.cpp
@@ -1,6 +1,6 @@
 // $Id$
 #include "repository_manager_admin.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 #include "RepositoryManagerDaemonC.h"
 
 namespace DAnCE
diff --git a/DAnCE/RepositoryManager/repository_manager_admin_exec.cpp b/DAnCE/RepositoryManager/repository_manager_admin_exec.cpp
index 05cbbda7b27..b02796c25f7 100644
--- a/DAnCE/RepositoryManager/repository_manager_admin_exec.cpp
+++ b/DAnCE/RepositoryManager/repository_manager_admin_exec.cpp
@@ -11,8 +11,8 @@
 #include "ace/Get_Opt.h"
 #include "ace/Unbounded_Set.h"
 #include "ace/String_Base.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/Logger/Logger_Service.h"
+#include "Logger/Log_Macros.h"
+#include "Logger/Logger_Service.h"
 #include "Deployment/Deployment_RepositoryManagerC.h"
 
 #include "repository_manager_admin.h"
diff --git a/DAnCE/TargetManager/DomainDataManager.cpp b/DAnCE/TargetManager/DomainDataManager.cpp
index 35b66bae1c7..ca07960daa6 100644
--- a/DAnCE/TargetManager/DomainDataManager.cpp
+++ b/DAnCE/TargetManager/DomainDataManager.cpp
@@ -3,7 +3,7 @@
 #include "Deployment/Deployment_NodeManagerC.h"
 
 #include "Config_Handlers/XML_File_Intf.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 #ifdef GEN_OSTREAM_OPS
 #include <iostream>
diff --git a/DAnCE/TargetManager/ResourceCommitmentManager.cpp b/DAnCE/TargetManager/ResourceCommitmentManager.cpp
index dbef7942d93..46a3f3fcb5b 100644
--- a/DAnCE/TargetManager/ResourceCommitmentManager.cpp
+++ b/DAnCE/TargetManager/ResourceCommitmentManager.cpp
@@ -2,7 +2,7 @@
 //
 #include "ResourceCommitmentManager.h"
 #include "DomainDataManager.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 DAnCE::ResourceCommitmentManager_i::ResourceCommitmentManager_i (void)
 {
diff --git a/DAnCE/TargetManager/ResourceCommitmentManager.h b/DAnCE/TargetManager/ResourceCommitmentManager.h
index d7c4a81cff4..1c742627ea1 100644
--- a/DAnCE/TargetManager/ResourceCommitmentManager.h
+++ b/DAnCE/TargetManager/ResourceCommitmentManager.h
@@ -11,7 +11,7 @@
 #ifndef DEPLOYMENT_RESOURCECOMMITMENTMANAGERI_H_
 #define DEPLOYMENT_RESOURCECOMMITMENTMANAGERI_H_
 
-#include "DAnCE/Deployment/Deployment_ResourceCommitmentManagerS.h"
+#include "Deployment/Deployment_ResourceCommitmentManagerS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/DAnCE/TargetManager/Target_Manager.cpp b/DAnCE/TargetManager/Target_Manager.cpp
index 76f45218764..26deaaa9e9c 100644
--- a/DAnCE/TargetManager/Target_Manager.cpp
+++ b/DAnCE/TargetManager/Target_Manager.cpp
@@ -3,8 +3,8 @@
 #include "ace/Dynamic_Service.h"
 #include "tao/ORB.h"
 #include "tao/Object.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/Logger/Logger_Service.h"
+#include "Logger/Log_Macros.h"
+#include "Logger/Logger_Service.h"
 #include "Target_Manager_Module.h"
 
 int
diff --git a/DAnCE/TargetManager/Target_Manager_Module.cpp b/DAnCE/TargetManager/Target_Manager_Module.cpp
index 357f2b26f80..e6d0a8a3917 100644
--- a/DAnCE/TargetManager/Target_Manager_Module.cpp
+++ b/DAnCE/TargetManager/Target_Manager_Module.cpp
@@ -8,8 +8,8 @@
 #include "tao/IORTable/IORTable.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
 #include "orbsvcs/CosNamingC.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/DAnCE/DAnCE_PropertiesC.h"
+#include "Logger/Log_Macros.h"
+#include "DAnCE/DAnCE_PropertiesC.h"
 
 #include "TargetManager_Impl.h"
 
diff --git a/DAnCE/tests/Config_Handlers/DynAny_Handler/test.cpp b/DAnCE/tests/Config_Handlers/DynAny_Handler/test.cpp
index 42c14370029..161e8e92d79 100644
--- a/DAnCE/tests/Config_Handlers/DynAny_Handler/test.cpp
+++ b/DAnCE/tests/Config_Handlers/DynAny_Handler/test.cpp
@@ -4,7 +4,7 @@
 
 #include "Deployment.hpp"
 #include "DP_Handler.h"
-#include "DAnCE/Deployment/Deployment_DataC.h"
+#include "Deployment/Deployment_DataC.h"
 #include "ace/Get_Opt.h"
 #include "XML_Typedefs.h"
 #include "tao/ORB.h"
diff --git a/DAnCE/tests/Config_Handlers/Package_Handlers/test.cpp b/DAnCE/tests/Config_Handlers/Package_Handlers/test.cpp
index c107fed4a77..f4a7d3b6ec0 100644
--- a/DAnCE/tests/Config_Handlers/Package_Handlers/test.cpp
+++ b/DAnCE/tests/Config_Handlers/Package_Handlers/test.cpp
@@ -4,7 +4,7 @@
 
 #include "Deployment.hpp"
 #include "PCD_Handler.h"
-#include "DAnCE/Deployment/Deployment_Packaging_DataC.h"
+#include "Deployment/Deployment_Packaging_DataC.h"
 #include "SID_Handler.h"
 #include "ace/Get_Opt.h"
 #include "Utils/XML_Helper.h"
diff --git a/DAnCE/tests/Config_Handlers/test.cpp b/DAnCE/tests/Config_Handlers/test.cpp
index fd50374aa7e..abbe607a459 100644
--- a/DAnCE/tests/Config_Handlers/test.cpp
+++ b/DAnCE/tests/Config_Handlers/test.cpp
@@ -4,7 +4,7 @@
 
 #include "Deployment.hpp"
 #include "DP_Handler.h"
-#include "DAnCE/Deployment/Deployment_DataC.h"
+#include "Deployment/Deployment_DataC.h"
 #include "ace/Get_Opt.h"
 #include "Utils/XML_Typedefs.h"
 #include "tao/ORB.h"
diff --git a/DAnCE/tests/DeploymentPlanDump/test.cpp b/DAnCE/tests/DeploymentPlanDump/test.cpp
index fe919737168..d0c967ebde6 100644
--- a/DAnCE/tests/DeploymentPlanDump/test.cpp
+++ b/DAnCE/tests/DeploymentPlanDump/test.cpp
@@ -1,7 +1,7 @@
 // $Id$
 #include "Config_Handlers/DnC_Dump.h"
 #include "Config_Handlers/XML_File_Intf.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 int ACE_TMAIN (int argc, ACE_TCHAR * argv[])
 {
diff --git a/DAnCE/tests/DeploymentPlanTestReferences/test.cpp b/DAnCE/tests/DeploymentPlanTestReferences/test.cpp
index 655c582f0e1..e0a4a37a0f2 100644
--- a/DAnCE/tests/DeploymentPlanTestReferences/test.cpp
+++ b/DAnCE/tests/DeploymentPlanTestReferences/test.cpp
@@ -2,7 +2,7 @@
 #include "ace/Auto_Ptr.h"
 #include "Config_Handlers/DnC_Dump.h"
 #include "Config_Handlers/XML_File_Intf.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 int ACE_TMAIN (int argc, ACE_TCHAR * argv[])
 {
diff --git a/DAnCE/tests/DeploymentTest1/test.cpp b/DAnCE/tests/DeploymentTest1/test.cpp
index 1b63896b786..fcaa5645239 100644
--- a/DAnCE/tests/DeploymentTest1/test.cpp
+++ b/DAnCE/tests/DeploymentTest1/test.cpp
@@ -1,12 +1,12 @@
 // $Id$
 #include "ace/Auto_Ptr.h"
-#include "DAnCE/Deployment/Deployment_DeploymentPlanC.h"
-#include "DAnCE/Deployment/Deployment_ExecutionManagerC.h"
-#include "DAnCE/Deployment/Deployment_DomainApplicationManagerC.h"
-#include "DAnCE/Deployment/Deployment_DomainApplicationC.h"
-#include "DAnCE/Deployment/Deployment_NodeManagerC.h"
-#include "DAnCE/Deployment/Deployment_NodeApplicationManagerC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Deployment/Deployment_DeploymentPlanC.h"
+#include "Deployment/Deployment_ExecutionManagerC.h"
+#include "Deployment/Deployment_DomainApplicationManagerC.h"
+#include "Deployment/Deployment_DomainApplicationC.h"
+#include "Deployment/Deployment_NodeManagerC.h"
+#include "Deployment/Deployment_NodeApplicationManagerC.h"
+#include "Logger/Log_Macros.h"
 #include "Config_Handlers/DnC_Dump.h"
 #include "Config_Handlers/XML_File_Intf.h"
 
diff --git a/DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp b/DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp
index b1bb33ea44b..85e87f44ce0 100644
--- a/DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp
+++ b/DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp
@@ -1,7 +1,7 @@
 // $Id$
-#include "DAnCE/Deployment/Deployment_NodeManagerC.h"
-#include "DAnCE/Deployment/Deployment_NodeApplicationC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Deployment/Deployment_NodeManagerC.h"
+#include "Deployment/Deployment_NodeApplicationC.h"
+#include "Logger/Log_Macros.h"
 
 int ACE_TMAIN (int argc, ACE_TCHAR * argv[])
 {
diff --git a/DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp b/DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp
index d7ead772ace..cd758dcb19d 100644
--- a/DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp
+++ b/DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp
@@ -1,6 +1,6 @@
 // $Id$
-#include "DAnCE/Deployment/Deployment_NodeManagerC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Deployment/Deployment_NodeManagerC.h"
+#include "Logger/Log_Macros.h"
 
 int ACE_TMAIN (int argc, ACE_TCHAR * argv[])
 {
diff --git a/DAnCE/tests/Parsing/domain.cpp b/DAnCE/tests/Parsing/domain.cpp
index b4cc8d13cac..9a409dff5cb 100644
--- a/DAnCE/tests/Parsing/domain.cpp
+++ b/DAnCE/tests/Parsing/domain.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
 #include "ace/Auto_Ptr.h"
-#include "DAnCE/Deployment/Deployment_TargetDataC.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/Logger/Logger_Service.h"
+#include "Deployment/Deployment_TargetDataC.h"
+#include "Logger/Log_Macros.h"
+#include "Logger/Logger_Service.h"
 #include "Config_Handlers/DnC_Dump.h"
 #include "Config_Handlers/XML_File_Intf.h"
 #include "Config_Handlers/Common.h"
diff --git a/DAnCE/tests/Parsing/test.cpp b/DAnCE/tests/Parsing/test.cpp
index 65bf4187341..85268d3770f 100644
--- a/DAnCE/tests/Parsing/test.cpp
+++ b/DAnCE/tests/Parsing/test.cpp
@@ -1,14 +1,14 @@
 // $Id$
 
 #include "ace/Auto_Ptr.h"
-#include "DAnCE/Deployment/Deployment_DeploymentPlanC.h"
-#include "DAnCE/Deployment/Deployment_ExecutionManagerC.h"
-#include "DAnCE/Deployment/Deployment_DomainApplicationManagerC.h"
-#include "DAnCE/Deployment/Deployment_DomainApplicationC.h"
-#include "DAnCE/Deployment/Deployment_NodeManagerC.h"
-#include "DAnCE/Deployment/Deployment_NodeApplicationManagerC.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/Logger/Logger_Service.h"
+#include "Deployment/Deployment_DeploymentPlanC.h"
+#include "Deployment/Deployment_ExecutionManagerC.h"
+#include "Deployment/Deployment_DomainApplicationManagerC.h"
+#include "Deployment/Deployment_DomainApplicationC.h"
+#include "Deployment/Deployment_NodeManagerC.h"
+#include "Deployment/Deployment_NodeApplicationManagerC.h"
+#include "Logger/Log_Macros.h"
+#include "Logger/Logger_Service.h"
 #include "Config_Handlers/DnC_Dump.h"
 #include "Config_Handlers/XML_File_Intf.h"
 #include "Config_Handlers/Common.h"
diff --git a/DAnCE/tests/TargetManager/CmpClient.cpp b/DAnCE/tests/TargetManager/CmpClient.cpp
index 9d42e928a53..ef7057f9472 100644
--- a/DAnCE/tests/TargetManager/CmpClient.cpp
+++ b/DAnCE/tests/TargetManager/CmpClient.cpp
@@ -9,8 +9,8 @@
  * TM to getAllResources and getAvailable resources
  */
 
-#include "DAnCE/Deployment/Deployment_DataC.h"
-#include "DAnCE/Deployment/Deployment_ResourceCommitmentManagerC.h"
+#include "Deployment/Deployment_DataC.h"
+#include "Deployment/Deployment_ResourceCommitmentManagerC.h"
 #include "DAnCE/TargetManager/TargetManagerC.h"
 #include "ace/streams.h"
 #include "ace/FILE_IO.h"
diff --git a/DAnCE/tools/Artifact_Installation/Artifact_Installation.mpc b/DAnCE/tools/Artifact_Installation/Artifact_Installation.mpc
index 83fbd07de16..b8a92bf81dc 100644
--- a/DAnCE/tools/Artifact_Installation/Artifact_Installation.mpc
+++ b/DAnCE/tools/Artifact_Installation/Artifact_Installation.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project (DAnCE_Artifact_Installation_IDL) : taoidldefaults {
+project (DAnCE_Artifact_Installation_IDL) : danceidldefaults {
   custom_only = 1
   IDL_Files {
     idlflags += -SS -Sci
diff --git a/DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.cpp b/DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.cpp
index 174791524f0..0c98979498f 100644
--- a/DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.cpp
+++ b/DAnCE/tools/Artifact_Installation/Artifact_Installation_Handler_Svc.cpp
@@ -2,7 +2,7 @@
 
 #include "Artifact_Installation_Handler_Svc.h"
 #include "Artifact_Installation_Impl.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.cpp b/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.cpp
index b74ea5e6281..b75d48803e0 100644
--- a/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.cpp
+++ b/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "Artifact_Installation_Impl.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 #if !defined (__ACE_INLINE__)
 #include "Artifact_Installation_Impl.inl"
diff --git a/DAnCE/tools/Artifact_Installation/Artifact_Installation_exec.cpp b/DAnCE/tools/Artifact_Installation/Artifact_Installation_exec.cpp
index 4e21c44c2ac..96e84e10efa 100644
--- a/DAnCE/tools/Artifact_Installation/Artifact_Installation_exec.cpp
+++ b/DAnCE/tools/Artifact_Installation/Artifact_Installation_exec.cpp
@@ -3,11 +3,11 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/Get_Opt.h"
 #include "ace/Auto_Ptr.h"
-#include "DAnCE/Deployment/Deployment_DeploymentPlanC.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/Logger/Logger_Service.h"
-#include "DAnCE/Config_Handlers/XML_File_Intf.h"
-#include "DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h"
+#include "Deployment/Deployment_DeploymentPlanC.h"
+#include "Logger/Log_Macros.h"
+#include "Logger/Logger_Service.h"
+#include "Config_Handlers/XML_File_Intf.h"
+#include "tools/Convert_Plan/Convert_Plan_Impl.h"
 #include "Artifact_Installation_Impl.h"
 #include "Artifact_Installation_Handler_Svc.h"
 #include "Installation_Repository_Manager_Impl.h"
diff --git a/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.idl b/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.idl
index 8a44c3c3de0..f23e11e6c1d 100644
--- a/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.idl
+++ b/DAnCE/tools/Artifact_Installation/DAnCE_Artifact_Installation_Handler.idl
@@ -3,7 +3,7 @@
 #ifndef DANCE_ARTIFACT_INSTALLATION_HANDLER_IDL
 #define DANCE_ARTIFACT_INSTALLATION_HANDLER_IDL
 
-#include "DAnCE/Deployment/Deployment_PlanError.idl"
+#include "Deployment/Deployment_PlanError.idl"
 
 module DAnCE
 {
diff --git a/DAnCE/tools/Artifact_Installation/File_Installation_Handler.cpp b/DAnCE/tools/Artifact_Installation/File_Installation_Handler.cpp
index 7c84d680800..35b8065636e 100644
--- a/DAnCE/tools/Artifact_Installation/File_Installation_Handler.cpp
+++ b/DAnCE/tools/Artifact_Installation/File_Installation_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "File_Installation_Handler.h"
 #include "Installation_Repository_Manager.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 #include "ace/ACE.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_unistd.h"
diff --git a/DAnCE/tools/Artifact_Installation/Http_Installation_Handler.cpp b/DAnCE/tools/Artifact_Installation/Http_Installation_Handler.cpp
index 7591af0318d..f45924b85de 100644
--- a/DAnCE/tools/Artifact_Installation/Http_Installation_Handler.cpp
+++ b/DAnCE/tools/Artifact_Installation/Http_Installation_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "Http_Installation_Handler.h"
 #include "Installation_Repository_Manager.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/INet/HTTP_URL.h"
 #include "ace/INet/HTTP_ClientRequestHandler.h"
diff --git a/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.cpp b/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.cpp
index e02d6d0d776..885b54c9b6c 100644
--- a/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.cpp
+++ b/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "Installation_Repository_Manager.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.cpp b/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.cpp
index 6bef331c8de..394bf33c3ec 100644
--- a/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.cpp
+++ b/DAnCE/tools/Artifact_Installation/Installation_Repository_Manager_Impl.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "Installation_Repository_Manager_Impl.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 #include "ace/Service_Config.h"
 #include "ace/OS_NS_stdlib.h"
 #include "ace/Dirent.h"
diff --git a/DAnCE/tools/Convert_Plan/Convert_Plan.cpp b/DAnCE/tools/Convert_Plan/Convert_Plan.cpp
index 6dc58526d12..55bb9f340c0 100644
--- a/DAnCE/tools/Convert_Plan/Convert_Plan.cpp
+++ b/DAnCE/tools/Convert_Plan/Convert_Plan.cpp
@@ -4,10 +4,10 @@
 #include "ace/Get_Opt.h"
 #include "ace/Auto_Ptr.h"
 #include "tao/ORB.h"
-#include "DAnCE/Deployment/Deployment_DeploymentPlanC.h"
-#include "DAnCE/Deployment/Deployment_PlanErrorC.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/Logger/Logger_Service.h"
+#include "Deployment/Deployment_DeploymentPlanC.h"
+#include "Deployment/Deployment_PlanErrorC.h"
+#include "Logger/Log_Macros.h"
+#include "Logger/Logger_Service.h"
 #include "Convert_Plan_Impl.h"
 
 
diff --git a/DAnCE/tools/Split_Plan/Locality_Splitter.cpp b/DAnCE/tools/Split_Plan/Locality_Splitter.cpp
index b51f8387d07..d1a0bf82b06 100644
--- a/DAnCE/tools/Split_Plan/Locality_Splitter.cpp
+++ b/DAnCE/tools/Split_Plan/Locality_Splitter.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
 #include "Locality_Splitter.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/DAnCE/DAnCE_PropertiesC.h"
-#include "DAnCE/DAnCE/DAnCE_Utility.h"
+#include "Logger/Log_Macros.h"
+#include "DAnCE/DAnCE_PropertiesC.h"
+#include "DAnCE/DAnCE_Utility.h"
 #include "ace/UUID.h"
 #include <algorithm>
 
diff --git a/DAnCE/tools/Split_Plan/Node_Splitter.cpp b/DAnCE/tools/Split_Plan/Node_Splitter.cpp
index 3a95669058b..df24098694e 100644
--- a/DAnCE/tools/Split_Plan/Node_Splitter.cpp
+++ b/DAnCE/tools/Split_Plan/Node_Splitter.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "Node_Splitter.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/tools/Split_Plan/Split_Plan.cpp b/DAnCE/tools/Split_Plan/Split_Plan.cpp
index 6c7313edae7..c75f03e25e9 100644
--- a/DAnCE/tools/Split_Plan/Split_Plan.cpp
+++ b/DAnCE/tools/Split_Plan/Split_Plan.cpp
@@ -8,7 +8,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "Split_Plan.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 namespace DAnCE
 {
diff --git a/DAnCE/tools/Split_Plan/Split_Plan_exec.cpp b/DAnCE/tools/Split_Plan/Split_Plan_exec.cpp
index 80c480b79db..5ddf50ca3a5 100644
--- a/DAnCE/tools/Split_Plan/Split_Plan_exec.cpp
+++ b/DAnCE/tools/Split_Plan/Split_Plan_exec.cpp
@@ -4,11 +4,11 @@
 #include "ace/Get_Opt.h"
 #include "ace/Auto_Ptr.h"
 //#include "tao/ORB.h"
-#include "DAnCE/Deployment/Deployment_DeploymentPlanC.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/Logger/Logger_Service.h"
-#include "DAnCE/Config_Handlers/XML_File_Intf.h"
-#include "DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h"
+#include "Deployment/Deployment_DeploymentPlanC.h"
+#include "Logger/Log_Macros.h"
+#include "Logger/Logger_Service.h"
+#include "Config_Handlers/XML_File_Intf.h"
+#include "tools/Convert_Plan/Convert_Plan_Impl.h"
 #include "Split_Plan.h"
 #include "Node_Splitter.h"
 #include "Locality_Splitter.h"
diff --git a/DAnCE/tools/System_Health/Daemon/SHS_Daemon.cpp b/DAnCE/tools/System_Health/Daemon/SHS_Daemon.cpp
index 6029ba2129a..8953b4a5201 100644
--- a/DAnCE/tools/System_Health/Daemon/SHS_Daemon.cpp
+++ b/DAnCE/tools/System_Health/Daemon/SHS_Daemon.cpp
@@ -5,8 +5,8 @@
 #include "tao/Utils/ORB_Destroyer.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
 #include "orbsvcs/CosNamingC.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/Logger/Logger_Service.h"
+#include "Logger/Log_Macros.h"
+#include "Logger/Logger_Service.h"
 #include "DAnCE/DAnCE_Utility.h"
 
 #include "SHS_Daemon_Impl.h"
diff --git a/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.cpp b/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.cpp
index 7f259d7f859..77b5e5bab2c 100644
--- a/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.cpp
+++ b/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.cpp
@@ -6,7 +6,7 @@
 
 #include "SHS_Daemon_Impl.h"
 
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 
 #include <sstream>
 
diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp b/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp
index b47fcfed28f..01e885d4f92 100644
--- a/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp
+++ b/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp
@@ -3,7 +3,7 @@
 #include "SHS_CORBA_Transport.h"
 #include "orbsvcs/CosNamingC.h"
 #include "DAnCE/DAnCE_PropertiesC.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 #include "LocalityManager/Scheduler/Plugin_Manager.h"
 
 namespace DAnCE
diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp b/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp
index af8eb13f805..ae91241ed23 100644
--- a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp
+++ b/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp
@@ -4,7 +4,7 @@
 #include "Deployment/Deployment_StartErrorC.h"
 #include "DAnCE/DAnCE_PropertiesC.h"
 #include "DAnCE/DAnCE_Utility.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "Logger/Log_Macros.h"
 #include "System_Health/SHS_DataModelC.h"
 #include "System_Health/Interceptors/SHS_CORBA_Transport.h"
author	William R. Otte <wotte@dre.vanderbilt.edu>	2010-09-10 15:44:03 +0000
committer	William R. Otte <wotte@dre.vanderbilt.edu>	2010-09-10 15:44:03 +0000
commit	e22348bf1e5f45c2ff3a0b5142df89e1da2819eb (patch)
tree	7fd0ef70fa5e320715b66b0452b1eb1b640c637e
parent	9e9a872ceb4fbc1185fd59c6f1f4298f716a8880 (diff)
download	ATCD-e22348bf1e5f45c2ff3a0b5142df89e1da2819eb.tar.gz