svn commit: r672545 - in /tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl: CorbaReferenceBindingProvider.java CorbaServiceBindingProvider.java

[rf...@apache.org]

Author: rfeng
Date: Sat Jun 28 09:37:45 2008
New Revision: 672545

URL: http://svn.apache.org/viewvc?rev=672545&view=rev
Log:
Fix the compliation error due to refactoring in host-corba

Modified:
    tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java
    tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java

Modified: tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java?rev=672545&r1=672544&r2=672545&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java Sat Jun 28 09:37:45 2008
@@ -21,12 +21,15 @@
 
 import org.apache.tuscany.sca.binding.corba.CorbaBinding;
 import org.apache.tuscany.sca.host.corba.CorbaHost;
+import org.apache.tuscany.sca.host.corba.CorbaHostException;
 import org.apache.tuscany.sca.interfacedef.InterfaceContract;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
 import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
+import org.omg.CORBA.ORB;
 import org.omg.CORBA.Object;
+import org.osoa.sca.ServiceRuntimeException;
 
 /**
  * @version $Rev$ $Date$
@@ -37,11 +40,17 @@
     private CorbaHost host;
     private RuntimeComponentReference reference;
     private Object remoteObject;
+    private ORB orb;
 
     public CorbaReferenceBindingProvider(CorbaBinding binding, CorbaHost host, RuntimeComponentReference reference) {
         this.binding = binding;
         this.host = host;
         this.reference = reference;
+        try {
+            this.orb = host.createORB(binding.getHost(), binding.getPort(), false);
+        } catch (CorbaHostException e) {
+            throw new ServiceRuntimeException(e);
+        }
     }
 
     /**
@@ -50,7 +59,7 @@
     public Invoker createInvoker(Operation operation) {
         try {
             if (remoteObject == null) {
-                remoteObject = host.getReference(binding.getName(), binding.getHost(), binding.getPort());
+                remoteObject = host.lookup(orb, binding.getName());
             }
             return new CorbaInvoker(remoteObject);
         } catch (Exception e) {

Modified: tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java?rev=672545&r1=672544&r2=672545&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java Sat Jun 28 09:37:45 2008
@@ -25,6 +25,7 @@
 import org.apache.tuscany.sca.interfacedef.InterfaceContract;
 import org.apache.tuscany.sca.provider.ServiceBindingProvider;
 import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+import org.omg.CORBA.ORB;
 import org.osoa.sca.ServiceRuntimeException;
 
 /**
@@ -36,6 +37,7 @@
     private CorbaHost host;
     private RuntimeComponentService service;
     private DynaCorbaServant servant;
+    private ORB orb;
 
     public CorbaServiceBindingProvider(CorbaBinding binding, CorbaHost host, RuntimeComponentService service) {
         this.binding = binding;
@@ -55,8 +57,9 @@
      */
     public void start() {
         try {
+            this.orb = host.createORB(binding.getHost(), binding.getPort(), false);
             servant = new DynaCorbaServant(service, binding);
-            host.registerServant(binding.getName(), binding.getHost(), binding.getPort(), servant);
+            host.registerServant(orb, binding.getName(), servant);
         } catch (Exception e) {
             throw new ServiceRuntimeException(e);
         }
@@ -68,7 +71,7 @@
      */
     public void stop() {
         try {
-            host.unregisterServant(binding.getName(), binding.getHost(), binding.getPort());
+            host.unregisterServant(orb, binding.getName());
         } catch (Exception e) {
             throw new ServiceRuntimeException(e);
         }
@@ -79,7 +82,6 @@
      * @see org.apache.tuscany.sca.provider.ServiceBindingProvider#supportsOneWayInvocation()
      */
     public boolean supportsOneWayInvocation() {
-        // TODO Auto-generated method stub
         return false;
     }