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

4 files changed, 12 insertions, 22 deletions

diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index c42f71d838..878fdb4fe4 100644
--- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
@@ -26,16 +26,10 @@ public class HelloWorldReferenceImpl implements HelloWorldReference {
     @Reference
     protected HelloWorldService helloWorldService1;
     
-    public String getGreetings(String name){
-        helloWorldService1.setGreetings(name.getBytes());
-        
-        try {
-            Thread.sleep(2000);
-        } catch (Exception ex) {
-            // do nothing
-        }
-        
-        return HelloWorldServiceImpl.getGreetings(); 
+    public String getGreetings(String name){     
+        byte[] bytesValue = helloWorldService1.getByteArrayGreetings(name.getBytes());
+        String stringValue = new String(bytesValue);  
+        return stringValue; 
     }    
 }
 
diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b012f0f93c..82c57dfe75 100644
--- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
@@ -27,8 +27,7 @@ import org.osoa.sca.annotations.Remotable;
 @Remotable
 public interface HelloWorldService {
 
-    @OneWay
-    public void setGreetings(byte[] msg);
+    public byte[] getByteArrayGreetings(byte[] msg);
     
 }
 
diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index ce7b84903e..f0b7819c3b 100644
--- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
@@ -20,17 +20,14 @@ package org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld;
 
 public class HelloWorldServiceImpl implements HelloWorldService {
     
-    private static String greetings = "not set";
-    
-    public void setGreetings(byte[] msg){
+    public byte[] getByteArrayGreetings(byte[] msg){
          
         String name = new String(msg);
-        greetings =  "Hello " + name;
-    }
-    
-    public static String getGreetings(){
-        return greetings;
+        name =  "Hello " + name;
+        
+        return name.getBytes();
     }
 
+
 }
 
diff --git a/java/sca/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite b/java/sca/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
index 1862e88770..07507e0ebe 100644
--- a/java/sca/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
+++ b/java/sca/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
@@ -28,7 +28,7 @@
         <reference name="helloWorldService1" >
             <binding.jms>
                 <destination name="HelloWorldService1"/>
-                <tuscany:wireFormat.jmsDefault/>
+                <tuscany:wireFormat.jmsTextXML/>
             </binding.jms>
         </reference>  
         <reference name="helloWorldService2" >
@@ -48,7 +48,7 @@
         <service name="HelloWorldService">
             <binding.jms>
                 <destination name="HelloWorldService1"/>
-                <tuscany:wireFormat.jmsDefault/>
+                <tuscany:wireFormat.jmsTextXML/>
             </binding.jms>
         </service>
     </component>