[jbossws-commits] JBossWS SVN: r3560 - in branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core: soap and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-06-13 07:50:00 -0400 (Wed, 13 Jun 2007)
New Revision: 3560

Modified:
   branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java
   branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
   branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
   branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java
Log:
[JBWS-1692] SOAPElement.importNode() not supported

Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java	2007-06-13 10:54:09 UTC (rev 3559)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java	2007-06-13 11:50:00 UTC (rev 3560)
@@ -40,6 +40,7 @@
 import org.jboss.ws.core.HTTPMessageImpl;
 import org.jboss.ws.core.MessageAbstraction;
 import org.jboss.ws.core.soap.EnvelopeBuilder;
+import org.jboss.ws.core.soap.EnvelopeBuilderDOM;
 import org.jboss.ws.core.soap.MessageContextAssociation;
 import org.jboss.ws.core.soap.SOAPBodyImpl;
 import org.jboss.ws.core.soap.SOAPContentElement;
@@ -111,7 +112,7 @@
                try
                {
                   soapBody.removeContents();
-                  EnvelopeBuilder envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), null);
+                  EnvelopeBuilder envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), EnvelopeBuilderDOM.class.getName());
                   envBuilder.setStyle(style);
                   Element domBodyElement = DOMUtils.sourceToElement(source);
                   envBuilder.buildBodyElementRpc(soapBody, domBodyElement);

Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java	2007-06-13 10:54:09 UTC (rev 3559)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java	2007-06-13 11:50:00 UTC (rev 3560)
@@ -249,7 +249,7 @@
             soapMessage.setAttachments(attachments);
 
          // Get the SOAPEnvelope builder
-         EnvelopeBuilder envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), null);
+         EnvelopeBuilder envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), EnvelopeBuilderDOM.class.getName());
          envBuilder.setStyle(getStyle());
 
          // Build the payload

Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java	2007-06-13 10:54:09 UTC (rev 3559)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java	2007-06-13 11:50:00 UTC (rev 3560)
@@ -556,6 +556,17 @@
       {
          retNode = new TextImpl(node);
       }
+      else if (node instanceof org.w3c.dom.Element)
+      {
+         try
+         {
+            retNode = new SOAPFactoryImpl().createElement((Element)node);
+         }
+         catch (SOAPException ex)
+         {
+            throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "CAnnot convert to SOAP element: " + node);
+         }
+      }
       else
       {
          throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Operation not supported on this type of node: " + node);

Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java	2007-06-13 10:54:09 UTC (rev 3559)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java	2007-06-13 11:50:00 UTC (rev 3560)
@@ -172,7 +172,7 @@
          else
             throw new SOAPException("Unsupported DOMSource node: " + node);
 
-         EnvelopeBuilder envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), null);
+         EnvelopeBuilder envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), EnvelopeBuilderDOM.class.getName());
          envBuilder.setStyle(Style.DOCUMENT);
          envBuilder.build(soapMessage, domElement);
       }
@@ -181,7 +181,7 @@
          try
          {
             StreamSource streamSource = (StreamSource)source;
-            EnvelopeBuilder envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), null);
+            EnvelopeBuilder envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), EnvelopeBuilderDOM.class.getName());
             envBuilder.setStyle(Style.DOCUMENT);
             InputStream stream = streamSource.getInputStream();
             Reader reader = streamSource.getReader();
@@ -362,7 +362,7 @@
 
    public Document getOwnerDocument()
    {
-      throw new NotImplementedException();
+      return doc;
    }
 
    public org.w3c.dom.Node getParentNode()