From e4d4979293ce33727d6867b7304ab5c693af39ba Mon Sep 17 00:00:00 2001 From: slaws Date: Tue, 21 Feb 2012 11:29:58 +0000 Subject: TUSCANY-4005 - swap the test around so that the code that raises an error if a reference target containing only a component name matches a component with multiple services comes after the code that matches interfaces and policy git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1291714 13f79535-47bb-0310-9956-ffa450edef68 --- .../scaclient-api/src/main/java/itest/HelloworldServiceAgain.java | 2 +- .../scaclient-api/src/main/java/itest/MultipleServiceClientImpl.java | 2 +- .../itest/scaclient-api/src/main/java/itest/MultipleServiceImpl.java | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'sca-java-2.x/trunk/testing') diff --git a/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/HelloworldServiceAgain.java b/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/HelloworldServiceAgain.java index 614232c01e..e3205559d2 100644 --- a/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/HelloworldServiceAgain.java +++ b/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/HelloworldServiceAgain.java @@ -20,6 +20,6 @@ package itest; public interface HelloworldServiceAgain { - String sayHelloAgain(String name); + String sayHello(String name); } diff --git a/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/MultipleServiceClientImpl.java b/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/MultipleServiceClientImpl.java index 9313500e72..f2617d8a7c 100644 --- a/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/MultipleServiceClientImpl.java +++ b/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/MultipleServiceClientImpl.java @@ -32,7 +32,7 @@ public class MultipleServiceClientImpl implements HelloworldService { public HelloworldServiceAgain helloWorld; public String sayHello(String name) { - return "Hello " + helloWorld.sayHelloAgain(name); + return "Hello " + helloWorld.sayHello(name); } } diff --git a/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/MultipleServiceImpl.java b/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/MultipleServiceImpl.java index a7001c327d..6dab51f527 100644 --- a/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/MultipleServiceImpl.java +++ b/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/MultipleServiceImpl.java @@ -31,7 +31,4 @@ public class MultipleServiceImpl implements HelloworldService, HelloworldService return "Hello " + name; } - public String sayHelloAgain(String name) { - return "Hello again " + name; - } } -- cgit v1.2.3