submitted 1.2.0

2025-10-14 23:07:56 +02:00 · 2006-08-29 07:10:35 +00:00
parent f476bd6b32
commit 2d4078f392
1428 changed files with 25715 additions and 12456 deletions
--- a/XML/testsuite/src/AttributesImplTest.cpp
+++ b/XML/testsuite/src/AttributesImplTest.cpp
@@ -1,7 +1,7 @@
 //
 // AttributesImplTest.cpp
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/AttributesImplTest.cpp#2 $
+// $Id: //poco/1.2/XML/testsuite/src/AttributesImplTest.cpp#1 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -33,10 +33,10 @@
 #include "AttributesImplTest.h"
 #include "CppUnit/TestCaller.h"
 #include "CppUnit/TestSuite.h"
-#include "SAX/AttributesImpl.h"
+#include "Poco/SAX/AttributesImpl.h"


-using XML::AttributesImpl;
+using Poco::XML::AttributesImpl;


 AttributesImplTest::AttributesImplTest(const std::string& name): CppUnit::TestCase(name)
--- a/XML/testsuite/src/AttributesImplTest.h
+++ b/XML/testsuite/src/AttributesImplTest.h
@@ -1,7 +1,7 @@
 //
 // AttributesImplTest.h
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/AttributesImplTest.h#2 $
+// $Id: //poco/1.2/XML/testsuite/src/AttributesImplTest.h#1 $
 //
 // Definition of the AttributesImplTest class.
 //
@@ -36,12 +36,8 @@
 #define AttributesImplTest_INCLUDED


-#ifndef XML_XML_INCLUDED
-#include "XML/XML.h"
-#endif
-#ifndef CppUnit_TestCase_INCLUDED
+#include "Poco/XML/XML.h"
 #include "CppUnit/TestCase.h"
-#endif


 class AttributesImplTest: public CppUnit::TestCase
--- a/XML/testsuite/src/ChildNodesTest.cpp
+++ b/XML/testsuite/src/ChildNodesTest.cpp
@@ -1,7 +1,7 @@
 //
 // ChildNodesTest.cpp
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/ChildNodesTest.cpp#2 $
+// $Id: //poco/1.2/XML/testsuite/src/ChildNodesTest.cpp#1 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -33,17 +33,17 @@
 #include "ChildNodesTest.h"
 #include "CppUnit/TestCaller.h"
 #include "CppUnit/TestSuite.h"
-#include "DOM/Document.h"
-#include "DOM/Element.h"
-#include "DOM/NodeList.h"
-#include "DOM/AutoPtr.h"
+#include "Poco/DOM/Document.h"
+#include "Poco/DOM/Element.h"
+#include "Poco/DOM/NodeList.h"
+#include "Poco/DOM/AutoPtr.h"


-using XML::Element;
-using XML::Document;
-using XML::NodeList;
-using XML::Node;
-using XML::AutoPtr;
+using Poco::XML::Element;
+using Poco::XML::Document;
+using Poco::XML::NodeList;
+using Poco::XML::Node;
+using Poco::XML::AutoPtr;


 ChildNodesTest::ChildNodesTest(const std::string& name): CppUnit::TestCase(name)
--- a/XML/testsuite/src/ChildNodesTest.h
+++ b/XML/testsuite/src/ChildNodesTest.h
@@ -1,7 +1,7 @@
 //
 // ChildNodesTest.h
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/ChildNodesTest.h#2 $
+// $Id: //poco/1.2/XML/testsuite/src/ChildNodesTest.h#1 $
 //
 // Definition of the ChildNodesTest class.
 //
@@ -36,12 +36,8 @@
 #define ChildNodesTest_INCLUDED


-#ifndef XML_XML_INCLUDED
-#include "XML/XML.h"
-#endif
-#ifndef CppUnit_TestCase_INCLUDED
+#include "Poco/XML/XML.h"
 #include "CppUnit/TestCase.h"
-#endif


 class ChildNodesTest: public CppUnit::TestCase
--- a/XML/testsuite/src/DOMTestSuite.cpp
+++ b/XML/testsuite/src/DOMTestSuite.cpp
@@ -1,7 +1,7 @@
 //
 // DOMTestSuite.cpp
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/DOMTestSuite.cpp#2 $
+// $Id: //poco/1.2/XML/testsuite/src/DOMTestSuite.cpp#1 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
--- a/XML/testsuite/src/DOMTestSuite.h
+++ b/XML/testsuite/src/DOMTestSuite.h
@@ -1,7 +1,7 @@
 //
 // DOMTestSuite.h
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/DOMTestSuite.h#2 $
+// $Id: //poco/1.2/XML/testsuite/src/DOMTestSuite.h#1 $
 //
 // Definition of the DOMTestSuite class.
 //
@@ -36,9 +36,7 @@
 #define DOMTestSuite_INCLUDED


-#ifndef CppUnit_TestSuite_INCLUDED
 #include "CppUnit/TestSuite.h"
-#endif


 class DOMTestSuite
--- a/XML/testsuite/src/DocumentTest.cpp
+++ b/XML/testsuite/src/DocumentTest.cpp
@@ -1,7 +1,7 @@
 //
 // DocumentTest.cpp
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/DocumentTest.cpp#2 $
+// $Id: //poco/1.2/XML/testsuite/src/DocumentTest.cpp#1 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -33,22 +33,22 @@
 #include "DocumentTest.h"
 #include "CppUnit/TestCaller.h"
 #include "CppUnit/TestSuite.h"
