This is to change the Monitor to be request scoped for most of the cases:

Refactor the ArtifactProcessor/ModelResolver to take a ProcessorContext that holds context such as Monitor, Contribution for the contribution/artifact processing methods
Refactor the Builder to take a BuilderContext that holds context such as Monitor, Definitions, Base binding mapping for the building methods
Change the processor/resolver/builder implementation classes to not cache the Monitor

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

3 files changed, 86 insertions, 97 deletions

diff --git a/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java b/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java
index 202277a2c2..dd30d5ee6b 100644
--- a/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java
+++ b/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java
@@ -32,19 +32,14 @@ import junit.framework.TestCase;
 import org.apache.tuscany.sca.assembly.Composite;

 import org.apache.tuscany.sca.assembly.OperationsConfigurator;

 import org.apache.tuscany.sca.assembly.WireFormat;

-import org.apache.tuscany.sca.binding.jms.BindingProperty;

-import org.apache.tuscany.sca.binding.jms.JMSBinding;

-import org.apache.tuscany.sca.binding.jms.JMSBindingException;

 import org.apache.tuscany.sca.binding.jms.wireformat.WireFormatJMSBytes;

 import org.apache.tuscany.sca.binding.jms.wireformat.WireFormatJMSObject;

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

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

+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;

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

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

 import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;

-import org.apache.tuscany.sca.core.UtilityExtensionPoint;

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

