ChangeLogTag:Thu Feb 14 00:20:39 2002 Nanbor Wang <nanbor@cs.wustl.edu>

13 files changed, 38 insertions, 39 deletions

diff --git a/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp b/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp
index b5a8303ff98..8dd991126dd 100644
--- a/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp
+++ b/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "common/SAXExceptions.h"
-#include "parser/debug_validator/Debug_Attributes_Builder.h"
+#include "ACEXML/common/SAXExceptions.h"
+#include "ACEXML/parser/debug_validator/Debug_Attributes_Builder.h"
 
 ACEXML_Debug_Attribute_Builder::ACEXML_Debug_Attribute_Builder ()
   : type_ (ERROR_TYPE),
diff --git a/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h b/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h
index b727e29e72f..e4c64ea6e24 100644
--- a/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h
+++ b/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h
@@ -12,8 +12,8 @@
 #ifndef _ACEXML_DEBUG_ATTRIBUTES_BUILDER_H_
 #define _ACEXML_DEBUG_ATTRIBUTES_BUILDER_H_
 
-#include "common/Attributes_Def_Builder.h"
-#include "parser/debug_validator/Debug_DTD_Manager_Export.h"
+#include "ACEXML/common/Attributes_Def_Builder.h"
+#include "ACEXML/parser/debug_validator/Debug_DTD_Manager_Export.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Unbounded_Queue.h"
 
diff --git a/ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp b/ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp
index e38aecbffc4..05af2aa7d66 100644
--- a/ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp
+++ b/ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp
@@ -1,9 +1,9 @@
 // -*- C++ -*-   $Id$
 
