From 9425990f532b1152c2d73db96c0f07ef5216a3d1 Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 12 Nov 2009 00:43:48 +0000
Subject: Moving 2.x contribs

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835178 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/resources/CalculatorService-context.xml   | 39 --------------
 .../sca/SpringDelegationHelloWorld-context.xml     | 37 -------------
 .../META-INF/sca/SpringHelloWorld-context.xml      | 31 -----------
 .../context-access/CalculatorService-context.xml   | 45 ----------------
 .../context-imports/CalculatorService-context.xml  | 39 --------------
 .../sca/context-imports/SpringImport-context.xml   | 29 ----------
 .../context-multiple/StockQuoteService-context.xml | 36 -------------
 .../sca/context-multiple/beanRefContext.xml        | 34 ------------
 .../CalculatorService-context.xml                  | 39 --------------
 .../CalculatorService-context.xml                  | 41 ---------------
 .../resources/context/access/Calculator.composite  | 49 -----------------
 .../resources/context/imports/Calculator.composite | 49 -----------------
 .../context/multiple/StockQuote.composite          | 35 -------------
 .../implementation/policies/Calculator.composite   | 61 ----------------------
 .../implementation/policies/CalculatorJass.config  |  3 --
 .../policies/CalculatorLogMessages.properties      | 18 -------
 .../implementation/policies/definitions.xml        | 40 --------------
 .../spring/SpringDelegationHelloWorld.composite    | 32 ------------
 .../sca/itest/spring/SpringHelloWorld.composite    | 32 ------------
 .../spring/annotations/Calculator.composite        | 60 ---------------------
 20 files changed, 749 deletions(-)
 delete mode 100644 java/sca-contrib/itest/spring/src/main/resources/CalculatorService-context.xml
 delete mode 100644 java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
 delete mode 100644 java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
 delete mode 100644 java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml
 delete mode 100644 java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml
 delete mode 100644 java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml
 delete mode 100644 java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml
 delete mode 100644 java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml
 delete mode 100644 java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml
 delete mode 100644 java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml
 delete mode 100644 java/sca-contrib/itest/spring/src/main/resources/context/access/Calculator.composite
 delete mode 100644 java/sca-contrib/itest/spring/src/main/resources/context/imports/Calculator.composite
 delete mode 100644 java/sca-contrib/itest/spring/src/main/resources/context/multiple/StockQuote.composite
 delete mode 100644 java/sca-contrib/itest/spring/src/main/resources/implementation/policies/Calculator.composite
 delete mode 100644 java/sca-contrib/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config
 delete mode 100644 java/sca-contrib/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
 delete mode 100644 java/sca-contrib/itest/spring/src/main/resources/implementation/policies/definitions.xml
 delete mode 100644 java/sca-contrib/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
 delete mode 100644 java/sca-contrib/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
 delete mode 100644 java/sca-contrib/itest/spring/src/main/resources/spring/annotations/Calculator.composite

(limited to 'java/sca-contrib/itest/spring/src/main/resources')