-import org.apache.tuscany.sca.monitor.MonitorFactory;

 

 /**

  * Tests for JMS binding xml

@@ -398,21 +393,15 @@ public class JMSBindingProcessorTestCase extends TestCase {
 

     private XMLInputFactory inputFactory;

     private StAXArtifactProcessor<Object> staxProcessor;

-    private Monitor monitor;

+    private ProcessorContext context;

 

     @Override

     protected void setUp() throws Exception {

         DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();

+        context = new ProcessorContext(extensionPoints);

         inputFactory = XMLInputFactory.newInstance();

-        // Create a monitor

-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);

-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);

-        if (monitorFactory != null) {

-        	monitor = monitorFactory.createMonitor();

-        	utilities.addUtility(monitorFactory);

-        }

         StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);

-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, monitor);

+        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null);

 

     }

 

@@ -423,7 +412,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     public void testLoadValidComposite() throws Exception {

         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(COMPOSITE));

         

-        Composite composite = (Composite)staxProcessor.read(reader);

+        Composite composite = (Composite)staxProcessor.read(reader, context);

         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

         

         assertNotNull(binding);

@@ -433,7 +422,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     public void testHeaders1() throws Exception {

         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(HEADERS1));

         

-        Composite composite = (Composite)staxProcessor.read(reader);

+        Composite composite = (Composite)staxProcessor.read(reader, context);

         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

         

         assertNotNull(binding);

@@ -446,7 +435,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     public void testProperties1() throws Exception {

         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(PROPERTIES1));

         

-        Composite composite = (Composite)staxProcessor.read(reader);

+        Composite composite = (Composite)staxProcessor.read(reader, context);

         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

         

         assertNotNull(binding);

@@ -457,7 +446,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     public void testOpProperties1() throws Exception {

         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(OP_PROPERTIES1));

         

-        Composite composite = (Composite)staxProcessor.read(reader);

+        Composite composite = (Composite)staxProcessor.read(reader, context);

         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

         

         assertNotNull(binding);

@@ -476,7 +465,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     public void testSubscriptionHeaders () throws Exception {

         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(SELECTOR));

         

-        Composite composite = (Composite)staxProcessor.read(reader);

+        Composite composite = (Composite)staxProcessor.read(reader, context);

         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

         

         assertNotNull(binding);

@@ -490,7 +479,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(COMPOSITE_INVALID_URI));

 

         try {

-            Composite composite = (Composite)staxProcessor.read(reader);       

+            Composite composite = (Composite)staxProcessor.read(reader, context);       

         } catch(Exception e) {

             // JMSBindingExceptions are expected with invalid composite.

             if ( !e.getClass().isAssignableFrom( JMSBindingException.class ) )

@@ -505,7 +494,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(HEADERS_INVALID_PRIORITY));

 

         try {

-            Composite composite = (Composite)staxProcessor.read(reader);       

+            Composite composite = (Composite)staxProcessor.read(reader, context);       

         } catch(Exception e) {

             // JMSBindingExceptions are expected with invalid composite.

             if ( !e.getClass().isAssignableFrom( JMSBindingException.class ) )

@@ -522,7 +511,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(COMPOSITE_INVALID_RESPONSE_ATTR_ELEMENT));

         

         try {

-            Composite composite = (Composite)staxProcessor.read(reader);

+            Composite composite = (Composite)staxProcessor.read(reader, context);

         } catch(Exception e) {

             // JMSBindingExceptions are expected with invalid composite.

             if ( !e.getClass().isAssignableFrom( JMSBindingException.class ) )

@@ -535,7 +524,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     public void testDestinationProperties() throws Exception {

         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(DEST_PROPS));

         

-        Composite composite = (Composite)staxProcessor.read(reader);

+        Composite composite = (Composite)staxProcessor.read(reader, context);

         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

         

         assertNotNull(binding);

@@ -553,7 +542,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     public void testConnectionFactoryProperties() throws Exception {

         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(CF_PROPS));

         

-        Composite composite = (Composite)staxProcessor.read(reader);

+        Composite composite = (Composite)staxProcessor.read(reader, context);

         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

         

         assertNotNull(binding);

@@ -571,7 +560,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     public void testActivationSpecProperties() throws Exception {

         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(AS_PROPS));

         

-        Composite composite = (Composite)staxProcessor.read(reader);

+        Composite composite = (Composite)staxProcessor.read(reader, context);

         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

         

         assertNotNull(binding);

@@ -589,7 +578,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     public void testResponseDestinationProperties() throws Exception {

         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(RESP_DEST_PROPS));

         

-        Composite composite = (Composite)staxProcessor.read(reader);

+        Composite composite = (Composite)staxProcessor.read(reader, context);

         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

         

         assertNotNull(binding);

@@ -607,7 +596,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     public void testResponseConnectionFactoryProperties() throws Exception {

         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(RESP_CF_PROPS));

         

-        Composite composite = (Composite)staxProcessor.read(reader);

+        Composite composite = (Composite)staxProcessor.read(reader, context);

         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

         

         assertNotNull(binding);

@@ -625,7 +614,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     public void testResponseActivationSpecProperties() throws Exception {

         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(RESP_AS_PROPS));

         

-        Composite composite = (Composite)staxProcessor.read(reader);

+        Composite composite = (Composite)staxProcessor.read(reader, context);

         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

         

         assertNotNull(binding);

@@ -643,7 +632,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     public void testOperationPropertiesProperties() throws Exception {

         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(OP_PROPS_PROPS));

         

-        Composite composite = (Composite)staxProcessor.read(reader);

+        Composite composite = (Composite)staxProcessor.read(reader, context);

         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

         

         assertNotNull(binding);

@@ -661,7 +650,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     public void testResouceAdapterProperties() throws Exception {

         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(RES_ADPT_PROPS));

         

-        Composite composite = (Composite)staxProcessor.read(reader);

+        Composite composite = (Composite)staxProcessor.read(reader, context);

         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

         

         assertNotNull(binding);

@@ -687,7 +676,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     public void testOpProperties2() throws Exception {

         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(OP_PROPERTIES1));

         

-        Composite composite = (Composite)staxProcessor.read(reader);

+        Composite composite = (Composite)staxProcessor.read(reader, context);

         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

         

         assertNotNull(binding);

@@ -720,7 +709,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     public void testOpProperties3() throws Exception {

         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(OP_NAMES_NO_PROPERTIES1));

         

-        Composite composite = (Composite)staxProcessor.read(reader);

+        Composite composite = (Composite)staxProcessor.read(reader, context);

         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

         

         assertNotNull(binding);

@@ -743,7 +732,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     public void testConfiguredOperations1() throws Exception {

         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(CONFIGURED_OPERATIONS));

         

-        Composite composite = (Composite)staxProcessor.read(reader);

+        Composite composite = (Composite)staxProcessor.read(reader, context);

         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);        

         assertNotNull(binding);

         

@@ -761,7 +750,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     public void testWireFormat() throws Exception {

         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(WIRE_FORMAT));

         

-        Composite composite = (Composite)staxProcessor.read(reader);

+        Composite composite = (Composite)staxProcessor.read(reader, context);

         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);        

         assertNotNull(binding);

         

@@ -775,7 +764,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     public void testOpPropertiesName() throws Exception {

         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(OP_PROP_NAME));

         

-        Composite composite = (Composite)staxProcessor.read(reader);

+        Composite composite = (Composite)staxProcessor.read(reader, context);

         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);

         

         assertNotNull(binding);

diff --git a/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java b/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java
index f5eede8f41..468295df36 100644
--- a/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java
+++ b/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java
@@ -29,15 +29,12 @@ import javax.xml.stream.XMLStreamReader;
 import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.binding.jms.JMSBinding;
 import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
 import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
 import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
 
 /**
  * Tests for JMS binding XML writes.
@@ -49,7 +46,6 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
     private XMLInputFactory inputFactory;
     private XMLOutputFactory outputFactory;
     private StAXArtifactProcessor<Object> staxProcessor;
-    private Monitor monitor;
     
     public static final String DEFAULT =
         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
@@ -71,13 +67,16 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
             + " </component>"
             + "</composite>";
 
+    private ProcessorContext context;
+
     @Override
     protected void setUp() throws Exception {
         DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
+        context = new ProcessorContext(extensionPoints);
         inputFactory = XMLInputFactory.newInstance();
         outputFactory = XMLOutputFactory.newInstance();
         StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, null);
+        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory);
     }
 
     /**
@@ -86,17 +85,17 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
      */
     public void testLoadValidComposite() throws Exception {
         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(JMSBindingProcessorTestCase.COMPOSITE));       
