Moving 1.x branches

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

9 files changed, 0 insertions, 411 deletions

diff --git a/branches/sca-java-1.3/itest/recursive-multi-level/pom.xml b/branches/sca-java-1.3/itest/recursive-multi-level/pom.xml
deleted file mode 100644
index e44667b6a5..0000000000
--- a/branches/sca-java-1.3/itest/recursive-multi-level/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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>1.3-SNAPSHOT</version>
-        <!--relativePath>../pom.xml</relativePath-->
-    </parent>
-    <artifactId>itest-recursive-multi-level</artifactId>
-    <name>Apache Tuscany SCA Recusive Multi-Level Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>       
-    </dependencies>
-</project>
diff --git a/branches/sca-java-1.3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java b/branches/sca-java-1.3/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/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/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/branches/sca-java-1.3/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/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/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java b/branches/sca-java-1.3/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/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/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/branches/sca-java-1.3/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/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/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite b/branches/sca-java-1.3/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
deleted file mode 100644
index 975f61c664..0000000000
--- a/branches/sca-java-1.3/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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://www.osoa.org/xmlns/sca/1.0"
-           xmlns:foo="http://foo" 
-           xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-           xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0" 
-           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-1.3/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite b/branches/sca-java-1.3/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
deleted file mode 100644
index f9bbcc76d8..0000000000
--- a/branches/sca-java-1.3/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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://www.osoa.org/xmlns/sca/1.0"
-           xmlns:foo="http://foo" 
-           xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-           xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0" 
-           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-1.3/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite b/branches/sca-java-1.3/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
deleted file mode 100644
index 09fd10fb7e..0000000000
--- a/branches/sca-java-1.3/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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://www.osoa.org/xmlns/sca/1.0"
-           xmlns:foo="http://foo" 
-           xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-           xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0" 
-           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-1.3/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java b/branches/sca-java-1.3/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/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());
-    }
-}