[jboss-svn-commits] JBL Code SVN: r31545 - in labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta: tests/src/org/jboss/internal/soa/esb/util and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2010-02-10 09:07:49 -0500 (Wed, 10 Feb 2010)
New Revision: 31545

Added:
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/util/whitespace_source.xml
Modified:
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/internal/soa/esb/util/wstx/ESBDOMWrappingWriter.java
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/util/XMLHelperUnitTest.java
Log:
Handle characters outside of the root element: JBESB-3178

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/internal/soa/esb/util/wstx/ESBDOMWrappingWriter.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/internal/soa/esb/util/wstx/ESBDOMWrappingWriter.java	2010-02-10 13:52:57 UTC (rev 31544)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/internal/soa/esb/util/wstx/ESBDOMWrappingWriter.java	2010-02-10 14:07:49 UTC (rev 31545)
@@ -232,7 +232,9 @@
     }
 
     public void writeCData(String data) {
-        appendLeaf(mDocument.createCDATASection(data));
+        if (mParentElem != null) {
+            appendLeaf(mDocument.createCDATASection(data));
+        }
     }
 
     public void writeCharacters(char[] text, int start, int len)
@@ -241,7 +243,9 @@
     }
     
     public void writeCharacters(String text) {
-        appendLeaf(mDocument.createTextNode(text));
+        if (mParentElem != null) {
+            appendLeaf(mDocument.createTextNode(text));
+        }
     }
 
     public void writeComment(String data) {

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/util/XMLHelperUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/util/XMLHelperUnitTest.java	2010-02-10 13:52:57 UTC (rev 31544)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/util/XMLHelperUnitTest.java	2010-02-10 14:07:49 UTC (rev 31545)
@@ -177,6 +177,19 @@
         final Document document = XMLHelper.createDocument(reader) ;
         assertNotNull("document is null", document) ;
     }
+
+
+    @Test
+    public void testWhitespaceParsing()
+        throws Exception
+    {
+        final InputStream is = ClassUtil.getResourceAsStream("whitespace_source.xml", getClass()) ;
+        final XMLEventReader reader = XMLHelper.getXMLEventReader(is) ;
+        final Document document = XMLHelper.createDocument(reader) ;
+        
+        assertNotNull("document is null", document) ;
+    }
+
     public static junit.framework.Test suite()
     {
         return new JUnit4TestAdapter(XMLHelperUnitTest.class);

Added: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/util/whitespace_source.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/util/whitespace_source.xml	                        (rev 0)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/util/whitespace_source.xml	2010-02-10 14:07:49 UTC (rev 31545)
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- explicit whitespace before document -->
+
+<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" xmlns:body="http://www.example.com/ns/body">
+  <env:Header/>
+  <env:Body xmlns:env="http://schemas.xmlsoap.org/soap/envelope/">
+    <body:content xmlns:body="http://www.example.com/ns/body">
+      Text
+      <body:element>data</body:element>
+    </body:content>
+  </env:Body>
+</env:Envelope>
+
+<!-- explicit whitespace after document -->
+


Property changes on: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/util/whitespace_source.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native