-        Composite composite = (Composite)staxProcessor.read(reader);
+        Composite composite = (Composite)staxProcessor.read(reader, context);
         JMSBinding binding = (JMSBinding)composite.getComponents().get(0).getServices().get(0).getBindings().get(0);       
         assertNotNull(binding);
 
         // Write out JMSBinding model to stream.
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
+        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos), context);
 
         // Read written JMSBinding to a different JMSBinding model.
         XMLStreamReader reader2 = inputFactory.createXMLStreamReader(new StringReader(bos.toString()));       
-        Composite composite2 = (Composite)staxProcessor.read(reader2);
+        Composite composite2 = (Composite)staxProcessor.read(reader2, context);
         JMSBinding binding2 = (JMSBinding)composite2.getComponents().get(0).getServices().get(0).getBindings().get(0);       
         assertNotNull(binding2);
         
@@ -105,17 +104,17 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
     }
 
     public void testHeaders1() throws Exception {
-        Composite composite = (Composite)staxProcessor.read(inputFactory.createXMLStreamReader(new StringReader(JMSBindingProcessorTestCase.HEADERS1)));
+        Composite composite = (Composite)staxProcessor.read(inputFactory.createXMLStreamReader(new StringReader(JMSBindingProcessorTestCase.HEADERS1)), context);
         JMSBinding binding = (JMSBinding)composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
         assertNotNull(binding);
         
         // Write out JMSBinding model to stream.
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
+        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos), context);
 
         // Read written JMSBinding to a different JMSBinding model.
         XMLStreamReader reader2 = inputFactory.createXMLStreamReader(new StringReader(bos.toString()));       
-        Composite composite2 = (Composite)staxProcessor.read(reader2);
+        Composite composite2 = (Composite)staxProcessor.read(reader2, context);
         JMSBinding binding2 = (JMSBinding)composite2.getComponents().get(0).getServices().get(0).getBindings().get(0);       
         assertNotNull(binding2);
         