-#include "DOM/Document.h"
-#include "DOM/Element.h"
-#include "DOM/Text.h"
-#include "DOM/NodeList.h"
-#include "DOM/AutoPtr.h"
-#include "DOM/DOMException.h"
+#include "Poco/DOM/Document.h"
+#include "Poco/DOM/Element.h"
+#include "Poco/DOM/Text.h"
+#include "Poco/DOM/NodeList.h"
+#include "Poco/DOM/AutoPtr.h"
+#include "Poco/DOM/DOMException.h"


-using XML::Element;
-using XML::Document;
-using XML::Text;
-using XML::Node;
-using XML::NodeList;
-using XML::AutoPtr;
-using XML::XMLString;
-using XML::DOMException;
+using Poco::XML::Element;
+using Poco::XML::Document;
+using Poco::XML::Text;
+using Poco::XML::Node;
+using Poco::XML::NodeList;
+using Poco::XML::AutoPtr;
+using Poco::XML::XMLString;
+using Poco::XML::DOMException;


 DocumentTest::DocumentTest(const std::string& name): CppUnit::TestCase(name)
--- a/XML/testsuite/src/DocumentTest.h
+++ b/XML/testsuite/src/DocumentTest.h
@@ -1,7 +1,7 @@
 //
 // DocumentTest.h
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/DocumentTest.h#2 $
+// $Id: //poco/1.2/XML/testsuite/src/DocumentTest.h#1 $
 //
 // Definition of the DocumentTest class.
 //
@@ -36,12 +36,8 @@
 #define DocumentTest_INCLUDED


-#ifndef XML_XML_INCLUDED
-#include "XML/XML.h"
-#endif
-#ifndef CppUnit_TestCase_INCLUDED
+#include "Poco/XML/XML.h"
 #include "CppUnit/TestCase.h"
-#endif


 class DocumentTest: public CppUnit::TestCase
--- a/XML/testsuite/src/DocumentTypeTest.cpp
+++ b/XML/testsuite/src/DocumentTypeTest.cpp
@@ -1,7 +1,7 @@
 //
 // DocumentTypeTest.cpp
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/DocumentTypeTest.cpp#2 $
+// $Id: //poco/1.2/XML/testsuite/src/DocumentTypeTest.cpp#1 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -33,22 +33,22 @@
 #include "DocumentTypeTest.h"
 #include "CppUnit/TestCaller.h"
 #include "CppUnit/TestSuite.h"
-#include "DOM/DocumentType.h"
-#include "DOM/Document.h"
-#include "DOM/Notation.h"
-#include "DOM/Entity.h"
-#include "DOM/DOMImplementation.h"
-#include "DOM/NamedNodeMap.h"
-#include "DOM/AutoPtr.h"
+#include "Poco/DOM/DocumentType.h"
+#include "Poco/DOM/Document.h"
+#include "Poco/DOM/Notation.h"
+#include "Poco/DOM/Entity.h"
+#include "Poco/DOM/DOMImplementation.h"
+#include "Poco/DOM/NamedNodeMap.h"
+#include "Poco/DOM/AutoPtr.h"


-using XML::DocumentType;
-using XML::Document;
-using XML::Entity;
-using XML::Notation;
-using XML::DOMImplementation;
-using XML::NamedNodeMap;
-using XML::AutoPtr;
+using Poco::XML::DocumentType;
+using Poco::XML::Document;
+using Poco::XML::Entity;
+using Poco::XML::Notation;
+using Poco::XML::DOMImplementation;
+using Poco::XML::NamedNodeMap;
+using Poco::XML::AutoPtr;


 DocumentTypeTest::DocumentTypeTest(const std::string& name): CppUnit::TestCase(name)
--- a/XML/testsuite/src/DocumentTypeTest.h
+++ b/XML/testsuite/src/DocumentTypeTest.h
@@ -1,7 +1,7 @@
 //
 // DocumentTypeTest.h
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/DocumentTypeTest.h#2 $
+// $Id: //poco/1.2/XML/testsuite/src/DocumentTypeTest.h#1 $
 //
 // Definition of the DocumentTypeTest class.
 //
@@ -36,12 +36,8 @@
 #define DocumentTypeTest_INCLUDED


-#ifndef XML_XML_INCLUDED
-#include "XML/XML.h"
-#endif
-#ifndef CppUnit_TestCase_INCLUDED
+#include "Poco/XML/XML.h"
 #include "CppUnit/TestCase.h"
-#endif


 class DocumentTypeTest: public CppUnit::TestCase
--- a/XML/testsuite/src/Driver.cpp
+++ b/XML/testsuite/src/Driver.cpp
@@ -1,7 +1,7 @@
 //
 // Driver.cpp
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/Driver.cpp#2 $
+// $Id: //poco/1.2/XML/testsuite/src/Driver.cpp#1 $
 //
 // Console-based test driver for Poco XML.
 //
--- a/XML/testsuite/src/ElementTest.cpp
+++ b/XML/testsuite/src/ElementTest.cpp
@@ -1,7 +1,7 @@
 //
 // ElementTest.cpp
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/ElementTest.cpp#2 $
+// $Id: //poco/1.2/XML/testsuite/src/ElementTest.cpp#1 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -33,24 +33,24 @@
 #include "ElementTest.h"
 #include "CppUnit/TestCaller.h"
 #include "CppUnit/TestSuite.h"
-#include "DOM/Document.h"
-#include "DOM/Element.h"
-#include "DOM/Attr.h"
-#include "DOM/Text.h"
-#include "DOM/NamedNodeMap.h"
-#include "DOM/NodeList.h"
-#include "DOM/AutoPtr.h"
+#include "Poco/DOM/Document.h"
+#include "Poco/DOM/Element.h"
+#include "Poco/DOM/Attr.h"
+#include "Poco/DOM/Text.h"
+#include "Poco/DOM/NamedNodeMap.h"
+#include "Poco/DOM/NodeList.h"
+#include "Poco/DOM/AutoPtr.h"


