diff options
Diffstat (limited to 'java/sca/modules/implementation-spring')
10 files changed, 42 insertions, 44 deletions
diff --git a/java/sca/modules/implementation-spring/src/main/resources/META-INF/spring.handlers b/java/sca/modules/implementation-spring/src/main/resources/META-INF/spring.handlers index 4e7df50291..7f9a7b17b0 100644 --- a/java/sca/modules/implementation-spring/src/main/resources/META-INF/spring.handlers +++ b/java/sca/modules/implementation-spring/src/main/resources/META-INF/spring.handlers @@ -1,3 +1 @@ -http\://www.springframework.org/schema/sca=org.springframework.sca.config.ScaNamespaceHandler
-
-
+http\://www.springframework.org/schema/sca=org.apache.tuscany.sca.implementation.spring.ScaNamespaceHandler diff --git a/java/sca/modules/implementation-spring/src/main/resources/META-INF/spring.schemas b/java/sca/modules/implementation-spring/src/main/resources/META-INF/spring.schemas index 4374e4f1b0..249cc21c13 100644 --- a/java/sca/modules/implementation-spring/src/main/resources/META-INF/spring.schemas +++ b/java/sca/modules/implementation-spring/src/main/resources/META-INF/spring.schemas @@ -1 +1 @@ -http\://www.springframework.org/schema/sca/spring-sca.xsd=org/springframework/sca/xml/spring-sca.xsd
+http\://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd=org/springframework/sca/xml/spring-sca.xsd diff --git a/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml b/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml index 0733f49de8..7c358ac01c 100644 --- a/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml +++ b/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml @@ -25,7 +25,7 @@ explicitly using an sca:service element --> 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.springframework.org/schema/sca/spring-sca.xsd"> +http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd"> <sca:service name="fooService" type="org.apache.tuscany.sca.implementation.spring.itests.helloworld.HelloWorld" diff --git a/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml b/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml index c7feddf87f..38e90b41fa 100644 --- a/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml +++ b/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml @@ -22,7 +22,7 @@ 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.springframework.org/schema/sca/spring-sca.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.implementation.spring.itests.mock.TestReferenceBean"> <property name="bean" ref="testReference"/> diff --git a/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml b/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml index d59205e066..18ce21805c 100644 --- a/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml +++ b/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml @@ -23,7 +23,7 @@ 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.springframework.org/schema/sca/spring-sca.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.implementation.spring.itests.mock.TestHelloWorldBean" lazy-init="true"> </bean> diff --git a/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml b/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml index f366c6819f..e6b69e8cad 100644 --- a/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml +++ b/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml @@ -22,7 +22,7 @@ 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.springframework.org/schema/sca/spring-sca.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.implementation.spring.itests.mock.TestReferenceBean"> <!-- Here is the implicit reference - a property with a ref not satisifed within the diff --git a/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml b/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml index aef5a5524b..fdbbeeced2 100644 --- a/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml +++ b/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml @@ -22,7 +22,7 @@ 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.springframework.org/schema/sca/spring-sca.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.container.spring.mock.TestBeanImpl"> <property name="bean" ref="testReference"/> diff --git a/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml b/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml index fb9fb03692..6b3f1f9890 100644 --- a/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml +++ b/java/sca/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml @@ -22,7 +22,7 @@ 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.springframework.org/schema/sca/spring-sca.xsd"> +http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd"> <sca:service name="fooService" type="org.apache.tuscany.container.spring.mock.TestBeanImpl" target="testBean"/> diff --git a/java/sca/modules/implementation-spring/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml b/java/sca/modules/implementation-spring/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml index 36763a2d7a..f1ee21686d 100644 --- a/java/sca/modules/implementation-spring/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml +++ b/java/sca/modules/implementation-spring/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml @@ -1,34 +1,34 @@ -<?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.springframework.org/schema/sca/spring-sca.xsd">
-
- <bean id="testBean" class="org.apache.tuscany.sca.implementation.spring.itests.mock.TestSCAPropertyBean" lazy-init="true">
- <property name="hello" ref="TestProperty"/>
- </bean>
-
- <sca:property id="foo" name="TestProperty" type="java.lang.String"/>
-
+<?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.implementation.spring.itests.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/java/sca/modules/implementation-spring/src/test/resources/test.xml b/java/sca/modules/implementation-spring/src/test/resources/test.xml index 477ca69a38..f2d684f766 100644 --- a/java/sca/modules/implementation-spring/src/test/resources/test.xml +++ b/java/sca/modules/implementation-spring/src/test/resources/test.xml @@ -20,7 +20,7 @@ <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.springframework.org/schema/sca/spring-sca.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.implementation.spring.itests.mock.TestBeanImpl" /> |