diff options
62 files changed, 191 insertions, 138 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 67f8ef41046..49c28274749 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,28 @@ +Thu May 31 12:31:38 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/XML_Utils/XMLSchema: + * ace/XML_Utils/XMLSchema/Traversal.hpp: + * ace/XML_Utils/XMLSchema/TypeInfo.hpp: + * ace/XML_Utils/XMLSchema/Types.hpp: + * ace/XML_Utils/XMLSchema/Writer.hpp: + * ace/XML_Utils/XMLSchema/id_map.hpp: + * ace/XML_Utils/XSCRT: + * ace/XML_Utils/XSCRT/Elements.hpp: + * ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp: + * ace/XML_Utils/XSCRT/Parser.hpp: + * ace/XML_Utils/XSCRT/Traversal.hpp: + * ace/XML_Utils/XSCRT/Writer.hpp: + * ace/XML_Utils/XSCRT/XML.hpp: + * ace/XML_Utils/XSCRT/XMLSchema.hpp: + Moved these files from DAnCE to ACE + + * ace/XML_Utils/XSCRT/Elements.ipp: + * ace/XML_Utils/XSCRT/Parser.ipp: + * ace/XML_Utils/XSCRT/Traversal.ipp: + * ace/XML_Utils/XSCRT/Writer.ipp: + * ace/XML_Utils/XSCRT/XML.ipp: + Removed these files. + Thu May 31 09:12:07 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * ace/XML_Utils: diff --git a/DAnCE/tools/Config_Handlers/XMLSchema/Traversal.hpp b/ACE/ace/XML_Utils/XMLSchema/Traversal.hpp index 24fa7a9eb6e..5c28be0eb3b 100644 --- a/DAnCE/tools/Config_Handlers/XMLSchema/Traversal.hpp +++ b/ACE/ace/XML_Utils/XMLSchema/Traversal.hpp @@ -5,8 +5,8 @@ #ifndef XMLSCHEMA_TRAVERSAL_HPP #define XMLSCHEMA_TRAVERSAL_HPP -#include <XSCRT/Traversal.hpp> -#include <XMLSchema/Types.hpp> +#include <ace/XML_Utils/XSCRT/Traversal.hpp> +#include <ace/XML_Utils/XMLSchema/Types.hpp> namespace XMLSchema { @@ -71,7 +71,7 @@ namespace XMLSchema } } -#include <XMLSchema/Traversal.ipp> -#include <XMLSchema/Traversal.tpp> +#include <ace/XML_Utils/XMLSchema/Traversal.ipp> +#include <ace/XML_Utils/XMLSchema/Traversal.tpp> #endif // XMLSCHEMA_TRAVERSAL_HPP diff --git a/DAnCE/tools/Config_Handlers/XMLSchema/Traversal.ipp b/ACE/ace/XML_Utils/XMLSchema/Traversal.ipp index a5c614182a3..a5c614182a3 100644 --- a/DAnCE/tools/Config_Handlers/XMLSchema/Traversal.ipp +++ b/ACE/ace/XML_Utils/XMLSchema/Traversal.ipp diff --git a/DAnCE/tools/Config_Handlers/XMLSchema/Traversal.tpp b/ACE/ace/XML_Utils/XMLSchema/Traversal.tpp index d79c13630fb..d79c13630fb 100644 --- a/DAnCE/tools/Config_Handlers/XMLSchema/Traversal.tpp +++ b/ACE/ace/XML_Utils/XMLSchema/Traversal.tpp diff --git a/DAnCE/tools/Config_Handlers/XMLSchema/TypeInfo.hpp b/ACE/ace/XML_Utils/XMLSchema/TypeInfo.hpp index e4fa52dbb9c..4c29bf1eec7 100644 --- a/DAnCE/tools/Config_Handlers/XMLSchema/TypeInfo.hpp +++ b/ACE/ace/XML_Utils/XMLSchema/TypeInfo.hpp @@ -5,7 +5,7 @@ #ifndef XMLSCHEMA_TYPE_INFO_HPP #define XMLSCHEMA_TYPE_INFO_HPP -#include <XSCRT/ExtendedTypeInfo.hpp> +#include <ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp> namespace XMLSchema { @@ -16,7 +16,7 @@ namespace XMLSchema }; } -#include <XMLSchema/TypeInfo.ipp> -#include <XMLSchema/TypeInfo.tpp> +#include <ace/XML_Utils/XMLSchema/TypeInfo.ipp> +#include <ace/XML_Utils/XMLSchema/TypeInfo.tpp> #endif // XMLSCHEMA_TYPE_INFO_HPP diff --git a/DAnCE/tools/Config_Handlers/XMLSchema/TypeInfo.ipp b/ACE/ace/XML_Utils/XMLSchema/TypeInfo.ipp index 5b9422f38c8..5b9422f38c8 100644 --- a/DAnCE/tools/Config_Handlers/XMLSchema/TypeInfo.ipp +++ b/ACE/ace/XML_Utils/XMLSchema/TypeInfo.ipp diff --git a/DAnCE/tools/Config_Handlers/XMLSchema/TypeInfo.tpp b/ACE/ace/XML_Utils/XMLSchema/TypeInfo.tpp index d81b7bed143..d81b7bed143 100644 --- a/DAnCE/tools/Config_Handlers/XMLSchema/TypeInfo.tpp +++ b/ACE/ace/XML_Utils/XMLSchema/TypeInfo.tpp diff --git a/DAnCE/tools/Config_Handlers/XMLSchema/Types.hpp b/ACE/ace/XML_Utils/XMLSchema/Types.hpp index 17b1469c861..0861c6c34ef 100644 --- a/DAnCE/tools/Config_Handlers/XMLSchema/Types.hpp +++ b/ACE/ace/XML_Utils/XMLSchema/Types.hpp @@ -6,7 +6,7 @@ #define XMLSCHEMA_TYPES_HPP #include <string> -#include "XSCRT/Elements.hpp" +#include "ace/XML_Utils/XSCRT/Elements.hpp" #include "ace/Basic_Types.h" /** @@ -664,7 +664,7 @@ namespace XMLSchema }; } -#include "XMLSchema/Types.ipp" -#include "XMLSchema/Types.tpp" +#include "ace/XML_Utils/XMLSchema/Types.ipp" +#include "ace/XML_Utils/XMLSchema/Types.tpp" #endif // XMLSCHEMA_TYPES_HPP diff --git a/DAnCE/tools/Config_Handlers/XMLSchema/Types.ipp b/ACE/ace/XML_Utils/XMLSchema/Types.ipp index 6b749260f55..6b749260f55 100644 --- a/DAnCE/tools/Config_Handlers/XMLSchema/Types.ipp +++ b/ACE/ace/XML_Utils/XMLSchema/Types.ipp diff --git a/DAnCE/tools/Config_Handlers/XMLSchema/Types.tpp b/ACE/ace/XML_Utils/XMLSchema/Types.tpp index 4a8bddcf597..4a8bddcf597 100644 --- a/DAnCE/tools/Config_Handlers/XMLSchema/Types.tpp +++ b/ACE/ace/XML_Utils/XMLSchema/Types.tpp diff --git a/DAnCE/tools/Config_Handlers/XMLSchema/Writer.hpp b/ACE/ace/XML_Utils/XMLSchema/Writer.hpp index 4a0c1603efa..753a941e75e 100644 --- a/DAnCE/tools/Config_Handlers/XMLSchema/Writer.hpp +++ b/ACE/ace/XML_Utils/XMLSchema/Writer.hpp @@ -7,10 +7,10 @@ #include <sstream> -#include <XSCRT/Writer.hpp> +#include <ace/XML_Utils/XSCRT/Writer.hpp> -#include <XMLSchema/Types.hpp> -#include <XMLSchema/Traversal.hpp> +#include <ace/XML_Utils/XMLSchema/Types.hpp> +#include <ace/XML_Utils/XMLSchema/Traversal.hpp> #include <iostream> @@ -153,7 +153,7 @@ namespace XMLSchema } } -#include <XMLSchema/Writer.ipp> -#include <XMLSchema/Writer.tpp> +#include <ace/XML_Utils/XMLSchema/Writer.ipp> +#include <ace/XML_Utils/XMLSchema/Writer.tpp> #endif // XMLSCHEMA_WRITER_HPP diff --git a/DAnCE/tools/Config_Handlers/XMLSchema/Writer.ipp b/ACE/ace/XML_Utils/XMLSchema/Writer.ipp index 2b7c9a4b939..2b7c9a4b939 100644 --- a/DAnCE/tools/Config_Handlers/XMLSchema/Writer.ipp +++ b/ACE/ace/XML_Utils/XMLSchema/Writer.ipp diff --git a/DAnCE/tools/Config_Handlers/XMLSchema/Writer.tpp b/ACE/ace/XML_Utils/XMLSchema/Writer.tpp index 6c57de04d81..6c57de04d81 100644 --- a/DAnCE/tools/Config_Handlers/XMLSchema/Writer.tpp +++ b/ACE/ace/XML_Utils/XMLSchema/Writer.tpp diff --git a/DAnCE/tools/Config_Handlers/XMLSchema/id_map.hpp b/ACE/ace/XML_Utils/XMLSchema/id_map.hpp index efc6a8b8bd7..07691c54b68 100644 --- a/DAnCE/tools/Config_Handlers/XMLSchema/id_map.hpp +++ b/ACE/ace/XML_Utils/XMLSchema/id_map.hpp @@ -25,7 +25,7 @@ //ID_Map makes use of the Types::idref_ data member to set it to the appropriate //object created during parsing -#include "XMLSchema/Types.hpp" +#include "ace/XML_Utils/XMLSchema/Types.hpp" //The ID_Map is a Thread Specific Storage element. #include "ace/TSS_T.h" diff --git a/DAnCE/tools/Config_Handlers/XSCRT/Elements.hpp b/ACE/ace/XML_Utils/XSCRT/Elements.hpp index 0c8b6979282..80f451ff918 100644 --- a/DAnCE/tools/Config_Handlers/XSCRT/Elements.hpp +++ b/ACE/ace/XML_Utils/XSCRT/Elements.hpp @@ -11,7 +11,7 @@ #include "ace/ace_wchar.h" // #include <iostream> //@@ tmp -#include <XSCRT/Parser.hpp> +#include <ace/XML_Utils/XSCRT/Parser.hpp> #include "ace/Refcounted_Auto_Ptr.h" namespace XSCRT @@ -566,7 +566,6 @@ namespace XSCRT } -#include <XSCRT/Elements.ipp> -#include <XSCRT/Elements.tpp> +#include <ace/XML_Utils/XSCRT/Elements.tpp> #endif // XSCRT_ELEMENTS_HPP diff --git a/DAnCE/tools/Config_Handlers/XSCRT/Elements.tpp b/ACE/ace/XML_Utils/XSCRT/Elements.tpp index 7539a36d75f..7539a36d75f 100644 --- a/DAnCE/tools/Config_Handlers/XSCRT/Elements.tpp +++ b/ACE/ace/XML_Utils/XSCRT/Elements.tpp diff --git a/DAnCE/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp b/ACE/ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp index e2ab4b64956..7575b9f1b5a 100644 --- a/DAnCE/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp +++ b/ACE/ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp @@ -177,6 +177,6 @@ namespace XSCRT } } -#include <XSCRT/ExtendedTypeInfo.ipp> +#include <ace/XML_Utils/XSCRT/ExtendedTypeInfo.ipp> #endif // XSCRT_EXTENDED_TYPE_INFO_HPP diff --git a/DAnCE/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp b/ACE/ace/XML_Utils/XSCRT/ExtendedTypeInfo.ipp index 6c4fba2cf88..6c4fba2cf88 100644 --- a/DAnCE/tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp +++ b/ACE/ace/XML_Utils/XSCRT/ExtendedTypeInfo.ipp diff --git a/DAnCE/tools/Config_Handlers/XSCRT/Parser.hpp b/ACE/ace/XML_Utils/XSCRT/Parser.hpp index 5fa1e827f8d..7b91d73c961 100644 --- a/DAnCE/tools/Config_Handlers/XSCRT/Parser.hpp +++ b/ACE/ace/XML_Utils/XSCRT/Parser.hpp @@ -7,7 +7,7 @@ #include <string> -#include "XSCRT/XML.hpp" +#include "ace/XML_Utils/XSCRT/XML.hpp" namespace XSCRT { @@ -61,7 +61,6 @@ namespace XSCRT }; } -#include "XSCRT/Parser.ipp" -#include "XSCRT/Parser.tpp" +#include "ace/XML_Utils/XSCRT/Parser.tpp" #endif // XSCRT_PARSER_HPP diff --git a/DAnCE/tools/Config_Handlers/XSCRT/Parser.tpp b/ACE/ace/XML_Utils/XSCRT/Parser.tpp index 75b9f48eb1f..75b9f48eb1f 100644 --- a/DAnCE/tools/Config_Handlers/XSCRT/Parser.tpp +++ b/ACE/ace/XML_Utils/XSCRT/Parser.tpp diff --git a/DAnCE/tools/Config_Handlers/XSCRT/Traversal.hpp b/ACE/ace/XML_Utils/XSCRT/Traversal.hpp index befd0478295..5043f158a45 100644 --- a/DAnCE/tools/Config_Handlers/XSCRT/Traversal.hpp +++ b/ACE/ace/XML_Utils/XSCRT/Traversal.hpp @@ -9,7 +9,7 @@ #include <set> #include <vector> -#include "XSCRT/ExtendedTypeInfo.hpp" +#include "ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp" namespace XSCRT { @@ -260,7 +260,6 @@ namespace XSCRT } } -#include <XSCRT/Traversal.ipp> -#include <XSCRT/Traversal.tpp> +#include <ace/XML_Utils/XSCRT/Traversal.tpp> #endif // XSCRT_TRAVERSAL_HPP diff --git a/DAnCE/tools/Config_Handlers/XSCRT/Traversal.tpp b/ACE/ace/XML_Utils/XSCRT/Traversal.tpp index 51889c0fb9b..51889c0fb9b 100644 --- a/DAnCE/tools/Config_Handlers/XSCRT/Traversal.tpp +++ b/ACE/ace/XML_Utils/XSCRT/Traversal.tpp diff --git a/DAnCE/tools/Config_Handlers/XSCRT/Writer.hpp b/ACE/ace/XML_Utils/XSCRT/Writer.hpp index 6fdd82f6f3e..09a87845972 100644 --- a/DAnCE/tools/Config_Handlers/XSCRT/Writer.hpp +++ b/ACE/ace/XML_Utils/XSCRT/Writer.hpp @@ -8,7 +8,7 @@ #include <stack> #include <string> -#include "XSCRT/XML.hpp" +#include "ace/XML_Utils/XSCRT/XML.hpp" namespace XSCRT { @@ -75,7 +75,6 @@ namespace XSCRT }; } -#include <XSCRT/Writer.ipp> -#include <XSCRT/Writer.tpp> +#include <ace/XML_Utils/XSCRT/Writer.tpp> #endif // XSCRT_WRITER_HPP diff --git a/DAnCE/tools/Config_Handlers/XSCRT/Writer.tpp b/ACE/ace/XML_Utils/XSCRT/Writer.tpp index 8593004687f..8593004687f 100644 --- a/DAnCE/tools/Config_Handlers/XSCRT/Writer.tpp +++ b/ACE/ace/XML_Utils/XSCRT/Writer.tpp diff --git a/DAnCE/tools/Config_Handlers/XSCRT/XML.hpp b/ACE/ace/XML_Utils/XSCRT/XML.hpp index d0fdd30affe..347aeebf94a 100644 --- a/DAnCE/tools/Config_Handlers/XSCRT/XML.hpp +++ b/ACE/ace/XML_Utils/XSCRT/XML.hpp @@ -487,7 +487,6 @@ namespace XSCRT } } -#include "XSCRT/XML.ipp" -#include "XSCRT/XML.tpp" +#include "ace/XML_Utils/XSCRT/XML.tpp" #endif // XSCRT_XML_HPP diff --git a/DAnCE/tools/Config_Handlers/XSCRT/XML.tpp b/ACE/ace/XML_Utils/XSCRT/XML.tpp index 63023a05d28..63023a05d28 100644 --- a/DAnCE/tools/Config_Handlers/XSCRT/XML.tpp +++ b/ACE/ace/XML_Utils/XSCRT/XML.tpp diff --git a/DAnCE/tools/Config_Handlers/XSCRT/XMLSchema.hpp b/ACE/ace/XML_Utils/XSCRT/XMLSchema.hpp index 95575267eee..3229aa8bc9f 100644 --- a/DAnCE/tools/Config_Handlers/XSCRT/XMLSchema.hpp +++ b/ACE/ace/XML_Utils/XSCRT/XMLSchema.hpp @@ -8,7 +8,7 @@ #include <string> // #include <iostream> //@@ tmp -#include "XSCRT/Elements.hpp" +#include "ace/XML_Utils/XMLSchema/XSCRT/Elements.hpp" namespace XMLSchema { @@ -516,7 +516,7 @@ namespace XMLSchema // // -#include "XSCRT/Traversal.hpp" +#include "ace/XML_Utils/XSCRT/Traversal.hpp" namespace XMLSchema { @@ -571,7 +571,7 @@ namespace XMLSchema // // -#include "XSCRT/ExtendedTypeInfo.hpp" +#include "ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp" namespace XMLSchema { @@ -582,7 +582,7 @@ namespace XMLSchema }; } -#include "XSCRT/XMLSchema.ipp" -#include "XSCRT/XMLSchema.tpp" +#include "ace/XML_Utils/XSCRT/XMLSchema.ipp" +#include "ace/XML_Utils/XSCRT/XMLSchema.tpp" #endif // XSCRT_XMLSCHEMA_HPP diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 42792722400..80a985fc9b8 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Thu May 31 12:31:31 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/dds4ccm/tools/QOS_XML_Handler/XML_File_Intf.cpp: + * connectors/dds4ccm/tools/QOS_XML_Handler/dds_qos.cpp: + * connectors/dds4ccm/tools/QOS_XML_Handler/dds_qos.hpp: + * connectors/dds4ccm/tools/QOS_XML_Handler/qos_xml_handler.mpc: + Updated for XSC move from DAnCe to ACE + Thu May 31 09:12:50 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * MPC/config/dds4ccm_qos_xml_handler.mpb: 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 ae52a6099e5..ea421a0f39c 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 @@ -2,7 +2,7 @@ #include "XML_File_Intf.h" #include "ace/XML_Utils/XML_Typedefs.h" -#include "XMLSchema/id_map.hpp" +#include "ace/XML_Utils/XMLSchema/id_map.hpp" #include "dds/DdsDcpsInfrastructureC.h" #include "dds4ccm/impl/logger/Log_Macros.h" diff --git a/CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/dds_qos.cpp b/CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/dds_qos.cpp index 04636f52dea..7ef2c26c7f7 100644 --- a/CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/dds_qos.cpp +++ b/CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/dds_qos.cpp @@ -7154,7 +7154,7 @@ namespace dds } } -#include "XMLSchema/TypeInfo.hpp" +#include "ace/XML_Utils/XMLSchema/TypeInfo.hpp" namespace dds { diff --git a/CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/dds_qos.hpp b/CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/dds_qos.hpp index ec83a9739f4..fd76cb0e32e 100644 --- a/CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/dds_qos.hpp +++ b/CIAO/connectors/dds4ccm/tools/QOS_XML_Handler/dds_qos.hpp @@ -60,8 +60,8 @@ namespace dds #include <memory> #include <string> #include <list> -#include "XMLSchema/Types.hpp" -#include "XMLSchema/id_map.hpp" +#include "ace/XML_Utils/XMLSchema/Types.hpp" +#include "ace/XML_Utils/XMLSchema/id_map.hpp" #include "ace/Refcounted_Auto_Ptr.h" #include "ace/Null_Mutex.h" #include "ace/TSS_T.h" @@ -2246,7 +2246,7 @@ namespace dds } } -#include "XMLSchema/Traversal.hpp" +#include "ace/XML_Utils/XMLSchema/Traversal.hpp" namespace dds { @@ -4496,7 +4496,7 @@ namespace dds } } -#include "XMLSchema/Writer.hpp" +#include "ace/XML_Utils/XMLSchema/Writer.hpp" namespace dds { 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 5717c1076b4..03f5a753662 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,15 +27,12 @@ project (XML_QOS_XSC_Generation) : install, xscdefaults { project (QOS_XML_XSC_Handler) : install, acelib, xerces, anytypecode, \ - dds4ccm_dcps, dds4ccm_logger, ace_xml_utils, gen_ostream { + dds4ccm_dcps, dds4ccm_logger, ace_xml_utils, gen_ostream, ciao_output { sharedname = QOS_XML_XSC_Handler after += XML_QOS_XSC_Generation dynamicflags += XML_QOS_HANDLER_BUILD_DLL macros += XML_USE_PTHREADS includes += $(CIAO_ROOT)/connectors/dds4ccm/tools/QOS_XML_Handler $(CIAO_ROOT)/connectors $(DDS_ROOT) - includes += $(DANCE_ROOT)/tools/Config_Handlers $(DANCE_ROOT)/tools - - libout = $(ACE_ROOT)/lib requires += dds4ccm_opendds diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog index 734eab61367..da5b5bf9b3c 100644 --- a/DAnCE/ChangeLog +++ b/DAnCE/ChangeLog @@ -1,3 +1,66 @@ +Thu May 31 12:31:35 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * tools/Config_Handlers/Basic_Deployment_Data.hpp: + * tools/Config_Handlers/Basic_Deployment_Data.cpp: + * tools/Config_Handlers/Deployment.cpp: + * tools/Config_Handlers/Deployment.hpp: + * tools/Config_Handlers/Utils/Functors.h: + * tools/Config_Handlers/XMI.cpp: + * tools/Config_Handlers/XMI.hpp: + * tools/Config_Handlers/XML_File_Intf.cpp: + * tools/Config_Handlers/ccd.cpp: + * tools/Config_Handlers/ccd.hpp: + * tools/Config_Handlers/cdd.hpp: + * tools/Config_Handlers/cdd.cpp: + * tools/Config_Handlers/cdp.cpp: + * tools/Config_Handlers/cdp.hpp: + * tools/Config_Handlers/cid.hpp: + * tools/Config_Handlers/cid.cpp: + * tools/Config_Handlers/cpd.cpp: + * tools/Config_Handlers/cpd.hpp: + * tools/Config_Handlers/iad.cpp: + * tools/Config_Handlers/iad.hpp: + * tools/Config_Handlers/pcd.hpp: + * tools/Config_Handlers/pcd.cpp: + * tools/Config_Handlers/toplevel.hpp: + * tools/Config_Handlers/toplevel.cpp: + Updated for XMLSchema move to ACE + + * tools/Config_Handlers/XMLSchema: + * tools/Config_Handlers/XMLSchema/Traversal.hpp: + * tools/Config_Handlers/XMLSchema/Traversal.ipp: + * tools/Config_Handlers/XMLSchema/Traversal.tpp: + * tools/Config_Handlers/XMLSchema/TypeInfo.hpp: + * tools/Config_Handlers/XMLSchema/TypeInfo.ipp: + * tools/Config_Handlers/XMLSchema/TypeInfo.tpp: + * tools/Config_Handlers/XMLSchema/Types.hpp: + * tools/Config_Handlers/XMLSchema/Types.ipp: + * tools/Config_Handlers/XMLSchema/Types.tpp: + * tools/Config_Handlers/XMLSchema/Writer.hpp: + * tools/Config_Handlers/XMLSchema/Writer.ipp: + * tools/Config_Handlers/XMLSchema/Writer.tpp: + * tools/Config_Handlers/XMLSchema/id_map.hpp: + * tools/Config_Handlers/XSCRT: + * tools/Config_Handlers/XSCRT/Elements.hpp: + * tools/Config_Handlers/XSCRT/Elements.ipp: + * tools/Config_Handlers/XSCRT/Elements.tpp: + * tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp: + * tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp: + * tools/Config_Handlers/XSCRT/Parser.hpp: + * tools/Config_Handlers/XSCRT/Parser.ipp: + * tools/Config_Handlers/XSCRT/Parser.tpp: + * tools/Config_Handlers/XSCRT/Traversal.hpp: + * tools/Config_Handlers/XSCRT/Traversal.ipp: + * tools/Config_Handlers/XSCRT/Traversal.tpp: + * tools/Config_Handlers/XSCRT/Writer.hpp: + * tools/Config_Handlers/XSCRT/Writer.ipp: + * tools/Config_Handlers/XSCRT/Writer.tpp: + * tools/Config_Handlers/XSCRT/XML.hpp: + * tools/Config_Handlers/XSCRT/XML.ipp: + * tools/Config_Handlers/XSCRT/XML.tpp: + * tools/Config_Handlers/XSCRT/XMLSchema.hpp: + Removed these files, moved to ACE + Thu May 31 09:13:26 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * MPC/config/dance_config_handlers.mpb: diff --git a/DAnCE/tools/Config_Handlers/Basic_Deployment_Data.cpp b/DAnCE/tools/Config_Handlers/Basic_Deployment_Data.cpp index 5cc0292c0e1..7d60277d096 100644 --- a/DAnCE/tools/Config_Handlers/Basic_Deployment_Data.cpp +++ b/DAnCE/tools/Config_Handlers/Basic_Deployment_Data.cpp @@ -7232,7 +7232,7 @@ namespace DAnCE } } -#include "XMLSchema/TypeInfo.hpp" +#include "ace/XML_Utils/XMLSchema/TypeInfo.hpp" namespace DAnCE { diff --git a/DAnCE/tools/Config_Handlers/Basic_Deployment_Data.hpp b/DAnCE/tools/Config_Handlers/Basic_Deployment_Data.hpp index 5f1ca908974..76745eba955 100644 --- a/DAnCE/tools/Config_Handlers/Basic_Deployment_Data.hpp +++ b/DAnCE/tools/Config_Handlers/Basic_Deployment_Data.hpp @@ -70,8 +70,8 @@ namespace DAnCE #include <memory> #include <string> #include <list> -#include "XMLSchema/Types.hpp" -#include "XMLSchema/id_map.hpp" +#include "ace/XML_Utils/XMLSchema/Types.hpp" +#include "ace/XML_Utils/XMLSchema/id_map.hpp" #include "ace/Refcounted_Auto_Ptr.h" #include "ace/Null_Mutex.h" #include "ace/TSS_T.h" @@ -2715,7 +2715,7 @@ namespace DAnCE } } -#include "XMLSchema/Traversal.hpp" +#include "ace/XML_Utils/XMLSchema/Traversal.hpp" namespace DAnCE { @@ -5626,7 +5626,7 @@ namespace DAnCE } } -#include "XMLSchema/Writer.hpp" +#include "ace/XML_Utils/XMLSchema/Writer.hpp" namespace DAnCE { diff --git a/DAnCE/tools/Config_Handlers/Deployment.cpp b/DAnCE/tools/Config_Handlers/Deployment.cpp index 495f5f7d6e6..2effb45263e 100644 --- a/DAnCE/tools/Config_Handlers/Deployment.cpp +++ b/DAnCE/tools/Config_Handlers/Deployment.cpp @@ -253,7 +253,7 @@ namespace DAnCE } } -#include "XMLSchema/TypeInfo.hpp" +#include "ace/XML_Utils/XMLSchema/TypeInfo.hpp" namespace DAnCE { diff --git a/DAnCE/tools/Config_Handlers/Deployment.hpp b/DAnCE/tools/Config_Handlers/Deployment.hpp index 9de986a3ec4..a356299293a 100644 --- a/DAnCE/tools/Config_Handlers/Deployment.hpp +++ b/DAnCE/tools/Config_Handlers/Deployment.hpp @@ -31,8 +31,8 @@ namespace DAnCE #include <memory> #include <string> #include <list> -#include "XMLSchema/Types.hpp" -#include "XMLSchema/id_map.hpp" +#include "ace/XML_Utils/XMLSchema/Types.hpp" +#include "ace/XML_Utils/XMLSchema/id_map.hpp" #include "ace/Refcounted_Auto_Ptr.h" #include "ace/Null_Mutex.h" #include "ace/TSS_T.h" @@ -125,7 +125,7 @@ namespace DAnCE } } -#include "XMLSchema/Traversal.hpp" +#include "ace/XML_Utils/XMLSchema/Traversal.hpp" namespace DAnCE { @@ -137,7 +137,7 @@ namespace DAnCE } } -#include "XMLSchema/Writer.hpp" +#include "ace/XML_Utils/XMLSchema/Writer.hpp" namespace DAnCE { diff --git a/DAnCE/tools/Config_Handlers/Utils/Functors.h b/DAnCE/tools/Config_Handlers/Utils/Functors.h index edfa7e24789..e3efa822a6f 100644 --- a/DAnCE/tools/Config_Handlers/Utils/Functors.h +++ b/DAnCE/tools/Config_Handlers/Utils/Functors.h @@ -12,7 +12,7 @@ #include "tao/Basic_Types.h" // For CORBA::ULong #include "tao/StringSeqC.h" -#include "XMLSchema/Types.hpp" +#include "ace/XML_Utils/XMLSchema/Types.hpp" namespace DAnCE { namespace Config_Handlers diff --git a/DAnCE/tools/Config_Handlers/XMI.cpp b/DAnCE/tools/Config_Handlers/XMI.cpp index 3d90caca2f6..a56ca8d4f0a 100644 --- a/DAnCE/tools/Config_Handlers/XMI.cpp +++ b/DAnCE/tools/Config_Handlers/XMI.cpp @@ -480,7 +480,7 @@ namespace XMI } } -#include "XMLSchema/TypeInfo.hpp" +#include "ace/XML_Utils/XMLSchema/TypeInfo.hpp" namespace XMI { diff --git a/DAnCE/tools/Config_Handlers/XMI.hpp b/DAnCE/tools/Config_Handlers/XMI.hpp index 3514cbb4437..b28bf97a346 100644 --- a/DAnCE/tools/Config_Handlers/XMI.hpp +++ b/DAnCE/tools/Config_Handlers/XMI.hpp @@ -29,8 +29,8 @@ namespace XMI #include <memory> #include <string> #include <list> -#include "XMLSchema/Types.hpp" -#include "XMLSchema/id_map.hpp" +#include "ace/XML_Utils/XMLSchema/Types.hpp" +#include "ace/XML_Utils/XMLSchema/id_map.hpp" #include "ace/Refcounted_Auto_Ptr.h" #include "ace/Null_Mutex.h" #include "ace/TSS_T.h" @@ -160,7 +160,7 @@ namespace XMI } } -#include "XMLSchema/Traversal.hpp" +#include "ace/XML_Utils/XMLSchema/Traversal.hpp" namespace XMI { @@ -285,7 +285,7 @@ namespace XMI } } -#include "XMLSchema/Writer.hpp" +#include "ace/XML_Utils/XMLSchema/Writer.hpp" namespace XMI { diff --git a/DAnCE/tools/Config_Handlers/XML_File_Intf.cpp b/DAnCE/tools/Config_Handlers/XML_File_Intf.cpp index 71aa8736e11..75524254e00 100644 --- a/DAnCE/tools/Config_Handlers/XML_File_Intf.cpp +++ b/DAnCE/tools/Config_Handlers/XML_File_Intf.cpp @@ -6,7 +6,7 @@ #include "DP_Handler.h" #include "DD_Handler.h" #include "Common.h" -#include "XMLSchema/id_map.hpp" +#include "ace/XML_Utils/XMLSchema/id_map.hpp" #include "dance/Deployment/Deployment_DataC.h" #include "dance/Deployment/Deployment_TargetDataC.h" diff --git a/DAnCE/tools/Config_Handlers/XSCRT/Elements.ipp b/DAnCE/tools/Config_Handlers/XSCRT/Elements.ipp deleted file mode 100644 index 414f03eb031..00000000000 --- a/DAnCE/tools/Config_Handlers/XSCRT/Elements.ipp +++ /dev/null @@ -1,7 +0,0 @@ -// file : XSC/Elements.ipp -// author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ - -namespace XSC -{ -} diff --git a/DAnCE/tools/Config_Handlers/XSCRT/Parser.ipp b/DAnCE/tools/Config_Handlers/XSCRT/Parser.ipp deleted file mode 100644 index f7de09602ae..00000000000 --- a/DAnCE/tools/Config_Handlers/XSCRT/Parser.ipp +++ /dev/null @@ -1,7 +0,0 @@ -// file : XSCRT/Parser.ipp -// author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ - -namespace XSCRT -{ -} diff --git a/DAnCE/tools/Config_Handlers/XSCRT/Traversal.ipp b/DAnCE/tools/Config_Handlers/XSCRT/Traversal.ipp deleted file mode 100644 index bc2a462334a..00000000000 --- a/DAnCE/tools/Config_Handlers/XSCRT/Traversal.ipp +++ /dev/null @@ -1,7 +0,0 @@ -// file : XSCRT/Traversal.ixx -// author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ - -namespace XSCRT -{ -} diff --git a/DAnCE/tools/Config_Handlers/XSCRT/Writer.ipp b/DAnCE/tools/Config_Handlers/XSCRT/Writer.ipp deleted file mode 100644 index caa9fc99235..00000000000 --- a/DAnCE/tools/Config_Handlers/XSCRT/Writer.ipp +++ /dev/null @@ -1,7 +0,0 @@ -// file : XSCRT/Writer.ipp -// author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ - -namespace XSCRT -{ -} diff --git a/DAnCE/tools/Config_Handlers/XSCRT/XML.ipp b/DAnCE/tools/Config_Handlers/XSCRT/XML.ipp deleted file mode 100644 index 4a7b83efd1c..00000000000 --- a/DAnCE/tools/Config_Handlers/XSCRT/XML.ipp +++ /dev/null @@ -1,7 +0,0 @@ -// file : XSCRT/XML.ipp -// author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ - -namespace XSCRT -{ -} diff --git a/DAnCE/tools/Config_Handlers/ccd.cpp b/DAnCE/tools/Config_Handlers/ccd.cpp index 4a73967baab..999575d252f 100644 --- a/DAnCE/tools/Config_Handlers/ccd.cpp +++ b/DAnCE/tools/Config_Handlers/ccd.cpp @@ -588,7 +588,7 @@ namespace DAnCE } } -#include "XMLSchema/TypeInfo.hpp" +#include "ace/XML_Utils/XMLSchema/TypeInfo.hpp" namespace DAnCE { diff --git a/DAnCE/tools/Config_Handlers/ccd.hpp b/DAnCE/tools/Config_Handlers/ccd.hpp index a3256477a9a..ee3a3be7bf6 100644 --- a/DAnCE/tools/Config_Handlers/ccd.hpp +++ b/DAnCE/tools/Config_Handlers/ccd.hpp @@ -32,8 +32,8 @@ namespace DAnCE #include <memory> #include <string> #include <list> -#include "XMLSchema/Types.hpp" -#include "XMLSchema/id_map.hpp" +#include "ace/XML_Utils/XMLSchema/Types.hpp" +#include "ace/XML_Utils/XMLSchema/id_map.hpp" #include "ace/Refcounted_Auto_Ptr.h" #include "ace/Null_Mutex.h" #include "ace/TSS_T.h" @@ -222,7 +222,7 @@ namespace DAnCE } } -#include "XMLSchema/Traversal.hpp" +#include "ace/XML_Utils/XMLSchema/Traversal.hpp" namespace DAnCE { @@ -494,7 +494,7 @@ namespace DAnCE } } -#include "XMLSchema/Writer.hpp" +#include "ace/XML_Utils/XMLSchema/Writer.hpp" namespace DAnCE { diff --git a/DAnCE/tools/Config_Handlers/cdd.cpp b/DAnCE/tools/Config_Handlers/cdd.cpp index 0f673bc74e5..c5218bf9b29 100644 --- a/DAnCE/tools/Config_Handlers/cdd.cpp +++ b/DAnCE/tools/Config_Handlers/cdd.cpp @@ -1282,7 +1282,7 @@ namespace DAnCE } } -#include "XMLSchema/TypeInfo.hpp" +#include "ace/XML_Utils/XMLSchema/TypeInfo.hpp" namespace DAnCE { diff --git a/DAnCE/tools/Config_Handlers/cdd.hpp b/DAnCE/tools/Config_Handlers/cdd.hpp index 43538a6f2c2..c39f433e153 100644 --- a/DAnCE/tools/Config_Handlers/cdd.hpp +++ b/DAnCE/tools/Config_Handlers/cdd.hpp @@ -36,8 +36,8 @@ namespace DAnCE #include <memory> #include <string> #include <list> -#include "XMLSchema/Types.hpp" -#include "XMLSchema/id_map.hpp" +#include "ace/XML_Utils/XMLSchema/Types.hpp" +#include "ace/XML_Utils/XMLSchema/id_map.hpp" #include "ace/Refcounted_Auto_Ptr.h" #include "ace/Null_Mutex.h" #include "ace/TSS_T.h" @@ -489,7 +489,7 @@ namespace DAnCE } } -#include "XMLSchema/Traversal.hpp" +#include "ace/XML_Utils/XMLSchema/Traversal.hpp" namespace DAnCE { @@ -1079,7 +1079,7 @@ namespace DAnCE } } -#include "XMLSchema/Writer.hpp" +#include "ace/XML_Utils/XMLSchema/Writer.hpp" namespace DAnCE { diff --git a/DAnCE/tools/Config_Handlers/cdp.cpp b/DAnCE/tools/Config_Handlers/cdp.cpp index 5d2ed65722d..f86f044f002 100644 --- a/DAnCE/tools/Config_Handlers/cdp.cpp +++ b/DAnCE/tools/Config_Handlers/cdp.cpp @@ -881,7 +881,7 @@ namespace DAnCE } } -#include "XMLSchema/TypeInfo.hpp" +#include "ace/XML_Utils/XMLSchema/TypeInfo.hpp" namespace DAnCE { diff --git a/DAnCE/tools/Config_Handlers/cdp.hpp b/DAnCE/tools/Config_Handlers/cdp.hpp index 96a9df82aff..3c30a798b23 100644 --- a/DAnCE/tools/Config_Handlers/cdp.hpp +++ b/DAnCE/tools/Config_Handlers/cdp.hpp @@ -34,8 +34,8 @@ namespace DAnCE #include <memory> #include <string> #include <list> -#include "XMLSchema/Types.hpp" -#include "XMLSchema/id_map.hpp" +#include "ace/XML_Utils/XMLSchema/Types.hpp" +#include "ace/XML_Utils/XMLSchema/id_map.hpp" #include "ace/Refcounted_Auto_Ptr.h" #include "ace/Null_Mutex.h" #include "ace/TSS_T.h" @@ -348,7 +348,7 @@ namespace DAnCE } } -#include "XMLSchema/Traversal.hpp" +#include "ace/XML_Utils/XMLSchema/Traversal.hpp" namespace DAnCE { @@ -776,7 +776,7 @@ namespace DAnCE } } -#include "XMLSchema/Writer.hpp" +#include "ace/XML_Utils/XMLSchema/Writer.hpp" namespace DAnCE { diff --git a/DAnCE/tools/Config_Handlers/cid.cpp b/DAnCE/tools/Config_Handlers/cid.cpp index 819700bcd70..7c8bbd72296 100644 --- a/DAnCE/tools/Config_Handlers/cid.cpp +++ b/DAnCE/tools/Config_Handlers/cid.cpp @@ -2474,7 +2474,7 @@ namespace DAnCE } } -#include "XMLSchema/TypeInfo.hpp" +#include "ace/XML_Utils/XMLSchema/TypeInfo.hpp" namespace DAnCE { diff --git a/DAnCE/tools/Config_Handlers/cid.hpp b/DAnCE/tools/Config_Handlers/cid.hpp index e9304101253..608d478512b 100644 --- a/DAnCE/tools/Config_Handlers/cid.hpp +++ b/DAnCE/tools/Config_Handlers/cid.hpp @@ -41,8 +41,8 @@ namespace DAnCE #include <memory> #include <string> #include <list> -#include "XMLSchema/Types.hpp" -#include "XMLSchema/id_map.hpp" +#include "ace/XML_Utils/XMLSchema/Types.hpp" +#include "ace/XML_Utils/XMLSchema/id_map.hpp" #include "ace/Refcounted_Auto_Ptr.h" #include "ace/Null_Mutex.h" #include "ace/TSS_T.h" @@ -869,7 +869,7 @@ namespace DAnCE } } -#include "XMLSchema/Traversal.hpp" +#include "ace/XML_Utils/XMLSchema/Traversal.hpp" namespace DAnCE { @@ -1919,7 +1919,7 @@ namespace DAnCE } } -#include "XMLSchema/Writer.hpp" +#include "ace/XML_Utils/XMLSchema/Writer.hpp" namespace DAnCE { diff --git a/DAnCE/tools/Config_Handlers/cpd.cpp b/DAnCE/tools/Config_Handlers/cpd.cpp index 54741bca47f..fbfe4ac3ce5 100644 --- a/DAnCE/tools/Config_Handlers/cpd.cpp +++ b/DAnCE/tools/Config_Handlers/cpd.cpp @@ -874,7 +874,7 @@ namespace DAnCE } } -#include "XMLSchema/TypeInfo.hpp" +#include "ace/XML_Utils/XMLSchema/TypeInfo.hpp" namespace DAnCE { diff --git a/DAnCE/tools/Config_Handlers/cpd.hpp b/DAnCE/tools/Config_Handlers/cpd.hpp index deb955beb6f..d0474f5973b 100644 --- a/DAnCE/tools/Config_Handlers/cpd.hpp +++ b/DAnCE/tools/Config_Handlers/cpd.hpp @@ -34,8 +34,8 @@ namespace DAnCE #include <memory> #include <string> #include <list> -#include "XMLSchema/Types.hpp" -#include "XMLSchema/id_map.hpp" +#include "ace/XML_Utils/XMLSchema/Types.hpp" +#include "ace/XML_Utils/XMLSchema/id_map.hpp" #include "ace/Refcounted_Auto_Ptr.h" #include "ace/Null_Mutex.h" #include "ace/TSS_T.h" @@ -316,7 +316,7 @@ namespace DAnCE } } -#include "XMLSchema/Traversal.hpp" +#include "ace/XML_Utils/XMLSchema/Traversal.hpp" namespace DAnCE { @@ -678,7 +678,7 @@ namespace DAnCE } } -#include "XMLSchema/Writer.hpp" +#include "ace/XML_Utils/XMLSchema/Writer.hpp" namespace DAnCE { diff --git a/DAnCE/tools/Config_Handlers/iad.cpp b/DAnCE/tools/Config_Handlers/iad.cpp index 0a35bccf1ee..87b1ac6d0b7 100644 --- a/DAnCE/tools/Config_Handlers/iad.cpp +++ b/DAnCE/tools/Config_Handlers/iad.cpp @@ -599,7 +599,7 @@ namespace DAnCE } } -#include "XMLSchema/TypeInfo.hpp" +#include "ace/XML_Utils/XMLSchema/TypeInfo.hpp" namespace DAnCE { diff --git a/DAnCE/tools/Config_Handlers/iad.hpp b/DAnCE/tools/Config_Handlers/iad.hpp index a2e965f100e..a8d5bbae81a 100644 --- a/DAnCE/tools/Config_Handlers/iad.hpp +++ b/DAnCE/tools/Config_Handlers/iad.hpp @@ -33,8 +33,8 @@ namespace DAnCE #include <memory> #include <string> #include <list> -#include "XMLSchema/Types.hpp" -#include "XMLSchema/id_map.hpp" +#include "ace/XML_Utils/XMLSchema/Types.hpp" +#include "ace/XML_Utils/XMLSchema/id_map.hpp" #include "ace/Refcounted_Auto_Ptr.h" #include "ace/Null_Mutex.h" #include "ace/TSS_T.h" @@ -237,7 +237,7 @@ namespace DAnCE } } -#include "XMLSchema/Traversal.hpp" +#include "ace/XML_Utils/XMLSchema/Traversal.hpp" namespace DAnCE { @@ -500,7 +500,7 @@ namespace DAnCE } } -#include "XMLSchema/Writer.hpp" +#include "ace/XML_Utils/XMLSchema/Writer.hpp" namespace DAnCE { diff --git a/DAnCE/tools/Config_Handlers/pcd.cpp b/DAnCE/tools/Config_Handlers/pcd.cpp index e5efe1e382e..e5122683f70 100644 --- a/DAnCE/tools/Config_Handlers/pcd.cpp +++ b/DAnCE/tools/Config_Handlers/pcd.cpp @@ -565,7 +565,7 @@ namespace DAnCE } } -#include "XMLSchema/TypeInfo.hpp" +#include "ace/XML_Utils/XMLSchema/TypeInfo.hpp" namespace DAnCE { diff --git a/DAnCE/tools/Config_Handlers/pcd.hpp b/DAnCE/tools/Config_Handlers/pcd.hpp index 7c2ce3393b8..63b2c89e3aa 100644 --- a/DAnCE/tools/Config_Handlers/pcd.hpp +++ b/DAnCE/tools/Config_Handlers/pcd.hpp @@ -33,8 +33,8 @@ namespace DAnCE #include <memory> #include <string> #include <list> -#include "XMLSchema/Types.hpp" -#include "XMLSchema/id_map.hpp" +#include "ace/XML_Utils/XMLSchema/Types.hpp" +#include "ace/XML_Utils/XMLSchema/id_map.hpp" #include "ace/Refcounted_Auto_Ptr.h" #include "ace/Null_Mutex.h" #include "ace/TSS_T.h" @@ -217,7 +217,7 @@ namespace DAnCE } } -#include "XMLSchema/Traversal.hpp" +#include "ace/XML_Utils/XMLSchema/Traversal.hpp" namespace DAnCE { @@ -444,7 +444,7 @@ namespace DAnCE } } -#include "XMLSchema/Writer.hpp" +#include "ace/XML_Utils/XMLSchema/Writer.hpp" namespace DAnCE { diff --git a/DAnCE/tools/Config_Handlers/toplevel.cpp b/DAnCE/tools/Config_Handlers/toplevel.cpp index 858d6700b3f..459f281b4aa 100644 --- a/DAnCE/tools/Config_Handlers/toplevel.cpp +++ b/DAnCE/tools/Config_Handlers/toplevel.cpp @@ -130,7 +130,7 @@ namespace DAnCE } } -#include "XMLSchema/TypeInfo.hpp" +#include "ace/XML_Utils/XMLSchema/TypeInfo.hpp" namespace DAnCE { diff --git a/DAnCE/tools/Config_Handlers/toplevel.hpp b/DAnCE/tools/Config_Handlers/toplevel.hpp index 5aa9fb2d299..887053ae5df 100644 --- a/DAnCE/tools/Config_Handlers/toplevel.hpp +++ b/DAnCE/tools/Config_Handlers/toplevel.hpp @@ -32,8 +32,8 @@ namespace DAnCE #include <memory> #include <string> #include <list> -#include "XMLSchema/Types.hpp" -#include "XMLSchema/id_map.hpp" +#include "ace/XML_Utils/XMLSchema/Types.hpp" +#include "ace/XML_Utils/XMLSchema/id_map.hpp" #include "ace/Refcounted_Auto_Ptr.h" #include "ace/Null_Mutex.h" #include "ace/TSS_T.h" @@ -91,7 +91,7 @@ namespace DAnCE } } -#include "XMLSchema/Traversal.hpp" +#include "ace/XML_Utils/XMLSchema/Traversal.hpp" namespace DAnCE { @@ -153,7 +153,7 @@ namespace DAnCE } } -#include "XMLSchema/Writer.hpp" +#include "ace/XML_Utils/XMLSchema/Writer.hpp" namespace DAnCE { |