tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lrese...@apache.org
Subject svn commit: r956786 - in /tuscany/sca-java-2.x/trunk: distribution/all/src/main/release/bin/ itest/implementation-spring/ modules/implementation-spring-sca/ modules/implementation-spring-sca/META-INF/ modules/implementation-spring-sca/src/main/java/org...
Date Tue, 22 Jun 2010 06:25:10 GMT
Author: lresende
Date: Tue Jun 22 06:25:10 2010
New Revision: 956786

URL: http://svn.apache.org/viewvc?rev=956786&view=rev
Log:
TUSCANY-3605 - Moving Spring dependency to 3.0.2.RELEASE

Modified:
    tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
    tuscany/sca-java-2.x/trunk/itest/implementation-spring/pom.xml
    tuscany/sca-java-2.x/trunk/modules/implementation-spring-sca/META-INF/MANIFEST.MF
    tuscany/sca-java-2.x/trunk/modules/implementation-spring-sca/pom.xml
    tuscany/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java
    tuscany/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java

Modified: tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE?rev=956786&r1=956785&r2=956786&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE (original)
+++ tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE Tue Jun 22 06:25:10
2010
@@ -311,9 +311,12 @@ The following components come under Apac
  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

Modified: tuscany/sca-java-2.x/trunk/itest/implementation-spring/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/implementation-spring/pom.xml?rev=956786&r1=956785&r2=956786&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/implementation-spring/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/implementation-spring/pom.xml Tue Jun 22 06:25:10 2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/modules/implementation-spring-sca/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-spring-sca/META-INF/MANIFEST.MF?rev=956786&r1=956785&r2=956786&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-spring-sca/META-INF/MANIFEST.MF (original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-spring-sca/META-INF/MANIFEST.MF Tue
Jun 22 06:25:10 2010
@@ -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"
 

Modified: tuscany/sca-java-2.x/trunk/modules/implementation-spring-sca/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-spring-sca/pom.xml?rev=956786&r1=956785&r2=956786&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-spring-sca/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-spring-sca/pom.xml Tue Jun 22 06:25:10
2010
@@ -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>

Modified: tuscany/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java?rev=956786&r1=956785&r2=956786&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java
(original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java
Tue Jun 22 06:25:10 2010
@@ -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 implem
          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;

Modified: tuscany/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java?rev=956786&r1=956785&r2=956786&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
(original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
Tue Jun 22 06:25:10 2010
@@ -50,7 +50,7 @@ public class SpringImplementationTie {
     }
     
     public String getURI() {
-        throw new IllegalStateException("Not yet impl");
+        return implementation.getURI();
     }
 
     public String getComponentName() {



Mime
View raw message