- Faxtomail-commits - mailman.cloud.codelutin.com

r224 - in trunk: faxtomail-service faxtomail-ui-swing faxtomail-ui-swing/src/main faxtomail-ui-swing/src/main/resources
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 18:56:41 +0200 (Wed, 18 Jun 2014) New Revision: 224 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/224 Log: Fix strange pom Added: trunk/faxtomail-ui-swing/src/main/resources/faxtomail.config Removed: trunk/faxtomail-ui-swing/src/main/filtered-resources/ Modified: trunk/faxtomail-service/pom.xml trunk/faxtomail-ui-swing/pom.xml trunk/faxtomail-ui-swing/src/main/resources/log4j.properties Modified: trunk/faxtomail-service/pom.xml =================================================================== --- trunk/faxtomail-service/pom.xml 2014-06-18 16:46:34 UTC (rev 223) +++ trunk/faxtomail-service/pom.xml 2014-06-18 16:56:41 UTC (rev 224) @@ -22,12 +22,13 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> <version>0.3-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <groupId>com.franciaflex.faxtomail</groupId> <artifactId>faxtomail-service</artifactId> @@ -163,21 +164,7 @@ </dependencies> <build> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  + <plugins> <plugin> Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-06-18 16:46:34 UTC (rev 223) +++ trunk/faxtomail-ui-swing/pom.xml 2014-06-18 16:56:41 UTC (rev 224) @@ -33,7 +33,6 @@ <groupId>com.franciaflex.faxtomail</groupId> <artifactId>faxtomail-ui-swing</artifactId> - <version>0.3-SNAPSHOT</version> <name>FaxToMail :: UI</name> <properties> @@ -297,18 +296,20 @@ <build> <resources> <resource> - <directory>src/main/filtered-resources</directory> - <filtering>true</filtering> + <directory>src/main/resources</directory> <includes> <include>*.config</include> <include>*.properties</include> </includes> + <filtering>true</filtering> </resource> <resource> <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> + <excludes> + <exclude>*.config</exclude> + <exclude>*.properties</exclude> + </excludes> + <filtering>false</filtering> </resource> </resources> <plugins> Copied: trunk/faxtomail-ui-swing/src/main/resources/faxtomail.config (from rev 212, trunk/faxtomail-ui-swing/src/main/filtered-resources/faxtomail.config) =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/faxtomail.config (rev 0) +++ trunk/faxtomail-ui-swing/src/main/resources/faxtomail.config 2014-06-18 16:56:41 UTC (rev 224) @@ -0,0 +1,4 @@ +faxtomail.version=${project.version} +faxtomail.site.url=${project.url} +faxtomail.inceptionYear=${project.inceptionYear} +faxtomail.organizationName=${license.organizationName} \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/resources/log4j.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/log4j.properties 2014-06-18 16:46:34 UTC (rev 223) +++ trunk/faxtomail-ui-swing/src/main/resources/log4j.properties 2014-06-18 16:56:41 UTC (rev 224) @@ -19,18 +19,23 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -log4j.rootCategory=WARN, console +# Global logging configuration +log4j.rootLogger=ERROR, stdout, file -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %M %m%n +# Console output +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +#log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %5p [%20t] (%c:%L) - %m%n +log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %5p (%c:%L) - %m%n -# global level -log4j.logger.com.franciaflex.faxtomail.ui.swing=DEBUG +# faxtomail levels +log4j.logger.com.franciaflex.faxtomail=INFO -### persistence level -# log4j.logger.org.nuiton.topia=TRACE -# log4j.logger.com.franciaflex.faxtomail.persistence=TRACE +#log4j.appender.file=org.apache.log4j.RollingFileAppender +#log4j.appender.file.file=${faxtomail.log.file} +#log4j.appender.file.MaxFileSize=10MB +#log4j.appender.file.MaxBackupIndex=4 -### services level -# log4j.logger.com.franciaflex.faxtomail.services=TRACE +#log4j.appender.file.layout=org.apache.log4j.PatternLayout +#log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %5p [%20t] %c - %m%n +#log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %5p %c - %m%n

1 0