-using XML::Element;
-using XML::Document;
-using XML::Attr;
-using XML::Text;
-using XML::Node;
-using XML::NamedNodeMap;
-using XML::NodeList;
-using XML::AutoPtr;
-using XML::XMLString;
+using Poco::XML::Element;
+using Poco::XML::Document;
+using Poco::XML::Attr;
+using Poco::XML::Text;
+using Poco::XML::Node;
+using Poco::XML::NamedNodeMap;
+using Poco::XML::NodeList;
+using Poco::XML::AutoPtr;
+using Poco::XML::XMLString;


 ElementTest::ElementTest(const std::string& name): CppUnit::TestCase(name)
--- a/XML/testsuite/src/ElementTest.h
+++ b/XML/testsuite/src/ElementTest.h
@@ -1,7 +1,7 @@
 //
 // ElementTest.h
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/ElementTest.h#2 $
+// $Id: //poco/1.2/XML/testsuite/src/ElementTest.h#1 $
 //
 // Definition of the ElementTest class.
 //
@@ -36,12 +36,8 @@
 #define ElementTest_INCLUDED


-#ifndef XML_XML_INCLUDED
-#include "XML/XML.h"
-#endif
-#ifndef CppUnit_TestCase_INCLUDED
+#include "Poco/XML/XML.h"
 #include "CppUnit/TestCase.h"
-#endif


 class ElementTest: public CppUnit::TestCase
--- a/XML/testsuite/src/EventTest.cpp
+++ b/XML/testsuite/src/EventTest.cpp
@@ -1,7 +1,7 @@
 //
 // EventTest.cpp
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/EventTest.cpp#2 $
+// $Id: //poco/1.2/XML/testsuite/src/EventTest.cpp#1 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -33,26 +33,26 @@
 #include "EventTest.h"
 #include "CppUnit/TestCaller.h"
 #include "CppUnit/TestSuite.h"
-#include "DOM/Event.h"
-#include "DOM/MutationEvent.h"
-#include "DOM/EventListener.h"
-#include "DOM/Document.h"
-#include "DOM/Element.h"
-#include "DOM/Attr.h"
-#include "DOM/Text.h"
-#include "DOM/AutoPtr.h"
+#include "Poco/DOM/Event.h"
+#include "Poco/DOM/MutationEvent.h"
+#include "Poco/DOM/EventListener.h"
+#include "Poco/DOM/Document.h"
+#include "Poco/DOM/Element.h"
+#include "Poco/DOM/Attr.h"
+#include "Poco/DOM/Text.h"
+#include "Poco/DOM/AutoPtr.h"


-using XML::Event;
-using XML::MutationEvent;
-using XML::EventListener;
-using XML::Element;
-using XML::Document;
-using XML::Attr;
-using XML::Text;
-using XML::Node;
-using XML::AutoPtr;
-using XML::XMLString;
+using Poco::XML::Event;
+using Poco::XML::MutationEvent;
+using Poco::XML::EventListener;
+using Poco::XML::Element;
+using Poco::XML::Document;
+using Poco::XML::Attr;
+using Poco::XML::Text;
+using Poco::XML::Node;
+using Poco::XML::AutoPtr;
+using Poco::XML::XMLString;


 class TestEventListener: public EventListener
--- a/XML/testsuite/src/EventTest.h
+++ b/XML/testsuite/src/EventTest.h
@@ -1,7 +1,7 @@
 //
 // EventTest.h
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/EventTest.h#2 $
+// $Id: //poco/1.2/XML/testsuite/src/EventTest.h#1 $
 //
 // Definition of the EventTest class.
 //
@@ -36,12 +36,8 @@
 #define EventTest_INCLUDED


-#ifndef XML_XML_INCLUDED
-#include "XML/XML.h"
-#endif
-#ifndef CppUnit_TestCase_INCLUDED
+#include "Poco/XML/XML.h"
 #include "CppUnit/TestCase.h"
-#endif


 class EventTest: public CppUnit::TestCase
--- a/XML/testsuite/src/NamePoolTest.cpp
+++ b/XML/testsuite/src/NamePoolTest.cpp
@@ -1,7 +1,7 @@
 //
 // NamePoolTest.cpp
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/NamePoolTest.cpp#2 $
+// $Id: //poco/1.2/XML/testsuite/src/NamePoolTest.cpp#1 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -33,14 +33,14 @@
 #include "NamePoolTest.h"
 #include "CppUnit/TestCaller.h"
 #include "CppUnit/TestSuite.h"
-#include "XML/NamePool.h"
-#include "XML/Name.h"
-#include "DOM/AutoPtr.h"
+#include "Poco/XML/NamePool.h"
+#include "Poco/XML/Name.h"
+#include "Poco/DOM/AutoPtr.h"


-using XML::NamePool;
-using XML::Name;
-using XML::AutoPtr;
+using Poco::XML::NamePool;
+using Poco::XML::Name;
+using Poco::XML::AutoPtr;


 NamePoolTest::NamePoolTest(const std::string& name): CppUnit::TestCase(name)
--- a/XML/testsuite/src/NamePoolTest.h
+++ b/XML/testsuite/src/NamePoolTest.h
@@ -1,7 +1,7 @@
 //
 // NamePoolTest.h
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/NamePoolTest.h#2 $
+// $Id: //poco/1.2/XML/testsuite/src/NamePoolTest.h#1 $
 //
 // Definition of the NamePoolTest class.
 //
