Create 2.0-M4 release branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@831226 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 437 insertions, 0 deletions

diff --git a/branches/sca-java-2.0-M4/itest/recursive-multi-level/pom.xml b/branches/sca-java-2.0-M4/itest/recursive-multi-level/pom.xml
new file mode 100644
index 0000000000..c82860fb74
--- /dev/null
+++ b/branches/sca-java-2.0-M4/itest/recursive-multi-level/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * 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.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>2.0-M4-SNAPSHOT</version>
+        <!--relativePath>../pom.xml</relativePath-->
+    </parent>
+    <artifactId>itest-recursive-multi-level</artifactId>
+    <name>Apache Tuscany SCA iTest Recusive Multi-Level</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-api</artifactId>
+            <version>2.0-M4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>2.0-M4-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>2.0-M4-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <!-- XPathFactory -->
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+            <version>2.7.1</version>
+            <scope>test</scope>
+        </dependency>
+        
+    </dependencies>
+</project>
diff --git a/branches/sca-java-2.0-M4/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java b/branches/sca-java-2.0-M4/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
new file mode 100644
index 0000000000..986c8305dd
--- /dev/null
+++ b/branches/sca-java-2.0-M4/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/branches/sca-java-2.0-M4/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/branches/sca-java-2.0-M4/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
new file mode 100644
index 0000000000..6cad998042
--- /dev/null
+++ b/branches/sca-java-2.0-M4/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
@@ -0,0 +1,42 @@
+/*
+ * 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.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Service;
+
+@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-2.0-M4/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java b/branches/sca-java-2.0-M4/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
new file mode 100644
index 0000000000..261eff2584
--- /dev/null
+++ b/branches/sca-java-2.0-M4/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.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 MySimpleTotalService {
+    String getLocation();
+
+    String getYear();
+}
diff --git a/branches/sca-java-2.0-M4/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/branches/sca-java-2.0-M4/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
new file mode 100644
index 0000000000..f3c9280f96
--- /dev/null
+++ b/branches/sca-java-2.0-M4/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
@@ -0,0 +1,39 @@
+/*
+ * 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.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
+
+@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-2.0-M4/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite b/branches/sca-java-2.0-M4/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
new file mode 100644
index 0000000000..090bc49a41
--- /dev/null
+++ b/branches/sca-java-2.0-M4/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.    
+ -->
+<composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+           xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+           xmlns:foo="http://foo" 
+           xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+           xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200903 http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+           name="TotalComposite1Auto"
+           targetNamespace="http://foo" 
+           local="true" 
+           autowire="false">
+
+    <property name="newLocation" type="xsd:anyURI">Level 1</property>
+    <property name="newYear" type="xsd:anyURI">2001</property>
+
+    <component name="ServiceComponentLevel1Auto">
+        <implementation.java class="mysca.test.myservice.MyServiceImpl"/>
+        <property name="location" source="$newLocation"/>
+        <property name="year" source="$newYear"/>
+    </component>
+
+    <service name="MyServiceLevel1Auto" promote="TotalServiceComponentLevel1Auto/MySimpleTotalService">
+        <interface.java interface="mysca.test.myservice.MySimpleTotalService"/>
+    </service>
+    
+    <component name="TotalServiceComponentLevel1Auto">
+        <implementation.java class="mysca.test.myservice.MySimpleTotalServiceImpl"/>
+        <reference name="myService" autowire="true"/>
+    </component>
+
+    <reference name="myServiceReference1Auto" promote="TotalServiceComponentLevel1Auto/myService">
+        <interface.java interface="mysca.test.myservice.MyService"/>
+   </reference>
+</composite>
+
diff --git a/branches/sca-java-2.0-M4/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite b/branches/sca-java-2.0-M4/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
new file mode 100644
index 0000000000..8c1a9a2f72
--- /dev/null
+++ b/branches/sca-java-2.0-M4/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.    
+ -->
+<composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+           xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+           xmlns:foo="http://foo" 
+           xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+           xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200903 http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+           name="TotalComposite2Auto"
+           targetNamespace="http://foo" 
+           local="true" 
+           autowire="false">
+    
+    <property name="newLocation" type="xsd:anyURI">Level 2</property>
+    <property name="newYear" type="xsd:anyURI">2002</property>
+  
+    <component name="ServiceComponentLevel2Auto">
+        <implementation.java class="mysca.test.myservice.MyServiceImpl"/>
+        <property name="location">Default 2</property>
+        <property name="year">1992</property>
+    </component>
+  
+    <service name="MyServiceLevel2Auto" promote="TotalServiceInRecursive2Auto/MyServiceLevel1Auto"/>
+  
+    <component name="TotalServiceInRecursive2Auto">
+        <implementation.composite name="foo:TotalComposite1Auto"/>
+        <reference name="myServiceReference1Auto" autowire="true"/>
+        <property name="newLocation" source="$newLocation"/>
+        <property name="newYear" source="$newYear"/>
+    </component>
+  
+    <reference name="myServiceReference2Auto" promote="TotalServiceInRecursive2Auto/myServiceReference1Auto"/>
+</composite>
\ No newline at end of file
diff --git a/branches/sca-java-2.0-M4/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite b/branches/sca-java-2.0-M4/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
new file mode 100644
index 0000000000..884a8b0a96
--- /dev/null
+++ b/branches/sca-java-2.0-M4/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.    
+ -->
+<composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+           xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+           xmlns:foo="http://foo" 
+           xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+           xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200903 http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+           name="TotalComposite3Auto"
+           targetNamespace="http://foo" 
+           local="true" 
+           autowire="false">
+
+    <property name="newLocation" type="xsd:anyURI">Level 3</property>
+    <property name="newYear" type="xsd:anyURI">2003</property>
+
+    <component name="ServiceComponentLevel3Auto">
+        <implementation.java class="mysca.test.myservice.MyServiceImpl"/>
+        <property name="location">Default 3</property>
+        <property name="year">1993</property>
+    </component>
+  
+    <service name="MyServiceLevel3Auto" promote="TotalServiceInRecursive3Auto/MyServiceLevel2Auto">
+    </service>
+
+    <component name="TotalServiceInRecursive3Auto" autowire="true">
+        <implementation.composite name="foo:TotalComposite2Auto"/>
+        <reference name="myServiceReference2Auto"/>
+        <property name="newLocation" source="$newLocation"/>
+        <property name="newYear" source="$newYear"/>
+    </component>
+    
+    <reference name="myServiceReference3Auto" promote="TotalServiceInRecursive3Auto/myServiceReference2Auto">
+    </reference>
+
+</composite>
\ No newline at end of file
diff --git a/branches/sca-java-2.0-M4/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java b/branches/sca-java-2.0-M4/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
new file mode 100644
index 0000000000..b9b4e3ba7c
--- /dev/null
+++ b/branches/sca-java-2.0-M4/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
@@ -0,0 +1,90 @@
+/*
+ * 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 static org.junit.Assert.assertEquals;
+import mysca.test.myservice.MySimpleTotalService;
+
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * Tests to make sure that autowiring and recusive composite work together
+ *
+ */
+public class MultiLevelTestCase {
+    private static Node node1;
+    private static Node node2;
+    private static Node node3;
+    private static MySimpleTotalService myService1;
+    private static MySimpleTotalService myService2;
+    private static MySimpleTotalService myService3;
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        String location = ContributionLocationHelper.getContributionLocation("TotalService1Auto.composite");
+        Contribution contribution = new Contribution("c1", location);
+        try {
+            node1 = NodeFactory.newInstance().createNode("TotalService1Auto.composite", contribution);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        node2 = NodeFactory.newInstance().createNode("TotalService2Auto.composite", contribution);
+        node3 = NodeFactory.newInstance().createNode("TotalService3Auto.composite", contribution);
+        
+        node1.start();
+        node2.start();
+        node3.start();
+
+        myService1 = node1.getService(MySimpleTotalService.class, "TotalServiceComponentLevel1Auto");
+        myService2 = node2.getService(MySimpleTotalService.class, "TotalServiceInRecursive2Auto/MyServiceLevel1Auto");
+        myService3 = node3.getService(MySimpleTotalService.class, "TotalServiceInRecursive3Auto/MyServiceLevel2Auto");
+    }
+
+    @Test
+    public void testLevel1() {
+        assertEquals("Level 1", myService1.getLocation());
+        assertEquals("2001", myService1.getYear());
+    }
+
+    @Test
+    public void testLevel2() {
+        assertEquals("Default 2", myService2.getLocation());
+        assertEquals("1992", myService2.getYear());
+    }
+
+    @Test
+    public void testLevel3() {
+        assertEquals("Default 3", myService3.getLocation());
+        assertEquals("1993", myService3.getYear());
+    }
+    
+    @AfterClass
+    public static void tearDown() {
+        node1.stop();
+        node2.stop();
+        node3.stop();
+    }
+}