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 di...@apache.org on 2005/08/16 16:38:50 UTC
svn commit: r233001 - in
/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail:
./ server/
Author: dims
Date: Tue Aug 16 07:38:44 2005
New Revision: 233001
URL: http://svn.apache.org/viewcvs?rev=233001&view=rev
Log:
Fix broken build
Added:
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSrvConstants.java
- copied, changed from r232998, webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailConstants.java
Removed:
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailConstants.java
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/MailTransportSender.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.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=233001&r1=233000&r2=233001&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 Tue Aug 16 07:38:44 2005
@@ -32,6 +32,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.transport.EmailReceiver;
+import org.apache.axis2.transport.mail.server.MailSrvConstants;
/**
* @author hemapani
@@ -78,13 +79,13 @@
msg.setSubject(subject);
if (charSet == null){
- charSet = MailConstants.DEFAULT_CHAR_SET;
+ charSet = MailSrvConstants.DEFAULT_CHAR_SET;
}
- msg.addHeaderLine("Content-Type: " + MailConstants.DEFAULT_CONTENT_TYPE + "; charset=" + charSet);
+ msg.addHeaderLine("Content-Type: " + MailSrvConstants.DEFAULT_CONTENT_TYPE + "; charset=" + charSet);
msg.setText(message);
- msg.setHeader("Content-Transfer-Encoding", MailConstants.DEFAULT_CHAR_SET_ENCODING);
+ msg.setHeader("Content-Transfer-Encoding", MailSrvConstants.DEFAULT_CHAR_SET_ENCODING);
Transport.send(msg);
} catch (AddressException e) {
throw new AxisFault(e);
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=233001&r1=233000&r2=233001&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 Tue Aug 16 07:38:44 2005
@@ -22,6 +22,7 @@
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.transport.AbstractTransportSender;
+import org.apache.axis2.transport.mail.server.MailSrvConstants;
import org.apache.axis2.util.Utils;
import java.io.ByteArrayOutputStream;
@@ -48,16 +49,16 @@
TransportOutDescription transportOut = msgContext.getTransportOut();
user =
Utils.getParameterValue(
- transportOut.getParameter(MailConstants.SMTP_USER));
+ transportOut.getParameter(MailSrvConstants.SMTP_USER));
host =
Utils.getParameterValue(
- transportOut.getParameter(MailConstants.SMTP_HOST));
+ transportOut.getParameter(MailSrvConstants.SMTP_HOST));
password =
Utils.getParameterValue(
- transportOut.getParameter(MailConstants.SMTP_PASSWORD));
+ transportOut.getParameter(MailSrvConstants.SMTP_PASSWORD));
smtpPort =
Utils.getParameterValue(
- transportOut.getParameter(MailConstants.SMTP_PORT));
+ transportOut.getParameter(MailSrvConstants.SMTP_PORT));
if (user != null
&& host != null
&& password != null
@@ -71,7 +72,7 @@
// In mail char set is what is being used. Charset encoding is not what is expected here.
String charSet = (String)msgContext.getProperty(MessageContext.CHARACTER_SET_ENCODING);
if (charSet == null){
- charSet = MailConstants.DEFAULT_CHAR_SET;
+ charSet = MailSrvConstants.DEFAULT_CHAR_SET;
}
int index = eprAddress.indexOf('/');
String subject = "";
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=233001&r1=233000&r2=233001&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 Tue Aug 16 07:38:44 2005
@@ -18,6 +18,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.transport.mail.server.MailSrvConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
@@ -60,8 +61,8 @@
/**
* Constructor for MailWorker
*
- * @param server
* @param mimeMessage
+ * @param reg
*/
public MailWorker(MimeMessage mimeMessage, ConfigurationContext reg) {
this.mimeMessage = mimeMessage;
@@ -84,10 +85,10 @@
//create Message Context
msgContext = new MessageContext(reg, transportIn, transportOut);
msgContext.setServerSide(true);
- msgContext.setProperty(MailConstants.CONTENT_TYPE, mimeMessage.getContentType());
+ msgContext.setProperty(MailSrvConstants.CONTENT_TYPE, mimeMessage.getContentType());
msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING, mimeMessage.getEncoding());
- String soapAction = getMailHeader(MailConstants.HEADER_SOAP_ACTION);
+ String soapAction = getMailHeader(MailSrvConstants.HEADER_SOAP_ACTION);
msgContext.setWSAAction(soapAction);
msgContext.setSoapAction(soapAction);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java?rev=233001&r1=233000&r2=233001&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java Tue Aug 16 07:38:44 2005
@@ -25,6 +25,7 @@
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.transport.EmailReceiver;
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;
@@ -281,19 +282,19 @@
user =
Utils.getParameterValue(
- transportIn.getParameter(MailConstants.POP3_USER));
+ transportIn.getParameter(MailSrvConstants.POP3_USER));
host =
Utils.getParameterValue(
- transportIn.getParameter(MailConstants.POP3_HOST));
+ transportIn.getParameter(MailSrvConstants.POP3_HOST));
password =
Utils.getParameterValue(
- transportIn.getParameter(MailConstants.POP3_PASSWORD));
+ transportIn.getParameter(MailSrvConstants.POP3_PASSWORD));
port =
Utils.getParameterValue(
- transportIn.getParameter(MailConstants.POP3_PORT));
+ transportIn.getParameter(MailSrvConstants.POP3_PORT));
replyTo =
Utils.getParameterValue(
- transportIn.getParameter(MailConstants.RAPLY_TO));
+ transportIn.getParameter(MailSrvConstants.RAPLY_TO));
if (user == null || host == null || password == null || port == null) {
if (this.user == null) {
throw new AxisFault(
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java?rev=233001&r1=233000&r2=233001&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java Tue Aug 16 07:38:44 2005
@@ -77,8 +77,8 @@
confContext.getAxisConfiguration().getTransportOut(new QName(Constants.TRANSPORT_MAIL)));
msgContext.setServerSide(true);
- msgContext.setProperty(MailConstants.CONTENT_TYPE, mimeMessage.getContentType());
- msgContext.setWSAAction(getMailHeader(MailConstants.HEADER_SOAP_ACTION, mimeMessage));
+ msgContext.setProperty(MailSrvConstants.CONTENT_TYPE, mimeMessage.getContentType());
+ msgContext.setWSAAction(getMailHeader(MailSrvConstants.HEADER_SOAP_ACTION, mimeMessage));
String serviceURL = mimeMessage.getSubject();
if (serviceURL == null) {
Copied: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSrvConstants.java (from r232998, 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/server/MailSrvConstants.java?p2=webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSrvConstants.java&p1=webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailConstants.java&r1=232998&r2=233001&rev=233001&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/server/MailSrvConstants.java Tue Aug 16 07:38:44 2005
@@ -4,9 +4,9 @@
* TODO To change the template for this generated file go to Window -
* Preferences - Java - Code Style - Code Templates
*/
-package org.apache.axis2.transport.mail;
+package org.apache.axis2.transport.mail.server;
-public class MailConstants {
+public class MailSrvConstants {
public final static String FROM_ADDRESS = "transport.mail.from";
public final static String TO_ADDRESS = "transport.mail.to";
@@ -35,4 +35,30 @@
public final static String DEFAULT_CHAR_SET = "us-ascii";
public final static String DEFAULT_CHAR_SET_ENCODING = "7bit";
public final static String DEFAULT_CONTENT_TYPE = "text/xml";
+
+ public final static int SMTP_SERVER_PORT = (1024 + 25);
+ public final static String SERVER_DOMAIN = "localhost";
+ public final static int POP_SERVER_PORT = (1024 + 110);
+
+ public final static String COMMAND_UNKNOWN = "550 Unknown command";
+ public final static String COMMAND_EXIT = "EXIT";
+ 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 RCPT_OK = "250 OK performed command RCPT";
+ public final static String RCPT_ERROR = "550 Unknown recipient";
+ 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 COMMAND_TRANSMISSION_END = "221 Closing SMTP service.";
+ public final static String HELO_REPLY = "250 OK";
+ public final static String OK = "+OK ";
+ public final static String ERR = "-ERR ";
+ public final static String USER = "USER";
+ public final static String PASS = "PASS";
+ public final static String STAT = "STAT";
+ public final static String LIST = "LIST";
+ public final static String RETR = "RETR";
+ public final static String DELE = "DELE";
+ public final static String NOOP = "NOOP";
+ public final static String RSET = "RSET";
+ public final static String QUIT = "QUIT";
}