incubator-yoko-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r529717 - in /incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba: CorbaBinding.java CorbaBindingFactory.java CorbaConduit.java CorbaDestination.java
Date Tue, 17 Apr 2007 19:13:45 GMT
Author: bravi
Date: Tue Apr 17 12:13:44 2007
New Revision: 529717

URL: http://svn.apache.org/viewvc?view=rev&rev=529717
Log:
Fixing the bindings module compilation error.

Modified:
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBinding.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingFactory.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaConduit.java
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaDestination.java

Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBinding.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBinding.java?view=diff&rev=529717&r1=529716&r2=529717
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBinding.java
(original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBinding.java
Tue Apr 17 12:13:44 2007
@@ -28,18 +28,29 @@
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 
+import org.apache.cxf.service.model.BindingInfo;
+
 public class CorbaBinding extends AbstractBasicInterceptorProvider implements Binding {
 
     private List<Interceptor> in;
     private List<Interceptor> out;
     private List<Interceptor> infault;
-    private List<Interceptor> outfault;   
+    private List<Interceptor> outfault;
+    private BindingInfo bindingInfo;
     
     public CorbaBinding() {
         in = new ArrayList<Interceptor>();
         out = new ArrayList<Interceptor>();
         infault = new ArrayList<Interceptor>();
         outfault = new ArrayList<Interceptor>();
+    }
+    
+    public void setBindingInfo(BindingInfo info) {
+        bindingInfo = info;
+    }
+    
+    public BindingInfo getBindingInfo() {
+        return bindingInfo;
     }
     
     public Message createMessage() {

Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingFactory.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingFactory.java?view=diff&rev=529717&r1=529716&r2=529717
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingFactory.java
(original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingFactory.java
Tue Apr 17 12:13:44 2007
@@ -28,13 +28,11 @@
 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.BindingFactoryManager;
 
 //import org.apache.cxf.helpers.CastUtils;
-
 import org.apache.cxf.service.model.BindingInfo;
 import org.apache.cxf.service.model.EndpointInfo;
 
@@ -58,37 +56,26 @@
 public class CorbaBindingFactory extends AbstractBindingFactory
     implements ConduitInitiator, DestinationFactory {
 
-    private Bus bus;
     private Collection<String> activationNamespaces;
     private List<String> transportIds;
     private OrbConfig orbConfig = new OrbConfig();
 
-    @Resource
-    public void setBus(Bus b) {
-        bus = b;
-    }
-    
-    @Resource
-    public void setActivationNamespaces(Collection<String> ans) {
-        activationNamespaces = ans;
-    }
-
-    @Resource
+    @Resource(name = "orbClass")
     public void setOrbClass(String cls) {
         orbConfig.setOrbClass(cls);
     }
     
-    @Resource
+    @Resource(name = "orbSingletonClass")
     public void setOrbSingletonClass(String cls) {
         orbConfig.setOrbSingletonClass(cls);
     }
 
     @PostConstruct
     void registerSelf() {
-        if (null == bus) {
+        if (null == getBus()) {
             return;
         }
-        BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);
+        BindingFactoryManager bfm = getBus().getExtension(BindingFactoryManager.class);
         if (null != bfm) {
             for (String ns : activationNamespaces) {
                 bfm.registerBindingFactory(ns, this);
@@ -98,13 +85,13 @@
 
     @PostConstruct
     void registerWithBindingManager() {
-        ConduitInitiatorManager cim = bus.getExtension(ConduitInitiatorManager.class);
+        ConduitInitiatorManager cim = getBus().getExtension(ConduitInitiatorManager.class);
         if (null != cim) {
             for (String ns : activationNamespaces) {
                 cim.registerConduitInitiator(ns, this);
             }
         }
-        DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class);
+        DestinationFactoryManager dfm = getBus().getExtension(DestinationFactoryManager.class);
         if (null != dfm) {
             for (String ns : activationNamespaces) {
                 dfm.registerDestinationFactory(ns, this);
@@ -118,6 +105,7 @@
         binding.getOutInterceptors().add(new CorbaOutInterceptor());
         binding.getInFaultInterceptors().add(new CorbaFaultInInterceptor());
         binding.getOutFaultInterceptors().add(new CorbaFaultOutInterceptor());
+        binding.setBindingInfo(bindingInfo);
         return binding;
     }
 
@@ -137,11 +125,10 @@
     }
 
     public List<String> getTransportIds() {
-        System.out.println("getTransportIds" + transportIds.get(0));
         return transportIds;
     }
 
-    @Resource
+    @Resource(name = "transportIds")
     public void setTransportIds(List<String> ids) {
         transportIds = ids;
     }

Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaConduit.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaConduit.java?view=diff&rev=529717&r1=529716&r2=529717
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaConduit.java
(original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaConduit.java
Tue Apr 17 12:13:44 2007
@@ -181,6 +181,7 @@
         try {
             request.invoke();
         } catch (SystemException ex) {
+            ex.printStackTrace();
             message.setContent(Exception.class, new Fault(ex));
             message.setSystemException(ex);
             return;

Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaDestination.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaDestination.java?view=diff&rev=529717&r1=529716&r2=529717
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaDestination.java
(original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaDestination.java
Tue Apr 17 12:13:44 2007
@@ -56,6 +56,7 @@
     private BindingInfo binding;
     private EndpointInfo endpointInfo;
     private OrbConfig orbConfig;
+    private MessageObserver incomingObserver;
 
     public CorbaDestination(EndpointInfo ei, OrbConfig config) {
         address = ei.getExtensor(AddressType.class);
@@ -115,6 +116,7 @@
             LOG.log(Level.INFO, "Creating ORB with address " + location);
             orb = CorbaBindingHelper.createAddressSpecificORB(location, orbConfig);
         }
+        incomingObserver = observer;
         activate(observer);
     }
 
@@ -237,5 +239,9 @@
         }
 
         return location;
+    }
+    
+    public MessageObserver getMessageObserver() {
+        return incomingObserver;
     }
 }



Mime
View raw message