diff options
| author | ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68> | 2009-07-22 12:05:12 +0000 |
|---|---|---|
| committer | ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68> | 2009-07-22 12:05:12 +0000 |
| commit | 17437a5fab2eae345e1b9ede33d95b97417bcdfa (patch) | |
| tree | 358f0ed3988488dd6692ed4875fc1b6177d0a751 /java/sca/itest/implementation-spring/src/main | |
| parent | bcd0a070dda7d130d703fe86d0efe5e526226e5f (diff) | |
Fixes in itest for the spring classloader changes ref: TUSCANY-3069 in 1.x
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@796683 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/itest/implementation-spring/src/main')
31 files changed, 17 insertions, 56 deletions
diff --git a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml b/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml deleted file mode 100644 index c50f0ef4d9..0000000000 --- a/java/sca/itest/implementation-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/itest/implementation-spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml b/java/sca/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml index 81d59432b8..81d59432b8 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml +++ b/java/sca/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml diff --git a/java/sca/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite b/java/sca/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite index 209f2cb065..abdaa98bff 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite +++ b/java/sca/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite @@ -24,7 +24,7 @@ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"> <component name="CalculatorServiceComponent"> - <implementation.spring location="META-INF/sca/context-access/CalculatorService-context.xml"/> + <implementation.spring location="CalculatorService-context.xml"/> <reference name="addService" target="AddServiceComponent" /> <reference name="subtractService" target="SubtractServiceComponent" /> <reference name="multiplyService" target="MultiplyServiceComponent" /> diff --git a/java/sca/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite b/java/sca/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite index 9829b79104..dd186bddfc 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite +++ b/java/sca/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite @@ -24,7 +24,7 @@ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"> <component name="CalculatorServiceComponent"> - <implementation.spring location="META-INF/sca/context-imports/SpringImport-context.xml"/> + <implementation.spring location="META-INF/spring/SpringImport-context.xml"/> <reference name="addService" target="AddServiceComponent" /> <reference name="subtractService" target="SubtractServiceComponent" /> <reference name="multiplyService" target="MultiplyServiceComponent" /> diff --git a/java/sca/itest/implementation-spring/src/main/resources/CalculatorService-context.xml b/java/sca/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml index c50f0ef4d9..c50f0ef4d9 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/CalculatorService-context.xml +++ b/java/sca/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml diff --git a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml b/java/sca/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml index a0bb10e8dd..a0bb10e8dd 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml +++ b/java/sca/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml diff --git a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/java/sca/itest/implementation-spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml index 62e4e077b6..62e4e077b6 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml +++ b/java/sca/itest/implementation-spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml diff --git a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml b/java/sca/itest/implementation-spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml index 5b1885d6b3..5b1885d6b3 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml +++ b/java/sca/itest/implementation-spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml diff --git a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml b/java/sca/itest/implementation-spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml index 244e730921..1bb3b2c146 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml +++ b/java/sca/itest/implementation-spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml @@ -27,8 +27,8 @@ <bean id="beanRefFactory" class="org.springframework.context.support.ClassPathXmlApplicationContext"> <constructor-arg> <list> - <value>META-INF/sca/context-multiple/StockQuoteService-context.xml</value> - <value>META-INF/sca/context-multiple/SpringHelloWorld-context.xml</value> + <value>META-INF/spring/StockQuoteService-context.xml</value> + <value>META-INF/spring/SpringHelloWorld-context.xml</value> </list> </constructor-arg> </bean> diff --git a/java/sca/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite b/java/sca/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite index 1a66ff20f1..5acdc77d1a 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite +++ b/java/sca/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite @@ -29,7 +29,7 @@ </service> <component name="StockQuoteServiceComponent"> - <implementation.spring location="META-INF/sca/context-multiple/beanRefContext.xml"/> + <implementation.spring location="META-INF/spring/beanRefContext.xml"/> </component> </composite> diff --git a/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite b/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite index 9d8068368b..1179566749 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite +++ b/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite @@ -24,7 +24,7 @@ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"> <component name="CalculatorServiceComponent"> - <implementation.spring location="META-INF/sca/implementation-policies/CalculatorService-context.xml"/> + <implementation.spring location="META-INF/spring/CalculatorService-context.xml"/> <reference name="addService" target="AddServiceComponent" /> <reference name="subtractService" target="SubtractServiceComponent" /> <reference name="multiplyService" target="MultiplyServiceComponent" /> @@ -48,7 +48,7 @@ </component> <component name="AnotherCalculatorServiceComponent"> - <implementation.spring location="META-INF/sca/implementation-policies/CalculatorService-context.xml" requires="tuscany:logging"/> + <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" /> diff --git a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml b/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml index c50f0ef4d9..c50f0ef4d9 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml +++ b/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml diff --git a/java/sca/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite b/java/sca/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite index 9c5cf9be65..d7b3c5a6e6 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite +++ b/java/sca/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite @@ -32,7 +32,7 @@ </component> <component name="HelloWorldComponent"> - <implementation.spring location="META-INF/sca/location-folder"/> + <implementation.spring location="springapp"/> <property name="TestProperty">Hello</property> </component> diff --git a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/MANIFEST.MF b/java/sca/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF index 950dbeba4c..950dbeba4c 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/MANIFEST.MF +++ b/java/sca/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF diff --git a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml b/java/sca/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml index 8613e6c82a..8613e6c82a 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml +++ b/java/sca/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml diff --git a/java/sca/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite b/java/sca/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite index fb8b4255fb..fb31d2d612 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite +++ b/java/sca/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite @@ -32,7 +32,7 @@ </component> <component name="HelloWorldComponent"> - <implementation.spring location="META-INF/sca/location-jar/spring-context.jar"/> + <implementation.spring location="spring-context.jar"/> <property name="TestProperty">Hello</property> </component> diff --git a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/location-jar/spring-context.jar b/java/sca/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar Binary files differindex 504d59e5ff..504d59e5ff 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/location-jar/spring-context.jar +++ b/java/sca/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar diff --git a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml b/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml index 9912624870..9912624870 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml +++ b/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml diff --git a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/SpringHelloWorld-context.xml b/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml index 62e4e077b6..62e4e077b6 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/SpringHelloWorld-context.xml +++ b/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml diff --git a/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite index c2fc0f2e75..be6a336701 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite +++ b/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite @@ -26,7 +26,7 @@ </component> <component name="HelloWorldComponent"> - <implementation.spring location="META-INF/sca/SpringDelegationHelloWorld-context.xml"/> + <implementation.spring location="META-INF/spring/SpringDelegationHelloWorld-context.xml"/> </component> </composite> diff --git a/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite index 1b18f3def8..2273986365 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite +++ b/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite @@ -26,7 +26,7 @@ </component> <component name="HelloWorldComponent"> - <implementation.spring location="META-INF/sca/SpringHelloWorld-context.xml"/> + <implementation.spring location="META-INF/spring/SpringHelloWorld-context.xml"/> </component> </composite> diff --git a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringExplicitReference-context.xml b/java/sca/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml index 1705164104..1705164104 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringExplicitReference-context.xml +++ b/java/sca/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml diff --git a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringImplicitReference-context.xml b/java/sca/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml index 539dfa6e32..539dfa6e32 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringImplicitReference-context.xml +++ b/java/sca/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml diff --git a/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite b/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite index 7d73b287bb..4ef561dbfe 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite +++ b/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite @@ -21,7 +21,7 @@ name="SpringExplicitReference"> <component name="ClientComponent"> - <implementation.spring location="META-INF/sca/sca-references/SpringExplicitReference-context.xml"/> + <implementation.spring location="META-INF/spring/SpringExplicitReference-context.xml"/> <reference name="testReference" target="ExplicitReferenceComponent"/> </component> diff --git a/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite b/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite index 476a82adb9..c9c307b309 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite +++ b/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite @@ -28,7 +28,7 @@ name="SpringImplicitReference"> <component name="ClientComponent"> - <implementation.spring location="META-INF/sca/sca-references/SpringImplicitReference-context.xml"/> + <implementation.spring location="META-INF/spring/SpringImplicitReference-context.xml"/> <reference name="testReference" target="ImplicitReferenceComponent"/> </component> diff --git a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringExplicitService-context.xml b/java/sca/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml index 42e0cdbd23..42e0cdbd23 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringExplicitService-context.xml +++ b/java/sca/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml diff --git a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringImplicitService-context.xml b/java/sca/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml index 83558e8abc..83558e8abc 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringImplicitService-context.xml +++ b/java/sca/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml diff --git a/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite b/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite index b367399ed4..23a33a1545 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite +++ b/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite @@ -27,7 +27,7 @@ </component> <component name="ExplicitServiceComponent"> - <implementation.spring location="META-INF/sca/sca-services/SpringExplicitService-context.xml"/> + <implementation.spring location="META-INF/spring/SpringExplicitService-context.xml"/> </component> </composite> diff --git a/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite b/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite index 8d5b901378..847372680d 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite +++ b/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite @@ -26,7 +26,7 @@ </component> <component name="ImplicitServiceComponent"> - <implementation.spring location="META-INF/sca/sca-services/SpringImplicitService-context.xml"/> + <implementation.spring location="META-INF/spring/SpringImplicitService-context.xml"/> </component> </composite> diff --git a/java/sca/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite b/java/sca/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite index 2cb8037c72..236e2b23e6 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite +++ b/java/sca/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite @@ -24,7 +24,7 @@ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"> <component name="CalculatorServiceComponent"> - <implementation.spring location="META-INF/sca/spring-annotation/CalculatorService-context.xml"/> + <implementation.spring location="CalculatorService-context.xml"/> <property name="message">HelloWorld</property> <reference name="addService" target="AddServiceComponent" /> <reference name="subtractService" target="SubtractServiceComponent" /> @@ -49,7 +49,7 @@ </component> <!--<component name="AnotherCalculatorServiceComponent"> - <implementation.spring location="META-INF/sca/spring-annotation/CalculatorService-context.xml"/> + <implementation.spring location="CalculatorService-context.xml"/> <property name="message">HelloWorld</property> <reference name="addService" target="AddServiceComponent" /> <reference name="subtractService" target="SubtractServiceComponent" /> diff --git a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml b/java/sca/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml index 4a873f2424..4a873f2424 100644 --- a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml +++ b/java/sca/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml |