From 2f187c12e2ceceb61ca2745463fcd7fbbb438b72 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 16 Feb 2012 15:39:43 +0000
Subject: Rename beta3 tag to final name

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1245035 13f79535-47bb-0310-9956-ffa450edef68
---
 .../context/access/CalculatorService-context.xml   |  45 ----------------
 .../context/access/ContextAccess.composite         |  49 -----------------
 .../context/imports/ContextImports.composite       |  49 -----------------
 .../META-INF/spring/CalculatorService-context.xml  |  39 --------------
 .../META-INF/spring/SpringImport-context.xml       |  29 ----------
 .../context/multiple/MultipleContext.composite     |  30 -----------
 .../multiple/springapp/META-INF/MANIFEST.MF        |   3 --
 .../META-INF/spring/SpringHelloWorld-context.xml   |  31 -----------
 .../META-INF/spring/StockQuoteService-context.xml  |  36 -------------
 .../springapp/META-INF/spring/beanRefContext.xml   |  34 ------------
 .../implementation/policies/CalculatorJass.config  |   3 --
 .../policies/CalculatorLogMessages.properties      |  18 -------
 .../policies/ImplementationPolicies.composite      |  58 --------------------
 .../policies/META-INF/definitions.xml              |  54 -------------------
 .../META-INF/spring/CalculatorService-context.xml  |  39 --------------
 .../location/folder/SpringFolderLocation.composite |  40 --------------
 .../location/folder/springapp/META-INF/MANIFEST.MF |   3 --
 .../META-INF/spring/SpringSCAProperty-context.xml  |  34 ------------
 .../location/jar/SpringJarLocation.composite       |  40 --------------
 .../main/resources/location/jar/spring-context.jar | Bin 1454 -> 0 bytes
 .../spring/SpringDelegationHelloWorld-context.xml  |  39 --------------
 .../META-INF/spring/SpringHelloWorld-context.xml   |  31 -----------
 .../spring/SpringDelegationHelloWorld.composite    |  33 ------------
 .../sca/itest/spring/SpringHelloWorld.composite    |  33 ------------
 .../spring/SpringExplicitReference-context.xml     |  33 ------------
 .../spring/SpringImplicitReference-context.xml     |  34 ------------
 .../references/SpringExplicitReference.composite   |  33 ------------
 .../references/SpringImplicitReference.composite   |  40 --------------
 .../spring/SpringExplicitService-context.xml       |  41 --------------
 .../spring/SpringImplicitService-context.xml       |  31 -----------
 .../sca/services/SpringExplicitService.composite   |  34 ------------
 .../sca/services/SpringImplicitService.composite   |  33 ------------
 .../spring/annotations/Calculator.composite        |  60 ---------------------
 .../annotations/CalculatorService-context.xml      |  41 --------------
 34 files changed, 1150 deletions(-)
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
 delete mode 100644 sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml

(limited to 'sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources')

diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml
deleted file mode 100644
index 81d59432b8..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-  
-    <sca:service name="CalculatorService"
-        type="calculator.CalculatorService" target="CalculatorServiceBean"/>
-
-    <bean id="CalculatorServiceBean" class="calculator.CalculatorServiceImpl">        
-        <property name="addService" ref="addService"/>
-        <property name="subtractService" ref="subtractService"/>
-        <property name="multiplyService" ref="multiplyService"/>
-        <property name="divideService" ref="divideService"/>
-    </bean>
-    
-    <bean id="contextAccess" class="context.access.SCAApplicationContextProvider">
-    </bean>
-    
-    <sca:reference name="addService" type="calculator.AddService"/>
-    <sca:reference name="subtractService" type="calculator.SubtractService"/>   
-    <sca:reference name="multiplyService" type="calculator.MultiplyService"/>    
-    <sca:reference name="divideService" type="calculator.DivideService"/>
-
-</beans>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite
deleted file mode 100644
index f5514bad0a..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/access/ContextAccess.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="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-           targetNamespace="http://contextaccess"
-           xmlns:sample="http://contextaccess"
-           name="ContextAccess"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
-
-    <component name="CalculatorServiceComponent">
-        <implementation.spring location="CalculatorService-context.xml"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl"/>
-    </component>
-</composite>
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite
deleted file mode 100644
index 27df510da8..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/imports/ContextImports.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="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-           targetNamespace="http://contextimports"
-           xmlns:sample="http://contextimports"
-           name="ContextImports"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
-
-    <component name="CalculatorServiceComponent">
-        <implementation.spring location="META-INF/spring/SpringImport-context.xml"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl"/>
-    </component>
-</composite>
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
deleted file mode 100644
index c50f0ef4d9..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
+++ /dev/null
@@ -1,39 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="CalculatorServiceBean" class="calculator.CalculatorServiceImpl">        
-        <property name="addService" ref="addService"/>
-        <property name="subtractService" ref="subtractService"/>
-        <property name="multiplyService" ref="multiplyService"/>
-        <property name="divideService" ref="divideService"/>
-    </bean>
-
-    <sca:reference name="addService" type="calculator.AddService"/>
-    <sca:reference name="subtractService" type="calculator.SubtractService"/>   
-    <sca:reference name="multiplyService" type="calculator.MultiplyService"/>    
-    <sca:reference name="divideService" type="calculator.DivideService"/>
-
-</beans>
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
deleted file mode 100644
index a0bb10e8dd..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
+++ /dev/null
@@ -1,29 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-       
-    <import resource="CalculatorService-context.xml"/>
-    
-</beans>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
deleted file mode 100644
index 5973484f6e..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
+++ /dev/null
@@ -1,30 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-	targetNamespace="http://stockquote"
-	xmlns:hw="http://stockquote"
-    name="MultipleContext">
-
-    <component name="StockQuoteServiceComponent">
-        <implementation.spring location="springapp"/>
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF
deleted file mode 100644
index 9267f28e83..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Spring-Context: META-INF/spring/beanRefContext.xml; META-INF/spring/StockQuoteService-context.xml
-
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml
deleted file mode 100644
index 62e4e077b6..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml
+++ /dev/null
@@ -1,31 +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.    
--->
-<!-- Application context for the SpringHelloWorld testcase -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="testBean" class="org.apache.tuscany.sca.itest.spring.TestHelloWorldBean" lazy-init="true">
-    </bean>
-
-</beans>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml
deleted file mode 100644
index 5b1885d6b3..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml
+++ /dev/null
@@ -1,36 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-       
-    <sca:service name="StockQuoteService"
-        type="bigbank.stockquote.StockQuoteService" target="StockQuoteServiceBean"/>
-
-    <bean id="StockQuoteServiceBean" class="bigbank.stockquote.StockQuoteImpl">
-    </bean>
-    
-    <bean id="applicationContextProvider" class="context.access.SCAApplicationContextProvider">
-    </bean>
-
-</beans>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml
deleted file mode 100644
index dcc88f6770..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml
+++ /dev/null
@@ -1,34 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-       
-    <bean id="beanRefFactory" class="org.springframework.context.support.ClassPathXmlApplicationContext">
-	   <constructor-arg>
-		  <list>
-			 <value>context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml</value>
-		  </list>
-	   </constructor-arg>
-    </bean>
-</beans>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config
deleted file mode 100644
index 0e7cb86633..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config
+++ /dev/null
@@ -1,3 +0,0 @@
-Calculator {
-  calculator.security.JaasLoginModule required debug=true;
-};
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
deleted file mode 100644
index 0238f0b013..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
+++ /dev/null
@@ -1,18 +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.    
-CALLING_OPERATION=Inovoking operation {0} with arguments {1}
-OPERATION_RETURNED=Returning from operation {0} with return value {1}
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
deleted file mode 100644
index 5ffeda11df..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
+++ /dev/null
@@ -1,58 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-        <implementation.spring location="META-INF/spring/CalculatorService-context.xml"/>		
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" policySets="tuscany:JaasPolicy"/>
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent" policySets="tuscany:JaasPolicy">
-        <implementation.java class="calculator.MultiplyServiceImpl" />
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl"/>
-    </component>
-    
-    <component name="AnotherCalculatorServiceComponent">
-        <implementation.spring location="META-INF/spring/CalculatorService-context.xml" requires="tuscany:logging"/>		
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" policySets="tuscany:JaasPolicy"/>
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml
deleted file mode 100644
index efc2464425..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-    * 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.    
--->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-             targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
-             xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-             xmlns:calc="http://calculator">
-
-    <intent name="logging" constrains="sca:implementation" intentType="implementation"/>
-    
-    <!-- PolicySets -->
-    <policySet name="JaasPolicy" provides="tuscany:jaasAuthentication" appliesTo="//sca:binding">
-<!-- empty policy set so that intents are resolved and match works but without including 
-     any actual policy runtime artifacts
-        <tuscany:jaasAuthentication>
-            <tuscany:configurationName>Calculator</tuscany:configurationName>
-            <tuscany:callbackHandler>calculator.security.CalculatorCallbackHandler</tuscany:callbackHandler>
-        </tuscany:jaasAuthentication>
--->        
-    </policySet>
-
-
-    <!-- PolicySets -->
-
-    <policySet name="JDKLoggingPolicy" 
-               provides="tuscany:logging" 
-               appliesTo="//sca:implementation.spring"
-               attachTo="//sca:implementation.spring">
-<!-- empty policy set so that intents are resolved and match works but without including 
-     any actual policy runtime artifacts
-        <tuscany:jdkLogger name="calculator">
-            <logLevel>FINER</logLevel>
-        </tuscany:jdkLogger>
--->
-    </policySet>
-
-</definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
deleted file mode 100644
index c50f0ef4d9..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
+++ /dev/null
@@ -1,39 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="CalculatorServiceBean" class="calculator.CalculatorServiceImpl">        
-        <property name="addService" ref="addService"/>
-        <property name="subtractService" ref="subtractService"/>
-        <property name="multiplyService" ref="multiplyService"/>
-        <property name="divideService" ref="divideService"/>
-    </bean>
-
-    <sca:reference name="addService" type="calculator.AddService"/>
-    <sca:reference name="subtractService" type="calculator.SubtractService"/>   
-    <sca:reference name="multiplyService" type="calculator.MultiplyService"/>    
-    <sca:reference name="divideService" type="calculator.DivideService"/>
-
-</beans>
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
deleted file mode 100644
index e889d84544..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
+++ /dev/null
@@ -1,40 +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 for the SpringSCAPropertyTestCase         
- * This composite has the HelloWorldComponent implemented with a Spring implementation where
- * the Spring application context uses an explicit SCA property.  The value of the property
- * is set in this composite and is used to compute the response to a service invocation from
- * the ClientComponent.
- -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-           targetNamespace="http://SpringFolderLocation"
-           name="SpringFolderLocation">
-    
-    <component name="ClientComponent">
-        <implementation.java class="helloworld.HelloWorldProxy"/>
-        <reference name="delegate" target="HelloWorldComponent"/>
-    </component>
-
-    <component name="HelloWorldComponent">
-        <implementation.spring location="springapp"/>
-        <property name="TestProperty">Hello</property>
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
deleted file mode 100644
index 950dbeba4c..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Spring-Context: META-INF/spring/SpringSCAProperty-context.xml
-
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
deleted file mode 100644
index 8613e6c82a..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
+++ /dev/null
@@ -1,34 +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.    
--->
-<!-- Application context for the SpringHelloWorld testcase -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="testBean" class="mock.TestSCAPropertyBean" lazy-init="true">
-    	<property name="hello" ref="TestProperty"/>
-    </bean>
-    
-    <sca:property id="foo" name="TestProperty" type="java.lang.String"/>
-
-</beans>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
deleted file mode 100644
index b7281272da..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
+++ /dev/null
@@ -1,40 +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 for the SpringSCAPropertyTestCase         
- * This composite has the HelloWorldComponent implemented with a Spring implementation where
- * the Spring application context uses an explicit SCA property.  The value of the property
- * is set in this composite and is used to compute the response to a service invocation from
- * the ClientComponent.
- -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-           targetNamespace="http://SpringJarLocation"
-           name="SpringJarLocation">
-    
-    <component name="ClientComponent">
-        <implementation.java class="helloworld.HelloWorldProxy"/>
-        <reference name="delegate" target="HelloWorldComponent"/>
-    </component>
-
-    <component name="HelloWorldComponent">
-        <implementation.spring location="spring-context.jar"/>
-        <property name="TestProperty">Hello</property>
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar
deleted file mode 100644
index 504d59e5ff..0000000000
Binary files a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar and /dev/null differ
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
deleted file mode 100644
index 9912624870..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
+++ /dev/null
@@ -1,39 +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.    
--->
-<!-- Application context for the SpringHelloWorld testcase -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-	<sca:service name="HelloWorld" type="helloworld.HelloWorld" target="testBean"/>
-	
-    <bean id="delegateBean" 
-         class="org.apache.tuscany.sca.itest.spring.TestHelloWorldBean" lazy-init="true">
-    </bean>
-
-    <bean id="testBean" 
-         class="org.apache.tuscany.sca.itest.spring.TestHelloWorldDelegatorBean" lazy-init="true">
-         <property name="delegate"><ref bean="delegateBean"/></property>
-    </bean>
-
-</beans>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
deleted file mode 100644
index 62e4e077b6..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
+++ /dev/null
@@ -1,31 +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.    
--->
-<!-- Application context for the SpringHelloWorld testcase -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="testBean" class="org.apache.tuscany.sca.itest.spring.TestHelloWorldBean" lazy-init="true">
-    </bean>
-
-</beans>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
deleted file mode 100644
index e9f8bb888b..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
+++ /dev/null
@@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
-           targetNamespace="http://SpringDelegationHelloWorld"
-           name="SpringDelegationHelloWorld">
-
-    <component name="ClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.spring.HelloWorldProxy"/>
-        <reference name="delegate" target="HelloWorldComponent"/>
-    </component>
-
-    <component name="HelloWorldComponent">
-        <implementation.spring location="META-INF/spring/SpringDelegationHelloWorld-context.xml"/>
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
deleted file mode 100644
index 30719684a9..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
+++ /dev/null
@@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
-           targetNamespace="SpringHelloWorld"
-           name="SpringHelloWorld">
-
-    <component name="ClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.spring.HelloWorldProxy"/>
-        <reference name="delegate" target="HelloWorldComponent"/>
-    </component>
-
-	<component name="HelloWorldComponent">
-        <implementation.spring location="META-INF/spring/SpringHelloWorld-context.xml"/>
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
deleted file mode 100644
index 1705164104..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
+++ /dev/null
@@ -1,33 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="testBean" class="mock.TestReferenceBean">
-        <property name="bean" ref="testReference"/>
-    </bean>
-
-    <sca:reference name="testReference" type="helloworld.HelloWorld"/>
-
-</beans>
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
deleted file mode 100644
index 539dfa6e32..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
+++ /dev/null
@@ -1,34 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="testBean" class="mock.TestReferenceBean">
-        <!-- Here is the implicit reference - a property with a ref not satisifed within the
-         * Spring application context.
-         -->
-        <property name="bean" ref="testReference"/>
-    </bean>
-
-</beans>
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
deleted file mode 100644
index fcbafad27d..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
+++ /dev/null
@@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
-           targetNamespace="http://SpringExplicitReference"
-           name="SpringExplicitReference">
-
-    <component name="ClientComponent">
-        <implementation.spring location="META-INF/spring/SpringExplicitReference-context.xml"/>
-        <reference name="testReference" target="ExplicitReferenceComponent"/>
-    </component>
-
-    <component name="ExplicitReferenceComponent">
-        <implementation.java class="helloworld.HelloWorldImpl"/>
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
deleted file mode 100644
index 4204b75b48..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
+++ /dev/null
@@ -1,40 +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 for the SpringImplicitReferenceTestCase         
- * This composite has a ClientComponent implemented with a Spring implementation where
- * Spring application context uses an implicit reference definition through a Bean with
- * a property with an unsatisfied ref attribute, which forms the reference.
- * The reference is satisified by a wire to a ReferenceComponent which is implemented
- * by a plain Java POJO.
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-           targetNamespace="http://SpringImplicitReference"
-           name="SpringImplicitReference">
-
-    <component name="ClientComponent">
-        <implementation.spring location="META-INF/spring/SpringImplicitReference-context.xml"/>
-        <reference name="testReference" target="ImplicitReferenceComponent"/>
-    </component>
-
-    <component name="ImplicitReferenceComponent">
-        <implementation.java class="helloworld.HelloWorldImpl"/>
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
deleted file mode 100644
index 5fe57ed733..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
+++ /dev/null
@@ -1,41 +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.    
--->
-<!-- Application context for the SpringExplicitHelloWorld testcase 
-In this case, the service offered by the Spring application is specified
-explicitly using an sca:service element                                  -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xmlns:spec="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <sca:service name="fooService" 
-                 type="helloworld.HelloWorld" 
-                 target="testBean"/>
-                 <!-- requires="spec:serverAuthentication" -->
-
-    <bean id="testBean" 
-          class="mock.TestHelloWorldBean" 
-          lazy-init="true">
-    </bean>
-
-</beans>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
deleted file mode 100644
index 83558e8abc..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
+++ /dev/null
@@ -1,31 +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.    
--->
-<!-- Application context for the SpringHelloWorld testcase -->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="testBean" class="mock.TestHelloWorldBean" lazy-init="true">
-    </bean>
-
-</beans>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
deleted file mode 100644
index c9bb5b9e3e..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
+++ /dev/null
@@ -1,34 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-           targetNamespace="http://SpringExplicitService"
-           name="SpringExplicitService">
-
-    <component name="ClientComponent">
-        <implementation.java class="helloworld.HelloWorldProxy"/>
-        <reference name="delegate" target="ExplicitServiceComponent"/>
-    </component>
-
-    <component name="ExplicitServiceComponent">
-        <implementation.spring location="META-INF/spring/SpringExplicitService-context.xml"/>
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
deleted file mode 100644
index 856b41f897..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
+++ /dev/null
@@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
-           targetNamespace="http://SpringImplicitService"
-           name="SpringImplicitService">
-
-    <component name="ClientComponent">
-        <implementation.java class="helloworld.HelloWorldProxy"/>
-        <reference name="delegate" target="ImplicitServiceComponent"/>
-    </component>
-
-    <component name="ImplicitServiceComponent">
-        <implementation.spring location="META-INF/spring/SpringImplicitService-context.xml"/>
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
deleted file mode 100644
index b59114bd31..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
+++ /dev/null
@@ -1,60 +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 targetNamespace="http://sample"
-           xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"           
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
-
-    <component name="CalculatorServiceComponent">
-        <implementation.spring location="CalculatorService-context.xml"/>
-        <property name="message">HelloWorld</property>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />        
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl"/>
-    </component>
-    
-    <!--<component name="AnotherCalculatorServiceComponent">
-        <implementation.spring location="CalculatorService-context.xml"/>
-        <property name="message">HelloWorld</property>       
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-    
---></composite>
diff --git a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml
deleted file mode 100644
index 4a873f2424..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml
+++ /dev/null
@@ -1,41 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="CalculatorServiceBean" class="spring.annotations.CalculatorServiceImpl">        
-        <property name="addService" ref="addService"/>
-        <!-- <property name="subtractService" ref="subtractService"/>
-        <property name="multiplyService" ref="multiplyService"/> -->
-        <property name="divideService" ref="divideService"/>
-    </bean>   
-    
-    <sca:reference name="addService" type="calculator.AddService"/>
-    <sca:reference name="subtractService" type="calculator.SubtractService"/>   
-    <sca:reference name="multiplyService" type="calculator.MultiplyService"/> 
-    <sca:reference name="divideService" type="calculator.DivideService"/>
-    
-    <sca:property id="msg" name="message" type="java.lang.String"/>
-
-</beans>
-- 
cgit v1.2.3