From 5e520b1b65c79cd828057cb628b9367acb266880 Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:05:59 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835117 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca-android/vtest/assembly/component/pom.xml | 49 ------- .../sca/vtest/assembly/component/AService.java | 31 ----- .../sca/vtest/assembly/component/BService.java | 29 ---- .../sca/vtest/assembly/component/CService.java | 28 ---- .../assembly/component/impl/AServiceImpl.java | 49 ------- .../assembly/component/impl/BServiceImpl.java | 40 ------ .../assembly/component/impl/CServiceImpl.java | 31 ----- .../src/main/resources/component.composite | 41 ------ .../src/main/resources/nonuniquename.composite | 33 ----- .../src/main/resources/serviceelement.composite | 42 ------ .../main/resources/servicewithbinding.composite | 33 ----- .../main/resources/servicewithinterface.composite | 32 ----- .../src/main/resources/zerocomponents.composite | 26 ---- .../src/main/resources/zeroimplelements.composite | 38 ------ .../assembly/component/ComponentTestCase.java | 150 --------------------- .../sca-android/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 | 40 ------ .../ctypefile/CompomnentTypeFileTestCase.java | 111 --------------- branches/sca-android/vtest/assembly/pom.xml | 69 ---------- 25 files changed, 1128 deletions(-) delete mode 100644 branches/sca-android/vtest/assembly/component/pom.xml delete mode 100644 branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java delete mode 100644 branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java delete mode 100644 branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java delete mode 100644 branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java delete mode 100644 branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java delete mode 100644 branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java delete mode 100644 branches/sca-android/vtest/assembly/component/src/main/resources/component.composite delete mode 100644 branches/sca-android/vtest/assembly/component/src/main/resources/nonuniquename.composite delete mode 100644 branches/sca-android/vtest/assembly/component/src/main/resources/serviceelement.composite delete mode 100644 branches/sca-android/vtest/assembly/component/src/main/resources/servicewithbinding.composite delete mode 100644 branches/sca-android/vtest/assembly/component/src/main/resources/servicewithinterface.composite delete mode 100644 branches/sca-android/vtest/assembly/component/src/main/resources/zerocomponents.composite delete mode 100644 branches/sca-android/vtest/assembly/component/src/main/resources/zeroimplelements.composite delete mode 100644 branches/sca-android/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java delete mode 100644 branches/sca-android/vtest/assembly/ctypefile/pom.xml delete mode 100644 branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java delete mode 100644 branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java delete mode 100644 branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java delete mode 100644 branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java delete mode 100644 branches/sca-android/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType delete mode 100644 branches/sca-android/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType delete mode 100644 branches/sca-android/vtest/assembly/ctypefile/src/main/resources/typefile.composite delete mode 100644 branches/sca-android/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java delete mode 100644 branches/sca-android/vtest/assembly/pom.xml (limited to 'branches/sca-android/vtest/assembly') diff --git a/branches/sca-android/vtest/assembly/component/pom.xml b/branches/sca-android/vtest/assembly/component/pom.xml deleted file mode 100644 index cf38e7ab8e..0000000000 --- a/branches/sca-android/vtest/assembly/component/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - vtest-assembly - 1.4-SNAPSHOT - ../pom.xml - - vtest-assembly-component - - Apache Tuscany SCA Assembly Verification Tests - Component - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.4-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.4-SNAPSHOT - runtime - - - - - - diff --git a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java b/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java deleted file mode 100644 index 592020c180..0000000000 --- a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java +++ /dev/null @@ -1,31 +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 org.apache.tuscany.sca.vtest.assembly.component; - -/** - * Simple Remotable Service - */ -public interface AService { - - public String getState(); - public String getBProperty(); - public String getB2Property(); - - -} diff --git a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java b/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java deleted file mode 100644 index 0d95c8e4b8..0000000000 --- a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java +++ /dev/null @@ -1,29 +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 org.apache.tuscany.sca.vtest.assembly.component; - -/** - * Simple Service - */ -public interface BService { - - public String getState(); - public String getSomeProperty(); - -} diff --git a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java b/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java deleted file mode 100644 index c979c57f31..0000000000 --- a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.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 org.apache.tuscany.sca.vtest.assembly.component; - -/** - * - */ -public interface CService { - - public String getState(); - -} diff --git a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java b/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java deleted file mode 100644 index 8c0d08d052..0000000000 --- a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java +++ /dev/null @@ -1,49 +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 org.apache.tuscany.sca.vtest.assembly.component.impl; - -import org.apache.tuscany.sca.vtest.assembly.component.AService; -import org.apache.tuscany.sca.vtest.assembly.component.BService; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -@Service(AService.class) -public class AServiceImpl implements AService { - - @Reference - protected BService b; - - @Reference - protected BService b2; - - public String getState() { - return b.getState(); - } - - public String getBProperty() { - return b.getSomeProperty(); - } - - public String getB2Property() { - return b2.getSomeProperty(); - } - -} - diff --git a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java b/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java deleted file mode 100644 index 424e245fea..0000000000 --- a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java +++ /dev/null @@ -1,40 +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 org.apache.tuscany.sca.vtest.assembly.component.impl; - -import org.apache.tuscany.sca.vtest.assembly.component.BService; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Service; - -@Service(BService.class) -public class BServiceImpl implements BService { - - @Property - protected String someProperty; - - public String getState() { - return "SomeStateFromB"; - } - - public String getSomeProperty() { - return someProperty; - } - -} diff --git a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java b/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java deleted file mode 100644 index b2b420ed6a..0000000000 --- a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java +++ /dev/null @@ -1,31 +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 org.apache.tuscany.sca.vtest.assembly.component.impl; - -public class CServiceImpl { - - private String state = "Some State"; - - public String getState() { - return state; - } - -} - diff --git a/branches/sca-android/vtest/assembly/component/src/main/resources/component.composite b/branches/sca-android/vtest/assembly/component/src/main/resources/component.composite deleted file mode 100644 index bb452feac9..0000000000 --- a/branches/sca-android/vtest/assembly/component/src/main/resources/component.composite +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - some b component value - - - - - some b2 component value - - - diff --git a/branches/sca-android/vtest/assembly/component/src/main/resources/nonuniquename.composite b/branches/sca-android/vtest/assembly/component/src/main/resources/nonuniquename.composite deleted file mode 100644 index 3019542091..0000000000 --- a/branches/sca-android/vtest/assembly/component/src/main/resources/nonuniquename.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-android/vtest/assembly/component/src/main/resources/serviceelement.composite b/branches/sca-android/vtest/assembly/component/src/main/resources/serviceelement.composite deleted file mode 100644 index 9460f5a2e1..0000000000 --- a/branches/sca-android/vtest/assembly/component/src/main/resources/serviceelement.composite +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - some b component value - - - - - - some b2 component value - - - diff --git a/branches/sca-android/vtest/assembly/component/src/main/resources/servicewithbinding.composite b/branches/sca-android/vtest/assembly/component/src/main/resources/servicewithbinding.composite deleted file mode 100644 index 085d84f40e..0000000000 --- a/branches/sca-android/vtest/assembly/component/src/main/resources/servicewithbinding.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-android/vtest/assembly/component/src/main/resources/servicewithinterface.composite b/branches/sca-android/vtest/assembly/component/src/main/resources/servicewithinterface.composite deleted file mode 100644 index cc915fbde5..0000000000 --- a/branches/sca-android/vtest/assembly/component/src/main/resources/servicewithinterface.composite +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-android/vtest/assembly/component/src/main/resources/zerocomponents.composite b/branches/sca-android/vtest/assembly/component/src/main/resources/zerocomponents.composite deleted file mode 100644 index 6f02d7e941..0000000000 --- a/branches/sca-android/vtest/assembly/component/src/main/resources/zerocomponents.composite +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - diff --git a/branches/sca-android/vtest/assembly/component/src/main/resources/zeroimplelements.composite b/branches/sca-android/vtest/assembly/component/src/main/resources/zeroimplelements.composite deleted file mode 100644 index 8629f3817a..0000000000 --- a/branches/sca-android/vtest/assembly/component/src/main/resources/zeroimplelements.composite +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - some b component value - - - - - some b2 component value - - - diff --git a/branches/sca-android/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java b/branches/sca-android/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java deleted file mode 100644 index de4fbe39ce..0000000000 --- a/branches/sca-android/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java +++ /dev/null @@ -1,150 +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 org.apache.tuscany.sca.vtest.assembly.component; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.vtest.utilities.ServiceFinder; -import org.junit.Ignore; -import org.junit.Test; -import org.osoa.sca.ServiceRuntimeException; - -/** - * - */ -public class ComponentTestCase { - - private void initDomain(String compositePath) { - System.out.println("Setting up"); - ServiceFinder.init(compositePath); - } - - private void cleanupDomain() { - System.out.println("Cleaning up"); - ServiceFinder.cleanup(); - } - - /** - * Lines 92-96: - *

- * Components are configured instances of implementations. Components - * provide and consume services. More than one component can use and - * configure the same implementation, where each component configures the - * implementation differently. - */ - @Test - public void components1() throws Exception { - initDomain("component.composite"); - AService service = ServiceFinder.getService(AService.class, "AComponent/AService"); - Assert.assertEquals("some b component value", service.getBProperty()); - Assert.assertEquals("some b2 component value", service.getB2Property()); - cleanupDomain(); - } - - /** - * Lines 96-97: - *

- * There can be zero or more component elements within a composite. - */ - @Test - public void components2() throws Exception { - initDomain("zerocomponents.composite"); - cleanupDomain(); - } - - /** - * Lines 142-143: - *

- * name (required) – the name of the component. The name must be unique - * across all the components in the composite. - */ - @Test(expected = ServiceRuntimeException.class) - //@Ignore("TUSCANY-2455") - public void components3() throws Exception { - initDomain("nonuniquename.composite"); - cleanupDomain(); - } - - /** - * Lines 154-158: - *

- * A component element has zero or one implementation element as its child, - * which points to the implementation used by the component. A component - * with no implementation element is not runnable, but components of this - * kind may be useful during a "top-down" development process as a means of - * defining the characteristics required of the implementation before the - * implementation is written. - */ - @Test - public void components4() throws Exception { - initDomain("zeroimplelements.composite"); - cleanupDomain(); - } - - /** - * Lines 159-160: - *

- * The component element can have zero or more service elements as children - * which are used to configure the services of the component. - */ - @Test - public void components5() throws Exception { - initDomain("serviceelement.composite"); - cleanupDomain(); - } - - /** - * Lines 174-179: - *

- * A service has zero or one interface, which describes the operations - * provided by the service. The interface is described by an interface - * element which is a child element of the service element. If no interface - * is specified, then the interface specified for the service by the - * implementation is in effect. If an interface is specified it must provide - * a compatible subset of the interface provided by the implementation, i.e. - * provide a subset of the operations defined by the implementation for the - * service. - */ - @Test - public void components6() throws Exception { - initDomain("servicewithinterface.composite"); - CService service = ServiceFinder.getService(CService.class, "CComponent"); - Assert.assertEquals("Some State", service.getState()); - cleanupDomain(); - } - - /** - * Lines 180-182: - *

- * A service element has one or more binding elements as children. If no - * bindings are specified, then the bindings specified for the service by - * the implementation are in effect. If bindings are specified, then those - * bindings override the bindings specified by the implementation. - */ - @Test - public void components7() throws Exception { - initDomain("servicewithbinding.composite"); - CService service = ServiceFinder.getService(CService.class, "CComponent"); - Assert.assertEquals("Some State", service.getState()); - cleanupDomain(); - } - - -} diff --git a/branches/sca-android/vtest/assembly/ctypefile/pom.xml b/branches/sca-android/vtest/assembly/ctypefile/pom.xml deleted file mode 100644 index f1e2b3ba80..0000000000 --- a/branches/sca-android/vtest/assembly/ctypefile/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - vtest-assembly - 1.4-SNAPSHOT - ../pom.xml - - vtest-assembly-ctypefile - - Apache Tuscany SCA Assembly Verification Tests - Component Type File - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.4-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.4-SNAPSHOT - runtime - - - - - - diff --git a/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java b/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java deleted file mode 100644 index d1df390ace..0000000000 --- a/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java +++ /dev/null @@ -1,30 +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 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/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java b/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java deleted file mode 100644 index 8ee18b242f..0000000000 --- a/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java +++ /dev/null @@ -1,29 +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 org.apache.tuscany.sca.vtest.assembly.ctypefile; - -/** - * Simple Service - */ -public interface BService { - - public String getState(); - public String getSomeProperty(); - -} diff --git a/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java b/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java deleted file mode 100644 index 0f24201970..0000000000 --- a/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java +++ /dev/null @@ -1,53 +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 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/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java b/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java deleted file mode 100644 index fd32cb1f9b..0000000000 --- a/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java +++ /dev/null @@ -1,37 +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 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/branches/sca-android/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType b/branches/sca-android/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType deleted file mode 100644 index 173203ae21..0000000000 --- a/branches/sca-android/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-android/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType b/branches/sca-android/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType deleted file mode 100644 index c6a0f274c4..0000000000 --- a/branches/sca-android/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - componentTypeValue - - - \ No newline at end of file diff --git a/branches/sca-android/vtest/assembly/ctypefile/src/main/resources/typefile.composite b/branches/sca-android/vtest/assembly/ctypefile/src/main/resources/typefile.composite deleted file mode 100644 index 889bb846ba..0000000000 --- a/branches/sca-android/vtest/assembly/ctypefile/src/main/resources/typefile.composite +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - compositeValue - - - - - diff --git a/branches/sca-android/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java b/branches/sca-android/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java deleted file mode 100644 index f8f7e45f61..0000000000 --- a/branches/sca-android/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java +++ /dev/null @@ -1,111 +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 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.Test; - -/** - * - */ -public class CompomnentTypeFileTestCase { - - protected static String compositeName = "typefile.composite"; - protected static AService aService = null; - protected static BService bService2 = null; - - @BeforeClass - public static void init() throws Exception { - try { - System.out.println("Setting up"); - ServiceFinder.init(compositeName); - aService = ServiceFinder.getService(AService.class, "AComponent/AService"); - bService2 = ServiceFinder.getService(BService.class, "BComponent2/BService"); - } 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 - public void typeFile3() throws Exception { - Assert.assertEquals("compositeValue", aService.getBProperty()); - } - - public void typeFile31() throws Exception { - Assert.assertEquals("componentTypeValue", bService2.getSomeProperty()); - } - -} diff --git a/branches/sca-android/vtest/assembly/pom.xml b/branches/sca-android/vtest/assembly/pom.xml deleted file mode 100644 index 9a907402bf..0000000000 --- a/branches/sca-android/vtest/assembly/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-vtest - 1.4-SNAPSHOT - ../pom.xml - - vtest-assembly - pom - Apache Tuscany SCA Assembly Verification Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.4-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.4-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - vtest-utilities - 1.4-SNAPSHOT - runtime - - - - - - - - default - - true - - - ctypefile - component - - - - - -- cgit v1.2.3