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

r384 - in trunk: . faxtomail-persistence faxtomail-service faxtomail-ui-swing faxtomail-ui-web
by maven-release＠users.forge.codelutin.com 11 Jul '14

11 Jul '14

Author: maven-release Date: 2014-07-11 16:58:55 +0200 (Fri, 11 Jul 2014) New Revision: 384 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/384 Log: [maven-release-plugin] prepare release faxtomail-1.0-rc-1 Modified: trunk/faxtomail-persistence/pom.xml trunk/faxtomail-service/pom.xml trunk/faxtomail-ui-swing/pom.xml trunk/faxtomail-ui-web/pom.xml trunk/pom.xml Modified: trunk/faxtomail-persistence/pom.xml =================================================================== --- trunk/faxtomail-persistence/pom.xml 2014-07-11 14:51:41 UTC (rev 383) +++ trunk/faxtomail-persistence/pom.xml 2014-07-11 14:58:55 UTC (rev 384) @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.0-rc-1-SNAPSHOT</version> + <version>1.0-rc-1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/faxtomail-service/pom.xml =================================================================== --- trunk/faxtomail-service/pom.xml 2014-07-11 14:51:41 UTC (rev 383) +++ trunk/faxtomail-service/pom.xml 2014-07-11 14:58:55 UTC (rev 384) @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.0-rc-1-SNAPSHOT</version> + <version>1.0-rc-1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-07-11 14:51:41 UTC (rev 383) +++ trunk/faxtomail-ui-swing/pom.xml 2014-07-11 14:58:55 UTC (rev 384) @@ -28,7 +28,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.0-rc-1-SNAPSHOT</version> + <version>1.0-rc-1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-07-11 14:51:41 UTC (rev 383) +++ trunk/faxtomail-ui-web/pom.xml 2014-07-11 14:58:55 UTC (rev 384) @@ -27,7 +27,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.0-rc-1-SNAPSHOT</version> + <version>1.0-rc-1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-11 14:51:41 UTC (rev 383) +++ trunk/pom.xml 2014-07-11 14:58:55 UTC (rev 384) @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.0-rc-1-SNAPSHOT</version> + <version>1.0-rc-1</version> <packaging>pom</packaging> <name>FaxToMail</name> @@ -71,9 +71,9 @@ </modules> <scm> - <url>https://svn.codelutin.com/faxtomail/trunk</url> - <connection>scm:svn:https://svn.codelutin.com/faxtomail/trunk</connection> - <developerConnection>scm:svn:http://svn.codelutin.com/faxtomail/trunk</developerConnection> + <url>https://svn.codelutin.com/faxtomail/tags/faxtomail-1.0-rc-1</url> + <connection>scm:svn:https://svn.codelutin.com/faxtomail/tags/faxtomail-1.0-rc-1</connection> + <developerConnection>scm:svn:http://svn.codelutin.com/faxtomail/tags/faxtomail-1.0-rc-1</developerConnection> </scm> <distributionManagement> <site>

1 0

r383 - in trunk: . faxtomail-persistence faxtomail-service faxtomail-ui-swing faxtomail-ui-web
by echatellier＠users.forge.codelutin.com 11 Jul '14

11 Jul '14

Author: echatellier Date: 2014-07-11 16:51:41 +0200 (Fri, 11 Jul 2014) New Revision: 383 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/383 Log: Prepare release Modified: trunk/faxtomail-persistence/pom.xml trunk/faxtomail-service/pom.xml trunk/faxtomail-ui-swing/pom.xml trunk/faxtomail-ui-web/pom.xml trunk/pom.xml Modified: trunk/faxtomail-persistence/pom.xml =================================================================== --- trunk/faxtomail-persistence/pom.xml 2014-07-11 14:39:56 UTC (rev 382) +++ trunk/faxtomail-persistence/pom.xml 2014-07-11 14:51:41 UTC (rev 383) @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>0.3-SNAPSHOT</version> + <version>1.0-rc-1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/faxtomail-service/pom.xml =================================================================== --- trunk/faxtomail-service/pom.xml 2014-07-11 14:39:56 UTC (rev 382) +++ trunk/faxtomail-service/pom.xml 2014-07-11 14:51:41 UTC (rev 383) @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>0.3-SNAPSHOT</version> + <version>1.0-rc-1-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-07-11 14:39:56 UTC (rev 382) +++ trunk/faxtomail-ui-swing/pom.xml 2014-07-11 14:51:41 UTC (rev 383) @@ -28,7 +28,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>0.3-SNAPSHOT</version> + <version>1.0-rc-1-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-07-11 14:39:56 UTC (rev 382) +++ trunk/faxtomail-ui-web/pom.xml 2014-07-11 14:51:41 UTC (rev 383) @@ -27,7 +27,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>0.3-SNAPSHOT</version> + <version>1.0-rc-1-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-11 14:39:56 UTC (rev 382) +++ trunk/pom.xml 2014-07-11 14:51:41 UTC (rev 383) @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>0.3-SNAPSHOT</version> + <version>1.0-rc-1-SNAPSHOT</version> <packaging>pom</packaging> <name>FaxToMail</name>

