geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r450402 - in /geronimo/xbean/trunk: xbean-spring-v1/src/main/java/org/apache/xbean/spring/context/v1/ xbean-spring-v1/src/test/resources/org/apache/xbean/spring/context/ xbean-spring-v2a/src/main/java/org/apache/xbean/spring/context/v2a/ xb...
Date Wed, 27 Sep 2006 11:41:55 GMT
Author: gnodet
Date: Wed Sep 27 04:41:54 2006
New Revision: 450402

URL: http://svn.apache.org/viewvc?view=rev&rev=450402
Log:
XBEAN-54: CDATA in text properties are not parsed

Modified:
    geronimo/xbean/trunk/xbean-spring-v1/src/main/java/org/apache/xbean/spring/context/v1/XBeanXmlBeanDefinitionParser.java
    geronimo/xbean/trunk/xbean-spring-v1/src/test/resources/org/apache/xbean/spring/context/gin.xml
    geronimo/xbean/trunk/xbean-spring-v2a/src/main/java/org/apache/xbean/spring/context/v2a/XBeanNamespaceHandler.java
    geronimo/xbean/trunk/xbean-spring-v2a/src/test/resources/org/apache/xbean/spring/context/gin.xml
    geronimo/xbean/trunk/xbean-spring-v2b/src/main/java/org/apache/xbean/spring/context/v2b/XBeanNamespaceHandler.java
    geronimo/xbean/trunk/xbean-spring-v2b/src/test/resources/org/apache/xbean/spring/context/gin.xml