@@ -36,12 +36,8 @@
 #define NamePoolTest_INCLUDED


-#ifndef XML_XML_INCLUDED
-#include "XML/XML.h"
-#endif
-#ifndef CppUnit_TestCase_INCLUDED
+#include "Poco/XML/XML.h"
 #include "CppUnit/TestCase.h"
-#endif


 class NamePoolTest: public CppUnit::TestCase
--- a/XML/testsuite/src/NameTest.cpp
+++ b/XML/testsuite/src/NameTest.cpp
@@ -1,7 +1,7 @@
 //
 // NameTest.cpp
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/NameTest.cpp#2 $
+// $Id: //poco/1.2/XML/testsuite/src/NameTest.cpp#1 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -33,10 +33,10 @@
 #include "NameTest.h"
 #include "CppUnit/TestCaller.h"
 #include "CppUnit/TestSuite.h"
-#include "XML/Name.h"
+#include "Poco/XML/Name.h"


-using XML::Name;
+using Poco::XML::Name;


 NameTest::NameTest(const std::string& name): CppUnit::TestCase(name)
--- a/XML/testsuite/src/NameTest.h
+++ b/XML/testsuite/src/NameTest.h
@@ -1,7 +1,7 @@
 //
 // NameTest.h
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/NameTest.h#2 $
+// $Id: //poco/1.2/XML/testsuite/src/NameTest.h#1 $
 //
 // Definition of the NameTest class.
 //
@@ -36,12 +36,8 @@
 #define NameTest_INCLUDED


-#ifndef XML_XML_INCLUDED
-#include "XML/XML.h"
-#endif
-#ifndef CppUnit_TestCase_INCLUDED
+#include "Poco/XML/XML.h"
 #include "CppUnit/TestCase.h"
-#endif


 class NameTest: public CppUnit::TestCase
--- a/XML/testsuite/src/NamespaceSupportTest.cpp
+++ b/XML/testsuite/src/NamespaceSupportTest.cpp
@@ -1,7 +1,7 @@
 //
 // NamespaceSupportTest.cpp
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/NamespaceSupportTest.cpp#2 $
+// $Id: //poco/1.2/XML/testsuite/src/NamespaceSupportTest.cpp#1 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -33,10 +33,10 @@
 #include "NamespaceSupportTest.h"
 #include "CppUnit/TestCaller.h"
 #include "CppUnit/TestSuite.h"
-#include "SAX/NamespaceSupport.h"
+#include "Poco/SAX/NamespaceSupport.h"


-using XML::NamespaceSupport;
+using Poco::XML::NamespaceSupport;


 NamespaceSupportTest::NamespaceSupportTest(const std::string& name): CppUnit::TestCase(name)
--- a/XML/testsuite/src/NamespaceSupportTest.h
+++ b/XML/testsuite/src/NamespaceSupportTest.h
@@ -1,7 +1,7 @@
 //
 // NamespaceSupportTest.h
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/NamespaceSupportTest.h#2 $
+// $Id: //poco/1.2/XML/testsuite/src/NamespaceSupportTest.h#1 $
 //
 // Definition of the NamespaceSupportTest class.
 //
@@ -36,12 +36,8 @@
 #define NamespaceSupportTest_INCLUDED


-#ifndef XML_XML_INCLUDED
-#include "XML/XML.h"
-#endif
-#ifndef CppUnit_TestCase_INCLUDED
+#include "Poco/XML/XML.h"
 #include "CppUnit/TestCase.h"
-#endif


 class NamespaceSupportTest: public CppUnit::TestCase
--- a/XML/testsuite/src/NodeIteratorTest.cpp
+++ b/XML/testsuite/src/NodeIteratorTest.cpp
@@ -1,7 +1,7 @@
 //
 // NodeIteratorTest.cpp
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/NodeIteratorTest.cpp#2 $
+// $Id: //poco/1.2/XML/testsuite/src/NodeIteratorTest.cpp#1 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -33,22 +33,22 @@
 #include "NodeIteratorTest.h"
 #include "CppUnit/TestCaller.h"
 #include "CppUnit/TestSuite.h"
-#include "DOM/NodeIterator.h"
-#include "DOM/NodeFilter.h"
-#include "DOM/Document.h"
-#include "DOM/Element.h"
-#include "DOM/Text.h"
-#include "DOM/AutoPtr.h"
+#include "Poco/DOM/NodeIterator.h"
+#include "Poco/DOM/NodeFilter.h"
+#include "Poco/DOM/Document.h"
+#include "Poco/DOM/Element.h"
+#include "Poco/DOM/Text.h"
+#include "Poco/DOM/AutoPtr.h"


-using XML::NodeIterator;
-using XML::NodeFilter;
-using XML::Element;
-using XML::Document;
-using XML::Text;
-using XML::Node;
-using XML::AutoPtr;
-using XML::XMLString;
+using Poco::XML::NodeIterator;
+using Poco::XML::NodeFilter;
+using Poco::XML::Element;
+using Poco::XML::Document;
+using Poco::XML::Text;
+using Poco::XML::Node;
+using Poco::XML::AutoPtr;
+using Poco::XML::XMLString;


 namespace
--- a/XML/testsuite/src/NodeIteratorTest.h
+++ b/XML/testsuite/src/NodeIteratorTest.h
@@ -1,7 +1,7 @@
 //
 // NodeIteratorTest.h
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/NodeIteratorTest.h#2 $
+// $Id: //poco/1.2/XML/testsuite/src/NodeIteratorTest.h#1 $
 //
 // Definition of the NodeIteratorTest class.
 //
