Finish moving all the JMS binding off the AXIOM databinding to the DOM based one. Theres an intermittent issue with the JMS callbacks itest where trailing spaces seem to sometimes get lost, i'll take that itest out of the build for now while its investigated

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

1 files changed, 6 insertions, 6 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceInterceptor.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceInterceptor.java
index 499784095a..87d99a014e 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceInterceptor.java
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceInterceptor.java
@@ -25,7 +25,6 @@ import javax.jms.JMSException;
 import javax.jms.Session;
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMElement;
 import org.apache.tuscany.sca.binding.jms.JMSBinding;
 import org.apache.tuscany.sca.binding.jms.JMSBindingConstants;
 import org.apache.tuscany.sca.binding.jms.JMSBindingException;
@@ -41,6 +40,7 @@ import org.apache.tuscany.sca.invocation.Interceptor;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
 import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
+import org.w3c.dom.Node;
 
 /**
  * 
@@ -55,10 +55,10 @@ public class WireFormatJMSDefaultReferenceInterceptor implements Interceptor {
     private DefaultMessageProcessor requestMessageProcessor;
     private DefaultMessageProcessor responseMessageProcessor;
     private HashMap<String, Boolean> inputWrapperMap;
-    private HashMap<String, OMElement> outputWrapperMap;
+    private HashMap<String, Node> outputWrapperMap;
 
     public WireFormatJMSDefaultReferenceInterceptor(ExtensionPointRegistry registry, JMSResourceFactory jmsResourceFactory, RuntimeEndpointReference endpointReference, HashMap<String, Boolean> inputWrapperMap,
-            HashMap<String, OMElement> outputWrapperMap) {
+            HashMap<String, Node> outputWrapperMap) {
         super();
         this.jmsBinding = (JMSBinding) endpointReference.getBinding();
         this.endpointReference = endpointReference;
@@ -126,7 +126,7 @@ public class WireFormatJMSDefaultReferenceInterceptor implements Interceptor {
                 msg.setBody(jmsMsg);
             } else {
 
-                OMElement wrapper = null;
+                Node wrapper = null;
                 // if we have a fault no need to wrap the response
                 try {
                     if (!jmsMsg.getBooleanProperty(JMSBindingConstants.FAULT_PROPERTY)) {
@@ -149,8 +149,8 @@ public class WireFormatJMSDefaultReferenceInterceptor implements Interceptor {
                     try {
                         if (jmsMsg.getBooleanProperty(JMSBindingConstants.FAULT_PROPERTY)) {
                             FaultException e = new FaultException("remote exception", response);
-                            OMElement om = (OMElement) response;
-                            e.setFaultName(new QName(om.getNamespace().getNamespaceURI(), om.getLocalName()));
+                            Node om = ((Node)response).getFirstChild();
+                            e.setFaultName(new QName(om.getNamespaceURI(), om.getLocalName()));
                             msg.setFaultBody(e);
                         }
                     } catch (JMSException e) {