Modified: geronimo/xbean/trunk/xbean-spring-v1/src/main/java/org/apache/xbean/spring/context/v1/XBeanXmlBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-v1/src/main/java/org/apache/xbean/spring/context/v1/XBeanXmlBeanDefinitionParser.java?view=diff&rev=450402&r1=450401&r2=450402
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-v1/src/main/java/org/apache/xbean/spring/context/v1/XBeanXmlBeanDefinitionParser.java
(original)
+++ geronimo/xbean/trunk/xbean-spring-v1/src/main/java/org/apache/xbean/spring/context/v1/XBeanXmlBeanDefinitionParser.java
Wed Sep 27 04:41:54 2006
@@ -851,7 +851,7 @@
         NodeList nodeList = element.getChildNodes();
         for (int i = 0, size = nodeList.getLength(); i < size; i++) {
             Node node = nodeList.item(i);
-            if (node.getNodeType() == Node.TEXT_NODE) {
+            if (node.getNodeType() == Node.TEXT_NODE || node.getNodeType() == Node.CDATA_SECTION_NODE)
{
                 buffer.append(node.getNodeValue());
             }
         }

Modified: geronimo/xbean/trunk/xbean-spring-v1/src/test/resources/org/apache/xbean/spring/context/gin.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-v1/src/test/resources/org/apache/xbean/spring/context/gin.xml?view=diff&rev=450402&r1=450401&r2=450402
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-v1/src/test/resources/org/apache/xbean/spring/context/gin.xml
(original)
+++ geronimo/xbean/trunk/xbean-spring-v1/src/test/resources/org/apache/xbean/spring/context/gin.xml
Wed Sep 27 04:41:54 2006
@@ -20,7 +20,7 @@
 <!-- START SNIPPET: xml -->
 <beans xmlns:b="http://xbean.apache.org/schemas/pizza">
 
-  <b:gin id="ginService">Bombay Sapphire</b:gin>
+  <b:gin id="ginService"><![CDATA[Bombay Sapphire]]></b:gin>
 
 </beans>
 <!-- END SNIPPET: xml -->

Modified: geronimo/xbean/trunk/xbean-spring-v2a/src/main/java/org/apache/xbean/spring/context/v2a/XBeanNamespaceHandler.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-v2a/src/main/java/org/apache/xbean/spring/context/v2a/XBeanNamespaceHandler.java?view=diff&rev=450402&r1=450401&r2=450402
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-v2a/src/main/java/org/apache/xbean/spring/context/v2a/XBeanNamespaceHandler.java
(original)
+++ geronimo/xbean/trunk/xbean-spring-v2a/src/main/java/org/apache/xbean/spring/context/v2a/XBeanNamespaceHandler.java
Wed Sep 27 04:41:54 2006
@@ -862,7 +862,7 @@
         NodeList nodeList = element.getChildNodes();
         for (int i = 0, size = nodeList.getLength(); i < size; i++) {
             Node node = nodeList.item(i);
-            if (node.getNodeType() == Node.TEXT_NODE) {
+            if (node.getNodeType() == Node.TEXT_NODE || node.getNodeType() == Node.CDATA_SECTION_NODE)
{
                 buffer.append(node.getNodeValue());
             }
         }

Modified: geronimo/xbean/trunk/xbean-spring-v2a/src/test/resources/org/apache/xbean/spring/context/gin.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-v2a/src/test/resources/org/apache/xbean/spring/context/gin.xml?view=diff&rev=450402&r1=450401&r2=450402
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-v2a/src/test/resources/org/apache/xbean/spring/context/gin.xml
(original)
+++ geronimo/xbean/trunk/xbean-spring-v2a/src/test/resources/org/apache/xbean/spring/context/gin.xml
Wed Sep 27 04:41:54 2006
@@ -20,7 +20,7 @@
 <!-- START SNIPPET: xml -->
 <beans xmlns:b="http://xbean.apache.org/schemas/pizza">
 
-  <b:gin id="ginService">Bombay Sapphire</b:gin>
+  <b:gin id="ginService"><![CDATA[Bombay Sapphire]]></b:gin>
 
 </beans>
 <!-- END SNIPPET: xml -->

Modified: geronimo/xbean/trunk/xbean-spring-v2b/src/main/java/org/apache/xbean/spring/context/v2b/XBeanNamespaceHandler.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-v2b/src/main/java/org/apache/xbean/spring/context/v2b/XBeanNamespaceHandler.java?view=diff&rev=450402&r1=450401&r2=450402
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-v2b/src/main/java/org/apache/xbean/spring/context/v2b/XBeanNamespaceHandler.java
(original)
+++ geronimo/xbean/trunk/xbean-spring-v2b/src/main/java/org/apache/xbean/spring/context/v2b/XBeanNamespaceHandler.java
Wed Sep 27 04:41:54 2006
@@ -862,7 +862,7 @@
         NodeList nodeList = element.getChildNodes();
         for (int i = 0, size = nodeList.getLength(); i < size; i++) {
             Node node = nodeList.item(i);
-            if (node.getNodeType() == Node.TEXT_NODE) {
+            if (node.getNodeType() == Node.TEXT_NODE || node.getNodeType() == Node.CDATA_SECTION_NODE)
{
                 buffer.append(node.getNodeValue());
             }
         }

Modified: geronimo/xbean/trunk/xbean-spring-v2b/src/test/resources/org/apache/xbean/spring/context/gin.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-v2b/src/test/resources/org/apache/xbean/spring/context/gin.xml?view=diff&rev=450402&r1=450401&r2=450402
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-v2b/src/test/resources/org/apache/xbean/spring/context/gin.xml
(original)
+++ geronimo/xbean/trunk/xbean-spring-v2b/src/test/resources/org/apache/xbean/spring/context/gin.xml
Wed Sep 27 04:41:54 2006
@@ -20,7 +20,7 @@
 <!-- START SNIPPET: xml -->
 <beans xmlns:b="http://xbean.apache.org/schemas/pizza">
 
-  <b:gin id="ginService">Bombay Sapphire</b:gin>
+  <b:gin id="ginService"><![CDATA[Bombay Sapphire]]></b:gin>
 
 </beans>
 <!-- END SNIPPET: xml -->



Mime
View raw message