svn commit: r408845 - /incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XMarshaler.java

[gn...@apache.org]

Author: gnodet
Date: Tue May 23 00:55:34 2006
New Revision: 408845

URL: http://svn.apache.org/viewvc?rev=408845&view=rev
Log:
Fix XFire lw component unit tests

Modified:
    incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XMarshaler.java

Modified: incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XMarshaler.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XMarshaler.java?rev=408845&r1=408844&r2=408845&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XMarshaler.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XMarshaler.java Tue May 23 00:55:34 2006
@@ -30,6 +30,7 @@
 import javax.xml.transform.TransformerException;
 
 import org.apache.servicemix.jbi.jaxp.SourceTransformer;
+import org.apache.servicemix.jbi.jaxp.StAXSourceTransformer;
 import org.apache.servicemix.jbi.jaxp.StringSource;
 import org.codehaus.xfire.exchange.OutMessage;
 
@@ -38,13 +39,11 @@
  */
 public class XMarshaler {
 
-    private XMLOutputFactory outputFactory;
-    private XMLInputFactory inputFactory;
+    private StAXSourceTransformer transformer;
     
     public XMarshaler()
     {
-        outputFactory = XMLOutputFactory.newInstance();
-        inputFactory = XMLInputFactory.newInstance();
+        transformer = new StAXSourceTransformer();
     }
 
     public void setContent(NormalizedMessage message, String xml) throws MessagingException {
@@ -53,18 +52,12 @@
 
     public XMLStreamReader createStreamReader(NormalizedMessage message) throws XMLStreamException, TransformerException {
         Source content = message.getContent();
-        try {
-            return getInputFactory().createXMLStreamReader(content);
-        } catch (XMLStreamException e) {
-            // Such features can be not supported, depending on the source type
-            InputStream is = new SourceTransformer().toStreamSource(content).getInputStream();
-            return getInputFactory().createXMLStreamReader(is);
-        }
+        return transformer.toXMLStreamReader(content);
     }
 
 
     public XMLStreamWriter createStreamWriter(Writer writer) throws XMLStreamException {
-        return getOutputFactory().createXMLStreamWriter(writer);
+        return transformer.getOutputFactory().createXMLStreamWriter(writer);
     }
 
     /**
@@ -79,13 +72,4 @@
     public void toNMS(NormalizedMessage normalizedMessage, OutMessage outMessage) {
     }
 
-    public XMLInputFactory getInputFactory()
-    {
-        return inputFactory;
-    }
-
-    public XMLOutputFactory getOutputFactory()
-    {
-        return outputFactory;
-    }
 }