diff --git a/deploy/postfix-user/config/main.cf b/deploy/postfix-user/config/main.cf index cfb41e4..01c7af9 100644 --- a/deploy/postfix-user/config/main.cf +++ b/deploy/postfix-user/config/main.cf @@ -33,7 +33,7 @@ inet_interfaces = all inet_protocols = all javapipe_destination_recipient_limit = 1 -virtual_mailbox_domains = hash:/etc/postfix/config/virtual_domains +virtual_mailbox_domains = /etc/postfix/config/virtual_domains virtual_mailbox_maps = mysql:/etc/postfix/config/virtual_mailbox_maps.cf virtual_transport = javapipe diff --git a/ext/apache-tomcat b/ext/apache-tomcat deleted file mode 120000 index 58b360d..0000000 --- a/ext/apache-tomcat +++ /dev/null @@ -1 +0,0 @@ -apache-tomcat-7.0.37 \ No newline at end of file diff --git a/ext/apache-tomcat.tar.gz b/ext/apache-tomcat.tar.gz deleted file mode 120000 index e9d450e..0000000 --- a/ext/apache-tomcat.tar.gz +++ /dev/null @@ -1 +0,0 @@ -apache-tomcat-7.0.37.tar.gz \ No newline at end of file diff --git a/ext/setup b/ext/setup new file mode 100755 index 0000000..fb67d5d --- /dev/null +++ b/ext/setup @@ -0,0 +1,8 @@ +wget http://mirror.sdunix.com/apache/tomcat/tomcat-7/v7.0.42/bin/apache-tomcat-7.0.42.tar.gz +tar -xzf apache-tomcat-7.0.42.tar.gz +rm apache-tomcat +ln -fs apache-tomcat-7.0.42 apache-tomcat + +wget --no-check-certificate https://google-web-toolkit.googlecode.com/files/gwt-2.5.1.zip +unzip gwt-2.5.1.zip -x */samples/* */doc/* +ln -fs gwt-2.5.1 gwt diff --git a/gwt/build.xml b/gwt/build.xml index e1cb7d0..35a469f 100644 --- a/gwt/build.xml +++ b/gwt/build.xml @@ -4,18 +4,20 @@ To include a user specific buildfile here, simply create one in the same directory with the processing instruction as the first entry and export the buildfile again. --> - + + + - - - - + + + + @@ -67,4 +69,22 @@ + + + + + + + + + + + + + + + + + + diff --git a/java/core/src/core/constants/ConstantsServer.java b/java/core/src/core/constants/ConstantsServer.java index 96eb0b7..4475065 100644 --- a/java/core/src/core/constants/ConstantsServer.java +++ b/java/core/src/core/constants/ConstantsServer.java @@ -40,7 +40,7 @@ public class ConstantsServer public static final String SMTP_HOST = LOCAL_MAIL_SERVER; public static final int SMTP_PORT = 25; - public static final String LOCAL_SMTP_PORT = "10025"; + public static final String LOCAL_SMTP_PORT = "25"; public static final String KEY_AUTH_HOST = KEY_SERVER; public static final int KEY_AUTH_PORT = 7000; diff --git a/java/core/src/mail/client/Mailer.java b/java/core/src/mail/client/Mailer.java index ee78e36..eef160e 100644 --- a/java/core/src/mail/client/Mailer.java +++ b/java/core/src/mail/client/Mailer.java @@ -76,7 +76,6 @@ public class Mailer extends Servent sendMap.put("cc", Strings.concat(mail.getHeader().getRecipients().getCc(), ",")); sendMap.put("bcc", Strings.concat(mail.getHeader().getRecipients().getBcc(), ",")); sendMap.put("replyTo", Strings.concat(mail.getHeader().getRecipients().getReplyTo(), ",")); - sendMap.put("publicKey", Base64.encode(((CryptorRSA)getMaster().getCryptor()).getPublicKey())); /* if (mail.isPresendEncryptable()) diff --git a/java/core/src/mail/server/postfix/PostfixMailReceiver.java b/java/core/src/mail/server/postfix/PostfixMailReceiver.java index a8c15ed..5c2772a 100644 --- a/java/core/src/mail/server/postfix/PostfixMailReceiver.java +++ b/java/core/src/mail/server/postfix/PostfixMailReceiver.java @@ -1,26 +1,47 @@ package mail.server.postfix; import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.PrintStream; import mail.server.handler.UserInformation; import mail.server.handler.UserInformationFactory; +import core.util.LogOut; import core.util.Streams; public class PostfixMailReceiver { + static LogOut log = new LogOut(PostfixMailReceiver.class); + /** * @param args * @throws Exception */ public static void main(String[] args) throws Exception { - Class.forName("com.mysql.jdbc.Driver"); - String toAddress = args[1]; - byte[] bytes = Streams.readFullyBytes(System.in); - - UserInformation userInfo = UserInformationFactory.getInstance().getUserInformation(toAddress); - userInfo.handleIn(new ByteArrayInputStream(bytes)); + File me = new File(args[0]); + File logFile = new File(me.getParent(), "run.log"); + + System.setOut(new PrintStream(new FileOutputStream(logFile))); + System.setErr(System.out); + + try + { + log.debug("Running with log file as ",logFile); + + Class.forName("com.mysql.jdbc.Driver"); + String toAddress = args[1]; + byte[] bytes = Streams.readFullyBytes(System.in); + + UserInformation userInfo = UserInformationFactory.getInstance().getUserInformation(toAddress); + userInfo.handleIn(new ByteArrayInputStream(bytes)); + } + finally + { + System.out.flush(); + } } } diff --git a/java/webserver/build.xml b/java/webserver/build.xml index af12d7d..dd9753c 100644 --- a/java/webserver/build.xml +++ b/java/webserver/build.xml @@ -4,7 +4,7 @@ To include a user specific buildfile here, simply create one in the same directory with the processing instruction as the first entry and export the buildfile again. --> - + @@ -128,4 +128,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +