From e0ff67c0b32813ea48734c770a5ffc1952644e29 Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:08:02 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835128 13f79535-47bb-0310-9956-ffa450edef68 --- .../itest/recursive-multi-level/pom.xml | 45 -------------- .../main/java/mysca/test/myservice/MyService.java | 26 --------- .../java/mysca/test/myservice/MyServiceImpl.java | 48 --------------- .../mysca/test/myservice/MySimpleTotalService.java | 25 -------- .../test/myservice/MySimpleTotalServiceImpl.java | 46 --------------- .../src/main/resources/TotalService1Auto.composite | 52 ----------------- .../src/main/resources/TotalService2Auto.composite | 49 ---------------- .../src/main/resources/TotalService3Auto.composite | 52 ----------------- .../java/test/sca/tests/MultiLevelTestCase.java | 68 ---------------------- 9 files changed, 411 deletions(-) delete mode 100644 branches/sca-java-1.3.1/itest/recursive-multi-level/pom.xml delete mode 100644 branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java delete mode 100644 branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java delete mode 100644 branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java delete mode 100644 branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java delete mode 100644 branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite delete mode 100644 branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite delete mode 100644 branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite delete mode 100644 branches/sca-java-1.3.1/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java (limited to 'branches/sca-java-1.3.1/itest/recursive-multi-level') diff --git a/branches/sca-java-1.3.1/itest/recursive-multi-level/pom.xml b/branches/sca-java-1.3.1/itest/recursive-multi-level/pom.xml deleted file mode 100644 index 2e878262ed..0000000000 --- a/branches/sca-java-1.3.1/itest/recursive-multi-level/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.3.1-SNAPSHOT - - - itest-recursive-multi-level - Apache Tuscany SCA Recusive Multi-Level Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.3.1-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.3.1-SNAPSHOT - runtime - - - diff --git a/branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java b/branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java deleted file mode 100644 index 214d4d8a1f..0000000000 --- a/branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.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 mysca.test.myservice; - - -public interface MyService { - String getLocation(); - String getYear(); -} diff --git a/branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java deleted file mode 100644 index 51948a3b81..0000000000 --- a/branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java +++ /dev/null @@ -1,48 +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 mysca.test.myservice; - -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Service; - -import mysca.test.myservice.MyService; - -@Service(MyService.class) -public class MyServiceImpl implements MyService { - - @Property(name="location") - protected String location = "ABC"; - - @Property(name="year") - protected String year = "2006"; - - - public String getLocation() - { - return location; - } - - public String getYear() - { - return year; - } - - -} diff --git a/branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java b/branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java deleted file mode 100644 index 08df8ade17..0000000000 --- a/branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java +++ /dev/null @@ -1,25 +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 mysca.test.myservice; - -public interface MySimpleTotalService { - String getLocation(); - String getYear(); -} diff --git a/branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java deleted file mode 100644 index 2ad9f815f0..0000000000 --- a/branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java +++ /dev/null @@ -1,46 +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 mysca.test.myservice; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -import mysca.test.myservice.MyService; -import mysca.test.myservice.MySimpleTotalService; - -@Service(MySimpleTotalService.class) -public class MySimpleTotalServiceImpl implements MySimpleTotalService -{ - // default required==true so it is 1:1 - @Reference - public MyService myService; - - - public String getLocation() - { - return myService.getLocation(); - } - - public String getYear() - { - return myService.getYear(); - } - -} diff --git a/branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite b/branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite deleted file mode 100644 index 975f61c664..0000000000 --- a/branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite +++ /dev/null @@ -1,52 +0,0 @@ - - - - - Level 1 - 2001 - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite b/branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite deleted file mode 100644 index f9bbcc76d8..0000000000 --- a/branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite +++ /dev/null @@ -1,49 +0,0 @@ - - - - - Level 2 - 2002 - - - - Default 2 - 1992 - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite b/branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite deleted file mode 100644 index 09fd10fb7e..0000000000 --- a/branches/sca-java-1.3.1/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite +++ /dev/null @@ -1,52 +0,0 @@ - - - - - Level 3 - 2003 - - - - Default 3 - 1993 - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.3.1/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java b/branches/sca-java-1.3.1/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java deleted file mode 100644 index d8d6fe0dc5..0000000000 --- a/branches/sca-java-1.3.1/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java +++ /dev/null @@ -1,68 +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.sca.tests; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -import mysca.test.myservice.MySimpleTotalService; -import junit.framework.TestCase; - - -/** - * Tests to make sure that autowiring and recusive composite work together - * - */ -public class MultiLevelTestCase extends TestCase -{ - private SCADomain domain1; - private SCADomain domain2; - private SCADomain domain3; - private MySimpleTotalService myService1; - private MySimpleTotalService myService2; - private MySimpleTotalService myService3; - - protected void setUp() throws Exception { - super.setUp(); - domain1 = SCADomain.newInstance("TotalService1Auto.composite"); - domain2 = SCADomain.newInstance("TotalService2Auto.composite"); - domain3 = SCADomain.newInstance("TotalService3Auto.composite"); - - myService1 = domain1.getService(MySimpleTotalService.class, "TotalServiceComponentLevel1Auto"); - myService2 = domain2.getService(MySimpleTotalService.class, "TotalServiceInRecursive2Auto/MyServiceLevel1Auto"); - myService3 = domain3.getService(MySimpleTotalService.class, "TotalServiceInRecursive3Auto/MyServiceLevel2Auto"); - } - - public void testLevel1() - { - assertEquals("Level 1",myService1.getLocation()); - assertEquals("2001",myService1.getYear()); - } - - public void testLevel2() - { - assertEquals("Default 2",myService2.getLocation()); - assertEquals("1992",myService2.getYear()); - } - - public void testLevel3() - { - assertEquals("Default 3",myService3.getLocation()); - assertEquals("1993",myService3.getYear()); - } -} -- cgit v1.2.3