Author: echatellier Date: 2014-05-12 17:22:09 +0200 (Mon, 12 May 2014) New Revision: 66 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/66 Log: Rename "user" field to "login" (mssql reserved keyword) Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailAccountImportModel.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/MailFilterJob.java Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailAccountImportModel.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailAccountImportModel.java 2014-05-12 15:21:31 UTC (rev 65) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailAccountImportModel.java 2014-05-12 15:22:09 UTC (rev 66) @@ -42,7 +42,7 @@ newMandatoryColumn("protocol", EmailAccount.PROPERTY_PROTOCOL); newMandatoryColumn("host", EmailAccount.PROPERTY_HOST); - newMandatoryColumn("user", EmailAccount.PROPERTY_USER); + newMandatoryColumn("user", EmailAccount.PROPERTY_LOGIN); newMandatoryColumn("password", EmailAccount.PROPERTY_PASSWORD); } Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/MailFilterJob.java 2014-05-12 15:21:31 UTC (rev 65) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/MailFilterJob.java 2014-05-12 15:22:09 UTC (rev 66) @@ -116,7 +116,7 @@ Properties properties = new Properties(); properties.setProperty("mail.store.protocol", "pop3"); properties.setProperty("mail.pop3.host", account.getHost()); - properties.setProperty("mail.pop3.user", account.getUser()); + properties.setProperty("mail.pop3.user", account.getLogin()); Session session = Session.getInstance(properties); Store store = null; @@ -125,7 +125,7 @@ try { store = session.getStore(new URLName("pop3://" + account.getHost())); - store.connect(account.getUser(), account.getPassword()); + store.connect(account.getLogin(), account.getPassword()); defaultFolder = store.getDefaultFolder(); inbox = defaultFolder.getFolder("INBOX"); checkEmailsOfFolder(inbox);