@@ -36,12 +36,8 @@
 #define NodeIteratorTest_INCLUDED


-#ifndef XML_XML_INCLUDED
-#include "XML/XML.h"
-#endif
-#ifndef CppUnit_TestCase_INCLUDED
+#include "Poco/XML/XML.h"
 #include "CppUnit/TestCase.h"
-#endif


 class NodeIteratorTest: public CppUnit::TestCase
--- a/XML/testsuite/src/NodeTest.cpp
+++ b/XML/testsuite/src/NodeTest.cpp
@@ -1,7 +1,7 @@
 //
 // NodeTest.cpp
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/NodeTest.cpp#2 $
+// $Id: //poco/1.2/XML/testsuite/src/NodeTest.cpp#1 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -33,17 +33,17 @@
 #include "NodeTest.h"
 #include "CppUnit/TestCaller.h"
 #include "CppUnit/TestSuite.h"
-#include "DOM/Document.h"
-#include "DOM/Element.h"
-#include "DOM/DocumentFragment.h"
-#include "DOM/AutoPtr.h"
+#include "Poco/DOM/Document.h"
+#include "Poco/DOM/Element.h"
+#include "Poco/DOM/DocumentFragment.h"
+#include "Poco/DOM/AutoPtr.h"


-using XML::Element;
-using XML::Document;
-using XML::DocumentFragment;
-using XML::Node;
-using XML::AutoPtr;
+using Poco::XML::Element;
+using Poco::XML::Document;
+using Poco::XML::DocumentFragment;
+using Poco::XML::Node;
+using Poco::XML::AutoPtr;


 NodeTest::NodeTest(const std::string& name): CppUnit::TestCase(name)
--- a/XML/testsuite/src/NodeTest.h
+++ b/XML/testsuite/src/NodeTest.h
@@ -1,7 +1,7 @@
 //
 // NodeTest.h
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/NodeTest.h#2 $
+// $Id: //poco/1.2/XML/testsuite/src/NodeTest.h#1 $
 //
 // Definition of the NodeTest class.
 //
@@ -36,12 +36,8 @@
 #define NodeTest_INCLUDED


-#ifndef XML_XML_INCLUDED
-#include "XML/XML.h"
-#endif
-#ifndef CppUnit_TestCase_INCLUDED
+#include "Poco/XML/XML.h"
 #include "CppUnit/TestCase.h"
-#endif


 class NodeTest: public CppUnit::TestCase
--- a/XML/testsuite/src/ParserWriterTest.cpp
+++ b/XML/testsuite/src/ParserWriterTest.cpp
@@ -1,7 +1,7 @@
 //
 // ParserWriterTest.cpp
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/ParserWriterTest.cpp#2 $
+// $Id: //poco/1.2/XML/testsuite/src/ParserWriterTest.cpp#1 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -33,22 +33,22 @@
 #include "ParserWriterTest.h"
 #include "CppUnit/TestCaller.h"
 #include "CppUnit/TestSuite.h"
-#include "DOM/DOMParser.h"
-#include "DOM/DOMWriter.h"
-#include "DOM/Document.h"
-#include "DOM/AutoPtr.h"
-#include "SAX/InputSource.h"
-#include "XML/XMLWriter.h"
+#include "Poco/DOM/DOMParser.h"
+#include "Poco/DOM/DOMWriter.h"
+#include "Poco/DOM/Document.h"
+#include "Poco/DOM/AutoPtr.h"
+#include "Poco/SAX/InputSource.h"
+#include "Poco/XML/XMLWriter.h"
 #include <sstream>
 #include <fstream>


-using XML::DOMParser;
-using XML::DOMWriter;
-using XML::XMLWriter;
-using XML::Document;
-using XML::AutoPtr;
-using XML::InputSource;
+using Poco::XML::DOMParser;
+using Poco::XML::DOMWriter;
+using Poco::XML::XMLWriter;
+using Poco::XML::Document;
+using Poco::XML::AutoPtr;
+using Poco::XML::InputSource;


 ParserWriterTest::ParserWriterTest(const std::string& name): CppUnit::TestCase(name)
--- a/XML/testsuite/src/ParserWriterTest.h
+++ b/XML/testsuite/src/ParserWriterTest.h
@@ -1,7 +1,7 @@
 //
 // ParserWriterTest.h
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/ParserWriterTest.h#2 $
+// $Id: //poco/1.2/XML/testsuite/src/ParserWriterTest.h#1 $
 //
 // Definition of the ParserWriterTest class.
 //
@@ -36,12 +36,8 @@
 #define ParserWriterTest_INCLUDED


-#ifndef XML_XML_INCLUDED
-#include "XML/XML.h"
-#endif
-#ifndef CppUnit_TestCase_INCLUDED
+#include "Poco/XML/XML.h"
 #include "CppUnit/TestCase.h"
-#endif


 class ParserWriterTest: public CppUnit::TestCase
--- a/XML/testsuite/src/SAXParserTest.cpp
+++ b/XML/testsuite/src/SAXParserTest.cpp
@@ -1,7 +1,7 @@
 //
 // SAXParserTest.cpp
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/SAXParserTest.cpp#2 $
+// $Id: //poco/1.2/XML/testsuite/src/SAXParserTest.cpp#1 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -33,25 +33,25 @@
 #include "SAXParserTest.h"
 #include "CppUnit/TestCaller.h"
 #include "CppUnit/TestSuite.h"
