Modified fixes for TUSCANY-3096

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

1 files changed, 9 insertions, 6 deletions

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java
index 5a487436c9..4796aa0de9 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java
@@ -38,8 +38,9 @@ public class SpringImplementationProviderFactory implements ImplementationProvid
 

     private ProxyFactory proxyFactory;

     private JavaPropertyValueObjectFactory propertyFactory;

-    private AnnotationProcessorExtensionPoint annotationProcessor;

+    private ConfigurationPropertiesExtensionPoint configProperties;

     private boolean annotationSupport;

+    private String versionSupported;

 

     /**

      * Simple constructor

@@ -51,11 +52,12 @@ public class SpringImplementationProviderFactory implements ImplementationProvid
         ProxyFactoryExtensionPoint proxyFactories = extensionPoints.getExtensionPoint(ProxyFactoryExtensionPoint.class); 

         proxyFactory = new ExtensibleProxyFactory(proxyFactories);

         

-        annotationProcessor = extensionPoints.getExtensionPoint(AnnotationProcessorExtensionPoint.class);

-        if (annotationProcessor == null) {

-        	annotationProcessor = new DefaultAnnotationProcessorExtensionPoint();

+        configProperties = extensionPoints.getExtensionPoint(ConfigurationPropertiesExtensionPoint.class);

+        if (configProperties == null) {

+        	configProperties = new DefaultConfigurationPropertiesExtensionPoint();

         }

-        annotationSupport = annotationProcessor.isAnnotationSupported();

+        annotationSupport = configProperties.isAnnotationSupported();

+        versionSupported = configProperties.getSupportedVersion();

         

         // TODO: could the runtime have a default PropertyValueObjectFactory?

         propertyFactory = new JavaPropertyValueObjectFactory(new MediatorImpl(extensionPoints));

@@ -74,7 +76,8 @@ public class SpringImplementationProviderFactory implements ImplementationProvid
                                                 implementation, 

                                                 proxyFactory, 

                                                 propertyFactory,

-                                                annotationSupport);

+                                                annotationSupport,

+                                                versionSupported);

     }

 

     /**