More updates to bring up the jms binding from 1.x to 2.x

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

2 files changed, 4 insertions, 2 deletions

diff --git a/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java b/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
index d15a0abff0..e486377b2f 100644
--- a/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
+++ b/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
@@ -30,6 +30,7 @@ import javax.xml.stream.XMLStreamReader;
 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.wireformat.jmsbytes.WireFormatJMSBytes;

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

@@ -402,7 +403,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
         inputFactory = XMLInputFactory.newInstance();

         // Create a monitor

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

-        MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl();  

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

         if (monitorFactory != null) {

         	monitor = monitorFactory.createMonitor();

         	utilities.addUtility(monitorFactory);

diff --git a/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorWriteTestCase.java b/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorWriteTestCase.java
index 72e6cef7ad..d7644071c1 100644
--- a/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorWriteTestCase.java
+++ b/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorWriteTestCase.java
@@ -77,7 +77,7 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
         outputFactory = XMLOutputFactory.newInstance();
         // Create a monitor
         UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl();  
+        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
         if (monitorFactory != null) {
         	monitor = monitorFactory.createMonitor();
         	utilities.addUtility(monitorFactory);
@@ -92,6 +92,7 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
      */
     public void testLoadValidComposite() throws Exception {
         XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(JMSBindingProcessorTestCase.COMPOSITE));       
+        Object o = staxProcessor.read(reader);
         Composite composite = (Composite)staxProcessor.read(reader);
         JMSBinding binding = (JMSBinding)composite.getComponents().get(0).getServices().get(0).getBindings().get(0);       
         assertNotNull(binding);