@@ -125,17 +124,17 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
 
     public void testProperties1() throws Exception {
         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(JMSBindingProcessorTestCase.PROPERTIES1));        
-        Composite composite = (Composite)staxProcessor.read(reader);
+        Composite composite = (Composite)staxProcessor.read(reader, context);
         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);       
         assertNotNull(binding);
         
         // Write out JMSBinding model to stream.
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
+        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos), context);
 
         // Read written JMSBinding to a different JMSBinding model.
         XMLStreamReader reader2 = inputFactory.createXMLStreamReader(new StringReader(bos.toString()));       
-        Composite composite2 = (Composite)staxProcessor.read(reader2);
+        Composite composite2 = (Composite)staxProcessor.read(reader2, context);
         JMSBinding binding2 = (JMSBinding)composite2.getComponents().get(0).getServices().get(0).getBindings().get(0);       
         assertNotNull(binding2);
         
@@ -145,17 +144,17 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
 
     public void testOpProperties1() throws Exception {
         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(JMSBindingProcessorTestCase.OP_PROPERTIES1));       
-        Composite composite = (Composite)staxProcessor.read(reader);
+        Composite composite = (Composite)staxProcessor.read(reader, context);
         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);        
         assertNotNull(binding);
   
         // Write out JMSBinding model to stream.
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
+        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos), context);
 
         // Read written JMSBinding to a different JMSBinding model.
         XMLStreamReader reader2 = inputFactory.createXMLStreamReader(new StringReader(bos.toString()));
-        Composite composite2 = (Composite)staxProcessor.read(reader2);
+        Composite composite2 = (Composite)staxProcessor.read(reader2, context);
         JMSBinding binding2 = (JMSBinding)composite2.getComponents().get(0).getServices().get(0).getBindings().get(0);
         assertNotNull(binding2);
 
@@ -166,17 +165,17 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
     public void testSubscriptionHeaders() throws Exception {
         XMLStreamReader reader =
             inputFactory.createXMLStreamReader(new StringReader(JMSBindingProcessorTestCase.SELECTOR));
-        Composite composite = (Composite)staxProcessor.read(reader);
+        Composite composite = (Composite)staxProcessor.read(reader, context);
         JMSBinding binding = (JMSBinding)composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
         assertNotNull(binding);
 
         // Write out JMSBinding model to stream.
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
+        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos), context);
 
         // Read written JMSBinding to a different JMSBinding model.
         XMLStreamReader reader2 = inputFactory.createXMLStreamReader(new StringReader(bos.toString()));
-        Composite composite2 = (Composite)staxProcessor.read(reader2);
+        Composite composite2 = (Composite)staxProcessor.read(reader2, context);
         JMSBinding binding2 = (JMSBinding)composite2.getComponents().get(0).getServices().get(0).getBindings().get(0);
         assertNotNull(binding2);
 
@@ -186,16 +185,16 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
 
     public void testDestinationProperties() throws Exception {
         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(JMSBindingProcessorTestCase.DEST_PROPS));        
-        Composite composite = (Composite)staxProcessor.read(reader);
+        Composite composite = (Composite)staxProcessor.read(reader, context);
         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
 
         // Write out JMSBinding model to stream.
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
+        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos), context);
 
         // Read written JMSBinding to a different JMSBinding model.
         XMLStreamReader reader2 = inputFactory.createXMLStreamReader(new StringReader(bos.toString()));
-        Composite composite2 = (Composite)staxProcessor.read(reader2);
+        Composite composite2 = (Composite)staxProcessor.read(reader2, context);
         JMSBinding binding2 = (JMSBinding)composite2.getComponents().get(0).getServices().get(0).getBindings().get(0);
         assertNotNull(binding2);
 
@@ -205,17 +204,17 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
     
     public void testConnectionFactoryProperties() throws Exception {
         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(JMSBindingProcessorTestCase.CF_PROPS));
-        Composite composite = (Composite)staxProcessor.read(reader);
+        Composite composite = (Composite)staxProcessor.read(reader, context);
         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
         assertNotNull(binding);
 
         // Write out JMSBinding model to stream.
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
+        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos), context);
 
         // Read written JMSBinding to a different JMSBinding model.
         XMLStreamReader reader2 = inputFactory.createXMLStreamReader(new StringReader(bos.toString()));
