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 su...@apache.org on 2012/01/23 10:40:55 UTC

svn commit: r1234716 - in /axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail: MailConstants.java MailTransportSender.java

Author: supun
Date: Mon Jan 23 09:40:55 2012
New Revision: 1234716

URL: http://svn.apache.org/viewvc?rev=1234716&view=rev
Log:
fixing an build break with multipart messages

Modified:
    axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailConstants.java
    axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java

Modified: axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailConstants.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailConstants.java?rev=1234716&r1=1234715&r2=1234716&view=diff
==============================================================================
--- axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailConstants.java (original)
+++ axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailConstants.java Mon Jan 23 09:40:55 2012
@@ -60,6 +60,7 @@ public class MailConstants {
     public static final String TRANSPORT_MAIL_FORMAT = "transport.mail.Format";
     public static final String TRANSPORT_FORMAT_TEXT = "Text";
     public static final String TRANSPORT_FORMAT_MP   = "Multipart";
+    public static final String TRANSPORT_FORMAT_ATTACHMENT   = "Attachment";
     public static final String TRANSPORT_FORMAT_ATTACHMENT_FILE   = "AttachmentFile";
 
     public static final String TRANSPORT_MAIL_FOLDER           = "transport.mail.Folder";

Modified: axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java?rev=1234716&r1=1234715&r2=1234716&view=diff
==============================================================================
--- axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java (original)
+++ axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java Mon Jan 23 09:40:55 2012
@@ -433,6 +433,15 @@ public class MailTransportSender extends
             mimeMultiPart.addBodyPart(mimeBodyPart1);
             mimeMultiPart.addBodyPart(mimeBodyPart2);
             message.setContent(mimeMultiPart);
+            mainPart = mimeBodyPart2;
+        } else if (MailConstants.TRANSPORT_FORMAT_ATTACHMENT.equals(mFormat)) {
+            mimeMultiPart = new MimeMultipart();
+            MimeBodyPart mimeBodyPart1 = new MimeBodyPart();
+            mimeBodyPart1.setContent("Web Service Message Attached","text/plain");
+            MimeBodyPart mimeBodyPart2 = new MimeBodyPart();
+            mimeMultiPart.addBodyPart(mimeBodyPart1);
+            mimeMultiPart.addBodyPart(mimeBodyPart2);
+            message.setContent(mimeMultiPart);
 
             String fileName = (String) msgContext.getProperty(
                     MailConstants.TRANSPORT_FORMAT_ATTACHMENT_FILE);