1 files changed, 13 insertions, 15 deletions
diff --git a/sca-java-2.x/contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java b/sca-java-2.x/contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
index 573bd7ef17..e963be1e69 100644
--- a/sca-java-2.x/contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
+++ b/sca-java-2.x/contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
@@ -31,12 +31,13 @@ import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
 import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
 import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.implementation.ejb.EJBImplementation;
 import org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
 import org.apache.tuscany.sca.monitor.Problem.Severity;
 
@@ -47,17 +48,14 @@ import org.apache.tuscany.sca.monitor.Problem.Severity;
  * @version $Rev$ $Date$
  */
 public class EJBImplementationProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<EJBImplementation> {
-    private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
-    private static final QName IMPLEMENTATION_EJB = new QName(SCA10_NS, "implementation.ejb");
-    
+    private static final QName IMPLEMENTATION_EJB = EJBImplementation.TYPE;
     private AssemblyFactory assemblyFactory;
     private EJBImplementationFactory implementationFactory;
-    private Monitor monitor;
     
-    public EJBImplementationProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        this.implementationFactory = modelFactories.getFactory(EJBImplementationFactory.class);
-        this.monitor = monitor;
+    public EJBImplementationProcessor(ExtensionPointRegistry registry) {
+        FactoryExtensionPoint factories = registry.getExtensionPoint(FactoryExtensionPoint.class);
+        this.assemblyFactory = factories.getFactory(AssemblyFactory.class);
+        this.implementationFactory = factories.getFactory(EJBImplementationFactory.class);
     }
     
     /**
@@ -67,7 +65,7 @@ public class EJBImplementationProcessor extends BaseStAXArtifactProcessor implem
      * @param message
      * @param model
      */
-    private void error(String message, Object model, Object... messageParameters) {
+    private void error(org.apache.tuscany.sca.monitor.Monitor monitor, String message, Object model, Object... messageParameters) {
         if (monitor != null) {
             Problem problem = monitor.createProblem(this.getClass().getName(), "impl-ejb-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
             monitor.problem(problem);
@@ -84,7 +82,7 @@ public class EJBImplementationProcessor extends BaseStAXArtifactProcessor implem
         return EJBImplementation.class;
     }
 
-    public EJBImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
+    public EJBImplementation read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException {
         
         // Read an <implementation.ejb> element
         EJBImplementation implementation = implementationFactory.createEJBImplementation();
@@ -104,7 +102,7 @@ public class EJBImplementationProcessor extends BaseStAXArtifactProcessor implem
                 implementation.setURI(ejbLink);
             }
         } else {
-            error("EJBLinkAttributeMissing", reader);
+            error(context.getMonitor(), "EJBLinkAttributeMissing", reader);
         }
 
         // Skip to end element
@@ -117,14 +115,14 @@ public class EJBImplementationProcessor extends BaseStAXArtifactProcessor implem
         return implementation;
     }
 
-    public void resolve(EJBImplementation implementation, ModelResolver resolver) throws ContributionResolveException {
+    public void resolve(EJBImplementation implementation, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException {
         
         // Resolve the component type
         String uri = implementation.getURI();
         if (uri != null) {
             ComponentType componentType = assemblyFactory.createComponentType();
             componentType.setURI(uri + ".componentType");
-            componentType = resolver.resolveModel(ComponentType.class, componentType);
+            componentType = resolver.resolveModel(ComponentType.class, componentType, context);
             if (!componentType.isUnresolved()) {
                 
                 // Initialize the implementation's services, references and properties
@@ -136,7 +134,7 @@ public class EJBImplementationProcessor extends BaseStAXArtifactProcessor implem
         implementation.setUnresolved(false);
     }
 
-    public void write(EJBImplementation implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
+    public void write(EJBImplementation implementation, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, XMLStreamException {
         
         // Write <implementation.ejb>
         writeStart(writer, IMPLEMENTATION_EJB.getNamespaceURI(), IMPLEMENTATION_EJB.getLocalPart(),