whitlock 2002/11/28 06:26:57
Modified: java/test/mime MimeTest.java
java/src/org/apache/wsif/providers/soap/apacheaxis
WSIFOperation_ApacheAxis.java
Log:
Only support attachments that are DataHandlers
Revision Changes Path
1.5 +11 -8 xml-axis-wsif/java/test/mime/MimeTest.java
Index: MimeTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/mime/MimeTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MimeTest.java 19 Nov 2002 09:41:24 -0000 1.4
+++ MimeTest.java 28 Nov 2002 14:26:57 -0000 1.5
@@ -195,19 +195,22 @@
doit(RECEIVE_DH, "Mime.wsdl");
}
- public void testSendPlainText() {
- doit(SEND_PLAINTEXT, "Mime.wsdl");
- }
-
/*
+ * Attachments that are Strings, Images, are not supported at present.
+ * Attachments can only be DataHandlers.
+ *
+ * public void testSendPlainText() {
+ * doit(SEND_PLAINTEXT, "Mime.wsdl");
+ * }
+ *
* public void testReceivePlainText() {
* doit(RECEIVE_PLAINTEXT, "Mime.wsdl");
* }
+ *
+ * public void testBounceImage() {
+ * doit(BOUNCE_IMAGE, "Mime.wsdl");
+ * }
*/
-
- public void testBounceImage() {
- doit(BOUNCE_IMAGE, "Mime.wsdl");
- }
public void testBounceImage2() {
doit(BOUNCE_IMAGE2, "Mime.wsdl");
1.37 +15 -28
xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFOperation_ApacheAxis.java
Index: WSIFOperation_ApacheAxis.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFOperation_ApacheAxis.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- WSIFOperation_ApacheAxis.java 22 Nov 2002 09:52:18 -0000 1.36
+++ WSIFOperation_ApacheAxis.java 28 Nov 2002 14:26:57 -0000 1.37
@@ -60,7 +60,6 @@
import java.awt.Image;
import java.io.IOException;
import java.io.InputStream;
-import java.io.StringWriter;
import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -80,7 +79,7 @@
import javax.wsdl.Output;
import javax.wsdl.Part;
import javax.xml.namespace.QName;
-import javax.xml.rpc.ServiceException;
+import javax.xml.rpc.ParameterMode;
import javax.xml.soap.AttachmentPart;
import javax.xml.soap.SOAPException;
import javax.xml.transform.Source;
@@ -119,8 +118,6 @@
import org.apache.wsif.providers.WSIFDynamicTypeMapping;
import org.apache.wsif.util.WSIFUtils;
import org.apache.wsif.util.jms.WSIFJMSDestination;
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
import org.w3c.dom.Element;
/**
@@ -718,6 +715,8 @@
DataHandler dh = ap.getDataHandler();
msg.setObjectPart(name, dh);
} else if (
+// Attachments that are Strings, Images, etc are unsupported at present.
+// Attachments can only be DataHandlers.
valueType != null
&& (String.class.equals(type)
|| Image.class.equals(type)
@@ -1167,30 +1166,18 @@
qn,
JAFDataHandlerSerializerFactory.class,
JAFDataHandlerDeserializerFactory.class);
- } else if (Image.class.equals(objClass)) {
- call.registerTypeMapping(
- Image.class,
- qn,
- JAFDataHandlerSerializerFactory.class,
-
JAFDataHandlerDeserializerFactory.class);
- } else if (String.class.equals(objClass)) {
- call.registerTypeMapping(
- String.class,
- qn,
- JAFDataHandlerSerializerFactory.class,
-
JAFDataHandlerDeserializerFactory.class);
- } else if (Source.class.equals(objClass)) {
- call.registerTypeMapping(
- Source.class,
- qn,
- JAFDataHandlerSerializerFactory.class,
-
JAFDataHandlerDeserializerFactory.class);
- } else if (MimeMultipart.class.equals(objClass)) {
- call.registerTypeMapping(
- MimeMultipart.class,
- qn,
- JAFDataHandlerSerializerFactory.class,
-
JAFDataHandlerDeserializerFactory.class);
+ } else if (
+ // Attachments that are Images, Strings are unsupported at
present.
+ // Attachments can only be DataHandlers.
+ Image.class.equals(objClass)
+ || String.class.equals(objClass)
+ || Source.class.equals(objClass)
+ || MimeMultipart.class.equals(objClass)) {
+ call.registerTypeMapping(
+ objClass,
+ qn,
+ JAFDataHandlerSerializerFactory.class,
+ JAFDataHandlerDeserializerFactory.class);
} else {
BeanSerializerFactory bsf =
new BeanSerializerFactory(objClass,
qn);
