You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/02/14 23:48:19 UTC

svn commit: r377870 - in /incubator/servicemix/trunk: servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/ servicemix-soap/src/test/java/org/apache/servicemix/soap/marshalers/ servicemix-soap/src/test/resources/org/apache/servicemix/soap/marsh...

Author: gnodet
Date: Tue Feb 14 14:48:17 2006
New Revision: 377870

URL: http://svn.apache.org/viewcvs?rev=377870&view=rev
Log:
Fix parsing problems on soap headers

Added:
    incubator/servicemix/trunk/servicemix-soap/src/test/resources/org/apache/servicemix/soap/marshalers/soap2.xml
Modified:
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReader.java
    incubator/servicemix/trunk/servicemix-soap/src/test/java/org/apache/servicemix/soap/marshalers/SoapMessageMarshalerTest.java

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReader.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReader.java?rev=377870&r1=377869&r2=377870&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReader.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReader.java Tue Feb 14 14:48:17 2006
@@ -81,7 +81,6 @@
 			}
 			break;
 		case STATE_END_DOC:
-			getParent().next(); // Go to next event, after END_ELEMENT
 			event = END_DOCUMENT;
 			break;
 		default:

Modified: incubator/servicemix/trunk/servicemix-soap/src/test/java/org/apache/servicemix/soap/marshalers/SoapMessageMarshalerTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-soap/src/test/java/org/apache/servicemix/soap/marshalers/SoapMessageMarshalerTest.java?rev=377870&r1=377869&r2=377870&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-soap/src/test/java/org/apache/servicemix/soap/marshalers/SoapMessageMarshalerTest.java (original)
+++ incubator/servicemix/trunk/servicemix-soap/src/test/java/org/apache/servicemix/soap/marshalers/SoapMessageMarshalerTest.java Tue Feb 14 14:48:17 2006
@@ -144,6 +144,12 @@
         Node node = sourceTransformer.toDOMNode(new BytesSource(baos.toByteArray()));
         checkUserIdNamespace(node);
 	}
+    
+    public void testSoapMessage2() throws Exception {
+        SoapMarshaler marshaler = new SoapMarshaler(true);
+        SoapMessage msg = marshaler.createReader().read(getClass().getResourceAsStream("soap2.xml"));
+        assertNotNull(msg);
+    }
 	
 	public void testWriteAndReadSoapMessageWithAttachments() throws Exception {
 		SoapMarshaler marshaler = new SoapMarshaler(true);

Added: incubator/servicemix/trunk/servicemix-soap/src/test/resources/org/apache/servicemix/soap/marshalers/soap2.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-soap/src/test/resources/org/apache/servicemix/soap/marshalers/soap2.xml?rev=377870&view=auto
==============================================================================
--- incubator/servicemix/trunk/servicemix-soap/src/test/resources/org/apache/servicemix/soap/marshalers/soap2.xml (added)
+++ incubator/servicemix/trunk/servicemix-soap/src/test/resources/org/apache/servicemix/soap/marshalers/soap2.xml Tue Feb 14 14:48:17 2006
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<e:Envelope xmlns:e="http://schemas.xmlsoap.org/soap/envelope/"
+            xmlns:wsa="http://schemas.xmlsoap.org/soap/envelope/">
+  <e:Header>
+    <wsa:To>http://test/MyServiceConsumer/</wsa:To></e:Header>
+  <e:Body>
+    <ping>
+      <pingRequest>
+        <message xmlns="http://soap">hela</message>
+      </pingRequest>
+    </ping>
+  </e:Body>
+</e:Envelope>
+
+  
\ No newline at end of file