1 0

r382 - in trunk: faxtomail-ui-swing/src/main/resources faxtomail-ui-web/src/main/resources
by echatellier＠users.forge.codelutin.com 11 Jul '14

11 Jul '14

Author: echatellier Date: 2014-07-11 16:39:56 +0200 (Fri, 11 Jul 2014) New Revision: 382 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/382 Log: Fix log4j files Modified: trunk/faxtomail-ui-swing/src/main/resources/log4j.properties trunk/faxtomail-ui-web/src/main/resources/log4j.properties Modified: trunk/faxtomail-ui-swing/src/main/resources/log4j.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/log4j.properties 2014-07-10 14:46:57 UTC (rev 381) +++ trunk/faxtomail-ui-swing/src/main/resources/log4j.properties 2014-07-11 14:39:56 UTC (rev 382) @@ -25,7 +25,6 @@ # 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 # faxtomail levels Modified: trunk/faxtomail-ui-web/src/main/resources/log4j.properties =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/log4j.properties 2014-07-10 14:46:57 UTC (rev 381) +++ trunk/faxtomail-ui-web/src/main/resources/log4j.properties 2014-07-11 14:39:56 UTC (rev 382) @@ -28,7 +28,7 @@ log4j.appender.console.layout.ConversionPattern=%d{yyyy/MM/dd HH:mm:ss} %5p (%F:%L) %M %m%n # global level -log4j.logger.com.franciaflex.faxtomail=DEBUG +log4j.logger.com.franciaflex.faxtomail=INFO ### persistence level # log4j.logger.org.nuiton.topia=TRACE @@ -38,7 +38,7 @@ # log4j.logger.com.franciaflex.faxtomail.services=TRACE ### web level -log4j.logger.com.franciaflex.faxtomail.web.FaxToMailInterceptor=WARN +#log4j.logger.com.franciaflex.faxtomail.web.FaxToMailInterceptor=WARN # annoying errors #log4j.logger.com.opensymphony.xwork2.interceptor.ParametersInterceptor=FATAL

1 0

r381 - in trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing: actions content/demande
by echatellier＠users.forge.codelutin.com 10 Jul '14

10 Jul '14

