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

r294 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap
by echatellier＠users.forge.codelutin.com 30 Jun '14

30 Jun '14

Author: echatellier Date: 2014-06-30 10:20:04 +0200 (Mon, 30 Jun 2014) New Revision: 294 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/294 Log: Fix complete name Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java 2014-06-30 08:01:09 UTC (rev 293) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java 2014-06-30 08:20:04 UTC (rev 294) @@ -70,7 +70,7 @@ if (fakeGroup == null) { fakeGroup = new FaxToMailUserGroupImpl(); fakeGroup.setName("fake group"); - fakeGroup.setName(adminGroups.get(0)); + fakeGroup.setCompleteName(adminGroups.get(0)); fakeGroup = groupDao.create(fakeGroup); }

1 0

r293 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap
by echatellier＠users.forge.codelutin.com 30 Jun '14

30 Jun '14

Author: echatellier Date: 2014-06-30 10:01:09 +0200 (Mon, 30 Jun 2014) New Revision: 293 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/293 Log: Fix fake ldap admin user group Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java 2014-06-30 07:47:30 UTC (rev 292) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java 2014-06-30 08:01:09 UTC (rev 293) @@ -24,7 +24,14 @@ * #L% */ +import java.util.List; + +import org.apache.commons.collections.CollectionUtils; + import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroup; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroupImpl; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroupTopiaDao; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserImpl; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserTopiaDao; import com.franciaflex.faxtomail.services.service.LdapService; @@ -40,17 +47,39 @@ protected FaxToMailUser getFakeFaxToMailUser() { if (fakeUser == null) { - FaxToMailUserTopiaDao dao = getPersistenceContext().getFaxToMailUserDao(); + FaxToMailUserTopiaDao userDao = getPersistenceContext().getFaxToMailUserDao(); + FaxToMailUserGroupTopiaDao groupDao = getPersistenceContext().getFaxToMailUserGroupDao(); - fakeUser = dao.forAll().findAnyOrNull(); + fakeUser = userDao.forAll().findAnyOrNull(); + + // create user if (fakeUser == null) { fakeUser = new FaxToMailUserImpl(); fakeUser.setTrigraph("fkr"); fakeUser.setFirstName("Test ldap"); fakeUser.setLastName("Test ldap"); fakeUser.setLogin("test"); - dao.create(fakeUser); + fakeUser = userDao.create(fakeUser); } + + // add user to fake group + FaxToMailUserGroup fakeGroup = null; + List<String> adminGroups = getApplicationConfig().getLdapAdminGroups(); + if (CollectionUtils.isNotEmpty(adminGroups)) { + fakeGroup = groupDao.forCompleteNameEquals(adminGroups.get(0)).findAnyOrNull(); + if (fakeGroup == null) { + fakeGroup = new FaxToMailUserGroupImpl(); + fakeGroup.setName("fake group"); + fakeGroup.setName(adminGroups.get(0)); + fakeGroup = groupDao.create(fakeGroup); + } + + if (!fakeUser.containsUserGroups(fakeGroup)) { + fakeUser.addUserGroups(fakeGroup); + } + } + + getPersistenceContext().commit(); } return fakeUser; }

1 0

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

30 Jun '14

