From fd34d4342b95600825720708d7ff6917bba1ee42 Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 27 Jan 2010 09:41:44 +0000 Subject: Java SCA 1.6 RC1 Release Tag git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@903579 13f79535-47bb-0310-9956-ffa450edef68 --- .../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 ++++++++++++++++++++++ 8 files changed, 366 insertions(+) create mode 100644 sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java create mode 100644 sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java create mode 100644 sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java create mode 100644 sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java create mode 100644 sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite create mode 100644 sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite create mode 100644 sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite create mode 100644 sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java (limited to 'sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src') diff --git a/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java b/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java new file mode 100644 index 0000000000..214d4d8a1f --- /dev/null +++ b/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java @@ -0,0 +1,26 @@ +/* + * 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/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java new file mode 100644 index 0000000000..51948a3b81 --- /dev/null +++ b/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java @@ -0,0 +1,48 @@ +/* + * 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/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java b/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java new file mode 100644 index 0000000000..08df8ade17 --- /dev/null +++ b/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java @@ -0,0 +1,25 @@ +/* + * 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/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java new file mode 100644 index 0000000000..2ad9f815f0 --- /dev/null +++ b/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java @@ -0,0 +1,46 @@ +/* + * 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/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite b/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite new file mode 100644 index 0000000000..975f61c664 --- /dev/null +++ b/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite @@ -0,0 +1,52 @@ + + + + + Level 1 + 2001 + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite b/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite new file mode 100644 index 0000000000..f9bbcc76d8 --- /dev/null +++ b/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite @@ -0,0 +1,49 @@ + + + + + Level 2 + 2002 + + + + Default 2 + 1992 + + + + + + + + + + + + + \ No newline at end of file diff --git a/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite b/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite new file mode 100644 index 0000000000..09fd10fb7e --- /dev/null +++ b/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite @@ -0,0 +1,52 @@ + + + + + Level 3 + 2003 + + + + Default 3 + 1993 + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java b/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java new file mode 100644 index 0000000000..d8d6fe0dc5 --- /dev/null +++ b/sca-java-1.x/tags/1.6-RC1/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java @@ -0,0 +1,68 @@ +/* + * 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