5 files changed, 65 insertions, 30 deletions

diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReference.java b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
index ba563b658f..89bae83c77 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReference.java
+++ b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.binding.jms.format.jmsdelimited.helloworld;
+package org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld;
 
 import org.osoa.sca.annotations.Remotable;
 
@@ -26,8 +26,7 @@ import org.osoa.sca.annotations.Remotable;
 @Remotable
 public interface HelloWorldReference {
 
-    public String getGreetings(String firstName, 
-                               String lastName);
+    public String getGreetings(String firstName, String lastName);
     
 }
 
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReferenceImpl.java b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
index e5677169fe..a2cb1b6763 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReferenceImpl.java
+++ b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.binding.jms.format.jmsdelimited.helloworld;
+package org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld;
 
 import org.osoa.sca.annotations.Reference;
 
@@ -24,19 +24,15 @@ import org.osoa.sca.annotations.Reference;
 public class HelloWorldReferenceImpl implements HelloWorldReference {
     
     @Reference
-    protected HelloWorldService helloWorldService1;
+    protected HelloWorldService helloWorldService;
     
-    public String getGreetings(String firstName, 
-                               String lastName){
-        helloWorldService1.setGreetings(firstName, lastName);
+    public String getGreetings(String firstName, String lastName){ 
+    	Person person = new Person();
+    	person.setFirstName(firstName);
+    	person.setLastName(lastName);
+        Person returnPerson =  helloWorldService.getGreetings(person); 
         
-        try {
-            Thread.sleep(2000);
-        } catch (Exception ex) {
-            // do nothing
-        }
-        
-        return HelloWorldServiceImpl.getGreetings(); 
+        return returnPerson.getFirstName() + " " + returnPerson.getLastName();
     }    
 }
 
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldService.java b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
index 623fd43871..485e184f6c 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldService.java
+++ b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
@@ -16,9 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.binding.jms.format.jmsdelimited.helloworld;
+package org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld;
 
-import org.osoa.sca.annotations.OneWay;
 import org.osoa.sca.annotations.Remotable;
 
 /**
@@ -27,9 +26,7 @@ import org.osoa.sca.annotations.Remotable;
 @Remotable
 public interface HelloWorldService {
 
-    @OneWay
-    public void setGreetings(String firstName, 
-                            String lastName);
+    public Person getGreetings(Person person);
     
 }
 
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldServiceImpl.java b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
index 72ae0a330e..4747136509 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldServiceImpl.java
+++ b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
@@ -16,21 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.binding.jms.format.jmsdelimited.helloworld;
+package org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld;
 
 
 public class HelloWorldServiceImpl implements HelloWorldService {
     
-    private static String greetings = "not set";
-    
-    public void setGreetings(String firstName, 
-                            String lastName){
+    public Person getGreetings(Person person){
          
-        greetings =  "Hello " + firstName + " " + lastName;
-    }
-    
-    public static String getGreetings(){
-        return greetings;
+    	person.setFirstName("Hello " + person.getFirstName());
+    	person.setLastName("Hello " + person.getLastName());
+    	
+        return person;
     }
 }
 
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
new file mode 100644
index 0000000000..35c383ace9
--- /dev/null
+++ b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld;
+
+import java.io.Serializable;
+
+public class Person implements Serializable {
+
+    private static final long serialVersionUID = -6842761353978551779L;
+    
+    String firstName;
+    String lastName;
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+}
+