[java-opensaml COMMIT] in /trunk/opensaml-core/src: main/java/org/opensaml/core/xml/io/AbstractXMLObjectUnmarshaller....

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jan 30 00:56:09 2013
New Revision: 3182

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3182&view=rev
Log:
Port java-xmltooling r762, JXT-24

Modified:
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectUnmarshaller.java
    trunk/opensaml-core/src/test/java/org/opensaml/core/xml/ElementProxyTest.java
    trunk/opensaml-core/src/test/resources/data/org/opensaml/core/xml/UnknownContent.xml

Modified: trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectUnmarshaller.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectUnmarshaller.java?rev=3182&r1=3181&r2=3182&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectUnmarshaller.java (original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectUnmarshaller.java Wed Jan 30 00:56:09 2013
@@ -107,7 +107,8 @@
                 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: trunk/opensaml-core/src/test/java/org/opensaml/core/xml/ElementProxyTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/test/java/org/opensaml/core/xml/ElementProxyTest.java?rev=3182&r1=3181&r2=3182&view=diff
==============================================================================
--- trunk/opensaml-core/src/test/java/org/opensaml/core/xml/ElementProxyTest.java (original)
+++ trunk/opensaml-core/src/test/java/org/opensaml/core/xml/ElementProxyTest.java Wed Jan 30 00:56:09 2013
@@ -25,6 +25,7 @@
 import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
 import org.opensaml.core.xml.io.Unmarshaller;
 import org.opensaml.core.xml.io.UnmarshallingException;
+import org.opensaml.core.xml.schema.XSAny;
 import org.w3c.dom.Document;
 
 /** Test unmarshalling content for which no specific object providers were registered. */
@@ -43,5 +44,7 @@
         
         Assert.assertEquals(xmlobject.getElementQName().getLocalPart(), "products", "Unexpted root element name");
         Assert.assertEquals(xmlobject.getOrderedChildren().size(), 2, "Unexpected number of children");
+        Assert.assertEquals(((XSAny) xmlobject.getOrderedChildren().get(1).getOrderedChildren().get(0)).getTextContent(),
+                "<strong>XSLT Perfect IDE</strong>", "Unexpected CDATA content");
     }
 }

Modified: trunk/opensaml-core/src/test/resources/data/org/opensaml/core/xml/UnknownContent.xml
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/test/resources/data/org/opensaml/core/xml/UnknownContent.xml?rev=3182&r1=3181&r2=3182&view=diff
==============================================================================
--- trunk/opensaml-core/src/test/resources/data/org/opensaml/core/xml/UnknownContent.xml (original)
+++ trunk/opensaml-core/src/test/resources/data/org/opensaml/core/xml/UnknownContent.xml Wed Jan 30 00:56:09 2013
@@ -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>