From a3c48da9bb8971497d414f86e352123d95b9c3da Mon Sep 17 00:00:00 2001 From: lresende Date: Fri, 20 Nov 2009 23:53:35 +0000 Subject: Moving 2.x trunk git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@882795 13f79535-47bb-0310-9956-ffa450edef68 --- java/sca/itest/domains/helloworld/pom.xml | 83 ---------------------- .../src/main/java/itest/HelloworldImpl.java | 38 ---------- .../main/resources/META-INF/sca-contribution.xml | 23 ------ .../src/main/resources/helloworld.composite | 29 -------- java/sca/itest/domains/interfaces/pom.xml | 51 ------------- .../interfaces/src/main/java/itest/Helloworld.java | 28 -------- java/sca/itest/domains/pom.xml | 37 ---------- java/sca/itest/domains/standalone/pom.xml | 57 --------------- .../src/test/java/itest/StandaloneTestCase.java | 66 ----------------- 9 files changed, 412 deletions(-) delete mode 100644 java/sca/itest/domains/helloworld/pom.xml delete mode 100644 java/sca/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java delete mode 100644 java/sca/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 java/sca/itest/domains/helloworld/src/main/resources/helloworld.composite delete mode 100644 java/sca/itest/domains/interfaces/pom.xml delete mode 100644 java/sca/itest/domains/interfaces/src/main/java/itest/Helloworld.java delete mode 100644 java/sca/itest/domains/pom.xml delete mode 100644 java/sca/itest/domains/standalone/pom.xml delete mode 100644 java/sca/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java (limited to 'java/sca/itest/domains') diff --git a/java/sca/itest/domains/helloworld/pom.xml b/java/sca/itest/domains/helloworld/pom.xml deleted file mode 100644 index 9100fa05c6..0000000000 --- a/java/sca/itest/domains/helloworld/pom.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 2.0-SNAPSHOT - ../pom.xml - - itest-domains-helloworld - Apache Tuscany SCA itest domain helloworld - - - - org.apache.tuscany.sca - tuscany-sca-api - 2.0-SNAPSHOT - provided - - - org.apache.tuscany.sca - itest-domain-interfaces - 2.0-SNAPSHOT - - - junit - junit - 4.5 - test - - - - - ${artifactId} - - - maven-assembly-plugin - 2.2-beta-3 - - - org.apache.tuscany.sca - tuscany-zip-contribution-descriptor - 2.0-SNAPSHOT - - - - - make-assembly - package - - single - - - false - - tuscany-zip-contribution.xml - - - - - - - - - diff --git a/java/sca/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java b/java/sca/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java deleted file mode 100644 index 2a10b3fb77..0000000000 --- a/java/sca/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.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 itest.Helloworld; - -import org.oasisopen.sca.annotation.EagerInit; -import org.oasisopen.sca.annotation.Init; -import org.oasisopen.sca.annotation.Scope; - -@Scope("COMPOSITE") @EagerInit -public class HelloworldImpl implements Helloworld { - - public String sayHello(String name) { - return "Hello " + name; - } - - @Init - public void init() { - System.out.println(sayHello("world")); - } -} diff --git a/java/sca/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml b/java/sca/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index b46cb2baca..0000000000 --- a/java/sca/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/java/sca/itest/domains/helloworld/src/main/resources/helloworld.composite b/java/sca/itest/domains/helloworld/src/main/resources/helloworld.composite deleted file mode 100644 index 0834265186..0000000000 --- a/java/sca/itest/domains/helloworld/src/main/resources/helloworld.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - diff --git a/java/sca/itest/domains/interfaces/pom.xml b/java/sca/itest/domains/interfaces/pom.xml deleted file mode 100644 index 9e5a082f59..0000000000 --- a/java/sca/itest/domains/interfaces/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 2.0-SNAPSHOT - ../pom.xml - - itest-domains-interfaces - Apache Tuscany SCA itest domain interfaces - - - - org.apache.tuscany.sca - tuscany-sca-api - 2.0-SNAPSHOT - provided - - - - junit - junit - 4.5 - test - - - - - - ${artifactId} - - diff --git a/java/sca/itest/domains/interfaces/src/main/java/itest/Helloworld.java b/java/sca/itest/domains/interfaces/src/main/java/itest/Helloworld.java deleted file mode 100644 index f764bc8358..0000000000 --- a/java/sca/itest/domains/interfaces/src/main/java/itest/Helloworld.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 Helloworld { - - String sayHello(String name); - -} diff --git a/java/sca/itest/domains/pom.xml b/java/sca/itest/domains/pom.xml deleted file mode 100644 index ab07312f62..0000000000 --- a/java/sca/itest/domains/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 2.0-SNAPSHOT - ../pom.xml - - itest-domains - pom - Apache Tuscany SCA Domians Integration Tests - - - interfaces - helloworld - standalone - - diff --git a/java/sca/itest/domains/standalone/pom.xml b/java/sca/itest/domains/standalone/pom.xml deleted file mode 100644 index be441d2945..0000000000 --- a/java/sca/itest/domains/standalone/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-sca - 2.0-SNAPSHOT - ../../pom.xml - - itest-domains-standalone - Apache Tuscany SCA itest domain standalone - - - - org.apache.tuscany.sca - tuscany-domain-node - 2.0-SNAPSHOT - - - - - org.apache.tuscany.sca - tuscany-sca-client-impl - 2.0-SNAPSHOT - - - junit - junit - 4.5 - test - - - - - - ${artifactId} - - - diff --git a/java/sca/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java b/java/sca/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java deleted file mode 100644 index 0fbcc98a96..0000000000 --- a/java/sca/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java +++ /dev/null @@ -1,66 +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 org.apache.tuscany.sca.domain.node.DomainNode; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * This shows how to test the Calculator service component. - */ -public class StandaloneTestCase{ - - private static DomainNode node; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - node = new DomainNode(); - node.addContribution("../helloworld/target/itest-domains-helloworld.zip"); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - node.stop(); - } - - @Test - public void testServices() throws Exception { - assertEquals(1, node.getServiceNames().size()); - assertEquals("HelloworldComponent/Helloworld", node.getServiceNames().get(0)); - } - - @Test - public void testDuplicateComponents() throws Exception { - try { - node.addContribution("../helloworld/target/itest-domains-helloworld.zip", "dup"); - } catch (Exception e) { - e.printStackTrace(); - } - - // verify the old one is still there - // TODO: doesn't work correctly yet -// assertEquals(1, node.getServiceNames().size()); -// assertEquals("HelloworldComponent/Helloworld", node.getServiceNames().get(0)); - } - -} -- cgit v1.2.3