diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-02-14 06:28:57 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-02-14 06:28:57 +0000 |
| commit | c4600cd5f92ce3498cbfae368bc6ec188e012a19 (patch) | |
| tree | 6d8d94fa00cd0b803b379040389f87c6a78dac0c | |
| parent | fbf21ff2aae1d038d88d54cbc34f77262e4196e5 (diff) | |
| download | ATCD-c4600cd5f92ce3498cbfae368bc6ec188e012a19.tar.gz | |
ChangeLogTag:Thu Feb 14 00:20:39 2002 Nanbor Wang <nanbor@cs.wustl.edu>
68 files changed, 380 insertions, 171 deletions
diff --git a/ACEXML/common/Attributes.h b/ACEXML/common/Attributes.h index 1684d940872..74b5e47895d 100644 --- a/ACEXML/common/Attributes.h +++ b/ACEXML/common/Attributes.h @@ -13,10 +13,10 @@ #ifndef _ACEXML_ATTRIBUTES_H_ #define _ACEXML_ATTRIBUTES_H_ -#include "common/XML_Types.h" +#include "ACEXML/common/XML_Types.h" /** - * @class ACEXML_Attributes Attributes.h "common/Attributes.h" + * @class ACEXML_Attributes Attributes.h "ACEXML/common/Attributes.h" * * @brief ACEXML_Attributes defines a collection of attributes of an XML element. * diff --git a/ACEXML/common/AttributesImpl.cpp b/ACEXML/common/AttributesImpl.cpp index f4d86486d19..e010dd49cc9 100644 --- a/ACEXML/common/AttributesImpl.cpp +++ b/ACEXML/common/AttributesImpl.cpp @@ -1,9 +1,9 @@ // -*- C++ -*- $Id$ -#include "common/AttributesImpl.h" +#include "ACEXML/common/AttributesImpl.h" #if !defined (__ACEXML_INLINE__) -# include "common/AttributesImpl.i" +# include "ACEXML/common/AttributesImpl.i" #endif /* __ACEXML_INLINE__ */ ACEXML_AttributesImpl::ACEXML_AttributesImpl (int size) diff --git a/ACEXML/common/AttributesImpl.h b/ACEXML/common/AttributesImpl.h index 4f69b9a307d..555d7d38b53 100644 --- a/ACEXML/common/AttributesImpl.h +++ b/ACEXML/common/AttributesImpl.h @@ -14,7 +14,7 @@ #ifndef ACEXML_ATTRIBUTESIMPL_H #define ACEXML_ATTRIBUTESIMPL_H -#include "common/Attributes.h" +#include "ACEXML/common/Attributes.h" #include "ace/Containers_T.h" #if !defined ACEXML_AttributesImpl_Default_Size @@ -24,7 +24,7 @@ class ACEXML_AttributesImpl; /** - * @class ACEXML_Attribute AttributesImpl.h "common/AttributesImpl.h" + * @class ACEXML_Attribute AttributesImpl.h "ACEXML/common/AttributesImpl.h" * * @brief ACEXML_Attribute defines the data structure of an attribute * @@ -111,7 +111,7 @@ private: typedef ACE_Array<ACEXML_Attribute> ACEXML_Attribute_Array; /** - * @class ACEXML_AttributesImpl AttributesImpl.h "common/AttributesImpl.h" + * @class ACEXML_AttributesImpl AttributesImpl.h "ACEXML/common/AttributesImpl.h" * * @brief ACEXML_AttributesImpl provides the default implementation * of interface ACEXML_Attributes. @@ -288,6 +288,6 @@ private: }; #if defined (__ACEXML_INLINE__) -# include "common/AttributesImpl.i" +# include "ACEXML/common/AttributesImpl.i" #endif /* __ACEXML_INLINE__ */ #endif /* ACEXML_ATTRIBUTESIMPL_H */ diff --git a/ACEXML/common/Attributes_Def_Builder.cpp b/ACEXML/common/Attributes_Def_Builder.cpp index 7ee53696985..d70a80f2925 100644 --- a/ACEXML/common/Attributes_Def_Builder.cpp +++ b/ACEXML/common/Attributes_Def_Builder.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "common/Attributes_Def_Builder.h" +#include "ACEXML/common/Attributes_Def_Builder.h" ACEXML_Attribute_Def_Builder::~ACEXML_Attribute_Def_Builder () { diff --git a/ACEXML/common/Attributes_Def_Builder.h b/ACEXML/common/Attributes_Def_Builder.h index 960eb879b89..3b9f2576a89 100644 --- a/ACEXML/common/Attributes_Def_Builder.h +++ b/ACEXML/common/Attributes_Def_Builder.h @@ -12,8 +12,8 @@ #ifndef _ACEXML_ATTRIBUTES_DEF_BUILDER_H_ #define _ACEXML_ATTRIBUTES_DEF_BUILDER_H_ -#include "common/XML_Types.h" -#include "common/Env.h" +#include "ACEXML/common/XML_Types.h" +#include "ACEXML/common/Env.h" #include "ace/Auto_Ptr.h" /** diff --git a/ACEXML/common/CharStream.cpp b/ACEXML/common/CharStream.cpp index ada6573be40..2c6ea29600f 100644 --- a/ACEXML/common/CharStream.cpp +++ b/ACEXML/common/CharStream.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- $Id$ -#include "common/CharStream.h" +#include "ACEXML/common/CharStream.h" ACEXML_CharStream::~ACEXML_CharStream (void) { diff --git a/ACEXML/common/CharStream.h b/ACEXML/common/CharStream.h index 94d44645025..4ff31cfc338 100644 --- a/ACEXML/common/CharStream.h +++ b/ACEXML/common/CharStream.h @@ -13,10 +13,10 @@ #ifndef _ACEXML_CHARSTREAM_H_ #define _ACEXML_CHARSTREAM_H_ -#include "common/XML_Types.h" +#include "ACEXML/common/XML_Types.h" /** - * @class ACEXML_CharStream CharStream.h "common/CharStream.h" + * @class ACEXML_CharStream CharStream.h "ACEXML/common/CharStream.h" * * ACEXML_CharStream is an abstract class (interface) which defines * the basic opertions a parser could use to retrieve XML charater diff --git a/ACEXML/common/ContentHandler.h b/ACEXML/common/ContentHandler.h index d680a9261c1..f8ffbd6842b 100644 --- a/ACEXML/common/ContentHandler.h +++ b/ACEXML/common/ContentHandler.h @@ -12,13 +12,13 @@ #ifndef _ACEXML_CONTENTHANDLER_H_ #define _ACEXML_CONTENTHANDLER_H_ -#include "common/Env.h" -#include "common/SAXExceptions.h" -#include "common/Locator.h" -#include "common/Attributes.h" +#include "ACEXML/common/Env.h" +#include "ACEXML/common/SAXExceptions.h" +#include "ACEXML/common/Locator.h" +#include "ACEXML/common/Attributes.h" /** - * @class ACEXML_ContentHandler ContentHandler.h "common/ContentHandler.h" + * @class ACEXML_ContentHandler ContentHandler.h "ACEXML/common/ContentHandler.h" * * @brief ACEXML_ContentHandler * diff --git a/ACEXML/common/DTDHandler.h b/ACEXML/common/DTDHandler.h index c8cb7a1f8d2..ee0d980fe82 100644 --- a/ACEXML/common/DTDHandler.h +++ b/ACEXML/common/DTDHandler.h @@ -12,11 +12,11 @@ #ifndef _ACEXML_DTDHANDLER_H_ #define _ACEXML_DTDHANDLER_H_ -#include "common/Env.h" -#include "common/SAXExceptions.h" +#include "ACEXML/common/Env.h" +#include "ACEXML/common/SAXExceptions.h" /** - * @class ACEXML_DTDHandler DTDHandler.h "common/DTDHandler.h" + * @class ACEXML_DTDHandler DTDHandler.h "ACEXML/common/DTDHandler.h" * * @brief ACEXML_DTDHandler * diff --git a/ACEXML/common/DTD_Manager.cpp b/ACEXML/common/DTD_Manager.cpp index bacf4c91f24..39b3d2acef0 100644 --- a/ACEXML/common/DTD_Manager.cpp +++ b/ACEXML/common/DTD_Manager.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "common/DTD_Manager.h" +#include "ACEXML/common/DTD_Manager.h" ACEXML_DTD_Manager::~ACEXML_DTD_Manager () { diff --git a/ACEXML/common/DTD_Manager.h b/ACEXML/common/DTD_Manager.h index 3bc81aef694..7ab7b57facd 100644 --- a/ACEXML/common/DTD_Manager.h +++ b/ACEXML/common/DTD_Manager.h @@ -12,9 +12,9 @@ #ifndef _ACEXML_DTD_Manager_H_ #define _ACEXML_DTD_Manager_H_ -#include "common/Attributes_Def_Builder.h" -#include "common/Element_Def_Builder.h" -#include "common/Validator.h" +#include "ACEXML/common/Attributes_Def_Builder.h" +#include "ACEXML/common/Element_Def_Builder.h" +#include "ACEXML/common/Validator.h" /** * @ class ACEXML_DTD_Manager DTD_Manager.h "common/DTD_Manager.h" diff --git a/ACEXML/common/DefaultHandler.cpp b/ACEXML/common/DefaultHandler.cpp index 3ebff8f7ac2..509ee2f7f0c 100644 --- a/ACEXML/common/DefaultHandler.cpp +++ b/ACEXML/common/DefaultHandler.cpp @@ -1,8 +1,8 @@ // -*- C++ -*- $Id$ -#include "common/DefaultHandler.h" +#include "ACEXML/common/DefaultHandler.h" #if !defined (__ACEXML_INLINE__) -# include "common/DefaultHandler.i" +# include "ACEXML/common/DefaultHandler.i" #endif /* __ACEXML_INLINE__ */ ACEXML_DefaultHandler::ACEXML_DefaultHandler (void) diff --git a/ACEXML/common/DefaultHandler.h b/ACEXML/common/DefaultHandler.h index c746550c72b..09cb0501aa1 100644 --- a/ACEXML/common/DefaultHandler.h +++ b/ACEXML/common/DefaultHandler.h @@ -12,13 +12,13 @@ #ifndef ACEXML_DEFAULTHANDLER_H #define ACEXML_DEFAULTHANDLER_H -#include "common/ContentHandler.h" -#include "common/DTDHandler.h" -#include "common/EntityResolver.h" -#include "common/ErrorHandler.h" +#include "ACEXML/common/ContentHandler.h" +#include "ACEXML/common/DTDHandler.h" +#include "ACEXML/common/EntityResolver.h" +#include "ACEXML/common/ErrorHandler.h" /** - * @class ACEXML_DefaultHandler DefaultHandler.h "common/DefaultHandler.h" + * @class ACEXML_DefaultHandler DefaultHandler.h "ACEXML/common/DefaultHandler.h" * * @brief ACEXML_DefaultHandler * @@ -212,6 +212,6 @@ public: }; #if defined (__ACEXML_INLINE__) -# include "common/DefaultHandler.i" +# include "ACEXML/common/DefaultHandler.i" #endif /* __ACEXML_INLINE__ */ #endif /* ACEXML_DEFAULTHANDLER_H */ diff --git a/ACEXML/common/Element_Def_Builder.cpp b/ACEXML/common/Element_Def_Builder.cpp index 0063954c9e6..15be5e0feca 100644 --- a/ACEXML/common/Element_Def_Builder.cpp +++ b/ACEXML/common/Element_Def_Builder.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "common/Element_Def_Builder.h" +#include "ACEXML/common/Element_Def_Builder.h" ACEXML_Element_Def_Builder::~ACEXML_Element_Def_Builder () { diff --git a/ACEXML/common/Element_Def_Builder.h b/ACEXML/common/Element_Def_Builder.h index 187ab283423..7a16e19013f 100644 --- a/ACEXML/common/Element_Def_Builder.h +++ b/ACEXML/common/Element_Def_Builder.h @@ -13,8 +13,8 @@ #define _ACEXML_ELEMENT_DEF_BUILDER_H_ #include "ace/Auto_Ptr.h" -#include "common/XML_Types.h" -#include "common/Env.h" +#include "ACEXML/common/XML_Types.h" +#include "ACEXML/common/Env.h" /** * @ class ACEXML_Element_Def_Builder Element_Def_Builder.h "common/Element_Def_Builder.h" diff --git a/ACEXML/common/EntityResolver.h b/ACEXML/common/EntityResolver.h index 913228e2ca0..f90bacb9fc6 100644 --- a/ACEXML/common/EntityResolver.h +++ b/ACEXML/common/EntityResolver.h @@ -12,11 +12,11 @@ #ifndef _ACEXML_ENTITYHANDLER_H_ #define _ACEXML_ENTITYHANDLER_H_ -#include "common/Env.h" -#include "common/InputSource.h" +#include "ACEXML/common/Env.h" +#include "ACEXML/common/InputSource.h" /** - * @class ACEXML_EntityResolver EntityResolver.h "common/EntityResolver.h" + * @class ACEXML_EntityResolver EntityResolver.h "ACEXML/common/EntityResolver.h" * * @brief ACEXML_EntityResolver * diff --git a/ACEXML/common/Env.cpp b/ACEXML/common/Env.cpp index 412996d8bef..9629666da18 100644 --- a/ACEXML/common/Env.cpp +++ b/ACEXML/common/Env.cpp @@ -1,9 +1,9 @@ // -*- C++ -*- $Id$ -#include "common/Env.h" +#include "ACEXML/common/Env.h" #if !defined (__ACEXML_INLINE__) -# include "common/Env.i" +# include "ACEXML/common/Env.i" #endif /* __ACEXML_INLINE__ */ ACEXML_Env::ACEXML_Env (void) diff --git a/ACEXML/common/Env.h b/ACEXML/common/Env.h index 23d1aae4474..e1d2f15addf 100644 --- a/ACEXML/common/Env.h +++ b/ACEXML/common/Env.h @@ -12,10 +12,10 @@ #ifndef _ACEXML_ENV_H_ #define _ACEXML_ENV_H_ -#include "common/Exception.h" +#include "ACEXML/common/Exception.h" /** - * @class ACEXML_Env Env.h "common/Env.h" + * @class ACEXML_Env Env.h "ACEXML/common/Env.h" * * @brief ACEXML_Env * @@ -62,6 +62,6 @@ private: #define ACEXML_CHECK_RETURN(VAL) if (xmlenv.exception ()) return VAL; #if defined (__ACEXML_INLINE__) -# include "common/Env.i" +# include "ACEXML/common/Env.i" #endif /* __ACEXML_INLINE__ */ #endif /* _ACEXML_ENV_H_ */ diff --git a/ACEXML/common/ErrorHandler.h b/ACEXML/common/ErrorHandler.h index 06ddd8408e9..784419b108c 100644 --- a/ACEXML/common/ErrorHandler.h +++ b/ACEXML/common/ErrorHandler.h @@ -12,11 +12,11 @@ #ifndef _ACEXML_ERRORHANDLER_H_ #define _ACEXML_ERRORHANDLER_H_ -#include "common/Env.h" -#include "common/SAXExceptions.h" +#include "ACEXML/common/Env.h" +#include "ACEXML/common/SAXExceptions.h" /** - * @class ACEXML_ErrorHandler ErrorHandler.h "common/ErrorHandler.h" + * @class ACEXML_ErrorHandler ErrorHandler.h "ACEXML/common/ErrorHandler.h" * * @brief ACEXML_ErrorHandler * diff --git a/ACEXML/common/Exception.cpp b/ACEXML/common/Exception.cpp index ee64ef44e1d..f744ab11d53 100644 --- a/ACEXML/common/Exception.cpp +++ b/ACEXML/common/Exception.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- $Id$ -#include "common/Exception.h" +#include "ACEXML/common/Exception.h" #include "ace/Log_Msg.h" #include "ace/ACE.h" @@ -14,7 +14,7 @@ static const ACEXML_Char ACEXML_Exception_null [] = {0}; const ACEXML_Char *ACEXML_Exception::null_ = ACEXML_Exception_null; #if !defined (__ACEXML_INLINE__) -# include "common/Exception.i" +# include "ACEXML/common/Exception.i" #endif /* __ACEXML_INLINE__ */ ACEXML_Exception::ACEXML_Exception (void) diff --git a/ACEXML/common/Exception.h b/ACEXML/common/Exception.h index 7f285ff3688..c1bb4e702a8 100644 --- a/ACEXML/common/Exception.h +++ b/ACEXML/common/Exception.h @@ -13,10 +13,10 @@ #ifndef _ACEXML_EXCEPTION_H_ #define _ACEXML_EXCEPTION_H_ -#include "common/XML_Types.h" +#include "ACEXML/common/XML_Types.h" /** - * @class ACEXML_Exception Exception.h "common/Exception.h" + * @class ACEXML_Exception Exception.h "ACEXML/common/Exception.h" * * @brief ACEXML_Exception * @@ -64,6 +64,6 @@ protected: }; #if defined (__ACEXML_INLINE__) -# include "common/Exception.i" +# include "ACEXML/common/Exception.i" #endif /* __ACEXML_INLINE__ */ #endif /* _ACEXML_EXCEPTION_H_ */ diff --git a/ACEXML/common/FileCharStream.cpp b/ACEXML/common/FileCharStream.cpp index ac64e5b9ff9..f24aabc16ea 100644 --- a/ACEXML/common/FileCharStream.cpp +++ b/ACEXML/common/FileCharStream.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "common/FileCharStream.h" +#include "ACEXML/common/FileCharStream.h" #include "ace/ACE.h" ACEXML_FileCharStream::ACEXML_FileCharStream (void) diff --git a/ACEXML/common/FileCharStream.h b/ACEXML/common/FileCharStream.h index e9edfa1b33d..3a2d8219bc3 100644 --- a/ACEXML/common/FileCharStream.h +++ b/ACEXML/common/FileCharStream.h @@ -13,11 +13,11 @@ #ifndef _ACEXML_FILECHARSTREAM_H_ #define _ACEXML_FILECHARSTREAM_H_ -#include "common/CharStream.h" +#include "ACEXML/common/CharStream.h" #include "ace/streams.h" /** - * @class ACEXML_FileCharStream FileCharStream.h "common/FileCharStream.h" + * @class ACEXML_FileCharStream FileCharStream.h "ACEXML/common/FileCharStream.h" * * An implementation of ACEXML_CharStream for reading * input from a file. diff --git a/ACEXML/common/InputSource.cpp b/ACEXML/common/InputSource.cpp index 1d7035a3f2c..e7c02e85b90 100644 --- a/ACEXML/common/InputSource.cpp +++ b/ACEXML/common/InputSource.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- $Id$ -#include "common/InputSource.h" +#include "ACEXML/common/InputSource.h" #include "ace/ACE.h" ACEXML_InputSource::ACEXML_InputSource (void) diff --git a/ACEXML/common/InputSource.h b/ACEXML/common/InputSource.h index 62ab76c6854..50e5930d229 100644 --- a/ACEXML/common/InputSource.h +++ b/ACEXML/common/InputSource.h @@ -13,10 +13,10 @@ #ifndef _ACEXML_INPUTSOURCE_H_ #define _ACEXML_INPUTSOURCE_H_ -#include "common/CharStream.h" +#include "ACEXML/common/CharStream.h" /** - * @class ACEXML_InputSource InputSource.h "common/InputSource.h" + * @class ACEXML_InputSource InputSource.h "ACEXML/common/InputSource.h" * * @brief ACEXML_InputSource encapsulates the actual input stream with some * added information. diff --git a/ACEXML/common/Locator.h b/ACEXML/common/Locator.h index 91dd7ef29c6..67bbd446e8c 100644 --- a/ACEXML/common/Locator.h +++ b/ACEXML/common/Locator.h @@ -13,10 +13,10 @@ #ifndef _ACEXML_LOCATOR_H_ #define _ACEXML_LOCATOR_H_ -#include "common/XML_Types.h" +#include "ACEXML/common/XML_Types.h" /** - * @class ACEXML_Locator Locator.h "common/Locator.h" + * @class ACEXML_Locator Locator.h "ACEXML/common/Locator.h" * * @brief ACEXML_Locator defines operations that an XML locator should support. * diff --git a/ACEXML/common/LocatorImpl.cpp b/ACEXML/common/LocatorImpl.cpp index de715a44a0d..a51df409c60 100644 --- a/ACEXML/common/LocatorImpl.cpp +++ b/ACEXML/common/LocatorImpl.cpp @@ -1,9 +1,9 @@ // -*- C++ -*- $Id$ -#include "common/LocatorImpl.h" +#include "ACEXML/common/LocatorImpl.h" #if !defined (__ACEXML_INLINE__) -# include "common/LocatorImpl.i" +# include "ACEXML/common/LocatorImpl.i" #endif /* __ACEXML_INLINE__ */ ACEXML_LocatorImpl::ACEXML_LocatorImpl (void) diff --git a/ACEXML/common/LocatorImpl.h b/ACEXML/common/LocatorImpl.h index 404457ffaeb..a3af53c5a30 100644 --- a/ACEXML/common/LocatorImpl.h +++ b/ACEXML/common/LocatorImpl.h @@ -13,10 +13,10 @@ #ifndef ACEXML_LOCALTORIMPL_H #define ACEXML_LOCALTORIMPL_H -#include "common/Locator.h" +#include "ACEXML/common/Locator.h" /** - * @class ACEXML_LocatorImpl LocatorImpl.h "common/LocatorImpl.h" + * @class ACEXML_LocatorImpl LocatorImpl.h "ACEXML/common/LocatorImpl.h" * * @brief ACEXML_LocatorImpl is an implementation of ACEXML_Locator. * @@ -119,6 +119,6 @@ private: }; #if defined (__ACEXML_INLINE__) -# include "common/LocatorImpl.i" +# include "ACEXML/common/LocatorImpl.i" #endif /* __ACEXML_INLINE__ */ #endif /* ACEXML_LOCALTORIMPL_H */ diff --git a/ACEXML/common/Makefile b/ACEXML/common/Makefile index a116af1c4d5..85e52bedbc9 100644 --- a/ACEXML/common/Makefile +++ b/ACEXML/common/Makefile @@ -28,7 +28,6 @@ DEFS = $(addsuffix .h,$(FILES)) LSRC = $(addsuffix .cpp,$(FILES)) LIBS += $(ACELIB) -CCFLAGS += -I.. BUILD = $(VLIB) $(VSHLIB) diff --git a/ACEXML/common/NamespaceSupport.cpp b/ACEXML/common/NamespaceSupport.cpp index a1961829987..e6226ebace4 100644 --- a/ACEXML/common/NamespaceSupport.cpp +++ b/ACEXML/common/NamespaceSupport.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- $Id$ -#include "common/NamespaceSupport.h" +#include "ACEXML/common/NamespaceSupport.h" static const ACEXML_Char ACEXML_XMLNS_PREFIX_name[] = {'x', 'm', 'l', 'n', 's', 0}; const ACEXML_Char *ACEXML_NamespaceSupport::XMLNS_PREFIX = ACEXML_XMLNS_PREFIX_name; @@ -20,7 +20,7 @@ static const ACEXML_Char ACEXML_XMLNS_URI_name[] = { const ACEXML_Char *ACEXML_NamespaceSupport::XMLNS = ACEXML_XMLNS_URI_name; #if !defined (__ACEXML_INLINE__) -# include "common/NamespaceSupport.i" +# include "ACEXML/common/NamespaceSupport.i" #endif /* __ACEXML_INLINE__ */ ACEXML_Namespace_Context_Stack::ACEXML_Namespace_Context_Stack (void) diff --git a/ACEXML/common/NamespaceSupport.h b/ACEXML/common/NamespaceSupport.h index b712b063c94..b511b2ac6bc 100644 --- a/ACEXML/common/NamespaceSupport.h +++ b/ACEXML/common/NamespaceSupport.h @@ -13,7 +13,7 @@ #ifndef ACEXML_NAMESPACESUPPORT_H #define ACEXML_NAMESPACESUPPORT_H -#include "common/XML_Types.h" +#include "ACEXML/common/XML_Types.h" #include "ace/Functor.h" #include "ace/Hash_Map_Manager.h" #include "ace/Containers_T.h" @@ -42,7 +42,7 @@ typedef ACE_Hash_Map_Reverse_Iterator_Ex<ACEXML_String, typedef ACE_Unbounded_Queue<const ACEXML_Char *> ACEXML_STR_LIST; /** - * @class ACEXML_Namespace_Context_Stack NamespaceSupport.h "common/NamespaceSupport.h" + * @class ACEXML_Namespace_Context_Stack NamespaceSupport.h "ACEXML/common/NamespaceSupport.h" * * @brief ACEXML_Namespace_Context_Stack implements a simple stack * that ACEXML_NamespaceSupport uses to keep track of namespace scopes. @@ -76,7 +76,7 @@ private: }; /** - * @class ACEXML_NamespaceSupport NamespaceSupport.h "common/NamespaceSupport.h" + * @class ACEXML_NamespaceSupport NamespaceSupport.h "ACEXML/common/NamespaceSupport.h" * * @brief ACEXML_NamespaceSupport provides namespace management * operation for an XML parser. @@ -223,6 +223,6 @@ private: #if defined (__ACEXML_INLINE__) -# include "common/NamespaceSupport.i" +# include "ACEXML/common/NamespaceSupport.i" #endif /* __ACEXML_INLINE__ */ #endif /* ACEXML_NAMESPACESUPPORT_H */ diff --git a/ACEXML/common/SAXExceptions.cpp b/ACEXML/common/SAXExceptions.cpp index 3a7c3f72a47..97c57ec5bbe 100644 --- a/ACEXML/common/SAXExceptions.cpp +++ b/ACEXML/common/SAXExceptions.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- $Id$ -#include "common/SAXExceptions.h" +#include "ACEXML/common/SAXExceptions.h" #include "ace/Log_Msg.h" #include "ace/ACE.h" @@ -34,7 +34,7 @@ static const ACEXML_Char ACEXML_SAXParseException_name[] = { const ACEXML_Char *ACEXML_SAXParseException::exception_name_ = ACEXML_SAXParseException_name; #if !defined (__ACEXML_INLINE__) -# include "common/SAXExceptions.i" +# include "ACEXML/common/SAXExceptions.i" #endif /* __ACEXML_INLINE__ */ ACEXML_SAXException::ACEXML_SAXException (void) diff --git a/ACEXML/common/SAXExceptions.h b/ACEXML/common/SAXExceptions.h index 8cf909befda..ca24deeb0cd 100644 --- a/ACEXML/common/SAXExceptions.h +++ b/ACEXML/common/SAXExceptions.h @@ -13,10 +13,10 @@ #ifndef _ACEXML_SAXEXCEPTIONS_H_ #define _ACEXML_SAXEXCEPTIONS_H_ -#include "common/Exception.h" +#include "ACEXML/common/Exception.h" /** - * @class ACEXML_SAXException SAXExceptions.h "common/SAXExceptions.h" + * @class ACEXML_SAXException SAXExceptions.h "ACEXML/common/SAXExceptions.h" * * @brief ACEXML_SAXException * @@ -58,7 +58,7 @@ protected: }; /** - * @class ACEXML_SAXNotSupportedException SAXExceptions.h "common/SAXExceptions.h" + * @class ACEXML_SAXNotSupportedException SAXExceptions.h "ACEXML/common/SAXExceptions.h" * * @brief ACEXML_SAXNotSupportedException */ @@ -90,7 +90,7 @@ protected: }; /** - * @class ACEXML_SAXNotRecognizedException SAXExceptions.h "common/SAXExceptions.h" + * @class ACEXML_SAXNotRecognizedException SAXExceptions.h "ACEXML/common/SAXExceptions.h" * * @brief ACEXML_SAXNotRecognizedException */ @@ -125,7 +125,7 @@ protected: }; /** - * @class ACEXML_SAXParseException SAXExceptions.h "common/SAXExceptions.h" + * @class ACEXML_SAXParseException SAXExceptions.h "ACEXML/common/SAXExceptions.h" * * @brief ACEXML_SAXParseException * @@ -163,6 +163,6 @@ protected: }; #if defined (__ACEXML_INLINE__) -# include "common/SAXExceptions.i" +# include "ACEXML/common/SAXExceptions.i" #endif /* __ACEXML_INLINE__ */ #endif /* _ACEXML_SAXEXCEPTIONS_H_ */ diff --git a/ACEXML/common/Transcode.cpp b/ACEXML/common/Transcode.cpp index 8d767eb9e3d..4007d346494 100644 --- a/ACEXML/common/Transcode.cpp +++ b/ACEXML/common/Transcode.cpp @@ -1,9 +1,9 @@ // -*- C++ -*- $Id$ -#include "common/Transcode.h" +#include "ACEXML/common/Transcode.h" #if !defined (__ACEXML_INLINE__) -# include "common/Transcode.i" +# include "ACEXML/common/Transcode.i" #endif /* __ACEXML_INLINE__ */ int diff --git a/ACEXML/common/Transcode.h b/ACEXML/common/Transcode.h index cbbd34abb23..113a2880602 100644 --- a/ACEXML/common/Transcode.h +++ b/ACEXML/common/Transcode.h @@ -15,10 +15,10 @@ #ifndef _ACEXML_TRANSCODE_H_ #define _ACEXML_TRANSCODE_H_ -#include "common/XML_Types.h" +#include "ACEXML/common/XML_Types.h" /** - * @class ACEXML_Transcoder Transcode.h "common/Transcode.h" + * @class ACEXML_Transcoder Transcode.h "ACEXML/common/Transcode.h" * * @brief ACEXML_Transcoder * @@ -160,6 +160,6 @@ public: }; #if defined (__ACEXML_INLINE__) -# include "common/Transcode.i" +# include "ACEXML/common/Transcode.i" #endif /* __ACEXML_INLINE__ */ #endif /* _ACEXML_TRANSCODE_H_ */ diff --git a/ACEXML/common/Validator.cpp b/ACEXML/common/Validator.cpp index 7e6d4c1e847..cf3ce502200 100644 --- a/ACEXML/common/Validator.cpp +++ b/ACEXML/common/Validator.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "common/Validator.h" +#include "ACEXML/common/Validator.h" ACEXML_Validator::~ACEXML_Validator () { diff --git a/ACEXML/common/Validator.h b/ACEXML/common/Validator.h index 6e65043f8a4..32dd6f1db01 100644 --- a/ACEXML/common/Validator.h +++ b/ACEXML/common/Validator.h @@ -12,8 +12,8 @@ #ifndef _ACEXML_VALIDATOR_H_ #define _ACEXML_VALIDATOR_H_ -#include "common/Attributes.h" -#include "common/Env.h" +#include "ACEXML/common/Attributes.h" +#include "ACEXML/common/Env.h" /** * @ class ACEXML_Validator Validator.h "common/Validator.h" diff --git a/ACEXML/common/XMLFilter.h b/ACEXML/common/XMLFilter.h index da09fa723ac..ab3f8b5f3a2 100644 --- a/ACEXML/common/XMLFilter.h +++ b/ACEXML/common/XMLFilter.h @@ -12,10 +12,10 @@ #ifndef _ACEXML_XMLFILTER_H_ #define _ACEXML_XMLFILTER_H_ -#include "common/XMLReader.h" +#include "ACEXML/common/XMLReader.h" /** - * @class ACEXML_XMLFilter XMLFilter.h "common/XMLFilter.h" + * @class ACEXML_XMLFilter XMLFilter.h "ACEXML/common/XMLFilter.h" * * @brief ACEXML_XMLFilter * diff --git a/ACEXML/common/XMLFilterImpl.cpp b/ACEXML/common/XMLFilterImpl.cpp index e577ee748ce..c1b70a2cad1 100644 --- a/ACEXML/common/XMLFilterImpl.cpp +++ b/ACEXML/common/XMLFilterImpl.cpp @@ -1,9 +1,9 @@ // -*- C++ -*- $Id$ -#include "common/XMLFilterImpl.h" +#include "ACEXML/common/XMLFilterImpl.h" #if !defined (__ACEXML_INLINE__) -# include "common/XMLFilterImpl.i" +# include "ACEXML/common/XMLFilterImpl.i" #endif /* __ACEXML_INLINE__ */ ACEXML_XMLFilterImpl::ACEXML_XMLFilterImpl (void) diff --git a/ACEXML/common/XMLFilterImpl.h b/ACEXML/common/XMLFilterImpl.h index 16429e51146..1a87344687e 100644 --- a/ACEXML/common/XMLFilterImpl.h +++ b/ACEXML/common/XMLFilterImpl.h @@ -12,16 +12,16 @@ #ifndef ACEXML_XMLFILTERIMPL_H #define ACEXML_XMLFILTERIMPL_H -#include "common/XMLFilter.h" -#include "common/XMLReader.h" -#include "common/Locator.h" -#include "common/ContentHandler.h" -#include "common/DTDHandler.h" -#include "common/EntityResolver.h" -#include "common/ErrorHandler.h" +#include "ACEXML/common/XMLFilter.h" +#include "ACEXML/common/XMLReader.h" +#include "ACEXML/common/Locator.h" +#include "ACEXML/common/ContentHandler.h" +#include "ACEXML/common/DTDHandler.h" +#include "ACEXML/common/EntityResolver.h" +#include "ACEXML/common/ErrorHandler.h" /** - * @class ACEXML_XMLFilterImpl XMLFilterImpl.h "common/XMLFilterImpl.h" + * @class ACEXML_XMLFilterImpl XMLFilterImpl.h "ACEXML/common/XMLFilterImpl.h" * * @brief ACEXML_XMLFilterImpl * @@ -328,6 +328,6 @@ private: }; #if defined (__ACEXML_INLINE__) -# include "common/XMLFilterImpl.i" +# include "ACEXML/common/XMLFilterImpl.i" #endif /* __ACEXML_INLINE__ */ #endif /* ACEXML_XMLFILTERIMPL_H */ diff --git a/ACEXML/common/XMLReader.h b/ACEXML/common/XMLReader.h index 9586c9a3484..41332ca292f 100644 --- a/ACEXML/common/XMLReader.h +++ b/ACEXML/common/XMLReader.h @@ -12,13 +12,13 @@ #ifndef _ACEXML_XMLREADER_H_ #define _ACEXML_XMLREADER_H_ -#include "common/ContentHandler.h" -#include "common/DTDHandler.h" -#include "common/EntityResolver.h" -#include "common/ErrorHandler.h" +#include "ACEXML/common/ContentHandler.h" +#include "ACEXML/common/DTDHandler.h" +#include "ACEXML/common/EntityResolver.h" +#include "ACEXML/common/ErrorHandler.h" /** - * @class ACEXML_XMLReader XMLReader.h "common/XMLReader.h" + * @class ACEXML_XMLReader XMLReader.h "ACEXML/common/XMLReader.h" * * @brief ACEXML_XMLReader * diff --git a/ACEXML/common/XML_Types.h b/ACEXML/common/XML_Types.h index bcb5edc6e21..7c57eac0387 100644 --- a/ACEXML/common/XML_Types.h +++ b/ACEXML/common/XML_Types.h @@ -17,7 +17,7 @@ # define _ACEXML_XML_TYPES_H_ # include "ace/OS.h" # include "ace/SString.h" -# include "common/ACEXML_Export.h" +# include "ACEXML/common/ACEXML_Export.h" # if defined (ACE_HAS_WCHAR) && (ACE_SIZEOF_WCHAR == 2) typedef wchar_t ACEXML_UTF16; diff --git a/ACEXML/examples/SAXPrint/Makefile b/ACEXML/examples/SAXPrint/Makefile index 0d7fbe4ebb3..6cdfedee060 100644 --- a/ACEXML/examples/SAXPrint/Makefile +++ b/ACEXML/examples/SAXPrint/Makefile @@ -14,7 +14,6 @@ FILES = Print_Handler \ SRC = $(addsuffix .cpp,$(FILES)) OBJ = $(LSRC:%.cpp=$(VDIR)%.o) -CCFLAGS += -I../.. BIN = main diff --git a/ACEXML/examples/SAXPrint/Print_Handler.h b/ACEXML/examples/SAXPrint/Print_Handler.h index a9608c6b322..a2eec1400e3 100644 --- a/ACEXML/examples/SAXPrint/Print_Handler.h +++ b/ACEXML/examples/SAXPrint/Print_Handler.h @@ -13,7 +13,7 @@ #ifndef ACEXML_PRINT_HANDLER_H #define ACEXML_PRINT_HANDLER_H -#include "common/DefaultHandler.h" +#include "ACEXML/common/DefaultHandler.h" /** * @class ACEXML_Print_Handler diff --git a/ACEXML/examples/SAXPrint/SAXPrint_Handler.h b/ACEXML/examples/SAXPrint/SAXPrint_Handler.h index 90fd8e9f113..9a80eb16973 100644 --- a/ACEXML/examples/SAXPrint/SAXPrint_Handler.h +++ b/ACEXML/examples/SAXPrint/SAXPrint_Handler.h @@ -13,7 +13,7 @@ #ifndef ACEXML_SAXPRINT_HANDLER_H #define ACEXML_SAXPRINT_HANDLER_H -#include "common/DefaultHandler.h" +#include "ACEXML/common/DefaultHandler.h" /** * @class ACEXML_SAXPrint_Handler diff --git a/ACEXML/examples/SAXPrint/main.cpp b/ACEXML/examples/SAXPrint/main.cpp index 5eeafef2c43..47dea304662 100644 --- a/ACEXML/examples/SAXPrint/main.cpp +++ b/ACEXML/examples/SAXPrint/main.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "common/FileCharStream.h" -#include "parser/parser/Parser.h" +#include "ACEXML/common/FileCharStream.h" +#include "ACEXML/parser/parser/Parser.h" #include "Print_Handler.h" #include "SAXPrint_Handler.h" 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_ */ diff --git a/ACEXML/tests/Makefile b/ACEXML/tests/Makefile index 6478b548721..e172c04c626 100644 --- a/ACEXML/tests/Makefile +++ b/ACEXML/tests/Makefile @@ -15,7 +15,6 @@ BIN = Transcoder_Test \ LSRC = $(addsuffix .cpp,$(BIN)) LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) #SHOBJ = $(addsuffix .so,$(BIN)) -CCFLAGS += -I.. BUILD = $(VBIN) diff --git a/ACEXML/tests/NamespaceSupport_Test.cpp b/ACEXML/tests/NamespaceSupport_Test.cpp index 9f3ed5db203..45509b21053 100644 --- a/ACEXML/tests/NamespaceSupport_Test.cpp +++ b/ACEXML/tests/NamespaceSupport_Test.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "common/NamespaceSupport.h" +#include "ACEXML/common/NamespaceSupport.h" int main (int, ACE_TCHAR *[]) { diff --git a/ACEXML/tests/Transcoder_Test.cpp b/ACEXML/tests/Transcoder_Test.cpp index 1f7e113a93a..ff66804b309 100644 --- a/ACEXML/tests/Transcoder_Test.cpp +++ b/ACEXML/tests/Transcoder_Test.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- $Id$ -#include "common/Transcode.h" +#include "ACEXML/common/Transcode.h" #include "ace/Log_Msg.h" void dump_utf16 (const ACEXML_UTF16 *data, diff --git a/ChangeLog b/ChangeLog index 16a38e7f8ac..6caa37c0692 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,74 @@ +Thu Feb 14 00:20:39 2002 Nanbor Wang <nanbor@cs.wustl.edu> + + * Makefile: + * Makefile.bor: + * ACEXML/common/Attributes.h: + * ACEXML/common/AttributesImpl.cpp: + * ACEXML/common/AttributesImpl.h: + * ACEXML/common/Attributes_Def_Builder.cpp: + * ACEXML/common/Attributes_Def_Builder.h: + * ACEXML/common/CharStream.cpp: + * ACEXML/common/CharStream.h: + * ACEXML/common/ContentHandler.h: + * ACEXML/common/DTDHandler.h: + * ACEXML/common/DTD_Manager.cpp: + * ACEXML/common/DTD_Manager.h: + * ACEXML/common/DefaultHandler.cpp: + * ACEXML/common/DefaultHandler.h: + * ACEXML/common/Element_Def_Builder.cpp: + * ACEXML/common/Element_Def_Builder.h: + * ACEXML/common/EntityResolver.h: + * ACEXML/common/Env.cpp: + * ACEXML/common/Env.h: + * ACEXML/common/ErrorHandler.h: + * ACEXML/common/Exception.cpp: + * ACEXML/common/Exception.h: + * ACEXML/common/FileCharStream.cpp: + * ACEXML/common/FileCharStream.h: + * ACEXML/common/InputSource.cpp: + * ACEXML/common/InputSource.h: + * ACEXML/common/Locator.h: + * ACEXML/common/LocatorImpl.cpp: + * ACEXML/common/LocatorImpl.h: + * ACEXML/common/Makefile: + * ACEXML/common/NamespaceSupport.cpp: + * ACEXML/common/NamespaceSupport.h: + * ACEXML/common/SAXExceptions.cpp: + * ACEXML/common/SAXExceptions.h: + * ACEXML/common/Transcode.cpp: + * ACEXML/common/Transcode.h: + * ACEXML/common/Validator.cpp: + * ACEXML/common/Validator.h: + * ACEXML/common/XMLFilter.h: + * ACEXML/common/XMLFilterImpl.cpp: + * ACEXML/common/XMLFilterImpl.h: + * ACEXML/common/XMLReader.h: + * ACEXML/common/XML_Types.h: + * ACEXML/examples/SAXPrint/Makefile: + * ACEXML/examples/SAXPrint/Print_Handler.h: + * ACEXML/examples/SAXPrint/SAXPrint_Handler.h: + * ACEXML/examples/SAXPrint/main.cpp: + * ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp: + * ACEXML/parser/debug_validator/Debug_Attributes_Builder.h: + * ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp: + * ACEXML/parser/debug_validator/Debug_DTD_Manager.h: + * ACEXML/parser/debug_validator/Debug_Element_Builder.cpp: + * ACEXML/parser/debug_validator/Debug_Element_Builder.h: + * ACEXML/parser/debug_validator/Element_Tree.cpp: + * ACEXML/parser/debug_validator/Element_Tree.h: + * ACEXML/parser/parser/Entity_Manager.cpp: + * ACEXML/parser/parser/Entity_Manager.h: + * ACEXML/parser/parser/Makefile: + * ACEXML/parser/parser/Parser.cpp: + * ACEXML/parser/parser/Parser.h: + * ACEXML/tests/Makefile: + * ACEXML/tests/NamespaceSupport_Test.cpp: + * ACEXML/tests/Transcoder_Test.cpp: + * etc/acexml.doxygen: Renamed directory XML to ACEXML and moved the + base directory to include XML related files to $(ACE_ROOT). + Thanks to Johnny Tucker <jtucker@magisnetworks.com> for the + suggestion. + Wed Feb 13 20:13:54 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> * ace/Strategies_T.cpp (make_svc_handler): Make sure that the @@ -12,10 +83,10 @@ Wed Feb 13 17:42:32 2002 Balachandran Natarajan <bala@cs.wustl.edu> Wed Feb 13 12:45:06 2002 Balachandran Natarajan <bala@cs.wustl.edu> - * ace/Configuration.cpp: + * ace/Configuration.cpp: * tests/Config_Test.cpp (iniCompare): Fixed memory leaks. Thanks - to Johnny willemson for providing the patches. - + to Johnny willemson for providing the patches. + Wed Feb 13 11:46:54 2002 Nanbor Wang <nanbor@cs.wustl.edu> * XML/parser/parser/Makefile: Added a library (-lACEXML) to link diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 16a38e7f8ac..6caa37c0692 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,74 @@ +Thu Feb 14 00:20:39 2002 Nanbor Wang <nanbor@cs.wustl.edu> + + * Makefile: + * Makefile.bor: + * ACEXML/common/Attributes.h: + * ACEXML/common/AttributesImpl.cpp: + * ACEXML/common/AttributesImpl.h: + * ACEXML/common/Attributes_Def_Builder.cpp: + * ACEXML/common/Attributes_Def_Builder.h: + * ACEXML/common/CharStream.cpp: + * ACEXML/common/CharStream.h: + * ACEXML/common/ContentHandler.h: + * ACEXML/common/DTDHandler.h: + * ACEXML/common/DTD_Manager.cpp: + * ACEXML/common/DTD_Manager.h: + * ACEXML/common/DefaultHandler.cpp: + * ACEXML/common/DefaultHandler.h: + * ACEXML/common/Element_Def_Builder.cpp: + * ACEXML/common/Element_Def_Builder.h: + * ACEXML/common/EntityResolver.h: + * ACEXML/common/Env.cpp: + * ACEXML/common/Env.h: + * ACEXML/common/ErrorHandler.h: + * ACEXML/common/Exception.cpp: + * ACEXML/common/Exception.h: + * ACEXML/common/FileCharStream.cpp: + * ACEXML/common/FileCharStream.h: + * ACEXML/common/InputSource.cpp: + * ACEXML/common/InputSource.h: + * ACEXML/common/Locator.h: + * ACEXML/common/LocatorImpl.cpp: + * ACEXML/common/LocatorImpl.h: + * ACEXML/common/Makefile: + * ACEXML/common/NamespaceSupport.cpp: + * ACEXML/common/NamespaceSupport.h: + * ACEXML/common/SAXExceptions.cpp: + * ACEXML/common/SAXExceptions.h: + * ACEXML/common/Transcode.cpp: + * ACEXML/common/Transcode.h: + * ACEXML/common/Validator.cpp: + * ACEXML/common/Validator.h: + * ACEXML/common/XMLFilter.h: + * ACEXML/common/XMLFilterImpl.cpp: + * ACEXML/common/XMLFilterImpl.h: + * ACEXML/common/XMLReader.h: + * ACEXML/common/XML_Types.h: + * ACEXML/examples/SAXPrint/Makefile: + * ACEXML/examples/SAXPrint/Print_Handler.h: + * ACEXML/examples/SAXPrint/SAXPrint_Handler.h: + * ACEXML/examples/SAXPrint/main.cpp: + * ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp: + * ACEXML/parser/debug_validator/Debug_Attributes_Builder.h: + * ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp: + * ACEXML/parser/debug_validator/Debug_DTD_Manager.h: + * ACEXML/parser/debug_validator/Debug_Element_Builder.cpp: + * ACEXML/parser/debug_validator/Debug_Element_Builder.h: + * ACEXML/parser/debug_validator/Element_Tree.cpp: + * ACEXML/parser/debug_validator/Element_Tree.h: + * ACEXML/parser/parser/Entity_Manager.cpp: + * ACEXML/parser/parser/Entity_Manager.h: + * ACEXML/parser/parser/Makefile: + * ACEXML/parser/parser/Parser.cpp: + * ACEXML/parser/parser/Parser.h: + * ACEXML/tests/Makefile: + * ACEXML/tests/NamespaceSupport_Test.cpp: + * ACEXML/tests/Transcoder_Test.cpp: + * etc/acexml.doxygen: Renamed directory XML to ACEXML and moved the + base directory to include XML related files to $(ACE_ROOT). + Thanks to Johnny Tucker <jtucker@magisnetworks.com> for the + suggestion. + Wed Feb 13 20:13:54 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> * ace/Strategies_T.cpp (make_svc_handler): Make sure that the @@ -12,10 +83,10 @@ Wed Feb 13 17:42:32 2002 Balachandran Natarajan <bala@cs.wustl.edu> Wed Feb 13 12:45:06 2002 Balachandran Natarajan <bala@cs.wustl.edu> - * ace/Configuration.cpp: + * ace/Configuration.cpp: * tests/Config_Test.cpp (iniCompare): Fixed memory leaks. Thanks - to Johnny willemson for providing the patches. - + to Johnny willemson for providing the patches. + Wed Feb 13 11:46:54 2002 Nanbor Wang <nanbor@cs.wustl.edu> * XML/parser/parser/Makefile: Added a library (-lACEXML) to link diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 16a38e7f8ac..6caa37c0692 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,74 @@ +Thu Feb 14 00:20:39 2002 Nanbor Wang <nanbor@cs.wustl.edu> + + * Makefile: + * Makefile.bor: + * ACEXML/common/Attributes.h: + * ACEXML/common/AttributesImpl.cpp: + * ACEXML/common/AttributesImpl.h: + * ACEXML/common/Attributes_Def_Builder.cpp: + * ACEXML/common/Attributes_Def_Builder.h: + * ACEXML/common/CharStream.cpp: + * ACEXML/common/CharStream.h: + * ACEXML/common/ContentHandler.h: + * ACEXML/common/DTDHandler.h: + * ACEXML/common/DTD_Manager.cpp: + * ACEXML/common/DTD_Manager.h: + * ACEXML/common/DefaultHandler.cpp: + * ACEXML/common/DefaultHandler.h: + * ACEXML/common/Element_Def_Builder.cpp: + * ACEXML/common/Element_Def_Builder.h: + * ACEXML/common/EntityResolver.h: + * ACEXML/common/Env.cpp: + * ACEXML/common/Env.h: + * ACEXML/common/ErrorHandler.h: + * ACEXML/common/Exception.cpp: + * ACEXML/common/Exception.h: + * ACEXML/common/FileCharStream.cpp: + * ACEXML/common/FileCharStream.h: + * ACEXML/common/InputSource.cpp: + * ACEXML/common/InputSource.h: + * ACEXML/common/Locator.h: + * ACEXML/common/LocatorImpl.cpp: + * ACEXML/common/LocatorImpl.h: + * ACEXML/common/Makefile: + * ACEXML/common/NamespaceSupport.cpp: + * ACEXML/common/NamespaceSupport.h: + * ACEXML/common/SAXExceptions.cpp: + * ACEXML/common/SAXExceptions.h: + * ACEXML/common/Transcode.cpp: + * ACEXML/common/Transcode.h: + * ACEXML/common/Validator.cpp: + * ACEXML/common/Validator.h: + * ACEXML/common/XMLFilter.h: + * ACEXML/common/XMLFilterImpl.cpp: + * ACEXML/common/XMLFilterImpl.h: + * ACEXML/common/XMLReader.h: + * ACEXML/common/XML_Types.h: + * ACEXML/examples/SAXPrint/Makefile: + * ACEXML/examples/SAXPrint/Print_Handler.h: + * ACEXML/examples/SAXPrint/SAXPrint_Handler.h: + * ACEXML/examples/SAXPrint/main.cpp: + * ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp: + * ACEXML/parser/debug_validator/Debug_Attributes_Builder.h: + * ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp: + * ACEXML/parser/debug_validator/Debug_DTD_Manager.h: + * ACEXML/parser/debug_validator/Debug_Element_Builder.cpp: + * ACEXML/parser/debug_validator/Debug_Element_Builder.h: + * ACEXML/parser/debug_validator/Element_Tree.cpp: + * ACEXML/parser/debug_validator/Element_Tree.h: + * ACEXML/parser/parser/Entity_Manager.cpp: + * ACEXML/parser/parser/Entity_Manager.h: + * ACEXML/parser/parser/Makefile: + * ACEXML/parser/parser/Parser.cpp: + * ACEXML/parser/parser/Parser.h: + * ACEXML/tests/Makefile: + * ACEXML/tests/NamespaceSupport_Test.cpp: + * ACEXML/tests/Transcoder_Test.cpp: + * etc/acexml.doxygen: Renamed directory XML to ACEXML and moved the + base directory to include XML related files to $(ACE_ROOT). + Thanks to Johnny Tucker <jtucker@magisnetworks.com> for the + suggestion. + Wed Feb 13 20:13:54 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> * ace/Strategies_T.cpp (make_svc_handler): Make sure that the @@ -12,10 +83,10 @@ Wed Feb 13 17:42:32 2002 Balachandran Natarajan <bala@cs.wustl.edu> Wed Feb 13 12:45:06 2002 Balachandran Natarajan <bala@cs.wustl.edu> - * ace/Configuration.cpp: + * ace/Configuration.cpp: * tests/Config_Test.cpp (iniCompare): Fixed memory leaks. Thanks - to Johnny willemson for providing the patches. - + to Johnny willemson for providing the patches. + Wed Feb 13 11:46:54 2002 Nanbor Wang <nanbor@cs.wustl.edu> * XML/parser/parser/Makefile: Added a library (-lACEXML) to link @@ -22,7 +22,7 @@ DIRS = ace \ examples \ performance-tests \ websvcs \ - XML + ACEXML CLONE = Makefile \ ace \ @@ -36,7 +36,7 @@ CLONE = Makefile \ TAO \ tests \ websvcs \ - XML \ + ACEXML \ PACE #---------------------------------------------------------------------------- @@ -136,7 +136,7 @@ CONTROLLED_FILES = \ THANKS \ TODO \ VERSION \ - XML \ + ACEXML \ acconfig.h \ ace \ ace-config.1.in \ diff --git a/Makefile.bor b/Makefile.bor index 93d607be51b..81598db9af1 100644 --- a/Makefile.bor +++ b/Makefile.bor @@ -7,7 +7,7 @@ DIRS = \ examples \ performance-tests \ tests \ - XML \ - XML\tests + ACEXML \ + ACEXML\tests !include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/etc/acexml.doxygen b/etc/acexml.doxygen index c0bcee12b2e..286fb7abf9f 100644 --- a/etc/acexml.doxygen +++ b/etc/acexml.doxygen @@ -47,7 +47,7 @@ WARN_FORMAT = "$file:$line: $text" # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = XML +INPUT = ACEXML FILE_PATTERNS = *.cpp *.h *.i *.inl *.txt RECURSIVE = YES EXCLUDE = @@ -128,7 +128,7 @@ EXPAND_AS_DEFINED = ACE_RCSID \ #--------------------------------------------------------------------------- TAGFILES = html/ace/ACE.tag=.. -GENERATE_TAGFILE = html/xml/ACEXML.tag +GENERATE_TAGFILE = html/acexml/ACEXML.tag ALLEXTERNALS = NO PERL_PATH = /usr/bin/perl |