From 4e13586bc791d71c41760cf4d0a5cc908973de3e Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 11 Nov 2009 23:09:18 +0000
Subject: Moving 2.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835134 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/java/mysca/test/myservice/MyService.java  | 26 -----------
 .../java/mysca/test/myservice/MyServiceImpl.java   | 42 -----------------
 .../mysca/test/myservice/MySimpleTotalService.java | 26 -----------
 .../test/myservice/MySimpleTotalServiceImpl.java   | 39 ----------------
 .../src/main/resources/TotalService1Auto.composite | 52 ----------------------
 .../src/main/resources/TotalService2Auto.composite | 49 --------------------
 .../src/main/resources/TotalService3Auto.composite | 52 ----------------------
 7 files changed, 286 deletions(-)
 delete mode 100644 branches/sca-java-2.0-M2/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
 delete mode 100644 branches/sca-java-2.0-M2/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
 delete mode 100644 branches/sca-java-2.0-M2/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
 delete mode 100644 branches/sca-java-2.0-M2/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
 delete mode 100644 branches/sca-java-2.0-M2/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
 delete mode 100644 branches/sca-java-2.0-M2/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
 delete mode 100644 branches/sca-java-2.0-M2/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite

(limited to 'branches/sca-java-2.0-M2/itest/recursive-multi-level/src/main')

diff --git a/branches/sca-java-2.0-M2/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java b/branches/sca-java-2.0-M2/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
deleted file mode 100644
index 986c8305dd..0000000000
--- a/branches/sca-java-2.0-M2/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-2.0-M2/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/branches/sca-java-2.0-M2/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
deleted file mode 100644
index 6cad998042..0000000000
--- a/branches/sca-java-2.0-M2/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
+++ /dev/null
@@ -1,42 +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.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-M2/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java b/branches/sca-java-2.0-M2/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
deleted file mode 100644
index 261eff2584..0000000000
--- a/branches/sca-java-2.0-M2/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.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 MySimpleTotalService {
-    String getLocation();
-
-    String getYear();
-}
diff --git a/branches/sca-java-2.0-M2/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/branches/sca-java-2.0-M2/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
deleted file mode 100644
index f3c9280f96..0000000000
--- a/branches/sca-java-2.0-M2/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
+++ /dev/null
@@ -1,39 +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.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-M2/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite b/branches/sca-java-2.0-M2/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
deleted file mode 100644
index 090bc49a41..0000000000
--- a/branches/sca-java-2.0-M2/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://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-M2/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite b/branches/sca-java-2.0-M2/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
deleted file mode 100644
index 8c1a9a2f72..0000000000
--- a/branches/sca-java-2.0-M2/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://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-M2/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite b/branches/sca-java-2.0-M2/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
deleted file mode 100644
index 884a8b0a96..0000000000
--- a/branches/sca-java-2.0-M2/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://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
-- 
cgit v1.2.3