Author: echatellier Date: 2014-06-30 09:47:30 +0200 (Mon, 30 Jun 2014) New Revision: 292 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/292 Log: Add fake ldap service Added: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java 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-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceContext.java 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-29 18:47:40 UTC (rev 291) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-06-30 07:47:30 UTC (rev 292) @@ -247,6 +247,10 @@ return applicationConfig.getOptionAsBoolean(FaxToMailConfigurationOption.MAIL_EXPUNGE.getKey()); } + public boolean isLdapMock() { + return applicationConfig.getOptionAsBoolean(FaxToMailConfigurationOption.LDAP_MOCK.getKey()); + } + public String getLdapHost() { return applicationConfig.getOption(FaxToMailConfigurationOption.LDAP_HOST.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-29 18:47:40 UTC (rev 291) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-06-30 07:47:30 UTC (rev 292) @@ -92,6 +92,10 @@ "Chemin vers le fichier de configuration des journaux", null, String.class), + LDAP_MOCK( + "faxtomail.ldap.mock", + "Utilisation d'un service ldap mock", "false", Boolean.class), + LDAP_HOST( "faxtomail.ldap.host", "Adresse du serveur LDAP", null, String.class), Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceContext.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceContext.java 2014-06-29 18:47:40 UTC (rev 291) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceContext.java 2014-06-30 07:47:30 UTC (rev 292) @@ -24,21 +24,23 @@ * #L% */ -import com.franciaflex.faxtomail.FaxToMailConfiguration; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; -import com.franciaflex.faxtomail.services.service.FaxToMailWebApplicationContext; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.util.Date; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.ApplicationTechnicalException; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.util.Date; +import com.franciaflex.faxtomail.FaxToMailConfiguration; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; +import com.franciaflex.faxtomail.services.service.FaxToMailWebApplicationContext; +import com.franciaflex.faxtomail.services.service.LdapService; +import com.franciaflex.faxtomail.services.service.ldap.LdapServiceMock; public class FaxToMailServiceContext { - private static final Log log = - LogFactory.getLog(FaxToMailServiceContext.class); + private static final Log log = LogFactory.getLog(FaxToMailServiceContext.class); protected FaxToMailConfiguration applicationConfig; @@ -64,6 +66,11 @@ public <E extends FaxToMailService> E newService(Class<E> serviceClass) { + // special case for mock services + if (serviceClass.equals(LdapService.class) && applicationConfig.isLdapMock()) { + serviceClass = (Class<E>)LdapServiceMock.class; + } + E service; try { Added: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java (rev 0) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java 2014-06-30 07:47:30 UTC (rev 292) @@ -0,0 +1,77 @@ +package com.franciaflex.faxtomail.services.service.ldap; + +/* + * #%L + * FaxToMail :: Service + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserImpl; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserTopiaDao; +import com.franciaflex.faxtomail.services.service.LdapService; + +/** + * Surcharge les methodes qui utilisent le serveur ldap pour pouvoir fonctionner sans serveur ldap. + * + * @author Eric Chatellier + */ +public class LdapServiceMock extends LdapService { + + protected FaxToMailUser fakeUser; + + protected FaxToMailUser getFakeFaxToMailUser() { + if (fakeUser == null) { + FaxToMailUserTopiaDao dao = getPersistenceContext().getFaxToMailUserDao(); + + fakeUser = dao.forAll().findAnyOrNull(); + if (fakeUser == null) { + fakeUser = new FaxToMailUserImpl(); + fakeUser.setTrigraph("fkr"); + fakeUser.setFirstName("Test ldap"); + fakeUser.setLastName("Test ldap"); + fakeUser.setLogin("test"); + dao.create(fakeUser); + } + } + return fakeUser; + } + + @Override + public void updateLdapData() { + // do nothing here + } + + @Override + public FaxToMailUser getUserBean(String userTopiaId) { + return getFakeFaxToMailUser(); + } + + @Override + public FaxToMailUser authenticateUser(String login, String password) throws AuthenticationException { + return getFakeFaxToMailUser(); + } + + @Override + public FaxToMailUser getUserFromPrincipal(String principal) throws AuthenticationException { + return getFakeFaxToMailUser(); + } +} Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r291 - trunk
by echatellier＠users.forge.codelutin.com 29 Jun '14

29 Jun '14

Author: echatellier Date: 2014-06-29 20:47:40 +0200 (Sun, 29 Jun 2014) New Revision: 291 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/291 Log: yoala is not in nexus proxy cache Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-29 18:46:52 UTC (rev 290) +++ trunk/pom.xml 2014-06-29 18:47:40 UTC (rev 291) @@ -151,13 +151,6 @@ <checksumPolicy>fail</checksumPolicy> </releases> </repository> - - <repository> - <id>yoava</id> - <name>AOL yoava</name> - <url>http://evgenyg.artifactoryonline.com/evgenyg/repo</url> - </repository> - </repositories> <pluginRepositories>

1 0

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

29 Jun '14

Author: echatellier Date: 2014-06-29 20:46:52 +0200 (Sun, 29 Jun 2014) New Revision: 290 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/290 Log: Update bootstrap, select2, angularjs, jquery-ui Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml trunk/pom.xml 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-29 18:21:17 UTC (rev 289) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-29 18:46:52 UTC (rev 290) @@ -90,9 +90,9 @@ <input type="text" id="configurationEmailMaxSizeField" class="form-control" ng-model="configuration.emailMaxSize" /> </div> - <div class="form-group"> - 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"> + Actions autorisées lorsque la demande n'a pas d'état d'attente et est <strong>invalide</strong> : + <div class="checkbox" ng-repeat="(mailAction,label) in mailActions"> + <label> <input type="checkbox" ng-checked="configuration.invalidFormDisabledActions.indexOf(mailAction) == -1" ng-click="changeInvalidAction(mailAction)"> {{label}} </label> @@ -169,16 +169,20 @@ <div class="col-md-8" ng-if="selectedEtatAttente"> <h3>Édition de l'état d'attente {{selectedEtatAttente.label}}</h3> Actions autorisées lorsque la demande est <strong>valide</strong> : - <label class="checkbox" ng-repeat="(mailAction,label) in mailActions"> - <input type="checkbox" ng-checked="selectedEtatAttente.validFormDisabledActions.indexOf(mailAction) == -1" - ng-click="changeEtatAttenteValidAction(mailAction)"> {{label}} - </label> + <div class="checkbox" ng-repeat="(mailAction,label) in mailActions"> + <label> + <input type="checkbox" ng-checked="selectedEtatAttente.validFormDisabledActions.indexOf(mailAction) == -1" + ng-click="changeEtatAttenteValidAction(mailAction)"> {{label}} + </label> + </div> Actions autorisées lorsque la demande est <strong>invalide</strong> : - <label class="checkbox" ng-repeat="(mailAction,label) in mailActions"> - <input type="checkbox" ng-checked="selectedEtatAttente.invalidFormDisabledActions.indexOf(mailAction) == -1" - ng-click="changeEtatAttenteInvalidAction(mailAction)"> {{label}} - </label> + <div class="checkbox" ng-repeat="(mailAction,label) in mailActions"> + <label> + <input type="checkbox" ng-checked="selectedEtatAttente.invalidFormDisabledActions.indexOf(mailAction) == -1" + ng-click="changeEtatAttenteInvalidAction(mailAction)"> {{label}} + </label> + </div> </div> <div class="col-md-8" ng-if="!selectedEtatAttente"> <em>Sélectionnez un état d'attente.</em> @@ -207,10 +211,12 @@ <div class="col-md-8" ng-if="selectedDemandType"> <h3>Édition du type de document {{selectedDemandType.label}}</h3> Champs obligatoires pour le type de document : - <label class="checkbox" ng-repeat="(mailField,label) in canBeRequiredMailFields"> - <input type="checkbox" ng-checked="selectedDemandType.fields.indexOf(mailField) != -1" - ng-click="changeDemandTypeField(mailField)"> {{label}} - </label> + <div class="checkbox" ng-repeat="(mailField,label) in canBeRequiredMailFields"> + <label> + <input type="checkbox" ng-checked="selectedDemandType.fields.indexOf(mailField) != -1" + ng-click="changeDemandTypeField(mailField)"> {{label}} + </label> + </div> </div> <div class="col-md-8" ng-if="!selectedDemandType"> <em>Sélectionnez un type de document.</em> Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml 2014-06-29 18:21:17 UTC (rev 289) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml 2014-06-29 18:46:52 UTC (rev 290) @@ -24,9 +24,9 @@ <groups xmlns="http://www.isdc.ro/wro"> <group name='webjar-select2' abstract="true"> - <css>classpath:META-INF/resources/webjars/select2/3.4.8/select2.css</css> - <js>classpath:META-INF/resources/webjars/select2/3.4.8/select2.js</js> - <js>classpath:META-INF/resources/webjars/select2/3.4.8/select2_locale_fr.js</js> + <css>classpath:META-INF/resources/webjars/select2/3.5.0/select2.css</css> + <js>classpath:META-INF/resources/webjars/select2/3.5.0/select2.js</js> + <js>classpath:META-INF/resources/webjars/select2/3.5.0/select2_locale_fr.js</js> </group> <group name='webjar-chosen' abstract="true"> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-29 18:21:17 UTC (rev 289) +++ trunk/pom.xml 2014-06-29 18:46:52 UTC (rev 290) @@ -548,7 +548,7 @@ <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-bootstrap</artifactId> - <version>3.1.1-1</version> + <version>3.2.0-1-SNAPSHOT</version> <scope>runtime</scope> </dependency> @@ -575,14 +575,14 @@ <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-jquery-ui</artifactId> - <version>1.10.4-1</version> + <version>1.11.0-1-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.webjars</groupId> <artifactId>select2</artifactId> - <version>3.4.8-1</version> + <version>3.5.0</version> <scope>runtime</scope> </dependency> @@ -596,7 +596,7 @@ <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-angularjs</artifactId> - <version>1.2.17-1</version> + <version>1.2.18-1-SNAPSHOT</version> <scope>runtime</scope> </dependency>

1 0

r289 - trunk/faxtomail-ui-web/src/main/webapp/js
by kmorin＠users.forge.codelutin.com 29 Jun '14

29 Jun '14

Author: kmorin Date: 2014-06-29 20:21:17 +0200 (Sun, 29 Jun 2014) New Revision: 289 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/289 Log: - ne pas afficher les dossiers d'archive dans les listes de dossier - correction quand on supprime le dossier d'archive Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-29 18:20:30 UTC (rev 288) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-29 18:21:17 UTC (rev 289) @@ -77,10 +77,13 @@ folderCount += $scope.mailFoldersUsage[mailFolder.topiaId]; } - result.push(mailFolder); if (mailFolder.archiveFolder) { parent.hasArchiveFolder = true; + + } else { + result.push(mailFolder); } + folderCount += recursiveAddMailFolder(result, mailFolder.children, rootFolder, mailFolder.$fullPath, mailFolder); // et on modifie encore (tant qu'on a commencé !!!) @@ -427,6 +430,9 @@ } // remove current folder + if (nodeData.archiveFolder) { + nodeData.$parent.hasArchiveFolder = false; + } scope.remove(scope); // update filter meta map $scope.updateMetaFilter();