-#include "SAX/SAXParser.h"
-#include "SAX/InputSource.h"
-#include "SAX/EntityResolver.h"
-#include "SAX/SAXException.h"
-#include "SAX/WhitespaceFilter.h"
-#include "XML/XMLWriter.h"
-#include "Foundation/Latin9Encoding.h"
+#include "Poco/SAX/SAXParser.h"
+#include "Poco/SAX/InputSource.h"
+#include "Poco/SAX/EntityResolver.h"
+#include "Poco/SAX/SAXException.h"
+#include "Poco/SAX/WhitespaceFilter.h"
+#include "Poco/XML/XMLWriter.h"
+#include "Poco/Latin9Encoding.h"
 #include <sstream>
 #include <fstream>


-using XML::SAXParser;
-using XML::XMLWriter;
-using XML::XMLReader;
-using XML::InputSource;
-using XML::EntityResolver;
-using XML::XMLString;
-using XML::SAXParseException;
-using XML::WhitespaceFilter;
+using Poco::XML::SAXParser;
+using Poco::XML::XMLWriter;
+using Poco::XML::XMLReader;
+using Poco::XML::InputSource;
+using Poco::XML::EntityResolver;
+using Poco::XML::XMLString;
+using Poco::XML::SAXParseException;
+using Poco::XML::WhitespaceFilter;


 class TestEntityResolver: public EntityResolver
@@ -281,7 +281,7 @@ void SAXParserTest::testRSS()
 	XMLWriter writer(ostr, XMLWriter::CANONICAL | XMLWriter::PRETTY_PRINT);
 	filter.setContentHandler(&writer);
 	filter.setDTDHandler(&writer);
-	filter.setProperty(XMLReader::PROPERTY_LEXICAL_HANDLER, static_cast<XML::LexicalHandler*>(&writer));
+	filter.setProperty(XMLReader::PROPERTY_LEXICAL_HANDLER, static_cast<Poco::XML::LexicalHandler*>(&writer));
 	InputSource source(istr);
 	filter.parse(&source);
 }
