Thu May 31 09:13:26 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

        * MPC/config/dance_config_handlers.mpb:
        * MPC/config/dance_config_handlers_base.mpb:
        * dance/RepositoryManager/RepositoryManager_Impl.cpp:
        * dance/TargetManager/DomainDataManager.cpp:
        * tools/Config_Handlers/Any_Handler.h:
        * tools/Config_Handlers/Config_Handlers.mpc:
        * tools/Config_Handlers/DD_Handler.cpp:
        * tools/Config_Handlers/Package_Handlers/CAD_Handler.h:
        * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp:
        * tools/Config_Handlers/Package_Handlers/CPD_Handler.h:
        * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h:
        * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp:
        * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp:
        * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp:
        * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc:
        * tools/Config_Handlers/Package_Handlers/SID_Handler.h:
        * tools/Config_Handlers/XML_File_Intf.cpp:
          Updated because DAnCE XML_Utils has been moved to ACE as ACE_XML_Utils

        * MPC/config/xml_utils.mpb:
        * tools/XML:
        * tools/XML/XML.mpc:
        * tools/XML/XML_Error_Handler.h:
        * tools/XML/XML_Error_Handler.cpp:
        * tools/XML/XML_Helper.h:
        * tools/XML/XML_Helper.tpp:
        * tools/XML/XML_Schema_Resolver.h:
        * tools/XML/XML_Schema_Resolver.tpp:
        * tools/XML/XML_Schema_Resolver.cpp:
        * tools/XML/XML_Typedefs.h:
        * tools/XML/XML_Typedefs.cpp:
        * tools/XML/XML_Utils_Export.h:
        * tools/XML/XercesString.h:
        * tools/XML/XercesString.cpp:
          Removed these files.

12 files changed, 28 insertions, 13 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 46e425c3b63..42792722400 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,18 @@
+Thu May 31 09:12:50 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/dds4ccm_qos_xml_handler.mpb:
+        * MPC/config/dds4ccm_qos_xml_handler_base.mpb:
+        * connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp:
+        * connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc:
+        * tests/IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc:
+        * tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.h:
+        * tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp:
+        * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc:
+        * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h:
+        * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp:
+        * tools/IDL3_to_XMI/IR_Simulator_visitor.h:
+          Updated because DAnCE XML_Utils has been moved to ACE as ACE_XML_Utils
+
 Thu May 31 08:12:08 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * etc/ciao.doxygen:
