From 4fef5f61f57dcdfd675cc59f536b342f17a85d4e Mon Sep 17 00:00:00 2001 From: slaws Date: Sun, 29 Mar 2009 18:37:49 +0000 Subject: TUSCANY-2931 - update operation matching to be based on operation name. Add a complex type based interface back into to the test case. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@759742 13f79535-47bb-0310-9956-ffa450edef68 --- .../helloworld/HelloWorldReferenceImpl.java | 7 ++----- .../jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java | 2 +- .../jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java | 2 -- 3 files changed, 3 insertions(+), 8 deletions(-) (limited to 'branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms') diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java index 4233f42b73..732b49ea6c 100644 --- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java +++ b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java @@ -18,7 +18,6 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld; -import org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.Person; import org.osoa.sca.annotations.Reference; @@ -31,11 +30,9 @@ public class HelloWorldReferenceImpl implements HelloWorldService { return helloWorldService1.getGreetings(name).toString(); } - /* public String getPersonGreetings(Person person){ - return null; - } - */ + return helloWorldService1.getPersonGreetings(person).toString(); + } } diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java index e860c0594d..65323a3d63 100644 --- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java +++ b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java @@ -28,6 +28,6 @@ public interface HelloWorldService { public String getGreetings(String name); - //public String getPersonGreetings(Person person); + public String getPersonGreetings(Person person); } diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java index b8b27287bb..2f2c53b41d 100644 --- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java +++ b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java @@ -26,12 +26,10 @@ public class HelloWorldServiceImpl implements HelloWorldService { return response; } - /* public String getPersonGreetings(Person person){ String response = "Hello " + person.getFirstName() + " " + person.getLastName(); System.out.println("getPersonGreetings: " + response); return response; } - */ } -- cgit v1.2.3