-        Composite composite2 = (Composite)staxProcessor.read(reader2);
+        Composite composite2 = (Composite)staxProcessor.read(reader2, context);
         JMSBinding binding2 = (JMSBinding)composite2.getComponents().get(0).getServices().get(0).getBindings().get(0);
         assertNotNull(binding2);
 
@@ -225,17 +224,17 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
     
     public void testActivationSpecProperties() throws Exception {
         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(JMSBindingProcessorTestCase.AS_PROPS));       
-        Composite composite = (Composite)staxProcessor.read(reader);
+        Composite composite = (Composite)staxProcessor.read(reader, context);
         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);        
         assertNotNull(binding);
         
         // Write out JMSBinding model to stream.
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
+        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos), context);
 
         // Read written JMSBinding to a different JMSBinding model.
         XMLStreamReader reader2 = inputFactory.createXMLStreamReader(new StringReader(bos.toString()));
-        Composite composite2 = (Composite)staxProcessor.read(reader2);
+        Composite composite2 = (Composite)staxProcessor.read(reader2, context);
         JMSBinding binding2 = (JMSBinding)composite2.getComponents().get(0).getServices().get(0).getBindings().get(0);
         assertNotNull(binding2);
 
@@ -245,17 +244,17 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
 
     public void testResponseDestinationProperties() throws Exception {
         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(JMSBindingProcessorTestCase.RESP_DEST_PROPS));        
-        Composite composite = (Composite)staxProcessor.read(reader);
+        Composite composite = (Composite)staxProcessor.read(reader, context);
         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);        
         assertNotNull(binding);
 
         // Write out JMSBinding model to stream.
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
+        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos), context);
 
         // Read written JMSBinding to a different JMSBinding model.
         XMLStreamReader reader2 = inputFactory.createXMLStreamReader(new StringReader(bos.toString()));
-        Composite composite2 = (Composite)staxProcessor.read(reader2);
+        Composite composite2 = (Composite)staxProcessor.read(reader2, context);
         JMSBinding binding2 = (JMSBinding)composite2.getComponents().get(0).getServices().get(0).getBindings().get(0);
         assertNotNull(binding2);
 
@@ -265,17 +264,17 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
     
     public void testResponseConnectionFactoryProperties() throws Exception {
         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(JMSBindingProcessorTestCase.RESP_CF_PROPS));
-        Composite composite = (Composite)staxProcessor.read(reader);
+        Composite composite = (Composite)staxProcessor.read(reader, context);
         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);       
         assertNotNull(binding);
 
         // Write out JMSBinding model to stream.
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
+        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos), context);
 
         // Read written JMSBinding to a different JMSBinding model.
         XMLStreamReader reader2 = inputFactory.createXMLStreamReader(new StringReader(bos.toString()));
-        Composite composite2 = (Composite)staxProcessor.read(reader2);
+        Composite composite2 = (Composite)staxProcessor.read(reader2, context);
         JMSBinding binding2 = (JMSBinding)composite2.getComponents().get(0).getServices().get(0).getBindings().get(0);
         assertNotNull(binding2);
 
@@ -285,17 +284,17 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
     
     public void testResponseActivationSpecProperties() throws Exception {
         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(JMSBindingProcessorTestCase.RESP_AS_PROPS));        
-        Composite composite = (Composite)staxProcessor.read(reader);
+        Composite composite = (Composite)staxProcessor.read(reader, context);
         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);        
         assertNotNull(binding);
 
         // Write out JMSBinding model to stream.
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
+        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos), context);
 
         // Read written JMSBinding to a different JMSBinding model.
         XMLStreamReader reader2 = inputFactory.createXMLStreamReader(new StringReader(bos.toString()));
-        Composite composite2 = (Composite)staxProcessor.read(reader2);
+        Composite composite2 = (Composite)staxProcessor.read(reader2, context);
         JMSBinding binding2 = (JMSBinding)composite2.getComponents().get(0).getServices().get(0).getBindings().get(0);
         assertNotNull(binding2);
 
