cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r695879 - in /cxf/branches/2.1.x-fixes: ./ rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
Date Tue, 16 Sep 2008 13:40:21 GMT
Author: dkulp
Date: Tue Sep 16 06:40:21 2008
New Revision: 695879

URL: http://svn.apache.org/viewvc?rev=695879&view=rev
Log:
Merged revisions 695868 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r695868 | dkulp | 2008-09-16 09:24:43 -0400 (Tue, 16 Sep 2008) | 2 lines
  
  [CXF-1804] Patch for registering the corba conduit/dests from Matteo Vescovi applied.
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java
    cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 16 06:40:21 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java?rev=695879&r1=695878&r2=695879&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java
Tue Sep 16 06:40:21 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/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java?rev=695879&r1=695878&r2=695879&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
Tue Sep 16 06:40:21 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() {



Mime
View raw message