r223 - in trunk: . faxtomail-persistence/src/main/java/com/franciaflex/faxtomail faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 18:46:34 +0200 (Wed, 18 Jun 2014) New Revision: 223 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/223 Log: Fix attachment saving (editing still not working) Change file open to use xdg-open. Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java trunk/pom.xml Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-06-18 15:23:42 UTC (rev 222) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-06-18 16:46:34 UTC (rev 223) @@ -276,10 +276,6 @@ return applicationConfig.getOption(FaxToMailConfigurationOption.INSTANCE_DISCLAIMER.getKey()); } - public File getStorageFile() { - return applicationConfig.getOptionAsFile(FaxToMailConfigurationOption.STORAGE_FILE.getKey()); - } - public boolean isLogConfigurationProvided() { boolean logConfigurationProvided = StringUtils.isNotBlank(applicationConfig.getOption(FaxToMailConfigurationOption.LOG_CONFIGURATION_FILE.getKey())); Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-06-18 15:23:42 UTC (rev 222) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-06-18 16:46:34 UTC (rev 223) @@ -77,11 +77,6 @@ "Mode développement, court-circuite l'envoi de mail", "false", Boolean.class), - STORAGE_FILE( - "faxtomail.storage", - "L'emplacement de stockage des fichiers, répertoire accessible en écriture sur le FS", - "/tmp/faxtomail/storage", File.class), - LOG_CONFIGURATION_FILE( "logConfigurationFile", "Chemin vers le fichier de configuration des journaux", Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java 2014-06-18 15:23:42 UTC (rev 222) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java 2014-06-18 16:46:34 UTC (rev 223) @@ -65,7 +65,7 @@ // if the file already exists, then add a number to the name int i = 1; String extension = "." + FileUtil.extension(fileName); - String name = FileUtil.basename(fileName); + String name = FileUtil.basename(fileName, extension); while (tmpLocalFile.exists()) { tmpLocalFile = new File(tempFolder, name + "-" + i++ + extension); } Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-18 15:23:42 UTC (rev 222) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-18 16:46:34 UTC (rev 223) @@ -144,6 +144,15 @@ AttachmentFileTopiaDao attachementFileTopiaDao = getPersistenceContext().getAttachmentFileDao(); for (Attachment attachment : attachments) { + + // get attchment BEFORE for flush + AttachmentFile originalFile = null; + AttachmentFile editedFile = null; + if (attachment.isPersisted()) { + originalFile = getAttachmentFile(attachment.getTopiaId(), true); + editedFile = getAttachmentFile(attachment.getTopiaId(), false); + } + // get session attachment from id Attachment currentAttachment; if (StringUtils.isNoneBlank(attachment.getTopiaId())) { @@ -152,35 +161,44 @@ currentAttachment = new AttachmentImpl(); } + if (!attachment.isPersisted()) { + originalFile = attachment.getOriginalFile(); + editedFile = attachment.getEditedFile(); + } + // copy new data - attachmentBinder.copy(attachment, currentAttachment); + currentAttachment.setAddedByUser(attachment.isAddedByUser()); + currentAttachment.setEditedFile(editedFile); + currentAttachment.setOriginalFile(originalFile); - // persist - AttachmentFile editedFile = currentAttachment.getEditedFile(); + // ici les pieces jointes peuvent être sauvegardées sans que les pièces jointes + // soit présentes dans les entités car l'ui ne les a pas copiées + // pour ne pas les charger inutilement + // donc on les remet manuellement + + //if (originalFile != null) { + if (!originalFile.isPersisted()) { + attachementFileTopiaDao.create(originalFile); + } else { + attachementFileTopiaDao.update(originalFile); + } + /*} else if (attachment.isPersisted()) { + AttachmentFile attachmentFile = getAttachmentFile(attachment.getTopiaId(), true); + currentAttachment.setOriginalFile(attachmentFile); + }*/ + if (editedFile != null) { if (!editedFile.isPersisted()) { attachementFileTopiaDao.create(editedFile); } else { attachementFileTopiaDao.update(editedFile); } - } else if (attachment.isPersisted()) { + } /*else if (attachment.isPersisted()) { AttachmentFile attachmentFile = getAttachmentFile(attachment.getTopiaId(), false); currentAttachment.setEditedFile(attachmentFile); - } + }*/ - AttachmentFile originalFile = currentAttachment.getOriginalFile(); - if (originalFile != null) { - if (!originalFile.isPersisted()) { - attachementFileTopiaDao.create(originalFile); - } else { - attachementFileTopiaDao.update(originalFile); - } - } else if (attachment.isPersisted()) { - AttachmentFile attachmentFile = getAttachmentFile(attachment.getTopiaId(), true); - currentAttachment.setOriginalFile(attachmentFile); - } - - if (!attachment.isPersisted()) { + if (!currentAttachment.isPersisted()) { // persist using cascade email.addAttachment(currentAttachment); } Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-06-18 15:23:42 UTC (rev 222) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-06-18 16:46:34 UTC (rev 223) @@ -43,9 +43,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import org.nuiton.jaxx.application.ApplicationTechnicalException; -import com.franciaflex.faxtomail.FaxToMailConfiguration; import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.DemandType; @@ -84,8 +82,6 @@ log.info("faxtomail initialization started"); } - checkStorage(); - boolean devMode = serviceContext.getApplicationConfig().isDevMode(); if (devMode) { @@ -102,38 +98,6 @@ } - protected void checkStorage() { - - FaxToMailConfiguration applicationConfig = getApplicationConfig(); - - File storageFile = applicationConfig.getStorageFile(); - - if (storageFile.exists()) { - if (log.isInfoEnabled()) { - log.info("storage directory exists " + storageFile.getAbsolutePath()); - } - } else { - if (log.isInfoEnabled()) { - log.info("storage directory does not exist, creating " + storageFile.getAbsolutePath()); - } - - boolean created = storageFile.mkdirs(); - - if ( ! created) { - throw new ApplicationTechnicalException("unable to create directory " + storageFile.getAbsolutePath()); - } - } - - if ( ! storageFile.isDirectory()) { - throw new ApplicationTechnicalException("file exists but is not a directory " + storageFile.getAbsolutePath()); - } - - if ( ! storageFile.canWrite()) { - throw new ApplicationTechnicalException("directory exists but is not writable " + storageFile.getAbsolutePath()); - } - - } - protected void initSampleData() { log.debug("init Sample Data"); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java 2014-06-18 15:23:42 UTC (rev 222) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java 2014-06-18 16:46:34 UTC (rev 223) @@ -5,14 +5,12 @@ import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUI; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUIHandler; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUIModel; -import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentItem; -import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.DesktopUtil; -import java.awt.*; import java.io.File; -import java.io.IOException; import static org.nuiton.i18n.I18n.t; @@ -50,14 +48,8 @@ attachment.setEditedFile(attachmentFile); } } -// AttachmentFile attachmentFile = original ? attachment.getOriginalFile() : attachment.getEditedFile(); - Desktop desktop = FaxToMailUIUtil.getDesktopForOpen(); - try { - File file = attachmentFile.getFile(); - desktop.open(file); - } catch (IOException e) { - getContext().getErrorHelper().showErrorDialog(t("swing.error.cannot.open.file")); - } + File file = attachmentFile.getFile(); + DesktopUtil.browse(file.toURI()); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-06-18 15:23:42 UTC (rev 222) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-06-18 16:46:34 UTC (rev 223) @@ -27,12 +27,12 @@ import static org.nuiton.i18n.I18n.t; import com.franciaflex.faxtomail.persistence.entities.AttachmentFileImpl; + import org.apache.commons.io.FileUtils; -import org.nuiton.util.FileUtil; +import org.nuiton.util.DesktopUtil; import org.nuiton.validator.bean.simple.SimpleBeanValidator; import java.awt.Component; -import java.awt.Desktop; import java.awt.event.ActionListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -55,7 +55,6 @@ import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -65,7 +64,6 @@ import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import com.franciaflex.faxtomail.ui.swing.util.Cancelable; -import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.google.common.collect.Lists; /** @@ -282,14 +280,8 @@ public void openAttachment(AttachmentFile attachment) { File file = attachment.getFile(); + DesktopUtil.open(file); - Desktop desktop = FaxToMailUIUtil.getDesktopForOpen(); - try { - desktop.open(file); - - } catch (IOException e) { - getContext().getErrorHelper().showErrorDialog(t("swing.error.cannot.open.file")); - } } protected class FileComboBoxEditor implements ComboBoxEditor { Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-18 15:23:42 UTC (rev 222) +++ trunk/pom.xml 2014-06-18 16:46:34 UTC (rev 223) @@ -100,7 +100,7 @@ <nuitonCsvVersion>3.0-rc-2</nuitonCsvVersion> <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> <nuitonUpdaterVersion>3.0-alpha-2</nuitonUpdaterVersion> - <nuitonUtilsVersion>3.0-rc-3</nuitonUtilsVersion> + <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> <nuitonWebVersion>1.16</nuitonWebVersion>

1 0

r222 - in trunk: faxtomail-persistence/src/main/xmi faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 17:23:42 +0200 (Wed, 18 Jun 2014) New Revision: 222 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/222 Log: Add notNull constraints Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-06-18 15:23:25 UTC (rev 221) +++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-06-18 15:23:42 UTC (rev 222) @@ -54,11 +54,12 @@ # Attachment -#com.franciaflex.faxtomail.persistence.entities.Attachment.attribute.originalFile.tagvalue.notNull=true +com.franciaflex.faxtomail.persistence.entities.Attachment.attribute.originalFile.tagvalue.notNull=true +com.franciaflex.faxtomail.persistence.entities.Attachment.attribute.originalFileName.tagvalue.notNull=true # AttachmentFile com.franciaflex.faxtomail.persistence.entities.AttachmentFile.attribute.filename.tagvalue.notNull=true -#com.franciaflex.faxtomail.persistence.entities.AttachmentFile.attribute.content.tagvalue.notNull=true +com.franciaflex.faxtomail.persistence.entities.AttachmentFile.attribute.content.tagvalue.notNull=true # MailFolder com.franciaflex.faxtomail.persistence.entities.MailFolder.class.tagvalue.naturalIdMutable=true @@ -73,6 +74,7 @@ # Email com.franciaflex.faxtomail.persistence.entities.Email.attribute.mailFolder.tagvalue.notNull=true +com.franciaflex.faxtomail.persistence.entities.Email.attribute.originalEmail.tagvalue.notNull=true com.franciaflex.faxtomail.persistence.entities.Email.attribute.rangeRow.tagvalue.lazy=false com.franciaflex.faxtomail.persistence.entities.Email.attribute.attachment.tagvalue.lazy=false com.franciaflex.faxtomail.persistence.entities.Email.attribute.history.tagvalue.lazy=false Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-06-18 15:23:25 UTC (rev 221) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-06-18 15:23:42 UTC (rev 222) @@ -404,7 +404,8 @@ Email.PROPERTY_RECEPTION_DATE, now, Email.PROPERTY_MAIL_FOLDER, folder, Email.PROPERTY_DEMAND_STATUS, opened ? DemandStatus.IN_PROGRESS : DemandStatus.UNTREATED, - Email.PROPERTY_HISTORY, Lists.newArrayList(history)); + Email.PROPERTY_HISTORY, Lists.newArrayList(history), + Email.PROPERTY_ORIGINAL_EMAIL, "Demo data"); if (opened) { @@ -451,7 +452,8 @@ Email.PROPERTY_RECEPTION_DATE, yesterday, Email.PROPERTY_MAIL_FOLDER, folder, Email.PROPERTY_DEMAND_STATUS, opened ? DemandStatus.IN_PROGRESS : DemandStatus.UNTREATED, - Email.PROPERTY_HISTORY, Lists.newArrayList(history)); + Email.PROPERTY_HISTORY, Lists.newArrayList(history), + Email.PROPERTY_ORIGINAL_EMAIL, "Demo data"); if (opened) {

1 0

r221 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 17:23:25 +0200 (Wed, 18 Jun 2014) New Revision: 221 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/221 Log: Fix email saved twice Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-18 14:01:08 UTC (rev 220) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-18 15:23:25 UTC (rev 221) @@ -188,6 +188,7 @@ log.debug(count + " messages, " + unread + " unread"); EmailService emailService = serviceContext.newService(EmailService.class); + MailFolderService mailFolderService = serviceContext.newService(MailFolderService.class); for (int i = 0 ; i < count ; i++) { Email email = new EmailImpl(); @@ -215,7 +216,7 @@ for (Address address : recipients) { String recipient = address.toString(); - MailFolder mailFolder = serviceContext.newService(MailFolderService.class).getFolderForRecipient(recipient); + MailFolder mailFolder = mailFolderService.getFolderForRecipient(recipient); if (mailFolder != null) { log.debug("\tTo : " + address + " -> " + (mailFolder != null ? mailFolder.getName() : "none")); @@ -230,7 +231,6 @@ if (email.getMailFolder() == null) { continue; } - emailService.saveEmail(email, null); Address[] addresses = message.getFrom(); if (addresses != null && addresses.length > 0) { @@ -365,15 +365,7 @@ } } - File dir = new File(FileUtils.getTempDirectory(), email.getTopiaId()); - if (!dir.exists()) { - dir.mkdir(); - } - File file = new File(dir, fileName); - FileOutputStream fos = new FileOutputStream(file); - DataHandler dh = bp.getDataHandler(); - dh.writeTo(fos); Attachment attachment = new AttachmentImpl(); attachment.setAddedByUser(false);

1 0

r220 - trunk/faxtomail-persistence/src/main/xmi
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 16:01:08 +0200 (Wed, 18 Jun 2014) New Revision: 220 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/220 Log: Fix attachement mapping Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-06-18 13:04:09 UTC (rev 219) +++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-06-18 14:01:08 UTC (rev 220) @@ -24,6 +24,7 @@ model.tagValue.notGenerateToString=true model.tagValue.constantPrefix=PROPERTY_ model.tagValue.hibernateAttributeType.java.lang.String=text +model.tagValue.hibernateAttributeType.byte[]=binary model.tagValue.useEnumerationName=true model.tagValue.doNotGenerateBooleanGetMethods=true

1 0

r219 - trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 15:04:09 +0200 (Wed, 18 Jun 2014) New Revision: 219 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/219 Log: Remove ng-app Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp 2014-06-18 13:03:42 UTC (rev 218) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp 2014-06-18 13:04:09 UTC (rev 219) @@ -29,7 +29,7 @@ <title>Accueil</title> </head> <body> - <div id="main-container" class="container" ng-app="ConfigurationModule"> + <div id="main-container" class="container"> <h1 class="page-header">Administration FaxToMail</h1> <ul>

1 0

r218 - trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 15:03:42 +0200 (Wed, 18 Jun 2014) New Revision: 218 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/218 Log: Add missing link Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp 2014-06-18 13:01:19 UTC (rev 217) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp 2014-06-18 13:03:42 UTC (rev 218) @@ -40,6 +40,8 @@ <span class="fa fa-cog"></span> Configuration</a></li> <li><a href="<s:url action='import-input' namespace="/admin" />"> <span class="fa fa-upload"></span> Import</a></li> + <li><a href="<s:url action='lock-input' namespace="/admin" />"> + <span class="fa fa-unlock-alt"></span> Vérrouillages</a></li> </s:if> <li><a href="<s:url action='user-folder-input' namespace="/admin" />"> <span class="fa fa-folder-open"></span> Dossiers utilisateur</a></li>

1 0

r217 - trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 15:01:19 +0200 (Wed, 18 Jun 2014) New Revision: 217 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/217 Log: Fote Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-18 13:00:49 UTC (rev 216) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-18 13:01:19 UTC (rev 217) @@ -91,7 +91,7 @@ </div> <div class="form-group"> - Actions autorisées lorsque la demande n'a pas d'état d'attente est <strong>invalide</strong> : + Actions autorisées lorsque la demande n'a pas d'état d'attente et est <strong>invalide</strong> : <label class="checkbox" ng-repeat="(mailAction,label) in mailActions"> <input type="checkbox" ng-checked="configuration.invalidFormDisabledActions.indexOf(mailAction) == -1" ng-click="changeInvalidAction(mailAction)"> {{label}}

1 0

r216 - in trunk/faxtomail-ui-web/src/main: java/com/franciaflex/faxtomail/web java/com/franciaflex/faxtomail/web/job resources
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 15:00:49 +0200 (Wed, 18 Jun 2014) New Revision: 216 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/216 Log: Set quartz thread count to 1 to prevent shares objects Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java trunk/faxtomail-ui-web/src/main/resources/quartz.properties Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-06-18 12:57:41 UTC (rev 215) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-06-18 13:00:49 UTC (rev 216) @@ -44,7 +44,6 @@ import com.franciaflex.faxtomail.FaxToMailApplicationContext; import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; -import com.franciaflex.faxtomail.services.service.InitFaxToMailService; public class FaxToMailApplicationListener implements ServletContextListener { @@ -76,8 +75,6 @@ FaxToMailTopiaPersistenceContext persistenceContext = applicationContext.newPersistenceContext(); FaxToMailServiceContext serviceContext = applicationContext.newServiceContext(persistenceContext); - serviceContext.newService(InitFaxToMailService.class).init(); - data.put(MailFilterJob.SERVICE_CONTEXT, serviceContext); JobDetail mailFilteringJob = JobBuilder.newJob(MailFilterJob.class) @@ -91,7 +88,9 @@ .build(); try { - + + Scheduler scheduler = new StdSchedulerFactory().getScheduler(); + // schedule mail job (toutes les 5 minutes) Trigger trigger = TriggerBuilder .newTrigger() @@ -99,8 +98,6 @@ .withSchedule(CronScheduleBuilder.cronSchedule("0 */5 * * * ?")) .build(); - Scheduler scheduler = new StdSchedulerFactory().getScheduler(); - scheduler.start(); scheduler.scheduleJob(mailFilteringJob, trigger); // schedule EDI job (toutes les 5 minutes) @@ -109,11 +106,10 @@ .withIdentity("ediManagement", "ediManagementTrigger") .withSchedule(CronScheduleBuilder.cronSchedule("0 */5 * * * ?")) .build(); - - scheduler = new StdSchedulerFactory().getScheduler(); - scheduler.start(); + scheduler.scheduleJob(ediManagementJob, trigger); + scheduler.start(); log.debug("schedulers launched"); } catch (SchedulerException e) { Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java 2014-06-18 12:57:41 UTC (rev 215) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java 2014-06-18 13:00:49 UTC (rev 216) @@ -45,6 +45,10 @@ public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { serviceContext = getServiceContext(jobExecutionContext); + if (log.isDebugEnabled()) { + log.debug("Running EDIManagementJob at " + serviceContext.getNow()); + } + EmailService emailService = serviceContext.newService(EmailService.class); emailService.transmitPendingDemandsToEdi(); Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-18 12:57:41 UTC (rev 215) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-18 13:00:49 UTC (rev 216) @@ -50,7 +50,6 @@ import javax.mail.Part; import javax.mail.Session; import javax.mail.Store; -import javax.mail.URLName; import javax.mail.internet.ContentType; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; @@ -75,7 +74,6 @@ import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.EmailAccount; import com.franciaflex.faxtomail.persistence.entities.EmailImpl; -import com.franciaflex.faxtomail.persistence.entities.EmailProtocol; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.services.DecoratorService; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; @@ -93,18 +91,19 @@ protected FaxToMailServiceContext serviceContext; - //TODO kmorin 20140414 handle imap protocol @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { serviceContext = getServiceContext(jobExecutionContext); + + if (log.isDebugEnabled()) { + log.debug("Running MailFilterJob at " + serviceContext.getNow()); + } ConfigurationService configurationService = serviceContext.newService(ConfigurationService.class); Collection<EmailAccount> emailAccounts = configurationService.getEmailAccounts(); for (EmailAccount account : emailAccounts) { - //if (account.getProtocol() == EmailProtocol.POP3) { - checkEmails(account); - //} + checkEmails(account); } } Modified: trunk/faxtomail-ui-web/src/main/resources/quartz.properties =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/quartz.properties 2014-06-18 12:57:41 UTC (rev 215) +++ trunk/faxtomail-ui-web/src/main/resources/quartz.properties 2014-06-18 13:00:49 UTC (rev 216) @@ -22,5 +22,9 @@ # #L% ### org.quartz.scheduler.instanceName = FaxToMailScheduler -org.quartz.threadPool.threadCount = 3 + +# Set job count to 1 to avoid two job to run at the same time and avoid +# org.hibernate.HibernateException: Found shared references to a collection: com.franciaflex.faxtomail.persistence.entities.MailFolderImpl.replyAddresses +org.quartz.threadPool.threadCount = 1 + org.quartz.jobStore.class = org.quartz.simpl.RAMJobStore \ No newline at end of file

1 0

r215 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 14:57:41 +0200 (Wed, 18 Jun 2014) New Revision: 215 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/215 Log: Remove useless buffer Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java 2014-06-18 11:50:20 UTC (rev 214) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java 2014-06-18 12:57:41 UTC (rev 215) @@ -81,7 +81,7 @@ // be sure that "is" is not closed because is can be a local fileinputstream // that hibernate must read to put in database InputStream is = new ByteArrayInputStream(content); - OutputStream fos = new BufferedOutputStream(new FileOutputStream(tmpLocalFile)); + OutputStream fos = new FileOutputStream(tmpLocalFile); IOUtils.copy(is, fos); fos.close(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-06-18 11:50:20 UTC (rev 214) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-06-18 12:57:41 UTC (rev 215) @@ -173,7 +173,7 @@ if (file != null) { try { // warning, this not NOT be closed (will be by blob on commit) - InputStream is = new BufferedInputStream(new FileInputStream(file)); + InputStream is = new FileInputStream(file); AttachmentFile attachmentFile = getContext().getEmailService().getAttachmentFileFromStream(is); attachmentFile.setFilename(file.getName()); attachment.setOriginalFile(attachmentFile);

1 0