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

Build failed in Jenkins: faxtomail-nightly #1
by admin+ci-codelutin.com＠codelutin.com 27 May '14

27 May '14

See <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/1/> ------------------------------------------ [...truncated 117 lines...] A faxtomail-ui-swing/src/main/filtered-resources/faxtomail.config A faxtomail-ui-swing/src/main/filtered-resources/log4j.properties A faxtomail-ui-swing/src/main/resources A faxtomail-ui-swing/src/main/resources/i18n A faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_en_GB.properties A faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties A faxtomail-ui-swing/src/main/resources/META-INF A faxtomail-ui-swing/src/main/resources/log4j.properties A faxtomail-ui-swing/src/main/resources/icons AU faxtomail-ui-swing/src/main/resources/icons/action-reload-ui.png AU faxtomail-ui-swing/src/main/resources/icons/action-config.png AU faxtomail-ui-swing/src/main/resources/icons/action-reload-application.png AU faxtomail-ui-swing/src/main/resources/icons/action-exit.png AU faxtomail-ui-swing/src/main/resources/icons/action-reload-shortcut.png A faxtomail-ui-swing/src/main/resources/com A faxtomail-ui-swing/src/main/resources/com/franciaflex A faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail A faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui A faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing A faxtomail-ui-swing/pom.xml A faxtomail-ui-swing/README.txt A faxtomail-persistence A faxtomail-persistence/LICENSE.txt A faxtomail-persistence/src A faxtomail-persistence/src/test A faxtomail-persistence/src/test/java A faxtomail-persistence/src/main A faxtomail-persistence/src/main/java A faxtomail-persistence/src/main/java/com A faxtomail-persistence/src/main/java/com/franciaflex A faxtomail-persistence/src/main/java/com/franciaflex/faxtomail A faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence A faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities A faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/HistoryType.java A faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/RessourceClassLoader.java A faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/ProgressionModel.java A faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java A faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationProvider.java A faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java A faxtomail-persistence/src/main/resources A faxtomail-persistence/src/main/resources/faxtomail.properties A faxtomail-persistence/src/main/resources/i18n A faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties A faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_en_GB.properties A faxtomail-persistence/src/main/resources/META-INF A faxtomail-persistence/src/main/resources/META-INF/services A faxtomail-persistence/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider A faxtomail-persistence/src/main/xmi A faxtomail-persistence/src/main/xmi/faxtomail.properties AU faxtomail-persistence/src/main/xmi/faxtomail.zargo A faxtomail-persistence/pom.xml A faxtomail-persistence/README.txt A src A faxtomail-ui-web A faxtomail-ui-web/LICENSE.txt A faxtomail-ui-web/src A faxtomail-ui-web/src/main A faxtomail-ui-web/src/main/java A faxtomail-ui-web/src/main/java/com A faxtomail-ui-web/src/main/java/com/franciaflex A faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail A faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java A faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web A faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java A faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailIllegalAccessException.java A faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/DefaultFaxToMailWebApplicationContext.java A faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java A faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailSession.java A faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailStrutsObjectFactory.java A faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailEntityNotFoundException.java A faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailNoIdException.java A faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action A faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/IndexAction.java A faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin A faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java A faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java A faxtomail-ui-web/src/main/resources A faxtomail-ui-web/src/main/resources/i18n A faxtomail-ui-web/src/main/resources/i18n/faxtomail-web_fr_FR.properties A faxtomail-ui-web/src/main/resources/struts.properties A faxtomail-ui-web/src/main/resources/shiro.ini A faxtomail-ui-web/src/main/resources/struts.xml A faxtomail-ui-web/src/main/resources/validators.xml A faxtomail-ui-web/src/main/resources/xwork-conversion.properties A faxtomail-ui-web/src/main/resources/log4j.properties A faxtomail-ui-web/src/main/webapp A faxtomail-ui-web/src/main/webapp/WEB-INF A faxtomail-ui-web/src/main/webapp/WEB-INF/decorators.xml A faxtomail-ui-web/src/main/webapp/WEB-INF/decorators A faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/version.jsp A faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp A faxtomail-ui-web/src/main/webapp/WEB-INF/content A faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp A faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin A faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration.jsp A faxtomail-ui-web/src/main/webapp/WEB-INF/web.xml A faxtomail-ui-web/src/main/webapp/css A faxtomail-ui-web/src/main/webapp/css/select2 AU faxtomail-ui-web/src/main/webapp/css/select2/select2-spinner.gif AU faxtomail-ui-web/src/main/webapp/css/select2/select2.png A faxtomail-ui-web/src/main/webapp/css/select2/select2.css AU faxtomail-ui-web/src/main/webapp/css/select2/select2x2.png A faxtomail-ui-web/src/main/webapp/css/jstree A faxtomail-ui-web/src/main/webapp/css/jstree/themes A faxtomail-ui-web/src/main/webapp/css/jstree/themes/default AU faxtomail-ui-web/src/main/webapp/css/jstree/themes/default/32px.png A faxtomail-ui-web/src/main/webapp/css/jstree/themes/default/style.css A faxtomail-ui-web/src/main/webapp/css/jstree/themes/default/style.min.css AU faxtomail-ui-web/src/main/webapp/css/jstree/themes/default/throbber.gif AU faxtomail-ui-web/src/main/webapp/css/jstree/themes/default/40px.png A faxtomail-ui-web/src/main/webapp/css/configuration.css A faxtomail-ui-web/src/main/webapp/js A faxtomail-ui-web/src/main/webapp/js/select2 A faxtomail-ui-web/src/main/webapp/js/select2/LICENSE A faxtomail-ui-web/src/main/webapp/js/select2/select2_locale_fr.js A faxtomail-ui-web/src/main/webapp/js/select2/select2.min.js A faxtomail-ui-web/src/main/webapp/js/configuration.js A faxtomail-ui-web/src/main/webapp/js/jquery.ui.touch.js A faxtomail-ui-web/src/main/webapp/js/require.js A faxtomail-ui-web/src/main/webapp/js/jstree A faxtomail-ui-web/src/main/webapp/js/jstree/jstree.js A faxtomail-ui-web/src/main/webapp/js/jstree/jstree.min.js A faxtomail-ui-web/pom.xml A faxtomail-ui-web/README.txt A pom.xml A README.txt U . At revision 10 Parsing POMs Discovered a new module com.franciaflex:faxtomail FaxToMail Discovered a new module com.franciaflex.faxtomail:faxtomail-persistence FaxToMail :: Persistence Discovered a new module com.franciaflex.faxtomail:faxtomail-service FaxToMail :: Service Discovered a new module com.franciaflex.faxtomail:faxtomail-ui-web FaxToMail :: Web Discovered a new module com.franciaflex.faxtomail:faxtomail-ui-swing FaxToMail :: UI Modules changed, recalculating dependency graph [trunk] $ /opt/jdk7/bin/java -Dsettings.security=/var/local/forge/data/codelutin.com/maven/settings-security.xml -Djava.awt.headless=true -cp /var/local/forge/data/codelutin.com/jenkins/plugins/maven-plugin/WEB-INF/lib/maven31-agent-1.4.jar:/opt/maven3/boot/plexus-classworlds-2.5.1.jar:/opt/maven3/conf/logging jenkins.maven3.agent.Maven31Main /opt/maven3 /var/local/forge/exec/tomcat-codelutin.com/webapps/jenkins/WEB-INF/lib/remoting-2.33.jar /var/local/forge/data/codelutin.com/jenkins/plugins/maven-plugin/WEB-INF/lib/maven31-interceptor-1.4.jar /var/local/forge/data/codelutin.com/jenkins/plugins/maven-plugin/WEB-INF/lib/maven3-interceptor-commons-1.4.jar 54753 <===[JENKINS REMOTING CAPACITY]===> channel started log4j:WARN No appenders could be found for logger (org.apache.commons.beanutils.converters.BooleanConverter). log4j:WARN Please initialize the log4j system properly. Executing Maven: -B -f <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/pom.xml> -s /var/local/forge/data/codelutin.com/maven/settings.xml -e -U clean verify -DperformRelease [INFO] Error stacktraces are turned on. [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Reactor Build Order: [INFO] [INFO] FaxToMail [INFO] FaxToMail :: Persistence [INFO] FaxToMail :: Service [INFO] FaxToMail :: Web [INFO] FaxToMail :: UI [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building FaxToMail 0.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/cod… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/codehaus/m… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-maven-… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-maven-… (0 B at 0.0 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/cod… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/codehaus/m… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent… (0 B at 0.0 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/cod… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/codehaus/m… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-maven-… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-maven-… (0 B at 0.0 KB/sec) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ faxtomail --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ faxtomail --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ faxtomail --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-release-properties) @ faxtomail --- [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] FaxToMail ......................................... FAILURE [3.239s] [INFO] FaxToMail :: Persistence .......................... SKIPPED [INFO] FaxToMail :: Service .............................. SKIPPED [INFO] FaxToMail :: Web .................................. SKIPPED [INFO] FaxToMail :: UI ................................... SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 4.485s [INFO] Finished at: Sat Feb 15 01:16:29 CET 2014 [INFO] Final Memory: 16M/240M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-enforcer-plugin:1.3.1:enforce (check-release-properties) on project faxtomail: org.apache.maven.plugins.enforcer.RequireProperty failed with message: [ERROR] You must set a dbVersion property! [ERROR] -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-enforcer-plugin:1.3.1:enforce (check-release-properties) on project faxtomail: org.apache.maven.plugins.enforcer.RequireProperty failed with message: You must set a dbVersion property! at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:216) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:744) Caused by: org.apache.maven.plugin.MojoExecutionException: org.apache.maven.plugins.enforcer.RequireProperty failed with message: You must set a dbVersion property! at org.apache.maven.plugins.enforcer.EnforceMojo.execute(EnforceMojo.java:188) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more Caused by: org.apache.maven.enforcer.rule.api.EnforcerRuleException: You must set a dbVersion property! at org.apache.maven.plugins.enforcer.AbstractPropertyEnforcerRule.execute(AbstractPropertyEnforcerRule.java:119) at org.apache.maven.plugins.enforcer.EnforceMojo.execute(EnforceMojo.java:177) ... 32 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException Sending e-mails to: faxtomail-commits(a)list.forge.codelutin.com channel stopped Skipping sonar analysis due to bad build status FAILURE

1 36

Jenkins build is unstable: faxtomail-nightly » FaxToMail :: Service #27
by admin+ci-codelutin.com＠codelutin.com 27 May '14

27 May '14

See <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>

1 10

Jenkins build became unstable: faxtomail-ci #24
by admin+ci-codelutin.com＠codelutin.com 27 May '14

27 May '14

See <http://ci.codelutin.com/jenkins/job/faxtomail-ci/24/changes>

1 57

Jenkins build is unstable: faxtomail-ci » FaxToMail :: Service #76
by admin+ci-codelutin.com＠codelutin.com 27 May '14

27 May '14

See <http://ci.codelutin.com/jenkins/job/faxtomail-ci/com.franciaflex.faxtomail$…>

1 5

r103 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail faxtomail-persistence/src/main/resources/i18n faxtomail-persistence/src/main/xmi faxtomail-service faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service faxtomail-service/src/test/resources faxtomail-service/src/test/resources/csv fax
by echatellier＠users.forge.codelutin.com 27 May '14

27 May '14

Author: echatellier Date: 2014-05-27 18:37:04 +0200 (Tue, 27 May 2014) New Revision: 103 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/103 Log: refs #4661: [TECH] R?\195?\169f?\195?\169rentiels Added: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/DemandTypeImportModel.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EtatAttenteImportModel.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/PriorityImportModel.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/RangeImportModel.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ReferentielServiceTest.java trunk/faxtomail-service/src/test/resources/csv/ trunk/faxtomail-service/src/test/resources/csv/clients.csv trunk/faxtomail-service/src/test/resources/csv/demandtypes.csv trunk/faxtomail-service/src/test/resources/csv/email_accounts.csv trunk/faxtomail-service/src/test/resources/csv/email_filters.csv trunk/faxtomail-service/src/test/resources/csv/etatattentes.csv trunk/faxtomail-service/src/test/resources/csv/priorities.csv trunk/faxtomail-service/src/test/resources/csv/ranges.csv 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/resources/i18n/faxtomail-persistence_fr_FR.properties trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/pom.xml trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailAccountImportModel.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailFilterImportModel.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java trunk/faxtomail-ui-web/pom.xml trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/HibernateProxyTypeAdapter.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/TopiaEntityAdapter.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 trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.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-05-27 09:00:44 UTC (rev 102) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-05-27 16:37:04 UTC (rev 103) @@ -216,26 +216,25 @@ return jpaParameters; } - /** - * @return Le nom d'hôte du serveur SMTP. - */ public String getSmtpHost() { return applicationConfig.getOption(FaxToMailConfigurationOption.SMTP_HOST.getKey()); } - /** - * @return Le port du serveur SMTP. - */ public int getSmtpPort() { return applicationConfig.getOptionAsInt(FaxToMailConfigurationOption.SMTP_PORT.getKey()); } - - /** - * @return L'adresse d'expéditeur pour les mails de notifications - */ - public String getSmtpFrom() { - return applicationConfig.getOption(FaxToMailConfigurationOption.SMTP_FROM.getKey()); + + public String getSmtpUser() { + return applicationConfig.getOption(FaxToMailConfigurationOption.SMTP_USER.getKey()); } + + public String getSmtpPassword() { + return applicationConfig.getOption(FaxToMailConfigurationOption.SMTP_PASSWORD.getKey()); + } + + public boolean getSmtpUseSsl() { + return applicationConfig.getOptionAsBoolean(FaxToMailConfigurationOption.SMTP_SSL.getKey()); + } public String getInstanceUrl() { return applicationConfig.getOption(FaxToMailConfigurationOption.INSTANCE_URL.getKey()); @@ -290,6 +289,12 @@ File result = applicationConfig.getOptionAsFile(FaxToMailConfigurationOption.BASEDIR.getKey()); return result; } + + /** @return {@link FaxToMailConfigurationOption#DEMO_DIRECTORY} value */ + public File getDemoDirectory() { + File result = applicationConfig.getOptionAsFile(FaxToMailConfigurationOption.DEMO_DIRECTORY.getKey()); + return result; + } /** @return {@link FaxToMailConfigurationOption#DATA_DIRECTORY} value */ public File getDataDirectory() { Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-05-27 09:00:44 UTC (rev 102) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-05-27 16:37:04 UTC (rev 103) @@ -48,20 +48,30 @@ null, String.class), SMTP_HOST( - "smtp.host", + "faxtomail.smtp.host", "Nom d'hôte du serveur SMTP", - "", String.class), + null, String.class), SMTP_PORT( - "smtp.port", + "faxtomail.smtp.port", "Le port du serveur SMTP", "25", Integer.class), - SMTP_FROM( - "smtp.from", - "L'adresse d'expéditeur pour les mails de notifications", - "", String.class), + SMTP_USER( + "faxtomail.smtp.user", + "Utilisateur du serveur smtp", + null, String.class), + SMTP_PASSWORD( + "faxtomail.smtp.password", + "Mot de passe de l'utilisateur du smtp", + null, String.class), + + SMTP_SSL( + "faxtomail.smtp.ssl", + "Utilisation on non du mode ssl pour le stmp", + "false", Boolean.class), + DEV_MODE( "faxtomail.devMode", "Mode développement, court-circuite l'envoi de mail", @@ -126,6 +136,13 @@ File.class, true ), + + DEMO_DIRECTORY( + "faxtomail.demo.directory", + n("faxtomail.config.option.demo.directory.description"), + "${faxtomail.basedir}/demo", + File.class, + true), DATA_DIRECTORY( "faxtomail.data.directory", 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-05-27 09:00:44 UTC (rev 102) +++ trunk/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties 2014-05-27 16:37:04 UTC (rev 103) @@ -2,6 +2,7 @@ faxtomail.config.option.basedir.description= faxtomail.config.option.csv.separator.description= faxtomail.config.option.data.directory.description= +faxtomail.config.option.demo.directory.description= faxtomail.config.option.edi.directory.description= faxtomail.config.option.i18n.directory.description= faxtomail.config.option.i18n.locale.description= Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-05-27 09:00:44 UTC (rev 102) +++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-05-27 16:37:04 UTC (rev 103) @@ -52,3 +52,5 @@ # DemandType com.franciaflex.faxtomail.persistence.entities.DemandType.attribute.label.tagvalue.naturalId=true +# Client +#com.franciaflex.faxtomail.persistence.entities.Client.attribute.emailAddress.tagvalue.naturalId=true Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-service/pom.xml =================================================================== --- trunk/faxtomail-service/pom.xml 2014-05-27 09:00:44 UTC (rev 102) +++ trunk/faxtomail-service/pom.xml 2014-05-27 16:37:04 UTC (rev 103) @@ -124,6 +124,11 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> </dependency> + + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </dependency>  <dependency> 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-05-27 09:00:44 UTC (rev 102) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-05-27 16:37:04 UTC (rev 103) @@ -489,30 +489,17 @@ Email email = getEmailById(originalEmailId); - Properties properties = new Properties(); + final String smtpUser = getApplicationConfig().getSmtpUser(); + final String password = getApplicationConfig().getSmtpPassword(); + final boolean useSsl = getApplicationConfig().getSmtpUseSsl(); - try { - URL smtpPropertiesURL = ClassLoader.getSystemResource("smtp.properties"); - if (smtpPropertiesURL != null) { - properties.load(smtpPropertiesURL.openStream()); - } - } catch(Exception e) { - log.error("error getting the smtp properties", e); - } - - final String smtpUser = properties.getProperty("mail.user"); - final String password = properties.getProperty("mail.password"); - final String useSsl = properties.getProperty("mail.ssl"); - MultiPartEmail message = new MultiPartEmail(); - message.setHostName(properties.getProperty("mail.smtp.host")); - message.setSmtpPort(Integer.parseInt(properties.getProperty("mail.smtp.port"))); + message.setHostName(getApplicationConfig().getSmtpHost()); + message.setSmtpPort(getApplicationConfig().getSmtpPort()); if (StringUtils.isNotBlank(smtpUser) && password != null) { message.setAuthenticator(new DefaultAuthenticator(smtpUser, password)); } - if ("true".equalsIgnoreCase(useSsl)) { - message.setSSLOnConnect(true); - } + message.setSSLOnConnect(useSsl); message.setCharset(EmailConstants.UTF_8); message.setFrom(from); Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-05-27 09:00:44 UTC (rev 102) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-05-27 16:37:04 UTC (rev 103) @@ -52,13 +52,16 @@ import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import com.google.common.collect.Lists; import com.google.common.collect.Sets; + import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.SystemUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; import org.nuiton.jaxx.application.ApplicationTechnicalException; import java.io.File; +import java.io.FileInputStream; import java.io.InputStream; import java.util.ArrayList; import java.util.Calendar; @@ -282,8 +285,10 @@ folders.put("Jeanne", jeanneFolder); // email accounts + File demoDirectory = getApplicationConfig().getDemoDirectory(); + File emailAcountFile = new File(demoDirectory, "email_accounts.csv"); try { - InputStream emailAccountsPropertiesStream = ClassLoader.getSystemResourceAsStream("email_accounts.csv"); + InputStream emailAccountsPropertiesStream = new FileInputStream(emailAcountFile); if (emailAccountsPropertiesStream != null) { getReferentielService().importEmailAccounts(emailAccountsPropertiesStream); } @@ -293,8 +298,9 @@ } // email filters + File emailFilterFile = new File(demoDirectory, "email_filters.csv"); try { - InputStream emailFiltersPropertiesStream = ClassLoader.getSystemResourceAsStream("email_filters.csv"); + InputStream emailFiltersPropertiesStream = new FileInputStream(emailFilterFile); if (emailFiltersPropertiesStream != null) { getReferentielService().importEmailFilters(emailFiltersPropertiesStream, folders); } @@ -311,8 +317,9 @@ userGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, "Administrateurs"); // clients and emails + File clientFile = new File(demoDirectory, "fx_clients.csv"); try { - InputStream fxClientsStream = ClassLoader.getSystemResourceAsStream("fx_clients.csv"); + InputStream fxClientsStream = new FileInputStream(clientFile); if (fxClientsStream != null) { List<Client> clients = getReferentielService().importClients(fxClientsStream); Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-05-27 09:00:44 UTC (rev 102) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-05-27 16:37:04 UTC (rev 103) @@ -58,7 +58,7 @@ public MailFolder getFolderForRecipient(String recipient) { MailFilterTopiaDao filterTopiaDao = getPersistenceContext().getMailFilterDao(); - PaginationParameter tpb = PaginationParameter.of(-1, -1, MailFilter.PROPERTY_POSITION, false); + PaginationParameter tpb = PaginationParameter.of(0, -1, MailFilter.PROPERTY_POSITION, false); String query = "FROM " + MailFilter.class.getCanonicalName() + " WHERE :recipient LIKE " + MailFilter.PROPERTY_EXPRESSION; Map<String, Object> params = new HashMap<>(); Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-05-27 09:00:44 UTC (rev 102) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-05-27 16:37:04 UTC (rev 103) @@ -60,8 +60,12 @@ import com.franciaflex.faxtomail.persistence.entities.RangeTopiaDao; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import com.franciaflex.faxtomail.services.service.imports.ClientImportModel; +import com.franciaflex.faxtomail.services.service.imports.DemandTypeImportModel; import com.franciaflex.faxtomail.services.service.imports.EmailAccountImportModel; import com.franciaflex.faxtomail.services.service.imports.EmailFilterImportModel; +import com.franciaflex.faxtomail.services.service.imports.EtatAttenteImportModel; +import com.franciaflex.faxtomail.services.service.imports.PriorityImportModel; +import com.franciaflex.faxtomail.services.service.imports.RangeImportModel; import com.google.common.collect.Maps; /** @@ -164,18 +168,11 @@ EmailAccountTopiaDao dao = getPersistenceContext().getEmailAccountDao(); EmailAccountImportModel emailAccountImportModel = new EmailAccountImportModel(';'); - try { - Import<EmailAccount> importer = Import.newImport(emailAccountImportModel, inputStream); - try { - for (EmailAccount emailAccount : importer) { - result.add(dao.create(emailAccount)); - } - getPersistenceContext().commit(); - - } finally { - IOUtils.closeQuietly(importer); + try (Import<EmailAccount> importer = Import.newImport(emailAccountImportModel, inputStream)) { + for (EmailAccount emailAccount : importer) { + result.add(dao.create(emailAccount)); } - + getPersistenceContext().commit(); } catch (ImportRuntimeException e) { String message; if (e.getCause() != null) { @@ -196,18 +193,80 @@ MailFilterTopiaDao dao = getPersistenceContext().getMailFilterDao(); EmailFilterImportModel emailFilterImportModel = new EmailFilterImportModel(';', foldersByName); - try { - Import<MailFilter> importer = Import.newImport(emailFilterImportModel, inputStream); - try { - for (MailFilter emailFilter : importer) { - result.add(dao.create(emailFilter)); + try (Import<MailFilter> importer = Import.newImport(emailFilterImportModel, inputStream)) { + for (MailFilter emailFilter : importer) { + result.add(dao.create(emailFilter)); + } + getPersistenceContext().commit(); + + } catch (ImportRuntimeException e) { + String message; + if (e.getCause() != null) { + message = e.getCause().getMessage(); + } else { + message = e.getMessage(); + } + throw new ApplicationTechnicalException(message, e); + + } finally { + IOUtils.closeQuietly(inputStream); + } + return result; + } + + public List<EtatAttente> importEtatAttentes(InputStream inputStream) { + + List<EtatAttente> result = new ArrayList<>(); + EtatAttenteTopiaDao etatAttenteTopiaDao = getPersistenceContext().getEtatAttenteDao(); + + EtatAttenteImportModel importModel = new EtatAttenteImportModel(';'); + try (Import<EtatAttente> importer = Import.newImport(importModel, inputStream)) { + for (EtatAttente etatAttente : importer) { + + EtatAttente currentEtatAttente = etatAttenteTopiaDao.forLabelEquals(etatAttente.getLabel()).findAnyOrNull(); + if (currentEtatAttente == null) { + currentEtatAttente = etatAttenteTopiaDao.create(etatAttente); } - getPersistenceContext().commit(); + // else maybe update current ? + + result.add(currentEtatAttente); + } + getPersistenceContext().commit(); - } finally { - IOUtils.closeQuietly(importer); + } catch (ImportRuntimeException e) { + String message; + if (e.getCause() != null) { + message = e.getCause().getMessage(); + } else { + message = e.getMessage(); } + throw new ApplicationTechnicalException(message, e); + } finally { + IOUtils.closeQuietly(inputStream); + } + + return result; + } + + public List<Priority> importPriorities(InputStream inputStream) { + List<Priority> result = new ArrayList<>(); + PriorityTopiaDao priorityTopiaDao = getPersistenceContext().getPriorityDao(); + + PriorityImportModel importModel = new PriorityImportModel(';'); + try (Import<Priority> importer = Import.newImport(importModel, inputStream)) { + for (Priority priority : importer) { + + Priority currentPriority = priorityTopiaDao.forLabelEquals(priority.getLabel()).findAnyOrNull(); + if (currentPriority == null) { + currentPriority = priorityTopiaDao.create(priority); + } + // else maybe update current ? + + result.add(currentPriority); + } + getPersistenceContext().commit(); + } catch (ImportRuntimeException e) { String message; if (e.getCause() != null) { @@ -220,6 +279,73 @@ } finally { IOUtils.closeQuietly(inputStream); } + return result; } + + public List<Range> importRanges(InputStream inputStream) { + List<Range> result = new ArrayList<>(); + RangeTopiaDao rangeTopiaDao = getPersistenceContext().getRangeDao(); + + RangeImportModel importModel = new RangeImportModel(';'); + try (Import<Range> importer = Import.newImport(importModel, inputStream)) { + for (Range range : importer) { + + Range currentRange = rangeTopiaDao.forLabelEquals(range.getLabel()).findAnyOrNull(); + if (currentRange == null) { + currentRange = rangeTopiaDao.create(range); + } + // else maybe update current ? + + result.add(currentRange); + } + getPersistenceContext().commit(); + + } catch (ImportRuntimeException e) { + String message; + if (e.getCause() != null) { + message = e.getCause().getMessage(); + } else { + message = e.getMessage(); + } + throw new ApplicationTechnicalException(message, e); + + } finally { + IOUtils.closeQuietly(inputStream); + } + return result; + } + + public List<DemandType> importDemandTypes(InputStream inputStream) { + List<DemandType> result = new ArrayList<>(); + DemandTypeTopiaDao demandTypeTopiaDao = getPersistenceContext().getDemandTypeDao(); + + DemandTypeImportModel importModel = new DemandTypeImportModel(';'); + try (Import<DemandType> importer = Import.newImport(importModel, inputStream)) { + for (DemandType demandType : importer) { + + DemandType currentDemandType = demandTypeTopiaDao.forLabelEquals(demandType.getLabel()).findAnyOrNull(); + if (currentDemandType == null) { + currentDemandType = demandTypeTopiaDao.create(demandType); + } + // else maybe update current ? + + result.add(currentDemandType); + } + getPersistenceContext().commit(); + + } catch (ImportRuntimeException e) { + String message; + if (e.getCause() != null) { + message = e.getCause().getMessage(); + } else { + message = e.getMessage(); + } + throw new ApplicationTechnicalException(message, e); + + } finally { + IOUtils.closeQuietly(inputStream); + } + return result; + } } Added: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/DemandTypeImportModel.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/DemandTypeImportModel.java (rev 0) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/DemandTypeImportModel.java 2014-05-27 16:37:04 UTC (rev 103) @@ -0,0 +1,47 @@ +package com.franciaflex.faxtomail.services.service.imports; + +/* + * #%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 org.nuiton.csv.ext.AbstractImportModel; + +import com.franciaflex.faxtomail.persistence.entities.DemandType; +import com.franciaflex.faxtomail.persistence.entities.DemandTypeImpl; + +/** + * Modèle d'import des etat d'attente. + */ +public class DemandTypeImportModel extends AbstractImportModel<DemandType> { + + public DemandTypeImportModel(char separator) { + super(separator); + + newMandatoryColumn("demandetype", DemandType.PROPERTY_LABEL); + } + + @Override + public DemandType newEmptyInstance() { + return new DemandTypeImpl(); + } +} Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/DemandTypeImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailAccountImportModel.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailAccountImportModel.java 2014-05-27 09:00:44 UTC (rev 102) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailAccountImportModel.java 2014-05-27 16:37:04 UTC (rev 103) @@ -26,11 +26,8 @@ import com.franciaflex.faxtomail.persistence.entities.EmailAccount; import com.franciaflex.faxtomail.persistence.entities.EmailAccountImpl; -import org.nuiton.csv.ValueParser; import org.nuiton.csv.ext.AbstractImportModel; -import java.text.ParseException; - /** * @author Kevin Morin (Code Lutin) * @since x.x Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailFilterImportModel.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailFilterImportModel.java 2014-05-27 09:00:44 UTC (rev 102) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailFilterImportModel.java 2014-05-27 16:37:04 UTC (rev 103) @@ -24,8 +24,6 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.EmailAccount; -import com.franciaflex.faxtomail.persistence.entities.EmailAccountImpl; import com.franciaflex.faxtomail.persistence.entities.MailFilter; import com.franciaflex.faxtomail.persistence.entities.MailFilterImpl; import com.franciaflex.faxtomail.persistence.entities.MailFolder; Added: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EtatAttenteImportModel.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EtatAttenteImportModel.java (rev 0) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EtatAttenteImportModel.java 2014-05-27 16:37:04 UTC (rev 103) @@ -0,0 +1,47 @@ +package com.franciaflex.faxtomail.services.service.imports; + +/* + * #%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 org.nuiton.csv.ext.AbstractImportModel; + +import com.franciaflex.faxtomail.persistence.entities.EtatAttente; +import com.franciaflex.faxtomail.persistence.entities.EtatAttenteImpl; + +/** + * Modèle d'import des etat d'attente. + */ +public class EtatAttenteImportModel extends AbstractImportModel<EtatAttente> { + + public EtatAttenteImportModel(char separator) { + super(separator); + + newMandatoryColumn("etatattente", EtatAttente.PROPERTY_LABEL); + } + + @Override + public EtatAttente newEmptyInstance() { + return new EtatAttenteImpl(); + } +} Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EtatAttenteImportModel.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/PriorityImportModel.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/PriorityImportModel.java (rev 0) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/PriorityImportModel.java 2014-05-27 16:37:04 UTC (rev 103) @@ -0,0 +1,47 @@ +package com.franciaflex.faxtomail.services.service.imports; + +/* + * #%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 org.nuiton.csv.ext.AbstractImportModel; + +import com.franciaflex.faxtomail.persistence.entities.Priority; +import com.franciaflex.faxtomail.persistence.entities.PriorityImpl; + +/** + * Modèle d'import des etat d'attente. + */ +public class PriorityImportModel extends AbstractImportModel<Priority> { + + public PriorityImportModel(char separator) { + super(separator); + + newMandatoryColumn("priorite", Priority.PROPERTY_LABEL); + } + + @Override + public Priority newEmptyInstance() { + return new PriorityImpl(); + } +} Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/PriorityImportModel.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/RangeImportModel.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/RangeImportModel.java (rev 0) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/RangeImportModel.java 2014-05-27 16:37:04 UTC (rev 103) @@ -0,0 +1,47 @@ +package com.franciaflex.faxtomail.services.service.imports; + +/* + * #%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 org.nuiton.csv.ext.AbstractImportModel; + +import com.franciaflex.faxtomail.persistence.entities.Range; +import com.franciaflex.faxtomail.persistence.entities.RangeImpl; + +/** + * Modèle d'import des etat d'attente. + */ +public class RangeImportModel extends AbstractImportModel<Range> { + + public RangeImportModel(char separator) { + super(separator); + + newMandatoryColumn("gamme", Range.PROPERTY_LABEL); + } + + @Override + public Range newEmptyInstance() { + return new RangeImpl(); + } +} Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/RangeImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java 2014-05-27 09:00:44 UTC (rev 102) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java 2014-05-27 16:37:04 UTC (rev 103) @@ -29,6 +29,8 @@ import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; import com.franciaflex.faxtomail.services.FaxToMailService; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; + +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.SystemUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -58,6 +60,8 @@ protected List<FaxToMailTopiaPersistenceContext> openedTransactions = new LinkedList<>(); + protected File databaseFile; + protected FaxToMailTopiaApplicationContext newApplicationContext(String dataBase) { Map<String, String> hibernateH2Config = new HashMap<String, String>(); @@ -71,7 +75,7 @@ File tempDirFile = SystemUtils.getJavaIoTmpDir(); - File databaseFile = new File(tempDirFile, dataBase); + databaseFile = new File(tempDirFile, dataBase); // Set test data in MSSQLServer mode (like production database) String h2dataPath = databaseFile.getAbsolutePath() + File.separator + "h2data-test;MODE=MSSQLServer"; @@ -102,7 +106,7 @@ return false; } - protected FaxToMailTopiaApplicationContext getApplicationContext () { + protected FaxToMailTopiaApplicationContext getApplicationContext() { String databaseName = UUID.randomUUID().toString(); @@ -214,7 +218,7 @@ } @After - public void tearDown() { + public void tearDown() throws IOException { for (FaxToMailTopiaPersistenceContext openedTransaction : openedTransactions) { @@ -236,6 +240,8 @@ } + // clear full directory + FileUtils.deleteDirectory(databaseFile); } protected static FaxToMailConfiguration getApplicationConfig() { Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java 2014-05-27 09:00:44 UTC (rev 102) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java 2014-05-27 16:37:04 UTC (rev 103) @@ -24,12 +24,10 @@ * #L% */ -import java.util.ArrayList; +import java.io.IOException; import java.util.Collections; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -45,8 +43,6 @@ */ public class EmailServiceTest extends AbstractFaxToMailServiceTest { - private static final Log log = LogFactory.getLog(MailFolderServiceTest.class); - protected EmailService service; protected ReferentielService referentielService; @@ -54,12 +50,11 @@ protected UserService userService; @Before - public void setUp() { + public void setUp() throws IOException { service = newService(EmailService.class); referentielService = newService(ReferentielService.class); userService = newService(UserService.class); - log.info("init sample data"); - newService(InitFaxToMailService.class).initSampleData(); + newService(InitTestData.class).initTestData(); } @Test @@ -68,17 +63,17 @@ // empty filter EmailFilter filter = new EmailFilter(); List<Email> emails = service.search(filter); - Assert.assertEquals(116, emails.size()); + Assert.assertEquals(10, emails.size()); // client code filter - filter.setClientCode("23"); + filter.setClientCode("9915"); emails = service.search(filter); - Assert.assertEquals(18, emails.size()); + Assert.assertEquals(10, emails.size()); // client code filter + subject filter - filter.setDemandObject("ARENO"); + filter.setDemandObject("A+"); emails = service.search(filter); - Assert.assertEquals(2, emails.size()); + Assert.assertEquals(0, emails.size()); // some other fields just to test query syntax filter.setMinReceptionDate(getServiceContext().getNow()); @@ -102,7 +97,6 @@ filter.setDemandStatus(Collections.singletonList(DemandStatus.ARCHIVED)); filter.setGamme(Collections.singletonList(referentielService.getAllRange().get(0))); filter.setPriority(referentielService.getAllPriority()); -// filter.setCommandNumber("test"); filter.setEtatAttente(Collections.singletonList(referentielService.getAllEtatAttente().get(0))); filter.setEdiCodeNumber("test"); filter.setLocalReference("test"); Added: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java (rev 0) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java 2014-05-27 16:37:04 UTC (rev 103) @@ -0,0 +1,291 @@ +package com.franciaflex.faxtomail.services.service; + +/* + * #%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 static org.nuiton.i18n.I18n.t; + +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.decorator.Decorator; + +import com.franciaflex.faxtomail.persistence.entities.Client; +import com.franciaflex.faxtomail.persistence.entities.DemandStatus; +import com.franciaflex.faxtomail.persistence.entities.DemandType; +import com.franciaflex.faxtomail.persistence.entities.Email; +import com.franciaflex.faxtomail.persistence.entities.EmailTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.EtatAttente; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.History; +import com.franciaflex.faxtomail.persistence.entities.HistoryTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.HistoryType; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.MailFolderTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.Priority; +import com.franciaflex.faxtomail.persistence.entities.Range; +import com.franciaflex.faxtomail.persistence.entities.RangeRow; +import com.franciaflex.faxtomail.persistence.entities.RangeRowTopiaDao; +import com.franciaflex.faxtomail.services.DecoratorService; +import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; + +/** + * Test service to manage test data. + * + * @author Eric Chatellier + */ +public class InitTestData extends FaxToMailServiceSupport { + + private static final Log log = LogFactory.getLog(InitTestData.class); + + /** + * Import all test data. + * + * @throws IOException + */ + public void initTestData() throws IOException { + if (log.isDebugEnabled()) { + log.debug("Init test data"); + } + ReferentielService referentielService = newService(ReferentielService.class); + + // import etat attentes + List<EtatAttente> etatAttentes = null; + try (InputStream is = InitTestData.class.getResourceAsStream("/csv/etatattentes.csv")) { + etatAttentes = referentielService.importEtatAttentes(is); + } + + // create folders + MailFolderTopiaDao folderDao = getPersistenceContext().getMailFolderDao(); + Map<String, MailFolder> foldersByName = new HashMap<>(); + MailFolder franciaflex = folderDao.create(MailFolder.PROPERTY_NAME, "Franciaflex"); + + // categories + MailFolder chargesClientelle = folderDao.create(MailFolder.PROPERTY_NAME, "Chargés de clientèle", + MailFolder.PROPERTY_PARENT, franciaflex, + MailFolder.PROPERTY_REPLY_ADDRESSES, Lists.newArrayList("no-reply(a)franciaflex.com")); + franciaflex.addChildren(chargesClientelle); + foldersByName.put(chargesClientelle.getName(), chargesClientelle); + + MailFolder sav = folderDao.create(MailFolder.PROPERTY_NAME, "SAV", + MailFolder.PROPERTY_PARENT, franciaflex, + MailFolder.PROPERTY_ETAT_ATTENTE, etatAttentes.subList(0, 1)); + franciaflex.addChildren(sav); + foldersByName.put(sav.getName(), sav); + + // user folders + MailFolder cyrilFolder = folderDao.create(MailFolder.PROPERTY_NAME, "Cyril", + MailFolder.PROPERTY_PARENT, chargesClientelle, + MailFolder.PROPERTY_ETAT_ATTENTE, etatAttentes.subList(1, 2)); + chargesClientelle.addChildren(cyrilFolder); + foldersByName.put(cyrilFolder.getName(), cyrilFolder); + + MailFolder claireFolder = folderDao.create(MailFolder.PROPERTY_NAME, "Claire", + MailFolder.PROPERTY_PARENT, chargesClientelle); + chargesClientelle.addChildren(claireFolder); + foldersByName.put(claireFolder.getName(), claireFolder); + + MailFolder agatheFolder = folderDao.create(MailFolder.PROPERTY_NAME, "Agathe", + MailFolder.PROPERTY_PARENT, chargesClientelle, + MailFolder.PROPERTY_ETAT_ATTENTE, etatAttentes.subList(2, 3)); + chargesClientelle.addChildren(agatheFolder); + foldersByName.put(agatheFolder.getName(), agatheFolder); + + MailFolder marcFolder = folderDao.create(MailFolder.PROPERTY_NAME, "Marc", + MailFolder.PROPERTY_PARENT, sav); + sav.addChildren(marcFolder); + foldersByName.put(marcFolder.getName(), marcFolder); + + MailFolder fredericFolder = folderDao.create(MailFolder.PROPERTY_NAME, "Frédéric", + MailFolder.PROPERTY_PARENT, sav); + sav.addChildren(fredericFolder); + foldersByName.put(fredericFolder.getName(), fredericFolder); + + MailFolder jeanneFolder = folderDao.create(MailFolder.PROPERTY_NAME, "Jeanne", + MailFolder.PROPERTY_PARENT, sav); + sav.addChildren(jeanneFolder); + foldersByName.put(jeanneFolder.getName(), jeanneFolder); + + // create test users + FaxToMailUserTopiaDao userDao = getPersistenceContext().getFaxToMailUserDao(); + FaxToMailUser marc = userDao.create(FaxToMailUser.PROPERTY_LAST_NAME, "Lefèbvre", + FaxToMailUser.PROPERTY_FIRST_NAME, "Marc", + FaxToMailUser.PROPERTY_LOGIN, "mlefebvre", + FaxToMailUser.PROPERTY_TRIGRAPH, "MLE"); + FaxToMailUser cyril = userDao.create(FaxToMailUser.PROPERTY_LAST_NAME, "Baillet", + FaxToMailUser.PROPERTY_FIRST_NAME, "Cyril", + FaxToMailUser.PROPERTY_LOGIN, "cbaillet", + FaxToMailUser.PROPERTY_TRIGRAPH, "CBA"); + FaxToMailUser frederic = userDao.create(FaxToMailUser.PROPERTY_LAST_NAME, "Viala", + FaxToMailUser.PROPERTY_FIRST_NAME, "Frédéric", + FaxToMailUser.PROPERTY_LOGIN, "fviala", + FaxToMailUser.PROPERTY_TRIGRAPH, "FVI"); + FaxToMailUser claire = userDao.create(FaxToMailUser.PROPERTY_LAST_NAME, "Marquis", + FaxToMailUser.PROPERTY_FIRST_NAME, "Claire", + FaxToMailUser.PROPERTY_LOGIN, "cmarquis", + FaxToMailUser.PROPERTY_TRIGRAPH, "CMA"); + FaxToMailUser agathe = userDao.create(FaxToMailUser.PROPERTY_LAST_NAME, "Borde", + FaxToMailUser.PROPERTY_FIRST_NAME, "Agathe", + FaxToMailUser.PROPERTY_LOGIN, "aborde", + FaxToMailUser.PROPERTY_TRIGRAPH, "ABO"); + FaxToMailUser jeanne = userDao.create(FaxToMailUser.PROPERTY_LAST_NAME, "Bourgoin", + FaxToMailUser.PROPERTY_FIRST_NAME, "Jeanne", + FaxToMailUser.PROPERTY_LOGIN, "jbourgoin", + FaxToMailUser.PROPERTY_TRIGRAPH, "JBO"); + + // import test csv + List<Range> ranges = null; + try (InputStream is = InitTestData.class.getResourceAsStream("/csv/ranges.csv")) { + ranges = referentielService.importRanges(is); + } + List<Priority> priorities = null; + try (InputStream is = InitTestData.class.getResourceAsStream("/csv/priorities.csv")) { + priorities = referentielService.importPriorities(is); + } + try (InputStream is = InitTestData.class.getResourceAsStream("/csv/email_accounts.csv")) { + referentielService.importEmailAccounts(is); + } + List<Client> clients = null; + try (InputStream is = InitTestData.class.getResourceAsStream("/csv/clients.csv")) { + clients = referentielService.importClients(is); + } + List<DemandType> types = null; + try (InputStream is = InitTestData.class.getResourceAsStream("/csv/demandtypes.csv")) { + types = referentielService.importDemandTypes(is); + } + try (InputStream is = InitTestData.class.getResourceAsStream("/csv/email_filters.csv")) { + referentielService.importEmailFilters(is, foldersByName); + } + + // create test mail + HistoryTopiaDao historyDao = getPersistenceContext().getHistoryDao(); + RangeRowTopiaDao rangeRowDao = getPersistenceContext().getRangeRowDao(); + EmailTopiaDao emailDao = getPersistenceContext().getEmailDao(); + createEmails(historyDao, rangeRowDao, emailDao, ranges, clients, types, priorities, cyrilFolder, cyril); + } + + protected void createEmails(HistoryTopiaDao historyDao, RangeRowTopiaDao rangeRowDao, EmailTopiaDao emailDao, List<Range> ranges, + List<Client> clients, List<DemandType> types, List<Priority> priorities, MailFolder folder, FaxToMailUser user) + throws InvalidClientException { + for (int i = 0; i < 5; i++) { + createEmail(historyDao, rangeRowDao, emailDao, ranges, clients, types, priorities, folder, user); + } + } + + protected void createEmail(HistoryTopiaDao historyDao, RangeRowTopiaDao rangeRowDao, EmailTopiaDao emailDao, List<Range> ranges, + List<Client> clients, List<DemandType> types, List<Priority> priorities, MailFolder folder, FaxToMailUser user) + throws InvalidClientException { + + List<RangeRow> rangeRows = new ArrayList<>(); + + Client client = clients.get(0); + String sender = client.getEmailAddress(); + boolean fax = false; + if (sender == null && client.getFaxNumber() != null) { + sender = client.getFaxNumber(); + fax = true; + } + + boolean opened = true; //random.nextBoolean(); + + Decorator<Date> dateDecorator = getDecoratorService().getDecoratorByType(Date.class, DecoratorService.DATE); + + Date now = new Date(); + History history = historyDao.create(History.PROPERTY_TYPE, HistoryType.CREATION, History.PROPERTY_FIELDS, Sets.newHashSet( + Email.PROPERTY_SENDER, Email.PROPERTY_CLIENT, Email.PROPERTY_PROJECT_REFERENCE, Email.PROPERTY_OBJECT, Email.PROPERTY_RECEPTION_DATE, + Email.PROPERTY_MAIL_FOLDER, Email.PROPERTY_DEMAND_STATUS), History.PROPERTY_MODIFICATION_DATE, now); + String projectRef = t("faxtomail.email.projectReference.default", dateDecorator.toString(now)); + + Email email = emailDao.create(Email.PROPERTY_SENDER, sender, Email.PROPERTY_FAX, fax, Email.PROPERTY_CLIENT, client, + Email.PROPERTY_PROJECT_REFERENCE, projectRef, Email.PROPERTY_OBJECT, client.getCaracteristic1() + " / " + client.getCode() + " / " + + client.getName() + " / " + client.getFaxNumber() + " / " + dateDecorator.toString(now), Email.PROPERTY_RECEPTION_DATE, now, + Email.PROPERTY_MAIL_FOLDER, folder, Email.PROPERTY_DEMAND_STATUS, opened ? DemandStatus.IN_PROGRESS : DemandStatus.UNTREATED, + Email.PROPERTY_HISTORY, Lists.newArrayList(history)); + + if (opened) { + + getEmailService().addToHistory(email.getTopiaId(), HistoryType.OPENING, user, now); + DemandType demandType = types.get(0); + if (demandType.getRangeNeeded()) { + for (int j = 0; j < 4; j++) { + RangeRow rangeRow = rangeRowDao.create(RangeRow.PROPERTY_RANGE, ranges.get(j), + RangeRow.PROPERTY_COMMAND_NUMBER, RandomStringUtils.randomNumeric(6), RangeRow.PROPERTY_PRODUCT_QUANTITY, + 50, RangeRow.PROPERTY_SAV_QUANTITY, 60); + rangeRows.add(rangeRow); + } + email.setRangeRow(rangeRows); + } + + email.setDemandType(demandType); + email.setPriority(priorities.get(0)); + email.setRangeRow(rangeRows); + getEmailService().saveEmail(email, user, Email.PROPERTY_DEMAND_TYPE, Email.PROPERTY_PRIORITY, Email.PROPERTY_RANGE_ROW); + } + + Calendar cal = Calendar.getInstance(); + cal.add(Calendar.DAY_OF_MONTH, -1); + Date yesterday = cal.getTime(); + history = historyDao.create(History.PROPERTY_TYPE, HistoryType.CREATION, History.PROPERTY_FIELDS, Sets.newHashSet(Email.PROPERTY_SENDER, + Email.PROPERTY_CLIENT, Email.PROPERTY_PROJECT_REFERENCE, Email.PROPERTY_OBJECT, Email.PROPERTY_RECEPTION_DATE, + Email.PROPERTY_MAIL_FOLDER, Email.PROPERTY_DEMAND_STATUS), History.PROPERTY_MODIFICATION_DATE, yesterday); + projectRef = t("faxtomail.email.projectReference.default", dateDecorator.toString(yesterday)); + + email = emailDao.create(Email.PROPERTY_SENDER, sender, Email.PROPERTY_FAX, fax, Email.PROPERTY_CLIENT, client, + Email.PROPERTY_PROJECT_REFERENCE, projectRef, Email.PROPERTY_OBJECT, client.getCaracteristic1() + " / " + client.getCode() + " / " + + client.getName() + " / " + client.getFaxNumber() + " / " + dateDecorator.toString(yesterday), + Email.PROPERTY_RECEPTION_DATE, yesterday, Email.PROPERTY_MAIL_FOLDER, folder, Email.PROPERTY_DEMAND_STATUS, + opened ? DemandStatus.IN_PROGRESS : DemandStatus.UNTREATED, Email.PROPERTY_HISTORY, Lists.newArrayList(history)); + + if (opened) { + getEmailService().addToHistory(email.getTopiaId(), HistoryType.OPENING, user, now); + DemandType demandType = types.get(0); + if (demandType.getRangeNeeded()) { + for (int j = 0; j < 4; j++) { + RangeRow rangeRow = rangeRowDao.create(RangeRow.PROPERTY_RANGE, ranges.get(j), + RangeRow.PROPERTY_COMMAND_NUMBER, RandomStringUtils.randomNumeric(6), RangeRow.PROPERTY_PRODUCT_QUANTITY, + 50, RangeRow.PROPERTY_SAV_QUANTITY, 60); + rangeRows.add(rangeRow); + } + email.setRangeRow(rangeRows); + } + email.setDemandType(demandType); + email.setPriority(priorities.get(0)); + email.setRangeRow(rangeRows); + getEmailService().saveEmail(email, null, email.getClient().getCode(), user, Email.PROPERTY_DEMAND_TYPE, Email.PROPERTY_PRIORITY, + Email.PROPERTY_RANGE_ROW); + } + } +} Property changes on: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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-05-27 09:00:44 UTC (rev 102) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java 2014-05-27 16:37:04 UTC (rev 103) @@ -24,7 +24,10 @@ * #L% */ +import java.io.IOException; + import com.franciaflex.faxtomail.persistence.entities.MailFolder; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -42,10 +45,9 @@ protected MailFolderService service; @Before - public void setUp() { + public void setUp() throws IOException { service = newService(MailFolderService.class); - log.info("init sample data"); - newService(InitFaxToMailService.class).initSampleData(); + newService(InitTestData.class).initTestData(); } @Test Added: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ReferentielServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ReferentielServiceTest.java (rev 0) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ReferentielServiceTest.java 2014-05-27 16:37:04 UTC (rev 103) @@ -0,0 +1,29 @@ +package com.franciaflex.faxtomail.services.service; + +/* + * #%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% + */ + +public class ReferentielServiceTest extends AbstractFaxToMailServiceTest { + +} Property changes on: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ReferentielServiceTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/faxtomail-service/src/test/resources/csv/clients.csv =================================================================== --- trunk/faxtomail-service/src/test/resources/csv/clients.csv (rev 0) +++ trunk/faxtomail-service/src/test/resources/csv/clients.csv 2014-05-27 16:37:04 UTC (rev 103) @@ -0,0 +1,5 @@ +Id_Correspondance;Societe;Nom;Caracteristique1;Caracteristique2;Caracteristique3;Client_Top;Numero_Fax;Adresse_Mail;Code_Client;Objet_Message;Destination +253042;FX;John Doe;A;71 Allo;NULL;NULL;03 12 34 56 78;john(a)doe.fr;99153;NULL; +253142;FX;Gerard Menvussa;A+;40 Nabi;NULL;NULL;05 12 23 34 45;gerard.menvussa(a)code.com;99154;NULL; +253242;FX;Ella Elli;NULL;38 LA;NULL;NULL;04 98 87 76 65;NULL;99184;NULL; + Added: trunk/faxtomail-service/src/test/resources/csv/demandtypes.csv =================================================================== --- trunk/faxtomail-service/src/test/resources/csv/demandtypes.csv (rev 0) +++ trunk/faxtomail-service/src/test/resources/csv/demandtypes.csv 2014-05-27 16:37:04 UTC (rev 103) @@ -0,0 +1,4 @@ +demandetype +Devis +Commande +Retour \ No newline at end of file Added: trunk/faxtomail-service/src/test/resources/csv/email_accounts.csv =================================================================== --- trunk/faxtomail-service/src/test/resources/csv/email_accounts.csv (rev 0) +++ trunk/faxtomail-service/src/test/resources/csv/email_accounts.csv 2014-05-27 16:37:04 UTC (rev 103) @@ -0,0 +1,2 @@ +protocol;host;user;password +pop3;test.franciaflex.fr;testuser;password Added: trunk/faxtomail-service/src/test/resources/csv/email_filters.csv =================================================================== --- trunk/faxtomail-service/src/test/resources/csv/email_filters.csv (rev 0) +++ trunk/faxtomail-service/src/test/resources/csv/email_filters.csv 2014-05-27 16:37:04 UTC (rev 103) @@ -0,0 +1,8 @@ +recipient;folder;position +fx.01test(a)franciaflex.com;Cyril;0 +fx.02test(a)franciaflex.com;Agathe;1 +fx.03test(a)franciaflex.com;Claire;2 +fx.adv%(a)franciaflex.com;Cyril;3 +fx.savFFEtest(a)franciaflex.com;Marc;4 +fx.savFMEtest(a)franciaflex.com;Jeanne;5 +fx.sav%(a)franciaflex.xn--com;frdric;6-gebb \ No newline at end of file Added: trunk/faxtomail-service/src/test/resources/csv/etatattentes.csv =================================================================== --- trunk/faxtomail-service/src/test/resources/csv/etatattentes.csv (rev 0) +++ trunk/faxtomail-service/src/test/resources/csv/etatattentes.csv 2014-05-27 16:37:04 UTC (rev 103) @@ -0,0 +1,6 @@ +etatattente +Non traité +Pris +En cours +Transmit +Terminé Added: trunk/faxtomail-service/src/test/resources/csv/priorities.csv =================================================================== --- trunk/faxtomail-service/src/test/resources/csv/priorities.csv (rev 0) +++ trunk/faxtomail-service/src/test/resources/csv/priorities.csv 2014-05-27 16:37:04 UTC (rev 103) @@ -0,0 +1,5 @@ +priorite +Bas +Normal +Haut +Urgent Added: trunk/faxtomail-service/src/test/resources/csv/ranges.csv =================================================================== --- trunk/faxtomail-service/src/test/resources/csv/ranges.csv (rev 0) +++ trunk/faxtomail-service/src/test/resources/csv/ranges.csv 2014-05-27 16:37:04 UTC (rev 103) @@ -0,0 +1,6 @@ +gamme +Bas de gamme +Normal de gamme +Haut de gamme +Très haut de gamme +C'est de la gamme Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-05-27 09:00:44 UTC (rev 102) +++ trunk/faxtomail-ui-web/pom.xml 2014-05-27 16:37:04 UTC (rev 103) @@ -100,11 +100,6 @@ </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - - <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> @@ -120,11 +115,6 @@ </dependency> <dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-struts2</artifactId> - </dependency> - - <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> </dependency> @@ -197,6 +187,11 @@ <artifactId>h2</artifactId> <scope>runtime</scope> </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> <dependency> <groupId>org.quartz-scheduler</groupId> Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/HibernateProxyTypeAdapter.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/HibernateProxyTypeAdapter.java 2014-05-27 09:00:44 UTC (rev 102) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/HibernateProxyTypeAdapter.java 2014-05-27 16:37:04 UTC (rev 103) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.web.json; +/* + * #%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 java.io.IOException; import org.hibernate.Hibernate; Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/TopiaEntityAdapter.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/TopiaEntityAdapter.java 2014-05-27 09:00:44 UTC (rev 102) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/TopiaEntityAdapter.java 2014-05-27 16:37:04 UTC (rev 103) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.web.json; +/* + * #%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 java.lang.reflect.Type; import org.nuiton.topia.persistence.TopiaEntity; 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-05-27 09:00:44 UTC (rev 102) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-05-27 16:37:04 UTC (rev 103) @@ -268,7 +268,8 @@ <div id="collapse3" class="panel-collapse collapse"> <div class="panel-body"> <label class="checkbox" ng-repeat="etatAttente in etatAttentes"> - <input type="checkbox"> {{etatAttente.label}} + <input type="checkbox" ng-checked="selectedMailFolder.etatAttente.indexOf(etatAttente) != -1" + ng-click="changeFolderEtatAttente(etatAttente)"> {{etatAttente.label}} </label> </div> </div> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-05-27 09:00:44 UTC (rev 102) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-05-27 16:37:04 UTC (rev 103) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /** * Global configuration controller. @@ -191,7 +214,17 @@ $scope.removeReplyAddress = function(index) { $scope.selectedMailFolder.replyAddresses.splice(index, 1); }; - + + // selection/deselection d'un état d'attente possible pour ce dossier + $scope.changeFolderEtatAttente = function(etatAttente) { + var index = $scope.selectedMailFolder.etatAttente.indexOf(etatAttente); + if (index != -1) { + $scope.selectedMailFolder.etatAttente.splice(index, 1); + } else { + $scope.selectedMailFolder.etatAttente.push(etatAttente); + } + }; + // selection/deselection d'une action possible du menu contextuel pour ce dossier $scope.changeFolderAction = function(etatAttenteAction) { var index = $scope.selectedMailFolder.folderActions.indexOf(etatAttenteAction); @@ -280,4 +313,4 @@ function($scope, $http, ConfigurationData) { // {Array} Liste des groupes ldap $scope.ldapGroups = ["Group1", "Group2", "Group3", "Group4", "Group5"]; -}]); \ No newline at end of file +}]); Modified: trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js 2014-05-27 09:00:44 UTC (rev 102) +++ trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js 2014-05-27 16:37:04 UTC (rev 103) @@ -1,2 +1,25 @@ +/* + * #%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% + */ var FaxToMailModule = angular.module('FaxToMail', []);

1 0

Build failed in Jenkins: faxtomail-ci » FaxToMail :: UI #76
by admin+ci-codelutin.com＠codelutin.com 27 May '14

27 May '14

1 4

r102 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by echatellier＠users.forge.codelutin.com 27 May '14

27 May '14

Author: echatellier Date: 2014-05-27 11:00:44 +0200 (Tue, 27 May 2014) New Revision: 102 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/102 Log: Fix ui and test data Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-05-26 21:04:50 UTC (rev 101) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-05-27 09:00:44 UTC (rev 102) @@ -26,13 +26,10 @@ import com.franciaflex.faxtomail.FaxToMailConfiguration; import com.franciaflex.faxtomail.persistence.entities.Client; -import com.franciaflex.faxtomail.persistence.entities.Configuration; -import com.franciaflex.faxtomail.persistence.entities.ConfigurationTopiaDao; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.DemandType; import com.franciaflex.faxtomail.persistence.entities.DemandTypeTopiaDao; import com.franciaflex.faxtomail.persistence.entities.Email; -import com.franciaflex.faxtomail.persistence.entities.EmailAccount; import com.franciaflex.faxtomail.persistence.entities.EmailTopiaDao; import com.franciaflex.faxtomail.persistence.entities.EtatAttente; import com.franciaflex.faxtomail.persistence.entities.EtatAttenteTopiaDao; @@ -43,7 +40,6 @@ import com.franciaflex.faxtomail.persistence.entities.History; import com.franciaflex.faxtomail.persistence.entities.HistoryTopiaDao; import com.franciaflex.faxtomail.persistence.entities.HistoryType; -import com.franciaflex.faxtomail.persistence.entities.MailFilter; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.MailFolderTopiaDao; import com.franciaflex.faxtomail.persistence.entities.Priority; @@ -64,7 +60,6 @@ import java.io.File; import java.io.InputStream; -import java.net.URL; import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; @@ -241,12 +236,14 @@ MailFolder chargesClientelle = folderDao.create(MailFolder.PROPERTY_NAME, "Chargés de clientèle", MailFolder.PROPERTY_PARENT, franciaflex, MailFolder.PROPERTY_REPLY_ADDRESSES, Lists.newArrayList("no-reply(a)franciaflex.com")); + franciaflex.addChildren(chargesClientelle); folders.put("Chargés de clientèle", chargesClientelle); Collections.shuffle(etatAttentes); MailFolder sav = folderDao.create(MailFolder.PROPERTY_NAME, "SAV", MailFolder.PROPERTY_PARENT, franciaflex, MailFolder.PROPERTY_ETAT_ATTENTE, etatAttentes.subList(0, random.nextInt(etatAttenteSize - 8) + 2)); + franciaflex.addChildren(sav); folders.put("SAV", sav); // user folders Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-05-26 21:04:50 UTC (rev 101) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-05-27 09:00:44 UTC (rev 102) @@ -45,7 +45,10 @@ import com.franciaflex.faxtomail.ui.swing.util.FolderTreeNode; import com.google.common.base.Function; import com.google.common.collect.Collections2; + import jaxx.runtime.validator.swing.SwingValidator; + +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -286,7 +289,7 @@ @Override protected Collection<String> getColumns() { MailFolder selectedFolder = getModel().getSelectedFolder(); - return selectedFolder == null ? null : + return selectedFolder == null || selectedFolder.getFolderTableColumns() == null ? null : Collections2.transform(selectedFolder.getFolderTableColumns(), new Function<Field, String>() { @Override public String apply(Field field) {

1 0

r101 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-persistence/src/main/resources/i18n faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service 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/reply
by kmorin＠users.forge.codelutin.com 26 May '14

26 May '14

Author: kmorin Date: 2014-05-26 23:04:50 +0200 (Mon, 26 May 2014) New Revision: 101 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/101 Log: - on ne transmet qu'une fois ?\195?\160 l'EDI (m?\195?\170me s'il y a une erreur) - on donne le nom du fichier aux fichiers temporaires - l'?\195?\169l?\195?\169ment n'est en lecture seule que pendant la transmission ?\195?\160 l'EDI. Autrement tout est ?\195?\169ditable. Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/HistoryType.java trunk/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java 2014-05-26 16:18:45 UTC (rev 100) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java 2014-05-26 21:04:50 UTC (rev 101) @@ -30,9 +30,11 @@ import java.io.IOException; import java.io.InputStream; +import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.FileUtil; public class AttachmentFileImpl extends AttachmentFileAbstract { @@ -46,10 +48,24 @@ if (tmpLocalFile == null && getContent() != null) { try { // create temp file - tmpLocalFile = File.createTempFile("faxtomail-", ".tmp"); + File tempFolder = new File(FileUtils.getTempDirectory(), "faxtomail"); + tempFolder.mkdir(); + + String fileName = getFilename(); + tmpLocalFile = new File(tempFolder, fileName); + + // if the file already exists, then add a number to the name + int i = 1; + String extension = "." + FileUtil.extension(fileName); + String name = FileUtil.basename(extension); + while (tmpLocalFile.exists()) { + tmpLocalFile = new File(tempFolder, name + "-" + i + extension); + } + if (log.isDebugEnabled()) { log.debug(String.format("Copy blob content to file : %s", tmpLocalFile.getAbsolutePath())); } + tmpLocalFile.deleteOnExit(); // copy blob content Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/HistoryType.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/HistoryType.java 2014-05-26 16:18:45 UTC (rev 100) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/HistoryType.java 2014-05-26 21:04:50 UTC (rev 101) @@ -36,6 +36,7 @@ CREATION(n("faxtomail.historyType.creation"), true), OPENING(n("faxtomail.historyType.opening"), false), MODIFICATION(n("faxtomail.historyType.modification"), true), + TRANSMISSION_TO_EDI(n("faxtomail.historyType.transmissionToEdi"), true), TRANSMISSION(n("faxtomail.historyType.transmission"), true), REPLY(n("faxtomail.historyType.reply"), false), PRINTING(n("faxtomail.historyType.printing"), false), 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-05-26 16:18:45 UTC (rev 100) +++ trunk/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties 2014-05-26 21:04:50 UTC (rev 101) @@ -37,6 +37,7 @@ faxtomail.historyType.printing=Impression faxtomail.historyType.reply=Réponse faxtomail.historyType.transmission=Transmission +faxtomail.historyType.transmissionToEdi=Transmission à l'EDI faxtomail.persistence.loader.error= faxtomail.persistence.mkDir.error= faxtomail.service.config.deleteTempDirectory.error= 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-05-26 16:18:45 UTC (rev 100) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-05-26 21:04:50 UTC (rev 101) @@ -49,6 +49,7 @@ import javax.mail.MessagingException; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.Predicate; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; @@ -200,12 +201,22 @@ Set<String> fieldSet = Sets.newHashSet(modifiedFields); - if (email.getDemandStatus() == DemandStatus.UNTREATED + History transmissionToEdi = CollectionUtils.find(email.getHistory(), new Predicate<History>() { + @Override + public boolean evaluate(History object) { + return object.getType() == HistoryType.TRANSMISSION_TO_EDI; + } + }); + if (transmissionToEdi == null && email.getClient() != null && email.getDemandType() != null - && email.getProjectReference() != null) { + && StringUtils.isNotBlank(email.getProjectReference())) { + email.setDemandStatus(DemandStatus.TRANSMITTED_TO_EDI); -// transmitDemandToEdi(email); + transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, + History.PROPERTY_MODIFICATION_DATE, new Date()); + email.addHistory(transmissionToEdi); + fieldSet.add(Email.PROPERTY_DEMAND_STATUS); } History history; @@ -336,9 +347,11 @@ ediWriter.write(rangeRow.getRange().getTopiaId() + "\n"); ediWriter.write("%END_ENTETE_QUOTE\n"); + } catch (IOException ex) { throw new RuntimeException("Can't generate EDI file"); } + } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-05-26 16:18:45 UTC (rev 100) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-05-26 21:04:50 UTC (rev 101) @@ -29,6 +29,7 @@ import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +import com.franciaflex.faxtomail.persistence.entities.Field; import com.franciaflex.faxtomail.persistence.entities.History; import com.franciaflex.faxtomail.persistence.entities.HistoryImpl; import com.franciaflex.faxtomail.persistence.entities.HistoryType; @@ -42,6 +43,8 @@ import com.franciaflex.faxtomail.ui.swing.util.CloseableUI; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.franciaflex.faxtomail.ui.swing.util.FolderTreeNode; +import com.google.common.base.Function; +import com.google.common.collect.Collections2; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -283,7 +286,13 @@ @Override protected Collection<String> getColumns() { MailFolder selectedFolder = getModel().getSelectedFolder(); - return selectedFolder != null ? selectedFolder.getFolderDisplayColumn() : null; + return selectedFolder == null ? null : + Collections2.transform(selectedFolder.getFolderTableColumns(), new Function<Field, String>() { + @Override + public String apply(Field field) { + return field.toString(); + } + }); } @Override Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css 2014-05-26 16:18:45 UTC (rev 100) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css 2014-05-26 21:04:50 UTC (rev 101) @@ -31,18 +31,20 @@ } JTextField, JXTable, BeanFilterableComboBox, #commentField, ButtonAttachment { - editable: { model.isEditable() }; + editable: { model.isEditable() && + !DemandStatus.TRANSMITTED_TO_EDI.equals(model.getDemandStatus()) }; } +BeanFilterableComboBox { + enabled: { model.isEditable() && + !DemandStatus.TRANSMITTED_TO_EDI.equals(model.getDemandStatus()) }; +} + .rightLabel { horizontalAlignment: { SwingConstants.RIGHT }; font-style: "italic"; } -.unmodifiableFields { - editable: { DemandStatus.UNTREATED.equals(model.getDemandStatus()) }; -} - #topToolBar { floatable: false; opaque: false; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx 2014-05-26 16:18:45 UTC (rev 100) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx 2014-05-26 21:04:50 UTC (rev 101) @@ -112,7 +112,6 @@ </cell> <cell weightx='1' columns="3"> <JTextField id='objectField' - styleClass="unmodifiableFields" onKeyReleased='handler.setText(event, "object")'/> </cell> </row> @@ -122,7 +121,6 @@ </cell> <cell weightx='1'> <JTextField id='clientField' - styleClass="unmodifiableFields" onKeyReleased='handler.setText(event, "clientCode")'/> </cell> <cell> @@ -140,7 +138,6 @@ </cell> <cell weightx='1' columns="3"> <BeanFilterableComboBox id='docTypeComboBox' - styleClass="unmodifiableFields" constructorParams='this' genericType="DemandType"/> </cell> @@ -273,7 +270,7 @@ <JLabel id="savNbField"/> </JPanel> <JScrollPane constraints="BorderLayout.CENTER"> - <JXTable id='rangeTable' styleClass="unmodifiableFields"/> + <JXTable id='rangeTable'/> </JScrollPane> </JPanel> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-05-26 16:18:45 UTC (rev 100) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-05-26 21:04:50 UTC (rev 101) @@ -282,6 +282,7 @@ @Override public void setItem(Object anObject) { String text; + //FIXME kmorin 20140523 if set from the filechooser, classcastexception AttachmentFile file = (AttachmentFile) anObject; if ( anObject != null ) {

1 0

r100 - in trunk/faxtomail-ui-web/src/main/webapp: WEB-INF/content/admin js
by echatellier＠users.forge.codelutin.com 26 May '14

26 May '14

Author: echatellier Date: 2014-05-26 18:18:45 +0200 (Mon, 26 May 2014) New Revision: 100 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/100 Log: refs #4662: D?\195?\169but d'interface pour la mise en avant des dossiers par groupes ldap Modified: 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-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-05-26 16:05:15 UTC (rev 99) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-05-26 16:18:45 UTC (rev 100) @@ -426,7 +426,21 @@ </div> <div id="tabs-ldap" class="tab-pane" ng-controller="ConfigurationLdapController"> - Comming soon ... + <table id='table-snapshot' class="table table-bordered"> + <caption>Dossiers mis en avant</caption> + <thead> + <tr> + <th>Dossier</th> + <th ng-repeat="ldapGroup in ldapGroups">{{ldapGroup}}</th> + </tr> + </thead> + <tbody ng-repeat="mailFolder in flatMailFolders()"> + <th>{{mailFolder.name}}</th> + <td ng-repeat="ldapGroup in ldapGroups"> + <input type="checkbox" /> + </td> + </tbody> + </table> </div> <nav class="navbar navbar-default navbar-fixed-bottom"> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-05-26 16:05:15 UTC (rev 99) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-05-26 16:18:45 UTC (rev 100) @@ -12,6 +12,23 @@ $scope.etatAttenteFields = ConfigurationData.etatAttenteFields; //{Array} les etats d'attentes disponibles $scope.etatAttentes = ConfigurationData.etatAttentes; + + // method privée recursive pour retourner l'ensemble des dossiers + var recursiveAddMailFolder = function(result, mailFolders) { + if (mailFolders) { + angular.forEach(mailFolders, function(mailFolder) { + result.push(mailFolder); + recursiveAddMailFolder(result, mailFolder.children); + }); + } + }; + + // Retourne l'ensemble de l'arbre des dossiers "à plat" + $scope.flatMailFolders = function() { + var flatMailFolders = []; + recursiveAddMailFolder(flatMailFolders, $scope.mailFolders); + return flatMailFolders; + }; }]); /** @@ -216,22 +233,6 @@ return mailFilters; }; - var recursiveAddMailFolder = function(result, mailFolders) { - if (mailFolders) { - angular.forEach(mailFolders, function(mailFolder) { - result.push(mailFolder); - recursiveAddMailFolder(result, mailFolder.children); - }); - } - }; - - // FIXME second binding sur une methode, pas top - $scope.flatMailFolders = function() { - var flatMailFolders = []; - recursiveAddMailFolder(flatMailFolders, $scope.mailFolders); - return flatMailFolders; - }; - // add new filter action $scope.addNewFilter = function() { var filter = {expression: $scope.selectedFilter, fmMailFolder: $scope.selectedFolder}; @@ -277,5 +278,6 @@ */ FaxToMailModule.controller('ConfigurationLdapController', ['$scope', '$http', 'ConfigurationData', function($scope, $http, ConfigurationData) { - + // {Array} Liste des groupes ldap + $scope.ldapGroups = ["Group1", "Group2", "Group3", "Group4", "Group5"]; }]); \ No newline at end of file

1 0

r99 - in trunk: . faxtomail-ui-web
by echatellier＠users.forge.codelutin.com 26 May '14

26 May '14

Author: echatellier Date: 2014-05-26 18:05:15 +0200 (Mon, 26 May 2014) New Revision: 99 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/99 Log: Fix dependencies Modified: trunk/faxtomail-ui-web/pom.xml trunk/pom.xml Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-05-26 15:31:06 UTC (rev 98) +++ trunk/faxtomail-ui-web/pom.xml 2014-05-26 16:05:15 UTC (rev 99) @@ -209,8 +209,8 @@ </dependency> <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> </dependency> <dependency> @@ -220,11 +220,6 @@ <dependency> <groupId>org.webjars</groupId> - <artifactId>jstree</artifactId> - </dependency> - - <dependency> - <groupId>org.webjars</groupId> <artifactId>bootstrap</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-26 15:31:06 UTC (rev 98) +++ trunk/pom.xml 2014-05-26 16:05:15 UTC (rev 99) @@ -530,13 +530,6 @@ <dependency> <groupId>org.webjars</groupId> - <artifactId>jstree</artifactId> - <version>3.0.0</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.webjars</groupId> <artifactId>bootstrap</artifactId> <version>3.1.1-1</version> <scope>runtime</scope> @@ -561,6 +554,12 @@ <artifactId>nuiton-js-angular-ui-tree</artifactId> <version>2.0.6-1</version> <scope>runtime</scope> + <exclusions> + <exclusion> + <artifactId>nuiton-js-angularjs</artifactId> + <groupId>org.nuiton.js</groupId> + </exclusion> + </exclusions> </dependency> </dependencies>

1 0