cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1035428 - in /cxf/trunk/rt: bindings/soap/src/main/java/org/apache/cxf/binding/soap/ bindings/soap/src/main/resources/META-INF/cxf/ frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/ frontend/simple/src/test/java/org/apache/cxf/fron...
Date Mon, 15 Nov 2010 20:14:26 GMT
Author: dkulp
Date: Mon Nov 15 20:14:26 2010
New Revision: 1035428

URL: http://svn.apache.org/viewvc?rev=1035428&view=rev
Log:
Remove private "bus" in SoapTransportFactory that is redundant with the
parent class

Modified:
    cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
    cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
    cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml
    cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml
    cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/servers.xml

Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java?rev=1035428&r1=1035427&r2=1035428&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
(original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
Mon Nov 15 20:14:26 2010
@@ -21,13 +21,14 @@ package org.apache.cxf.binding.soap;
 
 import java.io.IOException;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import javax.wsdl.Port;
 import javax.wsdl.WSDLException;
@@ -68,12 +69,20 @@ public class SoapTransportFactory extend
     
     public static final String TRANSPORT_ID = "http://schemas.xmlsoap.org/soap/";
     
-    private Bus bus;
-    private Collection<String> activationNamespaces;
+    private static final List<String> TRANSPORT_IDS = Arrays.asList(
+            "http://schemas.xmlsoap.org/soap/",
+            "http://schemas.xmlsoap.org/wsdl/soap/",
+            "http://schemas.xmlsoap.org/wsdl/soap12/",
+            "http://schemas.xmlsoap.org/soap/http/",
+            "http://schemas.xmlsoap.org/wsdl/soap/http",
+            "http://www.w3.org/2010/soapjms/",
+            "http://www.w3.org/2003/05/soap/bindings/HTTP/",
+            "http://schemas.xmlsoap.org/soap/http");
     
     public SoapTransportFactory() {
-        super();
+        super(TRANSPORT_IDS, null);
     }
+    
     public Set<String> getUriPrefixes() {
         return Collections.singleton("soap.tcp");
     }
@@ -218,33 +227,15 @@ public class SoapTransportFactory extend
         }
     }
 
-    public Bus getBus() {
-        return bus;
-    }
-
     @Resource(name = "cxf")
     public void setBus(Bus bus) {
-        this.bus = bus;
+        super.setBus(bus);
     }
     
     public void setActivationNamespaces(Collection<String> ans) {
-        activationNamespaces = ans;
+        super.setTransportIds(new ArrayList<String>(ans));
     }
 
-    @PostConstruct
-    void registerWithBindingManager() {
-        if (null == bus) {
-            return;
-        }
-
-        DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class);
-        if (null != dfm && activationNamespaces != null) {
-            for (String ns : activationNamespaces) {
-                dfm.registerDestinationFactory(ns, this);
-            }
-        }
-    }
-    
     private static class SoapEndpointInfo extends EndpointInfo {
         SoapAddress saddress;
         SoapEndpointInfo(ServiceInfo serv, String trans) {

Modified: cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml?rev=1035428&r1=1035427&r2=1035428&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml (original)
+++ cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml Mon
Nov 15 20:14:26 2010
@@ -32,18 +32,6 @@ http://www.springframework.org/schema/be
     <bean class="org.apache.cxf.binding.soap.SoapTransportFactory"
 	  id="org.apache.cxf.binding.soap.SoapTransportFactory"
 	  lazy-init="true">
-        <property name="transportIds">
-            <list>
-                <value>http://schemas.xmlsoap.org/soap/</value>
-                <value>http://schemas.xmlsoap.org/wsdl/soap/</value>
-		        <value>http://schemas.xmlsoap.org/wsdl/soap12/</value>
-		        <value>http://schemas.xmlsoap.org/soap/http/</value>
-                <value>http://schemas.xmlsoap.org/wsdl/soap/http</value>
-            	<value>http://www.w3.org/2010/soapjms/</value>
-                <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value>
-            	<value>http://schemas.xmlsoap.org/soap/http</value>
-            </list>
-        </property>
         <property name="bus" ref="cxf"/>
     </bean>
         

Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml?rev=1035428&r1=1035427&r2=1035428&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml Mon
Nov 15 20:14:26 2010
@@ -30,7 +30,9 @@ http://cxf.apache.org/jaxws http://cxf.a
   <import resource="classpath:META-INF/cxf/cxf-extension-xml.xml"/>
   <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>
     
-  <bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="false">
+  <bean class="org.apache.cxf.transport.local.LocalTransportFactory" 
+    lazy-init="false"
+    depends-on="org.apache.cxf.binding.soap.SoapTransportFactory">
       <property name="transportIds">
           <list>
               <value>http://cxf.apache.org/transports/local</value>

Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml?rev=1035428&r1=1035427&r2=1035428&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml Mon
Nov 15 20:14:26 2010
@@ -29,7 +29,9 @@ http://cxf.apache.org/jaxws http://cxf.a
   <import resource="classpath:META-INF/cxf/cxf.xml"/>
   <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>
 
-  <bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="false">
+  <bean class="org.apache.cxf.transport.local.LocalTransportFactory"
+    lazy-init="false"
+    depends-on="org.apache.cxf.binding.soap.SoapTransportFactory">
       <property name="transportIds">
           <list>
               <value>http://cxf.apache.org/transports/local</value>

Modified: cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/servers.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/servers.xml?rev=1035428&r1=1035427&r2=1035428&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/servers.xml
(original)
+++ cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/servers.xml
Mon Nov 15 20:14:26 2010
@@ -30,7 +30,9 @@ http://cxf.apache.org/simple http://cxf.
   <import resource="classpath:META-INF/cxf/cxf-extension-xml.xml"/>
   <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>
 
-  <bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="false">
+  <bean class="org.apache.cxf.transport.local.LocalTransportFactory" 
+    lazy-init="false"
+    depends-on="org.apache.cxf.binding.soap.SoapTransportFactory">
       <property name="transportIds">
           <list>
               <value>http://cxf.apache.org/transports/local</value>



Mime
View raw message