From 04dcd09976ecc5aa2948993b9a9a2d90d239ee44 Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 28 Jul 2011 10:58:07 +0000 Subject: Delete old beta3 branch as its going to be recreated from the current trunk git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1151789 13f79535-47bb-0310-9956-ffa450edef68 --- .../testing/itest/scaclient-api-remote/pom.xml | 46 -------- .../src/main/java/itest/HelloworldService.java | 28 ----- .../src/main/java/itest/HelloworldServiceImpl.java | 38 ------- .../src/main/resources/Helloworld.composite | 29 ----- .../main/resources/META-INF/sca-contribution.xml | 23 ---- .../java/test/scaclient/SCAClientTestCase.java | 121 --------------------- 6 files changed, 285 deletions(-) delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/pom.xml delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/java/itest/HelloworldService.java delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/java/itest/HelloworldServiceImpl.java delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/resources/Helloworld.composite delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/src/test/java/test/scaclient/SCAClientTestCase.java (limited to 'sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote') diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/pom.xml b/sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/pom.xml deleted file mode 100644 index 2865e345b4..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 2.0-Beta3-SNAPSHOT - ../pom.xml - - itest-scaclient-api-remote - Apache Tuscany SCA iTest SCAClient API with Hazelcast client - - - - org.apache.tuscany.sca - tuscany-base-runtime-pom - pom - 2.0-Beta3-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-domain-hazelcast - 2.0-Beta3-SNAPSHOT - - - - diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/java/itest/HelloworldService.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/java/itest/HelloworldService.java deleted file mode 100644 index f97d2c3a83..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/java/itest/HelloworldService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 itest; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloworldService { - - String sayHello(String name); - -} diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/java/itest/HelloworldServiceImpl.java deleted file mode 100644 index a04b40279f..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/java/itest/HelloworldServiceImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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 itest; - -import org.oasisopen.sca.annotation.EagerInit; -import org.oasisopen.sca.annotation.Init; -import org.oasisopen.sca.annotation.Scope; - -@EagerInit -@Scope("COMPOSITE") -public class HelloworldServiceImpl implements HelloworldService { - - public String sayHello(String name) { - return "Hello " + name; - } - - @Init - public void init() { - System.out.println(sayHello("world")); - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/resources/Helloworld.composite b/sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/resources/Helloworld.composite deleted file mode 100644 index d37c93857d..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/resources/Helloworld.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index e178823296..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/src/test/java/test/scaclient/SCAClientTestCase.java deleted file mode 100644 index 432d51dc27..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scaclient-api-remote/src/test/java/test/scaclient/SCAClientTestCase.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * 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 test.scaclient; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; -import itest.HelloworldService; - -import java.net.URI; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.oasisopen.sca.NoSuchDomainException; -import org.oasisopen.sca.client.SCAClientFactory; - -/** - * Test SCADomain.newInstance and invocation of a service. - * - * @version $Rev: 904064 $ $Date: 2010-01-28 12:31:36 +0000 (Thu, 28 Jan 2010) $ - */ -public class SCAClientTestCase { - - private Node node; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - } - - @Test - public void testDefault() throws Exception { - - node = NodeFactory.newInstance().createNode((String)null, new String[] {"target/classes"}); - node.start(); - - HelloworldService service = SCAClientFactory.newInstance(URI.create("default")).getService(HelloworldService.class, "HelloworldComponent"); - assertEquals("Hello petra", service.sayHello("petra")); - } - - @Test - public void testURIconfig() throws Exception { - - node = NodeFactory.newInstance("uri:somedomain").createNode((String)null, new String[] {"target/classes"}); - node.start(); - - HelloworldService service = SCAClientFactory.newInstance(URI.create("somedomain")).getService(HelloworldService.class, "HelloworldComponent"); - assertEquals("Hello petra", service.sayHello("petra")); - try { - service = SCAClientFactory.newInstance(URI.create("nosuchdomain")).getService(HelloworldService.class, "HelloworldComponent"); - service.sayHello("petra"); - fail(); - } catch (NoSuchDomainException e) { - //expected - } - } - - @Test - public void testExplicit() throws Exception { - node = NodeFactory.newInstance().createNode(URI.create("myFooDomain"), new String[] {"target/classes"}); - node.start(); - - HelloworldService service = SCAClientFactory.newInstance(URI.create("myFooDomain")).getService(HelloworldService.class, "HelloworldComponent"); - assertEquals("Hello petra", service.sayHello("petra")); - } - - @Test - public void testExplicitRemote() throws Exception { - node = NodeFactory.newInstance("uri:myFooDomain?bind=127.0.0.1:14821").createNode((String)null, new String[] {"target/classes"}); - node.start(); - - // TUSCANY-3670 - why factory takes URI while node factory take configuration string? - // hacked this for now to make the client domain name match the domain - // name that's pulled out of the factory URI - //HelloworldService service = SCAClientFactory.newInstance(URI.create("uri:myFooDomain?wka=127.0.0.1:14821")).getService(HelloworldService.class, "HelloworldComponent"); - HelloworldService service = SCAClientFactory.newInstance(URI.create("myFooDomain")).getService(HelloworldService.class, "HelloworldComponent"); - assertEquals("Hello petra", service.sayHello("petra")); - } - - @Test - public void testExplicitRemote2() throws Exception { - node = NodeFactory.newInstance("uri:myFooDomain?bind=127.0.0.1:14821").createNode((String)null, new String[] {"target/classes"}); - node.start(); - - // TUSCANY-3670 - why factory takes URI while node factory take configuration string? - // hacked this for now to make the client domain name match the domain - // name that's pulled out of the factory URI - //HelloworldService service = SCAClientFactory.newInstance(URI.create("uri:myFooDomain?wka=127.0.0.1:14821")).getService(HelloworldService.class, "HelloworldComponent"); - HelloworldService service = SCAClientFactory.newInstance(URI.create("myFooDomain")).getService(HelloworldService.class, "HelloworldComponent"); - assertEquals("Hello petra", service.sayHello("petra")); - } - - @After - public void tearDown() throws Exception { - node.stop(); - } - -} -- cgit v1.2.3