From 50107a29161e0dbc6d47d17ce08fd7d4745c4e5c Mon Sep 17 00:00:00 2001 From: antelder Date: Fri, 31 Jul 2009 10:50:31 +0000 Subject: Delete old RC tags git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@799574 13f79535-47bb-0310-9956-ffa450edef68 --- .../itest/nodes/helloworld-client/pom.xml | 44 --------- .../src/main/java/itest/nodes/HelloworldImpl.java | 33 ------- .../main/resources/META-INF/sca-contribution.xml | 23 ----- .../src/main/resources/helloworld-client.composite | 29 ------ .../itest/nodes/helloworld-iface/pom.xml | 39 -------- .../src/main/java/itest/nodes/Helloworld.java | 26 ------ .../itest/nodes/helloworld-service/pom.xml | 49 ---------- .../src/main/java/itest/nodes/HelloworldImpl.java | 28 ------ .../main/resources/META-INF/sca-contribution.xml | 23 ----- .../main/resources/helloworld-service.composite | 28 ------ .../2.0-M3-RC3a/itest/nodes/one-node-test/pom.xml | 48 ---------- .../src/test/java/itest/OneNodeTestCase.java | 87 ------------------ tags/java/sca/2.0-M3-RC3a/itest/nodes/pom.xml | 44 --------- .../2.0-M3-RC3a/itest/nodes/two-nodes-test/pom.xml | 53 ----------- .../src/test/java/itest/TwoNodesTestCase.java | 101 --------------------- 15 files changed, 655 deletions(-) delete mode 100644 tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-client/pom.xml delete mode 100644 tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java delete mode 100644 tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite delete mode 100644 tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-iface/pom.xml delete mode 100644 tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java delete mode 100644 tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-service/pom.xml delete mode 100644 tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java delete mode 100644 tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite delete mode 100644 tags/java/sca/2.0-M3-RC3a/itest/nodes/one-node-test/pom.xml delete mode 100644 tags/java/sca/2.0-M3-RC3a/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java delete mode 100644 tags/java/sca/2.0-M3-RC3a/itest/nodes/pom.xml delete mode 100644 tags/java/sca/2.0-M3-RC3a/itest/nodes/two-nodes-test/pom.xml delete mode 100644 tags/java/sca/2.0-M3-RC3a/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java (limited to 'tags/java/sca/2.0-M3-RC3a/itest/nodes') diff --git a/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-client/pom.xml b/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-client/pom.xml deleted file mode 100644 index ec124f23f7..0000000000 --- a/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-client/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 2.0-M3 - ../pom.xml - - itest-nodes-helloworld-client - Apache Tuscany SCA iTest Nodes Helloworld Client - - - - org.apache.tuscany.sca - itest-nodes-helloworld-iface - 2.0-M3 - - - org.apache.tuscany.sca - tuscany-sca-api - 2.0-M3 - provided - - - diff --git a/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java b/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java deleted file mode 100644 index a8e74be096..0000000000 --- a/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java +++ /dev/null @@ -1,33 +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.nodes; - -import org.oasisopen.sca.annotation.Reference; - -public class HelloworldImpl implements Helloworld { - - @Reference - public Helloworld service; - - public String sayHello(String name) { - return "Hi " + service.sayHello(name); - } - -} diff --git a/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index d55aa7ba9c..0000000000 --- a/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite b/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite deleted file mode 100644 index 81a3fa1f2d..0000000000 --- a/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - diff --git a/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-iface/pom.xml b/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-iface/pom.xml deleted file mode 100644 index 7ee22a320d..0000000000 --- a/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-iface/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 2.0-M3 - ../pom.xml - - itest-nodes-helloworld-iface - Apache Tuscany SCA iTest Nodes Helloworld IFaces - - - - org.apache.tuscany.sca - tuscany-sca-api - 2.0-M3 - provided - - - diff --git a/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java b/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java deleted file mode 100644 index d49ebc2cef..0000000000 --- a/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java +++ /dev/null @@ -1,26 +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.nodes; - -public interface Helloworld { - - String sayHello(String name); - -} diff --git a/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-service/pom.xml b/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-service/pom.xml deleted file mode 100644 index 24c4299f35..0000000000 --- a/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-service/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 2.0-M3 - ../pom.xml - - itest-nodes-helloworld-service - Apache Tuscany SCA iTest Nodes Helloworld Service - - - - org.apache.tuscany.sca - itest-nodes-helloworld-iface - 2.0-M3 - - - org.apache.tuscany.sca - tuscany-sca-api - 2.0-M3 - provided - - - org.apache.tuscany.sca - tuscany-sca-api - 2.0-M3 - - - diff --git a/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java b/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java deleted file mode 100644 index 20233b0397..0000000000 --- a/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.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.nodes; - -public class HelloworldImpl implements Helloworld { - - public String sayHello(String name) { - return "Hello " + name; - } - -} diff --git a/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 9c68ffd043..0000000000 --- a/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite b/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite deleted file mode 100644 index 95d78b1983..0000000000 --- a/tags/java/sca/2.0-M3-RC3a/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/tags/java/sca/2.0-M3-RC3a/itest/nodes/one-node-test/pom.xml b/tags/java/sca/2.0-M3-RC3a/itest/nodes/one-node-test/pom.xml deleted file mode 100644 index 2b73398afe..0000000000 --- a/tags/java/sca/2.0-M3-RC3a/itest/nodes/one-node-test/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 2.0-M3 - ../pom.xml - - itest-nodes-one-nodes-test - Apache Tuscany SCA iTest Nodes One Nodes Test - - - - org.apache.tuscany.sca - itest-nodes-helloworld-iface - 2.0-M3 - - - org.apache.tuscany.sca - tuscany-node-impl - 2.0-M3 - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 2.0-M3 - - - diff --git a/tags/java/sca/2.0-M3-RC3a/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java b/tags/java/sca/2.0-M3-RC3a/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java deleted file mode 100644 index 63ddc789db..0000000000 --- a/tags/java/sca/2.0-M3-RC3a/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java +++ /dev/null @@ -1,87 +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 static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.io.File; - -import itest.nodes.Helloworld; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * This shows how to test the Calculator service component. - */ -public class OneNodeTestCase{ - - private static Node node; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - System.setProperty("org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint.enabled", "false"); - NodeFactory factory = NodeFactory.newInstance(); - node = factory.createNode( - new Contribution("service", getJar("../helloworld-service/target")), - new Contribution("client", getJar("../helloworld-client/target"))); - node.start(); - } - - /** - * Get the jar in the target folder without being dependent on the version name to - * make tuscany releases easier - */ - private static String getJar(String targetDirectory) { - File f = new File(targetDirectory); - for (File file : f.listFiles()) { - if (file.getName().endsWith(".jar")) { - return file.toURI().toString(); - } - } - throw new IllegalStateException("Can't find jar in: " + targetDirectory); - } - - @Test - public void testCalculator() throws Exception { - - // Ideally this would use the SCAClient API but leaving that tillwe have the basics working - - Helloworld service = node.getService(Helloworld.class, "HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - - Helloworld client = node.getService(Helloworld.class, "HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (node != null) { - node.stop(); - } - } -} diff --git a/tags/java/sca/2.0-M3-RC3a/itest/nodes/pom.xml b/tags/java/sca/2.0-M3-RC3a/itest/nodes/pom.xml deleted file mode 100644 index 9d153681ed..0000000000 --- a/tags/java/sca/2.0-M3-RC3a/itest/nodes/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 2.0-M3 - ../pom.xml - - pom - itest-nodes - Apache Tuscany SCA iTest Nodes - - - install - - - - helloworld-iface - helloworld-service - helloworld-client - one-node-test - two-nodes-test - - - diff --git a/tags/java/sca/2.0-M3-RC3a/itest/nodes/two-nodes-test/pom.xml b/tags/java/sca/2.0-M3-RC3a/itest/nodes/two-nodes-test/pom.xml deleted file mode 100644 index 6436ea09dc..0000000000 --- a/tags/java/sca/2.0-M3-RC3a/itest/nodes/two-nodes-test/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 2.0-M3 - ../pom.xml - - itest-nodes-two-nodes-test - Apache Tuscany SCA iTest Nodes Two Nodes Test - - - - org.apache.tuscany.sca - itest-nodes-helloworld-iface - 2.0-M3 - - - org.apache.tuscany.sca - tuscany-node-impl - 2.0-M3 - - - org.apache.tuscany.sca - tuscany-sca-client-impl - 2.0-M3 - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 2.0-M3 - - - diff --git a/tags/java/sca/2.0-M3-RC3a/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java b/tags/java/sca/2.0-M3-RC3a/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java deleted file mode 100644 index 8352f70e17..0000000000 --- a/tags/java/sca/2.0-M3-RC3a/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java +++ /dev/null @@ -1,101 +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 static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import itest.nodes.Helloworld; - -import java.io.File; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.oasisopen.sca.client.SCAClient; -import org.oasisopen.sca.client.SCAClientFactory; - -/** - * This shows how to test the Calculator service component. - */ -public class TwoNodesTestCase{ - - private static Node serviceNode; - private static Node clientNode; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - System.setProperty("org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint.enabled", "false"); - NodeFactory factory = NodeFactory.newInstance(); - serviceNode = factory.createNode(new Contribution("service", getJar("../helloworld-service/target"))); - serviceNode.start(); - clientNode = factory.createNode(new Contribution("client", getJar("../helloworld-client/target"))); - clientNode.start(); - } - - /** - * Get the jar in the target folder without being dependent on the version name to - * make tuscany releases easier - */ - private static String getJar(String targetDirectory) { - File f = new File(targetDirectory); - for (File file : f.listFiles()) { - if (file.getName().endsWith(".jar")) { - return file.toURI().toString(); - } - } - throw new IllegalStateException("Can't find jar in: " + targetDirectory); - } - - @Test - public void testCalculator() throws Exception { - Helloworld service = serviceNode.getService(Helloworld.class, "HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - - Helloworld client = clientNode.getService(Helloworld.class, "HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - } - - @Test - public void testCalculatorClientAPI() throws Exception { - SCAClient scaClient = SCAClientFactory.newInstance(); - Helloworld service = scaClient.getService(Helloworld.class, "HelloworldService", null); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - - Helloworld client = scaClient.getService(Helloworld.class, "HelloworldClient", null); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (serviceNode != null) { - serviceNode.stop(); - } - if (clientNode != null) { - clientNode.stop(); - } - } -} -- cgit v1.2.3