cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jp...@apache.org
Subject cxf git commit: CXF-6107 extended to support marshaller / unmarshaller aware event readers, event writers, stream writers
Date Mon, 17 Nov 2014 22:44:19 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 83ac7b236 -> ca3d75211


CXF-6107 extended to support marshaller / unmarshaller aware event readers, event writers,
stream writers

Conflicts:
	rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ca3d7521
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ca3d7521
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ca3d7521

Branch: refs/heads/3.0.x-fixes
Commit: ca3d75211b28d8f84736c7d30849b36246cd388d
Parents: 83ac7b2
Author: Jason Pell <jpell@apache.org>
Authored: Tue Nov 18 09:34:32 2014 +1100
Committer: Jason Pell <jpell@apache.org>
Committed: Tue Nov 18 09:43:38 2014 +1100

----------------------------------------------------------------------
 .../org/apache/cxf/jaxb/JAXBEncoderDecoder.java | 22 ++++-
 .../cxf/jaxb/MarshallerAwareXMLWriter.java      | 29 +++++++
 .../cxf/jaxb/UnmarshallerAwareXMLReader.java    | 29 +++++++
 .../jaxb/UnmarshallerAwareXMLStreamReader.java  | 29 -------
 .../cxf/jaxb/DocLiteralInInterceptorTest.java   | 33 +------
 .../cxf/jaxb/FixNamespacesXMLEventReader.java   | 41 +++++++++
 .../cxf/jaxb/FixNamespacesXMLEventWriter.java   | 81 ++++++++++++++++++
 .../cxf/jaxb/FixNamespacesXMLStreamReader.java  | 41 ++-------
 .../cxf/jaxb/FixNamespacesXMLStreamWriter.java  | 42 +++++++++
 .../apache/cxf/jaxb/JAXBEncoderDecoderTest.java | 90 +++++++++++++++++---
 .../resources/GreetMeDocLiteralReqDiffNs.xml    | 20 -----
 11 files changed, 327 insertions(+), 130 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/ca3d7521/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