diff --git a/java/sca-contrib/itest/spring/src/main/resources/CalculatorService-context.xml b/java/sca-contrib/itest/spring/src/main/resources/CalculatorService-context.xml
deleted file mode 100644
index 7c84965629..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/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/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml b/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
deleted file mode 100644
index 18ab7e332d..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
+++ /dev/null
@@ -1,37 +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="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/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
deleted file mode 100644
index 62e4e077b6..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/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/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml b/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml
deleted file mode 100644
index 87458b99a3..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/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/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml b/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml
deleted file mode 100644
index 7c84965629..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-imports/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/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml b/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml
deleted file mode 100644
index 3faed92fd2..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-imports/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/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml b/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml
deleted file mode 100644
index 74473073ea..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-multiple/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/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml b/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml
deleted file mode 100644
index fb4be314b6..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-multiple/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>META-INF/sca/context-multiple/StockQuoteService-context.xml</value>
-		  </list>
-	   </constructor-arg>
-    </bean>
-</beans>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml b/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml
deleted file mode 100644
index 7c84965629..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/implementation-policies/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/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml b/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml
deleted file mode 100644
index 4110a9a7b7..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/spring-annotation/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>
diff --git a/java/sca-contrib/itest/spring/src/main/resources/context/access/Calculator.composite b/java/sca-contrib/itest/spring/src/main/resources/context/access/Calculator.composite
deleted file mode 100644
index 03116905fc..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/context/access/Calculator.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://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <component name="CalculatorServiceComponent">
-        <implementation.spring location="META-INF/sca/context-access/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/java/sca-contrib/itest/spring/src/main/resources/context/imports/Calculator.composite b/java/sca-contrib/itest/spring/src/main/resources/context/imports/Calculator.composite
deleted file mode 100644
index 709de34a34..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/context/imports/Calculator.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://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <component name="CalculatorServiceComponent">
-        <implementation.spring location="META-INF/sca/context-imports/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/java/sca-contrib/itest/spring/src/main/resources/context/multiple/StockQuote.composite b/java/sca-contrib/itest/spring/src/main/resources/context/multiple/StockQuote.composite
deleted file mode 100644
index 3838515055..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/context/multiple/StockQuote.composite
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://stockquote"
-	xmlns:hw="http://stockquote"
-    name="StockQuote">
-    
-    <service name="StockQuoteService" promote="StockQuoteServiceComponent">
-        <interface.java interface="bigbank.stockquote.StockQuoteService"/>
-        <binding.ws uri="http://localhost:8081/services/StockQuoteWebService"/>
-    </service>
-
-    <component name="StockQuoteServiceComponent">
-        <implementation.spring location="META-INF/sca/context-multiple/StockQuoteService-context.xml"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/Calculator.composite b/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/Calculator.composite
deleted file mode 100644
index 0551dc60ef..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/Calculator.composite
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <component name="CalculatorServiceComponent">
-        <implementation.spring location="META-INF/sca/implementation-policies/CalculatorService-context.xml">		
-			<operation name="divide" requires="tuscany:logging"/>
-			<operation name="subtract" requires="tuscany:logging"/>
-		</implementation.spring>
-        <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" requires="tuscany:jaasAuthentication"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl"/>
-    </component>
-    
-    <component name="AnotherCalculatorServiceComponent">
-        <implementation.spring location="META-INF/sca/implementation-policies/CalculatorService-context.xml" requires="tuscany:logging"/>		
-        <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/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config b/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config
deleted file mode 100644
index 0e7cb86633..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config
+++ /dev/null
@@ -1,3 +0,0 @@
-Calculator {
-  calculator.security.JaasLoginModule required debug=true;
-};
diff --git a/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties b/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
deleted file mode 100644
index f62125eaa9..0000000000
--- a/java/sca-contrib/itest/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/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/definitions.xml b/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/definitions.xml
deleted file mode 100644
index 992c1b92f5..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/definitions.xml
+++ /dev/null
@@ -1,40 +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://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:calc="http://calculator">
-
-    <!-- PolicySets -->
-    <policySet name="JaasPolicy" provides="tuscany:jaasAuthentication" appliesTo="sca:implementation.java"
-        xmlns="http://www.osoa.org/xmlns/sca/1.0">
-        <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"
-        xmlns="http://www.osoa.org/xmlns/sca/1.0">
-        <tuscany:jdkLogger name="calculator">
-            <logLevel>FINER</logLevel>
-        </tuscany:jdkLogger>
-    </policySet>
-</definitions>
\ No newline at end of file
diff --git a/java/sca-contrib/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/java/sca-contrib/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
deleted file mode 100644
index 70b2d5fdab..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           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/sca/SpringDelegationHelloWorld-context.xml"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/java/sca-contrib/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
deleted file mode 100644
index bab9ecb528..0000000000
--- a/java/sca-contrib/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           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/sca/SpringHelloWorld-context.xml"/>
-    </component>
-
-</composite>
diff --git a/java/sca-contrib/itest/spring/src/main/resources/spring/annotations/Calculator.composite b/java/sca-contrib/itest/spring/src/main/resources/spring/annotations/Calculator.composite
deleted file mode 100644
index a8a1f5b703..0000000000
--- a/java/sca-contrib/itest/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 xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <component name="CalculatorServiceComponent">
-        <implementation.spring location="META-INF/sca/spring-annotation/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="META-INF/sca/spring-annotation/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>
-- 
cgit v1.2.3