You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2005/08/10 10:42:28 UTC
svn commit: r231195 - in
/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail:
EMailSender.java MailConstants.java MailTransportSender.java MailWorker.java
Author: deepal
Date: Wed Aug 10 01:41:57 2005
New Revision: 231195
URL: http://svn.apache.org/viewcvs?rev=231195&view=rev
Log:
applied chamis patch
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/EMailSender.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailConstants.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/EMailSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/EMailSender.java?rev=231195&r1=231194&r2=231195&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/EMailSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/EMailSender.java Wed Aug 10 01:41:57 2005
@@ -17,14 +17,21 @@
*/
package org.apache.axis2.transport.mail;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.transport.EmailReceiver;
+import java.util.Properties;
-import javax.mail.*;
+import javax.mail.Authenticator;
+import javax.mail.Flags;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.PasswordAuthentication;
+import javax.mail.Session;
+import javax.mail.Transport;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
-import java.util.Properties;
+
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.transport.EmailReceiver;
/**
* @author hemapani
@@ -48,7 +55,7 @@
this.password = password;
}
- public void send(String subject, String targetEmail, String message) throws AxisFault {
+ public void send(String subject, String targetEmail, String message, String charSetEn) throws AxisFault {
try {
final PasswordAuthentication authentication =
new PasswordAuthentication(user, password);
@@ -70,10 +77,14 @@
new InternetAddress(targetEmail));
msg.setSubject(subject);
- msg.addHeaderLine("Content-Type: text/plain; charset=us-ascii");
+ if (charSetEn.equals("")){
+ charSetEn = MailConstants.DEFAULT_CHAR_SET_ENCODING;
+ }
+
+ msg.addHeaderLine("Content-Type: text/plain; charset=" + MailConstants.DEFAULT_CHAR_SET);
msg.setText(message);
- msg.setHeader("Content-Transfer-Encoding", "7bit");
+ msg.setHeader("Content-Transfer-Encoding", charSetEn);
Transport.send(msg);
} catch (AddressException e) {
throw new AxisFault(e);
@@ -92,7 +103,7 @@
sender.send("Testing mail sending",
"hemapani@127.0.0.1",
- "Hellp, testing");
+ "Hellp, testing", "us-ascii");
EmailReceiver receiver = new EmailReceiver(user,
host,
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailConstants.java?rev=231195&r1=231194&r2=231195&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailConstants.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailConstants.java Wed Aug 10 01:41:57 2005
@@ -31,4 +31,7 @@
public final static String SMTP_USER = "transport.mail.smtp.user";
public final static String SMTP_PASSWORD = "transport.mail.smtp.password";
public final static String SMTP_PORT = "transport.mail.smtp.port";
-}
\ No newline at end of file
+
+ public final static String DEFAULT_CHAR_SET = "us-ascii";
+ public final static String DEFAULT_CHAR_SET_ENCODING = "7bit";
+}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java?rev=231195&r1=231194&r2=231195&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java Wed Aug 10 01:41:57 2005
@@ -68,6 +68,7 @@
//TODO this is just a temporary hack, fix this to use input streams
String eprAddress = msgContext.getTo().getAddress();
+ String charEncoding = (String)msgContext.getProperty(MessageContext.CHARACTER_SET_ENCODING);
int index = eprAddress.indexOf('/');
String subject = "";
String email = null;
@@ -78,11 +79,10 @@
email = eprAddress;
}
-
sender.send(
subject,
email,
- new String(byteArrayOutputStream.toByteArray()));
+ new String(byteArrayOutputStream.toByteArray()), charEncoding);
} else {
if (user == null) {
throw new AxisFault(
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java?rev=231195&r1=231194&r2=231195&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java Wed Aug 10 01:41:57 2005
@@ -85,6 +85,8 @@
msgContext = new MessageContext(reg, transportIn, transportOut);
msgContext.setServerSide(true);
msgContext.setProperty(MailConstants.CONTENT_TYPE, mimeMessage.getContentType());
+ msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING, mimeMessage.getEncoding());
+
String soapAction = getMailHeader(MailConstants.HEADER_SOAP_ACTION);
msgContext.setWSAAction(soapAction);
msgContext.setSoapAction(soapAction);
@@ -178,4 +180,4 @@
}
-}
\ No newline at end of file
+}