servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1144369 - in /servicemix/components/trunk: bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/ engines/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/ engines/servicemix-jsr181/src/main/java/org/apach...
Date Fri, 08 Jul 2011 15:57:24 GMT
Author: jbonofre
Date: Fri Jul  8 15:57:24 2011
New Revision: 1144369

URL: http://svn.apache.org/viewvc?rev=1144369&view=rev
Log:
[SM-1831] Replace StaxSourceTransformer by SourceTransformer.

Modified:
    servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/DefaultHttpConsumerMarshaler.java
    servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/DefaultHttpProviderMarshaler.java
    servicemix/components/trunk/engines/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java
    servicemix/components/trunk/engines/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiChannel.java
    servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jbi/JbiWrapperHelper.java
    servicemix/components/trunk/shared-libraries/servicemix-soap/src/main/java/org/apache/servicemix/soap/marshalers/SoapMarshaler.java

Modified: servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/DefaultHttpConsumerMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/DefaultHttpConsumerMarshaler.java?rev=1144369&r1=1144368&r2=1144369&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/DefaultHttpConsumerMarshaler.java
(original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/DefaultHttpConsumerMarshaler.java
Fri Jul  8 15:57:24 2011
@@ -31,20 +31,19 @@ import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.servicemix.jbi.jaxp.StAXSourceTransformer;
+import org.apache.servicemix.jbi.jaxp.SourceTransformer;
 import org.apache.servicemix.jbi.jaxp.XMLStreamHelper;
 import org.apache.servicemix.common.JbiConstants;
 import org.mortbay.jetty.HttpHeaders;
 
 /**
  * The default consumer marshaler used for non-soap consumer endpoints.
- * 
- * @author gnodet
+ *
  * @since 3.2
  */
 public class DefaultHttpConsumerMarshaler extends AbstractHttpConsumerMarshaler {
 
-    private StAXSourceTransformer transformer = new StAXSourceTransformer();
+    private SourceTransformer transformer = new SourceTransformer();
     private URI defaultMep;
 
     public DefaultHttpConsumerMarshaler() {

Modified: servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/DefaultHttpProviderMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/DefaultHttpProviderMarshaler.java?rev=1144369&r1=1144368&r2=1144369&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/DefaultHttpProviderMarshaler.java
(original)
+++ servicemix/components/trunk/bindings/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/DefaultHttpProviderMarshaler.java
Fri Jul  8 15:57:24 2011
@@ -36,7 +36,6 @@ import org.apache.commons.httpclient.Htt
 import org.apache.servicemix.expression.Expression;
 import org.apache.servicemix.http.jetty.SmxHttpExchange;
 import org.apache.servicemix.jbi.jaxp.SourceTransformer;
-import org.apache.servicemix.jbi.jaxp.StAXSourceTransformer;
 import org.mortbay.io.ByteArrayBuffer;
 import org.mortbay.jetty.HttpHeaders;
 import org.mortbay.jetty.HttpMethods;
@@ -49,7 +48,7 @@ import org.mortbay.jetty.HttpMethods;
  */
 public class DefaultHttpProviderMarshaler extends AbstractHttpProviderMarshaler implements
HttpProviderMarshaler {
 
-    private SourceTransformer transformer = new StAXSourceTransformer();
+    private SourceTransformer transformer = new SourceTransformer();
     private String locationURI;
     private Expression locationURIExpression;
     private String method;

Modified: servicemix/components/trunk/engines/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java?rev=1144369&r1=1144368&r2=1144369&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java
(original)
+++ servicemix/components/trunk/engines/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java
Fri Jul  8 15:57:24 2011
@@ -52,7 +52,7 @@ import org.apache.servicemix.common.Mana
 import org.apache.servicemix.common.endpoints.ProviderEndpoint;
 import org.apache.servicemix.common.tools.wsdl.WSDLFlattener;
 import org.apache.servicemix.jbi.api.Container;
-import org.apache.servicemix.jbi.jaxp.StAXSourceTransformer;
+import org.apache.servicemix.jbi.jaxp.SourceTransformer;
 import org.apache.servicemix.jbi.jaxp.StringSource;
 import org.apache.servicemix.jsr181.xfire.JbiFaultSerializer;
 import org.apache.servicemix.jsr181.xfire.JbiTransport;
@@ -107,7 +107,7 @@ public class Jsr181Endpoint extends Prov
     protected Resource wsdlResource;
     protected boolean mtomEnabled;
     protected Map properties;
-    protected StAXSourceTransformer transformer;
+    protected SourceTransformer transformer;
 
     /* should the payload be automaticaly validated by the ws engine
      * if not set then it is up to the engine to decide
@@ -115,7 +115,7 @@ public class Jsr181Endpoint extends Prov
     private Boolean validationEnabled;
     
     public Jsr181Endpoint() {
-        this.transformer = new StAXSourceTransformer();
+        this.transformer = new SourceTransformer();
     }
     
     /**

Modified: servicemix/components/trunk/engines/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiChannel.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiChannel.java?rev=1144369&r1=1144368&r2=1144369&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiChannel.java
(original)
+++ servicemix/components/trunk/engines/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiChannel.java
Fri Jul  8 15:57:24 2011
@@ -34,7 +34,7 @@ import javax.xml.stream.XMLStreamWriter;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.servicemix.jbi.jaxp.StAXSourceTransformer;
+import org.apache.servicemix.jbi.jaxp.SourceTransformer;
 import org.apache.servicemix.jbi.jaxp.StringSource;
 import org.apache.servicemix.jbi.helper.MessageExchangePattern;
 import org.apache.servicemix.jsr181.JBIContext;
@@ -60,17 +60,17 @@ public class JbiChannel extends Abstract
     public static final String JBI_ENDPOINT = "jbi.endpoint";
     public static final String JBI_SECURITY_PROPAGATATION = "jbi.security.propagation";
 
-    private static ThreadLocal<StAXSourceTransformer> transformer = new ThreadLocal<StAXSourceTransformer>();
+    private static ThreadLocal<SourceTransformer> transformer = new ThreadLocal<SourceTransformer>();
 
     public JbiChannel(String uri, JbiTransport transport) {
         setTransport(transport);
         setUri(uri);
     }
 
-    protected static StAXSourceTransformer getTransformer() {
-        StAXSourceTransformer t = transformer.get();
+    protected static SourceTransformer getTransformer() {
+        SourceTransformer t = transformer.get();
         if (t == null) {
-            t = new StAXSourceTransformer();
+            t = new SourceTransformer();
             transformer.set(t);
         }
         return t;

Modified: servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jbi/JbiWrapperHelper.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jbi/JbiWrapperHelper.java?rev=1144369&r1=1144368&r2=1144369&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jbi/JbiWrapperHelper.java
(original)
+++ servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jbi/JbiWrapperHelper.java
Fri Jul  8 15:57:24 2011
@@ -27,13 +27,13 @@ import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.dom.DOMSource;
 
+import org.apache.servicemix.jbi.jaxp.SourceTransformer;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import org.apache.servicemix.common.util.DOMUtil;
 import org.apache.servicemix.jbi.jaxp.StaxSource;
 import org.apache.servicemix.jbi.jaxp.FragmentStreamReader;
-import org.apache.servicemix.jbi.jaxp.StAXSourceTransformer;
 
 /**
  * Helper classes dealing with the WSDL 1.1 JBI wrapper
@@ -51,7 +51,7 @@ public class JbiWrapperHelper {
     public static final String WSDL11_WRAPPER_PART_LOCALNAME = "part";
     public static final QName WSDL11_WRAPPER_PART = new QName(WSDL11_WRAPPER_NAMESPACE, WSDL11_WRAPPER_PART_LOCALNAME,
WSDL11_WRAPPER_PREFIX);
 
-    private static final StAXSourceTransformer transformer = new StAXSourceTransformer();
+    private static final SourceTransformer transformer = new SourceTransformer();
 
     public static Document createDocument() throws ParserConfigurationException {
         return transformer.createDocument();
@@ -123,7 +123,7 @@ public class JbiWrapperHelper {
     }
 
     public static Source unwrap(Source source) throws TransformerException, XMLStreamException
{
-        XMLStreamReader reader = new StAXSourceTransformer().toXMLStreamReader(source);
+        XMLStreamReader reader = new SourceTransformer().toXMLStreamReader(source);
         reader.nextTag();
         if (!reader.isStartElement()) {
              throw new IllegalStateException("expected an element");

Modified: servicemix/components/trunk/shared-libraries/servicemix-soap/src/main/java/org/apache/servicemix/soap/marshalers/SoapMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/shared-libraries/servicemix-soap/src/main/java/org/apache/servicemix/soap/marshalers/SoapMarshaler.java?rev=1144369&r1=1144368&r2=1144369&view=diff
==============================================================================
--- servicemix/components/trunk/shared-libraries/servicemix-soap/src/main/java/org/apache/servicemix/soap/marshalers/SoapMarshaler.java
(original)
+++ servicemix/components/trunk/shared-libraries/servicemix-soap/src/main/java/org/apache/servicemix/soap/marshalers/SoapMarshaler.java
Fri Jul  8 15:57:24 2011
@@ -16,12 +16,12 @@
  */
 package org.apache.servicemix.soap.marshalers;
 
+import org.apache.servicemix.jbi.jaxp.SourceTransformer;
+
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLOutputFactory;
 
-import org.apache.servicemix.jbi.jaxp.StAXSourceTransformer;
-
 /**
  * 
  * @author Guillaume Nodet
@@ -66,7 +66,7 @@ public class SoapMarshaler {
     
 	protected XMLInputFactory inputFactory;
 	protected XMLOutputFactory outputFactory;
-	protected StAXSourceTransformer  sourceTransformer;
+	protected SourceTransformer sourceTransformer;
 	protected boolean repairingNamespace;
 	protected String prefix = SOAP_PREFIX;
 	protected boolean soap = true;
@@ -106,9 +106,9 @@ public class SoapMarshaler {
         return outputFactory;
     }
     
-    public StAXSourceTransformer getSourceTransformer() {
+    public SourceTransformer getSourceTransformer() {
     	if (sourceTransformer == null) {
-    		sourceTransformer = new StAXSourceTransformer();
+    		sourceTransformer = new SourceTransformer();
     	}
     	return sourceTransformer;
     }



Mime
View raw message