Author: echatellier Date: 2014-07-10 16:46:57 +0200 (Thu, 10 Jul 2014) New Revision: 381 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/381 Log: Ajout de la valorisation des getValidRangeRowModels() pour la validation. Et plein de FIXME parce que l'interet est pas evident Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-07-10 14:04:18 UTC (rev 380) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-07-10 14:46:57 UTC (rev 381) @@ -26,10 +26,12 @@ import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import com.franciaflex.faxtomail.ui.swing.content.demande.RangeRowModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -37,6 +39,7 @@ import org.nuiton.util.pagination.PaginationResult; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import static org.nuiton.i18n.I18n.t; @@ -86,6 +89,22 @@ for (Email email : emails) { DemandeUIModel demand = new DemandeUIModel(); demand.fromEntity(email, false); + + // FIXME echatellier 20140710 : ajout du code suivant sinon getValidRangeRowModels() est toujours vide + // et les lignes sont toujours rouge car jamais valides + Collection<RangeRow> rangeRows = demand.getRangeRow(); + if (rangeRows != null) { + for (RangeRow rangeRow : rangeRows) { + RangeRowModel rangeRowModel = new RangeRowModel(); + rangeRowModel.fromEntity(rangeRow); + // FIXME echatellier 20140710 : wtf is that ? incomprehensible sans explication + // on ajout la row dans getValidRangeRowModels() sans condition ? donc elle contient forcement toutes les rangeRowModel + // et ne doit pas vraiment avoir d'utilité + demand.getValidRangeRowModels().add(rangeRowModel); + } + } + // / getValidRangeRowModels() + demand.setValid(handler.isDemandeValid(demand)); demands.add(demand); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-07-10 14:04:18 UTC (rev 380) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-07-10 14:46:57 UTC (rev 381) @@ -181,6 +181,9 @@ RangeRowModel rangeRowModel = new RangeRowModel(); rangeRowModel.fromEntity(rangeRow); rangeRowModels.add(rangeRowModel); + // FIXME echatellier 20140710 : wtf is that ? incomprehensible sans explication + // on ajout la row dans getValidRangeRowModels() sans condition ? donc elle contient forcement toutes les rangeRowModel + // et ne doit pas vraiment avoir d'utilité model.getValidRangeRowModels().add(rangeRowModel); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-07-10 14:04:18 UTC (rev 380) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-07-10 14:46:57 UTC (rev 381) @@ -681,10 +681,10 @@ if (getRangeRow() != null) { oldValue = new ArrayList<RangeRow>(getRangeRow()); } - String refOldValue = getReference(); + String refOldValue = getReference(); // FIXME : why ? editObject.removeRangeRow(rangeRow); firePropertyChange(Email.PROPERTY_RANGE_ROW, oldValue, getRangeRow()); - firePropertyChanged(PROPERTY_REFERENCE, refOldValue, getReference()); + firePropertyChanged(PROPERTY_REFERENCE, refOldValue, getReference()); // FIXME : why ? } public void setRangeRow(Collection<RangeRow> rangeRow) { @@ -695,10 +695,10 @@ if (rangeRow == null) { rangeRow = new ArrayList<RangeRow>(); } - String refOldValue = getReference(); + String refOldValue = getReference(); // FIXME : why ? editObject.setRangeRow(rangeRow); firePropertyChange(Email.PROPERTY_RANGE_ROW, oldValue, getRangeRow()); - firePropertyChanged(PROPERTY_REFERENCE, refOldValue, getReference()); + firePropertyChanged(PROPERTY_REFERENCE, refOldValue, getReference()); // FIXME : why ? } public MailFolder getMailFolder() {

1 0

r380 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by echatellier＠users.forge.codelutin.com 10 Jul '14

10 Jul '14

