Unix fixes
authorScott Cantor <cantor.2@osu.edu>
Mon, 6 Mar 2006 06:43:17 +0000 (06:43 +0000)
committerScott Cantor <cantor.2@osu.edu>
Mon, 6 Mar 2006 06:43:17 +0000 (06:43 +0000)
xmltooling/util/XMLObjectChildrenList.h
xmltoolingtest/XMLObjectBaseTestCase.h

index 91cda64..18888af 100644 (file)
@@ -146,7 +146,7 @@ namespace xmltooling {
     template <class Container, class _Ty>
     class XMLObjectChildrenList
     {
-        typename Container& m_container;
+        Container& m_container;
         typename std::list<_Ty*>* m_list;
         typename std::list<_Ty*>::iterator m_fence;
         XMLObject* m_parent;
index 9adb659..68c3b3e 100644 (file)
-/*\r
- *  Copyright 2001-2005 Internet2\r
- * \r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-#include <cxxtest/TestSuite.h>\r
-#include <xmltooling/AbstractAttributeExtensibleXMLObject.h>\r
-#include <xmltooling/AbstractDOMCachingXMLObject.h>\r
-#include <xmltooling/AbstractExtensibleXMLObject.h>\r
-#include <xmltooling/exceptions.h>\r
-#include <xmltooling/XMLObjectBuilder.h>\r
-#include <xmltooling/XMLToolingConfig.h>\r
-#include <xmltooling/io/AbstractXMLObjectMarshaller.h>\r
-#include <xmltooling/io/AbstractXMLObjectUnmarshaller.h>\r
-#include <xmltooling/util/ParserPool.h>\r
-#include <xmltooling/util/XMLObjectChildrenList.h>\r
-#include <xmltooling/util/XMLHelper.h>\r
-\r
-using namespace xmltooling;\r
-using namespace std;\r
-\r
-extern ParserPool* validatingPool;\r
-extern ParserPool* nonvalidatingPool;\r
-extern string data_path;\r
-\r
-#if defined (_MSC_VER)\r
-    #pragma warning( push )\r
-    #pragma warning( disable : 4250 4251 )\r
-#endif\r
-\r
-class SimpleXMLObject : public AbstractDOMCachingXMLObject\r
-{\r
-public:\r
-    static const XMLCh NAMESPACE[];\r
-    static const XMLCh NAMESPACE_PREFIX[];\r
-    static const XMLCh LOCAL_NAME[];\r
-    static const XMLCh ID_ATTRIB_NAME[];\r
-\r
-    SimpleXMLObject() : AbstractDOMCachingXMLObject(NAMESPACE, LOCAL_NAME, NAMESPACE_PREFIX), m_id(NULL), m_value(NULL) {}\r
-    virtual ~SimpleXMLObject() {\r
-        XMLString::release(&m_id);\r
-        XMLString::release(&m_value);\r
-    }\r
-    \r
-    const XMLCh* getId() const { return m_id; }\r
-    void setId(const XMLCh* id) { m_id=prepareForAssignment(m_id,id); }\r
-\r
-    const XMLCh* getValue() const { return m_value; }\r
-    void setValue(const XMLCh* value) { m_value=prepareForAssignment(m_value,value); }\r
-    \r
-    VectorOf(SimpleXMLObject) getSimpleXMLObjects() {\r
-        return VectorOf(SimpleXMLObject)(this, m_simples, &m_children, m_children.end());\r
-    }\r
-    \r
-    SimpleXMLObject* clone() const {\r
-        auto_ptr<XMLObject> domClone(AbstractDOMCachingXMLObject::clone());\r
-        SimpleXMLObject* ret=dynamic_cast<SimpleXMLObject*>(domClone.get());\r
-        if (ret) {\r
-            domClone.release();\r
-            return ret;\r
-        }\r
-\r
-        ret=new SimpleXMLObject();\r
-        ret->setId(m_id);\r
-        ret->setValue(m_value);\r
-        xmltooling::clone(m_children, ret->m_children);\r
-        return ret;\r
-    }\r
-\r
-private:\r
-    XMLCh* m_id;\r
-    XMLCh* m_value;\r
-    vector<SimpleXMLObject*> m_simples;\r
-};\r
-\r
-class SimpleXMLObjectBuilder : public XMLObjectBuilder\r
-{\r
-public:\r
-    SimpleXMLObject* buildObject() const {\r
-        return new SimpleXMLObject();\r
-    }\r
-};\r
-\r
-class SimpleXMLObjectMarshaller : public AbstractXMLObjectMarshaller\r
-{\r
-public:\r
-    SimpleXMLObjectMarshaller() {}\r
-\r
-private:\r
-    void marshallAttributes(const XMLObject& xmlObject, DOMElement* domElement) const {\r
-        const SimpleXMLObject& simpleXMLObject = dynamic_cast<const SimpleXMLObject&>(xmlObject);\r
-        \r
-        if(simpleXMLObject.getId()) {\r
-            domElement->setAttributeNS(NULL, SimpleXMLObject::ID_ATTRIB_NAME, simpleXMLObject.getId());\r
-            domElement->setIdAttributeNS(NULL, SimpleXMLObject::ID_ATTRIB_NAME);\r
-        }\r
-    }\r
-\r
-    void marshallElementContent(const XMLObject& xmlObject, DOMElement* domElement) const {\r
-        const SimpleXMLObject& simpleXMLObject = dynamic_cast<const SimpleXMLObject&>(xmlObject);\r
-\r
-        if(simpleXMLObject.getValue()) {\r
-            domElement->setTextContent(simpleXMLObject.getValue());\r
-        }\r
-    }\r
-};\r
-\r
-class SimpleXMLObjectUnmarshaller : public AbstractXMLObjectUnmarshaller\r
-{\r
-public:\r
-    SimpleXMLObjectUnmarshaller() {}\r
-\r
-private:\r
-    void processChildElement(XMLObject& parentXMLObject, XMLObject* childXMLObject) const {\r
-        SimpleXMLObject& simpleXMLObject = dynamic_cast<SimpleXMLObject&>(parentXMLObject);\r
-\r
-        SimpleXMLObject* child = dynamic_cast<SimpleXMLObject*>(childXMLObject);\r
-        if (child) {\r
-            simpleXMLObject.getSimpleXMLObjects().push_back(child);\r
-        }\r
-        else {\r
-            throw UnmarshallingException("Unknown child element cannot be added to parent object.");\r
-        }\r
-    }\r
-\r
-    void processAttribute(XMLObject& xmlObject, const DOMAttr* attribute) const {\r
-        SimpleXMLObject& simpleXMLObject = dynamic_cast<SimpleXMLObject&>(xmlObject);\r
-\r
-        if (XMLString::equals(attribute->getLocalName(),SimpleXMLObject::ID_ATTRIB_NAME)) {\r
-            simpleXMLObject.setId(attribute->getValue());\r
-        }\r
-        else {\r
-            throw UnmarshallingException("Unknown attribute cannot be processed by parent object.");\r
-        }\r
-    }\r
-\r
-    void processElementContent(XMLObject& xmlObject, const XMLCh* elementContent) const {\r
-        SimpleXMLObject& simpleXMLObject = dynamic_cast<SimpleXMLObject&>(xmlObject);\r
-        \r
-        simpleXMLObject.setValue(elementContent);\r
-    }\r
-\r
-};\r
-\r
-class WildcardXMLObjectMarshaller;\r
-\r
-class WildcardXMLObject : public AbstractExtensibleXMLObject, public AbstractAttributeExtensibleXMLObject\r
-{\r
-    friend class WildcardXMLObjectMarshaller;\r
-public:\r
-    WildcardXMLObject(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix)\r
-        : AbstractDOMCachingXMLObject(nsURI, localName, prefix),\r
-        AbstractExtensibleXMLObject(nsURI, localName, prefix),\r
-        AbstractAttributeExtensibleXMLObject(nsURI, localName, prefix) {}\r
-    virtual ~WildcardXMLObject() {}\r
-    \r
-    WildcardXMLObject* clone() const {\r
-        auto_ptr<XMLObject> domClone(AbstractDOMCachingXMLObject::clone());\r
-        WildcardXMLObject* ret=dynamic_cast<WildcardXMLObject*>(domClone.get());\r
-        if (ret) {\r
-            domClone.release();\r
-            return ret;\r
-        }\r
-\r
-        ret=new WildcardXMLObject(\r
-            getElementQName().getNamespaceURI(),getElementQName().getLocalPart(),getElementQName().getPrefix()\r
-            );\r
-        for (map<QName,XMLCh*>::const_iterator i=m_attributeMap.begin(); i!=m_attributeMap.end(); i++) {\r
-            ret->m_attributeMap[i->first]=XMLString::replicate(i->second);\r
-        }\r
-        xmltooling::clone(m_children, ret->m_children);\r
-        return ret;\r
-    }\r
-};\r
-\r
-class WildcardXMLObjectBuilder : public XMLObjectBuilder\r
-{\r
-public:\r
-    XMLObject* buildObject() const {\r
-        throw XMLObjectException("No default builder available.");\r
-    }\r
-\r
-    WildcardXMLObject* buildObject(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix) const {\r
-        return new WildcardXMLObject(nsURI,localName,prefix);\r
-    }\r
-};\r
-\r
-class WildcardXMLObjectMarshaller : public AbstractXMLObjectMarshaller\r
-{\r
-public:\r
-    WildcardXMLObjectMarshaller() : AbstractXMLObjectMarshaller() {}\r
-\r
-private:\r
-    void marshallAttributes(const XMLObject& xmlObject, DOMElement* domElement) const {\r
-        const WildcardXMLObject& wcXMLObject = dynamic_cast<const WildcardXMLObject&>(xmlObject);\r
-\r
-        for (map<QName,XMLCh*>::const_iterator i=wcXMLObject.m_attributeMap.begin(); i!=wcXMLObject.m_attributeMap.end(); i++) {\r
-            DOMAttr* attr=domElement->getOwnerDocument()->createAttributeNS(i->first.getNamespaceURI(),i->first.getLocalPart());\r
-            if (i->first.hasPrefix())\r
-                attr->setPrefix(i->first.getPrefix());\r
-            attr->setNodeValue(i->second);\r
-            domElement->setAttributeNode(attr);\r
-        }\r
-    }\r
-\r
-    void marshallElementContent(const XMLObject& xmlObject, DOMElement* domElement) const {\r
-        const WildcardXMLObject& wcXMLObject = dynamic_cast<const WildcardXMLObject&>(xmlObject);\r
-\r
-        if(wcXMLObject.getTextContent()) {\r
-            domElement->appendChild(domElement->getOwnerDocument()->createTextNode(wcXMLObject.getTextContent()));\r
-        }\r
-    }\r
-};\r
-\r
-class WildcardXMLObjectUnmarshaller : public AbstractXMLObjectUnmarshaller\r
-{\r
-public:\r
-    WildcardXMLObjectUnmarshaller() {}\r
-\r
-private:\r
-    XMLObject* buildXMLObject(const DOMElement* domElement) const {\r
-        const WildcardXMLObjectBuilder* builder =\r
-            dynamic_cast<const WildcardXMLObjectBuilder*>(XMLObjectBuilder::getBuilder(domElement));\r
-        if (builder)\r
-            return builder->buildObject(domElement->getNamespaceURI(),domElement->getLocalName(),domElement->getPrefix());\r
-        throw UnmarshallingException("Failed to locate WildcardObjectBuilder for element.");\r
-    }\r
-\r
-    void processChildElement(XMLObject& parentXMLObject, XMLObject* childXMLObject) const {\r
-        WildcardXMLObject& wcXMLObject = dynamic_cast<WildcardXMLObject&>(parentXMLObject);\r
-\r
-        wcXMLObject.getXMLObjects().push_back(childXMLObject);\r
-    }\r
-\r
-    void processAttribute(XMLObject& xmlObject, const DOMAttr* attribute) const {\r
-        WildcardXMLObject& wcXMLObject = dynamic_cast<WildcardXMLObject&>(xmlObject);\r
-        \r
-        wcXMLObject.setAttribute(\r
-            QName(attribute->getNamespaceURI(),attribute->getLocalName(),attribute->getPrefix()),\r
-            attribute->getNodeValue()\r
-            );\r
-    }\r
-\r
-    void processElementContent(XMLObject& xmlObject, const XMLCh* elementContent) const {\r
-        WildcardXMLObject& wcXMLObject = dynamic_cast<WildcardXMLObject&>(xmlObject);\r
-        \r
-        wcXMLObject.setTextContent(elementContent);\r
-    }\r
-\r
-};\r
-\r
-#if defined (_MSC_VER)\r
-    #pragma warning( pop )\r
-#endif\r
+/*
+ *  Copyright 2001-2005 Internet2
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <cxxtest/TestSuite.h>
+#include <xmltooling/AbstractAttributeExtensibleXMLObject.h>
+#include <xmltooling/AbstractDOMCachingXMLObject.h>
+#include <xmltooling/AbstractExtensibleXMLObject.h>
+#include <xmltooling/exceptions.h>
+#include <xmltooling/XMLObjectBuilder.h>
+#include <xmltooling/XMLToolingConfig.h>
+#include <xmltooling/io/AbstractXMLObjectMarshaller.h>
+#include <xmltooling/io/AbstractXMLObjectUnmarshaller.h>
+#include <xmltooling/util/ParserPool.h>
+#include <xmltooling/util/XMLObjectChildrenList.h>
+#include <xmltooling/util/XMLHelper.h>
+
+using namespace xmltooling;
+using namespace std;
+
+extern ParserPool* validatingPool;
+extern ParserPool* nonvalidatingPool;
+extern string data_path;
+
+#if defined (_MSC_VER)
+    #pragma warning( push )
+    #pragma warning( disable : 4250 4251 )
+#endif
+
+class SimpleXMLObject : public AbstractDOMCachingXMLObject
+{
+public:
+    static const XMLCh NAMESPACE[];
+    static const XMLCh NAMESPACE_PREFIX[];
+    static const XMLCh LOCAL_NAME[];
+    static const XMLCh ID_ATTRIB_NAME[];
+
+    SimpleXMLObject() : AbstractDOMCachingXMLObject(NAMESPACE, LOCAL_NAME, NAMESPACE_PREFIX), m_id(NULL), m_value(NULL) {}
+    virtual ~SimpleXMLObject() {
+        XMLString::release(&m_id);
+        XMLString::release(&m_value);
+    }
+    
+    const XMLCh* getId() const { return m_id; }
+    void setId(const XMLCh* id) { m_id=prepareForAssignment(m_id,id); }
+
+    const XMLCh* getValue() const { return m_value; }
+    void setValue(const XMLCh* value) { m_value=prepareForAssignment(m_value,value); }
+    
+    VectorOf(SimpleXMLObject) getSimpleXMLObjects() {
+        return VectorOf(SimpleXMLObject)(this, m_simples, &m_children, m_children.end());
+    }
+    
+    SimpleXMLObject* clone() const {
+        auto_ptr<XMLObject> domClone(AbstractDOMCachingXMLObject::clone());
+        SimpleXMLObject* ret=dynamic_cast<SimpleXMLObject*>(domClone.get());
+        if (ret) {
+            domClone.release();
+            return ret;
+        }
+
+        ret=new SimpleXMLObject();
+        ret->setId(m_id);
+        ret->setValue(m_value);
+        xmltooling::clone(m_children, ret->m_children);
+        return ret;
+    }
+
+private:
+    XMLCh* m_id;
+    XMLCh* m_value;
+    vector<SimpleXMLObject*> m_simples;
+};
+
+class SimpleXMLObjectBuilder : public XMLObjectBuilder
+{
+public:
+    SimpleXMLObject* buildObject() const {
+        return new SimpleXMLObject();
+    }
+};
+
+class SimpleXMLObjectMarshaller : public AbstractXMLObjectMarshaller
+{
+public:
+    SimpleXMLObjectMarshaller() {}
+
+private:
+    void marshallAttributes(const XMLObject& xmlObject, DOMElement* domElement) const {
+        const SimpleXMLObject& simpleXMLObject = dynamic_cast<const SimpleXMLObject&>(xmlObject);
+        
+        if(simpleXMLObject.getId()) {
+            domElement->setAttributeNS(NULL, SimpleXMLObject::ID_ATTRIB_NAME, simpleXMLObject.getId());
+            domElement->setIdAttributeNS(NULL, SimpleXMLObject::ID_ATTRIB_NAME);
+        }
+    }
+
+    void marshallElementContent(const XMLObject& xmlObject, DOMElement* domElement) const {
+        const SimpleXMLObject& simpleXMLObject = dynamic_cast<const SimpleXMLObject&>(xmlObject);
+
+        if(simpleXMLObject.getValue()) {
+            domElement->setTextContent(simpleXMLObject.getValue());
+        }
+    }
+};
+
+class SimpleXMLObjectUnmarshaller : public AbstractXMLObjectUnmarshaller
+{
+public:
+    SimpleXMLObjectUnmarshaller() {}
+
+private:
+    void processChildElement(XMLObject& parentXMLObject, XMLObject* childXMLObject) const {
+        SimpleXMLObject& simpleXMLObject = dynamic_cast<SimpleXMLObject&>(parentXMLObject);
+
+        SimpleXMLObject* child = dynamic_cast<SimpleXMLObject*>(childXMLObject);
+        if (child) {
+            simpleXMLObject.getSimpleXMLObjects().push_back(child);
+        }
+        else {
+            throw UnmarshallingException("Unknown child element cannot be added to parent object.");
+        }
+    }
+
+    void processAttribute(XMLObject& xmlObject, const DOMAttr* attribute) const {
+        SimpleXMLObject& simpleXMLObject = dynamic_cast<SimpleXMLObject&>(xmlObject);
+
+        if (XMLString::equals(attribute->getLocalName(),SimpleXMLObject::ID_ATTRIB_NAME)) {
+            simpleXMLObject.setId(attribute->getValue());
+        }
+        else {
+            throw UnmarshallingException("Unknown attribute cannot be processed by parent object.");
+        }
+    }
+
+    void processElementContent(XMLObject& xmlObject, const XMLCh* elementContent) const {
+        SimpleXMLObject& simpleXMLObject = dynamic_cast<SimpleXMLObject&>(xmlObject);
+        
+        simpleXMLObject.setValue(elementContent);
+    }
+
+};
+
+class WildcardXMLObjectMarshaller;
+
+class WildcardXMLObject : public AbstractExtensibleXMLObject, public AbstractAttributeExtensibleXMLObject
+{
+    friend class WildcardXMLObjectMarshaller;
+public:
+    WildcardXMLObject(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix)
+        : AbstractDOMCachingXMLObject(nsURI, localName, prefix),
+        AbstractExtensibleXMLObject(nsURI, localName, prefix),
+        AbstractAttributeExtensibleXMLObject(nsURI, localName, prefix) {}
+    virtual ~WildcardXMLObject() {}
+    
+    WildcardXMLObject* clone() const {
+        auto_ptr<XMLObject> domClone(AbstractDOMCachingXMLObject::clone());
+        WildcardXMLObject* ret=dynamic_cast<WildcardXMLObject*>(domClone.get());
+        if (ret) {
+            domClone.release();
+            return ret;
+        }
+
+        ret=new WildcardXMLObject(
+            getElementQName().getNamespaceURI(),getElementQName().getLocalPart(),getElementQName().getPrefix()
+            );
+        for (map<QName,XMLCh*>::const_iterator i=m_attributeMap.begin(); i!=m_attributeMap.end(); i++) {
+            ret->m_attributeMap[i->first]=XMLString::replicate(i->second);
+        }
+        xmltooling::clone(m_children, ret->m_children);
+        return ret;
+    }
+};
+
+class WildcardXMLObjectBuilder : public XMLObjectBuilder
+{
+public:
+    XMLObject* buildObject() const {
+        throw XMLObjectException("No default builder available.");
+    }
+
+    WildcardXMLObject* buildObject(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix) const {
+        return new WildcardXMLObject(nsURI,localName,prefix);
+    }
+};
+
+class WildcardXMLObjectMarshaller : public AbstractXMLObjectMarshaller
+{
+public:
+    WildcardXMLObjectMarshaller() : AbstractXMLObjectMarshaller() {}
+
+private:
+    void marshallAttributes(const XMLObject& xmlObject, DOMElement* domElement) const {
+        const WildcardXMLObject& wcXMLObject = dynamic_cast<const WildcardXMLObject&>(xmlObject);
+
+        for (map<QName,XMLCh*>::const_iterator i=wcXMLObject.m_attributeMap.begin(); i!=wcXMLObject.m_attributeMap.end(); i++) {
+            DOMAttr* attr=domElement->getOwnerDocument()->createAttributeNS(i->first.getNamespaceURI(),i->first.getLocalPart());
+            if (i->first.hasPrefix())
+                attr->setPrefix(i->first.getPrefix());
+            attr->setNodeValue(i->second);
+            domElement->setAttributeNode(attr);
+        }
+    }
+
+    void marshallElementContent(const XMLObject& xmlObject, DOMElement* domElement) const {
+        const WildcardXMLObject& wcXMLObject = dynamic_cast<const WildcardXMLObject&>(xmlObject);
+
+        if(wcXMLObject.getTextContent()) {
+            domElement->appendChild(domElement->getOwnerDocument()->createTextNode(wcXMLObject.getTextContent()));
+        }
+    }
+};
+
+class WildcardXMLObjectUnmarshaller : public AbstractXMLObjectUnmarshaller
+{
+public:
+    WildcardXMLObjectUnmarshaller() {}
+
+private:
+    XMLObject* buildXMLObject(const DOMElement* domElement) const {
+        const WildcardXMLObjectBuilder* builder =
+            dynamic_cast<const WildcardXMLObjectBuilder*>(XMLObjectBuilder::getBuilder(domElement));
+        if (builder)
+            return builder->buildObject(domElement->getNamespaceURI(),domElement->getLocalName(),domElement->getPrefix());
+        throw UnmarshallingException("Failed to locate WildcardObjectBuilder for element.");
+    }
+
+    void processChildElement(XMLObject& parentXMLObject, XMLObject* childXMLObject) const {
+        WildcardXMLObject& wcXMLObject = dynamic_cast<WildcardXMLObject&>(parentXMLObject);
+
+        wcXMLObject.getXMLObjects().push_back(childXMLObject);
+    }
+
+    void processAttribute(XMLObject& xmlObject, const DOMAttr* attribute) const {
+        WildcardXMLObject& wcXMLObject = dynamic_cast<WildcardXMLObject&>(xmlObject);
+       
+        QName q(attribute->getNamespaceURI(),attribute->getLocalName(),attribute->getPrefix()); 
+        wcXMLObject.setAttribute(q,attribute->getNodeValue());
+    }
+
+    void processElementContent(XMLObject& xmlObject, const XMLCh* elementContent) const {
+        WildcardXMLObject& wcXMLObject = dynamic_cast<WildcardXMLObject&>(xmlObject);
+        
+        wcXMLObject.setTextContent(elementContent);
+    }
+
+};
+
+#if defined (_MSC_VER)
+    #pragma warning( pop )
+#endif