Delete previous 1.5 branch thats now old and unused and will be replaced with the current 1.x trunk

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

6 files changed, 0 insertions, 336 deletions

diff --git a/branches/sca-java-1.5/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java b/branches/sca-java-1.5/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java
deleted file mode 100644
index bcf4153064..0000000000
--- a/branches/sca-java-1.5/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-import static junit.framework.Assert.assertEquals;

-

-import org.apache.tuscany.sca.itest.admin.MyService;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-

-

-public class MySimpleServiceInRecursiveTestCase

-{

-    private static MyService myServiceOrg;

-    private static MyService myServiceAnother;

-    private static MyService myServiceCary;

-

-    private static SCADomain domain;

-

-    

-    @Test

-    public void testPropertyDefault()

-    {

-        assertEquals("RTP",myServiceOrg.getLocation());

-        assertEquals("2006",myServiceOrg.getYear());

-    }

-

-   

-    @Test

-    public void testPropertyOverrideValue()

-    {

-        assertEquals("CARY",myServiceCary.getLocation());

-        assertEquals("2007",myServiceCary.getYear());

-    }

-

-   

-    @Test

-    public void testPropertyOverrideVariable()

-    {

-        assertEquals("Durham",myServiceAnother.getLocation());

-        assertEquals("2009",myServiceAnother.getYear());

-    }

-

-

-    @BeforeClass

-    public static void init() throws Exception {

-        try {

-        domain = SCADomain.newInstance("Iteration1Composite.composite");

-        } catch ( Exception e ) { e.printStackTrace(); }

-        

-        myServiceOrg = domain.getService(MyService.class, "MySimpleServiceInRecursive/MyServiceOrig1");

-        myServiceCary = domain.getService(MyService.class, "MySimpleServiceInRecursive/MyServiceCary1");

-        myServiceAnother = domain.getService(MyService.class, "MySimpleServiceInRecursiveAnother/MyServiceNew1");

-    }

-	

-	@AfterClass

-    public static void destroy() throws Exception {

-        domain.close();

-    }

-}

diff --git a/branches/sca-java-1.5/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java b/branches/sca-java-1.5/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
deleted file mode 100644
index 747f71576c..0000000000
--- a/branches/sca-java-1.5/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-import static junit.framework.Assert.assertEquals;

-

-import org.apache.tuscany.sca.itest.admin.MyService;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class MySimpleServiceTestCase

-{

-    private static SCADomain domain;

-    private static MyService myServiceOrg;

-    private static MyService myServiceNew;

-    private static MyService myServiceCary;

-

-	@Test

-    public void testPropertyDefault()

-    {

-        assertEquals("RTP",myServiceOrg.getLocation());

-        assertEquals("2006",myServiceOrg.getYear());

-    }

-

-   

-	 @Test 

-    public void testPropertyOverrideWithValue()

-    {

-        assertEquals("CARY",myServiceCary.getLocation());

-        assertEquals("2007",myServiceCary.getYear());

-    }

-

-    

-	 @Test 

-    public void testPropertyOverrideWithVariable()

-    {

-        assertEquals("Raleigh",myServiceNew.getLocation());

-        assertEquals("2008",myServiceNew.getYear());

-    }

-

-  

-    @BeforeClass

-    public static void init() throws Exception {

-        try {

-        domain = SCADomain.newInstance("MySimpleService.composite");

-        } catch ( Exception e ) { System.out.println("Could not initialize " + e.toString());

-                                e.printStackTrace(); }

-        myServiceOrg = domain.getService(MyService.class, "MyServiceComponentOrig/MyService");

-        myServiceCary = domain.getService(MyService.class, "MyServiceComponentCary2007/MyService");

-		myServiceNew = domain.getService(MyService.class, "MyServiceComponentNew/MyService");

-    }

-	

-    @AfterClass

-    public static void destroy() throws Exception {

-        domain.close();

-    }  

-}

diff --git a/branches/sca-java-1.5/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java b/branches/sca-java-1.5/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
deleted file mode 100644
index 6c2dffb7b4..0000000000
--- a/branches/sca-java-1.5/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.apache.tuscany.sca.itest.admin;

-

-import static junit.framework.Assert.assertEquals;

-

-import org.apache.tuscany.sca.itest.admin.MyTotalService;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class MyTotalServiceTestCase

-{

-    private static MyTotalService myTotalServiceOrg;

-    private static MyTotalService myTotalServiceNew;

-

-   private static SCADomain domain;

-

-	 @Test

-    public void testPropertyDefault()

-    {

-        assertEquals("RTP",myTotalServiceOrg.getLocation());

-        assertEquals("2006",myTotalServiceOrg.getYear());

-    }

-

-    

-	 @Test

-    public void testPropertyOverrideVariable()

-    {

-        assertEquals("Raleigh",myTotalServiceNew.getLocation());

-        assertEquals("2008",myTotalServiceNew.getYear());

-    }

-

-  

-    @BeforeClass

-    public static void init() throws Exception {

-        try {

-        domain = SCADomain.newInstance("Iteration3Composite.composite");

-        } catch ( Exception e ) { e.printStackTrace(); }

-		

-        myTotalServiceOrg =domain.getService(MyTotalService.class, "MyTotalServiceComponent");

-        myTotalServiceNew=domain.getService(MyTotalService.class, "MyTotalServiceNewComponent");

-    }

-	

-    @AfterClass

-    public static void destroy() throws Exception {

-        domain.close();

-    }

-}

