hi,
Can some kind soul with enough Karma please apply this patch.
Best Regards,
Chamil Thanthrimudalige.
Index: modules/integration/test/org/apache/axis2/mail/UtilsMailServer.java
===================================================================
--- modules/integration/test/org/apache/axis2/mail/UtilsMailServer.java
(revision 233131)
+++ modules/integration/test/org/apache/axis2/mail/UtilsMailServer.java
(working copy)
@@ -65,7 +65,6 @@
return SERVER_CONFIG_CONTEXT;
}
-
public static ConfigurationContext createClientConfigurationContext()
throws Exception {
if(CLIENT_CONFIG_CONTEXT == null){
File file = new File(MAIL_TRANSPORT_CLIENT_ENABLED_REPO_PATH);
Index:
modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java
===================================================================
---
modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java
(revision 233131)
+++
modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java
(working copy)
@@ -51,7 +51,7 @@
*/
public class MailetRequestResponceRawXMLTest extends TestCase {
private EndpointReference targetEPR =
- new EndpointReference("[EMAIL PROTECTED]" +
+ new EndpointReference("[EMAIL PROTECTED]" +
"/axis/services/EchoXMLService/echoOMElement");
private Log log = LogFactory.getLog(getClass());
private QName serviceName = new QName("EchoXMLService");
@@ -165,92 +165,4 @@
call.close();
}
-
-// public ConfigurationContext createServerConfigurationContext() throws
Exception {
-// ConfigurationContextFactory builder = new
ConfigurationContextFactory();
-// ConfigurationContext configContext =
-// builder.buildConfigurationContext(
-// org.apache.axis2.Constants.TESTING_REPOSITORY);
-//
-// TransportInDescription transportIn =
-// new TransportInDescription(new
QName(Constants.TRANSPORT_MAIL));
-// transportIn.addParameter(
-// new ParameterImpl("transport.mail.pop3.host", "127.0.0.1"));
-// transportIn.addParameter(
-// new ParameterImpl("transport.mail.pop3.user",
-// "[EMAIL PROTECTED]"));
-// transportIn.addParameter(
-// new ParameterImpl("transport.mail.pop3.password", "axis2"));
-// transportIn.addParameter(
-// new ParameterImpl("transport.mail.pop3.port", "1134"));
-// transportIn.addParameter(
-// new ParameterImpl("transport.mail.replyToAddress",
-// "[EMAIL PROTECTED]"));
-// transportIn.setReceiver(new SimpleMailListener());
-// transportIn.getReceiver().init(configContext, transportIn);
-//
-// TransportOutDescription transportOut =
-// new TransportOutDescription(
-// new QName(Constants.TRANSPORT_MAIL));
-//
-// transportOut.addParameter(
-// new ParameterImpl("transport.mail.smtp.host", "127.0.0.1"));
-// transportOut.addParameter(
-// new ParameterImpl("transport.mail.smtp.user", "server"));
-// transportOut.addParameter(
-// new ParameterImpl("transport.mail.smtp.password", "axis2"));
-// transportOut.addParameter(
-// new ParameterImpl("transport.mail.smtp.port", "1049"));
-// transportOut.setSender(new MailTransportSender());
-// transportOut.getSender().init(configContext, transportOut);
-//
-// configContext.getAxisConfiguration().addTransportIn(transportIn);
-// configContext.getAxisConfiguration().addTransportOut(transportOut);
-// return configContext;
-// }
-//
-// public ConfigurationContext createClientConfigurationContext() throws
Exception {
-// ConfigurationContextFactory builder = new
ConfigurationContextFactory();
-// ConfigurationContext configContext =
-// builder.buildConfigurationContext(
-// org.apache.axis2.Constants.TESTING_REPOSITORY);
-//
-// TransportInDescription transportIn =
-// new TransportInDescription(new
QName(Constants.TRANSPORT_MAIL));
-// transportIn.addParameter(
-// new ParameterImpl("transport.mail.pop3.host", "127.0.0.1"));
-// transportIn.addParameter(
-// new ParameterImpl("transport.mail.pop3.user",
-// "[EMAIL PROTECTED]"));
-// transportIn.addParameter(
-// new ParameterImpl("transport.mail.pop3.password", "axis2"));
-// transportIn.addParameter(
-// new ParameterImpl("transport.mail.pop3.port", "1134"));
-// transportIn.addParameter(
-// new ParameterImpl("transport.mail.replyToAddress",
-// "[EMAIL PROTECTED]"));
-// transportIn.setReceiver(new SimpleMailListener());
-// transportIn.getReceiver().init(configContext, transportIn);
-//
-// TransportOutDescription transportOut =
-// new TransportOutDescription(
-// new QName(Constants.TRANSPORT_MAIL));
-//
-// transportOut.addParameter(
-// new ParameterImpl("transport.mail.smtp.host", "127.0.0.1"));
-// transportOut.addParameter(
-// new ParameterImpl("transport.mail.smtp.user", "client"));
-// transportOut.addParameter(
-// new ParameterImpl("transport.mail.smtp.password", "axis2"));
-// transportOut.addParameter(
-// new ParameterImpl("transport.mail.smtp.port", "1049"));
-// transportOut.setSender(new MailTransportSender());
-// transportOut.getSender().init(configContext, transportOut);
-//
-// configContext.getAxisConfiguration().addTransportIn(transportIn);
-// configContext.getAxisConfiguration().addTransportOut(transportOut);
-// return configContext;
-// }
-//
-
}
Index: modules/core/src/org/apache/axis2/transport/mail/server/SMTPWorker.java
===================================================================
--- modules/core/src/org/apache/axis2/transport/mail/server/SMTPWorker.java
(revision 233131)
+++ modules/core/src/org/apache/axis2/transport/mail/server/SMTPWorker.java
(working copy)
@@ -229,7 +229,7 @@
try {
if (bodyData) {
temp += input;
- mail.setContent(temp, "text/plain");
+ mail.setContent(temp,
MailSrvConstants.DEFAULT_CONTENT_TYPE);
} else {
mail.addHeaderLine(input);
}
Index: modules/core/src/org/apache/axis2/transport/mail/MailWorker.java
===================================================================
--- modules/core/src/org/apache/axis2/transport/mail/MailWorker.java
(revision 233131)
+++ modules/core/src/org/apache/axis2/transport/mail/MailWorker.java
(working copy)
@@ -75,6 +75,7 @@
public void doWork() {
AxisEngine engine = new AxisEngine(reg);
MessageContext msgContext = null;
+ String charSet = "";
// create and initialize a message context
try {
TransportInDescription transportIn =
@@ -86,7 +87,9 @@
msgContext = new MessageContext(reg, transportIn,
transportOut);
msgContext.setServerSide(true);
msgContext.setProperty(MailSrvConstants.CONTENT_TYPE,
mimeMessage.getContentType());
- msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING,
mimeMessage.getEncoding());
+ charSet = mimeMessage.getContentType();
+ charSet = charSet.substring(charSet.indexOf('=') + 1,
charSet.length());
+ msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING,
charSet);
String soapAction =
getMailHeader(MailSrvConstants.HEADER_SOAP_ACTION);
msgContext.setWSAAction(soapAction);
@@ -128,7 +131,6 @@
soapNamespaceURI =
SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI;
}
-
StAXBuilder builder = new StAXSOAPModelBuilder(reader,
soapNamespaceURI);
SOAPEnvelope envelope = (SOAPEnvelope)
builder.getDocumentElement();