1 0

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

29 Jun '14

Author: echatellier Date: 2014-06-29 20:20:30 +0200 (Sun, 29 Jun 2014) New Revision: 288 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/288 Log: Correction affichage 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-29 17:44:09 UTC (rev 287) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-29 18:20:30 UTC (rev 288) @@ -251,7 +251,7 @@ </div> </div> - <div class="col-md-8" ng-show="!selectedMailFolder.archiveFolder"> + <div class="col-md-8" ng-show="selectedMailFolder && !selectedMailFolder.archiveFolder"> <h3>Édition du dossier {{selectedMailFolder.name}}</h3> <div class="panel-group" id="accordion">

1 0

r287 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by kmorin＠users.forge.codelutin.com 29 Jun '14

29 Jun '14

Author: kmorin Date: 2014-06-29 19:44:09 +0200 (Sun, 29 Jun 2014) New Revision: 287 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/287 Log: nettoyage 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-29 17:42:07 UTC (rev 286) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-29 17:44:09 UTC (rev 287) @@ -60,13 +60,10 @@ import javax.mail.Part; import javax.mail.Session; import javax.mail.Store; -import javax.mail.internet.ContentType; import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; import javax.mail.internet.MimeUtility; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; @@ -80,17 +77,12 @@ import com.itextpdf.text.pdf.PdfWriter; import gui.ava.html.image.generator.HtmlImageGenerator; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.io.Charsets; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.htmlcleaner.CleanerProperties; -import org.htmlcleaner.HtmlCleaner; -import org.htmlcleaner.PrettyXmlSerializer; -import org.htmlcleaner.TagNode; import org.nuiton.decorator.Decorator; import org.nuiton.util.StringUtil; import org.quartz.JobExecutionContext; @@ -113,10 +105,7 @@ import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.services.service.MailFolderService; -import org.xhtmlrenderer.pdf.ITextRenderer; -import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; /** * @author Kevin Morin (Code Lutin) @@ -651,8 +640,6 @@ public Attachment convertHTMLToPdf(List<Attachment> attachments, String content, String name) throws IOException, ParserConfigurationException, SAXException, DocumentException { - File source = File.createTempFile("faxtomail-", ".html"); - source.deleteOnExit(); File target = File.createTempFile("faxtomail-", ".png"); target.deleteOnExit(); @@ -679,16 +666,7 @@ } } -// CleanerProperties props = new CleanerProperties(); - -// do parsing -// TagNode tagNode = new HtmlCleaner(props).clean(content); - -// serialize to xml file -// new PrettyXmlSerializer(props).writeToFile(tagNode, source.getAbsolutePath(), "utf-8"); - HtmlImageGenerator imageGenerator = new HtmlImageGenerator(); -// imageGenerator.loadUrl(source.toURI().toURL()); imageGenerator.loadHtml(content); imageGenerator.saveAsImage(target);

1 0

r286 - in trunk: . faxtomail-persistence/src/main/xmi faxtomail-service/src/main/java/com/franciaflex/faxtomail/services faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util faxtomail-ui-web faxtomail-ui-web/src/main/java/com/
by kmorin＠users.forge.codelutin.com 29 Jun '14

29 Jun '14

Author: kmorin Date: 2014-06-29 19:42:07 +0200 (Sun, 29 Jun 2014) New Revision: 286 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/286 Log: - am?\195?\169lioration de la g?\195?\169n?\195?\169ration des mail en pj - am?\195?\169lioration de l'?\195?\169dition des pj Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 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/pdfeditor/PDFEditorUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java trunk/faxtomail-ui-web/pom.xml trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java trunk/pom.xml Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java 2014-06-29 16:50:40 UTC (rev 285) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java 2014-06-29 17:42:07 UTC (rev 286) @@ -25,7 +25,13 @@ */ import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import org.apache.commons.io.Charsets; +import javax.mail.MessagingException; +import javax.mail.Part; +import javax.mail.internet.ContentType; +import java.nio.charset.Charset; + /** * @author Kevin Morin (Code Lutin) * @since x.x @@ -44,4 +50,11 @@ faxNumber += "@" + folder.getFaxDomain(); return faxNumber; } + + public static Charset getCharset(Part part) throws MessagingException { + ContentType contentType = new ContentType(part.getContentType()); + String charsetName = contentType.getParameter("charset"); + Charset charset = Charsets.toCharset(charsetName); + return charset; + } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-06-29 16:50:40 UTC (rev 285) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-06-29 17:42:07 UTC (rev 286) @@ -58,10 +58,16 @@ @Override public void doAction() throws Exception { + FaxToMailUIUtil.forceAttachmentFileLoading(getContext(), attachment); + } + + @Override + public void postSuccessAction() { + super.postSuccessAction(); + MainUI mainUI = getContext().getMainUI(); PDFEditorUI dialogContent = new PDFEditorUI(getUI()); - FaxToMailUIUtil.forceAttachmentFileLoading(getContext(), attachment); /*boolean editedNull = attachment.getEditedFileName() == null; AttachmentFile attachmentFile = editedNull ? attachment.getOriginalFile() : attachment.getEditedFile(); if (attachmentFile == null) { @@ -77,4 +83,5 @@ getHandler().openDialog(dialogContent, attachment.getOriginalFileName(), mainUI.getSize()); dialogContent.getModel().toEntity(attachment); } + } \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-06-29 16:50:40 UTC (rev 285) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-06-29 17:42:07 UTC (rev 286) @@ -116,13 +116,14 @@ float zoom = model.getZoom(); int rotation = model.getRotation(); + for (int i = 0 ; i < pageNb ; i++) { PdfContentByte cb = pdfStamper.getOverContent(i + 1); - PdfDictionary pageDict; - pageDict = pdfReader.getPageN(i + 1); - int pageRotation = pdfReader.getPageRotation(i + 1); - pageDict.put(PdfName.ROTATE, new PdfNumber((360 + pageRotation + rotation) % 360)); +// PdfDictionary pageDict; +// pageDict = pdfReader.getPageN(i + 1); +// int pageRotation = pdfReader.getPageRotation(i + 1); +// pageDict.put(PdfName.ROTATE, new PdfNumber((360 + pageRotation + rotation) % 360)); for (PDFEditorNoteUI note : model.getPages()[i].getNotes()) { @@ -240,6 +241,7 @@ // convert content to blob InputStream is = new BufferedInputStream(new FileInputStream(target)); AttachmentFile attachmentFileNew = getContext().getEmailService().getAttachmentFileFromStream(is); + attachmentFileNew.setRotation(rotation); String fileName = getModel().getNotNullFile().getFilename(); attachmentFileNew.setFilename(FaxToMailUIUtil.getEditedFileName(fileName)); getModel().setEditedFile(attachmentFileNew); 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-06-29 16:50:40 UTC (rev 285) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-06-29 17:42:07 UTC (rev 286) @@ -39,6 +39,7 @@ import com.franciaflex.faxtomail.persistence.entities.Priority; import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.persistence.entities.Reply; +import com.franciaflex.faxtomail.services.FaxToMailServiceUtils; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailBeanUIModel; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentModelAware; import com.google.common.base.Function; @@ -967,7 +968,7 @@ // if it is a text part, the,n this is the email content String disposition = bp.getDisposition(); if (bp.isMimeType("text/*") && !Part.ATTACHMENT.equals(disposition)) { - Charset charset = getCharset(bp); + Charset charset = FaxToMailServiceUtils.getCharset(bp); String content = IOUtils.toString(bp.getInputStream(), charset); if (bp.isMimeType("text/plain")) { plainContent = content; @@ -982,13 +983,6 @@ } } - protected Charset getCharset(Part part) throws MessagingException { - ContentType contentType = new ContentType(part.getContentType()); - String charsetName = contentType.getParameter("charset"); - Charset charset = Charsets.toCharset(charsetName); - return charset; - } - @Override public boolean isEmpty() { return false; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-06-29 16:50:40 UTC (rev 285) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-06-29 17:42:07 UTC (rev 286) @@ -233,7 +233,7 @@ @Override public void onCloseUI() { - +// getModel() } public void addNote() { @@ -515,6 +515,7 @@ // convert content to blob AttachmentFile attachmentFileNew = getContext().getEmailService().getAttachmentFileFromStream(new FileInputStream(target)); attachmentFileNew.setFilename(attachmentFile.getFilename() + ".pdf"); + attachmentFileNew.setRotation(0); getModel().setEditedFile(attachmentFileNew); return target; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java 2014-06-29 16:50:40 UTC (rev 285) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java 2014-06-29 17:42:07 UTC (rev 286) @@ -138,6 +138,7 @@ Object oldValue = getEditedFile(); editObject.setEditedFile(file); firePropertyChange(Attachment.PROPERTY_EDITED_FILE, oldValue, file); + setRotation(file != null ? file.getRotation() : 0); } public AttachmentFile getEditedFile() { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-29 16:50:40 UTC (rev 285) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-29 17:42:07 UTC (rev 286) @@ -171,7 +171,7 @@ || context.getCurrentUser().isAffectedFoldersEmpty() || context.getCurrentUser().containsAffectedFolders(node.getMailFolder())) { - foreground = hasFocus ? Color.WHITE : Color.BLACK; + foreground = sel ? Color.WHITE : Color.BLACK; } else { foreground = Color.LIGHT_GRAY; Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-06-29 16:50:40 UTC (rev 285) +++ trunk/faxtomail-ui-web/pom.xml 2014-06-29 17:42:07 UTC (rev 286) @@ -293,6 +293,11 @@ <artifactId>itextpdf</artifactId> </dependency> + <dependency> + <groupId>gui.ava</groupId> + <artifactId>html2image</artifactId> + </dependency> + </dependencies> <build> 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-29 16:50:40 UTC (rev 285) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-29 17:42:07 UTC (rev 286) @@ -28,11 +28,13 @@ import java.awt.image.RenderedImage; import java.io.BufferedReader; +import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; +import java.io.StringBufferInputStream; import java.io.UnsupportedEncodingException; import java.net.URL; import java.nio.ByteBuffer; @@ -46,6 +48,7 @@ import java.util.Enumeration; import java.util.List; import java.util.Properties; +import java.util.regex.Pattern; import javax.activation.DataHandler; import javax.activation.DataSource; @@ -62,6 +65,9 @@ import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; import javax.mail.internet.MimeUtility; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailFilter; @@ -72,6 +78,7 @@ import com.itextpdf.text.PageSize; import com.itextpdf.text.Paragraph; import com.itextpdf.text.pdf.PdfWriter; +import gui.ava.html.image.generator.HtmlImageGenerator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.Charsets; import org.apache.commons.io.FileUtils; @@ -80,6 +87,10 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.htmlcleaner.CleanerProperties; +import org.htmlcleaner.HtmlCleaner; +import org.htmlcleaner.PrettyXmlSerializer; +import org.htmlcleaner.TagNode; import org.nuiton.decorator.Decorator; import org.nuiton.util.StringUtil; import org.quartz.JobExecutionContext; @@ -102,6 +113,10 @@ import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.services.service.MailFolderService; +import org.xhtmlrenderer.pdf.ITextRenderer; +import org.xml.sax.ErrorHandler; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; /** * @author Kevin Morin (Code Lutin) @@ -221,7 +236,7 @@ int messageNumber = count - i; Message message = folder.getMessage(messageNumber); - Charset charset = getCharset(message); + Charset charset = FaxToMailServiceUtils.getCharset(message); List<String> modifiedProperties = new ArrayList<>(); @@ -352,10 +367,7 @@ } - Date receivedDate = message.getReceivedDate(); - if (receivedDate == null) { - receivedDate = message.getSentDate(); - } + Date receivedDate = new Date(); email.setReceptionDate(receivedDate); modifiedProperties.add(Email.PROPERTY_RECEPTION_DATE); @@ -380,19 +392,25 @@ emailSource.append("\n").append(originalContent); email.setOriginalEmail(emailSource.toString()); - List<Attachment> attachements = new ArrayList<>(); - Attachment attachment = convertTextToPdf(emailSource.toString(), t("faxtomail.email.content.attachment.fileName")); - attachements.add(attachment); + List<Attachment> attachments = new ArrayList<>(); + if (message.isMimeType("multipart/*")) { + String htmlContent = decomposeMultipartEmail(attachments, message, email, emailService); + if (htmlContent != null) { + Attachment attachment = convertHTMLToPdf(attachments, htmlContent, t("faxtomail.email.content.attachment.fileName")); + attachments.add(attachment); + } - if (message.isMimeType("multipart/*")) { - decomposeMultipartEmail(attachements, message, email, emailService); - // } else { + } else { // String content = IOUtils.toString(message.getInputStream(), charset); // email.setPlainContent(content); +// Charset charset = FaxToMailServiceUtils.getCharset(bp); + String content = IOUtils.toString(message.getInputStream(), charset); + Attachment attachment = convertTextToPdf(content, t("faxtomail.email.content.attachment.fileName")); + attachments.add(0, attachment); } emailService.saveEmail(email, - attachements, + attachments, email.getClient() != null ? email.getClient().getCode() : null, null, modifiedProperties.toArray(new String[modifiedProperties.size()])); @@ -428,28 +446,36 @@ * @param emailService email service * @throws Exception */ - protected void decomposeMultipartEmail(List<Attachment> attachments, Part part, Email email, EmailService emailService) throws Exception { + protected String decomposeMultipartEmail(List<Attachment> attachments, Part part, Email email, EmailService emailService) throws Exception { + String result = null; + DataSource dataSource = part.getDataHandler().getDataSource(); MimeMultipart mimeMultipart = new MimeMultipart(dataSource); int multiPartCount = mimeMultipart.getCount(); for (int j = 0; j < multiPartCount; j++) { MimeBodyPart bp = (MimeBodyPart) mimeMultipart.getBodyPart(j); - Charset charset = getCharset(bp); - // if it is a text part, the,n this is the email content + // if it is a text part, then this is the email content String disposition = bp.getDisposition(); if (bp.isMimeType("text/*") && !Part.ATTACHMENT.equals(disposition)) { -// String content = IOUtils.toString(bp.getInputStream(), charset); -// if (bp.isMimeType("text/plain")) { -// email.setPlainContent(content); -// } else { -// email.setHtmlContent(content); -// } + Charset charset = FaxToMailServiceUtils.getCharset(bp); + String content = IOUtils.toString(bp.getInputStream(), charset); + if (bp.isMimeType("text/plain")) { + Attachment attachment = convertTextToPdf(content, t("faxtomail.email.content.attachment.fileName")); + attachments.add(attachment); + + } else { + result = content; + } + // if it is multipart part, decompose it } else if (bp.isMimeType("multipart/*")) { - decomposeMultipartEmail(attachments, bp, email, emailService); + String htmlContent = decomposeMultipartEmail(attachments, bp, email, emailService); + if (htmlContent != null) { + result = htmlContent; + } // else, this is an attachment } else { @@ -465,7 +491,6 @@ // remove the guillemets between the id - if (fileName == null && contentID == null) { break; } else if (fileName == null) { @@ -501,15 +526,9 @@ attachments.add(attachment); } } + return result; } - protected Charset getCharset(Part part) throws MessagingException { - ContentType contentType = new ContentType(part.getContentType()); - String charsetName = contentType.getParameter("charset"); - Charset charset = Charsets.toCharset(charsetName); - return charset; - } - /** * Retourne un input stream sur une piece jointe convertie ou pas. * @@ -601,7 +620,6 @@ } public Attachment convertTextToPdf(String content, String name) throws IOException, DocumentException { - File target = File.createTempFile("faxtomail-", ".tmp"); target.deleteOnExit(); @@ -630,4 +648,60 @@ return attachment; } + + public Attachment convertHTMLToPdf(List<Attachment> attachments, String content, String name) throws IOException, ParserConfigurationException, SAXException, DocumentException { + + File source = File.createTempFile("faxtomail-", ".html"); + source.deleteOnExit(); + File target = File.createTempFile("faxtomail-", ".png"); + target.deleteOnExit(); + + content = content.replaceAll("<meta (.*?)>(</meta>)?", ""); + for (Attachment attachment : attachments) { + String key = attachment.getContentId(); + if (key == null) { + key = attachment.getOriginalFileName(); + } + + // get file content + AttachmentFile attachmentFile = attachment.getOriginalFile(); + File file = attachmentFile.getFile(); + + // replace the inline attachments with the extracted attachment file url + // match les patterns: + // <td background="cid:bg.gif" height="52"> + // <img border=0 src="cid:bg.gif" /> + // <img src='cid:5e9ef859-ea65-4f9b-a9fa-30d4a2c5837c' + content = content.replaceAll("(\\w+)=([\"'])cid:" + Pattern.quote(key) + "([\"'])", "$1=$2file://" + file.getAbsolutePath() + "$3"); + + if (log.isDebugEnabled()) { + log.debug("Mapping attachment id " + key + " to file " + file.getAbsolutePath()); + } + } + +// CleanerProperties props = new CleanerProperties(); + +// do parsing +// TagNode tagNode = new HtmlCleaner(props).clean(content); + +// serialize to xml file +// new PrettyXmlSerializer(props).writeToFile(tagNode, source.getAbsolutePath(), "utf-8"); + + HtmlImageGenerator imageGenerator = new HtmlImageGenerator(); +// imageGenerator.loadUrl(source.toURI().toURL()); + imageGenerator.loadHtml(content); + imageGenerator.saveAsImage(target); + + // convert content to blob + EmailService emailService = serviceContext.newService(EmailService.class); + AttachmentFile attachmentFileNew = emailService.getAttachmentFileFromStream(new FileInputStream(target)); + attachmentFileNew.setFilename(name + ".png"); + + Attachment attachment = new AttachmentImpl(); + attachment.setOriginalFile(attachmentFileNew); + attachment.setOriginalFileName(name); + attachment.setAddedByUser(false); + + return attachment; + } } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-29 16:50:40 UTC (rev 285) +++ trunk/pom.xml 2014-06-29 17:42:07 UTC (rev 286) @@ -151,7 +151,15 @@ <checksumPolicy>fail</checksumPolicy> </releases> </repository> + + <repository> + <id>yoava</id> + <name>AOL yoava</name> + <url>http://evgenyg.artifactoryonline.com/evgenyg/repo</url> + </repository> + </repositories> + <pluginRepositories> <pluginRepository> <id>faxtomail-public-group</id> @@ -631,13 +639,19 @@ <artifactId>pdfbox</artifactId> <version>${pdfboxVersion}</version> </dependency> + + <dependency> + <groupId>gui.ava</groupId> + <artifactId>html2image</artifactId> + <version>0.9</version> + </dependency> + </dependencies> </dependencyManagement> <build> - <pluginManagement> <plugins>

1 0

r285 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-service/src/main/java/com/franciaflex/faxtomail/services faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print faxtomail-ui-swing/src/main/resources/i18n faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by echatellier＠users.forge.codelutin.com 29 Jun '14

29 Jun '14

Author: echatellier Date: 2014-06-29 18:50:40 +0200 (Sun, 29 Jun 2014) New Revision: 285 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/285 Log: Fix build Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFilterTopiaDao.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/NewClientType.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/ComputeDemandeContent.java trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFilterTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFilterTopiaDao.java 2014-06-28 14:29:21 UTC (rev 284) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFilterTopiaDao.java 2014-06-29 16:50:40 UTC (rev 285) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.persistence.entities; +/* + * #%L + * FaxToMail :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + public class MailFilterTopiaDao extends AbstractMailFilterTopiaDao<MailFilter> { @Override Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java 2014-06-28 14:29:21 UTC (rev 284) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java 2014-06-29 16:50:40 UTC (rev 285) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.persistence.entities; +/* + * #%L + * FaxToMail :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + public class MailFolderTopiaDao extends AbstractMailFolderTopiaDao<MailFolder> { @Override Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/NewClientType.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/NewClientType.java 2014-06-28 14:29:21 UTC (rev 284) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/NewClientType.java 2014-06-29 16:50:40 UTC (rev 285) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.persistence.entities; +/* + * #%L + * FaxToMail :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + /** * @author Kevin Morin (Code Lutin) * @since x.x Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java 2014-06-28 14:29:21 UTC (rev 284) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java 2014-06-29 16:50:40 UTC (rev 285) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.services; +/* + * #%L + * FaxToMail :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.franciaflex.faxtomail.persistence.entities.MailFolder; /** Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/ComputeDemandeContent.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/ComputeDemandeContent.java 2014-06-28 14:29:21 UTC (rev 284) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/ComputeDemandeContent.java 2014-06-29 16:50:40 UTC (rev 285) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.content.print; +/* + * #%L + * FaxToMail :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.google.common.base.Joiner; import com.google.common.collect.Lists; Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-06-28 14:29:21 UTC (rev 284) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-06-29 16:50:40 UTC (rev 285) @@ -105,6 +105,7 @@ faxtomail.demande.demandStatus.label=Statut faxtomail.demande.demandType.label=Type faxtomail.demande.docType.label=Type +faxtomail.demande.ediCodeNumber.label= faxtomail.demande.ediError.label=Retour EDI faxtomail.demande.etatAttente.label=État attente faxtomail.demande.fax.label=Fax Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java 2014-06-28 14:29:21 UTC (rev 284) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java 2014-06-29 16:50:40 UTC (rev 285) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.web.job; +/* + * #%L + * FaxToMail :: Web + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.services.service.ClientService; import com.franciaflex.faxtomail.services.service.EmailService;

1 0