diff --git a/branches/sca-java-1.5/itest/admin/src/test/resources/Iteration1Composite.composite b/branches/sca-java-1.5/itest/admin/src/test/resources/Iteration1Composite.composite
deleted file mode 100644
index 95dbbf0124..0000000000
--- a/branches/sca-java-1.5/itest/admin/src/test/resources/Iteration1Composite.composite
+++ /dev/null
@@ -1,43 +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="http://www.osoa.org/xmlns/sca/1.0" 

-       xmlns:foo="http://foo" 

-       xmlns:cust="http://www.example.com/Customer"

-       xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"

-       targetNamespace="http://foo"

-           name="Iteration1Composite" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-

-	<property name="newLocation" type="xs:anyURI">Raleigh</property>

-	<property name="newYear" type="xs:anyURI">2008</property>

-

-	<property name="anotherLocation" type="xs:anyURI">Durham</property>

-	<property name="anotherYear" type="xs:anyURI">2009</property>

-

-    <component name="MySimpleServiceInRecursive">

-        <implementation.composite name="foo:MySimpleService"/>

-    </component>

-

-    <component name="MySimpleServiceInRecursiveAnother">

-        <implementation.composite name="foo:MySimpleService"/>

-        <property name="newLocation">Durham</property>

-        <property name="newYear">2009</property>   

-    </component>

-

-</composite>

diff --git a/branches/sca-java-1.5/itest/admin/src/test/resources/Iteration3Composite.composite b/branches/sca-java-1.5/itest/admin/src/test/resources/Iteration3Composite.composite
deleted file mode 100644
index dd06d030d6..0000000000
--- a/branches/sca-java-1.5/itest/admin/src/test/resources/Iteration3Composite.composite
+++ /dev/null
@@ -1,68 +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="Iteration3Composite"

-    targetNamespace="http://foo" local="true" autowire="false" requires="cns:confidentiality"

-    policySets="sns:secure">

-  <property name="newLocation" type="anyURI">Raleigh</property>

-  <property name="newYear" type="anyURI">2008</property>

- 

- <component name="MyServiceComponentOrig">

-    <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>

-  </component>

- 

- <component name="MyServiceComponentCary2007">

-    <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>

-    <property name="location">CARY</property>

-    <property name="year">2007</property>

-  </component>

- 

- <component name="MyServiceComponentNew">

-    <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>

-    <property name="location" source="$newLocation"/>

-    <property name="year" source="$newYear"/>

-  </component>

- 

- <component name="MyTotalServiceComponent">

-    <implementation.java class="org.apache.tuscany.sca.itest.admin.MyTotalServiceImpl"/>

-    <reference name="myService" target="MyServiceComponentOrig/MyService"/>

-    <reference name="myListService" target="MyServiceComponentOrig/MyListService"/>

-  </component>

- 

- <component name="MyTotalServiceNewComponent">

-    <implementation.java class="org.apache.tuscany.sca.itest.admin.MyTotalServiceImpl"/>

-    <reference name="myService" target="MyServiceComponentNew/MyService"/>

-    <reference name="myListService" target="MyServiceComponentNew/MyListService"/>

-  </component>

-  

-  <property name="anotherLocation" type="anyURI">Durham</property>

-  <property name="anotherYear" type="anyURI">2009</property>

- 

- <component name="MySimpleServiceInRecursive">

-    <implementation.composite name="foo:MySimpleService"/>

-  </component>

-  

-  <component name="MySimpleServiceInRecursiveAnother">

-    <implementation.composite name="foo:MySimpleService"/>

-    <property name="newLocation">Durham</property>

-    <property name="newYear">2009</property>

-  </component>

-</composite>

diff --git a/branches/sca-java-1.5/itest/admin/src/test/resources/MySimpleService.composite b/branches/sca-java-1.5/itest/admin/src/test/resources/MySimpleService.composite
deleted file mode 100644
index a1f8abb8da..0000000000
--- a/branches/sca-java-1.5/itest/admin/src/test/resources/MySimpleService.composite
+++ /dev/null
@@ -1,59 +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="http://www.osoa.org/xmlns/sca/1.0" 

-       xmlns:foo="http://foo" 

-       xmlns:cust="http://www.example.com/Customer"

-       xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"

-       targetNamespace="http://foo"

-           name="MySimpleService" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-

-    <service name="MyServiceCary1" promote="MyServiceComponentCary2007/MyService">

-        <interface.java interface="org.apache.tuscany.sca.itest.admin.MyService"/>

-    </service>

-

-    <service name="MyServiceOrig1" promote="MyServiceComponentOrig/MyService">

-        <interface.java interface="org.apache.tuscany.sca.itest.admin.MyService"/>

-    </service>

-

-    <service name="MyServiceNew1" promote="MyServiceComponentNew/MyService">

-        <interface.java interface="org.apache.tuscany.sca.itest.admin.MyService"/>

-    </service>

-

-	<property name="newLocation" type="anyURI">Raleigh</property>

-	<property name="newYear" type="anyURI">2008</property>

-

-    <component name="MyServiceComponentOrig">

-        <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>

-    </component>

-	

-    <component name="MyServiceComponentCary2007">

-        <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>

-		<property name="location">CARY</property>

-		<property name="year">2007</property>

-    </component>

-

-    <component name="MyServiceComponentNew">

-        <implementation.java class="org.apache.tuscany.sca.itest.admin.MyServiceImpl"/>

-        <property name="location" source="$newLocation"/>

-		<property name="year" source="$newYear"/>

-    </component>

-    

-</composite>