Tidy wire format support (move model into binding-jms and rename default to textxml). Extend support to include text and object.

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

2 files changed, 10 insertions, 7 deletions

diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
index beb86fefe1..4f463b105d 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
@@ -128,6 +128,11 @@ public class EndpointWireImpl implements RuntimeWire {
         }
     }
 
+    public Object invoke(Message msg) throws InvocationTargetException {
+        // not called as the endpoint wire only appears on the reference side
+        return null;
+    }
+    
     public Object invoke(Operation operation, Object[] args) throws InvocationTargetException {
         // not called as the endpoint wire only appears on the reference side
         return null;
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
index 842799c277..b6f949f081 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
@@ -147,6 +147,10 @@ public class RuntimeWireImpl implements RuntimeWire {
         }
         return null;
     }
+    
+    public Object invoke(Message msg) throws InvocationTargetException {
+        return getBindingInvocationChain().getHeadInvoker().invoke(msg);
+    }    
 
     public Object invoke(Operation operation, Object[] args) throws InvocationTargetException {
         Message msg = messageFactory.createMessage();
@@ -238,13 +242,7 @@ public class RuntimeWireImpl implements RuntimeWire {
                     }
                 }
             }
-        }        
-        
-        // TODO - add something on the end of the wire to invoke the 
-        //        invocation chain. Need to split out the runtime
-        //        wire invoker into conversation, callback interceptors etc
-       
-        
+        }               
     }    
     
     private void initServiceBindingInvocationChains() {