From 751699fd7b0bccbf6882bd719b8afec7a0dacd47 Mon Sep 17 00:00:00 2001 From: antelder Date: Mon, 22 Mar 2010 10:21:48 +0000 Subject: [PATCH] Revert changes in 925994 committed by accident git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@926021 13f79535-47bb-0310-9956-ffa450edef68 --- .../testing/helloworld-scaclient-javase/pom.xml | 5 ----- .../{testingxxx => testing}/HelloworldClient.java | 11 +++-------- .../{testingxxx => testing}/HelloworldService.java | 2 +- 3 files changed, 4 insertions(+), 14 deletions(-) rename sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-javase/src/main/java/{testingxxx => testing}/HelloworldClient.java (78%) rename sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-javase/src/main/java/{testingxxx => testing}/HelloworldService.java (95%) diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-javase/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-javase/pom.xml index fcc7189d2d..39c6bb2b59 100644 --- a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-javase/pom.xml +++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-javase/pom.xml @@ -35,11 +35,6 @@ tuscany-base-nodep 2.0-SNAPSHOT - - org.apache.tuscany.sca.shades - tuscany-bpel - 2.0-SNAPSHOT - diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-javase/src/main/java/testingxxx/HelloworldClient.java b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-javase/src/main/java/testing/HelloworldClient.java similarity index 78% rename from sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-javase/src/main/java/testingxxx/HelloworldClient.java rename to sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-javase/src/main/java/testing/HelloworldClient.java index 442d050454..b36fe418a4 100644 --- a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-javase/src/main/java/testingxxx/HelloworldClient.java +++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-javase/src/main/java/testing/HelloworldClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package testingxxx; +package testing; import java.net.URI; @@ -24,8 +24,6 @@ import org.oasisopen.sca.NoSuchDomainException; import org.oasisopen.sca.NoSuchServiceException; import org.oasisopen.sca.client.SCAClientFactory; -import com.hazelcast.client.InRunnable; - public class HelloworldClient { @@ -35,14 +33,11 @@ public class HelloworldClient { if (args.length > 0) { domainURI = URI.create(args[0]); } else { - domainURI = URI.create("tuscanyclient:foo?remotes=127.0.0.1:14820"); + domainURI = URI.create("tuscany:default?remotes=192.168.1.73:14820"); } - InRunnable xx; SCAClientFactory factory = SCAClientFactory.newInstance(domainURI); HelloworldService service = factory.getService(HelloworldService.class, "HelloworldComponent"); - System.out.println(service.sayHello("world")); - System.out.println(service.sayHello("world2")); - System.out.println(service.sayHello("world3")); + System.out.println(service.sayHello("world")); } } diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-javase/src/main/java/testingxxx/HelloworldService.java b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-javase/src/main/java/testing/HelloworldService.java similarity index 95% rename from sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-javase/src/main/java/testingxxx/HelloworldService.java rename to sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-javase/src/main/java/testing/HelloworldService.java index 81ce1ec739..b035a772be 100644 --- a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-javase/src/main/java/testingxxx/HelloworldService.java +++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-javase/src/main/java/testing/HelloworldService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package testingxxx; +package testing; import org.oasisopen.sca.annotation.Remotable;