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 he...@apache.org on 2005/06/30 08:59:10 UTC
svn commit: r202497 - in
/webservices/axis/trunk/java/modules/core/src/org/apache/axis:
Constants.java transport/mail/server/MailSorter.java
transport/mail/server/POP3Worker.java transport/mail/server/SMTPWorker.java
Author: hemapani
Date: Wed Jun 29 23:59:09 2005
New Revision: 202497
URL: http://svn.apache.org/viewcvs?rev=202497&view=rev
Log:
fix the error on wrong repo
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/Constants.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/server/MailSorter.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/server/POP3Worker.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/server/SMTPWorker.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/Constants.java?rev=202497&r1=202496&r2=202497&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/Constants.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/Constants.java Wed Jun 29 23:59:09 2005
@@ -175,8 +175,8 @@
public static final String RESPONSE_WRITTEN = "CONTENT_WRITTEN";
- //public static final String TESTING_PATH = "target/test-resources/";
- public static final String TESTING_PATH = "modules/samples/target/test-resources/";
+ public static final String TESTING_PATH = "target/test-resources/";
+ //public static final String TESTING_PATH = "modules/samples/target/test-resources/";
public static final String TESTING_REPOSITORY = TESTING_PATH+ "samples";
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/server/MailSorter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/server/MailSorter.java?rev=202497&r1=202496&r2=202497&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/server/MailSorter.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/server/MailSorter.java Wed Jun 29 23:59:09 2005
@@ -63,9 +63,7 @@
msgContext.setServerSide(true);
msgContext.setProperty(MailConstants.CONTENT_TYPE, mimeMessage.getContentType());
- String soapAction = getMailHeader(MailConstants.HEADER_SOAP_ACTION, mimeMessage);
- msgContext.setWSAAction(soapAction);
- msgContext.setSoapAction(soapAction);
+ msgContext.setWSAAction(getMailHeader(MailConstants.HEADER_SOAP_ACTION, mimeMessage));
String serviceURL = mimeMessage.getSubject();
if (serviceURL == null) {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/server/POP3Worker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/server/POP3Worker.java?rev=202497&r1=202496&r2=202497&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/server/POP3Worker.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/server/POP3Worker.java Wed Jun 29 23:59:09 2005
@@ -48,6 +48,8 @@
ArrayList messages = new ArrayList();
private void processInput(String input, PrintWriter printWriter){
int listLen = (MailConstants.LIST+" ").length();
+ byte[] CR_LF = new byte[] {0x0D, 0x0A};
+ byte[] CR_LF_DOT_CR_LF = new byte[] { 0x0D, 0x0A, '.', 0x0D, 0x0A };
String user = "";
if(input==null) {
this.doneProcess = true; // This should not be happening
@@ -96,8 +98,12 @@
int index = Integer.parseInt(i);
printWriter.println(MailConstants.OK);
MimeMessage m = (MimeMessage)messages.get(index-1);
+
m.writeTo(socket.getOutputStream());
- byte[] CR_LF_DOT_CR_LF = new byte[] { 0x0D, 0x0A, '.', 0x0D, 0x0A };
+ //System.out.println("\n\n\n\n ========This is the mail========");
+ //m.writeTo(System.out);//socket.getOutputStream());
+ //System.out.println("\n\n\n\n ========This is the mail========");
+
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) {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/server/SMTPWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/server/SMTPWorker.java?rev=202497&r1=202496&r2=202497&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/server/SMTPWorker.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/server/SMTPWorker.java Wed Jun 29 23:59:09 2005
@@ -89,7 +89,6 @@
MailSorter mSort = new MailSorter(this.st,this.configurationContext);
mSort.sort((String)recivers.get(idx), new MimeMessage(mail));
} catch (MessagingException e1) {
- // TODO Auto-generated catch block
e1.printStackTrace();
}
}
@@ -107,19 +106,17 @@
}
private String processInput(String input) {
-
+ byte[] CR_LF = new byte[] {0x0D, 0x0A};
if(input==null) return MailConstants.COMMAND_UNKNOWN;
if(mail!=null && transmitionEnd) return MailConstants.COMMAND_TRANSMISSION_END;
if (input.startsWith("MAIL")) {
- temp += input + "\n";
-
mail = new MimeMessage(Session.getInstance(new Properties(), new Authenticator() {
protected PasswordAuthentication getPasswordAuthentication() {
return null;
}
}));
-
+
int start = input.indexOf("<") + 1;
int end;
@@ -152,8 +149,8 @@
} else if (input.startsWith("RCPT")) {
String domain = MailConstants.SERVER_DOMAIN;
- //System.out.println("RCPT:" + input);
- temp += input + "\n";
+ //System.out.println("RCPT:" + input);
+ //temp += input + "\n"; TODO Check this
int start = input.indexOf("<") + 1;
int end;
@@ -183,8 +180,6 @@
return MailConstants.RCPT_OK;
} else if (input.equalsIgnoreCase("DATA")) {
-
- //session.setDataWriting(true);
dataWriting = true;
return MailConstants.DATA_START_SUCCESS;
@@ -200,10 +195,11 @@
bodyData = true;
return null;
} else if(mail!=null && dataWriting){
- temp += input + "\n";
try {
if (bodyData) {
- mail.setContent(input, "text/plain");
+ temp += input;
+ mail.setContent(temp, "text/plain");
+ System.out.println("\n\n\n---------------" + temp + "---------------\n\n\n");
} else {
mail.addHeaderLine(input);
}