-#include "common/SAXExceptions.h"
-#include "parser/debug_validator/Debug_DTD_Manager.h"
-#include "parser/debug_validator/Debug_Element_Builder.h"
-#include "parser/debug_validator/Debug_Attributes_Builder.h"
+#include "ACEXML/common/SAXExceptions.h"
+#include "ACEXML/parser/debug_validator/Debug_DTD_Manager.h"
+#include "ACEXML/parser/debug_validator/Debug_Element_Builder.h"
+#include "ACEXML/parser/debug_validator/Debug_Attributes_Builder.h"
 
 ACEXML_Debug_DTD_Manager::ACEXML_Debug_DTD_Manager ()
 {
diff --git a/ACEXML/parser/debug_validator/Debug_DTD_Manager.h b/ACEXML/parser/debug_validator/Debug_DTD_Manager.h
index 0e03740cc99..37c477f735e 100644
--- a/ACEXML/parser/debug_validator/Debug_DTD_Manager.h
+++ b/ACEXML/parser/debug_validator/Debug_DTD_Manager.h
@@ -12,8 +12,8 @@
 #ifndef _ACEXML_DEBUG_DTD_Manager_H_
 #define _ACEXML_DEBUG_DTD_Manager_H_
 
-#include "common/DTD_Manager.h"
-#include "parser/debug_validator/Debug_DTD_Manager_Export.h"
+#include "ACEXML/common/DTD_Manager.h"
+#include "ACEXML/parser/debug_validator/Debug_DTD_Manager_Export.h"
 
 class ACEXML_DEBUG_DTD_MANAGER_Export ACEXML_Debug_DTD_Manager : public ACEXML_DTD_Manager
 {
diff --git a/ACEXML/parser/debug_validator/Debug_Element_Builder.cpp b/ACEXML/parser/debug_validator/Debug_Element_Builder.cpp
index fd9df4fc5b9..f3cdfbe52ab 100644
--- a/ACEXML/parser/debug_validator/Debug_Element_Builder.cpp
+++ b/ACEXML/parser/debug_validator/Debug_Element_Builder.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "common/SAXExceptions.h"
-#include "parser/debug_validator/Debug_Element_Builder.h"
+#include "ACEXML/common/SAXExceptions.h"
+#include "ACEXML/parser/debug_validator/Debug_Element_Builder.h"
 
 ACEXML_Debug_Element_Builder::ACEXML_Debug_Element_Builder ()
   : type_ (UNDEFINED),
diff --git a/ACEXML/parser/debug_validator/Debug_Element_Builder.h b/ACEXML/parser/debug_validator/Debug_Element_Builder.h
index 28f3864a5b1..a93bafc237f 100644
--- a/ACEXML/parser/debug_validator/Debug_Element_Builder.h
+++ b/ACEXML/parser/debug_validator/Debug_Element_Builder.h
@@ -12,9 +12,9 @@
 #ifndef _ACEXML_DEBUG_ELEMENT_BUILDER_H_
 #define _ACEXML_DEBUG_ELEMENT_BUILDER_H_
 
-#include "common/Element_Def_Builder.h"
-#include "parser/debug_validator/Debug_DTD_Manager_Export.h"
-#include "parser/debug_validator/Element_Tree.h"
+#include "ACEXML/common/Element_Def_Builder.h"
+#include "ACEXML/parser/debug_validator/Debug_DTD_Manager_Export.h"
+#include "ACEXML/parser/debug_validator/Element_Tree.h"
 
 /**
  * @ class ACEXML_Debug_Element_Builder Debug_Element_Builder.h "parser/debug_validator/Debug_Element_Builder.h"
diff --git a/ACEXML/parser/debug_validator/Element_Tree.cpp b/ACEXML/parser/debug_validator/Element_Tree.cpp
index 19111032586..0afb5135b41 100644
--- a/ACEXML/parser/debug_validator/Element_Tree.cpp
+++ b/ACEXML/parser/debug_validator/Element_Tree.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "parser/debug_validator/Element_Tree.h"
+#include "ACEXML/parser/debug_validator/Element_Tree.h"
 
 #if !defined (__ACEXML_INLINE__)
-# include "parser/debug_validator/Element_Tree.i"
+# include "ACEXML/parser/debug_validator/Element_Tree.i"
 #endif /* __ACEXML_INLINE__ */
 
 ACEXML_Element_Tree_Node::~ACEXML_Element_Tree_Node ()
diff --git a/ACEXML/parser/debug_validator/Element_Tree.h b/ACEXML/parser/debug_validator/Element_Tree.h
index 8cfe49431fa..ecaaf5c4bf5 100644
--- a/ACEXML/parser/debug_validator/Element_Tree.h
+++ b/ACEXML/parser/debug_validator/Element_Tree.h
@@ -12,8 +12,8 @@
 #ifndef _ACEXML_ELEMENT_TREE_H_
 #define _ACEXML_ELEMENT_TREE_H_
 
-#include "common/XML_Types.h"
-#include "parser/debug_validator/Debug_DTD_Manager_Export.h"
+#include "ACEXML/common/XML_Types.h"
+#include "ACEXML/parser/debug_validator/Debug_DTD_Manager_Export.h"
 
 /**
  * @ class ACEXML_Element_Tree_Node Element_Tree.h "parser/debug_validator/Element_Tree.h"
@@ -146,6 +146,6 @@ protected:
 };
 
 #if defined (__ACEXML_INLINE__)
-# include "parser/debug_validator/Element_Tree.i"
+# include "ACEXML/parser/debug_validator/Element_Tree.i"
 #endif /* __ACEXML_INLINE__ */
 #endif /* _ACEXML_ELEMENT_TREE_H_ */
diff --git a/ACEXML/parser/parser/Entity_Manager.cpp b/ACEXML/parser/parser/Entity_Manager.cpp
index 59054a7411e..651742476af 100644
--- a/ACEXML/parser/parser/Entity_Manager.cpp
+++ b/ACEXML/parser/parser/Entity_Manager.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "parser/parser/Entity_Manager.h"
+#include "ACEXML/parser/parser/Entity_Manager.h"
 
 #if !defined (__ACEXML_INLINE__)
-# include "parser/parser/Entity_Manager.i"
+# include "ACEXML/parser/parser/Entity_Manager.i"
 #endif /* __ACEXML_INLINE__ */
 
 static const ACEXML_Char amp_name[] = {'a', 'm', 'p', 0 };
diff --git a/ACEXML/parser/parser/Entity_Manager.h b/ACEXML/parser/parser/Entity_Manager.h
index 205715e7a4e..8ca668b34ab 100644
--- a/ACEXML/parser/parser/Entity_Manager.h
+++ b/ACEXML/parser/parser/Entity_Manager.h
@@ -13,8 +13,8 @@
 #ifndef ACEXML_ENTITY_MANAGER_H
 #define ACEXML_ENTITY_MANAGER_H
 
-#include "common/XML_Types.h"
-#include "parser/parser/Parser_export.h"
+#include "ACEXML/common/XML_Types.h"
+#include "ACEXML/parser/parser/Parser_export.h"
 #include "ace/Hash_Map_Manager.h"
 
 typedef ACE_Hash_Map_Entry<ACEXML_String,
@@ -39,7 +39,7 @@ typedef ACE_Hash_Map_Reverse_Iterator_Ex<ACEXML_String,
                                          ACE_Null_Mutex> ACEXML_ENTITIES_MANAGER_REVERSE_ITER;
 
 /**
- * @class ACEXML_Entity_Manager Entity_Manager.h "parser/parser/Entity_Manager.h"
+ * @class ACEXML_Entity_Manager Entity_Manager.h "ACEXML/parser/parser/Entity_Manager.h"
  *
  * @brief Class to manage and resolve entity references.
  *
@@ -66,6 +66,6 @@ private:
 };
 
 #if defined (__ACEXML_INLINE__)
-# include "parser/parser/Entity_Manager.i"
+# include "ACEXML/parser/parser/Entity_Manager.i"
 #endif /* __ACEXML_INLINE__ */
 #endif /* ACEXML_ENTITY_MANAGER_H */
diff --git a/ACEXML/parser/parser/Makefile b/ACEXML/parser/parser/Makefile
index 7fa37cf4ba8..ffd88d5c13e 100644
--- a/ACEXML/parser/parser/Makefile
+++ b/ACEXML/parser/parser/Makefile
@@ -14,7 +14,6 @@ DEFS    = $(addsuffix .h,$(FILES))
 LSRC    = $(addsuffix .cpp,$(FILES))
 
 LIBS   += $(ACELIB) -lACEXML
-CCFLAGS += -I../..
 
 BUILD   = $(VLIB) $(VSHLIB)
 
diff --git a/ACEXML/parser/parser/Parser.cpp b/ACEXML/parser/parser/Parser.cpp
index d48ddaa2869..379093aa02a 100644
--- a/ACEXML/parser/parser/Parser.cpp
+++ b/ACEXML/parser/parser/Parser.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "parser/parser/Parser.h"
-#include "common/Transcode.h"
-#include "common/AttributesImpl.h"
+#include "ACEXML/parser/parser/Parser.h"
+#include "ACEXML/common/Transcode.h"
+#include "ACEXML/common/AttributesImpl.h"
 
 static const ACEXML_Char default_attribute_type[] = {'C', 'D', 'A', 'T', 'A', 0};
 static const ACEXML_Char empty_string[] = { 0 };
@@ -11,7 +11,7 @@ const ACEXML_Char
 ACEXML_Parser::simple_parsing_name_[] = { 'S', 'i', 'm', 'p', 'l', 'e', 0 };
 
 #if !defined (__ACEXML_INLINE__)
-# include "parser/parser/Parser.i"
+# include "ACEXML/parser/parser/Parser.i"
 #endif /* __ACEXML_INLINE__ */
 
 /***
diff --git a/ACEXML/parser/parser/Parser.h b/ACEXML/parser/parser/Parser.h
index df19607e160..8e0c6f52f94 100644
--- a/ACEXML/parser/parser/Parser.h
+++ b/ACEXML/parser/parser/Parser.h
@@ -13,20 +13,20 @@
 #ifndef _ACEXML_BASIC_PARSER_H_
 #define _ACEXML_BASIC_PARSER_H_
 
-#include "common/XMLReader.h"
-#include "common/LocatorImpl.h"
-#include "common/NamespaceSupport.h"
-#include "common/CharStream.h"
-#include "parser/parser/Parser_export.h"
+#include "ACEXML/common/XMLReader.h"
+#include "ACEXML/common/LocatorImpl.h"
+#include "ACEXML/common/NamespaceSupport.h"
+#include "ACEXML/common/CharStream.h"
+#include "ACEXML/parser/parser/Parser_export.h"
 #include "ace/Obstack.h"
 #include "ace/Functor.h"
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Containers_T.h"
-#include "parser/parser/Entity_Manager.h"
+#include "ACEXML/parser/parser/Entity_Manager.h"
 
 /**
- * @class ACEXML_Parser Parser.h "parser/parser/Parser.h"
+ * @class ACEXML_Parser Parser.h "ACEXML/parser/parser/Parser.h"
  *
  * @brief A SAX based parser.
  *
@@ -464,6 +464,6 @@ private:
 };
 
 #if defined (__ACEXML_INLINE__)
-# include "parser/parser/Parser.i"
+# include "ACEXML/parser/parser/Parser.i"
 #endif /* __ACEXML_INLINE__ */
 #endif /* _ACEXML_BASIC_PARSER_H_ */