cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1076689 - in /cxf/trunk: rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/ rt/bindings/corba/src/main/resources/META-INF/cxf/ rt/bindings/http/src/main/java/org/apache/cxf/binding/http/ rt/bindings/http/src/main/resources/META-...
Date Thu, 03 Mar 2011 17:23:59 GMT
Author: dkulp
Date: Thu Mar  3 17:23:58 2011
New Revision: 1076689

URL: http://svn.apache.org/viewvc?rev=1076689&view=rev
Log:
Pull all the namespaces out of the spring configs and bus-extensions.xml

Modified:
    cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java
    cxf/trunk/rt/bindings/corba/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/bindings/corba/src/main/resources/META-INF/cxf/cxf-extension-corba.xml
    cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/HttpBindingFactory.java
    cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml
    cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingFactory.java
    cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/binding/jbi/cxf-binding-jbi.xml
    cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi-binding.xml
    cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectBindingFactory.java
    cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml
    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/bus-extensions.xml
    cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java
    cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/cxf-extension-xml.xml
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/TransportFinder.java
    cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
    cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPTransportFactory.java
    cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml
    cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java
    cxf/trunk/rt/transports/http-osgi/src/main/resources/META-INF/cxf/osgi/cxf-extension-osgi.xml
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java
    cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml
    cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml
    cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java
    cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi.xml
    cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/transport/jbi/cxf-transport-jbi.xml
    cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
    cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/cxf-extension-jms.xml
    cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java
    cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/cxf-extension-local.xml
    cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java

Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java (original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java Thu Mar  3 17:23:58 2011
@@ -20,12 +20,16 @@
 package org.apache.cxf.binding.corba;
 
 import java.io.IOException;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
 import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
 
+import org.apache.cxf.Bus;
 import org.apache.cxf.binding.AbstractBindingFactory;
 import org.apache.cxf.binding.Binding;
 import org.apache.cxf.binding.corba.interceptors.CorbaStreamFaultInInterceptor;
@@ -33,6 +37,7 @@ import org.apache.cxf.binding.corba.inte
 import org.apache.cxf.binding.corba.interceptors.CorbaStreamInInterceptor;
 import org.apache.cxf.binding.corba.interceptors.CorbaStreamOutInterceptor;
 import org.apache.cxf.binding.corba.utils.OrbConfig;
+import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.interceptor.BareInInterceptor;
 import org.apache.cxf.interceptor.BareOutInterceptor;
 import org.apache.cxf.service.model.BindingInfo;
@@ -45,14 +50,29 @@ import org.apache.cxf.transport.Destinat
 import org.apache.cxf.transport.DestinationFactoryManager;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 
+@NoJSR250Annotations(unlessNull = { "bus" })
 public class CorbaBindingFactory extends AbstractBindingFactory
     implements ConduitInitiator, DestinationFactory {
+
+    public static final Collection<String> DEFAULT_NAMESPACES 
+        = Arrays.asList(
+            "http://cxf.apache.org/bindings/corba",
+            "http://schemas.apache.org/yoko/bindings/corba"
+        );
+
     
-    protected List<String> transportIds;
+    protected List<String> transportIds = new ArrayList<String>(DEFAULT_NAMESPACES);
     protected OrbConfig orbConfig = new OrbConfig();
 
+    public CorbaBindingFactory(Bus b) {
+        super(b, DEFAULT_NAMESPACES);
+        registerWithDestinationManager();
+        registerWithConduitManager();
+    }
+
+    
     @PostConstruct
-    void registerWithDestinationManager() {
+    final void registerWithDestinationManager() {
         if (null == bus) {
             return;
         }
@@ -66,7 +86,7 @@ public class CorbaBindingFactory extends
     }
 
     @PostConstruct
-    void registerWithConduitManager() {
+    final void registerWithConduitManager() {
         if (null == bus) {
             return;
         }
@@ -119,7 +139,6 @@ public class CorbaBindingFactory extends
         return transportIds;
     }
 
-    @Resource(name = "transportIds")
     public void setTransportIds(List<String> ids) {
         transportIds = ids;
     }

Modified: cxf/trunk/rt/bindings/corba/src/main/resources/META-INF/cxf/bus-extensions.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/resources/META-INF/cxf/bus-extensions.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/resources/META-INF/cxf/bus-extensions.xml (original)
+++ cxf/trunk/rt/bindings/corba/src/main/resources/META-INF/cxf/bus-extensions.xml Thu Mar  3 17:23:58 2011
@@ -18,11 +18,6 @@
   under the License.
 -->
 <extensions xmlns="http://cxf.apache.org/bus/extension">
-
-    <extension class="org.apache.cxf.binding.corba.CorbaBindingFactory" deferred="true">
-        <namespace>http://cxf.apache.org/bindings/corba</namespace>
-        <namespace>http://schemas.apache.org/yoko/bindings/corba</namespace>
-    </extension>
+    <extension class="org.apache.cxf.binding.corba.CorbaBindingFactory" deferred="true"/>
     <extension class="org.apache.cxf.binding.corba.wsdl.WSDLExtensionRegister" deferred="true"/>
-
 </extensions>

Modified: cxf/trunk/rt/bindings/corba/src/main/resources/META-INF/cxf/cxf-extension-corba.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/resources/META-INF/cxf/cxf-extension-corba.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/resources/META-INF/cxf/cxf-extension-corba.xml (original)
+++ cxf/trunk/rt/bindings/corba/src/main/resources/META-INF/cxf/cxf-extension-corba.xml Thu Mar  3 17:23:58 2011
@@ -25,20 +25,8 @@
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
     
     <bean id="org.apache.cxf.binding.corba.CorbaBindingFactory"
-	class="org.apache.cxf.binding.corba.CorbaBindingFactory" lazy-init="true">
-        <property name="bus" ref="cxf"/>
-        <property name="activationNamespaces">
-            <set>
-                <value>http://cxf.apache.org/bindings/corba</value>
-                <value>http://schemas.apache.org/yoko/bindings/corba</value>
-            </set>
-        </property>
-        <property name="transportIds">
-            <list>
-				<value>http://cxf.apache.org/bindings/corba</value>
-	        	<value>http://schemas.apache.org/yoko/bindings/corba</value>
-            </list>
-        </property>
+	   class="org.apache.cxf.binding.corba.CorbaBindingFactory" lazy-init="true">
+        <constructor-arg ref="cxf"/>
     </bean>
     
     <bean class="org.apache.cxf.binding.corba.wsdl.WSDLExtensionRegister" lazy-init="true">

Modified: cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/HttpBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/HttpBindingFactory.java?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/HttpBindingFactory.java (original)
+++ cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/HttpBindingFactory.java Thu Mar  3 17:23:58 2011
@@ -20,10 +20,13 @@ package org.apache.cxf.binding.http;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 
 import javax.xml.namespace.QName;
 
+import org.apache.cxf.Bus;
 import org.apache.cxf.binding.AbstractBindingFactory;
 import org.apache.cxf.binding.Binding;
 import org.apache.cxf.binding.http.interceptor.ContentTypeOutInterceptor;
@@ -52,12 +55,19 @@ import org.apache.cxf.service.model.Serv
 public class HttpBindingFactory extends AbstractBindingFactory {
 
     public static final String HTTP_BINDING_ID = "http://apache.org/cxf/binding/http";
+    public static final Collection<String> DEFAULT_NAMESPACES = Arrays.asList(HTTP_BINDING_ID);
+                                                                              
     private List<ResourceStrategy> strategies = new ArrayList<ResourceStrategy>();
 
     public HttpBindingFactory() {
         strategies.add(new JRAStrategy());
         strategies.add(new ConventionStrategy());
     }
+    public HttpBindingFactory(Bus bus) {
+        super(bus, DEFAULT_NAMESPACES);
+        strategies.add(new JRAStrategy());
+        strategies.add(new ConventionStrategy());
+    }
 
     public Binding createBinding(BindingInfo bi) {
         XMLBinding binding = new XMLBinding(bi);

Modified: cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/bus-extensions.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/bus-extensions.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/bus-extensions.xml (original)
+++ cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/bus-extensions.xml Thu Mar  3 17:23:58 2011
@@ -20,8 +20,6 @@
 <extensions xmlns="http://cxf.apache.org/bus/extension">
 
     <extension class="org.apache.cxf.binding.http.HttpBindingFactory" 
-      interface="org.apache.cxf.binding.BindingFactory" deferred="true">
-        <namespace>http://apache.org/cxf/binding/http</namespace>
-    </extension>
+      interface="org.apache.cxf.binding.BindingFactory" deferred="true"/>
     
 </extensions>

Modified: cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml (original)
+++ cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml Thu Mar  3 17:23:58 2011
@@ -27,11 +27,6 @@ http://www.springframework.org/schema/be
     <bean class="org.apache.cxf.binding.http.HttpBindingFactory"
 	  id="org.apache.cxf.binding.http.HttpBindingFactory"
 	  lazy-init="true">
-        <property name="activationNamespaces">
-            <set>
-                <value>http://apache.org/cxf/binding/http</value>
-            </set>
-        </property>
-	<property name="bus" ref="cxf"/>
+	  <constructor-arg ref="cxf"/>
     </bean>
 </beans>

Modified: cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingFactory.java?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingFactory.java (original)
+++ cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingFactory.java Thu Mar  3 17:23:58 2011
@@ -18,8 +18,12 @@
  */
 package org.apache.cxf.binding.jbi;
 
+import java.util.Arrays;
+import java.util.Collection;
+
 import javax.xml.namespace.QName;
 
+import org.apache.cxf.Bus;
 import org.apache.cxf.binding.AbstractBindingFactory;
 import org.apache.cxf.binding.Binding;
 import org.apache.cxf.binding.jbi.interceptor.JBIFaultInInterceptor;
@@ -27,6 +31,7 @@ import org.apache.cxf.binding.jbi.interc
 import org.apache.cxf.binding.jbi.interceptor.JBIOperationInInterceptor;
 import org.apache.cxf.binding.jbi.interceptor.JBIWrapperInInterceptor;
 import org.apache.cxf.binding.jbi.interceptor.JBIWrapperOutInterceptor;
+import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.interceptor.AttachmentInInterceptor;
 import org.apache.cxf.interceptor.AttachmentOutInterceptor;
 import org.apache.cxf.interceptor.StaxInInterceptor;
@@ -36,8 +41,18 @@ import org.apache.cxf.service.model.Bind
 import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.service.model.ServiceInfo;
 
+@NoJSR250Annotations(unlessNull = { "bus" })
 public class JBIBindingFactory extends AbstractBindingFactory {
+    public static final Collection<String> DEFAULT_NAMESPACES 
+        = Arrays.asList("http://cxf.apache.org/bindings/jbi",
+                        "http://java.sun.com/xml/ns/jbi/binding/service+engine");
 
+    public JBIBindingFactory() {
+    }
+    public JBIBindingFactory(Bus b) {
+        super(b, DEFAULT_NAMESPACES);
+    }
+    
     public Binding createBinding(BindingInfo binding) {
         JBIBindingInfo bindingInfo = (JBIBindingInfo) binding;
         JBIBinding jb = new JBIBinding(bindingInfo);

Modified: cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/binding/jbi/cxf-binding-jbi.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/binding/jbi/cxf-binding-jbi.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/binding/jbi/cxf-binding-jbi.xml (original)
+++ cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/binding/jbi/cxf-binding-jbi.xml Thu Mar  3 17:23:58 2011
@@ -25,13 +25,7 @@ http://www.springframework.org/schema/be
     <bean class="org.apache.cxf.binding.jbi.JBIBindingFactory" 
 	  id="org.apache.cxf.binding.jbi.JBIBindingFactory" 
 	  lazy-init="true">
-      <property name="bus" ref="cxf"/>
-      <property name="activationNamespaces">
-            <set>
-              <value>http://cxf.apache.org/bindings/jbi</value>
-              <value>http://java.sun.com/xml/ns/jbi/binding/service+engine</value>
-            </set>
-        </property>
+      <constructor-arg ref="cxf"/>
     </bean>
 
 </beans>

Modified: cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/bus-extensions.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/bus-extensions.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/bus-extensions.xml (original)
+++ cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/bus-extensions.xml Thu Mar  3 17:23:58 2011
@@ -19,9 +19,6 @@
 -->
 <extensions xmlns="http://cxf.apache.org/bus/extension">
 
-    <extension class="org.apache.cxf.binding.jbi.JBIBindingFactory" deferred="true">
-        <namespace>http://cxf.apache.org/bindings/jbi</namespace>
-        <namespace>http://java.sun.com/xml/ns/jbi/binding/service+engine</namespace>
-    </extension>
+    <extension class="org.apache.cxf.binding.jbi.JBIBindingFactory" deferred="true"/>
     
 </extensions>

Modified: cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi-binding.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi-binding.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi-binding.xml (original)
+++ cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi-binding.xml Thu Mar  3 17:23:58 2011
@@ -25,13 +25,7 @@ http://www.springframework.org/schema/be
     <bean class="org.apache.cxf.binding.jbi.JBIBindingFactory" 
 	  id="org.apache.cxf.binding.jbi.JBIBindingFactory" 
 	  lazy-init="true">
-      <property name="bus" ref="cxf"/>
-      <property name="activationNamespaces">
-            <set>
-              <value>http://cxf.apache.org/bindings/jbi</value>
-              <value>http://java.sun.com/xml/ns/jbi/binding/service+engine</value>
-            </set>
-        </property>
+      <consructor-arg ref="cxf"/>
     </bean>
 
 </beans>

Modified: cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectBindingFactory.java?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectBindingFactory.java (original)
+++ cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectBindingFactory.java Thu Mar  3 17:23:58 2011
@@ -18,22 +18,30 @@
  */
 package org.apache.cxf.binding.object;
 
+import java.util.Arrays;
+
+import java.util.Collection;
+
 import javax.annotation.PostConstruct;
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.binding.AbstractBindingFactory;
 import org.apache.cxf.binding.Binding;
+import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.endpoint.ServerLifeCycleManager;
 import org.apache.cxf.service.model.BindingInfo;
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.service.model.ServiceInfo;
 
+@NoJSR250Annotations(unlessNull = { "bus" })
 public class ObjectBindingFactory extends AbstractBindingFactory {
     public static final String BINDING_ID = "http://cxf.apache.org/binding/object";
     public static final String RUN_NON_LOGICAL  = "objectBinding.stopAfterLogical";
     
+    public static final Collection<String> DEFAULT_NAMESPACES = Arrays.asList(BINDING_ID);
+                                                                              
     private boolean autoRegisterLocalEndpoint;
     private boolean initialized = true;
     private LocalServerListener listener;
@@ -42,11 +50,12 @@ public class ObjectBindingFactory extend
         
     }
     public ObjectBindingFactory(Bus b) {
-        super(b);
+        super(b, DEFAULT_NAMESPACES);
+        initialize();
     }
     
     @PostConstruct
-    public void initialize() {
+    public final void initialize() {
         if (autoRegisterLocalEndpoint) {
             Bus bus = getBus();
             ServerLifeCycleManager manager = bus.getExtension(ServerLifeCycleManager.class);
@@ -54,6 +63,13 @@ public class ObjectBindingFactory extend
                 listener = new LocalServerListener(bus, this);
                 manager.registerListener(listener);
             }
+        } else if (listener != null) {
+            Bus bus = getBus();
+            ServerLifeCycleManager manager = bus.getExtension(ServerLifeCycleManager.class);
+            if (manager != null) {
+                manager.unRegisterListener(listener);
+                listener = null;
+            }
         }
         initialized = true;
     }

Modified: cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/bus-extensions.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/bus-extensions.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/bus-extensions.xml (original)
+++ cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/bus-extensions.xml Thu Mar  3 17:23:58 2011
@@ -19,8 +19,6 @@
 -->
 <extensions xmlns="http://cxf.apache.org/bus/extension">
 
-    <extension class="org.apache.cxf.binding.object.ObjectBindingFactory" deferred="true">
-        <namespace>http://cxf.apache.org/binding/object</namespace>
-    </extension>
+    <extension class="org.apache.cxf.binding.object.ObjectBindingFactory" deferred="true"/>
     
 </extensions>

Modified: cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml (original)
+++ cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml Thu Mar  3 17:23:58 2011
@@ -26,12 +26,7 @@ http://www.springframework.org/schema/be
 
 	<bean class="org.apache.cxf.binding.object.ObjectBindingFactory"
 	      id="org.apache.cxf.binding.object.ObjectBindingFactory"
-		lazy-init="true" depends-on="org.apache.cxf.endpoint.ServerLifeCycleManager" >
-		<property name="bus" ref="cxf"/>
-		<property name="activationNamespaces">
-			<set>
-				<value>http://cxf.apache.org/binding/object</value>
-			</set>
-		</property>
+		lazy-init="true">
+		<constructor-arg ref="cxf"/>
 	</bean>
 </beans>

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=1076689&r1=1076688&r2=1076689&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 Thu Mar  3 17:23:58 2011
@@ -67,7 +67,7 @@ public class SoapTransportFactory extend
     
     public static final String TRANSPORT_ID = "http://schemas.xmlsoap.org/soap/";
     
-    private static final List<String> TRANSPORT_IDS = Arrays.asList(
+    public static final List<String> DEFAULT_NAMESPACES = Arrays.asList(
             "http://schemas.xmlsoap.org/soap/",
             "http://schemas.xmlsoap.org/wsdl/soap/",
             "http://schemas.xmlsoap.org/wsdl/soap12/",
@@ -78,7 +78,7 @@ public class SoapTransportFactory extend
             "http://schemas.xmlsoap.org/soap/http");
     
     public SoapTransportFactory() {
-        super(TRANSPORT_IDS, null);
+        super(DEFAULT_NAMESPACES, null);
     }
     
     public Set<String> getUriPrefixes() {

Modified: cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.xml (original)
+++ cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.xml Thu Mar  3 17:23:58 2011
@@ -19,23 +19,7 @@
 -->
 <extensions xmlns="http://cxf.apache.org/bus/extension">
 
-    <extension class="org.apache.cxf.binding.soap.SoapBindingFactory" deferred="true">
-        <namespace>http://schemas.xmlsoap.org/soap/</namespace>
-        <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace>
-        <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace>
-        <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
-        <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
-        <namespace>http://www.w3.org/2010/soapjms/</namespace>
-    </extension>
+    <extension class="org.apache.cxf.binding.soap.SoapBindingFactory" deferred="true"/>
     
-    <extension class="org.apache.cxf.binding.soap.SoapTransportFactory" deferred="true">
-        <namespace>http://schemas.xmlsoap.org/soap/</namespace>
-        <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace>
-        <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace>
-        <namespace>http://schemas.xmlsoap.org/soap/http/</namespace>
-        <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
-        <namespace>http://www.w3.org/2010/soapjms/</namespace>
-        <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
-        <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
-    </extension>    
+    <extension class="org.apache.cxf.binding.soap.SoapTransportFactory" deferred="true"/>
 </extensions>

Modified: cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java (original)
+++ cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java Thu Mar  3 17:23:58 2011
@@ -18,9 +18,13 @@
  */
 package org.apache.cxf.binding.xml;
 
+import java.util.Arrays;
+import java.util.Collection;
+
 import javax.xml.namespace.QName;
 
 
+import org.apache.cxf.Bus;
 import org.apache.cxf.binding.AbstractBindingFactory;
 import org.apache.cxf.binding.Binding;
 import org.apache.cxf.binding.xml.interceptor.XMLFaultInInterceptor;
@@ -42,6 +46,17 @@ import org.apache.cxf.service.model.Serv
 
 @NoJSR250Annotations(unlessNull = { "bus" })
 public class XMLBindingFactory extends AbstractBindingFactory {
+    public static final Collection<String> DEFAULT_NAMESPACES 
+        = Arrays.asList(
+            "http://cxf.apache.org/bindings/xformat",
+            "http://www.w3.org/2004/08/wsdl/http",
+            "http://schemas.xmlsoap.org/wsdl/http/");
+    
+    public XMLBindingFactory() {
+    }
+    public XMLBindingFactory(Bus b) {
+        super(b, DEFAULT_NAMESPACES);
+    }
     
     public Binding createBinding(BindingInfo binding) {
         XMLBinding xb = new XMLBinding(binding);

Modified: cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/bus-extensions.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/bus-extensions.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/bus-extensions.xml (original)
+++ cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/bus-extensions.xml Thu Mar  3 17:23:58 2011
@@ -19,11 +19,7 @@
 -->
 <extensions xmlns="http://cxf.apache.org/bus/extension">
 
-    <extension class="org.apache.cxf.binding.xml.XMLBindingFactory" deferred="true">
-        <namespace>http://cxf.apache.org/bindings/xformat</namespace>
-        <namespace>http://www.w3.org/2004/08/wsdl/http</namespace>  
-        <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>       
-    </extension>
+    <extension class="org.apache.cxf.binding.xml.XMLBindingFactory" deferred="true"/>
     <extension class="org.apache.cxf.binding.xml.wsdl11.XMLWSDLExtensionLoader" deferred="true"/>
     
 </extensions>

Modified: cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/cxf-extension-xml.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/cxf-extension-xml.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/cxf-extension-xml.xml (original)
+++ cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/cxf-extension-xml.xml Thu Mar  3 17:23:58 2011
@@ -26,14 +26,7 @@ http://www.springframework.org/schema/be
     <bean class="org.apache.cxf.binding.xml.XMLBindingFactory"
 	  id="org.apache.cxf.binding.xml.XMLBindingFactory"
 	  lazy-init="true">
-        <property name="activationNamespaces">
-            <set>
-                <value>http://cxf.apache.org/bindings/xformat</value>
-                <value>http://www.w3.org/2004/08/wsdl/http</value>
-                <value>http://schemas.xmlsoap.org/wsdl/http/</value>
-            </set>
-        </property>
-        <property name="bus" ref="cxf"/>
+        <constructor-arg ref="cxf"/>
     </bean>
     <bean class="org.apache.cxf.binding.xml.wsdl11.XMLWSDLExtensionLoader"
       id="org.apache.cxf.binding.xml.wsdl11.XMLWSDLExtensionLoader"

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java Thu Mar  3 17:23:58 2011
@@ -212,7 +212,9 @@ public class ExtensionManagerImpl implem
         
         // Since we need to support spring2.5 by removing @Resource("activationNamespaces")
         // Now we call the setActivationNamespaces method directly here
-        invokeSetterActivationNSMethod(obj, e.getNamespaces());
+        if (e.getNamespaces() != null && !e.getNamespaces().isEmpty()) {
+            invokeSetterActivationNSMethod(obj, e.getNamespaces());
+        }
         
         ResourceInjector injector = new ResourceInjector(resourceManager);
         

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java Thu Mar  3 17:23:58 2011
@@ -35,6 +35,9 @@ public abstract class AbstractTransportF
     
     public AbstractTransportFactory() {
     }
+    public AbstractTransportFactory(List<String> ids) {
+        transportIds = ids;
+    }
     public AbstractTransportFactory(List<String> ids, Bus b) {
         transportIds = ids;
         bus = b;

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/TransportFinder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/TransportFinder.java?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/TransportFinder.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/TransportFinder.java Thu Mar  3 17:23:58 2011
@@ -52,9 +52,9 @@ public class TransportFinder<T> {
         if (locator == null) {
             return null;
         }
-        T factory = loadDefaultNamespace(namespace);
+        T factory = loadActivationNamespaces(namespace);
         if (factory == null) {
-            factory = loadActivationNamespaces(namespace);
+            factory = loadDefaultNamespace(namespace);
         }
         if (factory == null) {
             factory = loadNoDefaultNamespace(namespace);

Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java Thu Mar  3 17:23:58 2011
@@ -91,6 +91,9 @@ public class JettyHTTPServerEngineFactor
     public JettyHTTPServerEngineFactory() {
         // Empty
     }    
+    public JettyHTTPServerEngineFactory(Bus b) {
+        setBus(b);
+    }    
     public JettyHTTPServerEngineFactory(Bus b,
                                         Map<String, TLSServerParameters> tls,
                                         Map<String, ThreadingParameters> threading) {

Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPTransportFactory.java?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPTransportFactory.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPTransportFactory.java Thu Mar  3 17:23:58 2011
@@ -19,6 +19,7 @@
 package org.apache.cxf.transport.http_jetty;
 
 import java.io.IOException;
+
 import java.security.GeneralSecurityException;
 
 import javax.annotation.PostConstruct;
@@ -26,18 +27,23 @@ import javax.annotation.Resource;
 import javax.imageio.IIOException;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.transport.Destination;
 import org.apache.cxf.transport.DestinationFactory;
 import org.apache.cxf.transport.http.AbstractHTTPDestination;
 import org.apache.cxf.transport.http.AbstractHTTPTransportFactory;
 
+@NoJSR250Annotations(unlessNull = { "bus" })
 public class JettyHTTPTransportFactory extends AbstractHTTPTransportFactory
     implements DestinationFactory {
 
     public JettyHTTPTransportFactory() {
         super();
     }
+    public JettyHTTPTransportFactory(Bus b) {
+        super(b);
+    }
     
     @Resource 
     public void setBus(Bus b) {
@@ -45,7 +51,7 @@ public class JettyHTTPTransportFactory e
     }
     
     @PostConstruct
-    public void finalizeConfig() {
+    public final void finalizeConfig() {
         if (null == bus) {
             return;
         }

Modified: cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.xml (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.xml Thu Mar  3 17:23:58 2011
@@ -19,10 +19,6 @@
 -->
 <extensions xmlns="http://cxf.apache.org/bus/extension">
 
-    <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="false">
-        <namespace>http://cxf.apache.org/transports/http</namespace>
-        <namespace>http://cxf.apache.org/transports/http/configuration</namespace>
-        <namespace>http://schemas.xmlsoap.org/wsdl/http</namespace>
-        <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
-    </extension>
+    <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="false"/>
+    <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory" deferred="true"/>
 </extensions>

Modified: cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml Thu Mar  3 17:23:58 2011
@@ -28,15 +28,12 @@ http://www.springframework.org/schema/be
     <bean class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory"
 	  id="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory"
     	lazy-init="true">
-        <property name="bus" ref="cxf"/>
-        <property name="transportIds">
-            <list>
-                <value>http://cxf.apache.org/transports/http</value>
-                <value>http://cxf.apache.org/transports/http/configuration</value>
-                <value>http://schemas.xmlsoap.org/wsdl/http</value>
-                <value>http://schemas.xmlsoap.org/wsdl/http/</value>
-            </list>
-        </property>
+        <constructor-arg ref="cxf"/>
+    </bean>
+    <bean class="org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory"
+        id="org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory"
+        lazy-init="true">
+        <constructor-arg ref="cxf"/>
     </bean>
 
 </beans>

Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java Thu Mar  3 17:23:58 2011
@@ -23,7 +23,6 @@ import java.net.URL;
 import junit.framework.Assert;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.BusException;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.transport.DestinationFactory;
@@ -66,24 +65,21 @@ public class JettyHTTPServerEngineFactor
      * configuration.
      */
     @Test
-    public void testMakeSureTransportFactoryHasEngineFactory() {
+    public void testMakeSureTransportFactoryHasEngineFactory() throws Exception {
         bus = BusFactory.getDefaultBus(true);
         
         assertNotNull("Cannot get bus", bus);
         
-        try {
-            // Make sure we got the Transport Factory.
-            DestinationFactoryManager destFM = 
-                bus.getExtension(DestinationFactoryManager.class);
-            assertNotNull("Cannot get DestinationFactoryManager", destFM);
-            DestinationFactory destF = 
-                destFM.getDestinationFactory(
-                        "http://cxf.apache.org/transports/http");
-            assertNotNull("No DestinationFactory", destF);
-            assertTrue(JettyHTTPTransportFactory.class.isInstance(destF));
-        } catch (BusException e) {
-            fail("Asserting Transport Factory" + e);
-        }
+        // Make sure we got the Transport Factory.
+        DestinationFactoryManager destFM = 
+            bus.getExtension(DestinationFactoryManager.class);
+        assertNotNull("Cannot get DestinationFactoryManager", destFM);
+        DestinationFactory destF = 
+            destFM.getDestinationFactory(
+                    "http://cxf.apache.org/transports/http");
+        assertNotNull("No DestinationFactory", destF);
+        assertTrue(JettyHTTPTransportFactory.class.isInstance(destF));
+
         // And the JettyHTTPServerEngineFactory should be there.
         JettyHTTPServerEngineFactory factory =
             bus.getExtension(JettyHTTPServerEngineFactory.class);

Modified: cxf/trunk/rt/transports/http-osgi/src/main/resources/META-INF/cxf/osgi/cxf-extension-osgi.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-osgi/src/main/resources/META-INF/cxf/osgi/cxf-extension-osgi.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-osgi/src/main/resources/META-INF/cxf/osgi/cxf-extension-osgi.xml (original)
+++ cxf/trunk/rt/transports/http-osgi/src/main/resources/META-INF/cxf/osgi/cxf-extension-osgi.xml Thu Mar  3 17:23:58 2011
@@ -31,14 +31,6 @@ http://www.springframework.org/schema/os
         <constructor-arg ref="osgiDestinationRegistry"/>
 
         <property name="bus" ref="cxf"/>
-        <property name="transportIds">
-            <list>
-                <value>http://cxf.apache.org/transports/http</value>
-                <value>http://cxf.apache.org/transports/http/configuration</value>
-                <value>http://schemas.xmlsoap.org/wsdl/http</value>
-                <value>http://schemas.xmlsoap.org/wsdl/http/</value>
-            </list>
-        </property>
     </bean>
 
     <osgi:reference id="osgiDestinationRegistry"

Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java Thu Mar  3 17:23:58 2011
@@ -20,6 +20,7 @@
 package org.apache.cxf.transport.http;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -30,6 +31,7 @@ import javax.wsdl.extensions.http.HTTPAd
 import javax.wsdl.extensions.soap.SOAPAddress;
 import javax.xml.namespace.QName;
 
+import org.apache.cxf.Bus;
 import org.apache.cxf.configuration.Configurer;
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.model.BindingInfo;
@@ -47,6 +49,15 @@ public abstract class AbstractHTTPTransp
     extends AbstractTransportFactory 
     implements WSDLEndpointFactory {
 
+    public static final List<String> DEFAULT_NAMESPACES 
+        = Arrays.asList(
+            "http://cxf.apache.org/transports/http",
+            "http://cxf.apache.org/transports/http/configuration",
+            "http://schemas.xmlsoap.org/wsdl/http",
+            "http://schemas.xmlsoap.org/wsdl/http/"
+        );
+        
+    
     /**
      * This constant holds the prefixes served by this factory.
      */
@@ -61,8 +72,16 @@ public abstract class AbstractHTTPTransp
     public AbstractHTTPTransportFactory() {
         this(new DestinationRegistryImpl());
     }
-    
+    public AbstractHTTPTransportFactory(Bus b) {
+        this(b, new DestinationRegistryImpl());
+    }
+    public AbstractHTTPTransportFactory(Bus b, DestinationRegistry registry) {
+        super(DEFAULT_NAMESPACES, b);
+        this.registry = registry;
+    }
+
     public AbstractHTTPTransportFactory(DestinationRegistry registry) {
+        super(DEFAULT_NAMESPACES);
         this.registry = registry;
     }
 

Modified: cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/bus-extensions.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/bus-extensions.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/bus-extensions.xml (original)
+++ cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/bus-extensions.xml Thu Mar  3 17:23:58 2011
@@ -19,12 +19,7 @@
 -->
 <extensions xmlns="http://cxf.apache.org/bus/extension">
 
-    <extension class="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory"  deferred="true">
-        <namespace>http://cxf.apache.org/transports/http</namespace>
-        <namespace>http://cxf.apache.org/transports/http/configuration</namespace>
-        <namespace>http://schemas.xmlsoap.org/wsdl/http</namespace>
-        <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
-    </extension>
+    <extension class="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory"  deferred="true"/>
     <extension class="org.apache.cxf.transport.http.HTTPWSDLExtensionLoader"  deferred="true"/>
     <extension class="org.apache.cxf.transport.http.policy.HTTPClientAssertionBuilder" deferred="true"/>
     <extension class="org.apache.cxf.transport.http.policy.HTTPServerAssertionBuilder" deferred="true"/>

Modified: cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml (original)
+++ cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml Thu Mar  3 17:23:58 2011
@@ -39,13 +39,5 @@ http://www.springframework.org/schema/be
     	id="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory" 
     	lazy-init="true">
         <property name="bus" ref="cxf"/>
-        <property name="transportIds">
-            <list>
-                <value>http://cxf.apache.org/transports/http</value>
-                <value>http://cxf.apache.org/transports/http/configuration</value>
-                <value>http://schemas.xmlsoap.org/wsdl/http</value>
-                <value>http://schemas.xmlsoap.org/wsdl/http/</value>
-            </list>
-        </property>
     </bean>
 </beans>

Modified: cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml (original)
+++ cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml Thu Mar  3 17:23:58 2011
@@ -28,13 +28,5 @@ http://www.springframework.org/schema/be
     <bean class="org.apache.cxf.transport.servlet.ServletTransportFactory"
 	  id="org.apache.cxf.transport.servlet.ServletTransportFactory">
         <property name="bus" ref="cxf"/>
-        <property name="transportIds">
-            <list>
-                <value>http://cxf.apache.org/transports/http</value>                
-                <value>http://cxf.apache.org/transports/http/configuration</value>                
-                <value>http://schemas.xmlsoap.org/wsdl/http</value>
-                <value>http://schemas.xmlsoap.org/wsdl/http/</value>
-            </list>
-        </property>
     </bean>
 </beans>

Modified: cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java (original)
+++ cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java Thu Mar  3 17:23:58 2011
@@ -19,9 +19,11 @@
 package org.apache.cxf.transport.jbi;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Logger;
@@ -48,6 +50,9 @@ public class JBITransportFactory extends
     DestinationFactory {
 
     public static final String TRANSPORT_ID = "http://cxf.apache.org/transports/jbi";
+    public static final List<String> DEFAULT_NAMESPACES 
+        = Arrays.asList(TRANSPORT_ID,
+                        "http://cxf.apache.org/transports/jbi/configuration");
 
     private static final Logger LOG = LogUtils.getL7dLogger(JBITransportFactory.class);
 
@@ -57,7 +62,11 @@ public class JBITransportFactory extends
     private final Map<String, JBIDestination> destinationMap =  new HashMap<String, JBIDestination>();
 
 
-    private Collection<String> activationNamespaces;
+    private Collection<String> activationNamespaces = DEFAULT_NAMESPACES;
+    
+    public JBITransportFactory() {
+        super(DEFAULT_NAMESPACES);
+    }
 
     @Resource(name = "cxf")
     public void setBus(Bus b) {

Modified: cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/bus-extensions.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/bus-extensions.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/bus-extensions.xml (original)
+++ cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/bus-extensions.xml Thu Mar  3 17:23:58 2011
@@ -19,10 +19,7 @@
 -->
 <extensions xmlns="http://cxf.apache.org/bus/extension">
 
-    <extension class="org.apache.cxf.transport.jbi.JBITransportFactory" deferred="true">
-      <namespace>http://cxf.apache.org/transports/jbi</namespace>
-      <namespace>http://cxf.apache.org/transports/jbi/configuration</namespace>
-    </extension>
+    <extension class="org.apache.cxf.transport.jbi.JBITransportFactory" deferred="true"/>
     <extension class="org.apache.cxf.transport.jbi.wsdl11.JBIWSDLExtensionLoader"  deferred="true"/>
         
 </extensions>

Modified: cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi.xml (original)
+++ cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi.xml Thu Mar  3 17:23:58 2011
@@ -27,12 +27,6 @@ http://www.springframework.org/schema/be
 	  id="org.apache.cxf.transport.jbi.JBITransportFactory" 
 	  lazy-init="true">
         <property name="bus" ref="cxf"/>
-        <property name="transportIds">
-            <list>
-              <value>http://cxf.apache.org/transports/jbi</value>
-              <value>http://cxf.apache.org/transports/jbi/configuration</value>
-            </list>
-        </property>
     </bean>
     
     <bean class="org.apache.cxf.transport.jbi.wsdl11.JBIWSDLExtensionLoader"

Modified: cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/transport/jbi/cxf-transport-jbi.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/transport/jbi/cxf-transport-jbi.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/transport/jbi/cxf-transport-jbi.xml (original)
+++ cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/transport/jbi/cxf-transport-jbi.xml Thu Mar  3 17:23:58 2011
@@ -27,11 +27,5 @@ http://www.springframework.org/schema/be
 	  id="org.apache.cxf.transport.jbi.JBITransportFactory" 
 	  lazy-init="true">
         <property name="bus" ref="cxf"/>
-        <property name="transportIds">
-            <list>
-              <value>http://cxf.apache.org/transports/jbi</value>
-              <value>http://cxf.apache.org/transports/jbi/configuration</value>
-            </list>
-        </property>
     </bean>
 </beans>

Modified: cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java (original)
+++ cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java Thu Mar  3 17:23:58 2011
@@ -21,7 +21,9 @@ package org.apache.cxf.transport.jms;
 
 import java.io.IOException;
 
+import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import javax.annotation.Resource;
@@ -40,25 +42,26 @@ import org.apache.cxf.ws.addressing.Endp
 public class JMSTransportFactory extends AbstractTransportFactory implements ConduitInitiator,
     DestinationFactory {
 
+    public static final List<String> DEFAULT_NAMESPACES 
+        = Arrays.asList(
+            "http://cxf.apache.org/transports/jms",
+            "http://cxf.apache.org/transports/jms/configuration"
+        );
+
     private static final Set<String> URI_PREFIXES = new HashSet<String>();
     static {
         URI_PREFIXES.add("jms://");
         URI_PREFIXES.add("jms:");
     }
 
-    private Bus bus;
 
     public JMSTransportFactory() {
-        
+        super(DEFAULT_NAMESPACES);
     }
     
     @Resource(name = "cxf")
-    public void setBus(Bus b) {
-        bus = b;
-    }
-
-    public Bus getBus() {
-        return bus;
+    public void setBus(Bus bus) {
+        super.setBus(bus);
     }
 
     public Conduit getConduit(EndpointInfo endpointInfo) throws IOException {

Modified: cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.xml (original)
+++ cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.xml Thu Mar  3 17:23:58 2011
@@ -19,10 +19,7 @@
 -->
 <extensions xmlns="http://cxf.apache.org/bus/extension">
 
-    <extension class="org.apache.cxf.transport.jms.JMSTransportFactory" deferred="true">
-        <namespace>http://cxf.apache.org/transports/jms</namespace>
-        <namespace>http://cxf.apache.org/transports/jms/configuration</namespace>
-    </extension>
+    <extension class="org.apache.cxf.transport.jms.JMSTransportFactory" deferred="true"/>
     <extension class="org.apache.cxf.transport.jms.wsdl11.JMSWSDLExtensionLoader" deferred="true"/>
         
 </extensions>

Modified: cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/cxf-extension-jms.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/cxf-extension-jms.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/cxf-extension-jms.xml (original)
+++ cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/cxf-extension-jms.xml Thu Mar  3 17:23:58 2011
@@ -27,12 +27,6 @@ http://www.springframework.org/schema/be
 	  id="org.apache.cxf.transport.jms.JMSTransportFactory"
 	  lazy-init="true">
         <property name="bus" ref="cxf"/>
-        <property name="transportIds">
-            <list>
-                <value>http://cxf.apache.org/transports/jms</value>
-                <value>http://cxf.apache.org/transports/jms/configuration</value>
-            </list>
-        </property>
     </bean>
     <bean class="org.apache.cxf.transport.jms.wsdl11.JMSWSDLExtensionLoader"
       id="org.apache.cxf.transport.jms.wsdl11.JMSWSDLExtensionLoader"

Modified: cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java (original)
+++ cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java Thu Mar  3 17:23:58 2011
@@ -20,7 +20,7 @@
 package org.apache.cxf.transport.local;
 
 import java.io.IOException;
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -47,6 +47,10 @@ public class LocalTransportFactory exten
     implements DestinationFactory, ConduitInitiator {
    
     public static final String TRANSPORT_ID = "http://cxf.apache.org/transports/local";
+    public static final List<String> DEFAULT_NAMESPACES 
+        = Arrays.asList(TRANSPORT_ID);
+
+    
     public static final String MESSAGE_FILTER_PROPERTIES 
         = LocalTransportFactory.class.getName() + ".filterProperties";
     public static final String MESSAGE_INCLUDE_PROPERTIES 
@@ -66,10 +70,7 @@ public class LocalTransportFactory exten
     private Set<String> uriPrefixes = new HashSet<String>(URI_PREFIXES);
     
     public LocalTransportFactory() {
-        super();
-        List<String> ids = new ArrayList<String>();
-        ids.add(TRANSPORT_ID);
-        setTransportIds(ids);
+        super(DEFAULT_NAMESPACES);
         
         messageFilterProperties = new HashSet<String>();
         messageIncludeProperties = new HashSet<String>();

Modified: cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/bus-extensions.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/bus-extensions.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/bus-extensions.xml (original)
+++ cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/bus-extensions.xml Thu Mar  3 17:23:58 2011
@@ -19,7 +19,5 @@
 -->
 <extensions xmlns="http://cxf.apache.org/bus/extension">
 
-    <extension class="org.apache.cxf.transport.local.LocalTransportFactory"  deferred="true">
-        <namespace>http://cxf.apache.org/transports/local</namespace>
-    </extension>
+    <extension class="org.apache.cxf.transport.local.LocalTransportFactory"  deferred="true"/>
 </extensions>

Modified: cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/cxf-extension-local.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/cxf-extension-local.xml?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/cxf-extension-local.xml (original)
+++ cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/cxf-extension-local.xml Thu Mar  3 17:23:58 2011
@@ -27,10 +27,5 @@ http://www.springframework.org/schema/be
 	  id="org.apache.cxf.transport.local.LocalTransportFactory"
 	  lazy-init="true">
         <property name="bus" ref="cxf"/>
-        <property name="transportIds">
-            <list>
-                <value>http://cxf.apache.org/transports/local</value>
-            </list>
-        </property>
     </bean>
 </beans>

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java?rev=1076689&r1=1076688&r2=1076689&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java Thu Mar  3 17:23:58 2011
@@ -76,8 +76,10 @@ public class MultiplexClientServerTest e
             props.put("org.apache.activemq.default.directory.prefix", 
                       System.getProperty("org.apache.activemq.default.directory.prefix"));
         }
-        props.put("java.util.logging.config.file", 
+        if (System.getProperty("java.util.logging.config.file") != null) {
+            props.put("java.util.logging.config.file", 
                   System.getProperty("java.util.logging.config.file"));
+        }
         assertTrue("server did not launch correctly", 
                    launchServer(EmbeddedJMSBrokerLauncher.class, props, null, true));
         



Mime
View raw message