From bdd0a41aed7edf21ec2a65cfa17a86af2ef8c48a Mon Sep 17 00:00:00 2001 From: dims Date: Tue, 17 Jun 2008 00:23:01 +0000 Subject: Move Tuscany from Incubator to top level. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@668359 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/sca-node/vtest/assembly/ctypefile/pom.xml | 49 ++++++++++ .../sca/vtest/assembly/ctypefile/AService.java | 30 ++++++ .../sca/vtest/assembly/ctypefile/BService.java | 29 ++++++ .../assembly/ctypefile/impl/AServiceImpl.java | 53 ++++++++++ .../assembly/ctypefile/impl/BServiceImpl.java | 37 +++++++ .../ctypefile/impl/AServiceImpl.componentType | 30 ++++++ .../ctypefile/impl/BServiceImpl.componentType | 28 ++++++ .../src/main/resources/typefile.composite | 36 +++++++ .../ctypefile/CompomnentTypeFileTestCase.java | 107 +++++++++++++++++++++ .../sebastien/java/sca-node/vtest/assembly/pom.xml | 68 +++++++++++++ 10 files changed, 467 insertions(+) create mode 100644 sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/pom.xml create mode 100644 sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java create mode 100644 sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java create mode 100644 sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java create mode 100644 sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java create mode 100644 sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType create mode 100644 sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType create mode 100644 sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/resources/typefile.composite create mode 100644 sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java create mode 100644 sandbox/sebastien/java/sca-node/vtest/assembly/pom.xml (limited to 'sandbox/sebastien/java/sca-node/vtest/assembly') diff --git a/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/pom.xml b/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/pom.xml new file mode 100644 index 0000000000..89a1e8bafd --- /dev/null +++ b/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/pom.xml @@ -0,0 +1,49 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + vtest-assembly + 2.0-incubating-SNAPSHOT + ../pom.xml + + vtest-assembly-ctypefile + + Apache Tuscany SCA Assembly Verification Tests - Component Type File + + + + org.apache.tuscany.sca + tuscany-host-embedded + 2.0-incubating-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-implementation-java-runtime + 2.0-incubating-SNAPSHOT + runtime + + + + + + diff --git a/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java b/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java new file mode 100644 index 0000000000..d1df390ace --- /dev/null +++ b/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java @@ -0,0 +1,30 @@ +/* + * 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 org.apache.tuscany.sca.vtest.assembly.ctypefile; + +/** + * Simple Remotable Service + */ +public interface AService { + + public String getState(); + public String getState2(); + public String getBProperty(); + +} diff --git a/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java b/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java new file mode 100644 index 0000000000..8ee18b242f --- /dev/null +++ b/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java @@ -0,0 +1,29 @@ +/* + * 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 org.apache.tuscany.sca.vtest.assembly.ctypefile; + +/** + * Simple Service + */ +public interface BService { + + public String getState(); + public String getSomeProperty(); + +} diff --git a/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java b/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java new file mode 100644 index 0000000000..0f24201970 --- /dev/null +++ b/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java @@ -0,0 +1,53 @@ +/* + * 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 org.apache.tuscany.sca.vtest.assembly.ctypefile.impl; + +import org.apache.tuscany.sca.vtest.assembly.ctypefile.AService; +import org.apache.tuscany.sca.vtest.assembly.ctypefile.BService; +import org.osoa.sca.annotations.Reference; + +public class AServiceImpl implements AService { + + private BService bService; + private BService b2Service; + + public void setBService(BService b) { + this.bService = b; + } + + @Reference + public void setB2Service(BService b) { + this.b2Service = b; + } + + public String getState() { + return bService.getState(); + } + + public String getState2() { + return b2Service.getState(); + } + + public String getBProperty() { + return bService.getSomeProperty(); + } + +} + diff --git a/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java b/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java new file mode 100644 index 0000000000..fd32cb1f9b --- /dev/null +++ b/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java @@ -0,0 +1,37 @@ +/* + * 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 org.apache.tuscany.sca.vtest.assembly.ctypefile.impl; + +import org.apache.tuscany.sca.vtest.assembly.ctypefile.BService; + +public class BServiceImpl implements BService { + + //@Property + protected String someProperty; + + public String getState() { + return "SomeStateFromB"; + } + + public String getSomeProperty() { + return someProperty; + } + +} diff --git a/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType b/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType new file mode 100644 index 0000000000..173203ae21 --- /dev/null +++ b/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType @@ -0,0 +1,30 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType b/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType new file mode 100644 index 0000000000..360c31b8e2 --- /dev/null +++ b/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType @@ -0,0 +1,28 @@ + + + + + + + + SomePropertyValue + + + \ No newline at end of file diff --git a/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/resources/typefile.composite b/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/resources/typefile.composite new file mode 100644 index 0000000000..3a70a1a977 --- /dev/null +++ b/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/main/resources/typefile.composite @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + diff --git a/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java b/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java new file mode 100644 index 0000000000..ff0f9ebee7 --- /dev/null +++ b/sandbox/sebastien/java/sca-node/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java @@ -0,0 +1,107 @@ +/* + * 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 org.apache.tuscany.sca.vtest.assembly.ctypefile; + +import junit.framework.Assert; + +import org.apache.tuscany.sca.vtest.utilities.ServiceFinder; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Ignore; +import org.junit.Test; + +/** + * + */ +public class CompomnentTypeFileTestCase { + + protected static String compositeName = "typefile.composite"; + protected static AService aService = null; + + @BeforeClass + public static void init() throws Exception { + try { + System.out.println("Setting up"); + ServiceFinder.init(compositeName); + aService = ServiceFinder.getService(AService.class, "AComponent/AService"); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + @AfterClass + public static void destroy() throws Exception { + + System.out.println("Cleaning up"); + ServiceFinder.cleanup(); + + } + + /** + * Lines 435-439: + *

+ * Step two covers the cases where introspection of the implementation is + * not possible or where it does not provide complete information and it + * involves looking for an SCA component type file. Component type + * information found in the component type file must be compatible with the + * equivalent information found from inspection of the implementation. + *

+ * Lines 441-444: + *

+ * In the ideal case, the component type information is determined by + * inspecting the implementation, for example as code annotations. The + * component type file provides a mechanism for the provision of component + * type information for implementation types where the information cannot be + * determined by inspecting the implementation. + */ + @Test + public void typeFile1() throws Exception { + Assert.assertSame("SomeStateFromB", aService.getState()); + } + + /** + * Lines 439-449: + *

+ * The component type file can specify partial information, with the + * remainder being derived from the implementation. + *

+ * The first test makes use of the reference to b which is provided by the + * type file. The second test makes use of the reference to b2 which is + * provided via annotation + */ + @Test + public void typeFile2() throws Exception { + Assert.assertSame("SomeStateFromB", aService.getState()); + Assert.assertSame("SomeStateFromB", aService.getState2()); + } + + /** + * Lines 450-451: + *

+ * The componentType element can contain Service elements, Reference + * elements and Property elements. + */ + @Test + @Ignore("TUSCANY-2390") + public void typeFile3() throws Exception { + Assert.assertEquals("SomePropertyValue", aService.getBProperty()); + } + +} diff --git a/sandbox/sebastien/java/sca-node/vtest/assembly/pom.xml b/sandbox/sebastien/java/sca-node/vtest/assembly/pom.xml new file mode 100644 index 0000000000..9c8a199e83 --- /dev/null +++ b/sandbox/sebastien/java/sca-node/vtest/assembly/pom.xml @@ -0,0 +1,68 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-vtest + 2.0-incubating-SNAPSHOT + ../pom.xml + + vtest-assembly + pom + Apache Tuscany SCA Assembly Verification Tests + + + + org.apache.tuscany.sca + tuscany-host-embedded + 2.0-incubating-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-implementation-java-runtime + 2.0-incubating-SNAPSHOT + runtime + + + + org.apache.tuscany.sca + vtest-utilities + 2.0-incubating-SNAPSHOT + runtime + + + + + + + + default + + true + + + ctypefile + + + + + -- cgit v1.2.3