Fixes for Spring iTest

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@767105 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 22 insertions, 45 deletions

diff --git a/java/sca/itest/implementation-spring/pom.xml b/java/sca/itest/implementation-spring/pom.xml
index daaafb5730..fef74cf09e 100644
--- a/java/sca/itest/implementation-spring/pom.xml
+++ b/java/sca/itest/implementation-spring/pom.xml
@@ -39,35 +39,12 @@
             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-node-impl</artifactId>

             <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

         </dependency>

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-implementation-spring-runtime</artifactId>

             <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-policy-security</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

         </dependency>

         

         <!-- Spring dependencies... -->

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 3733c5c89b..8863553419 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
@@ -17,11 +17,11 @@
  * 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"

+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+           targetNamespace="http://contextaccess"

+           xmlns:sample="http://contextaccess"

            name="ContextAccess"

-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">

+           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">

 

     <component name="CalculatorServiceComponent">

         <implementation.spring location="META-INF/sca/context-access/CalculatorService-context.xml"/>

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 b9fe8af17a..2d6705ce56 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
@@ -17,11 +17,11 @@
  * 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"

+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+           targetNamespace="http://contextimports"

+           xmlns:sample="http://contextimports"

            name="ContextImports"

-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">

+           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">

 

     <component name="CalculatorServiceComponent">

         <implementation.spring location="META-INF/sca/context-imports/SpringImport-context.xml"/>

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 b53a625e2e..a416244258 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
@@ -17,10 +17,10 @@
  * 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"

+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+	targetNamespace="http://multiplecontext"

+	xmlns:hw="http://multiplecontext"

       name="MultipleContext">

     

     <service name="StockQuoteService" promote="StockQuoteServiceComponent">

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 7fc7545b7f..3eefec80cf 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
@@ -17,11 +17,11 @@
  * 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"

+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+           targetNamespace="http://implementationpolicies"

+           xmlns:sample="http://implementationpolicies"

            name="ImplementationPolicies"

-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">

+           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">

 

     <component name="CalculatorServiceComponent">

         <implementation.spring location="META-INF/sca/implementation-policies/CalculatorService-context.xml">		

diff --git a/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml b/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml
index 992c1b92f5..94e4997734 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml
+++ b/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml
@@ -17,8 +17,8 @@
     * 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"

+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"

+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

     xmlns:calc="http://calculator">

 

     <!-- PolicySets -->

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 fc1587d6da..b22d8b5a01 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
@@ -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/200903"

            name="SpringHelloWorld">

 

     <component name="ClientComponent">

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 4bac799a5d..42c67ffa39 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
@@ -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/200903"

            name="SpringHelloWorld">

 

     <component name="ClientComponent">

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 a8a1f5b703..8f8c01a451 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
@@ -17,11 +17,11 @@
  * 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/200903"

            targetNamespace="http://sample"

            xmlns:sample="http://sample"

            name="Calculator"

-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">

+           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">

 

     <component name="CalculatorServiceComponent">

         <implementation.spring location="META-INF/sca/spring-annotation/CalculatorService-context.xml"/>