You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ra...@apache.org on 2009/04/21 12:26:29 UTC

svn commit: r767105 - in /tuscany/java/sca/itest/implementation-spring: ./ src/main/resources/context/access/ src/main/resources/context/imports/ src/main/resources/context/multiple/ src/main/resources/implementation/policies/ src/main/resources/org/ap...

Author: ramkumar
Date: Tue Apr 21 10:26:28 2009
New Revision: 767105

URL: http://svn.apache.org/viewvc?rev=767105&view=rev
Log:
Fixes for Spring iTest

Modified:
    tuscany/java/sca/itest/implementation-spring/pom.xml
    tuscany/java/sca/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite
    tuscany/java/sca/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite
    tuscany/java/sca/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
    tuscany/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
    tuscany/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml
    tuscany/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
    tuscany/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
    tuscany/java/sca/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite

Modified: tuscany/java/sca/itest/implementation-spring/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/pom.xml?rev=767105&r1=767104&r2=767105&view=diff
==============================================================================
--- tuscany/java/sca/itest/implementation-spring/pom.xml (original)
+++ tuscany/java/sca/itest/implementation-spring/pom.xml Tue Apr 21 10:26:28 2009
@@ -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... -->

Modified: tuscany/java/sca/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite?rev=767105&r1=767104&r2=767105&view=diff
==============================================================================
--- tuscany/java/sca/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite (original)
+++ tuscany/java/sca/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite Tue Apr 21 10:26:28 2009
@@ -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"/>

Modified: tuscany/java/sca/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite?rev=767105&r1=767104&r2=767105&view=diff
==============================================================================
--- tuscany/java/sca/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite (original)
+++ tuscany/java/sca/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite Tue Apr 21 10:26:28 2009
@@ -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"/>

Modified: tuscany/java/sca/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite?rev=767105&r1=767104&r2=767105&view=diff
==============================================================================
--- tuscany/java/sca/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite (original)
+++ tuscany/java/sca/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite Tue Apr 21 10:26:28 2009
@@ -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">

Modified: tuscany/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite?rev=767105&r1=767104&r2=767105&view=diff
==============================================================================
--- tuscany/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite (original)
+++ tuscany/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite Tue Apr 21 10:26:28 2009
@@ -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">		

Modified: tuscany/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml?rev=767105&r1=767104&r2=767105&view=diff
==============================================================================
--- tuscany/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml (original)
+++ tuscany/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml Tue Apr 21 10:26:28 2009
@@ -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 -->

Modified: tuscany/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite?rev=767105&r1=767104&r2=767105&view=diff
==============================================================================
--- tuscany/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite (original)
+++ tuscany/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite Tue Apr 21 10:26:28 2009
@@ -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">

Modified: tuscany/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite?rev=767105&r1=767104&r2=767105&view=diff
==============================================================================
--- tuscany/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite (original)
+++ tuscany/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite Tue Apr 21 10:26:28 2009
@@ -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">

Modified: tuscany/java/sca/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite?rev=767105&r1=767104&r2=767105&view=diff
==============================================================================
--- tuscany/java/sca/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite (original)
+++ tuscany/java/sca/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite Tue Apr 21 10:26:28 2009
@@ -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"/>