svn commit: r695868 - in /cxf/trunk/rt: bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java

[dk...@apache.org]

Author: dkulp
Date: Tue Sep 16 06:24:43 2008
New Revision: 695868

URL: http://svn.apache.org/viewvc?rev=695868&view=rev
Log:
[CXF-1804] Patch for registering the corba conduit/dests from Matteo Vescovi applied.

Modified:
    cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.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=695868&r1=695867&r2=695868&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 Tue Sep 16 06:24:43 2008
@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.Set;
 
+import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 
 import org.apache.cxf.binding.AbstractBindingFactory;
@@ -38,8 +39,10 @@
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.ConduitInitiator;
+import org.apache.cxf.transport.ConduitInitiatorManager;
 import org.apache.cxf.transport.Destination;
 import org.apache.cxf.transport.DestinationFactory;
+import org.apache.cxf.transport.DestinationFactoryManager;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 
 public class CorbaBindingFactory extends AbstractBindingFactory
@@ -48,6 +51,34 @@
     protected List<String> transportIds;
     protected OrbConfig orbConfig = new OrbConfig();
 
+    @PostConstruct
+    void registerWithDestinationManager() {
+        if (null == bus) {
+            return;
+        }
+
+        DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class);
+        if (null != dfm && activationNamespaces != null) {
+            for (String ns : activationNamespaces) {
+                dfm.registerDestinationFactory(ns, this);
+            }
+        }
+    }
+
+    @PostConstruct
+    void registerWithConduitManager() {
+        if (null == bus) {
+            return;
+        }
+
+        ConduitInitiatorManager cim = bus.getExtension(ConduitInitiatorManager.class);
+        if (null != cim && activationNamespaces != null) {
+            for (String ns : activationNamespaces) {
+                cim.registerConduitInitiator(ns, this);
+            }
+        }
+    }
+
     public void setOrbClass(String cls) {
         orbConfig.setOrbClass(cls);
     }
@@ -55,7 +86,6 @@
     public void setOrbSingletonClass(String cls) {
         orbConfig.setOrbSingletonClass(cls);
     }
-   
 
     public Binding createBinding(BindingInfo bindingInfo) {
         CorbaBinding binding = new CorbaBinding();

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=695868&r1=695867&r2=695868&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 Tue Sep 16 06:24:43 2008
@@ -49,9 +49,9 @@
 
     public static final String DATABINDING_DISABLED = "databinding.disabled";
 
-    Collection<String> activationNamespaces;
+    protected Collection<String> activationNamespaces;
 
-    Bus bus;
+    protected Bus bus;
 
     @PostConstruct
     void registerWithBindingManager() {