29 files changed, 7 insertions, 7 deletions

diff --git a/sca-java-2.x/trunk/features/ejava/pom.xml b/sca-java-2.x/trunk/features/ejava/pom.xml
index 1c94279b7c..970d2e759c 100644
--- a/sca-java-2.x/trunk/features/ejava/pom.xml
+++ b/sca-java-2.x/trunk/features/ejava/pom.xml
@@ -105,7 +105,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring-sca</artifactId>
+            <artifactId>tuscany-implementation-spring-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/itest/distribution/src-distro-rat/pom.xml b/sca-java-2.x/trunk/itest/distribution/src-distro-rat/pom.xml
index ab645ce4d5..541b1c9830 100644
--- a/sca-java-2.x/trunk/itest/distribution/src-distro-rat/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/src-distro-rat/pom.xml
@@ -65,8 +65,8 @@
                               <exclude>tuscany-sca-2.0-SNAPSHOT-src/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config</exclude>
                               <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/modules/modules.list</exclude>
                               <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/services/services.list</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/implementation-spring-sca/src/main/resources/META-INF/spring.handlers</exclude>
-                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/implementation-spring-sca/src/main/resources/META-INF/spring.schemas</exclude>
+                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.handlers</exclude>
+                              <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.schemas</exclude>
 
                               <!-- these ones we need to implement RAT license processors to handle the non-AL headers, just exclude for now -->
                               <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/assembly-xsd/**/*.*</exclude>
diff --git a/sca-java-2.x/trunk/itest/implementation-spring/pom.xml b/sca-java-2.x/trunk/itest/implementation-spring/pom.xml
index f98b54386e..ac5265d026 100644
--- a/sca-java-2.x/trunk/itest/implementation-spring/pom.xml
+++ b/sca-java-2.x/trunk/itest/implementation-spring/pom.xml
@@ -48,7 +48,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring-sca</artifactId>
+            <artifactId>tuscany-implementation-spring-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/LICENSE b/sca-java-2.x/trunk/modules/implementation-spring-runtime/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/LICENSE
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/LICENSE
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/implementation-spring-runtime/META-INF/MANIFEST.MF
index 4a228362df..4a228362df 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/NOTICE b/sca-java-2.x/trunk/modules/implementation-spring-runtime/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/NOTICE
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/NOTICE
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/README b/sca-java-2.x/trunk/modules/implementation-spring-runtime/README
index e1b1f98fe0..e1b1f98fe0 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/README
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/README
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/pom.xml b/sca-java-2.x/trunk/modules/implementation-spring-runtime/pom.xml
index 60ee50a890..ef3a2dd0ac 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/pom.xml
@@ -25,7 +25,7 @@
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>tuscany-implementation-spring-sca</artifactId>
+    <artifactId>tuscany-implementation-spring-runtime</artifactId>
     <name>Apache Tuscany SCA Spring Implementation Runtime Model</name>
 
     <dependencies>
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/SCANamespaceHandlerResolver.java b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/SCANamespaceHandlerResolver.java
index 75e00007f6..75e00007f6 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/SCANamespaceHandlerResolver.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/SCANamespaceHandlerResolver.java
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaNamespaceHandler.java b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaNamespaceHandler.java
index f136e45b87..f136e45b87 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaNamespaceHandler.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaNamespaceHandler.java
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaPropertyBeanDefinitionParser.java b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaPropertyBeanDefinitionParser.java
index 5b1064d8d8..5b1064d8d8 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaPropertyBeanDefinitionParser.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaPropertyBeanDefinitionParser.java
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java
index fac02760c9..fac02760c9 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaServiceBeanDefinitionParser.java b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaServiceBeanDefinitionParser.java
index 3020dca8bc..3020dca8bc 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaServiceBeanDefinitionParser.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaServiceBeanDefinitionParser.java
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
index 7613f8166d..7613f8166d 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentStub.java b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentStub.java
index c72ccd6636..c72ccd6636 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentStub.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentStub.java
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
index 7eb63678f6..7eb63678f6 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
index 477582b1d3..477582b1d3 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
index f800654c34..f800654c34 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyValueStub.java b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyValueStub.java
index ea8f560ae1..ea8f560ae1 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyValueStub.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyValueStub.java
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
index dd43d63d97..dd43d63d97 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAGenericApplicationContext.java b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAGenericApplicationContext.java
index 6426306f26..6426306f26 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAGenericApplicationContext.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAGenericApplicationContext.java
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java
index 36f1f6d761..36f1f6d761 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java
index 77681b600f..77681b600f 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java
index af39869522..af39869522 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/resources/META-INF/spring.handlers b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.handlers
index 6d29e21024..6d29e21024 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/resources/META-INF/spring.handlers
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.handlers
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/resources/META-INF/spring.schemas b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.schemas
index 249cc21c13..249cc21c13 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/resources/META-INF/spring.schemas
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.schemas
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/resources/org/springframework/sca/xml/spring-sca.xsd b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
index dfa0b931f6..dfa0b931f6 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
diff --git a/sca-java-2.x/trunk/modules/pom.xml b/sca-java-2.x/trunk/modules/pom.xml
index 48bee7a6be..07993c5aed 100644
--- a/sca-java-2.x/trunk/modules/pom.xml
+++ b/sca-java-2.x/trunk/modules/pom.xml
@@ -92,7 +92,7 @@
         <module>implementation-java</module>
         <module>implementation-java-runtime</module>
         <module>implementation-spring</module>
-        <module>implementation-spring-sca</module>
+        <module>implementation-spring-runtime</module>
         <module>implementation-web</module>
         <module>implementation-web-client</module>
         <module>implementation-web-runtime</module>
diff --git a/sca-java-2.x/trunk/shades/spring/pom.xml b/sca-java-2.x/trunk/shades/spring/pom.xml
index 8ff946b2b9..1697669788 100644
--- a/sca-java-2.x/trunk/shades/spring/pom.xml
+++ b/sca-java-2.x/trunk/shades/spring/pom.xml
@@ -61,7 +61,7 @@
         </dependency>

         <dependency>

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

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

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

             <version>${pom.version}</version>

             <exclusions>

                 <exclusion>