You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/04/22 00:05:05 UTC
svn commit: r1328740 - in /axis/axis2/java/transports/trunk/modules:
base/src/main/java/org/apache/axis2/transport/base/
jms/src/main/java/org/apache/axis2/transport/jms/iowrappers/
mail/src/main/java/org/apache/axis2/transport/mail/ mail/src/test/java...
Author: veithen
Date: Sat Apr 21 22:05:05 2012
New Revision: 1328740
URL: http://svn.apache.org/viewvc?rev=1328740&view=rev
Log:
Eliminated a couple of references to deprecated classes so that we don't need to add a dependency to axiom-compat.
Modified:
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/iowrappers/BytesMessageDataSource.java
axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/WSMimeMessage.java
axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailClient.java
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java
Modified: axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java?rev=1328740&r1=1328739&r2=1328740&view=diff
==============================================================================
--- axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java (original)
+++ axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java Sat Apr 21 22:05:05 2012
@@ -34,7 +34,7 @@ import org.apache.axis2.engine.AxisEngin
import org.apache.axis2.addressing.EndpointReference;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -273,7 +273,7 @@ public abstract class AbstractTransportL
msgCtx.setTransportOut(transportOut);
msgCtx.setTransportIn(transportIn);
msgCtx.setServerSide(true);
- msgCtx.setMessageID(UUIDGenerator.getUUID());
+ msgCtx.setMessageID(UIDGenerator.generateURNString());
// There is a discrepency in what I thought, Axis2 spawns a nes threads to
// send a message is this is TRUE - and I want it to be the other way
Modified: axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java?rev=1328740&r1=1328739&r2=1328740&view=diff
==============================================================================
--- axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java (original)
+++ axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java Sat Apr 21 22:05:05 2012
@@ -33,7 +33,7 @@ import org.apache.axis2.description.Tran
import org.apache.axis2.description.WSDL2Constants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -185,7 +185,7 @@ public abstract class AbstractTransportS
responseMsgCtx.setTransportOut(transportOut);
responseMsgCtx.setTransportIn(transportIn);
- responseMsgCtx.setMessageID(UUIDGenerator.getUUID());
+ responseMsgCtx.setMessageID(UIDGenerator.generateURNString());
responseMsgCtx.setDoingREST(outMsgCtx.isDoingREST());
responseMsgCtx.setProperty(
Modified: axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/iowrappers/BytesMessageDataSource.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/iowrappers/BytesMessageDataSource.java?rev=1328740&r1=1328739&r2=1328740&view=diff
==============================================================================
--- axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/iowrappers/BytesMessageDataSource.java (original)
+++ axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/iowrappers/BytesMessageDataSource.java Sat Apr 21 22:05:05 2012
@@ -22,7 +22,7 @@ import java.io.OutputStream;
import javax.jms.BytesMessage;
import javax.jms.JMSException;
-import org.apache.axiom.attachments.SizeAwareDataSource;
+import org.apache.axiom.ext.activation.SizeAwareDataSource;
/**
* Data source implementation wrapping a JMS {@link BytesMessage}.
Modified: axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/WSMimeMessage.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/WSMimeMessage.java?rev=1328740&r1=1328739&r2=1328740&view=diff
==============================================================================
--- axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/WSMimeMessage.java (original)
+++ axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/WSMimeMessage.java Sat Apr 21 22:05:05 2012
@@ -22,7 +22,7 @@ package org.apache.axis2.transport.mail;
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.commons.io.output.CountingOutputStream;
import javax.mail.internet.MimeMessage;
@@ -52,8 +52,8 @@ public class WSMimeMessage extends MimeM
// we can over come gmail problem by setting the message id as follows with a valid gmail address
// <xx...@gmail.com> this can be achived by appending from address at the end of uuid
if (getHeader(MailConstants.MAIL_HEADER_MESSAGE_ID) == null) {
- String uuid = "<" + UUIDGenerator.getUUID().replaceAll(":",".") + fromAddress +">";
- setHeader(MailConstants.MAIL_HEADER_MESSAGE_ID, uuid);
+ String id = "<" + UIDGenerator.generateUID() + fromAddress +">";
+ setHeader(MailConstants.MAIL_HEADER_MESSAGE_ID, id);
}
}
Modified: axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailClient.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailClient.java?rev=1328740&r1=1328739&r2=1328740&view=diff
==============================================================================
--- axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailClient.java (original)
+++ axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailClient.java Sat Apr 21 22:05:05 2012
@@ -31,7 +31,7 @@ import javax.mail.internet.InternetAddre
import javax.mail.internet.MimeMessage;
import javax.mail.util.ByteArrayDataSource;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.transport.testkit.client.ClientOptions;
import org.apache.axis2.transport.testkit.client.TestClient;
import org.apache.axis2.transport.testkit.name.Name;
@@ -67,7 +67,7 @@ public abstract class MailClient impleme
}
protected String sendMessage(ContentType contentType, byte[] message) throws Exception {
- String msgId = UUIDGenerator.getUUID();
+ String msgId = UIDGenerator.generateUID() + "@localhost";
MimeMessage msg = new MimeMessage(session);
msg.setRecipients(Message.RecipientType.TO, InternetAddress.parse(channel.getRecipient().getAddress()));
msg.setFrom(new InternetAddress(channel.getSender().getAddress()));
Modified: axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java?rev=1328740&r1=1328739&r2=1328740&view=diff
==============================================================================
--- axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java (original)
+++ axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java Sat Apr 21 22:05:05 2012
@@ -20,16 +20,18 @@
package org.apache.axis2.transport.testkit.message;
import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
import java.io.StringWriter;
import javax.activation.DataHandler;
import javax.mail.internet.ContentType;
+import org.apache.axiom.attachments.Attachments;
import org.apache.axiom.attachments.ByteArrayDataSource;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.impl.MIMEOutputUtils;
+import org.apache.axiom.om.impl.OMMultipartWriter;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
@@ -87,9 +89,15 @@ public interface MessageEncoder<T,U> {
if (message.getType() == XMLMessage.Type.SWA) {
outputFormat.setMimeBoundary(options.getMimeBoundary());
outputFormat.setRootContentId(options.getRootContentId());
- StringWriter writer = new StringWriter();
- message.getMessageElement().serializeAndConsume(writer);
- MIMEOutputUtils.writeSOAPWithAttachmentsMessage(writer, baos, message.getAttachments(), outputFormat);
+ OMMultipartWriter mpw = new OMMultipartWriter(baos, outputFormat);
+ OutputStream out = mpw.writeRootPart();
+ message.getMessageElement().serializeAndConsume(out);
+ out.close();
+ Attachments attachments = message.getAttachments();
+ for (String id : attachments.getAllContentIDs()) {
+ mpw.writePart(attachments.getDataHandler(id), id);
+ }
+ mpw.complete();
} else {
message.getMessageElement().serializeAndConsume(baos, outputFormat);
}
Modified: axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java?rev=1328740&r1=1328739&r2=1328740&view=diff
==============================================================================
--- axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java (original)
+++ axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java Sat Apr 21 22:05:05 2012
@@ -31,7 +31,6 @@ import org.apache.axiom.attachments.Byte
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.transport.testkit.channel.AsyncChannel;
import org.apache.axis2.transport.testkit.client.AsyncTestClient;