TUSCANY-3605 - Moving Spring dependency to 3.0.2.RELEASE

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

6 files changed, 36 insertions, 20 deletions

diff --git a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
index 4586f6b833..ea62f833e2 100644
--- a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
@@ -311,9 +311,12 @@ The following components come under Apache Software License 2.0
  rampart-trust-1.4.jar

  regexp-1.3.jar

  rome-1.0.jar

- spring-beans-2.5.6.jar

- spring-context-2.5.6.jar

- spring-core-2.5.6.jar

+ spring-aop-3.0.2.RELEASE.jar
+ spring-asm-3.0.2.RELEASE.jar
+ spring-beans-3.0.2.RELEASE.jar

+ spring-context-3.0.2.RELEASE.jar

+ spring-core-3.0.2.RELEASE.jar
+ spring-expression-3.0.2.RELEASE.jar

  stripes-1.5.2.jar

  tranql-connector-1.1.jar

  tribes-6.0.26.jar

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 5c3c99567a..f98b54386e 100644
--- a/sca-java-2.x/trunk/itest/implementation-spring/pom.xml
+++ b/sca-java-2.x/trunk/itest/implementation-spring/pom.xml
@@ -74,19 +74,19 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>2.5.5</version>
+            <version>3.0.2.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
-            <version>2.5.5</version>
+            <version>3.0.2.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>2.5.5</version>
+            <version>3.0.2.RELEASE</version>
         </dependency>
     </dependencies>
 </project>
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-sca/META-INF/MANIFEST.MF
index 3d2fe4bcbd..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-sca/META-INF/MANIFEST.MF
@@ -11,14 +11,14 @@ Bundle-DocURL: http://www.apache.org/
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
 Import-Package: org.oasisopen.sca;version="2.0.0",

  org.oasisopen.sca.annotation;version="2.0.0",

- org.springframework.beans;version="2.5.6",

- org.springframework.beans.factory;version="2.5.6",

- org.springframework.beans.factory.annotation;version="2.5.6",

- org.springframework.beans.factory.config;version="2.5.6",

- org.springframework.beans.factory.support;version="2.5.6",

- org.springframework.beans.factory.xml;version="2.5.6",

- org.springframework.context;version="2.5.6",

- org.springframework.context.support;version="2.5.6",

- org.springframework.core.io;version="2.5.6",

- org.springframework.util;version="2.5.6"

+ org.springframework.beans;version="3.0.2.RELEASE",

+ org.springframework.beans.factory;version="3.0.2.RELEASE",

+ org.springframework.beans.factory.annotation;version="3.0.2.RELEASE",

+ org.springframework.beans.factory.config;version="3.0.2.RELEASE",

+ org.springframework.beans.factory.support;version="3.0.2.RELEASE",

+ org.springframework.beans.factory.xml;version="3.0.2.RELEASE",

+ org.springframework.context;version="3.0.2.RELEASE",

+ org.springframework.context.support;version="3.0.2.RELEASE",

+ org.springframework.core.io;version="3.0.2.RELEASE",

+ org.springframework.util;version="3.0.2.RELEASE"

 

diff --git a/sca-java-2.x/trunk/modules/implementation-spring-sca/pom.xml b/sca-java-2.x/trunk/modules/implementation-spring-sca/pom.xml
index 86ea9f9a63..60ee50a890 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-sca/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-spring-sca/pom.xml
@@ -51,19 +51,19 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>2.5.6</version>
+            <version>3.0.2.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
-            <version>2.5.6</version>
+            <version>3.0.2.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>2.5.6</version>
+            <version>3.0.2.RELEASE</version>
         </dependency>
 
     </dependencies>
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-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java
index 5ea1c2fd9d..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-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java
@@ -19,6 +19,7 @@
 package org.apache.tuscany.sca.implementation.spring.runtime.context;
 
 import java.io.IOException;
+import java.lang.annotation.Annotation;
 import java.util.Locale;
 import java.util.Map;
 
@@ -75,6 +76,18 @@ class SCAParentApplicationContext implements ApplicationContext {
          return getBean(name, ((Class)null));
     }
 
+    public <T> T getBean(Class<T> clazz) throws BeansException {
+        return clazz.cast(implementation.getBean(clazz.getName(), clazz));
+    }
+
+    public Map<String, Object> getBeansWithAnnotation(Class<? extends Annotation> clazz) throws BeansException {
+        return null;
+    }
+
+    public <A extends Annotation> A findAnnotationOnBean(String arg0, Class<A> clazz) {
+        return null;
+    }
+
     public boolean containsBean(String name) {
         // TODO
         return false;
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
index 6caa5207e4..a65db51449 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
@@ -50,7 +50,7 @@ public class SpringImplementationTie {
     }
     
     public String getURI() {
-        throw new IllegalStateException("Not yet impl");
+        return implementation.getURI();
     }
 
     public String getComponentName() {