You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sa...@apache.org on 2006/09/11 14:45:24 UTC
svn commit: r442198 - in /webservices/axis2/trunk/java/modules:
integration/test/org/apache/axis2/mail/
integration/test/org/apache/axis2/transport/
kernel/src/org/apache/axis2/transport/http/
kernel/src/org/apache/axis2/transport/mail/ kernel/src/org/...
Author: saminda
Date: Mon Sep 11 05:45:22 2006
New Revision: 442198
URL: http://svn.apache.org/viewvc?view=rev&rev=442198
Log:
1. Fixed mail sender as propsed.
2. Runtime as well as deployment time properties and parameter settings
//TODO : Fixing mail listener and test cases
Added:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/Constants.java (contents, props changed)
- copied, changed from r442092, webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailSrvConstants.java
Removed:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailSrvConstants.java
Modified:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/UtilsMailServer.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-axis2.xml
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/DualChannelRequestResponseRawXMLTest.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPConstants.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HttpTransportProperties.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/EMailSender.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailTransportSender.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailWorker.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/SimpleMailListener.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailServer.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailSorter.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/POP3Worker.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/SMTPWorker.java
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java?view=diff&rev=442198&r1=442197&r2=442198
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java Mon Sep 11 05:45:22 2006
@@ -34,22 +34,17 @@
import org.apache.axis2.client.async.Callback;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.context.ServiceGroupContext;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.description.OutInAxisOperation;
import org.apache.axis2.engine.Echo;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.transport.mail.SimpleMailListener;
-import org.apache.axis2.transport.mail.server.MailSrvConstants;
import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
public class MailRequestResponseRawXMLTest extends TestCase {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/UtilsMailServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/UtilsMailServer.java?view=diff&rev=442198&r1=442197&r2=442198
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/UtilsMailServer.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/UtilsMailServer.java Mon Sep 11 05:45:22 2006
@@ -18,19 +18,18 @@
import junit.framework.TestCase;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.transport.mail.server.MailServer;
-import org.apache.axis2.transport.mail.server.MailSrvConstants;
+import org.apache.axis2.transport.mail.Constants;
import java.io.File;
public class UtilsMailServer {
private static final String MAIL_TRANSPORT_SERVER_ENABLED_REPO_PATH =
- Constants.TESTING_PATH + "mail-transport-server-enabledRepository";
+ org.apache.axis2.Constants.TESTING_PATH + "mail-transport-server-enabledRepository";
private static final String MAIL_TRANSPORT_CLIENT_ENABLED_REPO_PATH =
- Constants.TESTING_PATH + "mail-transport-client-enabledRepository";
+ org.apache.axis2.Constants.TESTING_PATH + "mail-transport-client-enabledRepository";
private static MailServer server;
private static ConfigurationContext SERVER_CONFIG_CONTEXT;
@@ -45,8 +44,8 @@
server =
new MailServer(
SERVER_CONFIG_CONTEXT,
- MailSrvConstants.POP_SERVER_PORT,
- MailSrvConstants.SMTP_SERVER_PORT);
+ Constants.POP_SERVER_PORT,
+ Constants.SMTP_SERVER_PORT);
}
runningServerCount++;
return SERVER_CONFIG_CONTEXT;
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-axis2.xml?view=diff&rev=442198&r1=442197&r2=442198
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-axis2.xml Mon Sep 11 05:45:22 2006
@@ -25,10 +25,10 @@
</transportReceiver>
<transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
- <parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>
- <parameter name="transport.mail.pop3.user" locked="false">axis2@127.0.0.1</parameter>
+ <parameter name="mail.pop3.host" locked="false">127.0.0.1</parameter>
+ <parameter name="mail.pop3.user" locked="false">axis2@127.0.0.1</parameter>
+ <parameter name="mail.pop3.port" locked="false">1134</parameter>
<parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>
- <parameter name="transport.mail.pop3.port" locked="false">1134</parameter>
<parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
</transportReceiver>
@@ -47,10 +47,10 @@
<transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
- <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
- <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
+ <parameter name="mail.smtp.host" locked="false">127.0.0.1</parameter>
+ <parameter name="mail.smtp.user" locked="false">axis2</parameter>
+ <parameter name="mail.smtp.port" locked="false">1049</parameter>
<parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
- <parameter name="transport.mail.smtp.port" locked="false">1049</parameter>
</transportSender>
<!-- ================================================= -->
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml?view=diff&rev=442198&r1=442197&r2=442198
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml Mon Sep 11 05:45:22 2006
@@ -49,10 +49,10 @@
</transportReceiver>
<transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
- <parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>
- <parameter name="transport.mail.pop3.user" locked="false">bar@127.0.0.1</parameter>
+ <parameter name="mail.pop3.host" locked="false">127.0.0.1</parameter>
+ <parameter name="mail.pop3.user" locked="false">bar@127.0.0.1</parameter>
+ <parameter name="mail.pop3.port" locked="false">1134</parameter>
<parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>
- <parameter name="transport.mail.pop3.port" locked="false">1134</parameter>
<parameter name="transport.mail.replyToAddress" locked="false">bar@127.0.0.1</parameter>
</transportReceiver>
@@ -94,8 +94,8 @@
</transportSender>
<transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
- <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
- <parameter name="transport.mail.smtp.user" locked="false">bar</parameter>
+ <parameter name="mail.smtp.host" locked="false">127.0.0.1</parameter>
+ <parameter name="mail.smtp.user" locked="false">bar</parameter>
<parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
<parameter name="transport.mail.smtp.port" locked="false">1049</parameter>
</transportSender>
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml?view=diff&rev=442198&r1=442197&r2=442198
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml Mon Sep 11 05:45:22 2006
@@ -49,10 +49,10 @@
</transportReceiver>
<transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
- <parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>
- <parameter name="transport.mail.pop3.user" locked="false">foo@127.0.0.1</parameter>
+ <parameter name="mail.pop3.host" locked="false">127.0.0.1</parameter>
+ <parameter name="mail.pop3.user" locked="false">foo@127.0.0.1</parameter>
+ <parameter name="mail.pop3.port" locked="false">1134</parameter>
<parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>
- <parameter name="transport.mail.pop3.port" locked="false">1134</parameter>
<parameter name="transport.mail.replyToAddress" locked="false">foo@127.0.0.1</parameter>
</transportReceiver>
@@ -94,8 +94,8 @@
</transportSender>
<transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
- <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
- <parameter name="transport.mail.smtp.user" locked="false">foo</parameter>
+ <parameter name="mail.smtp.host" locked="false">127.0.0.1</parameter>
+ <parameter name="mail.smtp.user" locked="false">foo</parameter>
<parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
<parameter name="transport.mail.smtp.port" locked="false">1049</parameter>
</transportSender>
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/DualChannelRequestResponseRawXMLTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/DualChannelRequestResponseRawXMLTest.java?view=diff&rev=442198&r1=442197&r2=442198
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/DualChannelRequestResponseRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/DualChannelRequestResponseRawXMLTest.java Mon Sep 11 05:45:22 2006
@@ -26,7 +26,6 @@
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
@@ -34,25 +33,20 @@
import org.apache.axis2.client.async.Callback;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.context.ServiceGroupContext;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.description.OutInAxisOperation;
import org.apache.axis2.engine.Echo;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.mail.UtilsMailServer;
-import org.apache.axis2.transport.mail.SimpleMailListener;
import org.apache.axis2.transport.mail.server.MailServer;
-import org.apache.axis2.transport.mail.server.MailSrvConstants;
+import org.apache.axis2.transport.mail.Constants;
import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
public class DualChannelRequestResponseRawXMLTest extends TestCase {
@@ -106,11 +100,11 @@
Utils.createSimpleService(serviceName,
Echo.class.getName(),
operationName);
- UtilServer.start(Constants.TESTING_PATH + "mail-transport-server-enabledRepository");
+ UtilServer.start(org.apache.axis2.Constants.TESTING_PATH + "mail-transport-server-enabledRepository");
UtilServer.deployService(service);
mailServer =
- new MailServer(MailSrvConstants.POP_SERVER_PORT,
- MailSrvConstants.SMTP_SERVER_PORT);
+ new MailServer(Constants.POP_SERVER_PORT,
+ Constants.SMTP_SERVER_PORT);
/* SimpleMailListener ml = new SimpleMailListener();
ml.init(serverConfigContext, serverConfigContext.getAxisConfiguration()
.getTransportIn(new QName(Constants.TRANSPORT_MAIL)));
@@ -159,7 +153,7 @@
// options.setTransport InProtocol("smtp");
- options.setTransportInProtocol(Constants.TRANSPORT_MAIL);
+ options.setTransportInProtocol(org.apache.axis2.Constants.TRANSPORT_MAIL);
options.setUseSeparateListener(true);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPConstants.java?view=diff&rev=442198&r1=442197&r2=442198
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPConstants.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPConstants.java Mon Sep 11 05:45:22 2006
@@ -380,6 +380,8 @@
*/
public static final byte SENDER[] = "400".getBytes();
public static final String PROXY = "PROXY";
+ public static final String MAIL_SMTP = "_MAIL_SMTP_";
+ public static final String MAIL_POP3 = "_MAIL_POP3_";
public static final String BASIC_AUTHENTICATION = "_BASIC_AUTHENTICATION_";
public static final String NTLM_AUTHENTICATION = "_NTLM_AUTHENTICATION_";
public static final String MTOM_RECEIVED_CONTENT_TYPE = "MTOM_RECEIVED";
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HttpTransportProperties.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HttpTransportProperties.java?view=diff&rev=442198&r1=442197&r2=442198
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HttpTransportProperties.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HttpTransportProperties.java Mon Sep 11 05:45:22 2006
@@ -18,6 +18,8 @@
import org.apache.commons.httpclient.HttpVersion;
+import java.util.Properties;
+
/**
* Utility bean for setting transport properties in runtime.
*/
@@ -208,5 +210,31 @@
public void setPassword(String password) {
this.password = password;
}
+ }
+ public static class MailProperties{
+ final Properties mailProperties = new Properties();
+
+ private String password;
+
+ public void addProperty(String key, String value) {
+ mailProperties.put(key,value);
+ }
+
+ public void deleteProperty(String key) {
+ mailProperties.remove(key);
+ }
+
+ public Properties getProperties() {
+ return mailProperties;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
}
}
Copied: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/Constants.java (from r442092, webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailSrvConstants.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/Constants.java?view=diff&rev=442198&p1=webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailSrvConstants.java&r1=442092&p2=webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/Constants.java&r2=442198
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailSrvConstants.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/Constants.java Mon Sep 11 05:45:22 2006
@@ -14,39 +14,49 @@
* limitations under the License.
*/
-package org.apache.axis2.transport.mail.server;
+package org.apache.axis2.transport.mail;
+
+public class Constants {
+ public final static String FROM_ADDRESS = "mail.from";
+ public final static String TO_ADDRESS = "mail.to";
+ public final static String SUBJECT = "mail.subject";
+ public final static String HEADER_SOAP_ACTION = "mail.soapaction";
+
+ public final static String SMTP_USER = "mail.smtp.user";
+ public final static String SMTP_PORT = "mail.smtp.port";
+ public final static String SMTP_PASSWORD = "mail.smtp.password";
+ public final static String SMTP_HOST = "mail.smtp.host";
+
+ public final static String POP3_USER = "mail.pop3.user";
+ public final static String POP3_PORT = "mail.pop3.port";
+ public final static String POP3_PASSWORD = "mail.pop3.password";
+ public final static String POP3_HOST = "mail.pop3.host";
+
+ public final static String SMTP_USER_PASSWORD = "transport.mail.smtp.password";
+ public final static String RAPLY_TO = "transport.mail.replyToAddress";
-public class MailSrvConstants {
- public final static String FROM_ADDRESS = "transport.mail.from";
- public final static String TO_ADDRESS = "transport.mail.to";
- public final static String SUBJECT = "transport.mail.subject";
- public final static String SMTP_USER = "transport.mail.smtp.user";
public final static int SMTP_SERVER_PORT = (1024 + 25);
- public final static String SMTP_PORT = "transport.mail.smtp.port";
- public final static String SMTP_PASSWORD = "transport.mail.smtp.password";
- public final static String SMTP_HOST = "transport.mail.smtp.host";
+
public final static String SERVER_DOMAIN = "localhost";
public final static String RCPT_OK = "250 OK performed command RCPT";
public final static String RCPT_ERROR = "550 Unknown recipient";
- public final static String RAPLY_TO = "transport.mail.replyToAddress";
+
+
public final static int POP_SERVER_PORT = (1024 + 110);
- public final static String POP3_USER = "transport.mail.pop3.user";
- public final static String POP3_PORT = "transport.mail.pop3.port";
- public final static String POP3_PASSWORD = "transport.mail.pop3.password";
- public final static String POP3_HOST = "transport.mail.pop3.host";
+
public final static String OK = "+OK ";
public final static String MAIL_OK = "250 OK performed command MAIL";
public final static String MAIL_ERROR = "550 Error processign MAIL command";
public final static String HELO_REPLY = "250 OK";
- public final static String HEADER_SOAP_ACTION = "transport.mail.soapaction";
+
public final static String ERR = "-ERR ";
public final static String DEFAULT_CONTENT_TYPE = "text/xml";
public final static String DEFAULT_CHAR_SET_ENCODING = "7bit";
public final static String DEFAULT_CHAR_SET = "us-ascii";
public final static String DATA_START_SUCCESS = "354 OK Ready for data";
public final static String DATA_END_SUCCESS = "250 OK finished adding data";
- public final static String CONTENT_TYPE = "transport.mail.contenttype";
- public final static String CONTENT_LOCAION = "transport.mail.contentlocation";
+ public final static String CONTENT_TYPE = "mail.contenttype";
+ public final static String CONTENT_LOCAION = "mail.contentlocation";
public final static String COMMAND_UNKNOWN = "550 Unknown command";
public final static String COMMAND_TRANSMISSION_END = "221 Closing SMTP service.";
public final static String COMMAND_EXIT = "EXIT";
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/Constants.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/EMailSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/EMailSender.java?view=diff&rev=442198&r1=442197&r2=442198
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/EMailSender.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/EMailSender.java Mon Sep 11 05:45:22 2006
@@ -17,102 +17,56 @@
package org.apache.axis2.transport.mail;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.mail.server.MailSrvConstants;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.MessageContext;
-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.*;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import java.util.Properties;
public class EMailSender {
- private String host;
- private String password;
- private String smtpPort;
- private String user;
+ private Properties properties;
private MessageContext messageContext;
+ private PasswordAuthentication passwordAuthentication;
- public EMailSender(String user, String host, String smtpPort, String password) {
- this.user = user;
- this.host = host;
- this.smtpPort = smtpPort;
- this.password = password;
- }
+ public EMailSender() {}
public void setMessageContext(MessageContext messageContext) {
this.messageContext = messageContext;
}
+ public void setProperties(Properties properties) {
+ this.properties = properties;
+ }
- public static void main(String[] args) throws Exception {
- String user = "hemapani";
- String host = "127.0.0.1";
- String smtpPort = "25";
- String password = "hemapani";
- EMailSender sender = new EMailSender(user, host, smtpPort, password);
- OMOutputFormat format = new OMOutputFormat();
-
- sender.send("Testing mail sending", "hemapani@127.0.0.1", "Hellp, testing", format);
-
- EmailReceiver receiver = new EmailReceiver(user, host, "110", password);
-
- receiver.connect();
-
- Message[] msgs = receiver.receive();
-
- if (msgs != null) {
- for (int i = 0; i < msgs.length; i++) {
- MimeMessage msg = (MimeMessage) msgs[i];
-
- if (msg != null) {
- }
-
- msg.setFlag(Flags.Flag.DELETED, true);
- }
- }
-
- receiver.disconnect();
+ public void setPasswordAuthentication(PasswordAuthentication passwordAuthentication) {
+ this.passwordAuthentication = passwordAuthentication;
}
public void send(String subject, String targetEmail, String message, OMOutputFormat format)
throws AxisFault {
try {
- final PasswordAuthentication authentication =
- new PasswordAuthentication(user, password);
- Properties props = new Properties();
-
- props.put("mail.user", user);
- props.put("mail.host", host);
- props.put("mail.store.protocol", "pop3");
- props.put("mail.transport.protocol", "smtp");
- props.put("mail.smtp.port", smtpPort);
- Session session = Session.getInstance(props, new Authenticator() {
+ Session session = Session.getInstance(properties, new Authenticator() {
protected PasswordAuthentication getPasswordAuthentication() {
- return authentication;
+ return passwordAuthentication;
}
});
MimeMessage msg = new MimeMessage(session);
- msg.setFrom(new InternetAddress((user)));
+ msg.setFrom(new InternetAddress((passwordAuthentication.getUserName())));
msg.addRecipient(Message.RecipientType.TO, new InternetAddress(targetEmail));
msg.setSubject(subject);
String contentType = format.getContentType() != null ? format.getContentType() :
- MailSrvConstants.DEFAULT_CONTENT_TYPE;
+ Constants.DEFAULT_CONTENT_TYPE;
if (contentType.indexOf(SOAP11Constants.SOAP_11_CONTENT_TYPE) > -1) {
if (messageContext.getSoapAction() != null) {
- msg.setHeader(MailSrvConstants.HEADER_SOAP_ACTION,
+ msg.setHeader(Constants.HEADER_SOAP_ACTION,
messageContext.getSoapAction());
msg.setHeader("Content-Transfer-Encoding", "QUOTED-PRINTABLE");
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailTransportSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailTransportSender.java?view=diff&rev=442198&r1=442197&r2=442198
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailTransportSender.java Mon Sep 11 05:45:22 2006
@@ -21,37 +21,68 @@
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.TransportOutDescription;
+import org.apache.axis2.description.Parameter;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.transport.AbstractTransportSender;
-import org.apache.axis2.transport.mail.server.MailSrvConstants;
+import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.transport.http.HttpTransportProperties;
import org.apache.axis2.util.Utils;
+import javax.mail.PasswordAuthentication;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
public class MailTransportSender extends AbstractTransportSender {
-
- private static final long serialVersionUID = -2858556361961169381L;
- private String smtpPort = "25";
+
+ /* smtpProperties holds all the parameters needed to Java Mail. This will be filled either from Axis2.xml or
+ from runtime.
+ */
+ private java.util.Properties smtpProperties = new java.util.Properties();
+
+ private PasswordAuthentication passwordAuthentication;
+
private ByteArrayOutputStream byteArrayOutputStream;
- private String host;
- private String password;
- private String user;
- private TransportOutDescription transportOut;
// assosiation with OMOutputFormat
private OMOutputFormat format = new OMOutputFormat();
- public void init(ConfigurationContext confContext, TransportOutDescription transportOut)
- throws AxisFault {
- this.transportOut = transportOut;
+
+ public void init(ConfigurationContext configurationContext,
+ TransportOutDescription transportOut)
+ throws AxisFault {
+
+ ArrayList mailParameters = transportOut.getParameters();
+
+ String password = "";
+ String username = "";
+
+ for (Iterator iterator = mailParameters.iterator(); iterator.hasNext();) {
+ Parameter param = (Parameter) iterator.next();
+ String paramKey = param.getName();
+ String paramValue = Utils.getParameterValue(param);
+ if (paramKey == null || paramValue == null) {
+ throw new AxisFault(Messages.getMessage("canNotBeNull",
+ "Parameter name nor value should be null"));
+
+ }
+ smtpProperties.setProperty(paramKey, paramValue);
+ if (paramKey.equals(Constants.SMTP_USER)) {
+ username = paramValue;
+ }
+ if (paramKey.equals(Constants.SMTP_USER_PASSWORD)) {
+ password = paramValue;
+ }
+
+ }
+ passwordAuthentication = new PasswordAuthentication(username, password);
}
-
+
public MailTransportSender() {
}
@@ -63,67 +94,69 @@
throws AxisFault {
}
+ private void runtimeMailParameterSetting(MessageContext msgContext) {
+ Object obj = msgContext.getParameter(HTTPConstants.MAIL_SMTP);
+ if (obj != null) {
+ // Overide the axis2.xml cofiguration setting
+ if (obj instanceof HttpTransportProperties.MailProperties) {
+ HttpTransportProperties.MailProperties props =
+ (HttpTransportProperties.MailProperties) obj;
+ smtpProperties.clear();
+ smtpProperties.putAll(props.getProperties());
+ String username = (String) smtpProperties.get(Constants.SMTP_USER);
+ String passwd = props.getPassword();
+ passwordAuthentication = new PasswordAuthentication(username, passwd);
+ }
+ }
+
+ }
+
public void finalizeSendWithToAddress(MessageContext msgContext, OutputStream out)
throws AxisFault {
try {
- // TransportOutDescription transportOut = msgContext.getTransportOut();
+ // Override with runtime settings
+ runtimeMailParameterSetting(msgContext);
+
+ EMailSender sender = new EMailSender();
+ sender.setMessageContext(msgContext);
+ sender.setProperties(smtpProperties);
+ sender.setPasswordAuthentication(passwordAuthentication);
+
+ String eprAddress = msgContext.getTo().getAddress();
+
+ // In mail char set is what is being used. Charset encoding is not what is expected here.
+ String charSet =
+ (String) msgContext.getProperty(
+ org.apache.axis2.Constants.Configuration.CHARACTER_SET_ENCODING);
+ if (charSet == null) {
+ charSet =
+ MessageContext.DEFAULT_CHAR_SET_ENCODING;// Since we are deleaing only SOAP and XML messages here
+ }
+ format.setSOAP11(msgContext.isSOAP11());
+ format.setCharSetEncoding(charSet);
- user =
- Utils.getParameterValue(transportOut.getParameter(MailSrvConstants.SMTP_USER));
- host =
- Utils.getParameterValue(transportOut.getParameter(MailSrvConstants.SMTP_HOST));
- password =
- Utils.getParameterValue(transportOut.getParameter(MailSrvConstants.SMTP_PASSWORD));
- smtpPort =
- Utils.getParameterValue(transportOut.getParameter(MailSrvConstants.SMTP_PORT));
-
- if ((user != null) && (host != null) && (password != null) && (smtpPort != null)) {
-
- EMailSender sender = new EMailSender(user, host, smtpPort, password);
- sender.setMessageContext(msgContext);
-
- String eprAddress = msgContext.getTo().getAddress();
-
- // In mail char set is what is being used. Charset encoding is not what is expected here.
- String charSet =
- (String) msgContext.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING);
- if (charSet == null) {
- charSet = MessageContext.DEFAULT_CHAR_SET_ENCODING;// Since we are deleaing only SOAP and XML messages here
- }
- format.setSOAP11(msgContext.isSOAP11());
- format.setCharSetEncoding(charSet);
-
- int mailNameIndex = eprAddress.indexOf("mail:");
- if (mailNameIndex > -1){
- eprAddress = eprAddress.substring(mailNameIndex + 5);
- }
- int index = eprAddress.indexOf('/');
- String subject = "";
- String email = null;
-
- if (index >= 0) {
- subject = eprAddress.substring(index + 1);
- email = eprAddress.substring(0, index);
- } else {
- email = eprAddress;
- }
- int emailColon = email.indexOf(":");
- if (emailColon >= 0) {
- email = email.substring(emailColon + 1);
- }
-
- sender.send(subject, email, new String(byteArrayOutputStream.toByteArray()),format);
+ int mailNameIndex = eprAddress.indexOf("mail:");
+ if (mailNameIndex > -1) {
+ eprAddress = eprAddress.substring(mailNameIndex + 5);
+ }
+ int index = eprAddress.indexOf('/');
+ String subject = "";
+ String email;
+
+ if (index >= 0) {
+ subject = eprAddress.substring(index + 1);
+ email = eprAddress.substring(0, index);
} else {
- if (user == null) {
- throw new AxisFault(Messages.getMessage("canNotBeNull", "User"));
- } else if (smtpPort == null) {
- throw new AxisFault(Messages.getMessage("canNotBeNull", "smtpPort"));
- } else if (host == null) {
- throw new AxisFault(Messages.getMessage("canNotBeNull", "Host"));
- } else if (password == null) {
- throw new AxisFault(Messages.getMessage("canNotBeNull", "password"));
- }
+ email = eprAddress;
}
+ int emailColon = email.indexOf(":");
+ if (emailColon >= 0) {
+ email = email.substring(emailColon + 1);
+ }
+
+ sender.send(subject, email, new String(byteArrayOutputStream.toByteArray()),
+ format);
+
} catch (IOException e) {
throw new AxisFault(e);
}
@@ -147,6 +180,7 @@
throws AxisFault {
return out;
}
+
public void writeMessage(MessageContext msgContext, OutputStream out) throws AxisFault {
SOAPEnvelope envelope = msgContext.getEnvelope();
OMElement outputMessage = envelope;
@@ -160,7 +194,8 @@
OMOutputFormat format = new OMOutputFormat();
format.setDoOptimize(msgContext.isDoingMTOM());
- format.setCharSetEncoding(null); //Set to null so that the code will not fail on 7bit.
+ format.setCharSetEncoding(
+ null); //Set to null so that the code will not fail on 7bit.
outputMessage.serializeAndConsume(out, format);
out.flush();
} catch (Exception e) {
@@ -173,4 +208,5 @@
public void stop() {
}
+
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailWorker.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailWorker.java?view=diff&rev=442198&r1=442197&r2=442198
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailWorker.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailWorker.java Mon Sep 11 05:45:22 2006
@@ -24,7 +24,6 @@
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
@@ -32,7 +31,6 @@
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.transport.mail.server.MailSrvConstants;
import org.apache.axis2.transport.TransportUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -69,10 +67,10 @@
try {
TransportInDescription transportIn =
configContext.getAxisConfiguration()
- .getTransportIn(new QName(Constants.TRANSPORT_MAIL));
+ .getTransportIn(new QName(org.apache.axis2.Constants.TRANSPORT_MAIL));
TransportOutDescription transportOut =
configContext.getAxisConfiguration()
- .getTransportOut(new QName(Constants.TRANSPORT_MAIL));
+ .getTransportOut(new QName(org.apache.axis2.Constants.TRANSPORT_MAIL));
if ((transportIn != null) && (transportOut != null)) {
// create Message Context
msgContext = new MessageContext();
@@ -80,19 +78,21 @@
msgContext.setTransportIn(transportIn);
msgContext.setTransportOut(transportOut);
msgContext.setServerSide(true);
- msgContext.setProperty(MailSrvConstants.CONTENT_TYPE, mimeMessage.getContentType());
+ msgContext.setProperty(Constants.CONTENT_TYPE, mimeMessage.getContentType());
if (TransportUtils.getCharSetEncoding(mimeMessage.getContentType()) != null) {
- msgContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
- TransportUtils.getCharSetEncoding(
- mimeMessage.getContentType()));
+ msgContext.setProperty(
+ org.apache.axis2.Constants.Configuration.CHARACTER_SET_ENCODING,
+ TransportUtils.getCharSetEncoding(
+ mimeMessage.getContentType()));
} else {
- msgContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
- MessageContext.DEFAULT_CHAR_SET_ENCODING);
+ msgContext.setProperty(
+ org.apache.axis2.Constants.Configuration.CHARACTER_SET_ENCODING,
+ MessageContext.DEFAULT_CHAR_SET_ENCODING);
}
- msgContext.setIncomingTransportName(Constants.TRANSPORT_MAIL);
- String soapAction = getMailHeader(MailSrvConstants.HEADER_SOAP_ACTION);
+ msgContext.setIncomingTransportName(org.apache.axis2.Constants.TRANSPORT_MAIL);
+ String soapAction = getMailHeader(Constants.HEADER_SOAP_ACTION);
msgContext.setSoapAction(soapAction);
if (mimeMessage.getSubject() != null) {
msgContext.setTo(new EndpointReference(mimeMessage.getSubject()));
@@ -129,13 +129,16 @@
}
} else {
throw new AxisFault(Messages.getMessage("unknownTransport",
- Constants.TRANSPORT_MAIL));
+ org.apache.axis2.Constants.TRANSPORT_MAIL));
}
} catch (Exception e) {
try {
if (msgContext != null) {
- MessageContext faultContext = engine.createFaultMessageContext(msgContext, e);
- engine.sendFault(faultContext);
+ if (msgContext.isServerSide()) {
+ MessageContext faultContext =
+ engine.createFaultMessageContext(msgContext, e);
+ engine.sendFault(faultContext);
+ }
} else {
log.error(e);
}
@@ -143,13 +146,7 @@
log.error(e);
}
}
- /*
- *
- * This part is ignored for the time being. CT 07-Feb-2005.
- *
- * if (msgContext.getProperty(MessageContext.QUIT_REQUESTED) != null) { /
- * why then, quit! try { server.stop(); } catch (Exception e) { } }
- */
+
}
private String getMailHeader(String headerName) throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/SimpleMailListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/SimpleMailListener.java?view=diff&rev=442198&r1=442197&r2=442198
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/SimpleMailListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/SimpleMailListener.java Mon Sep 11 05:45:22 2006
@@ -26,7 +26,6 @@
import org.apache.axis2.engine.ListenerManager;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.transport.TransportListener;
-import org.apache.axis2.transport.mail.server.MailSrvConstants;
import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -111,11 +110,11 @@
public void init(ConfigurationContext configurationContext, TransportInDescription transportIn)
throws AxisFault {
this.configurationContext = configurationContext;
- user = Utils.getParameterValue(transportIn.getParameter(MailSrvConstants.POP3_USER));
- host = Utils.getParameterValue(transportIn.getParameter(MailSrvConstants.POP3_HOST));
- password = Utils.getParameterValue(transportIn.getParameter(MailSrvConstants.POP3_PASSWORD));
- port = Utils.getParameterValue(transportIn.getParameter(MailSrvConstants.POP3_PORT));
- replyTo = Utils.getParameterValue(transportIn.getParameter(MailSrvConstants.RAPLY_TO));
+ user = Utils.getParameterValue(transportIn.getParameter(org.apache.axis2.transport.mail.Constants.POP3_USER));
+ host = Utils.getParameterValue(transportIn.getParameter(org.apache.axis2.transport.mail.Constants.POP3_HOST));
+ password = Utils.getParameterValue(transportIn.getParameter(org.apache.axis2.transport.mail.Constants.POP3_PASSWORD));
+ port = Utils.getParameterValue(transportIn.getParameter(org.apache.axis2.transport.mail.Constants.POP3_PORT));
+ replyTo = Utils.getParameterValue(transportIn.getParameter(org.apache.axis2.transport.mail.Constants.RAPLY_TO));
if ((user == null) || (host == null) || (password == null) || (port == null)) {
if (this.user == null) {
throw new AxisFault(Messages.getMessage("canNotBeNull", "User"));
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailServer.java?view=diff&rev=442198&r1=442197&r2=442198
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailServer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailServer.java Mon Sep 11 05:45:22 2006
@@ -19,7 +19,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.transport.mail.SimpleMailListener;
+import org.apache.axis2.transport.mail.Constants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -95,8 +95,8 @@
}
public static void main(String args[]) {
- int smtpPost = MailSrvConstants.SMTP_SERVER_PORT;
- int popPort = MailSrvConstants.POP_SERVER_PORT;
+ int smtpPost = Constants.SMTP_SERVER_PORT;
+ int popPort = Constants.POP_SERVER_PORT;
if (args.length == 2) {
try {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailSorter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailSorter.java?view=diff&rev=442198&r1=442197&r2=442198
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailSorter.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailSorter.java Mon Sep 11 05:45:22 2006
@@ -23,7 +23,7 @@
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
+import org.apache.axis2.transport.mail.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
@@ -76,20 +76,20 @@
try {
msgContext = new MessageContext();
msgContext.setConfigurationContext(confContext);
- msgContext.setTransportIn(confContext.getAxisConfiguration().getTransportIn(new QName(Constants.TRANSPORT_MAIL)));
- msgContext.setTransportOut(confContext.getAxisConfiguration().getTransportOut(new QName(Constants.TRANSPORT_MAIL)));
+ msgContext.setTransportIn(confContext.getAxisConfiguration().getTransportIn(new QName(org.apache.axis2.Constants.TRANSPORT_MAIL)));
+ msgContext.setTransportOut(confContext.getAxisConfiguration().getTransportOut(new QName(org.apache.axis2.Constants.TRANSPORT_MAIL)));
msgContext.setServerSide(true);
- msgContext.setProperty(MailSrvConstants.CONTENT_TYPE, mimeMessage.getContentType());
- msgContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
+ msgContext.setProperty(Constants.CONTENT_TYPE, mimeMessage.getContentType());
+ msgContext.setProperty(org.apache.axis2.Constants.Configuration.CHARACTER_SET_ENCODING,
mimeMessage.getEncoding());
- String soapAction = getMailHeader(MailSrvConstants.HEADER_SOAP_ACTION, mimeMessage);
+ String soapAction = getMailHeader(Constants.HEADER_SOAP_ACTION, mimeMessage);
if (soapAction == null){
soapAction = mimeMessage.getSubject();
}
msgContext.setSoapAction(soapAction);
- msgContext.setIncomingTransportName(Constants.TRANSPORT_MAIL);
+ msgContext.setIncomingTransportName(org.apache.axis2.Constants.TRANSPORT_MAIL);
String serviceURL = mimeMessage.getSubject();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/POP3Worker.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/POP3Worker.java?view=diff&rev=442198&r1=442197&r2=442198
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/POP3Worker.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/POP3Worker.java Mon Sep 11 05:45:22 2006
@@ -19,6 +19,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.axis2.transport.mail.Constants;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
@@ -58,18 +59,18 @@
tokens.add(stk.nextToken());
}
- if (tokens.get(0).equals(MailSrvConstants.USER)) {
+ if (tokens.get(0).equals(Constants.USER)) {
user = (String) tokens.get(1);
messages = st.popUserMails(user);
- printWriter.println(MailSrvConstants.OK);
- } else if (tokens.get(0).equals(MailSrvConstants.PASS)) {
- printWriter.println(MailSrvConstants.OK); // Passwords are not checked.
- } else if (input.equals(MailSrvConstants.QUIT)) {
- printWriter.println(MailSrvConstants.OK + "POP3 server signing off");
+ printWriter.println(Constants.OK);
+ } else if (tokens.get(0).equals(Constants.PASS)) {
+ printWriter.println(Constants.OK); // Passwords are not checked.
+ } else if (input.equals(Constants.QUIT)) {
+ printWriter.println(Constants.OK + "POP3 server signing off");
doneProcess = true;
- } else if (input.equals(MailSrvConstants.STAT)) {
- printWriter.println(MailSrvConstants.OK + messages.size() + " 1"); // We take the maildrop size as one.
- } else if (tokens.get(0).equals(MailSrvConstants.LIST)) { // scan listing
+ } else if (input.equals(Constants.STAT)) {
+ printWriter.println(Constants.OK + messages.size() + " 1"); // We take the maildrop size as one.
+ } else if (tokens.get(0).equals(Constants.LIST)) { // scan listing
if (tokens.size() > 1) {
try {
int optArg = Integer.parseInt((String) tokens.get(1));
@@ -77,20 +78,20 @@
if ((messageArrayIndex < messages.size()) && (messageArrayIndex >= 0))
{ // that is OK careful with numbering
- printWriter.println(MailSrvConstants.OK + messageArrayIndex + 1
+ printWriter.println(Constants.OK + messageArrayIndex + 1
+ " 120"); // Mail size of 120 is just some number.
} else {
- printWriter.println(MailSrvConstants.ERR + "no such message, only "
+ printWriter.println(Constants.ERR + "no such message, only "
+ (messages.size() + 1) + " messages in maildrop");
}
} catch (NumberFormatException e) {
log.info(e.getMessage());
- printWriter.println(MailSrvConstants.ERR
+ printWriter.println(Constants.ERR
+ "problem passing the index. Index submited was "
+ tokens.get(1));
}
} else {
- printWriter.println(MailSrvConstants.OK + messages.size());
+ printWriter.println(Constants.OK + messages.size());
for (int i = 0; i < messages.size(); i++) {
int messageIndex = i + 1;
@@ -100,13 +101,13 @@
printWriter.println(".");
}
- } else if (tokens.get(0).equals(MailSrvConstants.RETR)) {
+ } else if (tokens.get(0).equals(Constants.RETR)) {
String i = (String) tokens.get(1);
try {
int index = Integer.parseInt(i);
- printWriter.println(MailSrvConstants.OK);
+ printWriter.println(Constants.OK);
MimeMessage m = (MimeMessage) messages.get(index - 1);
@@ -115,13 +116,13 @@
socket.getOutputStream().write(CR_LF_DOT_CR_LF); // This is a bit of a hack to get it working. Have to find a bette way to handle this.
socket.getOutputStream().flush();
} catch (NumberFormatException e) {
- printWriter.println(MailSrvConstants.ERR);
+ printWriter.println(Constants.ERR);
} catch (IOException e1) {
- printWriter.println(MailSrvConstants.ERR);
+ printWriter.println(Constants.ERR);
} catch (MessagingException e2) {
- printWriter.println(MailSrvConstants.ERR);
+ printWriter.println(Constants.ERR);
}
- } else if (tokens.get(0).equals(MailSrvConstants.DELE)) {
+ } else if (tokens.get(0).equals(Constants.DELE)) {
String smIndex = (String) tokens.get(1);
try {
@@ -130,18 +131,18 @@
if ((mIndex >= 0) && (mIndex < messages.size())) {
messages.remove(mIndex);
numDeleted++;
- printWriter.println(MailSrvConstants.OK);
+ printWriter.println(Constants.OK);
} else {
- printWriter.println(MailSrvConstants.ERR);
+ printWriter.println(Constants.ERR);
}
} catch (NumberFormatException e) {
- printWriter.println(MailSrvConstants.ERR);
+ printWriter.println(Constants.ERR);
}
- } else if (tokens.get(0).equals(MailSrvConstants.NOOP)
- || tokens.get(0).equals(MailSrvConstants.RSET)) {
- printWriter.println(MailSrvConstants.OK);
+ } else if (tokens.get(0).equals(Constants.NOOP)
+ || tokens.get(0).equals(Constants.RSET)) {
+ printWriter.println(Constants.OK);
} else {
- printWriter.println(MailSrvConstants.ERR);
+ printWriter.println(Constants.ERR);
}
}
}
@@ -152,7 +153,7 @@
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
PrintWriter printWriter = new PrintWriter(socket.getOutputStream(), true);
- printWriter.println(MailSrvConstants.OK + " POP3 server ready");
+ printWriter.println(Constants.OK + " POP3 server ready");
String s;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/SMTPWorker.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/SMTPWorker.java?view=diff&rev=442198&r1=442197&r2=442198
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/SMTPWorker.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/SMTPWorker.java Mon Sep 11 05:45:22 2006
@@ -18,6 +18,7 @@
package org.apache.axis2.transport.mail.server;
import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.transport.mail.Constants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -94,11 +95,11 @@
private String processInput(String input) {
if (input == null) {
- return MailSrvConstants.COMMAND_UNKNOWN;
+ return Constants.COMMAND_UNKNOWN;
}
if ((mail != null) && transmitionEnd) {
- return MailSrvConstants.COMMAND_TRANSMISSION_END;
+ return Constants.COMMAND_TRANSMISSION_END;
}
if (input.startsWith("MAIL")) {
@@ -135,11 +136,11 @@
}
}
- return MailSrvConstants.MAIL_OK;
+ return Constants.MAIL_OK;
}
if (input.startsWith("HELO")) {
- return MailSrvConstants.HELO_REPLY;
+ return Constants.HELO_REPLY;
} else if (input.startsWith("RCPT")) {
int start = input.indexOf("<") + 1;
@@ -149,13 +150,13 @@
start = input.indexOf("TO:") + 3;
/*
* if(!input.endsWith(domain)){ System.out.println("ERROR: wrong
- * donmain name"); return MailSrvConstants.RCPT_ERROR; }
+ * donmain name"); return Constants.RCPT_ERROR; }
*/
} else {
/*
* if(!input.endsWith(domain + ">")){ System.out.println("ERROR:
- * wrong donmain name"); return MailSrvConstants.RCPT_ERROR; }
+ * wrong donmain name"); return Constants.RCPT_ERROR; }
*/
}
@@ -170,20 +171,20 @@
log.info(e.getMessage());
}
- return MailSrvConstants.RCPT_OK;
+ return Constants.RCPT_OK;
} else if (input.equalsIgnoreCase("DATA")) {
dataWriting = true;
- return MailSrvConstants.DATA_START_SUCCESS;
+ return Constants.DATA_START_SUCCESS;
} else if (input.equalsIgnoreCase("QUIT")) {
dataWriting = true;
transmitionEnd = true;
- return MailSrvConstants.COMMAND_TRANSMISSION_END;
+ return Constants.COMMAND_TRANSMISSION_END;
} else if (input.equals(".")) {
dataWriting = false;
- return MailSrvConstants.DATA_END_SUCCESS;
+ return Constants.DATA_END_SUCCESS;
} else if (input.equals("") && !bodyData) {
bodyData = true;
@@ -202,7 +203,7 @@
return null;
} else {
- return MailSrvConstants.COMMAND_UNKNOWN;
+ return Constants.COMMAND_UNKNOWN;
}
}
@@ -222,7 +223,7 @@
String retString = processInput(input);
- if (MailSrvConstants.COMMAND_EXIT.equals(retString)) {
+ if (Constants.COMMAND_EXIT.equals(retString)) {
exitWorker();
} else {
if (retString != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org