Fixes for TUSCANY-3250: Support for multiple application context using MANIFEST.MF

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

1 files changed, 6 insertions, 5 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 a4840cfef6..1d941e2a4f 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
@@ -31,6 +31,7 @@ import org.apache.tuscany.sca.assembly.ComponentType;
 import org.apache.tuscany.sca.assembly.xml.Constants;

 import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor;

 import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;

+import org.apache.tuscany.sca.core.ExtensionPointRegistry;

 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

 import org.apache.tuscany.sca.contribution.service.ContributionReadException;

@@ -66,11 +67,11 @@ public class SpringImplementationProcessor implements StAXArtifactProcessor<Spri
 

     private ModelFactoryExtensionPoint factories;

 

-    public SpringImplementationProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {

-        this.factories = modelFactories;

-        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);

-        this.javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);

-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);

+    public SpringImplementationProcessor(ExtensionPointRegistry extensionPoints, Monitor monitor) {

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

+        this.assemblyFactory = factories.getFactory(AssemblyFactory.class);

+        this.javaFactory = factories.getFactory(JavaInterfaceFactory.class);

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

         this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);

         this.monitor = monitor;

     }