[java-xmltooling COMMIT] in /branches/REL_1: doc/RELEASE-NOTES.txt src/main/java/org/opensaml/xml/io/AbstractXMLObjec...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Nov  5 15:50:00 2012
New Revision: 762

URL: http://svn.shibboleth.net/view/java-xmltooling?rev=762&view=rev
Log:
JXT-24 - allow for CDATA node type

Modified:
    branches/REL_1/doc/RELEASE-NOTES.txt
    branches/REL_1/src/main/java/org/opensaml/xml/io/AbstractXMLObjectUnmarshaller.java
    branches/REL_1/src/test/java/org/opensaml/xml/ElementProxyTest.java
    branches/REL_1/src/test/resources/data/org/opensaml/xml/UnknownContent.xml

Modified: branches/REL_1/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-xmltooling/branches/REL_1/doc/RELEASE-NOTES.txt?rev=762&r1=761&r2=762&view=diff
==============================================================================
--- branches/REL_1/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_1/doc/RELEASE-NOTES.txt Mon Nov  5 15:50:00 2012
@@ -1,5 +1,6 @@
 Changes in Release 1.4.0
 =============================================
+[JXT-24] - Support for CDATA content
 [JXT-88] - AbstractXMLObject unnecessarily creates a new QName in getElementQName
 [JXT-89] - AbstractXMLObjectUnmarshaller should check isTraceEnabled in unmarshall(Element) before *creating* QNames and logging
 [JXT-93] - X509Util.determineEntityCertificate doesn't catch lower layer SecurityException

Modified: branches/REL_1/src/main/java/org/opensaml/xml/io/AbstractXMLObjectUnmarshaller.java
URL: http://svn.shibboleth.net/view/java-xmltooling/branches/REL_1/src/main/java/org/opensaml/xml/io/AbstractXMLObjectUnmarshaller.java?rev=762&r1=761&r2=762&view=diff
==============================================================================
--- branches/REL_1/src/main/java/org/opensaml/xml/io/AbstractXMLObjectUnmarshaller.java (original)
+++ branches/REL_1/src/main/java/org/opensaml/xml/io/AbstractXMLObjectUnmarshaller.java Mon Nov  5 15:50:00 2012
@@ -128,7 +128,7 @@
                 unmarshallAttribute(xmlObject, (Attr) childNode);
             } else if (childNode.getNodeType() == Node.ELEMENT_NODE) {
                 unmarshallChildElement(xmlObject, (Element) childNode);
-            } else if (childNode.getNodeType() == Node.TEXT_NODE) {
+            } else if (childNode.getNodeType() == Node.TEXT_NODE || childNode.getNodeType() == Node.CDATA_SECTION_NODE) {
                 unmarshallTextContent(xmlObject, (Text) childNode);
             }
         }

Modified: branches/REL_1/src/test/java/org/opensaml/xml/ElementProxyTest.java
URL: http://svn.shibboleth.net/view/java-xmltooling/branches/REL_1/src/test/java/org/opensaml/xml/ElementProxyTest.java?rev=762&r1=761&r2=762&view=diff
==============================================================================
--- branches/REL_1/src/test/java/org/opensaml/xml/ElementProxyTest.java (original)
+++ branches/REL_1/src/test/java/org/opensaml/xml/ElementProxyTest.java Mon Nov  5 15:50:00 2012
@@ -20,6 +20,7 @@
 import org.opensaml.xml.io.Unmarshaller;
 import org.opensaml.xml.io.UnmarshallingException;
 import org.opensaml.xml.parse.XMLParserException;
+import org.opensaml.xml.schema.XSAny;
 import org.w3c.dom.Document;
 
 /** Test unmarshalling content for which no specific object providers were registered. */
@@ -37,5 +38,7 @@
 
         assertEquals("Unexpted root element name", "products", xmlobject.getElementQName().getLocalPart());
         assertEquals("Unexpected number of children", 2, xmlobject.getOrderedChildren().size());
+        assertEquals("Unexpected CDATA content", "<strong>XSLT Perfect IDE</strong>",
+                ((XSAny) xmlobject.getOrderedChildren().get(1).getOrderedChildren().get(0)).getTextContent());
     }
 }

Modified: branches/REL_1/src/test/resources/data/org/opensaml/xml/UnknownContent.xml
URL: http://svn.shibboleth.net/view/java-xmltooling/branches/REL_1/src/test/resources/data/org/opensaml/xml/UnknownContent.xml?rev=762&r1=761&r2=762&view=diff
==============================================================================
--- branches/REL_1/src/test/resources/data/org/opensaml/xml/UnknownContent.xml (original)
+++ branches/REL_1/src/test/resources/data/org/opensaml/xml/UnknownContent.xml Mon Nov  5 15:50:00 2012
@@ -10,7 +10,7 @@
         </description>
     </product>
     <p:product xmlns:p="http://example.com/product-info" id="1166">
-        <p:name>XSLT Perfect IDE</p:name>
+        <p:name><![CDATA[<strong>XSLT Perfect IDE</strong>]]></p:name>
         <p:description xmlns:html="http://www.w3.org/1999/xhtml" xmlns:xl="http://www.w3.org/1999/xlink">
             <p:code>red</p:code>
             <html:code>blue</html:code>