diff --git a/build.xml b/build.xml index 46a823ab..31324f9d 100644 --- a/build.xml +++ b/build.xml @@ -1,5 +1,5 @@ - + diff --git a/pom.xml b/pom.xml index 94d5dcd6..696f1b46 100644 --- a/pom.xml +++ b/pom.xml @@ -5,14 +5,16 @@ davmail davmail jar - 1.1.1 + 1.2.0 davmail http://www.sourceforge.net/projects/davmail Ever wanted to get rid of Outlook ? DavMail is a POP/SMTP exchange gateway allowing users to use any mail client (e.g. Thunderbird) with an Exchange server, even from the internet through Outlook Web Access. DavMail gateway is implemented in java and should run on - any platform. Releases are tested on Windows and Linux (Ubuntu). + any platform. Releases are tested on Windows and Linux (Ubuntu). MacOS support is currently + limited to server (headless) mode. Tested successfully with the Iphone (gateway running on a + server). diff --git a/src/java/davmail/Settings.java b/src/java/davmail/Settings.java index b4a01131..d3c084aa 100644 --- a/src/java/davmail/Settings.java +++ b/src/java/davmail/Settings.java @@ -24,6 +24,10 @@ public class Settings { return isFirstStart; } + public static synchronized void load(InputStream inputStream) throws IOException { + SETTINGS.load(inputStream); + } + public static synchronized void load() { FileInputStream fileInputStream = null; try { @@ -34,7 +38,7 @@ public class Settings { File configFile = new File(configFilePath); if (configFile.exists()) { fileInputStream = new FileInputStream(configFile); - SETTINGS.load(fileInputStream); + load(fileInputStream); } else { isFirstStart = true; @@ -49,6 +53,7 @@ public class Settings { SETTINGS.put("davmail.proxyPort", ""); SETTINGS.put("davmail.proxyUser", ""); SETTINGS.put("davmail.proxyPassword", ""); + SETTINGS.put("davmail.server", "false"); save(); } } catch (IOException e) { diff --git a/src/site/site.xml b/src/site/site.xml index 6db135d6..9acb61b5 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -16,6 +16,7 @@ + diff --git a/src/site/xdoc/serversetup.xml b/src/site/xdoc/serversetup.xml new file mode 100644 index 00000000..de6e3d28 --- /dev/null +++ b/src/site/xdoc/serversetup.xml @@ -0,0 +1,61 @@ + + + + + + Setup DavMail as a server + Mickael Guessant + + + + +
+

Prerequisite : Sun J2SE 1.5 or 1.6. +

+ +

Davmail Gateway can now run in server mode as a gateway between the mail + client and the Outlook Web Access (Exchange) server. + In server mode Davmail can run on any Java supported platform. This is + currently the only way to run DavMail on MacOS X due to poor Java support + (no Java 6 yet). + This mode was tested successfully with the Iphone and should work with + any phone with POP/SMTP client. +

+ +

Download the generic DavMail package from Sourceforge and uncompress it with + your favorite tool, e.g. on Linux:unzip davmail-*.zip. +

+

Prepare a davmail.properties file according to you local needs : +

+ +davmail.url=http://exchangeServer/exchange/ +davmail.popPort=1110 +davmail.smtpPort=1025 +davmail.keepDelay=30 +davmail.allowRemote=true +davmail.enableProxy=false +davmail.proxyHost= +davmail.proxyPort= +davmail.proxyUser= +davmail.proxyPassword= +davmail.server=true + +

See + Getting started + for more information on + the options. Make sure davmail.server is set to true (no icon tray) and allow + remote connections: davmail.allowRemote=true. +

+

Launch Davmail with the following command: + nohup davmail.sh davmail.properties &. +

+

Then check messages: + tail -f nohup.out +

+

Proceed with client configuration: + Getting started +

+
+ + + \ No newline at end of file