Author: dbkr
Date: 2006-06-10 00:16:19 +0000 (Sat, 10 Jun 2006)
New Revision: 9118
Added:
trunk/apps/Freemail/src/freemail/
trunk/apps/Freemail/src/freemail/Freemail.java
Removed:
trunk/apps/Freemail/src/fnmail/
trunk/apps/Freemail/src/freemail/FNMail.java
Modified:
trunk/apps/Freemail/src/freemail/AccountManager.java
trunk/apps/Freemail/src/freemail/Contact.java
trunk/apps/Freemail/src/freemail/MailFetcher.java
trunk/apps/Freemail/src/freemail/MailLog.java
trunk/apps/Freemail/src/freemail/MailMessage.java
trunk/apps/Freemail/src/freemail/MessageBank.java
trunk/apps/Freemail/src/freemail/MessageSender.java
trunk/apps/Freemail/src/freemail/SingleAccountWatcher.java
trunk/apps/Freemail/src/freemail/fcp/FCPBadFileException.java
trunk/apps/Freemail/src/freemail/fcp/FCPClient.java
trunk/apps/Freemail/src/freemail/fcp/FCPConnection.java
trunk/apps/Freemail/src/freemail/fcp/FCPContext.java
trunk/apps/Freemail/src/freemail/fcp/FCPErrorMessage.java
trunk/apps/Freemail/src/freemail/fcp/FCPInsertErrorMessage.java
trunk/apps/Freemail/src/freemail/fcp/FCPMessage.java
trunk/apps/Freemail/src/freemail/fcp/HighLevelFCPClient.java
trunk/apps/Freemail/src/freemail/fcp/NoNodeConnectionException.java
trunk/apps/Freemail/src/freemail/fcp/SSKKeyPair.java
trunk/apps/Freemail/src/freemail/imap/IMAPBadMessageException.java
trunk/apps/Freemail/src/freemail/imap/IMAPHandler.java
trunk/apps/Freemail/src/freemail/imap/IMAPListener.java
trunk/apps/Freemail/src/freemail/imap/IMAPMessage.java
trunk/apps/Freemail/src/freemail/imap/IMAPMessageFlags.java
trunk/apps/Freemail/src/freemail/smtp/SMTPBadCommandException.java
trunk/apps/Freemail/src/freemail/smtp/SMTPCommand.java
trunk/apps/Freemail/src/freemail/smtp/SMTPHandler.java
trunk/apps/Freemail/src/freemail/smtp/SMTPListener.java
trunk/apps/Freemail/src/freemail/utils/DateStringFactory.java
trunk/apps/Freemail/src/freemail/utils/EmailAddress.java
trunk/apps/Freemail/src/freemail/utils/PropsFile.java
Log:
Nomenclature changes in source. Does mean backwards incompatible changes since
it involves changing KSKs. Better now than later.
Copied: trunk/apps/Freemail/src/freemail (from rev 9117,
trunk/apps/Freemail/src/fnmail)
Modified: trunk/apps/Freemail/src/freemail/AccountManager.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/AccountManager.java 2006-06-09 23:31:28 UTC
(rev 9117)
+++ trunk/apps/Freemail/src/freemail/AccountManager.java 2006-06-10
00:16:19 UTC (rev 9118)
@@ -1,4 +1,4 @@
-package fnmail;
+package freemail;
import java.io.File;
import java.io.FileInputStream;
@@ -10,9 +10,9 @@
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import fnmail.fcp.HighLevelFCPClient;
-import fnmail.fcp.SSKKeyPair;
-import fnmail.util.PropsFile;
+import freemail.fcp.HighLevelFCPClient;
+import freemail.fcp.SSKKeyPair;
+import freemail.util.PropsFile;
public class AccountManager {
public static final String DATADIR = "data";
@@ -59,7 +59,7 @@
try {
md = MessageDigest.getInstance("MD5");
} catch (NoSuchAlgorithmException alge) {
- throw new Exception("No MD5 implementation available -
sorry, fnmail cannot work!");
+ throw new Exception("No MD5 implementation available -
sorry, Freemail cannot work!");
}
File accountdir = new File(DATADIR, username);
@@ -110,7 +110,7 @@
private static void initAccFile(PropsFile accfile) {
try {
System.out.println("Generating mailsite keys...");
- HighLevelFCPClient fcpcli = new
HighLevelFCPClient(FNMail.getFCPConnection());
+ HighLevelFCPClient fcpcli = new
HighLevelFCPClient(Freemail.getFCPConnection());
SSKKeyPair keypair = fcpcli.makeSSK();
Modified: trunk/apps/Freemail/src/freemail/Contact.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/Contact.java 2006-06-09 23:31:28 UTC (rev
9117)
+++ trunk/apps/Freemail/src/freemail/Contact.java 2006-06-10 00:16:19 UTC
(rev 9118)
@@ -1,4 +1,4 @@
-package fnmail;
+package freemail;
import java.io.File;
import java.io.IOException;
@@ -6,7 +6,7 @@
import java.io.BufferedReader;
import java.util.Date;
-import fnmail.utils.DateStringFactory;
+import freemail.utils.DateStringFactory;
public class Contact {
public static final String KEYFILE = "key";
Deleted: trunk/apps/Freemail/src/freemail/FNMail.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/FNMail.java 2006-06-09 23:31:28 UTC (rev
9117)
+++ trunk/apps/Freemail/src/freemail/FNMail.java 2006-06-10 00:16:19 UTC
(rev 9118)
@@ -1,131 +0,0 @@
-package fnmail;
-
-import java.io.File;
-import java.io.IOException;
-
-import fnmail.fcp.FCPContext;
-import fnmail.fcp.FCPConnection;
-import fnmail.imap.IMAPListener;
-import fnmail.smtp.SMTPListener;
-
-public class FNMail {
- private static final String TEMPDIRNAME = "temp";
- private static File datadir;
- private static File tempdir;
- private static FCPConnection fcpconn;
-
- public static File getTempDir() {
- return FNMail.tempdir;
- }
-
- public static FCPConnection getFCPConnection() {
- return FNMail.fcpconn;
- }
-
- public static void main(String[] args) {
- String fcphost = "localhost";
- int fcpport = 9481;
-
- for (int i = 0; i < args.length; i++) {
- if (args[i].equals("--newaccount")) {
- i++;
- if (args.length - 1 < i) {
- System.out.println("Usage: --newaccount
<account name>");
- return;
- }
- try {
- AccountManager.Create(args[i]);
- // for now
- AccountManager.setupNIM(args[i]);
- System.out.println("Account created for
"+args[i]+". You may now set a password with --passwd <password>");
- System.out.println("For the time being,
you address is "+args[i]+"@nim.fnmail");
- } catch (IOException ioe) {
- System.out.println("Couldn't create
account. Please check write access to fnmail's working directory. Error:
"+ioe.getMessage());
- }
- return;
- } else if (args[i].equals("--passwd")) {
- i = i + 2;
- if (args.length - 1 < i) {
- System.out.println("Usage: --passwd
<account name> <password>");
- return;
- }
- try {
- AccountManager.ChangePassword(args[i -
1], args[i]);
- System.out.println("Password changed.");
- } catch (Exception e) {
- System.out.println("Couldn't change
password for "+args[i - 1]+". "+e.getMessage());
- }
- return;
- } else if (args[i].equals("-h")) {
- i++;
- if (args.length - 1 < i) {
- System.out.println("No hostname
supplied, using default");
- continue;
- }
- fcphost = args[i];
- } else if (args[i].equals("-p")) {
- i++;
- if (args.length - 1 < i) {
- System.out.println("No port supplied,
using default");
- continue;
- }
- try {
- fcpport = Integer.parseInt(args[i]);
- } catch (NumberFormatException nfe) {
- System.out.println("Bad port supplied,
using default");
- }
- }
- }
-
- FCPContext fcpctx = new FCPContext(fcphost, fcpport);
-
- FNMail.fcpconn = new FCPConnection(fcpctx);
- Thread fcpthread = new Thread(fcpconn);
- fcpthread.setDaemon(true);
- fcpthread.start();
-
- // start a SingleAccountWatcher for each account
- FNMail.datadir = new File("data");
- if (!FNMail.datadir.exists()) {
- System.out.println("Starting fnmail for the first
time.");
- System.out.println("You will probably want to add an
account by running fnmail with arguments --newaccount <username>");
- if (!FNMail.datadir.mkdir()) {
- System.out.println("Couldn't create data
directory. Please ensure that the user you are running fnmail as has write
access to its working directory");
- System.exit(1);
- }
- }
- FNMail.tempdir = new File(FNMail.TEMPDIRNAME);
- if (!FNMail.tempdir.exists()) {
- if (!FNMail.tempdir.mkdir()) {
- System.out.println("Couldn't create temporary
directory. Please ensure that the user you are running fnmail as has write
access to its working directory");
- System.exit(1);
- }
- }
-
- File[] files = FNMail.datadir.listFiles();
- for (int i = 0; i < files.length; i++) {
- if (files[i].getName().equals(".") ||
files[i].getName().equals(".."))
- continue;
-
- Thread t = new Thread(new
SingleAccountWatcher(files[i]));
- t.setDaemon(true);
- t.start();
- }
-
- // and a sender thread
- MessageSender sender = new MessageSender(FNMail.datadir);
- Thread senderthread = new Thread(sender);
- senderthread.setDaemon(true);
- senderthread.start();
-
- // start the SMTP Listener
- SMTPListener smtpl = new SMTPListener(sender);
- Thread smtpthread = new Thread(smtpl);
- smtpthread.setDaemon(true);
- smtpthread.start();
-
- // start the IMAP listener
- IMAPListener imapl = new IMAPListener();
- imapl.run();
- }
-}
Copied: trunk/apps/Freemail/src/freemail/Freemail.java (from rev 9117,
trunk/apps/Freemail/src/fnmail/FNMail.java)
===================================================================
--- trunk/apps/Freemail/src/fnmail/FNMail.java 2006-06-09 23:31:28 UTC (rev
9117)
+++ trunk/apps/Freemail/src/freemail/Freemail.java 2006-06-10 00:16:19 UTC
(rev 9118)
@@ -0,0 +1,131 @@
+package freemail;
+
+import java.io.File;
+import java.io.IOException;
+
+import freemail.fcp.FCPContext;
+import freemail.fcp.FCPConnection;
+import freemail.imap.IMAPListener;
+import freemail.smtp.SMTPListener;
+
+public class Freemail {
+ private static final String TEMPDIRNAME = "temp";
+ private static File datadir;
+ private static File tempdir;
+ private static FCPConnection fcpconn;
+
+ public static File getTempDir() {
+ return Freemail.tempdir;
+ }
+
+ public static FCPConnection getFCPConnection() {
+ return Freemail.fcpconn;
+ }
+
+ public static void main(String[] args) {
+ String fcphost = "localhost";
+ int fcpport = 9481;
+
+ for (int i = 0; i < args.length; i++) {
+ if (args[i].equals("--newaccount")) {
+ i++;
+ if (args.length - 1 < i) {
+ System.out.println("Usage: --newaccount
<account name>");
+ return;
+ }
+ try {
+ AccountManager.Create(args[i]);
+ // for now
+ AccountManager.setupNIM(args[i]);
+ System.out.println("Account created for
"+args[i]+". You may now set a password with --passwd <password>");
+ System.out.println("For the time being,
you address is "+args[i]+"@nim.freemail");
+ } catch (IOException ioe) {
+ System.out.println("Couldn't create
account. Please check write access to Freemail's working directory. Error:
"+ioe.getMessage());
+ }
+ return;
+ } else if (args[i].equals("--passwd")) {
+ i = i + 2;
+ if (args.length - 1 < i) {
+ System.out.println("Usage: --passwd
<account name> <password>");
+ return;
+ }
+ try {
+ AccountManager.ChangePassword(args[i -
1], args[i]);
+ System.out.println("Password changed.");
+ } catch (Exception e) {
+ System.out.println("Couldn't change
password for "+args[i - 1]+". "+e.getMessage());
+ }
+ return;
+ } else if (args[i].equals("-h")) {
+ i++;
+ if (args.length - 1 < i) {
+ System.out.println("No hostname
supplied, using default");
+ continue;
+ }
+ fcphost = args[i];
+ } else if (args[i].equals("-p")) {
+ i++;
+ if (args.length - 1 < i) {
+ System.out.println("No port supplied,
using default");
+ continue;
+ }
+ try {
+ fcpport = Integer.parseInt(args[i]);
+ } catch (NumberFormatException nfe) {
+ System.out.println("Bad port supplied,
using default");
+ }
+ }
+ }
+
+ FCPContext fcpctx = new FCPContext(fcphost, fcpport);
+
+ Freemail.fcpconn = new FCPConnection(fcpctx);
+ Thread fcpthread = new Thread(fcpconn);
+ fcpthread.setDaemon(true);
+ fcpthread.start();
+
+ // start a SingleAccountWatcher for each account
+ Freemail.datadir = new File("data");
+ if (!Freemail.datadir.exists()) {
+ System.out.println("Starting Freemail for the first
time.");
+ System.out.println("You will probably want to add an
account by running Freemail with arguments --newaccount <username>");
+ if (!Freemail.datadir.mkdir()) {
+ System.out.println("Couldn't create data
directory. Please ensure that the user you are running Freemail as has write
access to its working directory");
+ System.exit(1);
+ }
+ }
+ Freemail.tempdir = new File(Freemail.TEMPDIRNAME);
+ if (!Freemail.tempdir.exists()) {
+ if (!Freemail.tempdir.mkdir()) {
+ System.out.println("Couldn't create temporary
directory. Please ensure that the user you are running Freemail as has write
access to its working directory");
+ System.exit(1);
+ }
+ }
+
+ File[] files = Freemail.datadir.listFiles();
+ for (int i = 0; i < files.length; i++) {
+ if (files[i].getName().equals(".") ||
files[i].getName().equals(".."))
+ continue;
+
+ Thread t = new Thread(new
SingleAccountWatcher(files[i]));
+ t.setDaemon(true);
+ t.start();
+ }
+
+ // and a sender thread
+ MessageSender sender = new MessageSender(Freemail.datadir);
+ Thread senderthread = new Thread(sender);
+ senderthread.setDaemon(true);
+ senderthread.start();
+
+ // start the SMTP Listener
+ SMTPListener smtpl = new SMTPListener(sender);
+ Thread smtpthread = new Thread(smtpl);
+ smtpthread.setDaemon(true);
+ smtpthread.start();
+
+ // start the IMAP listener
+ IMAPListener imapl = new IMAPListener();
+ imapl.run();
+ }
+}
Modified: trunk/apps/Freemail/src/freemail/MailFetcher.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/MailFetcher.java 2006-06-09 23:31:28 UTC
(rev 9117)
+++ trunk/apps/Freemail/src/freemail/MailFetcher.java 2006-06-10 00:16:19 UTC
(rev 9118)
@@ -1,8 +1,8 @@
-package fnmail;
+package freemail;
-import fnmail.fcp.FCPConnection;
-import fnmail.fcp.HighLevelFCPClient;
-import fnmail.utils.DateStringFactory;
+import freemail.fcp.FCPConnection;
+import freemail.fcp.HighLevelFCPClient;
+import freemail.utils.DateStringFactory;
import java.io.File;
import java.io.IOException;
@@ -109,7 +109,7 @@
// add our own headers first
// recieved and date
- newmsg.addHeader("Received", "(fnmail); "+this.sdf.format(new
Date()));
+ newmsg.addHeader("Received", "(Freemail); "+this.sdf.format(new
Date()));
BufferedReader rdr = new BufferedReader(new FileReader(file));
Modified: trunk/apps/Freemail/src/freemail/MailLog.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/MailLog.java 2006-06-09 23:31:28 UTC (rev
9117)
+++ trunk/apps/Freemail/src/freemail/MailLog.java 2006-06-10 00:16:19 UTC
(rev 9118)
@@ -1,4 +1,4 @@
-package fnmail;
+package freemail;
import java.io.File;
import java.io.FileReader;
Modified: trunk/apps/Freemail/src/freemail/MailMessage.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/MailMessage.java 2006-06-09 23:31:28 UTC
(rev 9117)
+++ trunk/apps/Freemail/src/freemail/MailMessage.java 2006-06-10 00:16:19 UTC
(rev 9118)
@@ -1,4 +1,4 @@
-package fnmail;
+package freemail;
import java.io.OutputStream;
import java.io.FileOutputStream;
@@ -11,7 +11,7 @@
import java.util.Vector;
import java.util.Enumeration;
-import fnmail.imap.IMAPMessageFlags;
+import freemail.imap.IMAPMessageFlags;
public class MailMessage {
private File file;
Modified: trunk/apps/Freemail/src/freemail/MessageBank.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/MessageBank.java 2006-06-09 23:31:28 UTC
(rev 9117)
+++ trunk/apps/Freemail/src/freemail/MessageBank.java 2006-06-10 00:16:19 UTC
(rev 9118)
@@ -1,4 +1,4 @@
-package fnmail;
+package freemail;
import java.io.IOException;
import java.io.File;
Modified: trunk/apps/Freemail/src/freemail/MessageSender.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/MessageSender.java 2006-06-09 23:31:28 UTC
(rev 9117)
+++ trunk/apps/Freemail/src/freemail/MessageSender.java 2006-06-10 00:16:19 UTC
(rev 9118)
@@ -1,4 +1,4 @@
-package fnmail;
+package freemail;
import java.io.File;
import java.io.FileOutputStream;
@@ -8,16 +8,16 @@
import java.util.Vector;
import java.util.Enumeration;
-import fnmail.fcp.HighLevelFCPClient;
-import fnmail.fcp.FCPInsertErrorMessage;
-import fnmail.fcp.FCPBadFileException;
-import fnmail.utils.EmailAddress;
-import fnmail.utils.DateStringFactory;
+import freemail.fcp.HighLevelFCPClient;
+import freemail.fcp.FCPInsertErrorMessage;
+import freemail.fcp.FCPBadFileException;
+import freemail.utils.EmailAddress;
+import freemail.utils.DateStringFactory;
public class MessageSender implements Runnable {
public static final String OUTBOX_DIR = "outbox";
public static final int MIN_RUN_TIME = 60000;
- public static final String NIM_KEY_PREFIX = "KSK at fnmail-nim-";
+ public static final String NIM_KEY_PREFIX = "KSK at freemail-nim-";
private final File datadir;
private Thread senderthread;
@@ -39,7 +39,7 @@
}
private synchronized void copyToOutbox(File src, File outbox, String
to) throws IOException {
- File tempfile = File.createTempFile("fmail-msg-tmp", null,
FNMail.getTempDir());
+ File tempfile = File.createTempFile("fmail-msg-tmp", null,
Freemail.getTempDir());
FileOutputStream fos = new FileOutputStream(tempfile);
FileInputStream fis = new FileInputStream(src);
@@ -116,7 +116,7 @@
return;
}
- if (addr.domain.equalsIgnoreCase("nim.fnmail")) {
+ if (addr.domain.equalsIgnoreCase("nim.freemail")) {
if (this.slotinsert(msg,
NIM_KEY_PREFIX+addr.user+"-"+DateStringFactory.getKeyString())) {
msg.delete();
}
@@ -124,7 +124,7 @@
}
private boolean slotinsert(File data, String basekey) {
- HighLevelFCPClient cli = new
HighLevelFCPClient(FNMail.getFCPConnection());
+ HighLevelFCPClient cli = new
HighLevelFCPClient(Freemail.getFCPConnection());
int slot = 1;
boolean carryon = true;
Modified: trunk/apps/Freemail/src/freemail/SingleAccountWatcher.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/SingleAccountWatcher.java 2006-06-09
23:31:28 UTC (rev 9117)
+++ trunk/apps/Freemail/src/freemail/SingleAccountWatcher.java 2006-06-10
00:16:19 UTC (rev 9118)
@@ -1,4 +1,4 @@
-package fnmail;
+package freemail;
import java.io.File;
import java.lang.InterruptedException;
@@ -17,7 +17,7 @@
AccountManager.getMailsitePrivkey(accdir);
this.mb = new MessageBank(accdir.getName());
- this.mf = new MailFetcher(this.mb, contacts_dir,
FNMail.getFCPConnection());
+ this.mf = new MailFetcher(this.mb, contacts_dir,
Freemail.getFCPConnection());
}
public void run() {
Modified: trunk/apps/Freemail/src/freemail/fcp/FCPBadFileException.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/fcp/FCPBadFileException.java 2006-06-09
23:31:28 UTC (rev 9117)
+++ trunk/apps/Freemail/src/freemail/fcp/FCPBadFileException.java
2006-06-10 00:16:19 UTC (rev 9118)
@@ -1,5 +1,5 @@
-package fnmail.fcp;
+package freemail.fcp;
public class FCPBadFileException extends Exception {
-}
\ No newline at end of file
+}
Modified: trunk/apps/Freemail/src/freemail/fcp/FCPClient.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/fcp/FCPClient.java 2006-06-09 23:31:28 UTC
(rev 9117)
+++ trunk/apps/Freemail/src/freemail/fcp/FCPClient.java 2006-06-10 00:16:19 UTC
(rev 9118)
@@ -1,4 +1,4 @@
-package fnmail.fcp;
+package freemail.fcp;
public interface FCPClient {
public void requestFinished(FCPMessage msg);
Modified: trunk/apps/Freemail/src/freemail/fcp/FCPConnection.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/fcp/FCPConnection.java 2006-06-09
23:31:28 UTC (rev 9117)
+++ trunk/apps/Freemail/src/freemail/fcp/FCPConnection.java 2006-06-10
00:16:19 UTC (rev 9118)
@@ -1,4 +1,4 @@
-package fnmail.fcp;
+package freemail.fcp;
import java.io.OutputStream;
import java.io.InputStream;
Modified: trunk/apps/Freemail/src/freemail/fcp/FCPContext.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/fcp/FCPContext.java 2006-06-09 23:31:28 UTC
(rev 9117)
+++ trunk/apps/Freemail/src/freemail/fcp/FCPContext.java 2006-06-10
00:16:19 UTC (rev 9118)
@@ -1,4 +1,4 @@
-package fnmail.fcp;
+package freemail.fcp;
import java.io.IOException;
import java.net.Socket;
Modified: trunk/apps/Freemail/src/freemail/fcp/FCPErrorMessage.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/fcp/FCPErrorMessage.java 2006-06-09
23:31:28 UTC (rev 9117)
+++ trunk/apps/Freemail/src/freemail/fcp/FCPErrorMessage.java 2006-06-10
00:16:19 UTC (rev 9118)
@@ -1,4 +1,4 @@
-package fnmail.fcp;
+package freemail.fcp;
public class FCPErrorMessage {
public final int errorcode;
Modified: trunk/apps/Freemail/src/freemail/fcp/FCPInsertErrorMessage.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/fcp/FCPInsertErrorMessage.java
2006-06-09 23:31:28 UTC (rev 9117)
+++ trunk/apps/Freemail/src/freemail/fcp/FCPInsertErrorMessage.java
2006-06-10 00:16:19 UTC (rev 9118)
@@ -1,4 +1,4 @@
-package fnmail.fcp;
+package freemail.fcp;
public class FCPInsertErrorMessage extends FCPErrorMessage {
/* Caller supplied a URI we cannot use */
Modified: trunk/apps/Freemail/src/freemail/fcp/FCPMessage.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/fcp/FCPMessage.java 2006-06-09 23:31:28 UTC
(rev 9117)
+++ trunk/apps/Freemail/src/freemail/fcp/FCPMessage.java 2006-06-10
00:16:19 UTC (rev 9118)
@@ -1,4 +1,4 @@
-package fnmail.fcp;
+package freemail.fcp;
import java.io.OutputStream;
import java.io.InputStream;
@@ -9,7 +9,7 @@
import java.util.Enumeration;
import java.util.Collections;
-import fnmail.FNMail;
+import freemail.Freemail;
import freenet.support.io.LineReader;
import freenet.support.io.LineReadingInputStream;
@@ -86,7 +86,7 @@
private void readData(InputStream is, int len) {
try {
- this.data = File.createTempFile("fnmail-fcp", null,
FNMail.getTempDir());
+ this.data = File.createTempFile("freemail-fcp", null,
Freemail.getTempDir());
} catch (Exception e) {
this.data = null;
return;
@@ -141,7 +141,7 @@
buf.append("\r\n");
if (this.messagetype.equalsIgnoreCase("ClientHello")) {
- buf.append("Name=fnmail\r\n");
+ buf.append("Name=freemail\r\n");
buf.append("ExpectedVersion=2.0\r\n");
}
Modified: trunk/apps/Freemail/src/freemail/fcp/HighLevelFCPClient.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/fcp/HighLevelFCPClient.java 2006-06-09
23:31:28 UTC (rev 9117)
+++ trunk/apps/Freemail/src/freemail/fcp/HighLevelFCPClient.java
2006-06-10 00:16:19 UTC (rev 9118)
@@ -1,4 +1,4 @@
-package fnmail.fcp;
+package freemail.fcp;
import java.io.File;
import java.io.InputStream;
Modified: trunk/apps/Freemail/src/freemail/fcp/NoNodeConnectionException.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/fcp/NoNodeConnectionException.java
2006-06-09 23:31:28 UTC (rev 9117)
+++ trunk/apps/Freemail/src/freemail/fcp/NoNodeConnectionException.java
2006-06-10 00:16:19 UTC (rev 9118)
@@ -1,4 +1,4 @@
-package fnmail.fcp;
+package freemail.fcp;
public class NoNodeConnectionException extends Exception {
NoNodeConnectionException() {
Modified: trunk/apps/Freemail/src/freemail/fcp/SSKKeyPair.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/fcp/SSKKeyPair.java 2006-06-09 23:31:28 UTC
(rev 9117)
+++ trunk/apps/Freemail/src/freemail/fcp/SSKKeyPair.java 2006-06-10
00:16:19 UTC (rev 9118)
@@ -1,4 +1,4 @@
-package fnmail.fcp;
+package freemail.fcp;
public class SSKKeyPair {
public String pubkey;
Modified: trunk/apps/Freemail/src/freemail/imap/IMAPBadMessageException.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/imap/IMAPBadMessageException.java
2006-06-09 23:31:28 UTC (rev 9117)
+++ trunk/apps/Freemail/src/freemail/imap/IMAPBadMessageException.java
2006-06-10 00:16:19 UTC (rev 9118)
@@ -1,4 +1,4 @@
-package fnmail.imap;;
+package freemail.imap;;
public class IMAPBadMessageException extends Exception {
// no, this isn't the most exciting class in the world.
Modified: trunk/apps/Freemail/src/freemail/imap/IMAPHandler.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/imap/IMAPHandler.java 2006-06-09
23:31:28 UTC (rev 9117)
+++ trunk/apps/Freemail/src/freemail/imap/IMAPHandler.java 2006-06-10
00:16:19 UTC (rev 9118)
@@ -1,4 +1,4 @@
-package fnmail.imap;
+package freemail.imap;
import java.net.Socket;
import java.io.OutputStream;
@@ -9,10 +9,10 @@
import java.util.SortedMap;
import java.lang.NumberFormatException;
-import fnmail.MessageBank;
-import fnmail.MailMessage;
-import fnmail.AccountManager;
-import fnmail.utils.EmailAddress;
+import freemail.MessageBank;
+import freemail.MailMessage;
+import freemail.AccountManager;
+import freemail.utils.EmailAddress;
public class IMAPHandler implements Runnable {
final Socket client;
@@ -53,7 +53,7 @@
}
private void sendWelcome() {
- this.ps.print("* OK [CAPABILITY IMAP4rev1] fnmail ready - hit
me with your rhythm stick.\r\n");
+ this.ps.print("* OK [CAPABILITY IMAP4rev1] Freemail ready - hit
me with your rhythm stick.\r\n");
}
private void dispatch(IMAPMessage msg) {
@@ -652,10 +652,10 @@
buf.append(IMAPifyString(mmsg.getFirstHeader("Subject"))+" ");
// from
buf.append(this.IMAPifyAddress(mmsg.getFirstHeader("From"))+"
");
- // sender (this should probably be the fnmail address that
+ // sender (this should probably be the Freemail address that
// we got it from, except I haven't found a mail client that
// actually uses this part yet, so it might be pointless
-
buf.append(this.IMAPifyAddress(mmsg.getFirstHeader("x-fnmail-sender"))+" ");
+
buf.append(this.IMAPifyAddress(mmsg.getFirstHeader("x-freemail-sender"))+" ");
buf.append(this.IMAPifyAddress(mmsg.getFirstHeader("Reply-To"))+" ");
buf.append(this.IMAPifyAddress(mmsg.getFirstHeader("To"))+" ");
Modified: trunk/apps/Freemail/src/freemail/imap/IMAPListener.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/imap/IMAPListener.java 2006-06-09
23:31:28 UTC (rev 9117)
+++ trunk/apps/Freemail/src/freemail/imap/IMAPListener.java 2006-06-10
00:16:19 UTC (rev 9118)
@@ -1,4 +1,4 @@
-package fnmail.imap;
+package freemail.imap;
import java.net.ServerSocket;
import java.io.IOException;
Modified: trunk/apps/Freemail/src/freemail/imap/IMAPMessage.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/imap/IMAPMessage.java 2006-06-09
23:31:28 UTC (rev 9117)
+++ trunk/apps/Freemail/src/freemail/imap/IMAPMessage.java 2006-06-10
00:16:19 UTC (rev 9118)
@@ -1,4 +1,4 @@
-package fnmail.imap;
+package freemail.imap;
import java.util.Vector;
Modified: trunk/apps/Freemail/src/freemail/imap/IMAPMessageFlags.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/imap/IMAPMessageFlags.java 2006-06-09
23:31:28 UTC (rev 9117)
+++ trunk/apps/Freemail/src/freemail/imap/IMAPMessageFlags.java 2006-06-10
00:16:19 UTC (rev 9118)
@@ -1,4 +1,4 @@
-package fnmail.imap;
+package freemail.imap;
import java.util.Vector;
Modified: trunk/apps/Freemail/src/freemail/smtp/SMTPBadCommandException.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/smtp/SMTPBadCommandException.java
2006-06-09 23:31:28 UTC (rev 9117)
+++ trunk/apps/Freemail/src/freemail/smtp/SMTPBadCommandException.java
2006-06-10 00:16:19 UTC (rev 9118)
@@ -1,4 +1,4 @@
-package fnmail.smtp;
+package freemail.smtp;
public class SMTPBadCommandException extends Exception {
Modified: trunk/apps/Freemail/src/freemail/smtp/SMTPCommand.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/smtp/SMTPCommand.java 2006-06-09
23:31:28 UTC (rev 9117)
+++ trunk/apps/Freemail/src/freemail/smtp/SMTPCommand.java 2006-06-10
00:16:19 UTC (rev 9118)
@@ -1,4 +1,4 @@
-package fnmail.smtp;
+package freemail.smtp;
import java.util.Vector;
Modified: trunk/apps/Freemail/src/freemail/smtp/SMTPHandler.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/smtp/SMTPHandler.java 2006-06-09
23:31:28 UTC (rev 9117)
+++ trunk/apps/Freemail/src/freemail/smtp/SMTPHandler.java 2006-06-10
00:16:19 UTC (rev 9118)
@@ -1,4 +1,4 @@
-package fnmail.smtp;
+package freemail.smtp;
import java.net.Socket;
import java.io.OutputStream;
@@ -12,10 +12,10 @@
import java.util.Vector;
import thirdparty.Base64Coder;
-import fnmail.FNMail;
-import fnmail.AccountManager;
-import fnmail.MessageSender;
-import fnmail.utils.EmailAddress;
+import freemail.Freemail;
+import freemail.AccountManager;
+import freemail.MessageSender;
+import freemail.utils.EmailAddress;
public class SMTPHandler implements Runnable {
private final Socket client;
@@ -209,8 +209,8 @@
return;
}
- if (!addr.is_fnmail_address()) {
- this.ps.print("553 Not a fnmail address\r\n");
+ if (!addr.is_freemail_address()) {
+ this.ps.print("553 Not a Freemail address\r\n");
return;
}
@@ -232,7 +232,7 @@
}
try {
- File tempfile = File.createTempFile("fnmail-",
".message", FNMail.getTempDir());
+ File tempfile = File.createTempFile("freemail-",
".message", Freemail.getTempDir());
PrintWriter pw = new PrintWriter(new
FileOutputStream(tempfile));
this.ps.print("354 Go crazy\r\n");
Modified: trunk/apps/Freemail/src/freemail/smtp/SMTPListener.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/smtp/SMTPListener.java 2006-06-09
23:31:28 UTC (rev 9117)
+++ trunk/apps/Freemail/src/freemail/smtp/SMTPListener.java 2006-06-10
00:16:19 UTC (rev 9118)
@@ -1,9 +1,9 @@
-package fnmail.smtp;
+package freemail.smtp;
import java.net.ServerSocket;
import java.io.IOException;
-import fnmail.MessageSender;
+import freemail.MessageSender;
public class SMTPListener implements Runnable {
private static final int LISTENPORT = 3025;
Modified: trunk/apps/Freemail/src/freemail/utils/DateStringFactory.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/utils/DateStringFactory.java 2006-06-09
23:31:28 UTC (rev 9117)
+++ trunk/apps/Freemail/src/freemail/utils/DateStringFactory.java
2006-06-10 00:16:19 UTC (rev 9118)
@@ -1,4 +1,4 @@
-package fnmail.utils;
+package freemail.utils;
import java.util.Calendar;
import java.util.TimeZone;
Modified: trunk/apps/Freemail/src/freemail/utils/EmailAddress.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/utils/EmailAddress.java 2006-06-09
23:31:28 UTC (rev 9117)
+++ trunk/apps/Freemail/src/freemail/utils/EmailAddress.java 2006-06-10
00:16:19 UTC (rev 9118)
@@ -1,4 +1,4 @@
-package fnmail.utils;
+package freemail.utils;
public class EmailAddress {
public String realname;
@@ -45,8 +45,8 @@
}
}
- public boolean is_fnmail_address() {
+ public boolean is_freemail_address() {
if (this.domain == null) return false;
- return this.domain.equalsIgnoreCase("nim.fnmail");
+ return this.domain.equalsIgnoreCase("nim.freemail");
}
}
Modified: trunk/apps/Freemail/src/freemail/utils/PropsFile.java
===================================================================
--- trunk/apps/Freemail/src/fnmail/utils/PropsFile.java 2006-06-09 23:31:28 UTC
(rev 9117)
+++ trunk/apps/Freemail/src/freemail/utils/PropsFile.java 2006-06-10
00:16:19 UTC (rev 9118)
@@ -1,4 +1,4 @@
-package fnmail.util;
+package freemail.util;
import java.io.File;
import java.io.FileReader;