@@ -290,7 +290,7 @@ void SAXParserTest::testRSS()
 void SAXParserTest::testEncoding()
 {
 	SAXParser parser;
-	Foundation::Latin9Encoding encoding;
+	Poco::Latin9Encoding encoding;
 	parser.addEncoding("ISO-8859-15", &encoding); 
 	
 	std::istringstream istr(ENCODING);
@@ -298,7 +298,7 @@ void SAXParserTest::testEncoding()
 	XMLWriter writer(ostr, XMLWriter::WRITE_XML_DECLARATION, "ISO-8859-15", encoding);
 	parser.setContentHandler(&writer);
 	parser.setDTDHandler(&writer);
-	parser.setProperty(XMLReader::PROPERTY_LEXICAL_HANDLER, static_cast<XML::LexicalHandler*>(&writer));
+	parser.setProperty(XMLReader::PROPERTY_LEXICAL_HANDLER, static_cast<Poco::XML::LexicalHandler*>(&writer));
 	InputSource source(istr);
 	parser.parse(&source);
 	
@@ -324,7 +324,7 @@ std::string SAXParserTest::parse(XMLReader& reader, int options, const std::stri
 	XMLWriter writer(ostr, options);
 	reader.setContentHandler(&writer);
 	reader.setDTDHandler(&writer);
-	reader.setProperty(XMLReader::PROPERTY_LEXICAL_HANDLER, static_cast<XML::LexicalHandler*>(&writer));
+	reader.setProperty(XMLReader::PROPERTY_LEXICAL_HANDLER, static_cast<Poco::XML::LexicalHandler*>(&writer));
 	InputSource source(istr);
 	reader.parse(&source);
 	return ostr.str();
--- a/XML/testsuite/src/SAXParserTest.h
+++ b/XML/testsuite/src/SAXParserTest.h
@@ -1,7 +1,7 @@
 //
 // SAXParserTest.h
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/SAXParserTest.h#2 $
+// $Id: //poco/1.2/XML/testsuite/src/SAXParserTest.h#1 $
 //
 // Definition of the SAXParserTest class.
 //
@@ -36,15 +36,9 @@
 #define SAXParserTest_INCLUDED


-#ifndef XML_XML_INCLUDED
-#include "XML/XML.h"
-#endif
-#ifndef CppUnit_TestCase_INCLUDED
+#include "Poco/XML/XML.h"
 #include "CppUnit/TestCase.h"
-#endif
-#ifndef SAX_XMLReader_INCLUDED
-#include "SAX/XMLReader.h"
-#endif
+#include "Poco/SAX/XMLReader.h"


 class SAXParserTest: public CppUnit::TestCase
@@ -77,7 +71,7 @@ public:
 	void setUp();
 	void tearDown();

-	std::string parse(XML::XMLReader& reader, int options, const std::string& data);
+	std::string parse(Poco::XML::XMLReader& reader, int options, const std::string& data);

 	static CppUnit::Test* suite();

--- a/XML/testsuite/src/SAXTestSuite.cpp
+++ b/XML/testsuite/src/SAXTestSuite.cpp
@@ -1,7 +1,7 @@
 //
 // SAXTestSuite.cpp
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/SAXTestSuite.cpp#2 $
+// $Id: //poco/1.2/XML/testsuite/src/SAXTestSuite.cpp#1 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
--- a/XML/testsuite/src/SAXTestSuite.h
+++ b/XML/testsuite/src/SAXTestSuite.h
@@ -1,7 +1,7 @@
 //
 // SAXTestSuite.h
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/SAXTestSuite.h#2 $
+// $Id: //poco/1.2/XML/testsuite/src/SAXTestSuite.h#1 $
 //
 // Definition of the SAXTestSuite class.
 //
@@ -36,9 +36,7 @@
 #define SAXTestSuite_INCLUDED


-#ifndef CppUnit_TestSuite_INCLUDED
 #include "CppUnit/TestSuite.h"
-#endif


 class SAXTestSuite
--- a/XML/testsuite/src/TextTest.cpp
+++ b/XML/testsuite/src/TextTest.cpp
@@ -1,7 +1,7 @@
 //
 // TextTest.cpp
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/TextTest.cpp#2 $
+// $Id: //poco/1.2/XML/testsuite/src/TextTest.cpp#1 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -33,19 +33,19 @@
 #include "TextTest.h"
 #include "CppUnit/TestCaller.h"
 #include "CppUnit/TestSuite.h"
-#include "DOM/Text.h"
-#include "DOM/CDATASection.h"
-#include "DOM/Element.h"
-#include "DOM/Document.h"
-#include "DOM/AutoPtr.h"
+#include "Poco/DOM/Text.h"
+#include "Poco/DOM/CDATASection.h"
+#include "Poco/DOM/Element.h"
+#include "Poco/DOM/Document.h"
+#include "Poco/DOM/AutoPtr.h"


-using XML::Text;
-using XML::CDATASection;
-using XML::Element;
-using XML::Document;
-using XML::AutoPtr;
-using XML::XMLString;
+using Poco::XML::Text;
+using Poco::XML::CDATASection;
+using Poco::XML::Element;
+using Poco::XML::Document;
+using Poco::XML::AutoPtr;
+using Poco::XML::XMLString;


 TextTest::TextTest(const std::string& name): CppUnit::TestCase(name)
--- a/XML/testsuite/src/TextTest.h
+++ b/XML/testsuite/src/TextTest.h
@@ -1,7 +1,7 @@
 //
 // TextTest.h
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/TextTest.h#2 $
+// $Id: //poco/1.2/XML/testsuite/src/TextTest.h#1 $
 //
 // Definition of the TextTest class.
 //
@@ -36,12 +36,8 @@
 #define TextTest_INCLUDED


-#ifndef XML_XML_INCLUDED
-#include "XML/XML.h"
-#endif
-#ifndef CppUnit_TestCase_INCLUDED
+#include "Poco/XML/XML.h"
 #include "CppUnit/TestCase.h"
-#endif


 class TextTest: public CppUnit::TestCase
--- a/XML/testsuite/src/TreeWalkerTest.cpp
+++ b/XML/testsuite/src/TreeWalkerTest.cpp
@@ -1,7 +1,7 @@
 //
 // TreeWalkerTest.cpp
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/TreeWalkerTest.cpp#2 $
+// $Id: //poco/1.2/XML/testsuite/src/TreeWalkerTest.cpp#1 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -33,22 +33,22 @@
 #include "TreeWalkerTest.h"
 #include "CppUnit/TestCaller.h"
 #include "CppUnit/TestSuite.h"
-#include "DOM/TreeWalker.h"
-#include "DOM/NodeFilter.h"
-#include "DOM/Document.h"
-#include "DOM/Element.h"
-#include "DOM/Text.h"
-#include "DOM/AutoPtr.h"
+#include "Poco/DOM/TreeWalker.h"
+#include "Poco/DOM/NodeFilter.h"
+#include "Poco/DOM/Document.h"
+#include "Poco/DOM/Element.h"
+#include "Poco/DOM/Text.h"
+#include "Poco/DOM/AutoPtr.h"


-using XML::TreeWalker;
-using XML::NodeFilter;
-using XML::Element;
-using XML::Document;
-using XML::Text;
-using XML::Node;
-using XML::AutoPtr;
-using XML::XMLString;
+using Poco::XML::TreeWalker;
+using Poco::XML::NodeFilter;
+using Poco::XML::Element;
+using Poco::XML::Document;
+using Poco::XML::Text;
+using Poco::XML::Node;
+using Poco::XML::AutoPtr;
+using Poco::XML::XMLString;


 namespace
--- a/XML/testsuite/src/TreeWalkerTest.h
+++ b/XML/testsuite/src/TreeWalkerTest.h
@@ -1,7 +1,7 @@
 //
 // TreeWalkerTest.h
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/TreeWalkerTest.h#2 $
+// $Id: //poco/1.2/XML/testsuite/src/TreeWalkerTest.h#1 $
 //
 // Definition of the TreeWalkerTest class.
 //
@@ -36,12 +36,8 @@
 #define TreeWalkerTest_INCLUDED


-#ifndef XML_XML_INCLUDED
-#include "XML/XML.h"
-#endif
-#ifndef CppUnit_TestCase_INCLUDED
+#include "Poco/XML/XML.h"
 #include "CppUnit/TestCase.h"
-#endif


 class TreeWalkerTest: public CppUnit::TestCase
--- a/XML/testsuite/src/WinDriver.cpp
+++ b/XML/testsuite/src/WinDriver.cpp
@@ -1,7 +1,7 @@
 //
 // WinDriver.cpp
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/WinDriver.cpp#2 $
+// $Id: //poco/1.2/XML/testsuite/src/WinDriver.cpp#1 $
 //
 // Windows test driver for Poco XML.
 //
--- a/XML/testsuite/src/XMLTestSuite.cpp
+++ b/XML/testsuite/src/XMLTestSuite.cpp
@@ -1,7 +1,7 @@
 //
 // XMLTestSuite.cpp
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/XMLTestSuite.cpp#2 $
+// $Id: //poco/1.2/XML/testsuite/src/XMLTestSuite.cpp#1 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
--- a/XML/testsuite/src/XMLTestSuite.h
+++ b/XML/testsuite/src/XMLTestSuite.h
@@ -1,7 +1,7 @@
 //
 // XMLTestSuite.h
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/XMLTestSuite.h#2 $
+// $Id: //poco/1.2/XML/testsuite/src/XMLTestSuite.h#1 $
 //
 // Definition of the XMLTestSuite class.
 //
@@ -36,9 +36,7 @@
 #define XMLTestSuite_INCLUDED


-#ifndef CppUnit_TestSuite_INCLUDED
 #include "CppUnit/TestSuite.h"
-#endif


 class XMLTestSuite
--- a/XML/testsuite/src/XMLWriterTest.cpp
+++ b/XML/testsuite/src/XMLWriterTest.cpp
@@ -1,7 +1,7 @@
 //
 // XMLWriterTest.cpp
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/XMLWriterTest.cpp#2 $
+// $Id: //poco/1.2/XML/testsuite/src/XMLWriterTest.cpp#1 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -33,14 +33,14 @@
 #include "XMLWriterTest.h"
 #include "CppUnit/TestCaller.h"
 #include "CppUnit/TestSuite.h"
-#include "XML/XMLWriter.h"
-#include "SAX/AttributesImpl.h"
-#include "Foundation/Exception.h"
+#include "Poco/XML/XMLWriter.h"
+#include "Poco/SAX/AttributesImpl.h"
+#include "Poco/Exception.h"
 #include <sstream>


-using XML::XMLWriter;
-using XML::AttributesImpl;
+using Poco::XML::XMLWriter;
+using Poco::XML::AttributesImpl;


 XMLWriterTest::XMLWriterTest(const std::string& name): CppUnit::TestCase(name)
@@ -387,6 +387,22 @@ void XMLWriterTest::testNamespaces()
 	assert (xml == "<ns1:r xmlns:ns1=\"urn:ns\">data</ns1:r>");
 }

+void XMLWriterTest::testAttributeNamespaces()
+{
+	std::ostringstream str;
+	XMLWriter writer(str, XMLWriter::CANONICAL);
+	Poco::XML::AttributesImpl attrs;
+	attrs.addAttribute("urn:other", "myattr", "", "", "attrValue");
+	attrs.addAttribute("urn:ns", "myattr2", "", "", "attrValue2");
+	writer.startDocument();
+	writer.startElement("urn:ns", "r", "", attrs);
+	writer.characters("data");
+	writer.endElement("urn:ns", "r", "");
+	writer.endDocument();
+	std::string xml = str.str();
+	assert (xml == "<ns1:r myattr2=\"attrValue2\" ns2:myattr=\"attrValue\" xmlns:ns1=\"urn:ns\" xmlns:ns2=\"urn:other\">data</ns1:r>");
+}
+

 void XMLWriterTest::testNamespacesNested()
 {
@@ -438,7 +454,7 @@ void XMLWriterTest::testWellformed()
 		writer.endElement("", "", "bar");
 		fail("not wellformed - must throw exception");
 	}
-	catch (Foundation::Exception&)
+	catch (Poco::Exception&)
 	{
 	}
 }