index 4ba739f..b7b0478 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
@@ -608,12 +608,21 @@ public final class JAXBEncoderDecoder {
 
     private static void writeObject(Marshaller u, Object source, Object mObj) throws Fault,
JAXBException {
         if (source instanceof XMLStreamWriter) {
+            // allows the XML Stream Writer to adjust it's behaviour based on the state of
the unmarshaller
+            if (source instanceof MarshallerAwareXMLWriter) {
+                ((MarshallerAwareXMLWriter) source).setMarshaller(u);
+            }
             u.marshal(mObj, (XMLStreamWriter)source);
         } else if (source instanceof OutputStream) {
             u.marshal(mObj, (OutputStream)source);
         } else if (source instanceof Node) {
             u.marshal(mObj, (Node)source);
         } else if (source instanceof XMLEventWriter) {
+            // allows the XML Event Writer to adjust it's behaviour based on the state of
the unmarshaller
+            if (source instanceof MarshallerAwareXMLWriter) {
+                ((MarshallerAwareXMLWriter) source).setMarshaller(u);
+            }
+            
             u.marshal(mObj, (XMLEventWriter)source);
         } else {
             throw new Fault(new Message("UNKNOWN_SOURCE", LOG, source.getClass().getName()));
@@ -838,8 +847,8 @@ public final class JAXBEncoderDecoder {
             XMLStreamReader reader = dr.getReader();
             
             // allows the XML Stream Reader to adjust it's behaviour based on the state of
the unmarshaller
-            if (reader instanceof UnmarshallerAwareXMLStreamReader) {
-                ((UnmarshallerAwareXMLStreamReader) reader).setUnmarshaller(u);
+            if (reader instanceof UnmarshallerAwareXMLReader) {
+                ((UnmarshallerAwareXMLReader) reader).setUnmarshaller(u);
             }
             
             if (u.getSchema() != null) {
@@ -852,8 +861,8 @@ public final class JAXBEncoderDecoder {
             XMLStreamReader reader = (XMLStreamReader)source;
             
             // allows the XML Stream Reader to adjust it's behaviour based on the state of
the unmarshaller
-            if (reader instanceof UnmarshallerAwareXMLStreamReader) {
-                ((UnmarshallerAwareXMLStreamReader) reader).setUnmarshaller(u);
+            if (reader instanceof UnmarshallerAwareXMLReader) {
+                ((UnmarshallerAwareXMLReader) reader).setUnmarshaller(u);
             }
             
             if (u.getSchema() != null) {
@@ -863,6 +872,11 @@ public final class JAXBEncoderDecoder {
             obj = unmarshalWithClass ? u.unmarshal(reader, clazz) : u
                 .unmarshal((XMLStreamReader)source);
         } else if (source instanceof XMLEventReader) {
+            // allows the XML Event Reader to adjust it's behaviour based on the state of
the unmarshaller
+            if (source instanceof UnmarshallerAwareXMLReader) {
+                ((UnmarshallerAwareXMLReader) source).setUnmarshaller(u);
+            }
+            
             obj = unmarshalWithClass ? u.unmarshal((XMLEventReader)source, clazz) : u
                 .unmarshal((XMLEventReader)source);
         } else if (source == null) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/ca3d7521/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/MarshallerAwareXMLWriter.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/MarshallerAwareXMLWriter.java
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/MarshallerAwareXMLWriter.java
new file mode 100644
index 0000000..ef6bce9
--- /dev/null
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/MarshallerAwareXMLWriter.java
@@ -0,0 +1,29 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.jaxb;
+
+import javax.xml.bind.Marshaller;
+
+/*
+ * A XML Writer that adjusts it's behaviour based on the state of the marshaller.
+ */
+public interface MarshallerAwareXMLWriter {
+    void setMarshaller(Marshaller marshaller);
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/ca3d7521/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/UnmarshallerAwareXMLReader.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/UnmarshallerAwareXMLReader.java
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/UnmarshallerAwareXMLReader.java
new file mode 100644
index 0000000..27ed146
--- /dev/null
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/UnmarshallerAwareXMLReader.java
@@ -0,0 +1,29 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.jaxb;
+
+import javax.xml.bind.Unmarshaller;
+
+/*
+ * A XML Reader that adjusts it's behaviour based on the state of the unmarshaller.
+ */
+public interface UnmarshallerAwareXMLReader {
+    void setUnmarshaller(Unmarshaller unmarshaller);
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/ca3d7521/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/UnmarshallerAwareXMLStreamReader.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/UnmarshallerAwareXMLStreamReader.java
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/UnmarshallerAwareXMLStreamReader.java
deleted file mode 100644
index 382acc0..0000000
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/UnmarshallerAwareXMLStreamReader.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.jaxb;
-
-import javax.xml.bind.Unmarshaller;
-
-/*
- * A XML Stream Reader that adjusts it's behaviour based on the state of the unmarshaller.
- */
-public interface UnmarshallerAwareXMLStreamReader {
-    void setUnmarshaller(Unmarshaller unmarshaller);
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/ca3d7521/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
index c0083a2..b458256 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
@@ -19,14 +19,12 @@
 
 package org.apache.cxf.jaxb;
 
-
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.bind.JAXBContext;
-import javax.xml.bind.UnmarshalException;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
@@ -39,7 +37,6 @@ import org.apache.cxf.binding.BindingFactory;
 import org.apache.cxf.binding.BindingFactoryManager;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.endpoint.EndpointImpl;
-import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;
@@ -62,7 +59,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-
 import static org.easymock.EasyMock.createNiceControl;
 import static org.easymock.EasyMock.expect;
 
@@ -96,38 +92,13 @@ public class DocLiteralInInterceptorTest extends Assert {
 
     @Test
     public void testInterceptorInboundWrapped() throws Exception {
-        XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(
-                getTestStream(getClass(), "resources/GreetMeDocLiteralReq.xml"));
-        
-        testInterceptorInboundWrapped(reader);
-    }
-    
-    @Test
-    public void testInterceptorInboundWrappedDiffNs() throws Exception {
-        XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(
-                getTestStream(getClass(), "resources/GreetMeDocLiteralReqDiffNs.xml"));
-        FixNamespacesXMLStreamReader fixNs = new FixNamespacesXMLStreamReader(reader);
-        testInterceptorInboundWrapped(fixNs);
-    }
-    
-    @Test
-    public void testInterceptorInboundWrappedDiffNsNoFix() throws Exception {
-        XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(
-                getTestStream(getClass(), "resources/GreetMeDocLiteralReqDiffNs.xml"));
-        try {
-            testInterceptorInboundWrapped(reader);
-        } catch (Fault f) {
-            assertTrue(f.getCause() instanceof UnmarshalException);
-        }
-    }
-    
-    private void testInterceptorInboundWrapped(XMLStreamReader inReader) throws Exception
{
         setUpUsingHelloWorld();
 
         //WrappedInInterceptor interceptor = new WrappedInInterceptor();
         DocLiteralInInterceptor interceptor = new DocLiteralInInterceptor();
 
-        message.setContent(XMLStreamReader.class, inReader);
+        message.setContent(XMLStreamReader.class, XMLInputFactory.newInstance()
+            .createXMLStreamReader(getTestStream(getClass(), "resources/GreetMeDocLiteralReq.xml")));
         XMLStreamReader reader = message.getContent(XMLStreamReader.class);
         // skip the start element of soap body
         StaxUtils.skipToStartOfElement(reader);

http://git-wip-us.apache.org/repos/asf/cxf/blob/ca3d7521/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/FixNamespacesXMLEventReader.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/FixNamespacesXMLEventReader.java
b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/FixNamespacesXMLEventReader.java
new file mode 100644
index 0000000..9845ffc
--- /dev/null
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/FixNamespacesXMLEventReader.java
@@ -0,0 +1,41 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.jaxb;
+
+import javax.xml.bind.Unmarshaller;
+import javax.xml.stream.XMLEventReader;
+import javax.xml.stream.util.EventReaderDelegate;
+
+public class FixNamespacesXMLEventReader extends EventReaderDelegate implements UnmarshallerAwareXMLReader
{
+    private Unmarshaller unmarshaller;
+
+    public FixNamespacesXMLEventReader(final XMLEventReader delegate) {
+        super(delegate);
+    }
+
+    @Override
+    public void setUnmarshaller(Unmarshaller unmarshaller) {
+        this.unmarshaller = unmarshaller;
+    }
+
+    public Unmarshaller getUnmarshaller() {
+        return unmarshaller;
+    }
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/ca3d7521/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/FixNamespacesXMLEventWriter.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/FixNamespacesXMLEventWriter.java
b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/FixNamespacesXMLEventWriter.java
new file mode 100644
index 0000000..cae032b
--- /dev/null
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/FixNamespacesXMLEventWriter.java
@@ -0,0 +1,81 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.jaxb;
+
+import javax.xml.bind.Marshaller;
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.stream.XMLEventReader;
+import javax.xml.stream.XMLEventWriter;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.events.XMLEvent;
+
+public class FixNamespacesXMLEventWriter implements XMLEventWriter, MarshallerAwareXMLWriter
{
+    private final XMLEventWriter delegate;
+    private Marshaller marshaller;
+    
+    public FixNamespacesXMLEventWriter(XMLEventWriter delegate) {
+        this.delegate = delegate;
+    }
+    
+    public void flush() throws XMLStreamException {
+        delegate.flush();
+    }
+
+    public void close() throws XMLStreamException {
+        delegate.close();
+    }
+
+    public void add(XMLEvent event) throws XMLStreamException {
+        delegate.add(event);
+    }
+
+    public void add(XMLEventReader reader) throws XMLStreamException {
+        delegate.add(reader);
+    }
+
+    public String getPrefix(String uri) throws XMLStreamException {
+        return delegate.getPrefix(uri);
+    }
+
+    public void setPrefix(String prefix, String uri) throws XMLStreamException {
+        delegate.setPrefix(prefix, uri);
+    }
+
+    public void setDefaultNamespace(String uri) throws XMLStreamException {
+        delegate.setDefaultNamespace(uri);
+    }
+
+    public void setNamespaceContext(NamespaceContext context) throws XMLStreamException {
+        delegate.setNamespaceContext(context);
+    }
+
+    public NamespaceContext getNamespaceContext() {
+        return delegate.getNamespaceContext();
+    }
+
+    @Override
+    public void setMarshaller(Marshaller marshaller) {
+        this.marshaller = marshaller;
+    }
+
+    public Marshaller getMarshaller() {
+        return marshaller;
+    }
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/ca3d7521/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/FixNamespacesXMLStreamReader.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/FixNamespacesXMLStreamReader.java
b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/FixNamespacesXMLStreamReader.java
index bb67737..200f9cf 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/FixNamespacesXMLStreamReader.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/FixNamespacesXMLStreamReader.java
@@ -19,50 +19,23 @@
 
 package org.apache.cxf.jaxb;
 
-import java.util.Collection;
-
 import javax.xml.bind.Unmarshaller;
-import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.util.StreamReaderDelegate;
 
-import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallerImpl;
-import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext;
-
-/**
- * A sample of an unmarshaller aware xml stream reader that can adjust the namespace of elements
read in, as long
- * as the local name matches.  Based on the same kind of thing for SAX encountered at 
- * 
- * http://stackoverflow.com/questions/277502/jaxb-how-to-ignore-namespace-during-unmarshalling-xml-document
- */
-public class FixNamespacesXMLStreamReader extends StreamReaderDelegate implements UnmarshallerAwareXMLStreamReader
{
-    private UnmarshallingContext ctx;
+public class FixNamespacesXMLStreamReader extends StreamReaderDelegate implements UnmarshallerAwareXMLReader
{
+    private Unmarshaller unmarshaller;
 
     public FixNamespacesXMLStreamReader(final XMLStreamReader delegate) {
         super(delegate);
     }
 
-    public String getNamespaceURI() {
-        String localName = getLocalName();
-        String namespace = super.getNamespaceURI();
-        namespace = getMappedNamespace(localName, namespace);
-        return namespace;
-    }
-
-    private String getMappedNamespace(String localName, String namespace) {
-        if (ctx != null) {
-            Collection<QName> expected = ctx.getCurrentExpectedElements();
-            for (QName expectedQname : expected) {
-                if (localName.equals(expectedQname.getLocalPart())) {
-                    return expectedQname.getNamespaceURI();
-                }
-            }
-        }
-        return namespace;
-    }
-
     @Override
     public void setUnmarshaller(Unmarshaller unmarshaller) {
-        this.ctx = ((UnmarshallerImpl) unmarshaller).getContext();
+        this.unmarshaller = unmarshaller;
+    }
+
+    public Unmarshaller getUnmarshaller() {
+        return unmarshaller;
     }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/ca3d7521/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/FixNamespacesXMLStreamWriter.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/FixNamespacesXMLStreamWriter.java
b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/FixNamespacesXMLStreamWriter.java
new file mode 100644
index 0000000..10c5a18
--- /dev/null
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/FixNamespacesXMLStreamWriter.java
@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.jaxb;
+
+import javax.xml.bind.Marshaller;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.codehaus.stax2.util.StreamWriterDelegate;
+
+public class FixNamespacesXMLStreamWriter extends StreamWriterDelegate implements MarshallerAwareXMLWriter
{
+    private Marshaller marshaller;
+
+    public FixNamespacesXMLStreamWriter(final XMLStreamWriter delegate) {
+        super(delegate);
+    }
+
+    @Override
+    public void setMarshaller(Marshaller marshaller) {
+        this.marshaller = marshaller;
+    }
+
+    public Marshaller getMarshaller() {
+        return marshaller;
+    }
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/ca3d7521/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
index c4b89e7..d4cabb9 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
@@ -66,7 +66,6 @@ import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.hello_world_soap_http.types.GreetMe;
 import org.apache.hello_world_soap_http.types.GreetMeResponse;
 import org.apache.hello_world_soap_http.types.StringStruct;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -256,7 +255,7 @@ public class JAXBEncoderDecoderTest extends Assert {
     }
     
     @Test
-    public void testMarshallIntoStax() throws Exception {
+    public void testMarshallIntoStaxStreamWriter() throws Exception {
         GreetMe obj = new GreetMe();
         obj.setRequestType("Hello");
         QName elName = new QName(wrapperAnnotation.targetNamespace(),
@@ -268,11 +267,50 @@ public class JAXBEncoderDecoderTest extends Assert {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         XMLOutputFactory opFactory = XMLOutputFactory.newInstance();
         opFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
-        XMLEventWriter writer = opFactory.createXMLEventWriter(baos);
-
+        FixNamespacesXMLStreamWriter writer = new FixNamespacesXMLStreamWriter(opFactory.createXMLStreamWriter(baos));
+        
+        assertNull(writer.getMarshaller());
+        
+        Marshaller m = context.createMarshaller();
+        JAXBEncoderDecoder.marshall(m, obj, part, writer);
+        assertEquals(m, writer.getMarshaller());
+        writer.flush();
+        writer.close();
+        
+        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+        XMLInputFactory ipFactory = XMLInputFactory.newInstance();
+        XMLEventReader reader = ipFactory.createXMLEventReader(bais);
+        
+        Unmarshaller um = context.createUnmarshaller();        
+        Object val = um.unmarshal(reader, GreetMe.class);
+        assertTrue(val instanceof JAXBElement);
+        val = ((JAXBElement<?>)val).getValue();
+        assertTrue(val instanceof GreetMe);
+        assertEquals(obj.getRequestType(), 
+                     ((GreetMe)val).getRequestType());
+    }
+    
+    @Test
+    public void testMarshallIntoStaxEventWriter() throws Exception {
+        GreetMe obj = new GreetMe();
+        obj.setRequestType("Hello");
+        QName elName = new QName(wrapperAnnotation.targetNamespace(),
+                                 wrapperAnnotation.localName());
+        MessagePartInfo part = new MessagePartInfo(elName, null);
+        part.setElement(true);
+        part.setElementQName(elName);
+                
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        XMLOutputFactory opFactory = XMLOutputFactory.newInstance();
+        opFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
+        FixNamespacesXMLEventWriter writer = new FixNamespacesXMLEventWriter(opFactory.createXMLEventWriter(baos));
+        assertNull(writer.getMarshaller());
+        
         //STARTDOCUMENT/ENDDOCUMENT is not required
-        //writer.add(eFactory.createStartDocument("utf-8", "1.0"));        
-        JAXBEncoderDecoder.marshall(context.createMarshaller(), obj, part, writer);
+        //writer.add(eFactory.createStartDocument("utf-8", "1.0"));
+        Marshaller m = context.createMarshaller();
+        JAXBEncoderDecoder.marshall(m, obj, part, writer);
+        assertEquals(m, writer.getMarshaller());
         //writer.add(eFactory.createEndDocument());
         writer.flush();
         writer.close();
@@ -293,24 +331,52 @@ public class JAXBEncoderDecoderTest extends Assert {
     }
 
     @Test
-    public void testUnmarshallFromStax() throws Exception {
+    public void testUnmarshallFromStaxStreamReader() throws Exception {
         QName elName = new QName(wrapperAnnotation.targetNamespace(),
                                  wrapperAnnotation.localName());
         MessagePartInfo part = new MessagePartInfo(elName, null);
 
         InputStream is =  getClass().getResourceAsStream("resources/GreetMeDocLiteralReq.xml");
         XMLInputFactory factory = XMLInputFactory.newInstance();
-        XMLStreamReader reader = 
-            factory.createXMLStreamReader(is);
-
+        XMLStreamReader reader = factory.createXMLStreamReader(is);
+        
         QName[] tags = {SOAP_ENV, SOAP_BODY};
         StaxStreamFilter filter = new StaxStreamFilter(tags);
-        reader = factory.createFilteredReader(reader, filter);
+        FixNamespacesXMLStreamReader filteredReader = new FixNamespacesXMLStreamReader(
+                factory.createFilteredReader(reader, filter));
 
+        assertNull(filteredReader.getUnmarshaller());
+        
         //Remove START_DOCUMENT & START_ELEMENT pertaining to Envelope and Body Tags.
 
         part.setTypeClass(GreetMe.class);
-        Object val = JAXBEncoderDecoder.unmarshall(context.createUnmarshaller(), reader,
part, true);
+        Unmarshaller um = context.createUnmarshaller();
+        Object val = JAXBEncoderDecoder.unmarshall(um, filteredReader, part, true);
+        assertEquals(um, filteredReader.getUnmarshaller());
+        assertNotNull(val);
+        assertTrue(val instanceof GreetMe);
+        assertEquals("TestSOAPInputPMessage", 
+                     ((GreetMe)val).getRequestType());
+
+        is.close();
+    }
+    
+    @Test
+    public void testUnmarshallFromStaxEventReader() throws Exception {
+        QName elName = new QName(wrapperAnnotation.targetNamespace(),
+                                 wrapperAnnotation.localName());
+        MessagePartInfo part = new MessagePartInfo(elName, null);
+
+        InputStream is =  getClass().getResourceAsStream("resources/GreetMeDocLiteralReq.xml");
+        XMLInputFactory factory = XMLInputFactory.newInstance();
+        FixNamespacesXMLEventReader reader = new FixNamespacesXMLEventReader(factory.createXMLEventReader(is));
+        
+        assertNull(reader.getUnmarshaller());
+
+        part.setTypeClass(GreetMe.class);
+        Unmarshaller um = context.createUnmarshaller();
+        Object val = JAXBEncoderDecoder.unmarshall(um, reader, part, true);
+        assertEquals(um, reader.getUnmarshaller());
         assertNotNull(val);
         assertTrue(val instanceof GreetMe);
         assertEquals("TestSOAPInputPMessage", 

http://git-wip-us.apache.org/repos/asf/cxf/blob/ca3d7521/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/resources/GreetMeDocLiteralReqDiffNs.xml
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/resources/GreetMeDocLiteralReqDiffNs.xml
b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/resources/GreetMeDocLiteralReqDiffNs.xml
deleted file mode 100644
index c478583..0000000
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/resources/GreetMeDocLiteralReqDiffNs.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<ns4:greetMe xmlns:ns4="http://apache.org/hello_world_soap_http/types"
-	xmlns:ns3="http://apache.org/hello_world/data"><ns3:requestType>TestSOAPInputPMessage</ns3:requestType></ns4:greetMe>


Mime
View raw message