@@ -305,17 +304,17 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
     
     public void testOperationPropertiesProperties() throws Exception {
         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(JMSBindingProcessorTestCase.OP_PROPS_PROPS));       
-        Composite composite = (Composite)staxProcessor.read(reader);
+        Composite composite = (Composite)staxProcessor.read(reader, context);
         JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);        
         assertNotNull(binding);
 
         // Write out JMSBinding model to stream.
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
+        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos), context);
 
         // Read written JMSBinding to a different JMSBinding model.
         XMLStreamReader reader2 = inputFactory.createXMLStreamReader(new StringReader(bos.toString()));
-        Composite composite2 = (Composite)staxProcessor.read(reader2);
+        Composite composite2 = (Composite)staxProcessor.read(reader2, context);
         JMSBinding binding2 = (JMSBinding)composite2.getComponents().get(0).getServices().get(0).getBindings().get(0);
         assertNotNull(binding2);
 
@@ -326,17 +325,17 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
     public void testResouceAdapterProperties() throws Exception {
         XMLStreamReader reader =
             inputFactory.createXMLStreamReader(new StringReader(JMSBindingProcessorTestCase.RES_ADPT_PROPS));
-        Composite composite = (Composite)staxProcessor.read(reader);
+        Composite composite = (Composite)staxProcessor.read(reader, context);
         JMSBinding binding = (JMSBinding)composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
         assertNotNull(binding);
 
         // Write out JMSBinding model to stream.
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
+        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos), context);
 
         // Read written JMSBinding to a different JMSBinding model.
         XMLStreamReader reader2 = inputFactory.createXMLStreamReader(new StringReader(bos.toString()));
-        Composite composite2 = (Composite)staxProcessor.read(reader2);
+        Composite composite2 = (Composite)staxProcessor.read(reader2, context);
         JMSBinding binding2 = (JMSBinding)composite2.getComponents().get(0).getServices().get(0).getBindings().get(0);
         assertNotNull(binding2);
 
@@ -347,17 +346,17 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
     public void testConfiguredOperations() throws Exception {
         XMLStreamReader reader =
             inputFactory.createXMLStreamReader(new StringReader(JMSBindingProcessorTestCase.CONFIGURED_OPERATIONS));
-        Composite composite = (Composite)staxProcessor.read(reader);
+        Composite composite = (Composite)staxProcessor.read(reader, context);
         JMSBinding binding = (JMSBinding)composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
         assertNotNull(binding);
 
         // Write out JMSBinding model to stream.
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
+        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos), context);
 
         // Read written JMSBinding to a different JMSBinding model.
         XMLStreamReader reader2 = inputFactory.createXMLStreamReader(new StringReader(bos.toString()));
-        Composite composite2 = (Composite)staxProcessor.read(reader2);
+        Composite composite2 = (Composite)staxProcessor.read(reader2, context);
         JMSBinding binding2 = (JMSBinding)composite2.getComponents().get(0).getServices().get(0).getBindings().get(0);
         assertNotNull(binding2);
 
@@ -368,17 +367,17 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
     public void testWireFormat() throws Exception {
         XMLStreamReader reader =
             inputFactory.createXMLStreamReader(new StringReader(JMSBindingProcessorTestCase.WIRE_FORMAT));
-        Composite composite = (Composite)staxProcessor.read(reader);
+        Composite composite = (Composite)staxProcessor.read(reader, context);
         JMSBinding binding = (JMSBinding)composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
         assertNotNull(binding);
 
         // Write out JMSBinding model to stream.
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
+        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos), context);
 
         // Read written JMSBinding to a different JMSBinding model.
         XMLStreamReader reader2 = inputFactory.createXMLStreamReader(new StringReader(bos.toString()));
-        Composite composite2 = (Composite)staxProcessor.read(reader2);
+        Composite composite2 = (Composite)staxProcessor.read(reader2, context);
         JMSBinding binding2 = (JMSBinding)composite2.getComponents().get(0).getServices().get(0).getBindings().get(0);
         assertNotNull(binding2);
 
