Fixes for TUSCANY-3096

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

1 files changed, 12 insertions, 3 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 b7deeb2eb5..5a487436c9 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,6 +38,8 @@ public class SpringImplementationProviderFactory implements ImplementationProvid
 

     private ProxyFactory proxyFactory;

     private JavaPropertyValueObjectFactory propertyFactory;

+    private AnnotationProcessorExtensionPoint annotationProcessor;

+    private boolean annotationSupport;

 

     /**

      * Simple constructor

@@ -47,8 +49,14 @@ public class SpringImplementationProviderFactory implements ImplementationProvid
         super();

         

         ProxyFactoryExtensionPoint proxyFactories = extensionPoints.getExtensionPoint(ProxyFactoryExtensionPoint.class); 

-        proxyFactory = new ExtensibleProxyFactory(proxyFactories); 

-

+        proxyFactory = new ExtensibleProxyFactory(proxyFactories);

+        

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

+        if (annotationProcessor == null) {

+        	annotationProcessor = new DefaultAnnotationProcessorExtensionPoint();

+        }

+        annotationSupport = annotationProcessor.isAnnotationSupported();

+        

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

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

     }

@@ -65,7 +73,8 @@ public class SpringImplementationProviderFactory implements ImplementationProvid
         return new SpringImplementationProvider(component, 

                                                 implementation, 

                                                 proxyFactory, 

-                                                propertyFactory);

+                                                propertyFactory,

+                                                annotationSupport);

     }

 

     /**