Author: echatellier Date: 2014-07-10 16:04:18 +0200 (Thu, 10 Jul 2014) New Revision: 380 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/380 Log: Just add another comment Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-07-10 13:41:44 UTC (rev 379) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-07-10 14:04:18 UTC (rev 380) @@ -866,6 +866,14 @@ firePropertyChanged(PROPERTY_VALID_RANGE_ROW_MODELS, oldValue, validRangeRowModels); } + /** + * Appelée par la validation. + * + * Voir le fichier src/main/resources/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel-error-validation.xml + * + * @param field field to validate + * @return validity + */ public boolean isValid(String field) { boolean result = getDemandType() == null; if (!result) {

1 0

r379 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-persistence/src/main/resources/i18n faxtomail-persistence/src/main/xmi faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util faxtomail-ui-web/src/main/
by echatellier＠users.forge.codelutin.com 10 Jul '14

10 Jul '14

Author: echatellier Date: 2014-07-10 15:41:44 +0200 (Thu, 10 Jul 2014) New Revision: 379 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/379 Log: Ajout d'un statut suppl?\195?\169mentaire pour enc cours de transfer EDI et transf?\195?\169r?\195?\169 ?\195?\160 l'EDI 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/DemandStatus.java trunk/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-07-10 12:41:05 UTC (rev 378) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-07-10 13:41:44 UTC (rev 379) @@ -353,12 +353,6 @@ return result; } - /** @return {@link FaxToMailConfigurationOption#EDI_DIRECTORY} value */ - public File getEdiDirectory() { - File result = applicationConfig.getOptionAsFile(FaxToMailConfigurationOption.EDI_DIRECTORY.getKey()); - return result; - } - public File getTmpDirectory() { File result = applicationConfig.getOptionAsFile(FaxToMailConfigurationOption.TMP_DIRECTORY.getKey()); return result; Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-07-10 12:41:05 UTC (rev 378) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-07-10 13:41:44 UTC (rev 379) @@ -200,12 +200,6 @@ n("faxtomail.config.option.csv.separator.description"), ";", char.class), - - EDI_DIRECTORY( - "faxtomail.edi.directory", - n("faxtomail.config.option.edi.directory.description"), - "${faxtomail.data.directory}/edi", - File.class), // UI Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/DemandStatus.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/DemandStatus.java 2014-07-10 12:41:05 UTC (rev 378) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/DemandStatus.java 2014-07-10 13:41:44 UTC (rev 379) @@ -34,6 +34,7 @@ UNTREATED(n("faxtomail.demandStatus.untreated")), IN_PROGRESS(n("faxtomail.demandStatus.inProgress")), + TRANSMISSION_TO_EDI(n("faxtomail.demandStatus.transmissionToEdi")), TRANSMITTED_TO_EDI(n("faxtomail.demandStatus.transmittedToEdi")), QUALIFIED(n("faxtomail.demandStatus.qualified")), ARCHIVED(n("faxtomail.demandStatus.archive")); Modified: trunk/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties =================================================================== --- trunk/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties 2014-07-10 12:41:05 UTC (rev 378) +++ trunk/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties 2014-07-10 13:41:44 UTC (rev 379) @@ -26,6 +26,7 @@ faxtomail.demandStatus.archive=Archive faxtomail.demandStatus.inProgress=En cours faxtomail.demandStatus.qualified=Qualifié +faxtomail.demandStatus.transmissionToEdi=En cours de transmission à l'EDI faxtomail.demandStatus.transmittedToEdi=Transmis à l'EDI faxtomail.demandStatus.untreated=Non traité faxtomail.historyType.archive=Archivage Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) 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-07-10 12:41:05 UTC (rev 378) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-07-10 13:41:44 UTC (rev 379) @@ -42,7 +42,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.regex.Pattern; import javax.activation.DataSource; import javax.activation.FileDataSource; @@ -64,7 +63,6 @@ import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm; import org.apache.pdfbox.pdmodel.interactive.form.PDField; import org.nuiton.topia.persistence.TopiaEntities; -import org.nuiton.util.FileUtil; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; import org.nuiton.util.pagination.PaginationParameter; @@ -202,16 +200,11 @@ // 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 (!originalFile.isPersisted()) { + attachementFileTopiaDao.create(originalFile); + } else { + attachementFileTopiaDao.update(originalFile); + } if (editedFile != null) { if (!editedFile.isPersisted()) { @@ -219,10 +212,7 @@ } else { attachementFileTopiaDao.update(editedFile); } - } /*else if (attachment.isPersisted()) { - AttachmentFile attachmentFile = getAttachmentFile(attachment.getTopiaId(), false); - currentAttachment.setEditedFile(attachmentFile); - }*/ + } if (!currentAttachment.isPersisted()) { // persist using cascade @@ -257,33 +247,57 @@ Set<String> fieldSet = Sets.newHashSet(modifiedFields); - MailFolder folder = email.getMailFolder(); - while (!folder.isUseCurrentLevelEdiFolder() && folder.getParent() != null) { - folder = folder.getParent(); - } + History transmissionToEdi = CollectionUtils.find(email.getHistory(), new Predicate<History>() { + @Override + public boolean evaluate(History object) { + return object.getType() == HistoryType.TRANSMISSION_TO_EDI; + } + }); - // FIXME echatellier : et si on définit le ediFolder après ? la demande ne peux pas passer en TRANSMITTED_TO_EDI ? - if (StringUtils.isNotBlank(folder.getEdiFolder())) { - History transmissionToEdi = CollectionUtils.find(email.getHistory(), new Predicate<History>() { - @Override - public boolean evaluate(History object) { - return object.getType() == HistoryType.TRANSMISSION_TO_EDI; + // we transmit to EDI if: + // - it has never been transmitted before + // - all the required fields are filled + if (transmissionToEdi == null + && email.getClient() != null + && email.getDemandType() != null + && StringUtils.isNotBlank(email.getProjectReference())) { + + if (email.getDemandType().containsFields(MailField.RANGE_ROW)) { + + // si les gammes sont vides, la demande n'est pas valide, on ne fait rien dans ce cas + // sinon on transfer à edi + if (email.isRangeRowNotEmpty()) { + + if (email.getDemandType().isEdiTransfer()) { + // ajout d'un historique + transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, + History.PROPERTY_MODIFICATION_DATE, new Date()); + email.addHistory(transmissionToEdi); + + // changement du status + email.setDemandStatus(DemandStatus.TRANSMISSION_TO_EDI); + fieldSet.add(Email.PROPERTY_DEMAND_STATUS); + } else { + // TODO echatellier : pas sur qu'il faille l'ajouter tout le temps, mais sinon, le transfer se reproduira + transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, + History.PROPERTY_MODIFICATION_DATE, new Date()); + email.addHistory(transmissionToEdi); + + // passage en status + email.setDemandStatus(DemandStatus.IN_PROGRESS); + fieldSet.add(Email.PROPERTY_DEMAND_STATUS); + } } - }); - // we transmit to EDI if: - // - it has never been transmitted before - // - all the required fields are filled - if (transmissionToEdi == null - && email.getClient() != null - && email.getDemandType() != null - && StringUtils.isNotBlank(email.getProjectReference()) - && (!email.getDemandType().containsFields(MailField.RANGE_ROW) || CollectionUtils.isNotEmpty(email.getRangeRow()))) { + } else { - email.setDemandStatus(DemandStatus.TRANSMITTED_TO_EDI); + // TODO echatellier : pas sur qu'il faille l'ajouter tout le temps, mais sinon, le transfer se reproduira transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, - History.PROPERTY_MODIFICATION_DATE, new Date()); + History.PROPERTY_MODIFICATION_DATE, new Date()); email.addHistory(transmissionToEdi); + + // passage en status + email.setDemandStatus(DemandStatus.IN_PROGRESS); fieldSet.add(Email.PROPERTY_DEMAND_STATUS); } } @@ -322,7 +336,7 @@ public void transmitPendingDemandsToEdi() { EmailTopiaDao dao = getPersistenceContext().getEmailDao(); - List<Email> toTransmitToEdi = dao.forDemandStatusEquals(DemandStatus.TRANSMITTED_TO_EDI).findAll(); + List<Email> toTransmitToEdi = dao.forDemandStatusEquals(DemandStatus.TRANSMISSION_TO_EDI).findAll(); if (log.isDebugEnabled()) { log.debug(toTransmitToEdi.size() + " demands to transmit to edi"); } @@ -337,40 +351,41 @@ * @param email email to send */ protected void transmitDemandToEdi(Email email) { - Preconditions.checkArgument(email.getDemandStatus() == DemandStatus.TRANSMITTED_TO_EDI); - - // FIXME echatellier : une demande transmise a EDI sasn rangeRow restera en TRANSMITTED_TO_EDI pour toujours - if (CollectionUtils.isEmpty(email.getRangeRow())) { + Preconditions.checkArgument(email.getDemandStatus() == DemandStatus.TRANSMISSION_TO_EDI); + Preconditions.checkArgument(!email.getRangeRow().isEmpty()); + + // recherche du dossier ou deposer les demandes EDI + MailFolder folder = email.getMailFolder(); + while (!folder.isUseCurrentLevelEdiFolder() && folder.getParent() != null) { + folder = folder.getParent(); + } + String ediFolder = folder.getEdiFolder(); + if (StringUtils.isBlank(ediFolder)) { + if (log.isFatalEnabled()) { + log.fatal("Aucun dossier de depot des demandes EDI défini pour le dossier " + folder.getName()); + } return; } + File ediFolderDirectory = new File(ediFolder); + if (!ediFolderDirectory.canWrite()) { + if (log.isFatalEnabled()) { + log.fatal("Le dossier " + ediFolderDirectory.getAbsolutePath() + " ne dispose pas des droits d'écriture !"); + } + return; + } //TODO kmorin 20140521 maybe check if the file is not being read // get output file with pattern name depending on date Date now = serviceContext.getNow(); - File ediDirectory = getApplicationConfig().getEdiDirectory(); - ediDirectory.mkdirs(); - String fileDate = DateFormatUtils.format(now, "yyMMddHHmmss"); // create a file for each commande for (RangeRow rangeRow : email.getRangeRow()) { - // il n'y a pas de condition si le fait que le fichier à déjà été généré - // si il existe déjà, on ne le génére pas à nouveau - // TODO comment avoir une vraie condition de non génération en double ? - String pattern = Pattern.quote("ORD_FAX_") + ".*" + Pattern.quote(rangeRow.getTopiaId() + ".txt"); - Collection<File> files = FileUtil.find(ediDirectory, pattern, false); - if (!files.isEmpty()) { - if (log.isDebugEnabled()) { - log.debug("Already existing file found for " + rangeRow.getTopiaId() + ". Skipping."); - } - continue; - } - String fileName = "ORD_FAX_" + fileDate + "_" + rangeRow.getTopiaId() + ".txt"; - File ediFile = new File(ediDirectory, fileName); + File ediFile = new File(ediFolderDirectory, fileName); // generate output content String separator = ";"; @@ -439,6 +454,11 @@ } } + + // changement du status + EmailTopiaDao dao = getPersistenceContext().getEmailDao(); + email.setDemandStatus(DemandStatus.TRANSMITTED_TO_EDI); + dao.update(email); } public PaginationResult<Email> getEmailForFolder(MailFolder folder, PaginationParameter page) { Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java 2014-07-10 12:41:05 UTC (rev 378) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java 2014-07-10 13:41:44 UTC (rev 379) @@ -52,10 +52,8 @@ @Test public void testFindFilter() { - log.info(service.getAllMailFolders()); MailFolder folder = service.getFolderForRecipient("fx.savtest(a)franciaflex.com"); Assert.assertNotNull(folder); - log.info(folder.getName()); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-07-10 12:41:05 UTC (rev 378) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-07-10 13:41:44 UTC (rev 379) @@ -265,6 +265,9 @@ DemandeUIModel selectedEmail = tableModel.getEntry(rowIndex); onDoubleClickOnDemande(selectedEmail); FaxToMailUIContext context = getContext(); + + // reset transaction + context.createNewTransaction(); Email email = context.getEmailService().addToHistory(selectedEmail.getTopiaId(), HistoryType.OPENING, context.getCurrentUser(), @@ -306,12 +309,6 @@ FaxToMailUIContext context = getContext(); - // reload transaction - context.createNewTransaction(); - // reload model with current transaction - Email email = context.getEmailService().getEmailById(selectedEmail.getTopiaId()); - selectedEmail.fromEntity(email); - context.setCurrentEmail(selectedEmail); context.getActionEngine().runAction(new ShowDemandeAction(context.getMainUI().getHandler())); } 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-07-10 12:41:05 UTC (rev 378) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-07-10 13:41:44 UTC (rev 379) @@ -214,6 +214,11 @@ <input type="checkbox" ng-checked="selectedDemandType.fields.indexOf(mailField) != -1" ng-click="changeDemandTypeField(mailField)"> {{label}} </label> + <span ng-show="mailField == 'RANGE_ROW'">(<label> + <input type="checkbox" ng-model="selectedDemandType.ediTransfer" + ng-disabled="selectedDemandType.fields.indexOf(mailField) == -1"/> Autoriser le transfer EDI + <i class="fa fa-info-circle" tooltip="Si cette case est cochée, les demandes valides seront transférées à l'EDI pour le traitement des numéros de commande des gammes, sinon les demandes passerons directement dans le statut 'en cours'"></i> + </label>)</span> </div> </div> <div class="col-md-8" ng-if="!selectedDemandType"> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-07-10 12:41:05 UTC (rev 378) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-07-10 13:41:44 UTC (rev 379) @@ -327,11 +327,17 @@ // selection/deselection d'un champ $scope.changeDemandTypeField = function(mailField) { - + var index = $scope.selectedDemandType.fields.indexOf(mailField); if (index != -1) { $scope.selectedDemandType.fields.splice(index, 1); } else { + + // cas particulier des gammes + if (mailField == 'RANGE_ROW') { + $scope.selectedDemandType.ediTransfer = true; + } + $scope.selectedDemandType.fields.push(mailField); } };

1 0

r378 - in trunk: . faxtomail-service faxtomail-ui-web faxtomail-ui-web/src/license
by echatellier＠users.forge.codelutin.com 10 Jul '14

10 Jul '14

Author: echatellier Date: 2014-07-10 14:41:05 +0200 (Thu, 10 Jul 2014) New Revision: 378 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/378 Log: Clean dependencies Modified: trunk/faxtomail-service/pom.xml trunk/faxtomail-ui-web/pom.xml trunk/faxtomail-ui-web/src/license/THIRD-PARTY.properties trunk/pom.xml Modified: trunk/faxtomail-service/pom.xml =================================================================== --- trunk/faxtomail-service/pom.xml 2014-07-10 10:01:06 UTC (rev 377) +++ trunk/faxtomail-service/pom.xml 2014-07-10 12:41:05 UTC (rev 378) @@ -53,6 +53,11 @@ </dependency> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-07-10 10:01:06 UTC (rev 377) +++ trunk/faxtomail-ui-web/pom.xml 2014-07-10 12:41:05 UTC (rev 378) @@ -302,12 +302,6 @@ <dependency> <groupId>gui.ava</groupId> <artifactId>html2image</artifactId> - <exclusions> - <exclusion> - <artifactId>core-renderer</artifactId> - <groupId>org.xhtmlrenderer</groupId> - </exclusion> - </exclusions> </dependency> <dependency> Modified: trunk/faxtomail-ui-web/src/license/THIRD-PARTY.properties =================================================================== --- trunk/faxtomail-ui-web/src/license/THIRD-PARTY.properties 2014-07-10 10:01:06 UTC (rev 377) +++ trunk/faxtomail-ui-web/src/license/THIRD-PARTY.properties 2014-07-10 12:41:05 UTC (rev 378) @@ -9,6 +9,7 @@ # - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License +# - Common Public License Version 1.0 # - Copyright 2012 Igor Vaynberg # - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Public License (EPL), Version 1.0 @@ -29,6 +30,7 @@ # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - New BSD License # - Public Domain # - SIL Open Font License (OFL) # - The Apache Software License, Version 1.1 @@ -39,7 +41,7 @@ # Please fill the missing licenses for dependencies : # # -#Thu Jul 03 09:32:32 CEST 2014 +#Thu Jul 10 12:54:07 CEST 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License gui.ava--html2image--2.0.1=GNU Lesser General Public License, Version 2.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-10 10:01:06 UTC (rev 377) +++ trunk/pom.xml 2014-07-10 12:41:05 UTC (rev 378) @@ -202,6 +202,12 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <version>${hibernateVersion}</version> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -213,12 +219,6 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-profiling</artifactId> - <version>2.7.1</version> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> <version>${nuitonUtilsVersion}</version> </dependency> @@ -306,12 +306,6 @@ <dependency> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-config</artifactId> - <version>${jaxxVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-application-api</artifactId> <version>${jaxxVersion}</version> </dependency> @@ -322,21 +316,6 @@ <version>${jaxxVersion}</version> </dependency> - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime</artifactId> - <version>${jaxxVersion}</version> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> - - <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>jxlayer</artifactId> - <version>3.0.4</version> - <scope>compile</scope> - </dependency> -  <dependency> @@ -352,12 +331,6 @@ </dependency> <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-autocomplete</artifactId> - <version>${swingXVersion}</version> - </dependency> - - <dependency> <groupId>com.ezware.oxbow</groupId> <artifactId>swing-bits</artifactId> <version>0.5.0</version> @@ -369,22 +342,6 @@ <version>1.0.5</version> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-vfs2</artifactId> - <version>2.0</version> - <exclusions> - <exclusion> - <groupId>org.apache.maven.scm</groupId> - <artifactId>maven-scm-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.maven.scm</groupId> - <artifactId>maven-scm-provider-svnexe</artifactId> - </exclusion> - </exclusions> - </dependency> -  <dependency> <groupId>org.slf4j</groupId> @@ -449,12 +406,6 @@ <dependency> <groupId>org.apache.struts</groupId> - <artifactId>struts2-json-plugin</artifactId> - <version>${struts2Version}</version> - </dependency> - - <dependency> - <groupId>org.apache.struts</groupId> <artifactId>struts2-convention-plugin</artifactId> <version>${struts2Version}</version> </dependency> @@ -629,6 +580,16 @@ <groupId>gui.ava</groupId> <artifactId>html2image</artifactId> <version>2.0.1</version> + <exclusions> + <exclusion> + <artifactId>core-renderer</artifactId> + <groupId>org.xhtmlrenderer</groupId> + </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> </dependency> <dependency>

1 0

r377 - trunk
by echatellier＠users.forge.codelutin.com 10 Jul '14

10 Jul '14

Author: echatellier Date: 2014-07-10 12:01:06 +0200 (Thu, 10 Jul 2014) New Revision: 377 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/377 Log: Update to nuiton-utils 3.0-rc-4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-09 14:43:50 UTC (rev 376) +++ trunk/pom.xml 2014-07-10 10:01:06 UTC (rev 377) @@ -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-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>3.0-rc-4</nuitonUtilsVersion> <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> <nuitonWebVersion>1.16</nuitonWebVersion>

1 0

r376 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing
by echatellier＠users.forge.codelutin.com 09 Jul '14

09 Jul '14

Author: echatellier Date: 2014-07-09 16:43:50 +0200 (Wed, 09 Jul 2014) New Revision: 376 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/376 Log: Fix entity management when transaction is closed Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-07-09 14:41:50 UTC (rev 375) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-07-09 14:43:50 UTC (rev 376) @@ -52,6 +52,7 @@ import org.jdesktop.swingx.JXLoginPane; import org.jdesktop.swingx.JXLoginPane.Status; import org.jdesktop.swingx.auth.LoginService; +import org.jdesktop.swingx.error.ErrorInfo; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.i18n.init.DefaultI18nInitializer; @@ -181,28 +182,16 @@ private final ApplicationActionEngine faxToMailActionEngine; - /** - * @deprecated Ca pose problème de conserver des entités alors que le persistence contexte change (lazy). - */ - @Deprecated + /** L'utilisateur actuellement connecté. */ protected FaxToMailUser currentUser; - /** - * @deprecated Ca pose problème de conserver des entités alors que le persistence contexte change (lazy). - */ - @Deprecated + /** Le dossier courant (pour ???). */ protected MailFolder currentMailFolder; - /** - * @deprecated Ca pose problème de conserver des entités alors que le persistence contexte change (lazy). - */ - @Deprecated + /** L'email courant (pour quoi faire ?). */ protected DemandeUIModel currentEmail; - /** - * @deprecated Ca pose problème de conserver des entités alors que le persistence contexte change (lazy). - */ - @Deprecated + /** Les dossiers étendus (pour pouvoir les étendres encore au rechargement de l'UI). */ protected List<MailFolder> expandedFolders = new ArrayList<MailFolder>(); protected SearchUIModel search; @@ -266,6 +255,11 @@ public void showErrorDialog(String message, Throwable cause) { super.showErrorDialog(message, cause); } + + @Override + public void reportError(ErrorInfo errorInfo) throws NullPointerException { + // empeche la fenetre d'erreur de boucler déjà + } }; UIMessageNotifier logMessageNotifier = new UIMessageNotifier() { @@ -680,13 +674,7 @@ } public FaxToMailUser getCurrentUser() { - FaxToMailUser user = currentUser; - if (user != null) { - // reload with current transaction - //FIXME topiaId - user = getUserService().getUser(currentUser.getTopiaId()); - } - return user; + return currentUser; } public void setCurrentUser(FaxToMailUser currentUser) { @@ -694,13 +682,7 @@ } public MailFolder getCurrentMailFolder() { - MailFolder folder = currentMailFolder; - if (folder != null) { - // reload with current transaction - //FIXME topiaId - folder = getMailFolderService().getMailFolder(folder.getTopiaId()); - } - return folder; + return currentMailFolder; } public void setCurrentMailFolder(MailFolder currentMailFolder) {

1 0

r375 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com 09 Jul '14

09 Jul '14

Author: echatellier Date: 2014-07-09 16:41:50 +0200 (Wed, 09 Jul 2014) New Revision: 375 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/375 Log: Return entity without making binding copy (hibernate can't handle copy, just original) Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-07-09 12:55:59 UTC (rev 374) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-07-09 14:41:50 UTC (rev 375) @@ -185,13 +185,9 @@ if (userConnect.isConnected()) { // update in database - FaxToMailUser user = updateUserFormLdap(searchEntry, login); + result = updateUserFormLdap(searchEntry, login); getPersistenceContext().commit(); - - // return copy without sensible informations - Binder<FaxToMailUser, FaxToMailUser> faxToMailUserBinder = BinderFactory.newBinder(FaxToMailUser.class); - result = new FaxToMailUserImpl(); - faxToMailUserBinder.copyExcluding(user, result); + userConnect.close(); } else { throw new AuthenticationException("Not connected"); @@ -246,13 +242,9 @@ if( searchEntry != null ) { // update in database - FaxToMailUser user = updateUserFormLdap(searchEntry, login); + result = updateUserFormLdap(searchEntry, login); getPersistenceContext().commit(); - // return copy without sensible informations - Binder<FaxToMailUser, FaxToMailUser> faxToMailUserBinder = BinderFactory.newBinder(FaxToMailUser.class); - result = new FaxToMailUserImpl(); - faxToMailUserBinder.copyExcluding(user, result); } else { throw new AuthenticationException("Utilisateur inconnu : " + login); } @@ -324,6 +316,10 @@ } else { user = faxtomailUserDao.create(user); } + + // force collection loading to force non lazy collections + user.isAffectedFoldersEmpty(); + user.isUserGroupsEmpty(); return user; }

1 0