@@ -391,12 +390,12 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
     public void testDefault() throws Exception {
         XMLStreamReader reader =
             inputFactory.createXMLStreamReader(new StringReader(DEFAULT));
-        Composite composite = (Composite)staxProcessor.read(reader);
+        Composite composite = (Composite)staxProcessor.read(reader, context);
         JMSBinding binding = (JMSBinding)composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
         assertNotNull(binding);
         
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
+        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos), context);
         
         System.out.println(bos.toString());
         assertEquals(bos.toString(),
@@ -419,17 +418,17 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
     public void testOperationPropertiesName() throws Exception {
         XMLStreamReader reader =
             inputFactory.createXMLStreamReader(new StringReader(JMSBindingProcessorTestCase.OP_PROP_NAME));
-        Composite composite = (Composite)staxProcessor.read(reader);
+        Composite composite = (Composite)staxProcessor.read(reader, context);
         JMSBinding binding = (JMSBinding)composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
         assertNotNull(binding);
 
         // Write out JMSBinding model to stream.
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
+        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos), context);
 
         // Read written JMSBinding to a different JMSBinding model.
         XMLStreamReader reader2 = inputFactory.createXMLStreamReader(new StringReader(bos.toString()));
-        Composite composite2 = (Composite)staxProcessor.read(reader2);
+        Composite composite2 = (Composite)staxProcessor.read(reader2, context);
         JMSBinding binding2 = (JMSBinding)composite2.getComponents().get(0).getServices().get(0).getBindings().get(0);
         assertNotNull(binding2);
 
diff --git a/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java b/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java
index 7bfb355c8a..5180427ec6 100644
--- a/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java
+++ b/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java
@@ -40,6 +40,7 @@ import org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAu
 import org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicyProcessor;
 import org.apache.tuscany.sca.binding.jms.policy.header.JMSHeaderPolicy;
 import org.apache.tuscany.sca.binding.jms.policy.header.JMSHeaderPolicyProcessor;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -57,27 +58,27 @@ public class PolicyProcessorTestCase {
     public void testRead() throws Exception {
         List<String> results = new ArrayList<String>();
         Map<QName, StAXArtifactProcessor> processors = new HashMap<QName, StAXArtifactProcessor>();
-        processors.put(JMSHeaderPolicy.JMS_HEADER_POLICY_QNAME, new JMSHeaderPolicyProcessor(null, null));
-        processors.put(JMSTokenAuthenticationPolicy.JMS_TOKEN_AUTHENTICATION_POLICY_QNAME, new JMSTokenAuthenticationPolicyProcessor(null, null));
+        processors.put(JMSHeaderPolicy.JMS_HEADER_POLICY_QNAME, new JMSHeaderPolicyProcessor(null));
+        processors.put(JMSTokenAuthenticationPolicy.JMS_TOKEN_AUTHENTICATION_POLICY_QNAME, new JMSTokenAuthenticationPolicyProcessor(null));
         
         InputStream is = getClass().getResourceAsStream("mock_policy_definitions.xml");
         XMLInputFactory inputFactory = XMLInputFactory.newInstance();
         XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
         
         XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
-        
+        ProcessorContext context =new ProcessorContext();
         while (true) {
             int event = reader.getEventType();
             if (event == XMLStreamConstants.START_ELEMENT) {
                 if ("policySet".equals(reader.getName().getLocalPart())) {
                     reader.nextTag();
                     StAXArtifactProcessor processor = processors.get(reader.getName());
-                    Object xxx = processor.read(reader);
+                    Object xxx = processor.read(reader, context);
 //                    Policy policy = (Policy)processor.read(reader);
 
                     ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
                     XMLStreamWriter writer = outputFactory.createXMLStreamWriter(outputStream);
-                    processor.write(xxx, writer);
+                    processor.write(xxx, writer, context);
 //                    processor.write(policy, writer);
                     writer.flush();
                     results.add(outputStream.toString());