svn commit: r808024 - in /cxf/trunk/rt: bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java

[dkulp]

Author: dkulp
Date: Wed Aug 26 14:31:44 2009
New Revision: 808024

URL: http://svn.apache.org/viewvc?rev=808024&view=rev
Log:
Fix soap binding with spring doing jsr250 procesing

Modified:
    
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
    
cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java

Modified: 
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=808024&r1=808023&r2=808024&view=diff
==============================================================================
--- 
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
 (original)
+++ 
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
 Wed Aug 26 14:31:44 2009
@@ -101,7 +101,7 @@
 import static org.apache.cxf.helpers.CastUtils.cast;
 
 
-...@nojsr250annotations(unlessNull = { "bus", "activationNamespaces" })
+...@nojsr250annotations(unlessNull = { "bus" })
 public class SoapBindingFactory extends AbstractBindingFactory {
     public static final Collection<String> DEFAULT_NAMESPACES = Arrays.asList(
         "http://schemas.xmlsoap.org/soap/";,

Modified: 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java?rev=808024&r1=808023&r2=808024&view=diff
==============================================================================
--- 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
 (original)
+++ 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
 Wed Aug 26 14:31:44 2009
@@ -187,15 +187,16 @@
 
     @Resource
     public void setBus(Bus bus) {
-        this.bus = bus;
-        registerWithBindingManager();
+        if (this.bus != bus) {
+            this.bus = bus;
+            registerWithBindingManager();
+        }
     }
 
     public Collection<String> getActivationNamespaces() {
         return activationNamespaces;
     }
 
-    @Resource(name = "activationNamespaces")
     public void setActivationNamespaces(Collection<String> 
activationNamespaces) {
         this.activationNamespaces = activationNamespaces;
         registerWithBindingManager();