diff options
Diffstat (limited to '')
40 files changed, 46 insertions, 44 deletions
diff --git a/java/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite b/java/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite index 946c4862ee..f7305351be 100644 --- a/java/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite +++ b/java/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://callback" name="CallBackApiTest"> diff --git a/java/sca/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml b/java/sca/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml index 19eb25631e..4b3e8ff21c 100644 --- a/java/sca/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml +++ b/java/sca/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://callback" +<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://callback" xmlns:t="http://callback"> <deployable composite="t:CallBackApiTest" /> </contribution>
\ No newline at end of file diff --git a/java/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/java/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite index c506956088..add67bb498 100644 --- a/java/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite +++ b/java/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://callback" name="CallBackBasicTest"> diff --git a/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml b/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml index adf28214f6..6088a1d666 100644 --- a/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml +++ b/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://callback" +<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://callback" xmlns:t="http://callback"> <deployable composite="t:CallBackBasicTest" /> </contribution>
\ No newline at end of file diff --git a/java/sca/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/java/sca/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite index 3f48f16389..21b7946a98 100644 --- a/java/sca/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite +++ b/java/sca/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://callback" name="CallBackCTypeTest"> diff --git a/java/sca/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/java/sca/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType index ff38134df5..0d37198fce 100644 --- a/java/sca/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType +++ b/java/sca/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" > +<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" > <service name="CallBackCTypeService">
<interface.java interface="org.apache.tuscany.sca.test.CallBackCTypeService"
diff --git a/java/sca/itest/callback-id/src/main/resources/CallBackIdClient.composite b/java/sca/itest/callback-id/src/main/resources/CallBackIdClient.composite index c9a6ba6258..f1bee66af0 100644 --- a/java/sca/itest/callback-id/src/main/resources/CallBackIdClient.composite +++ b/java/sca/itest/callback-id/src/main/resources/CallBackIdClient.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://callback" name="CallBackIdTest"> diff --git a/java/sca/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite b/java/sca/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite index 3dae3ca3a8..3ed96dd215 100644 --- a/java/sca/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite +++ b/java/sca/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
targetNamespace="http://callback"
name="CallbackMultiWireTest">
diff --git a/java/sca/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite b/java/sca/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite index e111e5074c..c20cf91b7d 100644 --- a/java/sca/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite +++ b/java/sca/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://callback" name="CallBackSeparateThreadTest">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://callback" name="CallBackSeparateThreadTest">
<component name="CallBackSeparateThreadClient">
<implementation.java class="org.apache.tuscany.sca.itest.CallBackSeparateThreadClientImpl"/>
diff --git a/java/sca/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite b/java/sca/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite index 3552ddecab..8165454ea8 100644 --- a/java/sca/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite +++ b/java/sca/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://callback" name="CallBackSetCallbackTest"> diff --git a/java/sca/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite b/java/sca/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite index ce73417f94..15664b1231 100644 --- a/java/sca/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite +++ b/java/sca/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://callback" name="CallBackSetCallbackConvTest"> diff --git a/java/sca/itest/component-type/src/main/resources/Calculator.composite b/java/sca/itest/component-type/src/main/resources/Calculator.composite index b229787657..626e2a603b 100644 --- a/java/sca/itest/component-type/src/main/resources/Calculator.composite +++ b/java/sca/itest/component-type/src/main/resources/Calculator.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
targetNamespace="http://sample"
xmlns:sample="http://sample"
name="Calculator">
diff --git a/java/sca/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType b/java/sca/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType index 00c48e5a35..b3941440ba 100644 --- a/java/sca/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType +++ b/java/sca/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712">
<service name="AddService">
<interface.java interface="calculator.AddService"/>
diff --git a/java/sca/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType b/java/sca/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType index 74bedc0a98..554847f0e0 100644 --- a/java/sca/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType +++ b/java/sca/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712">
<service name="CalculatorService">
<interface.java interface="calculator.CalculatorService"/>
diff --git a/java/sca/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType b/java/sca/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType index 289fcc3e11..adb0a3d490 100644 --- a/java/sca/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType +++ b/java/sca/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712">
<service name="DivideService">
<interface.java interface="calculator.DivideService"/>
diff --git a/java/sca/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType b/java/sca/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType index 2d8a879cda..6d0915403a 100644 --- a/java/sca/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType +++ b/java/sca/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712">
<service name="MultiplyService">
<interface.java interface="calculator.MultiplyService"/>
diff --git a/java/sca/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType b/java/sca/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType index 6214955141..2ce72b4d47 100644 --- a/java/sca/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType +++ b/java/sca/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712">
<service name="SubtractService">
<interface.java interface="calculator.SubtractService"/>
diff --git a/java/sca/itest/conversations/src/main/resources/ConversationAge.composite b/java/sca/itest/conversations/src/main/resources/ConversationAge.composite index abd1c35ced..cd82031453 100644 --- a/java/sca/itest/conversations/src/main/resources/ConversationAge.composite +++ b/java/sca/itest/conversations/src/main/resources/ConversationAge.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
name="ConversationalIdTest">
<component name="ConversationAgeComponent">
diff --git a/java/sca/itest/conversations/src/main/resources/ConversationUniqueId.composite b/java/sca/itest/conversations/src/main/resources/ConversationUniqueId.composite index 831449a079..68070d7446 100644 --- a/java/sca/itest/conversations/src/main/resources/ConversationUniqueId.composite +++ b/java/sca/itest/conversations/src/main/resources/ConversationUniqueId.composite @@ -20,7 +20,7 @@ <!-- $Rev$ $Date$ --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://conversations" name="ConversationUniqueIdTest"> diff --git a/java/sca/itest/conversations/src/main/resources/conversationId.composite b/java/sca/itest/conversations/src/main/resources/conversationId.composite index e61eb08194..2abada3397 100644 --- a/java/sca/itest/conversations/src/main/resources/conversationId.composite +++ b/java/sca/itest/conversations/src/main/resources/conversationId.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
name="ConversationalIdTest">
<component name="ConversationIdComponent">
diff --git a/java/sca/itest/conversations/src/main/resources/conversationLifetime.composite b/java/sca/itest/conversations/src/main/resources/conversationLifetime.composite index 3b79dc43d9..4e994de7ce 100644 --- a/java/sca/itest/conversations/src/main/resources/conversationLifetime.composite +++ b/java/sca/itest/conversations/src/main/resources/conversationLifetime.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://conversations" name="conversationLifetimeTest"> diff --git a/java/sca/itest/conversations/src/main/resources/conversational.composite b/java/sca/itest/conversations/src/main/resources/conversational.composite index 4da3ce74d5..abe13badb8 100644 --- a/java/sca/itest/conversations/src/main/resources/conversational.composite +++ b/java/sca/itest/conversations/src/main/resources/conversational.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
targetNamespace="http://conversations"
name="ConversationalITest">
diff --git a/java/sca/itest/distribution/bin-distro-unzip/pom.xml b/java/sca/itest/distribution/bin-distro-unzip/pom.xml index e81becaf3e..2443de209a 100644 --- a/java/sca/itest/distribution/bin-distro-unzip/pom.xml +++ b/java/sca/itest/distribution/bin-distro-unzip/pom.xml @@ -71,6 +71,7 @@ </goals>
<configuration>
<tasks>
+ <property name="java.home" value="${java.home}"/>
<ant antfile="./build.xml" />
</tasks>
</configuration>
@@ -120,6 +121,7 @@ </goals>
<configuration>
<tasks>
+ <property name="java.home" value="${java.home}"/>
<ant antfile="./build.xml" />
</tasks>
</configuration>
diff --git a/java/sca/itest/exceptions/src/main/resources/ExceptionTest.composite b/java/sca/itest/exceptions/src/main/resources/ExceptionTest.composite index d27797c2fe..4c196247d3 100644 --- a/java/sca/itest/exceptions/src/main/resources/ExceptionTest.composite +++ b/java/sca/itest/exceptions/src/main/resources/ExceptionTest.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:foo="http://foo" targetNamespace="http://foo" +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:foo="http://foo" targetNamespace="http://foo" name="ExceptionTest"> <component name="main"> <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.ExceptionHandlerImpl" /> diff --git a/java/sca/itest/interfaces/src/main/resources/InterfacesTest.composite b/java/sca/itest/interfaces/src/main/resources/InterfacesTest.composite index 0361d8c83c..ec5adc67e6 100644 --- a/java/sca/itest/interfaces/src/main/resources/InterfacesTest.composite +++ b/java/sca/itest/interfaces/src/main/resources/InterfacesTest.composite @@ -16,7 +16,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:foo="http://foo" targetNamespace="http://foo"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:foo="http://foo" targetNamespace="http://foo"
name="InterfacesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<component name="LocalClientComponent">
diff --git a/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite b/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite index 70a251fa16..c0e2fa32d5 100644 --- a/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite +++ b/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
name="ConstructorPropertyInjection">
<component name="Foo1Component">
diff --git a/java/sca/itest/properties/src/main/resources/Outer.composite b/java/sca/itest/properties/src/main/resources/Outer.composite index b3e529e8b5..587557461e 100644 --- a/java/sca/itest/properties/src/main/resources/Outer.composite +++ b/java/sca/itest/properties/src/main/resources/Outer.composite @@ -16,9 +16,9 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
xmlns:foo="http://foo" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0" name="Iteration3Composite"
+ xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200712 http://docs.oasis-open.org/ns/opencsa/sca/200712" name="Iteration3Composite"
targetNamespace="http://foo" local="true" autowire="false">
<property name="newLocation" type="xsd:anyURI">Raleigh</property>
diff --git a/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite b/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite index 5237e964a3..87840ba16b 100644 --- a/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite +++ b/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite @@ -16,7 +16,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
xmlns:foo="http://foo"
targetNamespace="http://foo"
name="OuterPropertyTest" diff --git a/java/sca/itest/properties/src/main/resources/PropertyTest.composite b/java/sca/itest/properties/src/main/resources/PropertyTest.composite index 75deddbdad..e5a92e7d52 100644 --- a/java/sca/itest/properties/src/main/resources/PropertyTest.composite +++ b/java/sca/itest/properties/src/main/resources/PropertyTest.composite @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:foo="http://foo" xmlns:cust="http://www.example.com/Customer" xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" diff --git a/java/sca/itest/properties/src/main/resources/mySimpleService.composite b/java/sca/itest/properties/src/main/resources/mySimpleService.composite index 75fdd24add..1d2bdbf4f8 100644 --- a/java/sca/itest/properties/src/main/resources/mySimpleService.composite +++ b/java/sca/itest/properties/src/main/resources/mySimpleService.composite @@ -18,9 +18,9 @@ * under the License.
-->
<composite autowire="false" local="true" name="MySimpleService"
- targetNamespace="http://foo" xmlns:foo="http://foo" xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ targetNamespace="http://foo" xmlns:foo="http://foo" xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0 ">
+ xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200712 http://docs.oasis-open.org/ns/opencsa/sca/200712 ">
<service name="MyServiceNew1" promote="MyServiceComponentNew/MyService">
diff --git a/java/sca/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite b/java/sca/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite index 975f61c664..f5935ca16a 100644 --- a/java/sca/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite +++ b/java/sca/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite @@ -18,10 +18,10 @@ * under the License. --> <composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://www.osoa.org/xmlns/sca/1.0" + xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:foo="http://foo" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0" + xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200712 http://docs.oasis-open.org/ns/opencsa/sca/200712" name="TotalComposite1Auto" targetNamespace="http://foo" local="true" diff --git a/java/sca/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite b/java/sca/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite index f9bbcc76d8..00f55085be 100644 --- a/java/sca/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite +++ b/java/sca/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite @@ -18,10 +18,10 @@ * under the License. --> <composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://www.osoa.org/xmlns/sca/1.0" + xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:foo="http://foo" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0" + xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200712 http://docs.oasis-open.org/ns/opencsa/sca/200712" name="TotalComposite2Auto" targetNamespace="http://foo" local="true" diff --git a/java/sca/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite b/java/sca/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite index 09fd10fb7e..3b7d40cbc0 100644 --- a/java/sca/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite +++ b/java/sca/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite @@ -18,10 +18,10 @@ * under the License. --> <composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://www.osoa.org/xmlns/sca/1.0" + xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:foo="http://foo" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0" + xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200712 http://docs.oasis-open.org/ns/opencsa/sca/200712" name="TotalComposite3Auto" targetNamespace="http://foo" local="true" diff --git a/java/sca/itest/references/src/main/resources/AutoWiredReferencesTest.composite b/java/sca/itest/references/src/main/resources/AutoWiredReferencesTest.composite index 894f6681c2..c766523e1b 100644 --- a/java/sca/itest/references/src/main/resources/AutoWiredReferencesTest.composite +++ b/java/sca/itest/references/src/main/resources/AutoWiredReferencesTest.composite @@ -16,7 +16,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:foo="http://foo" targetNamespace="http://foo"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:foo="http://foo" targetNamespace="http://foo"
name="AutowireReferencesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autowire="true">
<service name="AComponent" promote="AComponent">
diff --git a/java/sca/itest/references/src/main/resources/InnerReferencesTest.composite b/java/sca/itest/references/src/main/resources/InnerReferencesTest.composite index 6cadc52c13..30af4621ed 100644 --- a/java/sca/itest/references/src/main/resources/InnerReferencesTest.composite +++ b/java/sca/itest/references/src/main/resources/InnerReferencesTest.composite @@ -16,7 +16,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:foo="http://foo" targetNamespace="http://foo"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:foo="http://foo" targetNamespace="http://foo"
name="InnerReferencesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<service name="AComponent" promote="AComponent">
diff --git a/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite b/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite index 708960974b..8b243e280d 100644 --- a/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite +++ b/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:foo="http://foo" targetNamespace="http://foo" +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:foo="http://foo" targetNamespace="http://foo" name="ManualWiredReferencesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autowire="true"> <service name="AComponent" promote="AComponent"> diff --git a/java/sca/itest/scopes/src/main/resources/scopes.composite b/java/sca/itest/scopes/src/main/resources/scopes.composite index 54a1b66830..6e706ca485 100644 --- a/java/sca/itest/scopes/src/main/resources/scopes.composite +++ b/java/sca/itest/scopes/src/main/resources/scopes.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
name="Scopes">
<!-- Components used to test scopes. -->
diff --git a/java/sca/itest/services/src/main/resources/META-INF/sca-contribution.xml b/java/sca/itest/services/src/main/resources/META-INF/sca-contribution.xml index 37ea8f677d..60b8a9c931 100644 --- a/java/sca/itest/services/src/main/resources/META-INF/sca-contribution.xml +++ b/java/sca/itest/services/src/main/resources/META-INF/sca-contribution.xml @@ -17,6 +17,6 @@ * specific language governing permissions and limitations * under the License. --> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://foo" xmlns:foo="http://foo"> +<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://foo" xmlns:foo="http://foo"> <deployable composite="foo:InnerServicesTest" /> </contribution>
\ No newline at end of file diff --git a/java/sca/itest/services/src/main/resources/ServicesTest.composite b/java/sca/itest/services/src/main/resources/ServicesTest.composite index eda885f9ec..14cc7ba860 100644 --- a/java/sca/itest/services/src/main/resources/ServicesTest.composite +++ b/java/sca/itest/services/src/main/resources/ServicesTest.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:foo="http://foo" targetNamespace="http://foo"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:foo="http://foo" targetNamespace="http://foo"
name="InnerServicesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<component name="AComponent1">
diff --git a/java/sca/itest/wires/src/main/resources/WireTest.composite b/java/sca/itest/wires/src/main/resources/WireTest.composite index 8b764d0e7d..5f68a84eeb 100644 --- a/java/sca/itest/wires/src/main/resources/WireTest.composite +++ b/java/sca/itest/wires/src/main/resources/WireTest.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://wires" name="WireTest">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://wires" name="WireTest">
<component name="WireClient">
<implementation.java class="org.apache.tuscany.sca.itest.WireClientImpl"/>
|