@@ -456,7 +472,7 @@ void XMLWriterTest::testWellformedNested()
 		writer.endElement("", "", "foo");
 		fail("not wellformed - must throw exception");
 	}
-	catch (Foundation::Exception&)
+	catch (Poco::Exception&)
 	{
 	}
 }
@@ -474,7 +490,7 @@ void XMLWriterTest::testWellformedNamespace()
 		writer.endElement("urn:ns1", "bar", "");
 		fail("not wellformed - must throw exception");
 	}
-	catch (Foundation::Exception&)
+	catch (Poco::Exception&)
 	{
 	}
 }
@@ -515,6 +531,7 @@ CppUnit::Test* XMLWriterTest::suite()
 	CppUnit_addTest(pSuite, XMLWriterTest, testQNamespaces);
 	CppUnit_addTest(pSuite, XMLWriterTest, testQNamespacesNested);
 	CppUnit_addTest(pSuite, XMLWriterTest, testNamespaces);
+	CppUnit_addTest(pSuite, XMLWriterTest, testAttributeNamespaces);
 	CppUnit_addTest(pSuite, XMLWriterTest, testNamespacesNested);
 	CppUnit_addTest(pSuite, XMLWriterTest, testExplicitNamespaces);
 	CppUnit_addTest(pSuite, XMLWriterTest, testWellformed);
--- a/XML/testsuite/src/XMLWriterTest.h
+++ b/XML/testsuite/src/XMLWriterTest.h
@@ -1,7 +1,7 @@
 //
 // XMLWriterTest.h
 //
-// $Id: //poco/1.1.0/XML/testsuite/src/XMLWriterTest.h#2 $
+// $Id: //poco/1.2/XML/testsuite/src/XMLWriterTest.h#1 $
 //
 // Definition of the XMLWriterTest class.
 //
@@ -36,12 +36,8 @@
 #define XMLWriterTest_INCLUDED


-#ifndef XML_XML_INCLUDED
-#include "XML/XML.h"
-#endif
-#ifndef CppUnit_TestCase_INCLUDED
+#include "Poco/XML/XML.h"
 #include "CppUnit/TestCase.h"
-#endif


 class XMLWriterTest: public CppUnit::TestCase
@@ -76,6 +72,7 @@ public:
 	void testWellformed();
 	void testWellformedNested();
 	void testWellformedNamespace();
+	void testAttributeNamespaces();

 	void setUp();
 	void tearDown();