Update of /var/cvs/applications/email/src/org/mmbase/module/smtp
In directory
james.mmbase.org:/tmp/cvs-serv26792/applications/email/src/org/mmbase/module/smtp
Modified Files:
Forwarder.java VerifyEmailMailHandler.java PopFetcher.java
MailFetcher.java SMTPFetcher.java MailHandler.java
SMTPListener.java
Log Message:
Cleaned the code a little
Added some generic stuff for function and datatypes
See also:
http://cvs.mmbase.org/viewcvs/applications/email/src/org/mmbase/module/smtp
Index: Forwarder.java
===================================================================
RCS file:
/var/cvs/applications/email/src/org/mmbase/module/smtp/Forwarder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Forwarder.java 20 Nov 2007 10:37:10 -0000 1.2
+++ Forwarder.java 3 Feb 2008 17:42:06 -0000 1.3
@@ -12,9 +12,7 @@
import org.mmbase.util.logging.Logging;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.xml.UtilReader;
-import org.mmbase.module.Module;
import java.util.*;
-import java.io.*;
import javax.mail.*;
import javax.mail.internet.*;
import org.mmbase.applications.email.SendMail;
@@ -22,7 +20,7 @@
/**
* Forwarding MailHandler. Fill [EMAIL PROTECTED] #forwards} to make this
actually do something.
*
- * @version $Id: Forwarder.java,v 1.2 2007/11/20 10:37:10 michiel Exp $
+ * @version $Id: Forwarder.java,v 1.3 2008/02/03 17:42:06 nklasens Exp $
*/
public class Forwarder implements MailHandler {
private static final Logger log =
Logging.getLoggerInstance(Forwarder.class);
Index: VerifyEmailMailHandler.java
===================================================================
RCS file:
/var/cvs/applications/email/src/org/mmbase/module/smtp/VerifyEmailMailHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- VerifyEmailMailHandler.java 9 Nov 2007 18:26:23 -0000 1.5
+++ VerifyEmailMailHandler.java 3 Feb 2008 17:42:06 -0000 1.6
@@ -12,9 +12,7 @@
import org.mmbase.util.logging.Logging;
import org.mmbase.util.logging.Logger;
import org.mmbase.bridge.*;
-import java.util.*;
import java.text.*;
-import java.io.*;
import javax.mail.*;
/**
@@ -22,7 +20,7 @@
* if so, handles it. Otherwise ignores the message.
* This Handler can be put in front of the [EMAIL PROTECTED]
ChainedMailedHandler}.
*
- * @version $Id: VerifyEmailMailHandler.java,v 1.5 2007/11/09 18:26:23 michiel
Exp $
+ * @version $Id: VerifyEmailMailHandler.java,v 1.6 2008/02/03 17:42:06
nklasens Exp $
*/
public class VerifyEmailMailHandler implements MailHandler {
private static final Logger log =
Logging.getLoggerInstance(VerifyEmailMailHandler.class);
Index: PopFetcher.java
===================================================================
RCS file:
/var/cvs/applications/email/src/org/mmbase/module/smtp/PopFetcher.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- PopFetcher.java 9 Nov 2007 18:26:23 -0000 1.3
+++ PopFetcher.java 3 Feb 2008 17:42:06 -0000 1.4
@@ -14,18 +14,15 @@
import org.mmbase.util.logging.Logger;
import org.mmbase.bridge.*;
import java.util.*;
-import java.io.*;
import org.mmbase.applications.crontab.*;
import javax.mail.*;
import javax.mail.search.*;
-import javax.mail.event.*;
-import javax.mail.internet.*;
/**
* A mail fetcher that does not smtp-listen but periodically pops from a
server. Implemented as a cronjob
*
*
- * @version $Id: PopFetcher.java,v 1.3 2007/11/09 18:26:23 michiel Exp $
+ * @version $Id: PopFetcher.java,v 1.4 2008/02/03 17:42:06 nklasens Exp $
*/
public class PopFetcher extends MailFetcher implements CronJob {
private static final Logger log =
Logging.getLoggerInstance(PopFetcher.class);
Index: MailFetcher.java
===================================================================
RCS file:
/var/cvs/applications/email/src/org/mmbase/module/smtp/MailFetcher.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- MailFetcher.java 9 Nov 2007 18:26:23 -0000 1.3
+++ MailFetcher.java 3 Feb 2008 17:42:06 -0000 1.4
@@ -11,14 +11,6 @@
package org.mmbase.module.smtp;
import org.mmbase.util.logging.Logging;
import org.mmbase.util.logging.Logger;
-import org.mmbase.bridge.*;
-import java.util.*;
-import java.io.*;
-import org.mmbase.applications.crontab.*;
-import javax.mail.*;
-import javax.mail.search.*;
-import javax.mail.event.*;
-import javax.mail.internet.*;
/**
* The abstraction of a class that somehow fetches mail. It is not defined how
these fetchers are
@@ -27,7 +19,7 @@
* bootstrapped by a module [EMAIL PROTECTED] SMTPModule}.
*
- * @version $Id: MailFetcher.java,v 1.3 2007/11/09 18:26:23 michiel Exp $
+ * @version $Id: MailFetcher.java,v 1.4 2008/02/03 17:42:06 nklasens Exp $
*/
public abstract class MailFetcher {
private static final Logger log =
Logging.getLoggerInstance(MailFetcher.class);
Index: SMTPFetcher.java
===================================================================
RCS file:
/var/cvs/applications/email/src/org/mmbase/module/smtp/SMTPFetcher.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- SMTPFetcher.java 22 Jan 2008 09:51:39 -0000 1.11
+++ SMTPFetcher.java 3 Feb 2008 17:42:06 -0000 1.12
@@ -11,7 +11,6 @@
package org.mmbase.module.smtp;
import org.mmbase.util.logging.Logging;
import org.mmbase.util.logging.Logger;
-import org.mmbase.bridge.*;
import java.util.*;
import java.io.*;
import javax.mail.*;
@@ -42,12 +41,11 @@
* TODO: What happens which attached mail-messages? Will those not cause a big
mess?
*
* @author Johannes Verelst <[EMAIL PROTECTED]>
- * @version $Id: SMTPFetcher.java,v 1.11 2008/01/22 09:51:39 michiel Exp $
+ * @version $Id: SMTPFetcher.java,v 1.12 2008/02/03 17:42:06 nklasens Exp $
*/
public class SMTPFetcher extends MailFetcher implements Runnable {
private static final Logger log =
Logging.getLoggerInstance(SMTPFetcher.class);
- private boolean running = true;
private final java.net.Socket socket;
private BufferedReader reader = null;
private BufferedWriter writer = null;
@@ -296,7 +294,6 @@
writer.flush();
char[] endchars = {'\r', '\n', '.', '\r', '\n'};
char[] last5chars = new char[endchars.length];
- int currentpos = 0;
int c;
long maxAttachmentSize = getMaxAttachmentSize(properties);
Index: MailHandler.java
===================================================================
RCS file:
/var/cvs/applications/email/src/org/mmbase/module/smtp/MailHandler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- MailHandler.java 6 Dec 2007 10:40:01 -0000 1.11
+++ MailHandler.java 3 Feb 2008 17:42:06 -0000 1.12
@@ -11,18 +11,14 @@
package org.mmbase.module.smtp;
import org.mmbase.util.logging.Logging;
import org.mmbase.util.logging.Logger;
-import org.mmbase.bridge.*;
import org.mmbase.util.xml.UtilReader;
import java.util.*;
-import java.io.*;
import javax.mail.*;
-import javax.mail.internet.*;
-import org.mmbase.applications.email.SendMail;
/**
* A MailHandler handles <em>one</em> mail. So you must create a new one for
every received message
* (You can use [EMAIL PROTECTED] Factory}).
- * @version $Id: MailHandler.java,v 1.11 2007/12/06 10:40:01 michiel Exp $
+ * @version $Id: MailHandler.java,v 1.12 2008/02/03 17:42:06 nklasens Exp $
*/
public interface MailHandler {
Index: SMTPListener.java
===================================================================
RCS file:
/var/cvs/applications/email/src/org/mmbase/module/smtp/SMTPListener.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- SMTPListener.java 20 Nov 2007 09:23:15 -0000 1.6
+++ SMTPListener.java 3 Feb 2008 17:42:06 -0000 1.7
@@ -11,7 +11,6 @@
package org.mmbase.module.smtp;
import org.mmbase.util.logging.Logging;
import org.mmbase.util.logging.Logger;
-import org.mmbase.bridge.LocalContext;
import java.util.Map;
import java.net.*;
import java.util.concurrent.*;
@@ -20,7 +19,7 @@
* Listener thread, that accepts connection on port 25 (default) and
* delegates all work to its worker threads.
* @author Johannes Verelst <[EMAIL PROTECTED]>
- * @version $Id: SMTPListener.java,v 1.6 2007/11/20 09:23:15 michiel Exp $
+ * @version $Id: SMTPListener.java,v 1.7 2008/02/03 17:42:06 nklasens Exp $
*/
public class SMTPListener extends Thread {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
