Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 12441 invoked from network); 27 Sep 2006 11:42:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 27 Sep 2006 11:42:05 -0000 Received: (qmail 9424 invoked by uid 500); 27 Sep 2006 11:42:01 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 8793 invoked by uid 500); 27 Sep 2006 11:41:58 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 8782 invoked by uid 99); 27 Sep 2006 11:41:58 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Sep 2006 04:41:58 -0700 Authentication-Results: idunn.apache.osuosl.org smtp.mail=gnodet@apache.org; spf=permerror X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received-SPF: error (idunn.apache.osuosl.org: domain apache.org from 140.211.166.113 cause and error) Received: from [140.211.166.113] ([140.211.166.113:49916] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id CF/52-24938-6836A154 for ; Wed, 27 Sep 2006 04:41:58 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id E80051A981A; Wed, 27 Sep 2006 04:41:55 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: gnodet@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060927114155.E80051A981A@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 @@ - Bombay Sapphire + 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 @@ - Bombay Sapphire + 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 @@ - Bombay Sapphire +