diff --git a/CIAO/MPC/config/dds4ccm_qos_xml_handler.mpb b/CIAO/MPC/config/dds4ccm_qos_xml_handler.mpb
index fbe9aa6bab6..a84c532b478 100644
--- a/CIAO/MPC/config/dds4ccm_qos_xml_handler.mpb
+++ b/CIAO/MPC/config/dds4ccm_qos_xml_handler.mpb
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project : dds4ccm_qos_xml_handler_base, dynamicany, typecodefactory, xml_utils {
+project : dds4ccm_qos_xml_handler_base, dynamicany, typecodefactory, ace_xml_utils {
 }
diff --git a/CIAO/MPC/config/dds4ccm_qos_xml_handler_base.mpb b/CIAO/MPC/config/dds4ccm_qos_xml_handler_base.mpb
index 5ae6f91f5e4..e3bea4ca605 100644
--- a/CIAO/MPC/config/dds4ccm_qos_xml_handler_base.mpb
+++ b/CIAO/MPC/config/dds4ccm_qos_xml_handler_base.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : xml_utils, dynamicany, typecodefactory {
+project : ace_xml_utils, dynamicany, typecodefactory {
   after += QOS_XML_XSC_Handler
   libs  += QOS_XML_XSC_Handler
   macros   += XML_USE_PTHREADS
diff --git a/CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp b/CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp
index 24e76992a16..ae52a6099e5 100644
--- a/CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp
+++ b/CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "XML_File_Intf.h"
-#include "XML/XML_Typedefs.h"
+#include "ace/XML_Utils/XML_Typedefs.h"
 #include "XMLSchema/id_map.hpp"
 
 #include "dds/DdsDcpsInfrastructureC.h"
diff --git a/CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc b/CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc
index c53736f1d02..5717c1076b4 100644
--- a/CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc
+++ b/CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc
@@ -27,7 +27,7 @@ project (XML_QOS_XSC_Generation) : install, xscdefaults {
 
 
 project (QOS_XML_XSC_Handler) : install, acelib, xerces, anytypecode, \
-                                dds4ccm_dcps, dds4ccm_logger, xml_utils, gen_ostream {
+                                dds4ccm_dcps, dds4ccm_logger, ace_xml_utils, gen_ostream {
   sharedname = QOS_XML_XSC_Handler
   after += XML_QOS_XSC_Generation
   dynamicflags += XML_QOS_HANDLER_BUILD_DLL
diff --git a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc
index 17753f15d8d..29e9f403465 100644
--- a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc
+++ b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*IDL2XMI_Test) : taoexe, xml_utils, xerces {
+project(*IDL2XMI_Test) : taoexe, ace_xml_utils, xerces {
   exename = xmlvalidator
 
   Source_Files {
diff --git a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp
index 2f125bd5a3e..f01765b8b4a 100644
--- a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp
+++ b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp
@@ -6,7 +6,7 @@
 #include "xercesc/dom/DOM.hpp"
 #include "xercesc/parsers/XercesDOMParser.hpp"
 
-#include "XML/XercesString.h"
+#include "ace/XML_Utils/XercesString.h"
 
 namespace Test
 {
diff --git a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.h b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.h
index 95ed9b74d03..ab8de5f4a96 100644
--- a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.h
+++ b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.h
@@ -18,7 +18,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "XML/XML_Error_Handler.h"
+#include "ace/XML_Utils/XML_Error_Handler.h"
 
 #include "xercesc/util/XercesDefs.hpp"
 
diff --git a/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc b/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc
index d887bc7e57e..303825f456e 100644
--- a/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc
+++ b/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CIAO_IDL3_TO_XMI_BE) : acelib, install_lib, ciao_output, xml_utils, xerces, tao_idl_fe {
+project(CIAO_IDL3_TO_XMI_BE) : acelib, install_lib, ciao_output, ace_xml_utils, xerces, tao_idl_fe {
   sharedname   = CIAO_IDL3_TO_XMI_BE
   dynamicflags += CIAO_IDL3_TO_XMI_BUILD_DLL
 
@@ -29,7 +29,7 @@ project(CIAO_IDL3_TO_XMI_BE) : acelib, install_lib, ciao_output, xml_utils, xerc
   }
 }
 
-project(CIAO_IDL3_TO_XMI_EXE) : aceexe, install, ciao_output, xml_utils, xerces, tao_idl_fe {
+project(CIAO_IDL3_TO_XMI_EXE) : aceexe, install, ciao_output, ace_xml_utils, xerces, tao_idl_fe {
   after          += CIAO_IDL3_TO_XMI_BE
   exename         = tao_idl3_to_xmi
   libs           += CIAO_IDL3_TO_XMI_BE
diff --git a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp
index a3262bad219..7a80fe8a59a 100644
--- a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp
+++ b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp
@@ -50,7 +50,7 @@
 #include "ace/ACE.h"
 
 #include "Literals.h"
-#include "XML/XercesString.h"
+#include "ace/XML_Utils/XercesString.h"
 
 #include <iostream>
 #include <limits>
@@ -59,7 +59,7 @@
 #include "xercesc/dom/DOM.hpp"
 #include "xercesc/util/XMLChar.hpp"
 
-#include "XML/XML_Helper.h"
+#include "ace/XML_Utils/XML_Helper.h"
 
 using XERCES_CPP_NAMESPACE::DOMDocument;
 using XERCES_CPP_NAMESPACE::DOMAttr;
diff --git a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h
index 5440f799465..1577fee0fc5 100644
--- a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h
+++ b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h
@@ -25,7 +25,7 @@
 
 #include "utl_scoped_name.h"
 #include "Literals.h"
-#include "XML/XercesString.h"
+#include "ace/XML_Utils/XercesString.h"
 #include "CIAO_IDL3_TO_XMI_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.h b/CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.h
index d92e4f7e1bc..c37d7f2d9d5 100644
--- a/CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.h
+++ b/CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.h
@@ -23,7 +23,7 @@
 #include "ast_component.h"
 #include "utl_scoped_name.h"
 #include "Literals.h"
-#include "XML/XercesString.h"
+#include "ace/XML_Utils/XercesString.h"
 #include "CIAO_IDL3_TO_XMI_Export.h"