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

[supun]

Author: supun
Date: Fri Jan 20 13:19:55 2012
New Revision: 1233893

URL: http://svn.apache.org/viewvc?rev=1233893&view=rev
Log:
fixing mail attachments

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=1233893&r1=1233892&r2=1233893&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
 Fri Jan 20 13:19: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_FILE   = 
"AttachmentFile";
 
     public static final String TRANSPORT_MAIL_FOLDER           = 
"transport.mail.Folder";
     public static final String TRANSPORT_MAIL_CONTENT_TYPE     = 
"transport.mail.ContentType";

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=1233893&r1=1233892&r2=1233893&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
 Fri Jan 20 13:19:55 2012
@@ -433,6 +433,15 @@ public class MailTransportSender extends
             mimeMultiPart.addBodyPart(mimeBodyPart1);
             mimeMultiPart.addBodyPart(mimeBodyPart2);
             message.setContent(mimeMultiPart);
+
+            String fileName = (String) msgContext.getProperty(
+                    MailConstants.TRANSPORT_FORMAT_ATTACHMENT_FILE);
+            if (fileName != null) {
+                mimeBodyPart2.setFileName(fileName);
+            } else {
+                mimeBodyPart2.setFileName("attachment");
+            }
+
             mainPart = mimeBodyPart2;
         } else {
             mainPart = message;