From 8d7bfe07035515556840fa330504f07c38b86267 Mon Sep 17 00:00:00 2001 From: ramkumar Date: Mon, 29 Jun 2009 07:07:33 +0000 Subject: Modified fixes for TUSCANY-3096 git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@789238 13f79535-47bb-0310-9956-ffa450edef68 --- .../implementation/spring/runtime/context/SpringContextTie.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org') diff --git a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java b/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java index bf7d133d01..9e56eac6cd 100644 --- a/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java +++ b/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java @@ -56,12 +56,15 @@ public class SpringContextTie { private AbstractApplicationContext springContext; private SpringImplementationStub implementation; private boolean isAnnotationSupported; + private String versionSupported; - public SpringContextTie(SpringImplementationStub implementation, URL resource, boolean annotationSupport) throws Exception { + public SpringContextTie(SpringImplementationStub implementation, URL resource, boolean annotationSupport, String versionSupported) throws Exception { this.implementation = implementation; this.isAnnotationSupported = annotationSupport; - if ((SpringVersion.getVersion()!= null) && (! SpringVersion.getVersion().equals("2.5.5"))) { - throw new RuntimeException("Unsupported version: Use only Spring Framework Version 2.5.5"); + this.versionSupported = versionSupported; + if (! this.versionSupported.equals("ANY")) { + if ((SpringVersion.getVersion()!= null) && (! SpringVersion.getVersion().equals(versionSupported))) + throw new RuntimeException("Unsupported version: Use only Spring Framework Version " + versionSupported); } SCAParentApplicationContext scaParentContext = new SCAParentApplicationContext(implementation); springContext = createApplicationContext(scaParentContext, resource); -- cgit v1.2.3