[jboss-svn-commits] JBossWS SVN: r642 - in branches/jbossws-1.0/src: main/java/org/jboss/ws/soap main/java/org/jboss/ws/xop test/java/org/jboss/test/ws/samples/mtom

[jboss-svn-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2006-07-26 13:32:24 -0400 (Wed, 26 Jul 2006)
New Revision: 642

Modified:
   branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java
   branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPUnmarshallerImpl.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/mtom/XOPRpcTestCase.java
Log:
Fix 'disguised' xop elements sent from .NET

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java	2006-07-26 09:53:01 UTC (rev 641)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java	2006-07-26 17:32:24 UTC (rev 642)
@@ -26,6 +26,7 @@
 import org.jboss.util.xml.DOMWriter;
 import org.jboss.ws.Constants;
 import org.jboss.ws.WSException;
+import org.jboss.ws.xop.XOPUnmarshallerImpl;
 import org.jboss.ws.binding.BindingException;
 import org.jboss.ws.jaxrpc.TypeMappingImpl;
 import org.jboss.ws.jaxrpc.encoding.*;
@@ -266,11 +267,11 @@
                {
                   // MSFT hack
                   Object convertedObj = null;
-                  if(obj instanceof ByteArrayInputStream)
+                  if(obj instanceof XOPUnmarshallerImpl.InputStreamWrapper)
                   {
                     MimeUtils utils = new MimeUtils();
                     MimeUtils.ByteArrayConverter converter = utils.getConverterFor(javaType);
-                    convertedObj = converter.convert( (ByteArrayInputStream)obj );
+                    convertedObj = converter.convert( ((XOPUnmarshallerImpl.InputStreamWrapper)obj).getStream() );
                   }
 
                   if(null == convertedObj) // conversion failed

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPUnmarshallerImpl.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPUnmarshallerImpl.java	2006-07-26 09:53:01 UTC (rev 641)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPUnmarshallerImpl.java	2006-07-26 17:32:24 UTC (rev 642)
@@ -34,6 +34,8 @@
 import javax.xml.soap.SOAPException;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.ByteArrayInputStream;
 
 /**
  * The XOPUnmarshallerImpl allows callbacks from the binding layer towards the
@@ -62,7 +64,15 @@
       {
          AttachmentPart part = getAttachementByCID(cid);
 
-         XOPObject xopObject = new XOPObject(part.getDataHandler().getContent());
+         // TODO: this should be fixed in XB
+         // http://jira.jboss.com/jira/browse/JBWS-1108
+         Object content = part.getDataHandler().getContent();
+         if(content instanceof ByteArrayInputStream)
+         {
+            content = new InputStreamWrapper((ByteArrayInputStream)content);
+         }
+
+         XOPObject xopObject = new XOPObject(content);
          xopObject.setContentType(part.getDataHandler().getContentType());
 
          return xopObject;
@@ -116,4 +126,15 @@
       return part;
    }
 
+   public final class InputStreamWrapper {
+      private ByteArrayInputStream stream;
+
+      public InputStreamWrapper(ByteArrayInputStream stream) {
+         this.stream = stream;
+      }
+
+      public ByteArrayInputStream getStream() {
+         return stream;
+      }
+   }
 }

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/mtom/XOPRpcTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/mtom/XOPRpcTestCase.java	2006-07-26 09:53:01 UTC (rev 641)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/samples/mtom/XOPRpcTestCase.java	2006-07-26 17:32:24 UTC (rev 642)
@@ -82,12 +82,15 @@
             port = (XOPTest)service.getPort(XOPTest.class);
             ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jbossws-samples-mtom");
          }
+
       }
+
+      //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8081/jbossws-samples-mtom");
    }
 
    /** Send a multipart message with a text/plain attachment part
     */
-   public void testSendMimeImageGIF() throws Exception
+   /*public void testSendMimeImageGIF() throws Exception
    {
       URL url = new File("resources/samples/mtom/attach.gif").toURL();
 
@@ -110,20 +113,20 @@
          assertNotNull(value);
          assertTrue("Wrong return value type", value instanceof Image);
       }
-   }
+   } */
 
    /** Send uknown file that actually is a jpeg that will turns into octet-stream
     */
    public void testSendDisguised() throws Exception
    {
-      /*Object value = port.sendMimeImageGIF("Some text message", new DataHandler(
+      Object value = port.sendMimeImageGIF("Some text message", new DataHandler(
           new FileDataSource("resources/samples/mtom/disguised_jpeg.xcf")
       ));
       assertNotNull(value);
       assertTrue("Wrong return value type", value instanceof Image);
-      */
 
-      System.out.println("FIXME: testSendDisguised");
+
+      //System.out.println("FIXME: testSendDisguised");
    }
 
    /** Send a multipart message with a text/plain attachment part