Add methods used by the JMS binding to the core module

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@813719 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 24 insertions, 2 deletions

diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
index d37d62c5cd..3876776846 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
@@ -34,6 +34,7 @@ import org.apache.tuscany.sca.core.assembly.EndpointSerializer;
  */
 public class RuntimeEndpointImpl extends EndpointImpl implements Externalizable {
     private EndpointSerializer serializer;
+    private String bindingURI;
     private String xml;
 
     /**
@@ -77,7 +78,7 @@ public class RuntimeEndpointImpl extends EndpointImpl implements Externalizable
     }
 
     @Override
-    protected void resolve() {
+    public void resolve() {
         if (component == null && xml != null) {
             try {
                 getSerializer().read(this, xml);
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java
index 78811ebf7e..4474c26deb 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java
@@ -289,8 +289,8 @@ public class RuntimeWireImpl implements RuntimeWire {
                 if (operation.isNonBlocking()) {
                     addNonBlockingInterceptor(reference, refBinding, chain);
                 }
-                addReferenceBindingInterceptor(reference, refBinding, chain, operation);
                 chains.add(chain);
+                addReferenceBindingInterceptor(reference, refBinding, chain, operation);
             }
 
         } else {
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
index 747a5ba032..b08ded18c4 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
@@ -190,6 +190,12 @@ public class NonBlockingInterceptor implements Interceptor {
         public List<Object> getHeaders() {
             return null;
         }        
+        public <T> T getBindingContext() {
+            return null;
+        }
+
+        public <T> void setBindingContext(T bindingContext) {
+        }        
     }
 
 }
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
index 42625e9ea1..5e36d724f5 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
@@ -104,6 +104,11 @@ public class JDKInvocationHandler implements InvocationHandler, Serializable {
     }
     */
 
+    public Class<?> getBusinessInterface() {
+        return businessInterface;
+    }
+    
+    
     protected Object getCallbackID() {
 //        if (callableReference != null) {
 //            return callableReference.getCallbackID();
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
index d24da46b3f..53fab3392c 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
@@ -41,6 +41,8 @@ public class MessageImpl implements Message {
     private EndpointReference from;
     private Endpoint to;
 
+    private Object bindingContext;
+
     public MessageImpl() {
         // TODO - EPR - What to do by default?
         //this.from = new EndpointReferenceImpl("/");
@@ -104,4 +106,12 @@ public class MessageImpl implements Message {
         return headers;
     }    
 
+    @SuppressWarnings("unchecked")
+    public <T> T getBindingContext() {
+        return (T)bindingContext;
+    }
+
+    public <T> void setBindingContext(T bindingContext) {
+        this.bindingContext = bindingContext;
+    }
 }