diff --git a/src/xercesc/dom/deprecated/AttrImpl.cpp b/src/xercesc/dom/deprecated/AttrImpl.cpp
index 989f17542a8e5cb39dd5192031371d6320dc9c12..c30cd2ab953d157644af19d3e6a23c1373a300b5 100644
--- a/src/xercesc/dom/deprecated/AttrImpl.cpp
+++ b/src/xercesc/dom/deprecated/AttrImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/AttrImpl.hpp b/src/xercesc/dom/deprecated/AttrImpl.hpp
index 2c5a4c9299ad3ba3f8402db73b7ed77a3538481c..f67fb475bd9d569fdb19ee9570d062f7d17c8d03 100644
--- a/src/xercesc/dom/deprecated/AttrImpl.hpp
+++ b/src/xercesc/dom/deprecated/AttrImpl.hpp
@@ -4,7 +4,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -131,7 +131,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/AttrMapImpl.cpp b/src/xercesc/dom/deprecated/AttrMapImpl.cpp
index 17b756af7f29290000b4f1924a63b24254f4d378..3c267977315659ff50d2ce6978edea45f7949853 100644
--- a/src/xercesc/dom/deprecated/AttrMapImpl.cpp
+++ b/src/xercesc/dom/deprecated/AttrMapImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/AttrMapImpl.hpp b/src/xercesc/dom/deprecated/AttrMapImpl.hpp
index 358f030c28f4e73481e67743c302740f3b7eab74..bd9ff292ce5e1cf0b152419c29a0419f5bd45743 100644
--- a/src/xercesc/dom/deprecated/AttrMapImpl.hpp
+++ b/src/xercesc/dom/deprecated/AttrMapImpl.hpp
@@ -4,7 +4,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -61,7 +61,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/AttrNSImpl.cpp b/src/xercesc/dom/deprecated/AttrNSImpl.cpp
index 72ac70efde4e62331a5b138e42a750adfa2d1241..1bfb450b2b045b522e1c326e6abad0b88be6c09f 100644
--- a/src/xercesc/dom/deprecated/AttrNSImpl.cpp
+++ b/src/xercesc/dom/deprecated/AttrNSImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/AttrNSImpl.hpp b/src/xercesc/dom/deprecated/AttrNSImpl.hpp
index b26629b767a69816d453b322d3154fb5bd2812fa..ca8a34e8b92495e38e63242a6e80a8886a91087c 100644
--- a/src/xercesc/dom/deprecated/AttrNSImpl.hpp
+++ b/src/xercesc/dom/deprecated/AttrNSImpl.hpp
@@ -4,7 +4,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/CDATASectionImpl.cpp b/src/xercesc/dom/deprecated/CDATASectionImpl.cpp
index b1e3bf0ab9e6ebef3dbb0c489c507adf7b1d5eff..fa8e6389bd5c459a9a1698589147099c8ac5322b 100644
--- a/src/xercesc/dom/deprecated/CDATASectionImpl.cpp
+++ b/src/xercesc/dom/deprecated/CDATASectionImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/CDATASectionImpl.hpp b/src/xercesc/dom/deprecated/CDATASectionImpl.hpp
index 7ed14563f1bf7f331184a273fe5ef412dfbf2dbc..98a0380561078dd250617e9311142fb18a47b52d 100644
--- a/src/xercesc/dom/deprecated/CDATASectionImpl.hpp
+++ b/src/xercesc/dom/deprecated/CDATASectionImpl.hpp
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -64,7 +64,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/CharacterDataImpl.cpp b/src/xercesc/dom/deprecated/CharacterDataImpl.cpp
index 3c65806df003d6d232265f07783598eb5c912370..be526715d732b7037d433cf734a7d8cd49b5ffeb 100644
--- a/src/xercesc/dom/deprecated/CharacterDataImpl.cpp
+++ b/src/xercesc/dom/deprecated/CharacterDataImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/CharacterDataImpl.hpp b/src/xercesc/dom/deprecated/CharacterDataImpl.hpp
index f42dc3c5311b28e79d88ebb0abf7601f2cacb268..8240bb7997bfeb596b0c1d3512922bdf4392a37a 100644
--- a/src/xercesc/dom/deprecated/CharacterDataImpl.hpp
+++ b/src/xercesc/dom/deprecated/CharacterDataImpl.hpp
@@ -4,7 +4,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/ChildNode.cpp b/src/xercesc/dom/deprecated/ChildNode.cpp
index 0174b24f11e3be780fb2212a4dfce36eb82ed698..e4c0b9ad3ab4295ac41b69ab950374ffb4ca9243 100644
--- a/src/xercesc/dom/deprecated/ChildNode.cpp
+++ b/src/xercesc/dom/deprecated/ChildNode.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/ChildNode.hpp b/src/xercesc/dom/deprecated/ChildNode.hpp
index b96b4b7dbbc25e5ef96f8b3c7c76aa78b856ce6c..e0c264a84ee9801d0711c3255453e7d2f8847797 100644
--- a/src/xercesc/dom/deprecated/ChildNode.hpp
+++ b/src/xercesc/dom/deprecated/ChildNode.hpp
@@ -65,7 +65,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/CommentImpl.cpp b/src/xercesc/dom/deprecated/CommentImpl.cpp
index c31a4c988a6714c760e9e55b2e279548b9d634fa..1a2c4a07afef485bcb596df02ea37e729db0b857 100644
--- a/src/xercesc/dom/deprecated/CommentImpl.cpp
+++ b/src/xercesc/dom/deprecated/CommentImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/CommentImpl.hpp b/src/xercesc/dom/deprecated/CommentImpl.hpp
index 7cf32f8ac4e66d8d81c804f2b4bb51cdd95d58f5..d2ab81010d899b9f64bd9de94bfb2e8cddd0d576 100644
--- a/src/xercesc/dom/deprecated/CommentImpl.hpp
+++ b/src/xercesc/dom/deprecated/CommentImpl.hpp
@@ -4,7 +4,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -66,7 +66,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/DOM.hpp b/src/xercesc/dom/deprecated/DOM.hpp
index c7dd4b802d1e6b2e6bae19dcc195fe6e21d2664f..da7c16a635f5f1cb9cfb27f00bedc74cd021cf2a 100644
--- a/src/xercesc/dom/deprecated/DOM.hpp
+++ b/src/xercesc/dom/deprecated/DOM.hpp
@@ -1,41 +1,41 @@
-#ifndef DOM_HEADER_GUARD_
-#define DOM_HEADER_GUARD_
+#ifndef DOM_DEPRECATED_HEADER_GUARD_
+#define DOM_DEPRECATED_HEADER_GUARD_
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -49,7 +49,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -59,29 +59,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:43 peiyongz
- * sane_include
- *
- * Revision 1.4 2000/04/25 20:29:32 aruna1
- * DOM_XMLDecl type node introduced to get the information of the
- * XML Declaration in a document and store it part of the tree
- *
- * Revision 1.3 2000/02/24 20:11:26 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.2 2000/02/06 07:47:27 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:46 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:12 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
//
@@ -89,26 +67,26 @@
// programs using the C++ XML Document Object Model API.
//
-#include <xercesc/dom/DOM_Attr.hpp>
-#include <xercesc/dom/DOM_CDATASection.hpp>
-#include <xercesc/dom/DOM_CharacterData.hpp>
-#include <xercesc/dom/DOM_Comment.hpp>
-#include <xercesc/dom/DOM_Document.hpp>
-#include <xercesc/dom/DOM_DocumentFragment.hpp>
-#include <xercesc/dom/DOM_DocumentType.hpp>
-#include <xercesc/dom/DOM_DOMException.hpp>
-#include <xercesc/dom/DOM_DOMImplementation.hpp>
-#include <xercesc/dom/DOM_Element.hpp>
-#include <xercesc/dom/DOM_Entity.hpp>
-#include <xercesc/dom/DOM_EntityReference.hpp>
-#include <xercesc/dom/DOM_NamedNodeMap.hpp>
-#include <xercesc/dom/DOM_Node.hpp>
-#include <xercesc/dom/DOM_NodeList.hpp>
-#include <xercesc/dom/DOM_Notation.hpp>
-#include <xercesc/dom/DOM_ProcessingInstruction.hpp>
-#include <xercesc/dom/DOM_Text.hpp>
-#include <xercesc/dom/DOMString.hpp>
-#include <xercesc/dom/DOM_XMLDecl.hpp>
+#include "DOM_Attr.hpp"
+#include "DOM_CDATASection.hpp"
+#include "DOM_CharacterData.hpp"
+#include "DOM_Comment.hpp"
+#include "DOM_Document.hpp"
+#include "DOM_DocumentFragment.hpp"
+#include "DOM_DocumentType.hpp"
+#include "DOM_DOMException.hpp"
+#include "DOM_DOMImplementation.hpp"
+#include "DOM_Element.hpp"
+#include "DOM_Entity.hpp"
+#include "DOM_EntityReference.hpp"
+#include "DOM_NamedNodeMap.hpp"
+#include "DOM_Node.hpp"
+#include "DOM_NodeList.hpp"
+#include "DOM_Notation.hpp"
+#include "DOM_ProcessingInstruction.hpp"
+#include "DOM_Text.hpp"
+#include "DOMString.hpp"
+#include "DOM_XMLDecl.hpp"
#endif
diff --git a/src/xercesc/dom/deprecated/DOMString.cpp b/src/xercesc/dom/deprecated/DOMString.cpp
index 86e961d53cc1942a14c6be6943c3967a0dc5653d..5f8afac0a91f790cee9380ab874e0339f224a6aa 100644
--- a/src/xercesc/dom/deprecated/DOMString.cpp
+++ b/src/xercesc/dom/deprecated/DOMString.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,127 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.6 2002/04/01 21:01:07 tng
- * DOMString problem with Asian codepages.
- *
- * Revision 1.5 2002/03/15 16:27:58 tng
- * DOMString Thread safe Fix: should lock the entire deleter function where freeListPtr and blockListPtr are modified.
- *
- * Revision 1.4 2002/03/15 13:54:41 tng
- * Issue DOMException::INDEX_SIZE_ERR if count is greater than length, equal to length is ok.
- *
- * Revision 1.3 2002/03/14 22:09:36 tng
- * IDOM Fix: Issue IDOM_DOMException::INDEX_SIZE_ERR if count or offset is negative.
- *
- * Revision 1.2 2002/02/28 21:52:13 tng
- * [Bug 1368] improper DOMStringHandle locking.
- *
- * Revision 1.1.1.1 2002/02/01 22:21:44 peiyongz
- * sane_include
- *
- * Revision 1.24 2001/12/14 15:16:51 tng
- * Performance: Do not transcode twice in DOMString constructor.
- *
- * Revision 1.23 2001/10/22 17:53:05 tng
- * [Bug 3660] Off-by-one error in DOMString.cpp. And check that memory has been acquired successfully after memory acquistion requests in DOMString.
- *
- * Revision 1.22 2001/10/18 18:01:29 tng
- * [Bug 1699] Redirect "delete this" to a temp ptr to bypass AIX xlC v5 optimization memory leak problem.
- *
- * Revision 1.21 2001/06/26 19:28:25 tng
- * [Bug 2119] DOMString::print() should use DOMString::transcode() for transcoding.
- *
- * Revision 1.20 2001/05/11 13:25:19 tng
- * Copyright update.
- *
- * Revision 1.19 2001/01/25 19:22:50 tng
- * Some bug fixes + Cleanup. Fixed by Khaled Noaman.
- *
- * Revision 1.18 2000/08/03 20:39:53 jberry
- * Add prototype for getDomConverter(), eliminating compiler warning
- *
- * Revision 1.17 2000/06/02 00:45:42 andyh
- * DOM Fixes: DOMString::rawBuffer() now returns a const XMLCh * pointer.
- * Two plain deletes changed to array deletes.
- *
- * Revision 1.16 2000/05/09 00:22:29 andyh
- * Memory Cleanup. XMLPlatformUtils::Terminate() deletes all lazily
- * allocated memory; memory leak checking tools will no longer report
- * that leaks exist. (DOM GetElementsByTagID temporarily removed
- * as part of this.)
- *
- * Revision 1.15 2000/03/28 19:43:13 roddey
- * Fixes for signed/unsigned warnings. New work for two way transcoding
- * stuff.
- *
- * Revision 1.14 2000/03/02 19:53:52 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.13 2000/02/06 07:47:27 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.12 2000/02/05 01:19:19 andyh
- * Add more DOMString tests. Fix limit test error in DOMString::insertData()
- * Andy Heninger heninger@us.ibm.com
- *
- * Revision 1.11 2000/02/04 05:06:29 andyh
- * Change all DOMString offsets and lengths form signed to unsigned
- * Other misc. cleanups.
- *
- * Revision 1.10 2000/02/04 00:52:57 rahulj
- * Changed size_t to int.
- *
- * Revision 1.9 2000/02/03 23:07:27 andyh
- * Add several new functions from Robert Weir to DOMString.
- *
- * Revision 1.8 2000/01/29 00:39:08 andyh
- * Redo synchronization in DOMStringHandle allocator. There
- * was a bug in the use of Compare and Swap. Switched to mutexes.
- *
- * Changed a few plain deletes to delete [].
- *
- * Revision 1.7 2000/01/18 19:55:37 andyh
- * Remove dependencies on XMLStdout and err, as these are about
- * to stop working.
- *
- * Revision 1.6 2000/01/05 22:16:26 robweir
- * Move DOMString implementation class declarations into a new
- * file: DOMStringImpl.hpp. Include this header in DOMString.hpp
- * for XML_DEBUG builds so the underlying character array will be
- * visible in the debugger. <robert_weir@lotus.com>
- *
- * Revision 1.5 1999/12/17 02:09:41 andyh
- * Fix bug in DOMString::insertData() that occured if the source
- * and destination strings were the same and the orginal buffer had
- * enough space to hold the result.
- *
- * Revision 1.4 1999/12/15 19:44:46 roddey
- * Changed to use new LCP transcoder scheme.
- *
- * Revision 1.3 1999/12/03 00:11:22 andyh
- * Added DOMString.clone() to node parameters in and out of the DOM,
- * where they had been missed.
- *
- * DOMString::rawBuffer, removed incorrect assumptions about it
- * being null terminated.
- *
- * Revision 1.2 1999/11/30 21:16:25 roddey
- * Changes to add the transcode() method to DOMString, which returns a transcoded
- * version (to local code page) of the DOM string contents. And I changed all of the
- * exception 'throw by pointer' to 'throw by value' style.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:47 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:12 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include <stdio.h>
diff --git a/src/xercesc/dom/deprecated/DOMString.hpp b/src/xercesc/dom/deprecated/DOMString.hpp
index c77baf5fd4e265a57f2613c49c5c293c0408860e..14d5249820eb5c151d7e868f0b9fd66e52ea29ed 100644
--- a/src/xercesc/dom/deprecated/DOMString.hpp
+++ b/src/xercesc/dom/deprecated/DOMString.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,68 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.2 2002/02/20 18:17:00 tng
- * [Bug 5977] Warnings on generating apiDocs.
- *
- * Revision 1.1.1.1 2002/02/01 22:21:44 peiyongz
- * sane_include
- *
- * Revision 1.12 2000/06/02 00:45:42 andyh
- * DOM Fixes: DOMString::rawBuffer() now returns a const XMLCh * pointer.
- * Two plain deletes changed to array deletes.
- *
- * Revision 1.11 2000/03/02 19:53:52 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.10 2000/02/24 20:11:27 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.9 2000/02/16 22:54:56 abagchi
- * Switched the order of CDOM_EXPORT DomString for operators, to make OS/390 happy
- *
- * Revision 1.8 2000/02/06 07:47:27 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.7 2000/02/04 05:06:30 andyh
- * Change all DOMString offsets and lengths form signed to unsigned
- * Other misc. cleanups.
- *
- * Revision 1.6 2000/02/04 00:52:58 rahulj
- * Changed size_t to int.
- *
- * Revision 1.5 2000/02/03 23:07:27 andyh
- * Add several new functions from Robert Weir to DOMString.
- *
- * Revision 1.4 2000/01/05 22:16:26 robweir
- * Move DOMString implementation class declarations into a new
- * file: DOMStringImpl.hpp. Include this header in DOMString.hpp
- * for XML_DEBUG builds so the underlying character array will be
- * visible in the debugger. <robert_weir@lotus.com>
- *
- * Revision 1.3 1999/12/03 00:11:22 andyh
- * Added DOMString.clone() to node parameters in and out of the DOM,
- * where they had been missed.
- *
- * DOMString::rawBuffer, removed incorrect assumptions about it
- * being null terminated.
- *
- * Revision 1.2 1999/11/30 21:16:25 roddey
- * Changes to add the transcode() method to DOMString, which returns a transcoded
- * version (to local code page) of the DOM string contents. And I changed all of the
- * exception 'throw by pointer' to 'throw by value' style.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:48 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:12 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#ifndef DOMString_HEADER_GUARD_
diff --git a/src/xercesc/dom/deprecated/DOMStringImpl.hpp b/src/xercesc/dom/deprecated/DOMStringImpl.hpp
index 4b8df9f2043fba2e9973e82150f6f42954ccd091..fedcc2c06d7097b66d105fb495950ba9448aba3f 100644
--- a/src/xercesc/dom/deprecated/DOMStringImpl.hpp
+++ b/src/xercesc/dom/deprecated/DOMStringImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -48,7 +48,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -58,49 +58,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:44 peiyongz
- * sane_include
- *
- * Revision 1.8 2000/05/09 00:22:30 andyh
- * Memory Cleanup. XMLPlatformUtils::Terminate() deletes all lazily
- * allocated memory; memory leak checking tools will no longer report
- * that leaks exist. (DOM GetElementsByTagID temporarily removed
- * as part of this.)
- *
- * Revision 1.7 2000/03/02 19:53:52 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.6 2000/02/24 20:11:27 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.5 2000/02/06 07:47:27 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.4 2000/02/04 05:46:31 andyh
- * Change offsets and lengths form signed to unsigned
- *
- * Revision 1.3 2000/01/29 00:39:08 andyh
- * Redo synchronization in DOMStringHandle allocator. There
- * was a bug in the use of Compare and Swap. Switched to mutexes.
- *
- * Changed a few plain deletes to delete [].
- *
- * Revision 1.2 2000/01/12 19:55:14 aruna1
- * Included header for size_t
- *
- * Revision 1.1 2000/01/05 22:16:26 robweir
- * Move DOMString implementation class declarations into a new
- * file: DOMStringImpl.hpp. Include this header in DOMString.hpp
- * for XML_DEBUG builds so the underlying character array will be
- * visible in the debugger. <robert_weir@lotus.com>
- *
- *
+ * $Id$
*/
@@ -108,6 +66,10 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
+// DOM API, or DOM_*.hpp for individual DOM classes, where the class
+// name is substituded for the *.
+//
#include <xercesc/util/XercesDefs.hpp>
@@ -121,7 +83,7 @@ public:
unsigned int fBufferLength;
int fRefCount;
XMLCh fData[1];
-
+
static DOMStringData *allocateBuffer(unsigned int length);
inline void addRef();
inline void removeRef();
@@ -160,4 +122,4 @@ private:
#endif
-
+
diff --git a/src/xercesc/dom/deprecated/DOM_Attr.cpp b/src/xercesc/dom/deprecated/DOM_Attr.cpp
index bc2d6c45210facbb0e75da2fb5c6f29497b4d2c8..31cbf8dce98d479e6060ed5ee16b31b60c49c3ef 100644
--- a/src/xercesc/dom/deprecated/DOM_Attr.cpp
+++ b/src/xercesc/dom/deprecated/DOM_Attr.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,37 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:44 peiyongz
- * sane_include
- *
- * Revision 1.5 2000/03/11 02:58:38 chchou
- * Fix bug # 18, remove set method of readonly attributes
- *
- * Revision 1.4 2000/03/02 19:53:52 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.3 2000/02/06 07:47:27 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 1999/12/03 00:11:22 andyh
- * Added DOMString.clone() to node parameters in and out of the DOM,
- * where they had been missed.
- *
- * DOMString::rawBuffer, removed incorrect assumptions about it
- * being null terminated.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:48 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:12 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "DOM_Attr.hpp"
@@ -103,14 +73,14 @@ DOM_Attr::DOM_Attr(const DOM_Attr & other)
{
};
-
+
DOM_Attr::DOM_Attr(AttrImpl *impl) :
DOM_Node(impl)
{
};
-DOM_Attr::~DOM_Attr()
+DOM_Attr::~DOM_Attr()
{
};
diff --git a/src/xercesc/dom/deprecated/DOM_Attr.hpp b/src/xercesc/dom/deprecated/DOM_Attr.hpp
index ea40d17dcfe1cf35c74f3f0aff6ab142d9154b64..9ad72ff7cee4fd41e0b2b51db688afdce6e78def 100644
--- a/src/xercesc/dom/deprecated/DOM_Attr.hpp
+++ b/src/xercesc/dom/deprecated/DOM_Attr.hpp
@@ -55,55 +55,15 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.3 2002/02/20 18:17:00 tng
- * [Bug 5977] Warnings on generating apiDocs.
- *
- * Revision 1.2 2002/02/04 19:57:15 tng
- * Remove the phrase "Experimental".
- *
- * Revision 1.1.1.1 2002/02/01 22:21:44 peiyongz
- * sane_include
- *
- * Revision 1.7 2000/03/11 02:58:38 chchou
- * Fix bug # 18, remove set method of readonly attributes
- *
- * Revision 1.6 2000/03/02 19:53:52 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.5 2000/02/24 20:11:27 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.4 2000/02/17 17:47:24 andyh
- * Update Doc++ API comments
- * NameSpace update to track W3C
- * Changes were made by Chih Hsiang Chou
- *
- * Revision 1.3 2000/02/06 07:47:27 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/01/05 01:16:06 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:48 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:13 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#ifndef DOM_Attr_HEADER_GUARD_
#define DOM_Attr_HEADER_GUARD_
#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM_Node.hpp>
-#include <xercesc/dom/DOM_Element.hpp>
+#include "DOM_Node.hpp"
+#include "DOM_Element.hpp"
class AttrImpl;
diff --git a/src/xercesc/dom/deprecated/DOM_CDATASection.cpp b/src/xercesc/dom/deprecated/DOM_CDATASection.cpp
index acbc4118957c4e296c7b8b465af8b7f6fe9bca7a..fc21e03b0c5ac6a380aedcf998719f71e263479d 100644
--- a/src/xercesc/dom/deprecated/DOM_CDATASection.cpp
+++ b/src/xercesc/dom/deprecated/DOM_CDATASection.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,27 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:44 peiyongz
- * sane_include
- *
- * Revision 1.3 2000/03/02 19:53:52 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.2 2000/02/06 07:47:28 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:48 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:13 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "DOM_CDATASection.hpp"
@@ -95,14 +75,14 @@ DOM_CDATASection::DOM_CDATASection(const DOM_CDATASection & other)
{
};
-
+
DOM_CDATASection::DOM_CDATASection(CDATASectionImpl *impl) :
DOM_Text(impl)
{
};
-DOM_CDATASection::~DOM_CDATASection()
+DOM_CDATASection::~DOM_CDATASection()
{
};
diff --git a/src/xercesc/dom/deprecated/DOM_CDATASection.hpp b/src/xercesc/dom/deprecated/DOM_CDATASection.hpp
index 3359ebede9f627655e9de7173fd15957b5e4d6dc..c8cf6fba67cd0407cb13afe018c483791dd261d0 100644
--- a/src/xercesc/dom/deprecated/DOM_CDATASection.hpp
+++ b/src/xercesc/dom/deprecated/DOM_CDATASection.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,43 +55,14 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.2 2002/02/20 18:17:00 tng
- * [Bug 5977] Warnings on generating apiDocs.
- *
- * Revision 1.1.1.1 2002/02/01 22:21:44 peiyongz
- * sane_include
- *
- * Revision 1.5 2000/03/02 19:53:52 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.4 2000/02/24 20:11:27 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.3 2000/02/06 07:47:28 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/01/05 01:16:06 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:49 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:13 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#ifndef DOM_CDataSection_HEADER_GUARD_
#define DOM_CDataSection_HEADER_GUARD_
#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM_Text.hpp>
+#include "DOM_Text.hpp"
class CDATASectionImpl;
diff --git a/src/xercesc/dom/deprecated/DOM_CharacterData.cpp b/src/xercesc/dom/deprecated/DOM_CharacterData.cpp
index da4318d64eaa8516c3ca47a1d756c45e2a03c969..5cda6594206c969d2f57c33142d5e66a6613d848 100644
--- a/src/xercesc/dom/deprecated/DOM_CharacterData.cpp
+++ b/src/xercesc/dom/deprecated/DOM_CharacterData.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,37 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:44 peiyongz
- * sane_include
- *
- * Revision 1.5 2000/03/02 19:53:52 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.4 2000/02/06 07:47:28 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.3 2000/02/04 01:49:29 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.2 1999/12/03 00:11:22 andyh
- * Added DOMString.clone() to node parameters in and out of the DOM,
- * where they had been missed.
- *
- * DOMString::rawBuffer, removed incorrect assumptions about it
- * being null terminated.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:49 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:13 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "DOM_CharacterData.hpp"
diff --git a/src/xercesc/dom/deprecated/DOM_CharacterData.hpp b/src/xercesc/dom/deprecated/DOM_CharacterData.hpp
index 19543bd0034f6edd20b104bc1e0c4dd679ce4164..73baf7db45ab22c2c745df40574da22fcc1713e0 100644
--- a/src/xercesc/dom/deprecated/DOM_CharacterData.hpp
+++ b/src/xercesc/dom/deprecated/DOM_CharacterData.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,48 +55,14 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.2 2002/02/20 18:17:00 tng
- * [Bug 5977] Warnings on generating apiDocs.
- *
- * Revision 1.1.1.1 2002/02/01 22:21:44 peiyongz
- * sane_include
- *
- * Revision 1.6 2000/03/02 19:53:53 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.5 2000/02/24 20:11:27 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.4 2000/02/15 23:17:36 andyh
- * Update Doc++ API comments
- * NameSpace bugfix and update to track W3C
- * Chih Hsiang Chou
- *
- * Revision 1.3 2000/02/06 07:47:28 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/02/04 01:49:29 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.1.1.1 1999/11/09 01:08:49 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:13 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#ifndef DOM_CharacterData_HEADER_GUARD_
#define DOM_CharacterData_HEADER_GUARD_
#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM_Node.hpp>
+#include "DOM_Node.hpp"
class CharacterDataImpl;
diff --git a/src/xercesc/dom/deprecated/DOM_Comment.cpp b/src/xercesc/dom/deprecated/DOM_Comment.cpp
index a18e452ce1a0d9e44c082600051bf4e2a25c2c9e..a653913aa16f74ea0015aeea37c0d74c4e21b6f6 100644
--- a/src/xercesc/dom/deprecated/DOM_Comment.cpp
+++ b/src/xercesc/dom/deprecated/DOM_Comment.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,27 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:44 peiyongz
- * sane_include
- *
- * Revision 1.3 2000/03/02 19:53:53 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.2 2000/02/06 07:47:28 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:49 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:14 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "DOM_Comment.hpp"
@@ -93,14 +73,14 @@ DOM_Comment::DOM_Comment(const DOM_Comment & other)
{
};
-
+
DOM_Comment::DOM_Comment(CommentImpl *impl) :
DOM_CharacterData(impl)
{
};
-DOM_Comment::~DOM_Comment()
+DOM_Comment::~DOM_Comment()
{
};
diff --git a/src/xercesc/dom/deprecated/DOM_Comment.hpp b/src/xercesc/dom/deprecated/DOM_Comment.hpp
index 8d5d9b94aac8cbdd78da894e1a6c9913f693e842..5c14ea34b646f7efe49714f3fe6c0864664eff5d 100644
--- a/src/xercesc/dom/deprecated/DOM_Comment.hpp
+++ b/src/xercesc/dom/deprecated/DOM_Comment.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,43 +55,14 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.2 2002/02/20 18:17:00 tng
- * [Bug 5977] Warnings on generating apiDocs.
- *
- * Revision 1.1.1.1 2002/02/01 22:21:44 peiyongz
- * sane_include
- *
- * Revision 1.5 2000/03/02 19:53:54 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.4 2000/02/24 20:11:27 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.3 2000/02/06 07:47:28 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/01/05 01:16:06 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:50 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:14 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#ifndef DOM_Comment_HEADER_GUARD_
#define DOM_Comment_HEADER_GUARD_
#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM_CharacterData.hpp>
+#include "DOM_CharacterData.hpp"
class CommentImpl;
diff --git a/src/xercesc/dom/deprecated/DOM_DOMException.cpp b/src/xercesc/dom/deprecated/DOM_DOMException.cpp
index d202147258de55cf5c6903bb4d58404f6ddb4ba7..a044802ecdbad44ae19db5ad8744900c9fb77d07 100644
--- a/src/xercesc/dom/deprecated/DOM_DOMException.cpp
+++ b/src/xercesc/dom/deprecated/DOM_DOMException.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,27 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:45 peiyongz
- * sane_include
- *
- * Revision 1.3 2000/03/02 19:53:54 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.2 2000/02/06 07:47:28 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:53 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:14 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "DOM_DOMException.hpp"
@@ -89,20 +69,20 @@ DOM_DOMException::DOM_DOMException()
};
-DOM_DOMException::DOM_DOMException(short exCode, const DOMString &message)
-: msg(message)
+DOM_DOMException::DOM_DOMException(short exCode, const DOMString &message)
+: msg(message)
{
code = (ExceptionCode) exCode;
};
-DOM_DOMException::DOM_DOMException(const DOM_DOMException &other)
+DOM_DOMException::DOM_DOMException(const DOM_DOMException &other)
: msg(other.msg)
{
code = other.code;
};
-DOM_DOMException::~DOM_DOMException()
+DOM_DOMException::~DOM_DOMException()
{
};
diff --git a/src/xercesc/dom/deprecated/DOM_DOMException.hpp b/src/xercesc/dom/deprecated/DOM_DOMException.hpp
index 5b69ca2ce106dab8de5283db00d1e924441a745d..80a56f4e1e131b1f57b79550d15a25821b0c5385 100644
--- a/src/xercesc/dom/deprecated/DOM_DOMException.hpp
+++ b/src/xercesc/dom/deprecated/DOM_DOMException.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,46 +55,14 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:45 peiyongz
- * sane_include
- *
- * Revision 1.7 2000/03/02 19:53:54 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.6 2000/02/24 20:11:27 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.5 2000/02/10 19:52:08 abagchi
- * Added docs for enum
- *
- * Revision 1.4 2000/02/06 07:47:28 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.3 2000/02/04 05:46:31 andyh
- * Change offsets and lengths form signed to unsigned
- *
- * Revision 1.2 2000/01/05 01:16:06 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:53 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:14 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
-#ifndef DOMException_HEADER_GUARD_
-#define DOMException_HEADER_GUARD_
+#ifndef DOM_DOMException_HEADER_GUARD_
+#define DOM_DOMException_HEADER_GUARD_
#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOMString.hpp>
+#include "DOMString.hpp"
/**
* Encapsulate a general DOM error or warning.
diff --git a/src/xercesc/dom/deprecated/DOM_DOMImplementation.cpp b/src/xercesc/dom/deprecated/DOM_DOMImplementation.cpp
index bdd625b70144940ed27a4d86036090631ec8d54d..471a8559fb98b4e85e0e5164a9ff8c2f31986245 100644
--- a/src/xercesc/dom/deprecated/DOM_DOMImplementation.cpp
+++ b/src/xercesc/dom/deprecated/DOM_DOMImplementation.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,78 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:45 peiyongz
- * sane_include
- *
- * Revision 1.12 2002/01/23 20:13:23 tng
- * Update DOM/IDOM hasFeature method to correctly reflect current status.
- *
- * Revision 1.11 2001/10/25 21:47:14 peiyongz
- * Replace XMLDeleterFor with XMLRegisterCleanup
- *
- * Revision 1.10 2001/10/23 23:04:38 peiyongz
- * [Bug#880] patch to PlatformUtils:init()/term() and related. from Mark Weaver
- *
- * Revision 1.9 2000/05/09 00:22:31 andyh
- * Memory Cleanup. XMLPlatformUtils::Terminate() deletes all lazily
- * allocated memory; memory leak checking tools will no longer report
- * that leaks exist. (DOM GetElementsByTagID temporarily removed
- * as part of this.)
- *
- * Revision 1.8 2000/04/27 02:52:42 lehors
- * global reorganization similar to what I've done in Java,
- * nodes now are much smaller.
- * The main changes are:
- * renamed NodeContainer to ParentNode,
- * introduced ChildNode and ChildAndParentNode,
- * all the boolean attributes have been changed to bit flags,
- * ownerDocument is no longer an attribute of NodeImpl, only Parent nodes have
- * it, leave nodes rely on their parent to get it, or get it from ownerNode when
- * they do not have a parent,
- * parent Nodes no longer have a direct pointer to the last child
- * instead the last child is stored as the previous sibling of
- * the first child.
- * I also added support for importing a DocumentType as it's done in Java,
- * and got the importNode mechanism back in sync with Java as well.
- *
- * Here are the most significant changes in size:
- * ElementImpl 52 -> 48
- * TextImpl 44 -> 32
- * AttrImpl 52 -> 36
- *
- * Revision 1.7 2000/03/02 19:53:54 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.6 2000/02/10 23:35:10 andyh
- * Update DOM_DOMImplementation::CreateDocumentType and
- * DOM_DocumentType to match latest from W3C
- *
- * Revision 1.5 2000/02/06 07:47:28 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.4 2000/01/19 21:39:19 andyh
- * DOM L2, fix problems with new style createDocument.
- *
- * Revision 1.3 2000/01/05 01:16:07 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.2 1999/11/30 21:16:25 roddey
- * Changes to add the transcode() method to DOMString, which returns a transcoded
- * version (to local code page) of the DOM string contents. And I changed all of the
- * exception 'throw by pointer' to 'throw by value' style.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:56 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:15 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "DOM_DOMImplementation.hpp"
diff --git a/src/xercesc/dom/deprecated/DOM_DOMImplementation.hpp b/src/xercesc/dom/deprecated/DOM_DOMImplementation.hpp
index d9266bb331c0d98758d9025c0dad21d7c7e693ef..75ae59b788069f366e29748907fce4cacc8f011b 100644
--- a/src/xercesc/dom/deprecated/DOM_DOMImplementation.hpp
+++ b/src/xercesc/dom/deprecated/DOM_DOMImplementation.hpp
@@ -55,55 +55,14 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.2 2002/02/04 19:57:15 tng
- * Remove the phrase "Experimental".
- *
- * Revision 1.1.1.1 2002/02/01 22:21:45 peiyongz
- * sane_include
- *
- * Revision 1.8 2001/10/25 21:47:14 peiyongz
- * Replace XMLDeleterFor with XMLRegisterCleanup
- *
- * Revision 1.7 2000/03/02 19:53:54 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.6 2000/02/24 20:11:27 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.5 2000/02/17 17:47:24 andyh
- * Update Doc++ API comments
- * NameSpace update to track W3C
- * Changes were made by Chih Hsiang Chou
- *
- * Revision 1.4 2000/02/10 23:35:11 andyh
- * Update DOM_DOMImplementation::CreateDocumentType and
- * DOM_DocumentType to match latest from W3C
- *
- * Revision 1.3 2000/02/06 07:47:28 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/01/05 01:16:07 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:57 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:15 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
-#ifndef DOMImplementation_HEADER_GUARD_
-#define DOMImplementation_HEADER_GUARD_
+#ifndef DOM_DOMImplementation_HEADER_GUARD_
+#define DOM_DOMImplementation_HEADER_GUARD_
#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOMString.hpp>
+#include "DOMString.hpp"
class DOM_Document;
class DOM_DocumentType;
diff --git a/src/xercesc/dom/deprecated/DOM_Document.cpp b/src/xercesc/dom/deprecated/DOM_Document.cpp
index 15b9a8581e952b1c45fda29fffb1605cd04d6fda..70817f19d4edc4cb729adc9d42dc8f4d2c311117 100644
--- a/src/xercesc/dom/deprecated/DOM_Document.cpp
+++ b/src/xercesc/dom/deprecated/DOM_Document.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/DOM_Document.hpp b/src/xercesc/dom/deprecated/DOM_Document.hpp
index 374698dbb6118d9eae4dc012122a83ad646d8a8b..ea01a53bf8f9c398bd9a07bd01ff047196dfd901 100644
--- a/src/xercesc/dom/deprecated/DOM_Document.hpp
+++ b/src/xercesc/dom/deprecated/DOM_Document.hpp
@@ -62,24 +62,24 @@
#define DOM_Document_HEADER_GUARD_
#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM_DocumentType.hpp>
-#include <xercesc/dom/DOM_DOMImplementation.hpp>
-#include <xercesc/dom/DOM_Element.hpp>
-#include <xercesc/dom/DOM_DocumentFragment.hpp>
-#include <xercesc/dom/DOM_Comment.hpp>
-#include <xercesc/dom/DOM_CDATASection.hpp>
-#include <xercesc/dom/DOM_ProcessingInstruction.hpp>
-#include <xercesc/dom/DOM_Attr.hpp>
-#include <xercesc/dom/DOM_Entity.hpp>
-#include <xercesc/dom/DOM_EntityReference.hpp>
-#include <xercesc/dom/DOM_NodeList.hpp>
-#include <xercesc/dom/DOM_Notation.hpp>
-#include <xercesc/dom/DOM_Text.hpp>
-#include <xercesc/dom/DOM_Node.hpp>
-#include <xercesc/dom/DOM_NodeIterator.hpp>
-#include <xercesc/dom/DOM_TreeWalker.hpp>
-#include <xercesc/dom/DOM_XMLDecl.hpp>
-#include <xercesc/dom/DOM_Range.hpp>
+#include "DOM_DocumentType.hpp"
+#include "DOM_DOMImplementation.hpp"
+#include "DOM_Element.hpp"
+#include "DOM_DocumentFragment.hpp"
+#include "DOM_Comment.hpp"
+#include "DOM_CDATASection.hpp"
+#include "DOM_ProcessingInstruction.hpp"
+#include "DOM_Attr.hpp"
+#include "DOM_Entity.hpp"
+#include "DOM_EntityReference.hpp"
+#include "DOM_NodeList.hpp"
+#include "DOM_Notation.hpp"
+#include "DOM_Text.hpp"
+#include "DOM_Node.hpp"
+#include "DOM_NodeIterator.hpp"
+#include "DOM_TreeWalker.hpp"
+#include "DOM_XMLDecl.hpp"
+#include "DOM_Range.hpp"
class DocumentImpl;
class NodeIteratorImpl;
diff --git a/src/xercesc/dom/deprecated/DOM_DocumentFragment.cpp b/src/xercesc/dom/deprecated/DOM_DocumentFragment.cpp
index 455fbdafc1f73e9ac644ac4937b8e1879b960196..bcd42490a0c879a99cdbb925493d9bed5bcc2459 100644
--- a/src/xercesc/dom/deprecated/DOM_DocumentFragment.cpp
+++ b/src/xercesc/dom/deprecated/DOM_DocumentFragment.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,27 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:44 peiyongz
- * sane_include
- *
- * Revision 1.3 2000/03/02 19:53:55 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.2 2000/02/06 07:47:28 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:51 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:16 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "DOM_DocumentFragment.hpp"
@@ -94,14 +74,14 @@ DOM_DocumentFragment::DOM_DocumentFragment(const DOM_DocumentFragment & other)
{
};
-
+
DOM_DocumentFragment::DOM_DocumentFragment(DocumentFragmentImpl *impl) :
DOM_Node(impl)
{
};
-DOM_DocumentFragment::~DOM_DocumentFragment()
+DOM_DocumentFragment::~DOM_DocumentFragment()
{
};
diff --git a/src/xercesc/dom/deprecated/DOM_DocumentFragment.hpp b/src/xercesc/dom/deprecated/DOM_DocumentFragment.hpp
index 5ded5f878e38006171197b76f00868a01a144857..8b1df0e6db82af42ecf5faa4b12faddec2450279 100644
--- a/src/xercesc/dom/deprecated/DOM_DocumentFragment.hpp
+++ b/src/xercesc/dom/deprecated/DOM_DocumentFragment.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,7 +62,7 @@
#define DOM_DocumentFragment_HEADER_GUARD_
#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM_Node.hpp>
+#include "DOM_Node.hpp"
class DocumentFragmentImpl;
diff --git a/src/xercesc/dom/deprecated/DOM_DocumentType.cpp b/src/xercesc/dom/deprecated/DOM_DocumentType.cpp
index 91406da617d8329c057ecbede225bccc689dbbdb..49e7507c343963815a1efaf951da8ff4b1e5ad70 100644
--- a/src/xercesc/dom/deprecated/DOM_DocumentType.cpp
+++ b/src/xercesc/dom/deprecated/DOM_DocumentType.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,41 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:45 peiyongz
- * sane_include
- *
- * Revision 1.6 2000/03/10 02:14:39 chchou
- * add null DOM_DocumentType constructor
- *
- * Revision 1.5 2000/03/02 19:53:55 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.4 2000/02/10 23:35:11 andyh
- * Update DOM_DOMImplementation::CreateDocumentType and
- * DOM_DocumentType to match latest from W3C
- *
- * Revision 1.3 2000/02/06 07:47:29 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 1999/12/03 00:11:23 andyh
- * Added DOMString.clone() to node parameters in and out of the DOM,
- * where they had been missed.
- *
- * DOMString::rawBuffer, removed incorrect assumptions about it
- * being null terminated.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:52 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:16 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "DOM_DocumentType.hpp"
@@ -119,14 +85,14 @@ DOM_DocumentType::DOM_DocumentType(const DOM_DocumentType & other)
{
};
-
+
DOM_DocumentType::DOM_DocumentType(DocumentTypeImpl *impl) :
DOM_Node(impl)
{
};
-DOM_DocumentType::~DOM_DocumentType()
+DOM_DocumentType::~DOM_DocumentType()
{
};
diff --git a/src/xercesc/dom/deprecated/DOM_DocumentType.hpp b/src/xercesc/dom/deprecated/DOM_DocumentType.hpp
index da019abb8f79fdd2655019d55548d3e731549695..a295937a0ad72f955b123df3565fcf2bdc22ee9b 100644
--- a/src/xercesc/dom/deprecated/DOM_DocumentType.hpp
+++ b/src/xercesc/dom/deprecated/DOM_DocumentType.hpp
@@ -55,58 +55,14 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.3 2002/02/20 18:17:00 tng
- * [Bug 5977] Warnings on generating apiDocs.
- *
- * Revision 1.2 2002/02/04 19:57:15 tng
- * Remove the phrase "Experimental".
- *
- * Revision 1.1.1.1 2002/02/01 22:21:45 peiyongz
- * sane_include
- *
- * Revision 1.8 2000/03/10 02:14:39 chchou
- * add null DOM_DocumentType constructor
- *
- * Revision 1.7 2000/03/02 19:53:55 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.6 2000/02/24 20:11:27 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.5 2000/02/17 17:47:24 andyh
- * Update Doc++ API comments
- * NameSpace update to track W3C
- * Changes were made by Chih Hsiang Chou
- *
- * Revision 1.4 2000/02/10 23:35:11 andyh
- * Update DOM_DOMImplementation::CreateDocumentType and
- * DOM_DocumentType to match latest from W3C
- *
- * Revision 1.3 2000/02/06 07:47:29 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/01/05 01:16:07 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:52 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:16 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#ifndef DOM_DocumentType_HEADER_GUARD_
#define DOM_DocumentType_HEADER_GUARD_
#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM_Node.hpp>
+#include "DOM_Node.hpp"
class DOM_NamedNodeMap;
class DocumentTypeImpl;
diff --git a/src/xercesc/dom/deprecated/DOM_Element.cpp b/src/xercesc/dom/deprecated/DOM_Element.cpp
index 1a3567b46cfd061b489c3895d5699552317c27de..c30f95565ce3bd29f0fc576dc55a101c73ecb36c 100644
--- a/src/xercesc/dom/deprecated/DOM_Element.cpp
+++ b/src/xercesc/dom/deprecated/DOM_Element.cpp
@@ -55,46 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.2 2002/02/04 20:03:48 tng
- * Add DOM Level missing functions:
- * 1. NodeIterator::getRoot
- * 2. TreeWalker::getRoot
- * 3. Element::hasAttribute
- * 4. Element::hasAttributeNS
- * 5. Node::hasAttributes
- * 6. Node::isSupported
- *
- * Revision 1.1.1.1 2002/02/01 22:21:45 peiyongz
- * sane_include
- *
- * Revision 1.5 2000/03/02 19:53:55 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.4 2000/02/06 07:47:29 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.3 2000/01/05 01:16:07 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.2 1999/12/03 00:11:23 andyh
- * Added DOMString.clone() to node parameters in and out of the DOM,
- * where they had been missed.
- *
- * DOMString::rawBuffer, removed incorrect assumptions about it
- * being null terminated.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:57 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:17 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "DOM_Element.hpp"
diff --git a/src/xercesc/dom/deprecated/DOM_Element.hpp b/src/xercesc/dom/deprecated/DOM_Element.hpp
index 7cf060bb1dd13b6f42892239c4ff1e5292280c41..a6a19b8607c4c1e52f65b7e594ca481a421624a4 100644
--- a/src/xercesc/dom/deprecated/DOM_Element.hpp
+++ b/src/xercesc/dom/deprecated/DOM_Element.hpp
@@ -55,70 +55,14 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.3 2002/02/20 18:17:00 tng
- * [Bug 5977] Warnings on generating apiDocs.
- *
- * Revision 1.2 2002/02/04 20:03:48 tng
- * Add DOM Level missing functions:
- * 1. NodeIterator::getRoot
- * 2. TreeWalker::getRoot
- * 3. Element::hasAttribute
- * 4. Element::hasAttributeNS
- * 5. Node::hasAttributes
- * 6. Node::isSupported
- *
- * Revision 1.1.1.1 2002/02/01 22:21:45 peiyongz
- * sane_include
- *
- * Revision 1.9 2001/05/11 13:25:20 tng
- * Copyright update.
- *
- * Revision 1.8 2001/05/03 19:17:26 knoaman
- * TraverseSchema Part II.
- *
- * Revision 1.7 2000/03/02 19:53:55 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.6 2000/02/24 20:11:27 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.5 2000/02/17 17:47:24 andyh
- * Update Doc++ API comments
- * NameSpace update to track W3C
- * Changes were made by Chih Hsiang Chou
- *
- * Revision 1.4 2000/02/06 07:47:29 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.3 2000/01/05 01:16:07 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.2 1999/12/21 07:47:06 robweir
- * Patches to support Xalan, where we need to create a
- * "special" DOM with subclassed Nodes.
- *
- * 1. Export the NodeImpl-derived classes
- * 2. Ensure that their constructors have at least protected access
- *
- * Revision 1.1.1.1 1999/11/09 01:08:57 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:17 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#ifndef DOM_Element_HEADER_GUARD_
#define DOM_Element_HEADER_GUARD_
#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM_Node.hpp>
+#include "DOM_Node.hpp"
class DOM_Attr;
class DOM_NodeList;
diff --git a/src/xercesc/dom/deprecated/DOM_Entity.cpp b/src/xercesc/dom/deprecated/DOM_Entity.cpp
index a245b4f5063bba4e20d2b0b035fd844089209233..b03bc15aafa10a95b55d347ca5f0836e7f5d298b 100644
--- a/src/xercesc/dom/deprecated/DOM_Entity.cpp
+++ b/src/xercesc/dom/deprecated/DOM_Entity.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,40 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:45 peiyongz
- * sane_include
- *
- * Revision 1.6 2000/04/19 02:26:16 aruna1
- * Full support for DOM_EntityReference, DOM_Entity and DOM_DocumentType introduced
- *
- * Revision 1.5 2000/03/11 02:58:38 chchou
- * Fix bug # 18, remove set method of readonly attributes
- *
- * Revision 1.4 2000/03/02 19:53:55 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.3 2000/02/06 07:47:30 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 1999/12/03 00:11:23 andyh
- * Added DOMString.clone() to node parameters in and out of the DOM,
- * where they had been missed.
- *
- * DOMString::rawBuffer, removed incorrect assumptions about it
- * being null terminated.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:57 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:17 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "DOM_Entity.hpp"
@@ -108,14 +75,14 @@ DOM_Entity::DOM_Entity(const DOM_Entity & other)
{
};
-
+
DOM_Entity::DOM_Entity(EntityImpl *impl) :
DOM_Node(impl)
{
};
-DOM_Entity::~DOM_Entity()
+DOM_Entity::~DOM_Entity()
{
};
@@ -172,8 +139,8 @@ DOM_Node DOM_Entity::getPreviousSibling() const
{
return DOM_Node(((EntityImpl*)fImpl)->getPreviousSibling());
};
-
-
+
+
DOM_Node DOM_Entity::getNextSibling() const
{
return DOM_Node(((EntityImpl*)fImpl)->getNextSibling());
diff --git a/src/xercesc/dom/deprecated/DOM_Entity.hpp b/src/xercesc/dom/deprecated/DOM_Entity.hpp
index db3a059309054867224c7eab1d2a3d0365a1f9d7..33b5e79f9f9ba00b4ceb9c5cc8c781e8b811d29b 100644
--- a/src/xercesc/dom/deprecated/DOM_Entity.hpp
+++ b/src/xercesc/dom/deprecated/DOM_Entity.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,52 +55,14 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.2 2002/02/20 18:17:00 tng
- * [Bug 5977] Warnings on generating apiDocs.
- *
- * Revision 1.1.1.1 2002/02/01 22:21:45 peiyongz
- * sane_include
- *
- * Revision 1.8 2000/09/09 00:11:46 andyh
- * Virtual Destructor Patch, submitted by Kirk Wylie
- *
- * Revision 1.7 2000/04/19 02:26:16 aruna1
- * Full support for DOM_EntityReference, DOM_Entity and DOM_DocumentType introduced
- *
- * Revision 1.6 2000/03/11 02:58:38 chchou
- * Fix bug # 18, remove set method of readonly attributes
- *
- * Revision 1.5 2000/03/02 19:53:55 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.4 2000/02/24 20:11:28 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.3 2000/02/06 07:47:30 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/01/05 01:16:07 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:58 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:17 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#ifndef DOM_Entity_HEADER_GUARD_
#define DOM_Entity_HEADER_GUARD_
#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM_Node.hpp>
+#include "DOM_Node.hpp"
class EntityImpl;
diff --git a/src/xercesc/dom/deprecated/DOM_EntityReference.cpp b/src/xercesc/dom/deprecated/DOM_EntityReference.cpp
index be85117fe361d50158ed4f2101301c867c376fb2..f55e39b747ef6a3e9b6942adba12bdad15c2e63d 100644
--- a/src/xercesc/dom/deprecated/DOM_EntityReference.cpp
+++ b/src/xercesc/dom/deprecated/DOM_EntityReference.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,27 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:45 peiyongz
- * sane_include
- *
- * Revision 1.3 2000/03/02 19:53:55 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.2 2000/02/06 07:47:30 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:58 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:18 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "DOM_EntityReference.hpp"
@@ -93,14 +73,14 @@ DOM_EntityReference::DOM_EntityReference(const DOM_EntityReference & other)
{
};
-
+
DOM_EntityReference::DOM_EntityReference(EntityReferenceImpl *impl) :
DOM_Node(impl)
{
};
-DOM_EntityReference::~DOM_EntityReference()
+DOM_EntityReference::~DOM_EntityReference()
{
};
diff --git a/src/xercesc/dom/deprecated/DOM_EntityReference.hpp b/src/xercesc/dom/deprecated/DOM_EntityReference.hpp
index bf2d518cccd7c0d8cb86ec7f435862b6249d1813..9a78ba18d6cf698422c5b4f529ec55ca2af63a48 100644
--- a/src/xercesc/dom/deprecated/DOM_EntityReference.hpp
+++ b/src/xercesc/dom/deprecated/DOM_EntityReference.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,43 +55,14 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.2 2002/02/20 18:17:00 tng
- * [Bug 5977] Warnings on generating apiDocs.
- *
- * Revision 1.1.1.1 2002/02/01 22:21:45 peiyongz
- * sane_include
- *
- * Revision 1.5 2000/03/02 19:53:56 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.4 2000/02/24 20:11:28 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.3 2000/02/06 07:47:30 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/01/05 01:16:07 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:58 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:18 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#ifndef DOM_EntityReference_HEADER_GUARD_
#define DOM_EntityReference_HEADER_GUARD_
#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM_Node.hpp>
+#include "DOM_Node.hpp"
class EntityReferenceImpl;
diff --git a/src/xercesc/dom/deprecated/DOM_NamedNodeMap.cpp b/src/xercesc/dom/deprecated/DOM_NamedNodeMap.cpp
index 0ca8624c7977ea0c9a22cad84f9fbbd0fa326dd2..d2e230ee198e9f01bf96786e759e84d15c757274 100644
--- a/src/xercesc/dom/deprecated/DOM_NamedNodeMap.cpp
+++ b/src/xercesc/dom/deprecated/DOM_NamedNodeMap.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,43 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:45 peiyongz
- * sane_include
- *
- * Revision 1.8 2000/06/07 22:49:40 andyh
- * Memory usage reduction: DOM NamedNodeMaps for attributes are allocated
- * only for elements that actually have attributes. By Joe Polastre.
- *
- * Revision 1.7 2000/03/11 03:19:12 chchou
- * Fix bug # 19, add const keyword to API
- *
- * Revision 1.6 2000/03/02 19:53:56 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.5 2000/02/06 07:47:30 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.4 2000/02/04 01:49:28 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.3 2000/01/22 01:38:29 andyh
- * Remove compiler warnings in DOM impl classes
- *
- * Revision 1.2 2000/01/05 01:16:07 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:59 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:18 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "DOM_Node.hpp"
@@ -136,9 +100,9 @@ DOM_NamedNodeMap::DOM_NamedNodeMap(NodeImpl *impl)
}
-DOM_NamedNodeMap::~DOM_NamedNodeMap()
+DOM_NamedNodeMap::~DOM_NamedNodeMap()
{
- (flagElem == NNM_OTHER) ? NamedNodeMapImpl::removeRef((NamedNodeMapImpl *)fImpl) :
+ (flagElem == NNM_OTHER) ? NamedNodeMapImpl::removeRef((NamedNodeMapImpl *)fImpl) :
NodeImpl::removeRef((NodeImpl *)fImpl);
};
@@ -168,7 +132,7 @@ bool DOM_NamedNodeMap::operator != (const DOM_NullPtr *p) const
DOM_NamedNodeMap & DOM_NamedNodeMap::operator = (const DOM_NamedNodeMap & other)
{
- if (this->fImpl != other.fImpl)
+ if (this->fImpl != other.fImpl)
{
// update reference counts and change pointers
(flagElem == NNM_OTHER) ? NamedNodeMapImpl::removeRef((NamedNodeMapImpl *)fImpl) : NodeImpl::removeRef((NodeImpl *)fImpl);
@@ -184,7 +148,7 @@ DOM_NamedNodeMap & DOM_NamedNodeMap::operator = (const DOM_NamedNodeMap & other)
DOM_NamedNodeMap & DOM_NamedNodeMap::operator = (const DOM_NullPtr *other)
{
-
+
(flagElem == NNM_OTHER) ? NamedNodeMapImpl::removeRef((NamedNodeMapImpl *)fImpl) : NodeImpl::removeRef((NodeImpl *)fImpl);
this->fImpl = 0;
this->flagElem = NNM_OTHER;
@@ -194,35 +158,35 @@ DOM_NamedNodeMap & DOM_NamedNodeMap::operator = (const DOM_NullPtr *other)
DOM_Node DOM_NamedNodeMap::getNamedItem(const DOMString &name) const
{
- return (flagElem == NNM_OTHER) ? DOM_Node(((NamedNodeMapImpl *)fImpl)->getNamedItem(name)) :
+ return (flagElem == NNM_OTHER) ? DOM_Node(((NamedNodeMapImpl *)fImpl)->getNamedItem(name)) :
DOM_Node(((ElementImpl *)fImpl)->NNM_getNamedItem(name));
};
DOM_Node DOM_NamedNodeMap::setNamedItem(DOM_Node arg)
{
- return (flagElem == NNM_OTHER) ? DOM_Node(((NamedNodeMapImpl *)fImpl)->setNamedItem(arg.fImpl)) :
+ return (flagElem == NNM_OTHER) ? DOM_Node(((NamedNodeMapImpl *)fImpl)->setNamedItem(arg.fImpl)) :
DOM_Node(((ElementImpl *)fImpl)->NNM_setNamedItem(arg.fImpl));
};
DOM_Node DOM_NamedNodeMap::removeNamedItem(const DOMString &name)
{
- return (flagElem == NNM_OTHER) ? DOM_Node(((NamedNodeMapImpl *)fImpl)->removeNamedItem(name)) :
+ return (flagElem == NNM_OTHER) ? DOM_Node(((NamedNodeMapImpl *)fImpl)->removeNamedItem(name)) :
DOM_Node(((ElementImpl *)fImpl)->NNM_removeNamedItem(name));
};
DOM_Node DOM_NamedNodeMap::item(unsigned int index) const
{
- return (flagElem == NNM_OTHER) ? DOM_Node(((NamedNodeMapImpl *)fImpl)->item(index)) :
+ return (flagElem == NNM_OTHER) ? DOM_Node(((NamedNodeMapImpl *)fImpl)->item(index)) :
DOM_Node(((ElementImpl *)fImpl)->NNM_item(index));
};
unsigned int DOM_NamedNodeMap::getLength() const
{
- return (flagElem == NNM_OTHER) ? ((NamedNodeMapImpl *)fImpl)->getLength() :
+ return (flagElem == NNM_OTHER) ? ((NamedNodeMapImpl *)fImpl)->getLength() :
((ElementImpl *)fImpl)->NNM_getLength();
};
diff --git a/src/xercesc/dom/deprecated/DOM_NamedNodeMap.hpp b/src/xercesc/dom/deprecated/DOM_NamedNodeMap.hpp
index 2168efece5843f1059e56af9103fbb402201609f..02bf3758eb9ea62f4eda37779a070edc8dbcb337 100644
--- a/src/xercesc/dom/deprecated/DOM_NamedNodeMap.hpp
+++ b/src/xercesc/dom/deprecated/DOM_NamedNodeMap.hpp
@@ -55,68 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.3 2002/02/20 18:17:00 tng
- * [Bug 5977] Warnings on generating apiDocs.
- *
- * Revision 1.2 2002/02/04 19:57:15 tng
- * Remove the phrase "Experimental".
- *
- * Revision 1.1.1.1 2002/02/01 22:21:45 peiyongz
- * sane_include
- *
- * Revision 1.13 2000/06/07 22:49:40 andyh
- * Memory usage reduction: DOM NamedNodeMaps for attributes are allocated
- * only for elements that actually have attributes. By Joe Polastre.
- *
- * Revision 1.12 2000/03/11 03:19:13 chchou
- * Fix bug # 19, add const keyword to API
- *
- * Revision 1.11 2000/03/02 19:53:56 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.10 2000/02/24 20:11:28 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.9 2000/02/17 17:47:24 andyh
- * Update Doc++ API comments
- * NameSpace update to track W3C
- * Changes were made by Chih Hsiang Chou
- *
- * Revision 1.8 2000/02/15 23:17:36 andyh
- * Update Doc++ API comments
- * NameSpace bugfix and update to track W3C
- * Chih Hsiang Chou
- *
- * Revision 1.7 2000/02/10 20:20:42 abagchi
- * Added docs for assignment operators
- *
- * Revision 1.6 2000/02/10 20:19:24 abagchi
- * Added docs for equality operators
- *
- * Revision 1.5 2000/02/06 07:47:30 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.4 2000/02/04 01:49:28 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.3 2000/01/22 01:38:29 andyh
- * Remove compiler warnings in DOM impl classes
- *
- * Revision 1.2 2000/01/05 01:16:07 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:59 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:18 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#ifndef DOM_NamedNodeMap_HEADER_GUARD_
@@ -124,7 +63,7 @@
#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM_Node.hpp>
+#include "DOM_Node.hpp"
class NamedNodeMapImpl;
/**
diff --git a/src/xercesc/dom/deprecated/DOM_Node.cpp b/src/xercesc/dom/deprecated/DOM_Node.cpp
index a27b84fd88ebc6eff3e7545b224afd2ceff3d5e1..4976e6f1d6cf13ac875c5b90c013ef916e9e5b9a 100644
--- a/src/xercesc/dom/deprecated/DOM_Node.cpp
+++ b/src/xercesc/dom/deprecated/DOM_Node.cpp
@@ -55,54 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.2 2002/02/04 20:03:48 tng
- * Add DOM Level missing functions:
- * 1. NodeIterator::getRoot
- * 2. TreeWalker::getRoot
- * 3. Element::hasAttribute
- * 4. Element::hasAttributeNS
- * 5. Node::hasAttributes
- * 6. Node::isSupported
- *
- * Revision 1.1.1.1 2002/02/01 22:21:45 peiyongz
- * sane_include
- *
- * Revision 1.7 2000/06/14 21:08:07 andyh
- * DOM attribute/named nodemaps: Fix a couple of null ptr problems.
- * Joe Polastre.
- *
- * Revision 1.6 2000/06/07 22:49:40 andyh
- * Memory usage reduction: DOM NamedNodeMaps for attributes are allocated
- * only for elements that actually have attributes. By Joe Polastre.
- *
- * Revision 1.5 2000/03/02 19:53:56 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.4 2000/02/06 07:47:30 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.3 2000/01/05 01:16:07 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.2 1999/12/03 00:11:23 andyh
- * Added DOMString.clone() to node parameters in and out of the DOM,
- * where they had been missed.
- *
- * DOMString::rawBuffer, removed incorrect assumptions about it
- * being null terminated.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:59 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:19 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "DOM_Node.hpp"
diff --git a/src/xercesc/dom/deprecated/DOM_Node.hpp b/src/xercesc/dom/deprecated/DOM_Node.hpp
index cde82fdd569a8c4024fae5be9dd66c029941e59e..cc01cc424f4091057c32c0016d6db397b7b53173 100644
--- a/src/xercesc/dom/deprecated/DOM_Node.hpp
+++ b/src/xercesc/dom/deprecated/DOM_Node.hpp
@@ -62,7 +62,7 @@
#define DOM_Node_HEADER_GUARD_
#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOMString.hpp>
+#include "DOMString.hpp"
class DOM_NodeList;
class DOM_NamedNodeMap;
diff --git a/src/xercesc/dom/deprecated/DOM_NodeFilter.cpp b/src/xercesc/dom/deprecated/DOM_NodeFilter.cpp
index d61515e817d2e171e9827a74d1ab410abfce8e26..adbee25095028e78da17ff7b928c312983acfc99 100644
--- a/src/xercesc/dom/deprecated/DOM_NodeFilter.cpp
+++ b/src/xercesc/dom/deprecated/DOM_NodeFilter.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,30 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:46 peiyongz
- * sane_include
- *
- * Revision 1.4 2000/03/02 19:53:56 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.3 2000/02/06 07:47:30 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/02/04 01:49:28 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.1.1.1 1999/11/09 01:09:00 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:19 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
// DOM_NodeFilter.cpp: implementation of the DOM_NodeFilter class.
@@ -89,12 +66,12 @@
DOM_NodeFilter::DOM_NodeFilter() {
-
+
}
DOM_NodeFilter::~DOM_NodeFilter() {
-
+
}
diff --git a/src/xercesc/dom/deprecated/DOM_NodeFilter.hpp b/src/xercesc/dom/deprecated/DOM_NodeFilter.hpp
index 58a5c1688b48dff4c4a5b7c68a80b19a888f5b32..48112fdf1dd042cd96f760ecbf0486afb729c077 100644
--- a/src/xercesc/dom/deprecated/DOM_NodeFilter.hpp
+++ b/src/xercesc/dom/deprecated/DOM_NodeFilter.hpp
@@ -55,53 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.2 2002/02/04 19:57:15 tng
- * Remove the phrase "Experimental".
- *
- * Revision 1.1.1.1 2002/02/01 22:21:46 peiyongz
- * sane_include
- *
- * Revision 1.10 2000/10/20 22:03:04 andyh
- * DOM NodeFileter - define values for FilterAction enum to match those in the DOM spec.
- *
- * Revision 1.9 2000/05/11 00:07:38 abagchi
- * Removed tables. It was confusing doxygen
- *
- * Revision 1.8 2000/03/11 03:19:13 chchou
- * Fix bug # 19, add const keyword to API
- *
- * Revision 1.7 2000/02/24 20:11:28 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.6 2000/02/17 17:47:25 andyh
- * Update Doc++ API comments
- * NameSpace update to track W3C
- * Changes were made by Chih Hsiang Chou
- *
- * Revision 1.5 2000/02/15 23:17:37 andyh
- * Update Doc++ API comments
- * NameSpace bugfix and update to track W3C
- * Chih Hsiang Chou
- *
- * Revision 1.4 2000/02/10 21:47:12 abagchi
- * Added API docs
- *
- * Revision 1.3 2000/02/06 07:47:30 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/02/04 01:49:28 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.1.1.1 1999/11/09 01:09:00 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:19 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
// DOM_NodeFilter.h: interface for the DOM_NodeFilter class.
diff --git a/src/xercesc/dom/deprecated/DOM_NodeIterator.cpp b/src/xercesc/dom/deprecated/DOM_NodeIterator.cpp
index 2e42e0acbc4e47f1df97c4d80e2991e9266b674d..6562a0c9e24cfdd3eaa7e6d85fe26e0fc92d8d92 100644
--- a/src/xercesc/dom/deprecated/DOM_NodeIterator.cpp
+++ b/src/xercesc/dom/deprecated/DOM_NodeIterator.cpp
@@ -55,39 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.2 2002/02/04 20:03:48 tng
- * Add DOM Level missing functions:
- * 1. NodeIterator::getRoot
- * 2. TreeWalker::getRoot
- * 3. Element::hasAttribute
- * 4. Element::hasAttributeNS
- * 5. Node::hasAttributes
- * 6. Node::isSupported
- *
- * Revision 1.1.1.1 2002/02/01 22:21:46 peiyongz
- * sane_include
- *
- * Revision 1.4 2000/03/02 19:53:56 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.3 2000/02/06 07:47:30 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/02/04 01:49:28 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.1.1.1 1999/11/09 01:09:01 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:20 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "DOM_NodeIterator.hpp"
diff --git a/src/xercesc/dom/deprecated/DOM_NodeIterator.hpp b/src/xercesc/dom/deprecated/DOM_NodeIterator.hpp
index 5d4b6f88c8f64db91b411da17abfeed99b117d72..45791b09456125974aab869971b98634757fb464 100644
--- a/src/xercesc/dom/deprecated/DOM_NodeIterator.hpp
+++ b/src/xercesc/dom/deprecated/DOM_NodeIterator.hpp
@@ -55,59 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.3 2002/02/20 18:17:00 tng
- * [Bug 5977] Warnings on generating apiDocs.
- *
- * Revision 1.2 2002/02/04 20:03:48 tng
- * Add DOM Level missing functions:
- * 1. NodeIterator::getRoot
- * 2. TreeWalker::getRoot
- * 3. Element::hasAttribute
- * 4. Element::hasAttributeNS
- * 5. Node::hasAttributes
- * 6. Node::isSupported
- *
- * Revision 1.1.1.1 2002/02/01 22:21:46 peiyongz
- * sane_include
- *
- * Revision 1.9 2000/02/17 17:47:25 andyh
- * Update Doc++ API comments
- * NameSpace update to track W3C
- * Changes were made by Chih Hsiang Chou
- *
- * Revision 1.8 2000/02/16 19:39:38 aruna1
- * API Doc++ changes in
- *
- * Revision 1.7 2000/02/15 23:17:37 andyh
- * Update Doc++ API comments
- * NameSpace bugfix and update to track W3C
- * Chih Hsiang Chou
- *
- * Revision 1.6 2000/02/11 18:14:11 abagchi
- * Fixed doc++ bugs
- *
- * Revision 1.5 2000/02/11 03:01:04 abagchi
- * Made protected method public to compile, must be fixed later
- *
- * Revision 1.4 2000/02/10 23:38:05 abagchi
- * Added API docs
- *
- * Revision 1.3 2000/02/06 07:47:30 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/02/04 01:49:28 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.3 1999/11/08 20:44:20 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:01 twl
- * Initial checkin
- *
+ * $Id$
*/
#ifndef DOM_NodeIterator_HEADER_GUARD_
diff --git a/src/xercesc/dom/deprecated/DOM_NodeList.cpp b/src/xercesc/dom/deprecated/DOM_NodeList.cpp
index 77160fcbccc3a981e651f8c7b4bb8bd6b0a4bc6f..070eae914c9e9862da5c90f74b88c089e4c17b7a 100644
--- a/src/xercesc/dom/deprecated/DOM_NodeList.cpp
+++ b/src/xercesc/dom/deprecated/DOM_NodeList.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,33 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:46 peiyongz
- * sane_include
- *
- * Revision 1.5 2000/03/02 19:53:56 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.4 2000/02/06 07:47:30 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.3 2000/02/04 01:49:27 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.2 2000/01/22 01:38:29 andyh
- * Remove compiler warnings in DOM impl classes
- *
- * Revision 1.1.1.1 1999/11/09 01:09:01 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:20 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "DOM_NodeList.hpp"
@@ -95,7 +69,7 @@ DOM_NodeList::DOM_NodeList()
};
-DOM_NodeList::DOM_NodeList(NodeListImpl *impl)
+DOM_NodeList::DOM_NodeList(NodeListImpl *impl)
{
fImpl = impl;
RefCountedImpl::addRef(fImpl);
@@ -129,7 +103,7 @@ DOM_NodeList & DOM_NodeList::operator = (const DOM_NullPtr *other)
};
-DOM_NodeList::~DOM_NodeList()
+DOM_NodeList::~DOM_NodeList()
{
RefCountedImpl::removeRef(this->fImpl);
fImpl = 0;
diff --git a/src/xercesc/dom/deprecated/DOM_NodeList.hpp b/src/xercesc/dom/deprecated/DOM_NodeList.hpp
index 631de1df3d9e2b15648d22ac52f9cd01d1f45a56..d62985dffa45db36f8448644ffc44c91f0fd0bbf 100644
--- a/src/xercesc/dom/deprecated/DOM_NodeList.hpp
+++ b/src/xercesc/dom/deprecated/DOM_NodeList.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,55 +55,14 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.2 2002/02/20 18:17:00 tng
- * [Bug 5977] Warnings on generating apiDocs.
- *
- * Revision 1.1.1.1 2002/02/01 22:21:46 peiyongz
- * sane_include
- *
- * Revision 1.9 2000/04/19 02:26:16 aruna1
- * Full support for DOM_EntityReference, DOM_Entity and DOM_DocumentType introduced
- *
- * Revision 1.8 2000/03/02 19:53:56 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.7 2000/02/24 20:11:28 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.6 2000/02/10 20:38:46 abagchi
- * Added docs for equality operators
- *
- * Revision 1.5 2000/02/06 07:47:30 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.4 2000/02/04 01:49:27 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.3 2000/01/22 01:38:29 andyh
- * Remove compiler warnings in DOM impl classes
- *
- * Revision 1.2 2000/01/05 01:16:08 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:02 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:20 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#ifndef DOM_NodeList_HEADER_GUARD_
#define DOM_NodeList_HEADER_GUARD_
#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM_Node.hpp>
+#include "DOM_Node.hpp"
class NodeListImpl;
diff --git a/src/xercesc/dom/deprecated/DOM_Notation.cpp b/src/xercesc/dom/deprecated/DOM_Notation.cpp
index 42a49643b7d973341291bcb0d9a3a49a3b0d2021..416776ba207959283f302c02ffca474907fa47dc 100644
--- a/src/xercesc/dom/deprecated/DOM_Notation.cpp
+++ b/src/xercesc/dom/deprecated/DOM_Notation.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,30 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:46 peiyongz
- * sane_include
- *
- * Revision 1.4 2000/03/11 02:58:39 chchou
- * Fix bug # 18, remove set method of readonly attributes
- *
- * Revision 1.3 2000/03/02 19:53:57 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.2 2000/02/06 07:47:31 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:02 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:21 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "DOM_Notation.hpp"
@@ -96,14 +73,14 @@ DOM_Notation::DOM_Notation(const DOM_Notation & other)
{
};
-
+
DOM_Notation::DOM_Notation(NotationImpl *impl) :
DOM_Node(impl)
{
};
-DOM_Notation::~DOM_Notation()
+DOM_Notation::~DOM_Notation()
{
};
diff --git a/src/xercesc/dom/deprecated/DOM_Notation.hpp b/src/xercesc/dom/deprecated/DOM_Notation.hpp
index 4d13372e5675e9decf62584d7ccb313cbeed90ff..3cb09a458e871ae8a04f89b8a583ec18bd042af2 100644
--- a/src/xercesc/dom/deprecated/DOM_Notation.hpp
+++ b/src/xercesc/dom/deprecated/DOM_Notation.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,46 +55,14 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.2 2002/02/20 18:17:00 tng
- * [Bug 5977] Warnings on generating apiDocs.
- *
- * Revision 1.1.1.1 2002/02/01 22:21:46 peiyongz
- * sane_include
- *
- * Revision 1.6 2000/03/11 02:58:39 chchou
- * Fix bug # 18, remove set method of readonly attributes
- *
- * Revision 1.5 2000/03/02 19:53:57 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.4 2000/02/24 20:11:28 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.3 2000/02/06 07:47:31 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/01/05 01:16:08 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:03 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:21 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#ifndef DOM_Notation_HEADER_GUARD_
#define DOM_Notation_HEADER_GUARD_
#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM_Node.hpp>
+#include "DOM_Node.hpp"
class NotationImpl;
diff --git a/src/xercesc/dom/deprecated/DOM_ProcessingInstruction.cpp b/src/xercesc/dom/deprecated/DOM_ProcessingInstruction.cpp
index 33d80ee36aeb7680b0b90c6b5ce38290c826cd0b..57a20af7cf9a34e9a95f86454037ea46a40dd155 100644
--- a/src/xercesc/dom/deprecated/DOM_ProcessingInstruction.cpp
+++ b/src/xercesc/dom/deprecated/DOM_ProcessingInstruction.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,34 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:46 peiyongz
- * sane_include
- *
- * Revision 1.4 2000/03/02 19:53:57 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.3 2000/02/06 07:47:31 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 1999/12/03 00:11:23 andyh
- * Added DOMString.clone() to node parameters in and out of the DOM,
- * where they had been missed.
- *
- * DOMString::rawBuffer, removed incorrect assumptions about it
- * being null terminated.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:03 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:21 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "DOM_ProcessingInstruction.hpp"
@@ -103,7 +76,7 @@ DOM_ProcessingInstruction::DOM_ProcessingInstruction(
{
};
-
+
DOM_ProcessingInstruction::DOM_ProcessingInstruction(
ProcessingInstructionImpl *impl)
: DOM_Node(impl)
@@ -111,7 +84,7 @@ DOM_ProcessingInstruction::DOM_ProcessingInstruction(
};
-DOM_ProcessingInstruction::~DOM_ProcessingInstruction()
+DOM_ProcessingInstruction::~DOM_ProcessingInstruction()
{
};
diff --git a/src/xercesc/dom/deprecated/DOM_ProcessingInstruction.hpp b/src/xercesc/dom/deprecated/DOM_ProcessingInstruction.hpp
index e63503d19c9a255c40f53c9818cf82804c27b08a..d9ab1fa21871a06a5c9b582c45015e3924d9ec33 100644
--- a/src/xercesc/dom/deprecated/DOM_ProcessingInstruction.hpp
+++ b/src/xercesc/dom/deprecated/DOM_ProcessingInstruction.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,43 +55,14 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.2 2002/02/20 18:17:00 tng
- * [Bug 5977] Warnings on generating apiDocs.
- *
- * Revision 1.1.1.1 2002/02/01 22:21:46 peiyongz
- * sane_include
- *
- * Revision 1.5 2000/03/02 19:53:57 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.4 2000/02/24 20:11:28 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.3 2000/02/06 07:47:31 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/01/05 01:16:08 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:03 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:21 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#ifndef DOM_ProcessingInstruction_HEADER_GUARD_
#define DOM_ProcessingInstruction_HEADER_GUARD_
#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM_Node.hpp>
+#include "DOM_Node.hpp"
class ProcessingInstructionImpl;
diff --git a/src/xercesc/dom/deprecated/DOM_Range.cpp b/src/xercesc/dom/deprecated/DOM_Range.cpp
index 4d2085378d995fdd198d1ef39b762ae6570c65b3..0ea8e5ba7649fa1576fcd72ad3d441ca1a2dda1e 100644
--- a/src/xercesc/dom/deprecated/DOM_Range.cpp
+++ b/src/xercesc/dom/deprecated/DOM_Range.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,7 +60,7 @@
-#include <xercesc/dom/DOM_Range.hpp>
+#include "DOM_Range.hpp"
#include "DocumentImpl.hpp"
#include "RangeImpl.hpp"
diff --git a/src/xercesc/dom/deprecated/DOM_Range.hpp b/src/xercesc/dom/deprecated/DOM_Range.hpp
index 8b6092cd0bf5bc1cafff372127709b8d42c5c13e..2f4eb93903254759a39248f1c728c5e3db10f818 100644
--- a/src/xercesc/dom/deprecated/DOM_Range.hpp
+++ b/src/xercesc/dom/deprecated/DOM_Range.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,9 +62,9 @@
#define DOM_Range_HEADER_GUARD_
#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM_Node.hpp>
-#include <xercesc/dom/DOMString.hpp>
-#include <xercesc/dom/DOM_DocumentFragment.hpp>
+#include "DOM_Node.hpp"
+#include "DOMString.hpp"
+#include "DOM_DocumentFragment.hpp"
class RangeImpl;
@@ -85,7 +85,7 @@ public:
DOM_Range(const DOM_Range& other);
~DOM_Range();
-
+
DOM_Range & operator = (const DOM_Range &other);
DOM_Range & operator = (const DOM_NullPtr *other);
bool operator != (const DOM_Range & other) const;
@@ -109,7 +109,7 @@ public:
void setStartAfter(const DOM_Node &refNode);
void setEndBefore(const DOM_Node &refNode);
void setEndAfter(const DOM_Node &refNode);
-
+
//misc functions
void collapse(bool toStart);
void selectNode(const DOM_Node &node);
@@ -127,8 +127,8 @@ public:
DOMString toString() const;
void detach();
-
-
+
+
protected:
diff --git a/src/xercesc/dom/deprecated/DOM_RangeException.cpp b/src/xercesc/dom/deprecated/DOM_RangeException.cpp
index d331721b93118657c405b2520d4a84eda4219a7d..f462bcf8d98910d4385a4932ffb834a6b53a699f 100644
--- a/src/xercesc/dom/deprecated/DOM_RangeException.cpp
+++ b/src/xercesc/dom/deprecated/DOM_RangeException.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -53,18 +53,9 @@
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-
+
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:46 peiyongz
- * sane_include
- *
- * Revision 1.1 2000/07/28 01:33:31 aruna1
- * DOM Level 2 Range feature introduced
- *
+ * $Id$
*/
#include "DOM_RangeException.hpp"
@@ -77,20 +68,20 @@ DOM_RangeException::DOM_RangeException()
};
-DOM_RangeException::DOM_RangeException(RangeExceptionCode exCode, const DOMString &message)
-: DOM_DOMException(exCode, message)
+DOM_RangeException::DOM_RangeException(RangeExceptionCode exCode, const DOMString &message)
+: DOM_DOMException(exCode, message)
{
code = exCode;
};
-DOM_RangeException::DOM_RangeException(const DOM_RangeException &other)
+DOM_RangeException::DOM_RangeException(const DOM_RangeException &other)
: DOM_DOMException(other)
{
code = other.code;
};
-DOM_RangeException::~DOM_RangeException()
+DOM_RangeException::~DOM_RangeException()
{
};
diff --git a/src/xercesc/dom/deprecated/DOM_RangeException.hpp b/src/xercesc/dom/deprecated/DOM_RangeException.hpp
index 6fc77bc306cb739d05782cc8ac5fb00059991744..b7c5c1108816e557fc5e8dc015a0c2d58130a29e 100644
--- a/src/xercesc/dom/deprecated/DOM_RangeException.hpp
+++ b/src/xercesc/dom/deprecated/DOM_RangeException.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,30 +55,21 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:46 peiyongz
- * sane_include
- *
- * Revision 1.1 2000/07/28 01:33:31 aruna1
- * DOM Level 2 Range feature introduced
- *
+ * $Id$
*/
#ifndef DOM_RangeException_HEADER_GUARD_
#define DOM_RangeException_HEADER_GUARD_
-#include <xercesc/dom/DOM_DOMException.hpp>
+#include "DOM_DOMException.hpp"
/**
- * Encapsulate range related DOM error or warning. DOM level 2 implementation.
+ * Encapsulate range related DOM error or warning. DOM level 2 implementation.
*
* <p> The DOM will create and throw an instance of DOM_RangeException
* when an error condition in range is detected. Exceptions can occur
* when an application directly manipulates the range elements in DOM document
- * tree that is produced by the parser.
+ * tree that is produced by the parser.
*
* <p>Unlike the other classes in the C++ DOM API, DOM_RangeException
* is NOT a reference to an underlying implementation class, and
diff --git a/src/xercesc/dom/deprecated/DOM_Text.cpp b/src/xercesc/dom/deprecated/DOM_Text.cpp
index 7a95c728df8d87fdeafd6b5a6f4c9dd9be80ff86..75d2eb5cbeade80e863cc63985653b009405bcf0 100644
--- a/src/xercesc/dom/deprecated/DOM_Text.cpp
+++ b/src/xercesc/dom/deprecated/DOM_Text.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,33 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:46 peiyongz
- * sane_include
- *
- * Revision 1.5 2000/03/24 01:30:50 chchou
- * Fix bug #8 to support ignorable whitespace text nodes
- *
- * Revision 1.4 2000/03/02 19:53:57 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.3 2000/02/06 07:47:31 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/02/04 01:49:27 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.1.1.1 1999/11/09 01:09:04 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:22 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "DOM_Text.hpp"
@@ -100,14 +74,14 @@ DOM_Text::DOM_Text(const DOM_Text & other)
{
};
-
+
DOM_Text::DOM_Text(TextImpl *impl) :
DOM_CharacterData(impl)
{
};
-DOM_Text::~DOM_Text()
+DOM_Text::~DOM_Text()
{
};
diff --git a/src/xercesc/dom/deprecated/DOM_Text.hpp b/src/xercesc/dom/deprecated/DOM_Text.hpp
index 5846d60a717b49154b69f7c7a7cd94a629c3557b..362118c7d8f1d7db18d5a4649c189c3782d65c60 100644
--- a/src/xercesc/dom/deprecated/DOM_Text.hpp
+++ b/src/xercesc/dom/deprecated/DOM_Text.hpp
@@ -55,55 +55,14 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.3 2002/02/20 18:17:00 tng
- * [Bug 5977] Warnings on generating apiDocs.
- *
- * Revision 1.2 2002/02/04 19:57:15 tng
- * Remove the phrase "Experimental".
- *
- * Revision 1.1.1.1 2002/02/01 22:21:46 peiyongz
- * sane_include
- *
- * Revision 1.8 2000/07/28 01:33:31 aruna1
- * DOM Level 2 Range feature introduced
- *
- * Revision 1.7 2000/03/24 01:30:50 chchou
- * Fix bug #8 to support ignorable whitespace text nodes
- *
- * Revision 1.6 2000/03/02 19:53:57 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.5 2000/02/24 20:11:28 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.4 2000/02/06 07:47:31 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.3 2000/02/04 01:49:27 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.2 2000/01/05 01:16:08 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:04 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:22 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#ifndef DOM_Text_HEADER_GUARD_
#define DOM_Text_HEADER_GUARD_
#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOM_CharacterData.hpp>
+#include "DOM_CharacterData.hpp"
class TextImpl;
diff --git a/src/xercesc/dom/deprecated/DOM_TreeWalker.cpp b/src/xercesc/dom/deprecated/DOM_TreeWalker.cpp
index ced656526b5636f36a4adbf4638a7ea58a09a927..a762b087f76653486ffdaf006e9d6c19a7bf0732 100644
--- a/src/xercesc/dom/deprecated/DOM_TreeWalker.cpp
+++ b/src/xercesc/dom/deprecated/DOM_TreeWalker.cpp
@@ -55,42 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.2 2002/02/04 20:03:48 tng
- * Add DOM Level missing functions:
- * 1. NodeIterator::getRoot
- * 2. TreeWalker::getRoot
- * 3. Element::hasAttribute
- * 4. Element::hasAttributeNS
- * 5. Node::hasAttributes
- * 6. Node::isSupported
- *
- * Revision 1.1.1.1 2002/02/01 22:21:46 peiyongz
- * sane_include
- *
- * Revision 1.5 2000/08/08 01:00:36 aruna1
- * detach functionality removed from TreeWalker
- *
- * Revision 1.4 2000/03/02 19:53:58 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.3 2000/02/06 07:47:31 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/02/04 01:49:27 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.1.1.1 1999/11/09 01:09:05 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:22 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "DOM_TreeWalker.hpp"
diff --git a/src/xercesc/dom/deprecated/DOM_TreeWalker.hpp b/src/xercesc/dom/deprecated/DOM_TreeWalker.hpp
index e6e198f51a030092938f2bc99d9a58a107fccc63..677428a4260254c70e603ef75b7dc65ed2d4ab83 100644
--- a/src/xercesc/dom/deprecated/DOM_TreeWalker.hpp
+++ b/src/xercesc/dom/deprecated/DOM_TreeWalker.hpp
@@ -55,59 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.3 2002/02/20 18:17:00 tng
- * [Bug 5977] Warnings on generating apiDocs.
- *
- * Revision 1.2 2002/02/04 20:03:48 tng
- * Add DOM Level missing functions:
- * 1. NodeIterator::getRoot
- * 2. TreeWalker::getRoot
- * 3. Element::hasAttribute
- * 4. Element::hasAttributeNS
- * 5. Node::hasAttributes
- * 6. Node::isSupported
- *
- * Revision 1.1.1.1 2002/02/01 22:21:46 peiyongz
- * sane_include
- *
- * Revision 1.9 2000/08/08 01:00:36 aruna1
- * detach functionality removed from TreeWalker
- *
- * Revision 1.8 2000/02/24 20:11:29 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.7 2000/02/17 17:47:25 andyh
- * Update Doc++ API comments
- * NameSpace update to track W3C
- * Changes were made by Chih Hsiang Chou
- *
- * Revision 1.6 2000/02/15 23:17:37 andyh
- * Update Doc++ API comments
- * NameSpace bugfix and update to track W3C
- * Chih Hsiang Chou
- *
- * Revision 1.5 2000/02/11 03:01:04 abagchi
- * Made protected method public to compile, must be fixed later
- *
- * Revision 1.4 2000/02/11 01:05:11 abagchi
- * Added API docs
- *
- * Revision 1.3 2000/02/06 07:47:31 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/02/04 01:49:27 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.1.1.1 1999/11/09 01:09:05 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:22 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#ifndef DOM_TreeWalker_HEADER_GUARD_
diff --git a/src/xercesc/dom/deprecated/DOM_XMLDecl.cpp b/src/xercesc/dom/deprecated/DOM_XMLDecl.cpp
index e60f356188e1321209dd76394de7cdaec10be72d..f10b995dd82cb4f19e2c13c2bde5b711500cb2a7 100644
--- a/src/xercesc/dom/deprecated/DOM_XMLDecl.cpp
+++ b/src/xercesc/dom/deprecated/DOM_XMLDecl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/DOM_XMLDecl.hpp b/src/xercesc/dom/deprecated/DOM_XMLDecl.hpp
index 82f6d5e014d656c5c3ea7651c6d812f946c2ac84..dc44295dc365dc21ff1ad77775a07c6b9540fa0f 100644
--- a/src/xercesc/dom/deprecated/DOM_XMLDecl.hpp
+++ b/src/xercesc/dom/deprecated/DOM_XMLDecl.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -63,7 +63,7 @@
#define DOM_XMLDecl_HEADER_GUARD_
#include <xercesc/util/XercesDefs.hpp>
-#include "xercesc/dom/DOM_Node.hpp"
+#include "DOM_Node.hpp"
class XMLDeclImpl;
/**
diff --git a/src/xercesc/dom/deprecated/DStringPool.cpp b/src/xercesc/dom/deprecated/DStringPool.cpp
index 79a5ec8d3e6daadea55d43a463c424c812cd9e16..494996b318b2fff0d79be46cb24b818277e25d08 100644
--- a/src/xercesc/dom/deprecated/DStringPool.cpp
+++ b/src/xercesc/dom/deprecated/DStringPool.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,44 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.2 2002/05/03 16:06:45 peiyongz
- * Bug 7341: Missing newline at end of util and DOM source files,
- * patch from Martin Kalen.
- *
- * Revision 1.1.1.1 2002/02/01 22:21:47 peiyongz
- * sane_include
- *
- * Revision 1.6 2001/10/25 21:47:14 peiyongz
- * Replace XMLDeleterFor with XMLRegisterCleanup
- *
- * Revision 1.5 2000/06/02 00:45:42 andyh
- * DOM Fixes: DOMString::rawBuffer() now returns a const XMLCh * pointer.
- * Two plain deletes changed to array deletes.
- *
- * Revision 1.4 2000/05/09 00:22:31 andyh
- * Memory Cleanup. XMLPlatformUtils::Terminate() deletes all lazily
- * allocated memory; memory leak checking tools will no longer report
- * that leaks exist. (DOM GetElementsByTagID temporarily removed
- * as part of this.)
- *
- * Revision 1.3 2000/03/02 19:53:58 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.2 2000/02/06 07:47:31 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:05 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:23 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
//
@@ -127,7 +90,7 @@ DStringPool::DStringPool(int hashTableSize)
};
-// Destructor. Iterate through the pool, deleting each of the
+// Destructor. Iterate through the pool, deleting each of the
// DSTringPoolEntry structs, then delete the hash
// array itself.
//
@@ -198,7 +161,7 @@ const DOMString &DStringPool::getPooledString(const DOMString &in)
// getLiteralString
//
// This is a static function that is somewhat separate from the rest
-// of the string pool. It is used to manage the one-time creation of
+// of the string pool. It is used to manage the one-time creation of
// static strings that are reused freqently within the DOM implementation.
// This is primarily things like the default names for the various
// node types ("#text" and the like).
diff --git a/src/xercesc/dom/deprecated/DStringPool.hpp b/src/xercesc/dom/deprecated/DStringPool.hpp
index 7f77aeb613a62b22ac7da0dc3565fef4da04b295..88c724c65d6808049c38c5782757c63fba041fc9 100644
--- a/src/xercesc/dom/deprecated/DStringPool.hpp
+++ b/src/xercesc/dom/deprecated/DStringPool.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -63,7 +63,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
@@ -72,7 +72,7 @@
#define DStringPool_HEADER_GUARD_
#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOMString.hpp>
+#include "DOMString.hpp"
#include <xercesc/util/XMLRegisterCleanup.hpp>
struct DStringPoolEntry;
@@ -88,7 +88,7 @@ struct DStringPoolEntry;
class DStringPool
{
public:
- DStringPool(int hashTableSize);
+ DStringPool(int hashTableSize);
~DStringPool();
const DOMString &getPooledString(const DOMString &in);
diff --git a/src/xercesc/dom/deprecated/DeepNodeListImpl.cpp b/src/xercesc/dom/deprecated/DeepNodeListImpl.cpp
index 617933e2ede1f4e370bc71a2418c9319eff44ca8..e6bee46a59ee5c2c7e90492c3912d3831eac8dd3 100644
--- a/src/xercesc/dom/deprecated/DeepNodeListImpl.cpp
+++ b/src/xercesc/dom/deprecated/DeepNodeListImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,64 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.2 2002/05/03 16:06:45 peiyongz
- * Bug 7341: Missing newline at end of util and DOM source files,
- * patch from Martin Kalen.
- *
- * Revision 1.1.1.1 2002/02/01 22:21:43 peiyongz
- * sane_include
- *
- * Revision 1.8 2001/10/25 21:47:14 peiyongz
- * Replace XMLDeleterFor with XMLRegisterCleanup
- *
- * Revision 1.7 2001/10/18 18:01:29 tng
- * [Bug 1699] Redirect "delete this" to a temp ptr to bypass AIX xlC v5 optimization memory leak problem.
- *
- * Revision 1.6 2000/04/27 02:52:42 lehors
- * global reorganization similar to what I've done in Java,
- * nodes now are much smaller.
- * The main changes are:
- * renamed NodeContainer to ParentNode,
- * introduced ChildNode and ChildAndParentNode,
- * all the boolean attributes have been changed to bit flags,
- * ownerDocument is no longer an attribute of NodeImpl, only Parent nodes have
- * it, leave nodes rely on their parent to get it, or get it from ownerNode when
- * they do not have a parent,
- * parent Nodes no longer have a direct pointer to the last child
- * instead the last child is stored as the previous sibling of
- * the first child.
- * I also added support for importing a DocumentType as it's done in Java,
- * and got the importNode mechanism back in sync with Java as well.
- *
- * Here are the most significant changes in size:
- * ElementImpl 52 -> 48
- * TextImpl 44 -> 32
- * AttrImpl 52 -> 36
- *
- * Revision 1.5 2000/03/02 19:53:59 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.4 2000/02/06 07:47:31 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.3 2000/02/04 01:49:30 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.2 2000/01/22 01:38:29 andyh
- * Remove compiler warnings in DOM impl classes
- *
- * Revision 1.1.1.1 1999/11/09 01:08:42 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:23 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "DeepNodeListImpl.hpp"
@@ -159,7 +102,7 @@ DeepNodeListImpl::DeepNodeListImpl(NodeImpl *rootNod,
, &kAstr
, reinitDeepNodeListImpl
, kAstrCleanup));
-
+
this->matchURIandTagname = true;
};
diff --git a/src/xercesc/dom/deprecated/DeepNodeListImpl.hpp b/src/xercesc/dom/deprecated/DeepNodeListImpl.hpp
index 69c0ea737fa6de2ed5dfb41989c22e44fc91bf26..71beb4aa910ea2d798c48adbd1076090dda98d7d 100644
--- a/src/xercesc/dom/deprecated/DeepNodeListImpl.hpp
+++ b/src/xercesc/dom/deprecated/DeepNodeListImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -48,7 +48,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -58,53 +58,14 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:43 peiyongz
- * sane_include
- *
- * Revision 1.8 2001/10/25 21:47:14 peiyongz
- * Replace XMLDeleterFor with XMLRegisterCleanup
- *
- * Revision 1.7 2000/03/02 19:53:59 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.6 2000/02/24 20:11:29 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.5 2000/02/06 07:47:31 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.4 2000/02/04 01:49:30 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.3 2000/01/22 01:38:29 andyh
- * Remove compiler warnings in DOM impl classes
- *
- * Revision 1.2 1999/12/21 07:47:06 robweir
- * Patches to support Xalan, where we need to create a
- * "special" DOM with subclassed Nodes.
- *
- * 1. Export the NodeImpl-derived classes
- * 2. Ensure that their constructors have at least protected access
- *
- * Revision 1.1.1.1 1999/11/09 01:08:42 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:23 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
//
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
@@ -120,8 +81,8 @@ class NodeVector;
class CDOM_EXPORT DeepNodeListImpl: public NodeListImpl {
private:
- NodeImpl *rootNode;
- DOMString tagName;
+ NodeImpl *rootNode;
+ DOMString tagName;
bool matchAll;
int changes;
NodeVector *nodes;
@@ -130,7 +91,7 @@ private:
DOMString namespaceURI;
bool matchAllURI;
bool matchURIandTagname; //match both namespaceURI and tagName
-
+
public:
DeepNodeListImpl(NodeImpl *rootNode, const DOMString &tagName);
DeepNodeListImpl(NodeImpl *rootNode, //DOM Level 2
diff --git a/src/xercesc/dom/deprecated/DocumentFragmentImpl.cpp b/src/xercesc/dom/deprecated/DocumentFragmentImpl.cpp
index e0f810d43dbcae95873772d7e2c62a72f699050d..d546b5ccb620b40d0702f482ea1c11867594ce20 100644
--- a/src/xercesc/dom/deprecated/DocumentFragmentImpl.cpp
+++ b/src/xercesc/dom/deprecated/DocumentFragmentImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/DocumentFragmentImpl.hpp b/src/xercesc/dom/deprecated/DocumentFragmentImpl.hpp
index b74990c26dd4abf3beefb6028a6072608d7e8408..2860983693c5faaeecd321f6dbcfcc37786a93b9 100644
--- a/src/xercesc/dom/deprecated/DocumentFragmentImpl.hpp
+++ b/src/xercesc/dom/deprecated/DocumentFragmentImpl.hpp
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -64,7 +64,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/DocumentImpl.cpp b/src/xercesc/dom/deprecated/DocumentImpl.cpp
index 84bf283f1b998e3f015dbbd23a0827ad3925f7dd..1b44330cfbb63f3e802d6609b0639860764836f6 100644
--- a/src/xercesc/dom/deprecated/DocumentImpl.cpp
+++ b/src/xercesc/dom/deprecated/DocumentImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/DocumentImpl.hpp b/src/xercesc/dom/deprecated/DocumentImpl.hpp
index 7e7138f5e904e04068d4ba1ee1b0fb89a7d090ad..7b5f6a0ade3fdf745ad3e64bbfe70755490692ef 100644
--- a/src/xercesc/dom/deprecated/DocumentImpl.hpp
+++ b/src/xercesc/dom/deprecated/DocumentImpl.hpp
@@ -4,7 +4,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/DocumentTypeImpl.cpp b/src/xercesc/dom/deprecated/DocumentTypeImpl.cpp
index 7fce1de2d2ef99293b0f0270bc024aa72f9cb1a3..69554f87cda25d2334e58ebf69a6c04bd0b42980 100644
--- a/src/xercesc/dom/deprecated/DocumentTypeImpl.cpp
+++ b/src/xercesc/dom/deprecated/DocumentTypeImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/DocumentTypeImpl.hpp b/src/xercesc/dom/deprecated/DocumentTypeImpl.hpp
index 2bb32856d956e7c144c25ea4469177614b4d5d3d..e61d2d09a66345e6a24242a6ac4b769bcb8d7cbd 100644
--- a/src/xercesc/dom/deprecated/DocumentTypeImpl.hpp
+++ b/src/xercesc/dom/deprecated/DocumentTypeImpl.hpp
@@ -4,7 +4,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/DomMemDebug.cpp b/src/xercesc/dom/deprecated/DomMemDebug.cpp
index a2ae018cca55282e1f31c6886219a1753a493f98..ef033186c407884b4b90cc86eeb2603fb9253d6a 100644
--- a/src/xercesc/dom/deprecated/DomMemDebug.cpp
+++ b/src/xercesc/dom/deprecated/DomMemDebug.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,35 +55,12 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:43 peiyongz
- * sane_include
- *
- * Revision 1.4 2001/07/20 17:09:43 tng
- * Add some test cases in the tests folder to sanityTest.pl.
- *
- * Revision 1.3 2000/03/02 19:54:00 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.2 2000/02/06 07:47:32 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:47 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:25 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "DomMemDebug.hpp"
-#include <xercesc/dom/DOMString.hpp>
+#include "DOMString.hpp"
#include "NodeImpl.hpp"
#include "NamedNodeMapImpl.hpp"
#include <stdio.h>
diff --git a/src/xercesc/dom/deprecated/DomMemDebug.hpp b/src/xercesc/dom/deprecated/DomMemDebug.hpp
index 11d74ac3c4557847b963824527cd65aae4fd3ea7..aec38bb7ef368d5fb082936a0d5d63d77efcfa31 100644
--- a/src/xercesc/dom/deprecated/DomMemDebug.hpp
+++ b/src/xercesc/dom/deprecated/DomMemDebug.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -48,7 +48,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -58,30 +58,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:44 peiyongz
- * sane_include
- *
- * Revision 1.4 2000/03/02 19:54:00 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.3 2000/02/24 20:11:29 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.2 2000/02/06 07:47:32 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:47 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:25 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include <xercesc/util/XercesDefs.hpp>
diff --git a/src/xercesc/dom/deprecated/ElementDefinitionImpl.cpp b/src/xercesc/dom/deprecated/ElementDefinitionImpl.cpp
index e5f5781b6a2119f4278a5859bf4ca62215100414..0f3b7db686d791a03ed1bb66a0502c2f6eef3d2f 100644
--- a/src/xercesc/dom/deprecated/ElementDefinitionImpl.cpp
+++ b/src/xercesc/dom/deprecated/ElementDefinitionImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/ElementDefinitionImpl.hpp b/src/xercesc/dom/deprecated/ElementDefinitionImpl.hpp
index 74b51441ffeb15651aaa75b21c19f9200c0ee72a..fa6da86cd78842924946b7acbdc4cbbbc2f4f6dd 100644
--- a/src/xercesc/dom/deprecated/ElementDefinitionImpl.hpp
+++ b/src/xercesc/dom/deprecated/ElementDefinitionImpl.hpp
@@ -4,7 +4,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/ElementImpl.hpp b/src/xercesc/dom/deprecated/ElementImpl.hpp
index 1bb01e9d166369fb1fde329e8ef029e018e2be31..c6b1f41d8c1bec9abdf98088264b9468e238a066 100644
--- a/src/xercesc/dom/deprecated/ElementImpl.hpp
+++ b/src/xercesc/dom/deprecated/ElementImpl.hpp
@@ -65,7 +65,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/ElementNSImpl.cpp b/src/xercesc/dom/deprecated/ElementNSImpl.cpp
index 9deb53d30520f93591d8e7cec67f033f7e390e76..4f36fb33ec083185751bf20a9a05fce60c3838ab 100644
--- a/src/xercesc/dom/deprecated/ElementNSImpl.cpp
+++ b/src/xercesc/dom/deprecated/ElementNSImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/ElementNSImpl.hpp b/src/xercesc/dom/deprecated/ElementNSImpl.hpp
index d987e4eaf6b3258068c1434009530f8080f08149..8845b236adaab8381e52f1ba98fcab60d6e2da49 100644
--- a/src/xercesc/dom/deprecated/ElementNSImpl.hpp
+++ b/src/xercesc/dom/deprecated/ElementNSImpl.hpp
@@ -4,7 +4,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/EntityImpl.cpp b/src/xercesc/dom/deprecated/EntityImpl.cpp
index 95a9335b649513386e0e664d813d09aae3e2dc6c..1457913aea94788d71b1cb3f7e40b4dfb8f1be06 100644
--- a/src/xercesc/dom/deprecated/EntityImpl.cpp
+++ b/src/xercesc/dom/deprecated/EntityImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/EntityImpl.hpp b/src/xercesc/dom/deprecated/EntityImpl.hpp
index cb9b991837260d9cb9a54b713cfead36d848d7c2..d223a16f8b8662e5387537873628ade60409c99d 100644
--- a/src/xercesc/dom/deprecated/EntityImpl.hpp
+++ b/src/xercesc/dom/deprecated/EntityImpl.hpp
@@ -4,7 +4,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/EntityReferenceImpl.cpp b/src/xercesc/dom/deprecated/EntityReferenceImpl.cpp
index fde30acef2a1a8775b6d14f7b9a84a0ffb2c8c64..7c914114023dcb2c31a1449d0fef609b475fd057 100644
--- a/src/xercesc/dom/deprecated/EntityReferenceImpl.cpp
+++ b/src/xercesc/dom/deprecated/EntityReferenceImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/EntityReferenceImpl.hpp b/src/xercesc/dom/deprecated/EntityReferenceImpl.hpp
index d19e9194612b8875c6fa1399694854fdea60662d..4660951fff85098b375f7ca13ba7566d00ab3d6e 100644
--- a/src/xercesc/dom/deprecated/EntityReferenceImpl.hpp
+++ b/src/xercesc/dom/deprecated/EntityReferenceImpl.hpp
@@ -4,7 +4,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/Makefile.in b/src/xercesc/dom/deprecated/Makefile.in
index d0f0d17de25241657983868bd1e4a2ef47206b6d..dc8a7162c1e551cbd455f8e7e3a5cf5f1132c890 100644
--- a/src/xercesc/dom/deprecated/Makefile.in
+++ b/src/xercesc/dom/deprecated/Makefile.in
@@ -1,7 +1,7 @@
#
# The Apache Software License, Version 1.1
#
-# Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+# Copyright (c) 1999-2002 The Apache Software Foundation. All rights
# reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -73,11 +73,13 @@ TRANSCODER = @transcoder@
THREADS = @threads@
MODULE = dom
+SUBMODULE = deprecated
-include ../Makefile.incl
+include ../../Makefile.incl
-DOM_CPP_PUBHEADERS = \
+DOM_DEPRECATED_CPP_PUBHEADERS = \
DOM.hpp \
+ DOMParser.hpp \
DOMString.hpp \
DOM_Attr.hpp \
DOM_CDATASection.hpp \
@@ -105,7 +107,7 @@ DOM_CPP_PUBHEADERS = \
DOM_TreeWalker.hpp \
DOM_XMLDecl.hpp
-DOM_CPP_PRIVHEADERS = \
+DOM_DEPRECATED_CPP_PRIVHEADERS = \
AttrImpl.hpp \
AttrMapImpl.hpp \
AttrNSImpl.hpp \
@@ -114,6 +116,7 @@ DOM_CPP_PRIVHEADERS = \
ChildNode.hpp \
CommentImpl.hpp \
DStringPool.hpp \
+ DOMStringImpl.hpp \
DeepNodeListImpl.hpp \
DocumentFragmentImpl.hpp \
DocumentImpl.hpp \
@@ -140,10 +143,10 @@ DOM_CPP_PRIVHEADERS = \
TreeWalkerImpl.hpp \
XMLDeclImpl.hpp
-DOM_C_FILES =
+DOM_DEPRECATED_C_FILES =
-DOM_CPP_OBJECTS = \
+DOM_DEPRECATED_CPP_OBJECTS = \
AttrImpl.$(TO) \
AttrMapImpl.$(TO) \
AttrNSImpl.$(TO) \
@@ -151,6 +154,7 @@ DOM_CPP_OBJECTS = \
CharacterDataImpl.$(TO) \
ChildNode.$(TO) \
CommentImpl.$(TO) \
+ DOMParser.$(TO) \
DOMString.$(TO) \
DOM_Attr.$(TO) \
DOM_CDATASection.$(TO) \
@@ -191,7 +195,7 @@ DOM_CPP_OBJECTS = \
NodeIDMap.$(TO) \
NodeImpl.$(TO) \
NodeIteratorImpl.$(TO) \
- NodeListImpl.$(TO) \
+ NodeListImpl.$(TO) \
NodeVector.$(TO) \
NotationImpl.$(TO) \
ParentNode.$(TO) \
@@ -203,27 +207,27 @@ DOM_CPP_OBJECTS = \
XMLDeclImpl.$(TO)
-all:: includes $(DOM_CPP_OBJECTS)
+all:: includes $(DOM_DEPRECATED_CPP_OBJECTS)
-includes:: pubheaders $(DOM_C_FILES)
+includes:: pubheaders $(DOM_DEPRECATED_C_FILES)
pubheaders::
- -mkdir -p $(XML_INC_DIR)/$(MODULE)
- $(CP) $(DOM_CPP_PUBHEADERS) $(DOM_C_FILES) $(XML_INC_DIR)/$(MODULE)
+ -mkdir -p $(XML_INC_DIR)/$(MODULE)/$(SUBMODULE)
+ $(CP) $(DOM_DEPRECATED_CPP_PUBHEADERS) $(DOM_DEPRECATED_C_FILES) $(XML_INC_DIR)/$(MODULE)/$(SUBMODULE)
# this may generate unnecessary dependencies, but it makes life easier
depend:: includes
$(MAKE_DEPEND) $(XML_INCL) *.cpp > $(DEPFILE)
clean::
- @echo "Making clean in $(MODULE) ..."
- $(RM2) $(addprefix $(XML_OBJ_DIR)/,$(DOM_CPP_OBJECTS))
+ @echo "Making clean in $(MODULE)/$(SUBMODULE) ..."
+ $(RM2) $(addprefix $(XML_OBJ_DIR)/,$(DOM_DEPRECATED_CPP_OBJECTS))
distclean:: clean
$(RM) Makefile $(DEPFILE)
- @echo "Removing all $(MODULE) header files ..."
- $(RM2) $(addprefix $(XML_INC_DIR)/$(MODULE)/,$(DOM_CPP_PUBHEADERS))
+ @echo "Removing all $(MODULE)/$(SUBMODULE) header files ..."
+ $(RM2) $(addprefix $(XML_INC_DIR)/$(MODULE)/$(SUBMODULE)/,$(DOM_DEPRECATED_CPP_PUBHEADERS))
install::
- -mkdir -p $(PREFIX_INCLUDE)/$(MODULE)
- $(CP) $(DOM_CPP_PUBHEADERS) $(DOM_C_FILES) $(PREFIX_INCLUDE)/$(MODULE)
+ -mkdir -p $(PREFIX_INCLUDE)/$(MODULE)/$(SUBMODULE)
+ $(CP) $(DOM_DEPRECATED_CPP_PUBHEADERS) $(DOM_DEPRECATED_C_FILES) $(PREFIX_INCLUDE)/$(MODULE)/$(SUBMODULE)
diff --git a/src/xercesc/dom/deprecated/MemDebug.hpp b/src/xercesc/dom/deprecated/MemDebug.hpp
index bc20a1f98f823645fa196097ff2f1311930ab552..de711ec27f0120ae0c34dabcce6deadfbb376b48 100644
--- a/src/xercesc/dom/deprecated/MemDebug.hpp
+++ b/src/xercesc/dom/deprecated/MemDebug.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -48,7 +48,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -58,25 +58,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:48 peiyongz
- * sane_include
- *
- * Revision 1.3 2000/02/24 20:11:30 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.2 2000/02/06 07:47:33 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:11 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:28 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
diff --git a/src/xercesc/dom/deprecated/NameNodeFilter.hpp b/src/xercesc/dom/deprecated/NameNodeFilter.hpp
index 7c70c9581a2dd19ed2a9421214c4d3a31dc803be..62f94303f535247c101cb6bf6dcfcd04744f2703 100644
--- a/src/xercesc/dom/deprecated/NameNodeFilter.hpp
+++ b/src/xercesc/dom/deprecated/NameNodeFilter.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,35 +55,17 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:48 peiyongz
- * sane_include
- *
- * Revision 1.4 2000/02/24 20:11:30 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.3 2000/02/15 23:17:37 andyh
- * Update Doc++ API comments
- * NameSpace bugfix and update to track W3C
- * Chih Hsiang Chou
- *
- * Revision 1.2 2000/02/06 07:47:33 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:12 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:28 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
-// DOM_NameNodeFilter.h: interface for the DOM_NameNodeFilter class.
//
-//////////////////////////////////////////////////////////////////////
+// This file is part of the internal implementation of the C++ XML DOM.
+// It should NOT be included or used directly by application programs.
+//
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
+// DOM API, or DOM_*.hpp for individual DOM classes, where the class
+// name is substituded for the *.
+//
#ifndef DOM_NameNodeFilter_HEADER_GUARD_
#define DOM_NameNodeFilter_HEADER_GUARD_
diff --git a/src/xercesc/dom/deprecated/NamedNodeMapImpl.cpp b/src/xercesc/dom/deprecated/NamedNodeMapImpl.cpp
index df58808ae2fe3818cebbc32bde8be7e5e72d47a9..804131bb50ef08eb1295ddb145eae00e0db48e70 100644
--- a/src/xercesc/dom/deprecated/NamedNodeMapImpl.cpp
+++ b/src/xercesc/dom/deprecated/NamedNodeMapImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/NamedNodeMapImpl.hpp b/src/xercesc/dom/deprecated/NamedNodeMapImpl.hpp
index a6f54b104d3da633bc7edfb684cf22b6a3a29d01..05abc05ee827d337ab15b22646c6b3e5eda7254b 100644
--- a/src/xercesc/dom/deprecated/NamedNodeMapImpl.hpp
+++ b/src/xercesc/dom/deprecated/NamedNodeMapImpl.hpp
@@ -4,7 +4,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/NodeIDMap.hpp b/src/xercesc/dom/deprecated/NodeIDMap.hpp
index b79fcda4ea73fa7ccf6d27223457995d57987811..e398fb4d3eb73c1e3af79e7cd0459f8085ed5eae 100644
--- a/src/xercesc/dom/deprecated/NodeIDMap.hpp
+++ b/src/xercesc/dom/deprecated/NodeIDMap.hpp
@@ -4,7 +4,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,7 +62,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/NodeImpl.hpp b/src/xercesc/dom/deprecated/NodeImpl.hpp
index 85f21f0bbc295ec6748e69b885d4279a15579d27..a3217cc7f0305d8d8e587cbfe27a482b7741d997 100644
--- a/src/xercesc/dom/deprecated/NodeImpl.hpp
+++ b/src/xercesc/dom/deprecated/NodeImpl.hpp
@@ -65,7 +65,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/NodeIteratorImpl.cpp b/src/xercesc/dom/deprecated/NodeIteratorImpl.cpp
index 628eee111f99f11c9276ddb0030cd62a76af9d44..c6f62d94a74f11057fba0210cf6083b4b92daf3d 100644
--- a/src/xercesc/dom/deprecated/NodeIteratorImpl.cpp
+++ b/src/xercesc/dom/deprecated/NodeIteratorImpl.cpp
@@ -55,70 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.3 2002/03/15 16:29:56 tng
- * [Bug 6888] NodeIterator. Retrofit this typo that was applied to Xerces-J, although this function "matchNodeOrParent" is not used in Xerces-C++....
- *
- * Revision 1.2 2002/02/04 20:03:48 tng
- * Add DOM Level missing functions:
- * 1. NodeIterator::getRoot
- * 2. TreeWalker::getRoot
- * 3. Element::hasAttribute
- * 4. Element::hasAttributeNS
- * 5. Node::hasAttributes
- * 6. Node::isSupported
- *
- * Revision 1.1.1.1 2002/02/01 22:21:48 peiyongz
- * sane_include
- *
- * Revision 1.12 2001/10/18 18:01:29 tng
- * [Bug 1699] Redirect "delete this" to a temp ptr to bypass AIX xlC v5 optimization memory leak problem.
- *
- * Revision 1.11 2000/11/01 01:26:30 andyh
- * DOM NodeIterator bug fix - iterators would sometimes continue beyond
- * their starting (root) node. Fix from Tinny Ng.
- *
- * Revision 1.10 2000/07/17 23:00:16 jpolast
- * bug fix for SHOW_ELEMENT flag incorrectly being retreived.
- * contributed by Grace Yan and Joe Kesselman.
- *
- * Revision 1.9 2000/03/02 19:54:03 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.8 2000/02/08 20:26:11 aruna1
- * NodeIterator problem solved
- *
- * Revision 1.7 2000/02/08 01:16:18 aruna1
- * nodeIterator previous tracking problem solved
- *
- * Revision 1.6 2000/02/06 07:47:33 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.5 2000/02/04 01:49:26 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.4 1999/11/30 21:16:25 roddey
- * Changes to add the transcode() method to DOMString, which returns a transcoded
- * version (to local code page) of the DOM string contents. And I changed all of the
- * exception 'throw by pointer' to 'throw by value' style.
- *
- * Revision 1.3 1999/11/23 01:48:16 rahulj
- * Changed 0L to 0. CC under HPUX is happy now.
- *
- * Revision 1.2 1999/11/20 00:56:39 rahulj
- * Source files must end with an un-escaped newline.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:15 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:30 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
// NodeIteratorImpl.cpp: implementation of the NodeIteratorImpl class.
diff --git a/src/xercesc/dom/deprecated/NodeIteratorImpl.hpp b/src/xercesc/dom/deprecated/NodeIteratorImpl.hpp
index 2711ccf115e4587ad52e604bb3a298e55ce301e8..acd706d647ce3be8e048422c423544dfd00d5141 100644
--- a/src/xercesc/dom/deprecated/NodeIteratorImpl.hpp
+++ b/src/xercesc/dom/deprecated/NodeIteratorImpl.hpp
@@ -55,51 +55,21 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.2 2002/02/04 20:03:48 tng
- * Add DOM Level missing functions:
- * 1. NodeIterator::getRoot
- * 2. TreeWalker::getRoot
- * 3. Element::hasAttribute
- * 4. Element::hasAttributeNS
- * 5. Node::hasAttributes
- * 6. Node::isSupported
- *
- * Revision 1.1.1.1 2002/02/01 22:21:48 peiyongz
- * sane_include
- *
- * Revision 1.5 2000/02/24 20:11:30 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.4 2000/02/15 23:17:37 andyh
- * Update Doc++ API comments
- * NameSpace bugfix and update to track W3C
- * Chih Hsiang Chou
- *
- * Revision 1.3 2000/02/06 07:47:33 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/02/04 01:49:26 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.1.1.1 1999/11/09 01:09:16 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:30 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#ifndef NodeIteratorImpl_HEADER_GUARD_
#define NodeIteratorImpl_HEADER_GUARD_
-
-// NodeIteratorImpl.hpp: interface for the NodeIteratorImpl class.
//
-//////////////////////////////////////////////////////////////////////
+// This file is part of the internal implementation of the C++ XML DOM.
+// It should NOT be included or used directly by application programs.
+//
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
+// DOM API, or DOM_*.hpp for individual DOM classes, where the class
+// name is substituded for the *.
+//
+
#include "DOM_Node.hpp"
#include "DOM_NodeIterator.hpp"
diff --git a/src/xercesc/dom/deprecated/NodeListImpl.cpp b/src/xercesc/dom/deprecated/NodeListImpl.cpp
index 3fbb86c095517a759db3b34ed7625493e0d9b3fc..6befc3bfbeb73eaf23257b87f8431e1ea55ad859 100644
--- a/src/xercesc/dom/deprecated/NodeListImpl.cpp
+++ b/src/xercesc/dom/deprecated/NodeListImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,27 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:48 peiyongz
- * sane_include
- *
- * Revision 1.3 2000/03/02 19:54:03 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.2 2000/02/06 07:47:33 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:16 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:31 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
diff --git a/src/xercesc/dom/deprecated/NodeListImpl.hpp b/src/xercesc/dom/deprecated/NodeListImpl.hpp
index 451bf0e624248c9be17015cc3be70ee1cad4b787..61fd051d0a2ba373b6ae9f7ed88b09b8538841f3 100644
--- a/src/xercesc/dom/deprecated/NodeListImpl.hpp
+++ b/src/xercesc/dom/deprecated/NodeListImpl.hpp
@@ -2,38 +2,38 @@
#define NodeListImpl_HEADER_GUARD_
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -47,7 +47,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -57,50 +57,14 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:48 peiyongz
- * sane_include
- *
- * Revision 1.7 2000/03/02 19:54:03 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.6 2000/02/24 20:11:30 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.5 2000/02/06 07:47:34 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.4 2000/02/04 01:49:26 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.3 2000/01/22 01:38:30 andyh
- * Remove compiler warnings in DOM impl classes
- *
- * Revision 1.2 1999/12/21 07:47:07 robweir
- * Patches to support Xalan, where we need to create a
- * "special" DOM with subclassed Nodes.
- *
- * 1. Export the NodeImpl-derived classes
- * 2. Ensure that their constructors have at least protected access
- *
- * Revision 1.1.1.1 1999/11/09 01:09:17 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:31 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
//
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/NodeVector.cpp b/src/xercesc/dom/deprecated/NodeVector.cpp
index a36d442ab6cbfaeb4a03a9a2626a11a16b8a8220..f7a2279572850706b38cd303748157f36d25e0e6 100644
--- a/src/xercesc/dom/deprecated/NodeVector.cpp
+++ b/src/xercesc/dom/deprecated/NodeVector.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,38 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:48 peiyongz
- * sane_include
- *
- * Revision 1.6 2000/05/22 22:38:12 andyh
- * DOM: GetNodeById(), fixed bad problem with rehash operation that caused
- * creashes.
- *
- * Revision 1.5 2000/03/28 19:43:13 roddey
- * Fixes for signed/unsigned warnings. New work for two way transcoding
- * stuff.
- *
- * Revision 1.4 2000/03/02 19:54:03 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.3 2000/02/06 07:47:34 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/02/04 01:49:25 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.1.1.1 1999/11/09 01:09:17 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:31 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
//
@@ -198,5 +167,5 @@ void NodeVector::setElementAt(NodeImpl *elem, unsigned int index) {
unsigned int NodeVector::size() {
return nextFreeSlot;
};
-
+
diff --git a/src/xercesc/dom/deprecated/NodeVector.hpp b/src/xercesc/dom/deprecated/NodeVector.hpp
index 9dba66eb2cb696388ffdca343e610cea5ac0f56b..bfecf9401a9ec16d39cf59c08d7f5f11d82628f8 100644
--- a/src/xercesc/dom/deprecated/NodeVector.hpp
+++ b/src/xercesc/dom/deprecated/NodeVector.hpp
@@ -2,38 +2,38 @@
#define NodeVector_HEADER_GUARD_
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -47,7 +47,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -57,40 +57,14 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:48 peiyongz
- * sane_include
- *
- * Revision 1.5 2000/03/02 19:54:04 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.4 2000/02/24 20:11:30 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.3 2000/02/06 07:47:34 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/02/04 01:49:25 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.1.1.1 1999/11/09 01:09:17 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:31 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
//
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
@@ -107,12 +81,12 @@ private:
unsigned int nextFreeSlot;
void init(unsigned int size);
void checkSpace();
-
+
public:
NodeVector();
NodeVector(unsigned int size);
~NodeVector();
-
+
unsigned int size();
NodeImpl *elementAt(unsigned int index);
NodeImpl *lastElement();
diff --git a/src/xercesc/dom/deprecated/NotationImpl.cpp b/src/xercesc/dom/deprecated/NotationImpl.cpp
index 1856e97bea92808dfe4fbb45908a1f877928dd33..7109802982788bea55b9de7bef858539b98a99c2 100644
--- a/src/xercesc/dom/deprecated/NotationImpl.cpp
+++ b/src/xercesc/dom/deprecated/NotationImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/NotationImpl.hpp b/src/xercesc/dom/deprecated/NotationImpl.hpp
index 203ad102524d50a952b0bf635a38b131db08835f..07bff26ffd46d0009bf3fd072cd837c20db0539e 100644
--- a/src/xercesc/dom/deprecated/NotationImpl.hpp
+++ b/src/xercesc/dom/deprecated/NotationImpl.hpp
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -64,7 +64,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/ParentNode.cpp b/src/xercesc/dom/deprecated/ParentNode.cpp
index 6d59382e7d5b889ca314a0f0b9e0a425ea2b8d51..ebe41400ea96955aa96107704802cba7e53aab84 100644
--- a/src/xercesc/dom/deprecated/ParentNode.cpp
+++ b/src/xercesc/dom/deprecated/ParentNode.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/ParentNode.hpp b/src/xercesc/dom/deprecated/ParentNode.hpp
index 269c7cde4b605509d8b814a20ef87334ea4dfda5..cd686b9a3d7e3f44d26923feca45feb8a9c50801 100644
--- a/src/xercesc/dom/deprecated/ParentNode.hpp
+++ b/src/xercesc/dom/deprecated/ParentNode.hpp
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,7 +60,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/ProcessingInstructionImpl.cpp b/src/xercesc/dom/deprecated/ProcessingInstructionImpl.cpp
index f66d7670579849669b6ea1a96137515623f12281..f241a5410522926a6f2d6a161f04607b2690c277 100644
--- a/src/xercesc/dom/deprecated/ProcessingInstructionImpl.cpp
+++ b/src/xercesc/dom/deprecated/ProcessingInstructionImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/ProcessingInstructionImpl.hpp b/src/xercesc/dom/deprecated/ProcessingInstructionImpl.hpp
index 7734aa36cc1c69bfbb504f8cc3726141416ece62..d9b13bcb8daac49bc5032e393299d8ee927ebaa8 100644
--- a/src/xercesc/dom/deprecated/ProcessingInstructionImpl.hpp
+++ b/src/xercesc/dom/deprecated/ProcessingInstructionImpl.hpp
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -64,7 +64,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/RangeImpl.cpp b/src/xercesc/dom/deprecated/RangeImpl.cpp
index 48f701d09965aacf8d3d868d5c3ec6af86548901..34ff1acdc242bfb98eb861354a2ffe6a120ba4e2 100644
--- a/src/xercesc/dom/deprecated/RangeImpl.cpp
+++ b/src/xercesc/dom/deprecated/RangeImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/RangeImpl.hpp b/src/xercesc/dom/deprecated/RangeImpl.hpp
index a93b8020d99d84bbbb3d30333b86e989701738c2..eae657e350c41a6c62037c8694add5acae315307 100644
--- a/src/xercesc/dom/deprecated/RangeImpl.hpp
+++ b/src/xercesc/dom/deprecated/RangeImpl.hpp
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,6 +60,14 @@
* $Id$
*/
+//
+// This file is part of the internal implementation of the C++ XML DOM.
+// It should NOT be included or used directly by application programs.
+//
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
+// DOM API, or DOM_*.hpp for individual DOM classes, where the class
+// name is substituded for the *.
+//
#include "DOM_Node.hpp"
@@ -71,9 +79,9 @@
typedef RefVectorOf<RangeImpl> Ranges;
-
+
class CDOM_EXPORT RangeImpl : public RefCountedImpl {
-public:
+public:
//c'tor
RangeImpl(DOM_Document doc);
RangeImpl(const RangeImpl& other);
@@ -83,16 +91,16 @@ public:
//referencing related functions
virtual void unreferenced();
-
+
//getter functions
DOM_Node getStartContainer() const;
unsigned int getStartOffset() const;
DOM_Node getEndContainer() const;
unsigned int getEndOffset() const;
-
-
-
+
+
+
void collapse(bool toStart);
bool getCollapsed() const;
@@ -106,15 +114,15 @@ public:
void selectNode(const DOM_Node& node);
void selectNodeContents(const DOM_Node& node);
-
+
short compareBoundaryPoints(DOM_Range::CompareHow how, RangeImpl* range) const;
-
+
void detach();
-
+
void deleteContents();
-
+
RangeImpl* cloneRange() const;
- DOMString toString() const;
+ DOMString toString() const;
DOM_Document getDocument();
void surroundContents(DOM_Node& node);
@@ -138,31 +146,31 @@ private:
};
enum TraversePoint {
- BEFORE = -1,
+ BEFORE = -1,
START = 0,
AFTER = 1
};
//setter functions
- void setStartContainer(const DOM_Node& node);
+ void setStartContainer(const DOM_Node& node);
void setStartOffset(unsigned int offset) ;
void setEndContainer(const DOM_Node& node);
void setEndOffset(unsigned int offset) ;
//misc functions
void validateNode(const DOM_Node& node) const;
- bool isValidAncestorType(const DOM_Node& node) const;
+ bool isValidAncestorType(const DOM_Node& node) const;
bool hasLegalRootContainer(const DOM_Node& node) const;
bool isLegalContainedNode(const DOM_Node& node ) const;
void checkIndex(const DOM_Node& node, unsigned int offset) const;
static bool isAncestorOf(const DOM_Node& a, const DOM_Node& b);
-
+
unsigned short indexOf(const DOM_Node& child, const DOM_Node& parent) const;
const DOM_Node commonAncestorOf(const DOM_Node& pointA, const DOM_Node& pointB) const;
DOM_Node nextNode(const DOM_Node& node, bool visitChildren) const;
DOM_DocumentFragment traverseContents(TraversalType type);
- void checkReadOnly(DOM_Node& start, DOM_Node& end,
+ void checkReadOnly(DOM_Node& start, DOM_Node& end,
unsigned int starOffset, unsigned int endOffset);
void recurseTreeAndCheck(DOM_Node& start, DOM_Node& end);
DOM_Node removeChild(DOM_Node& parent, DOM_Node& child);
@@ -179,8 +187,8 @@ private:
DOM_Node traverseTextNode( DOM_Node n, bool isLeft, int how );
DOM_Node getSelectedNode( DOM_Node container, int offset );
-
- //private data
+
+ //private data
DOM_Node fStartContainer;
unsigned int fStartOffset;
DOM_Node fEndContainer;
@@ -188,9 +196,9 @@ private:
bool fCollapsed;
DOM_Document fDocument;
bool fDetached;
-
+
DOM_Node fRemoveChild;
-
+
};
#endif
diff --git a/src/xercesc/dom/deprecated/RefCountedImpl.cpp b/src/xercesc/dom/deprecated/RefCountedImpl.cpp
index 45eb26a613934028f6993b6da307bfe266b7fb49..17df84f79ea45284d7d6c5bad4f9b3897c6c06d7 100644
--- a/src/xercesc/dom/deprecated/RefCountedImpl.cpp
+++ b/src/xercesc/dom/deprecated/RefCountedImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,27 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:49 peiyongz
- * sane_include
- *
- * Revision 1.3 2000/03/02 19:54:04 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.2 2000/02/06 07:47:34 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:19 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:32 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "RefCountedImpl.hpp"
diff --git a/src/xercesc/dom/deprecated/RefCountedImpl.hpp b/src/xercesc/dom/deprecated/RefCountedImpl.hpp
index 7ff68c827280ba52ed174203b2c81856e6df46af..13ac8caa28d04aaff5ee4fbbbe099f73564ead5c 100644
--- a/src/xercesc/dom/deprecated/RefCountedImpl.hpp
+++ b/src/xercesc/dom/deprecated/RefCountedImpl.hpp
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -57,37 +57,14 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.1.1.1 2002/02/01 22:21:49 peiyongz
- * sane_include
- *
- * Revision 1.4 2000/03/02 19:54:04 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.3 2000/02/24 20:11:31 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.2 2000/02/06 07:47:34 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:19 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:33 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
//
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/TextImpl.cpp b/src/xercesc/dom/deprecated/TextImpl.cpp
index b4918ef8f5f6339addf8b9b3a59f119b949ec0c9..5b0eeed3186dd858a59d126451cd6c6a2c33f95b 100644
--- a/src/xercesc/dom/deprecated/TextImpl.cpp
+++ b/src/xercesc/dom/deprecated/TextImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/TextImpl.hpp b/src/xercesc/dom/deprecated/TextImpl.hpp
index 2d241320890f3710b7fc97b09791cbcd828d9b56..d6c681479d4201a6df8601723f4597dba16497c3 100644
--- a/src/xercesc/dom/deprecated/TextImpl.hpp
+++ b/src/xercesc/dom/deprecated/TextImpl.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,7 +62,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//
diff --git a/src/xercesc/dom/deprecated/TreeWalkerImpl.cpp b/src/xercesc/dom/deprecated/TreeWalkerImpl.cpp
index 2ded3dabcc5e877dfd3b9b42094caa7777daa4d0..393a0f28d9ec8dcb5d3d0e497d1dfc06cef1e2b9 100644
--- a/src/xercesc/dom/deprecated/TreeWalkerImpl.cpp
+++ b/src/xercesc/dom/deprecated/TreeWalkerImpl.cpp
@@ -55,56 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.2 2002/02/04 20:03:48 tng
- * Add DOM Level missing functions:
- * 1. NodeIterator::getRoot
- * 2. TreeWalker::getRoot
- * 3. Element::hasAttribute
- * 4. Element::hasAttributeNS
- * 5. Node::hasAttributes
- * 6. Node::isSupported
- *
- * Revision 1.1.1.1 2002/02/01 22:21:49 peiyongz
- * sane_include
- *
- * Revision 1.9 2001/10/18 18:01:29 tng
- * [Bug 1699] Redirect "delete this" to a temp ptr to bypass AIX xlC v5 optimization memory leak problem.
- *
- * Revision 1.8 2000/08/08 01:00:36 aruna1
- * detach functionality removed from TreeWalker
- *
- * Revision 1.7 2000/03/28 23:22:17 aruna1
- * Modified return statements in functions to avoid warnings on HP.
- *
- * Revision 1.6 2000/03/02 19:54:05 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.5 2000/02/06 07:47:34 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.4 2000/02/04 01:49:25 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.3 1999/11/30 21:16:26 roddey
- * Changes to add the transcode() method to DOMString, which returns a transcoded
- * version (to local code page) of the DOM string contents. And I changed all of the
- * exception 'throw by pointer' to 'throw by value' style.
- *
- * Revision 1.2 1999/11/23 01:48:17 rahulj
- * Changed 0L to 0. CC under HPUX is happy now.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:20 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:33 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
#include "TreeWalkerImpl.hpp"
diff --git a/src/xercesc/dom/deprecated/TreeWalkerImpl.hpp b/src/xercesc/dom/deprecated/TreeWalkerImpl.hpp
index d95cc3473c97a305ceb9f5d98e34a09565626a96..fbce5473b9a75013778a47a21957d6c3ffef688d 100644
--- a/src/xercesc/dom/deprecated/TreeWalkerImpl.hpp
+++ b/src/xercesc/dom/deprecated/TreeWalkerImpl.hpp
@@ -55,47 +55,18 @@
*/
/*
- * $Log$
- * Revision 1.1 2002/05/21 19:57:17 tng
- * DOM Reorganization: Move old DOM interface files from src/xercesc/dom to src/xercesc/dom/deprecated
- *
- * Revision 1.2 2002/02/04 20:03:48 tng
- * Add DOM Level missing functions:
- * 1. NodeIterator::getRoot
- * 2. TreeWalker::getRoot
- * 3. Element::hasAttribute
- * 4. Element::hasAttributeNS
- * 5. Node::hasAttributes
- * 6. Node::isSupported
- *
- * Revision 1.1.1.1 2002/02/01 22:21:49 peiyongz
- * sane_include
- *
- * Revision 1.6 2000/08/08 01:00:37 aruna1
- * detach functionality removed from TreeWalker
- *
- * Revision 1.5 2000/02/24 20:11:31 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.4 2000/02/15 23:17:37 andyh
- * Update Doc++ API comments
- * NameSpace bugfix and update to track W3C
- * Chih Hsiang Chou
- *
- * Revision 1.3 2000/02/06 07:47:34 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/02/04 01:49:24 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.1.1.1 1999/11/09 01:09:20 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:34 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
+//
+// This file is part of the internal implementation of the C++ XML DOM.
+// It should NOT be included or used directly by application programs.
+//
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
+// DOM API, or DOM_*.hpp for individual DOM classes, where the class
+// name is substituded for the *.
+//
+
#ifndef TreeWalkerImpl_HEADER_GUARD_
#define TreeWalkerImpl_HEADER_GUARD_
diff --git a/src/xercesc/dom/deprecated/XMLDeclImpl.cpp b/src/xercesc/dom/deprecated/XMLDeclImpl.cpp
index a1fdbd8681c1e62045fa1160a48a9654f5853217..b496d4a8bf64a42fa11c62766c27285070e20151 100644
--- a/src/xercesc/dom/deprecated/XMLDeclImpl.cpp
+++ b/src/xercesc/dom/deprecated/XMLDeclImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/xercesc/dom/deprecated/XMLDeclImpl.hpp b/src/xercesc/dom/deprecated/XMLDeclImpl.hpp
index d53e470ba17ce41ed651558fc25de4bd7799d63e..b8030ef91a3c127affc42009e406b39e9066582e 100644
--- a/src/xercesc/dom/deprecated/XMLDeclImpl.hpp
+++ b/src/xercesc/dom/deprecated/XMLDeclImpl.hpp
@@ -4,7 +4,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
-// Applications should include the file <dom/DOM.hpp> for the entire
+// Applications should include the file <xercesc/dom/deprecated/DOM.hpp> for the entire
// DOM API, or DOM_*.hpp for individual DOM classes, where the class
// name is substituded for the *.
//