Merge all changes from 1.5.2 branch into trunk

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

1 files changed, 13 insertions, 3 deletions

diff --git a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
index 1d941e2a4f..29dc0a38a1 100644
--- a/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
+++ b/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
@@ -39,11 +39,13 @@ import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
 import org.apache.tuscany.sca.contribution.service.ContributionWriteException;

 import org.apache.tuscany.sca.implementation.spring.SpringImplementation;

 import org.apache.tuscany.sca.implementation.spring.introspect.SpringXMLComponentTypeLoader;

+import org.apache.tuscany.sca.implementation.spring.invocation.ConfigurationPropertiesExtensionPoint;

+import org.apache.tuscany.sca.implementation.spring.invocation.DefaultConfigurationPropertiesExtensionPoint;

 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;

 import org.apache.tuscany.sca.monitor.Monitor;

 import org.apache.tuscany.sca.monitor.Problem;

 import org.apache.tuscany.sca.monitor.Problem.Severity;

-import org.apache.tuscany.sca.monitor.impl.ProblemImpl;
+import org.apache.tuscany.sca.monitor.impl.ProblemImpl;

 import org.apache.tuscany.sca.policy.PolicyFactory;

 

 /**

@@ -63,9 +65,11 @@ public class SpringImplementationProcessor implements StAXArtifactProcessor<Spri
     private JavaInterfaceFactory javaFactory;

     private PolicyFactory policyFactory;

     private PolicyAttachPointProcessor policyProcessor;

+    private ConfigurationPropertiesExtensionPoint configProperties;

     private Monitor monitor;

-

+    

     private ModelFactoryExtensionPoint factories;

+    private boolean multipleContextSupport;

 

     public SpringImplementationProcessor(ExtensionPointRegistry extensionPoints, Monitor monitor) {

         this.factories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);    	

@@ -73,6 +77,12 @@ public class SpringImplementationProcessor implements StAXArtifactProcessor<Spri
         this.javaFactory = factories.getFactory(JavaInterfaceFactory.class);

         this.policyFactory = factories.getFactory(PolicyFactory.class);

         this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);

+                

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

+        if (configProperties == null) {

+        	configProperties = new DefaultConfigurationPropertiesExtensionPoint();

+        }        

+        this.multipleContextSupport = configProperties.isMultipleContextSupported();

         this.monitor = monitor;

     }

 

@@ -197,7 +207,7 @@ public class SpringImplementationProcessor implements StAXArtifactProcessor<Spri
 

         /* Load the Spring component type by reading the Spring application context */

         SpringXMLComponentTypeLoader springLoader =

-            new SpringXMLComponentTypeLoader(factories, assemblyFactory, javaFactory, policyFactory);

+            new SpringXMLComponentTypeLoader(factories, assemblyFactory, javaFactory, policyFactory, multipleContextSupport);

         try {

             // Load the Spring Implementation information from its application context file...

             springLoader.load(springImplementation, resolver);