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

Build failed in Jenkins: faxtomail-nightly #39
by admin+ci-codelutin.com＠codelutin.com 02 Jun '14

02 Jun '14

See <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/39/changes> Changes: [kmorin] fix swing session new exception thrown [kmorin] add validator on the range table [echatellier] refs #4662: Begin ldap job to update database [echatellier] refs #4662: Amelioration de l'interface (ajout/suppression/fioritures) [echatellier] Disable ldap if not configured [echatellier] Refactoring de l'interface de configuration/folder/input [kmorin] use configuration for the email max size and search columns [kmorin] fix bug of search to group when there is a search in the context [kmorin] fixes #5154 Bug à l'ajout d'une pièce jointe dans une réponse à un message [kmorin] fixes #5157 Dans l'arborescence des éléments, le clic sur une partie vide de la liste des messages entraine une exception fixes #5158 Un message archivé peut être déplacé [echatellier] refs #4662: Display ldap groups [kmorin] fixes #5150 NPE au clic sur un noeud de l'arborescence ------------------------------------------ [...truncated 899 lines...] [INFO] Copying THIRD-PARTY.properties to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/target/colle…> [INFO] Copying faxtomail-0.1-SNAPSHOT-sources.jar to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/target/colle…> [INFO] Copying faxtomail-0.1-SNAPSHOT-javadoc.jar to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/target/colle…> [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ faxtomail-ui-web --- [INFO] Copying faxtomail-0.1-SNAPSHOT.war to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/target/colle…> [INFO] [INFO] --- maven-gpg-plugin:1.5:sign (sign-artifacts) @ faxtomail-ui-web --- [INFO] [INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ faxtomail-ui-web --- [INFO] Used declared dependencies found: [INFO] com.franciaflex.faxtomail:faxtomail-persistence:jar:0.1-SNAPSHOT:compile [INFO] com.franciaflex.faxtomail:faxtomail-service:jar:0.1-SNAPSHOT:compile [INFO] org.nuiton.topia:topia-persistence:jar:3.0-SNAPSHOT:compile [INFO] org.nuiton:nuiton-utils:jar:3.0-SNAPSHOT:compile [INFO] org.nuiton.jaxx:jaxx-application-api:jar:2.8.6-SNAPSHOT:compile [INFO] commons-logging:commons-logging:jar:1.1.3:compile [INFO] commons-io:commons-io:jar:2.4:compile [INFO] org.nuiton.i18n:nuiton-i18n:jar:3.1:compile [INFO] org.nuiton:nuiton-decorator:jar:3.0-alpha-3:compile [INFO] com.google.guava:guava:jar:17.0:compile [INFO] org.apache.struts:struts2-core:jar:2.3.16.3:compile [INFO] org.apache.struts.xwork:xwork-core:jar:2.3.16.3:compile [INFO] org.apache.commons:commons-collections4:jar:4.0:compile [INFO] javax.servlet:servlet-api:jar:2.5:provided [INFO] org.apache.struts:struts2-convention-plugin:jar:2.3.16.3:compile [INFO] com.google.code.gson:gson:jar:2.2.4:compile [INFO] log4j:log4j:jar:1.2.17:compile [INFO] org.hibernate:hibernate-core:jar:4.3.5.Final:compile [INFO] org.quartz-scheduler:quartz:jar:2.2.1:compile [INFO] javax.mail:mail:jar:1.4.7:compile [INFO] javax.activation:activation:jar:1.1.1:compile [INFO] [INFO] --- maven-install-plugin:2.5.1:install (default-install) @ faxtomail-ui-web --- [INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-ui-web/0.1-SNAPSHOT/faxtomail-ui-web-0.1-SNAPSHOT.war [INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-ui-web/0.1-SNAPSHOT/faxtomail-ui-web-0.1-SNAPSHOT.pom [INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-ui-web/0.1-SNAPSHOT/faxtomail-ui-web-0.1-SNAPSHOT-third-party.properties [INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-ui-web/0.1-SNAPSHOT/faxtomail-ui-web-0.1-SNAPSHOT-sources.jar [INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-ui-web/0.1-SNAPSHOT/faxtomail-ui-web-0.1-SNAPSHOT-javadoc.jar [INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-ui-web/0.1-SNAPSHOT/faxtomail-ui-web-0.1-SNAPSHOT.war.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-ui-web/0.1-SNAPSHOT/faxtomail-ui-web-0.1-SNAPSHOT.pom.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-ui-web/0.1-SNAPSHOT/faxtomail-ui-web-0.1-SNAPSHOT-third-party.properties.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-ui-web/0.1-SNAPSHOT/faxtomail-ui-web-0.1-SNAPSHOT-sources.jar.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-ui-web/0.1-SNAPSHOT/faxtomail-ui-web-0.1-SNAPSHOT-javadoc.jar.asc [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building FaxToMail :: UI 0.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 28.0 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 28.0 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 31.0 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 30.4 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 73.0 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 66.9 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 60.7 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 58.2 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 61.1 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 58.6 KB/sec) [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/topia/… [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/nuiton… [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j… [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ faxtomail-ui-swing --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ faxtomail-ui-swing --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ faxtomail-ui-swing --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ faxtomail-ui-swing --- [INFO] Exporting server [redmine-forge.codelutin.com] privateKey in ${redmine.apiKey} [INFO] [INFO] --- jaxx-maven-plugin:2.8.6-SNAPSHOT:generate (default) @ faxtomail-ui-swing --- [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 58.4 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 51.9 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 63.5 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 58.2 KB/sec) [INFO] use project compile scope class-path [INFO] Detects 26 modified jaxx file(s). [INFO] Generated 26 file(s) in 4.623s [INFO] [INFO] --- i18n-maven-plugin:3.1:parserJava (scan-sources) @ faxtomail-ui-swing --- [INFO] [INFO] --- i18n-maven-plugin:3.1:parserValidation (scan-sources) @ faxtomail-ui-swing --- [INFO] Load rules file validation.rules [INFO] [INFO] >>> i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-ui-swing >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:get (get) @ faxtomail-ui-swing --- [INFO] Copying faxtomail-ui-swing.properties to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-ui-swing <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-ui-swing --- [WARNING] bundle fr_FR contains 27/289 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] >>> i18n-maven-plugin:3.1:bundle (make-bundle) @ faxtomail-ui-swing >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:collect-i18n-artifacts (collect-i18n-artifacts) @ faxtomail-ui-swing --- [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/topia/… [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/2… [INFO] collected 10 i18n artifacts for locale fr_FR stored in <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:bundle (make-bundle) @ faxtomail-ui-swing <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:bundle (make-bundle) @ faxtomail-ui-swing --- [WARNING] bundle fr_FR contains 62/536 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- license-maven-plugin:1.7:update-project-license (attach-licenses) @ faxtomail-ui-swing --- [INFO] [INFO] --- license-maven-plugin:1.7:add-third-party (attach-licenses) @ faxtomail-ui-swing --- [INFO] Load missing file <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> [INFO] Missing file <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> is up-to-date. [INFO] Writing third-party file to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> [INFO] Writing bundled third-party file to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> [INFO] Will attach third party file from <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> [INFO] [INFO] --- license-maven-plugin:1.7:update-file-header (update-file-header-on-pom) @ faxtomail-ui-swing --- [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> [INFO] Scan 1 file header done in 7.657ms. [INFO] All files are up-to-date. [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ faxtomail-ui-swing --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 2 resources [INFO] Copying 45 resources [INFO] Copying 3 resources [INFO] Copying 4 resources [INFO] [INFO] --- license-maven-plugin:1.7:update-file-header (update-file-header) @ faxtomail-ui-swing --- [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> [INFO] Scan 171 files header done in 597.173ms. [INFO] * uptodate header on 143 files. * add header on 28 files. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ faxtomail-ui-swing --- [INFO] Compiling 107 source files to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>: Recompile with -Xlint:unchecked for details. [INFO] 2 warnings [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>:[173,39] unreported exception java.io.IOException; must be caught or declared to be thrown [INFO] 1 error [INFO] ------------------------------------------------------------- [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 ......................................... SUCCESS [ 8.203 s] [INFO] FaxToMail :: Persistence .......................... SUCCESS [ 22.817 s] [INFO] FaxToMail :: Service .............................. SUCCESS [ 13.186 s] [INFO] FaxToMail :: Web .................................. SUCCESS [ 9.331 s] [INFO] FaxToMail :: UI ................................... FAILURE [ 12.126 s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 01:07 min [INFO] Finished at: 2014-05-31T01:16:28+01:00 [INFO] Final Memory: 97M/912M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project faxtomail-ui-swing: Compilation failure [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>:[173,39] unreported exception java.io.IOException; must be caught or declared to be thrown [ERROR] -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project faxtomail-ui-swing: Compilation failure <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>:[173,39] unreported exception java.io.IOException; must be caught or declared to be thrown at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212) 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:108) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) 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:745) Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-ui…>:[173,39] unreported exception java.io.IOException; must be caught or declared to be thrown at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:858) at org.apache.maven.plugin.compiler.CompilerMojo.execute(CompilerMojo.java:129) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 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/MojoFailureException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :faxtomail-ui-swing Sending e-mails to: faxtomail-commits(a)list.forge.codelutin.com chatellier(a)codelutin.com morin(a)codelutin.com Sending e-mails to: faxtomail-commits(a)list.forge.codelutin.com morin(a)codelutin.com channel stopped Skipping sonar analysis due to bad build status FAILURE

1 2

Jenkins build became unstable: faxtomail-nightly » FaxToMail :: Service #39
by admin+ci-codelutin.com＠codelutin.com 02 Jun '14

02 Jun '14

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

1 2

Build failed in Jenkins: faxtomail-nightly » FaxToMail :: UI #39
by admin+ci-codelutin.com＠codelutin.com 02 Jun '14

02 Jun '14

See <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> Changes: [kmorin] fix swing session new exception thrown [kmorin] add validator on the range table [kmorin] use configuration for the email max size and search columns [kmorin] fix bug of search to group when there is a search in the context [kmorin] fixes #5154 Bug à l'ajout d'une pièce jointe dans une réponse à un message [kmorin] fixes #5157 Dans l'arborescence des éléments, le clic sur une partie vide de la liste des messages entraine une exception fixes #5158 Un message archivé peut être déplacé [kmorin] fixes #5150 NPE au clic sur un noeud de l'arborescence ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building FaxToMail :: UI 0.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 28.0 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 28.0 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 31.0 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 30.4 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 73.0 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 66.9 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 60.7 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 58.2 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 61.1 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 58.6 KB/sec) [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/topia/… [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/nuiton… [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j… [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ faxtomail-ui-swing --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ faxtomail-ui-swing --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ faxtomail-ui-swing --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ faxtomail-ui-swing --- [INFO] Exporting server [redmine-forge.codelutin.com] privateKey in ${redmine.apiKey} [INFO] [INFO] --- jaxx-maven-plugin:2.8.6-SNAPSHOT:generate (default) @ faxtomail-ui-swing --- [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 58.4 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 51.9 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 63.5 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 58.2 KB/sec) [INFO] use project compile scope class-path [INFO] Detects 26 modified jaxx file(s). [INFO] Generated 26 file(s) in 4.623s [INFO] [INFO] --- i18n-maven-plugin:3.1:parserJava (scan-sources) @ faxtomail-ui-swing --- [INFO] [INFO] --- i18n-maven-plugin:3.1:parserValidation (scan-sources) @ faxtomail-ui-swing --- [INFO] Load rules file validation.rules [INFO] [INFO] >>> i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-ui-swing >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:get (get) @ faxtomail-ui-swing --- [INFO] Copying faxtomail-ui-swing.properties to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-ui-swing <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-ui-swing --- [WARNING] bundle fr_FR contains 27/289 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] >>> i18n-maven-plugin:3.1:bundle (make-bundle) @ faxtomail-ui-swing >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:collect-i18n-artifacts (collect-i18n-artifacts) @ faxtomail-ui-swing --- [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/topia/… [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/2… [INFO] collected 10 i18n artifacts for locale fr_FR stored in <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:bundle (make-bundle) @ faxtomail-ui-swing <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:bundle (make-bundle) @ faxtomail-ui-swing --- [WARNING] bundle fr_FR contains 62/536 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- license-maven-plugin:1.7:update-project-license (attach-licenses) @ faxtomail-ui-swing --- [INFO] [INFO] --- license-maven-plugin:1.7:add-third-party (attach-licenses) @ faxtomail-ui-swing --- [INFO] Load missing file <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> [INFO] Missing file <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> is up-to-date. [INFO] Writing third-party file to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> [INFO] Writing bundled third-party file to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> [INFO] Will attach third party file from <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> [INFO] [INFO] --- license-maven-plugin:1.7:update-file-header (update-file-header-on-pom) @ faxtomail-ui-swing --- [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> [INFO] Scan 1 file header done in 7.657ms. [INFO] All files are up-to-date. [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ faxtomail-ui-swing --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 2 resources [INFO] Copying 45 resources [INFO] Copying 3 resources [INFO] Copying 4 resources [INFO] [INFO] --- license-maven-plugin:1.7:update-file-header (update-file-header) @ faxtomail-ui-swing --- [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> [INFO] Scan 171 files header done in 597.173ms. [INFO] * uptodate header on 143 files. * add header on 28 files. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ faxtomail-ui-swing --- [INFO] Compiling 107 source files to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>: Recompile with -Xlint:unchecked for details. [INFO] 2 warnings [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>:[173,39] unreported exception java.io.IOException; must be caught or declared to be thrown [INFO] 1 error [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled

1 2

Build failed in Jenkins: faxtomail-ci #87
by admin+ci-codelutin.com＠codelutin.com 02 Jun '14

02 Jun '14

See <http://ci.codelutin.com/jenkins/job/faxtomail-ci/87/changes> Changes: [echatellier] Refactoring de l'interface de configuration/folder/input ------------------------------------------ [...truncated 502 lines...] [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ faxtomail-ui-web --- [INFO] No sources to compile [INFO] [INFO] --- maven-surefire-plugin:2.17:test (default-test) @ faxtomail-ui-web --- [INFO] No tests to run. [JENKINS] Recording test results [INFO] [INFO] --- maven-war-plugin:2.4:war (default-war) @ faxtomail-ui-web --- [INFO] Packaging webapp [INFO] Assembling webapp [faxtomail-ui-web] in [<http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-web/…]> [INFO] Processing war project [INFO] Copying webapp webResources [<http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-web/…]> to [<http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-web/…]> [INFO] Copying webapp resources [<http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-web/…]> [INFO] Webapp assembled in [104 msecs] [INFO] Building war: <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-web/…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ faxtomail-ui-web --- [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building FaxToMail :: UI 0.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 50.0 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 46.7 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (7 KB at 248.2 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (7 KB at 302.2 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (57 KB at 1483.9 KB/sec) [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 53.7 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 51.7 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (4 KB at 139.4 KB/sec) [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (4 KB at 139.4 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 73.0 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 69.8 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (5 KB at 213.4 KB/sec) [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (5 KB at 213.4 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 66.5 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 60.7 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (5 KB at 230.0 KB/sec) [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (5 KB at 219.5 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 63.9 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 58.6 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (6 KB at 236.3 KB/sec) [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (6 KB at 216.6 KB/sec) [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/topia/… [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/nuiton… [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/j… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (73 KB at 1545.1 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (96 KB at 1425.8 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (385 KB at 3886.8 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (505 KB at 4271.6 KB/sec) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ faxtomail-ui-swing --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ faxtomail-ui-swing --- [INFO] [INFO] --- jaxx-maven-plugin:2.8.6-SNAPSHOT:generate (default) @ faxtomail-ui-swing --- [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 51.9 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 50.1 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (4 KB at 160.5 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (4 KB at 168.2 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 63.5 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 60.8 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (5 KB at 194.8 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (5 KB at 194.8 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (401 KB at 4218.0 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (493 KB at 4978.5 KB/sec) [INFO] use project compile scope class-path [INFO] Detects 26 modified jaxx file(s). [INFO] Generated 26 file(s) in 3.558s [INFO] [INFO] --- i18n-maven-plugin:3.1:parserJava (scan-sources) @ faxtomail-ui-swing --- [INFO] [INFO] --- i18n-maven-plugin:3.1:parserValidation (scan-sources) @ faxtomail-ui-swing --- [INFO] Load rules file validation.rules [INFO] [INFO] >>> i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-ui-swing >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:get (get) @ faxtomail-ui-swing --- [INFO] Copying faxtomail-ui-swing.properties to <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-ui-swing <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-ui-swing --- [WARNING] bundle fr_FR contains 27/287 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] >>> i18n-maven-plugin:3.1:bundle (make-bundle) @ faxtomail-ui-swing >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:collect-i18n-artifacts (collect-i18n-artifacts) @ faxtomail-ui-swing --- [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/topia/… [INFO] Downloading: http://repository.springsource.com/maven/bundles/external/org/nuiton/jaxx/2… [INFO] collected 10 i18n artifacts for locale fr_FR stored in <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:bundle (make-bundle) @ faxtomail-ui-swing <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:bundle (make-bundle) @ faxtomail-ui-swing --- [WARNING] bundle fr_FR contains 62/534 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- license-maven-plugin:1.7:update-project-license (attach-licenses) @ faxtomail-ui-swing --- [INFO] [INFO] --- license-maven-plugin:1.7:add-third-party (attach-licenses) @ faxtomail-ui-swing --- [INFO] Load missing file <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…> [INFO] Missing file <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…> is up-to-date. [INFO] Writing third-party file to <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…> [INFO] Writing bundled third-party file to <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…> [INFO] Will attach third party file from <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…> [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ faxtomail-ui-swing --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 2 resources [INFO] Copying 45 resources [INFO] Copying 3 resources [INFO] Copying 4 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ faxtomail-ui-swing --- [INFO] Compiling 107 source files to <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…>: Recompile with -Xlint:unchecked for details. [INFO] 2 warnings [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…>:[272,29] unreported exception java.io.IOException; must be caught or declared to be thrown [INFO] 1 error [INFO] ------------------------------------------------------------- [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 ......................................... SUCCESS [ 1.896 s] [INFO] FaxToMail :: Persistence .......................... SUCCESS [ 10.281 s] [INFO] FaxToMail :: Service .............................. SUCCESS [ 7.547 s] [INFO] FaxToMail :: Web .................................. SUCCESS [ 3.641 s] [INFO] FaxToMail :: UI ................................... FAILURE [ 10.644 s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 35.908 s [INFO] Finished at: 2014-05-30T13:25:49+01:00 [INFO] Final Memory: 88M/1471M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project faxtomail-ui-swing: Compilation failure [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…>:[272,29] unreported exception java.io.IOException; must be caught or declared to be thrown [ERROR] -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project faxtomail-ui-swing: Compilation failure <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…>:[272,29] unreported exception java.io.IOException; must be caught or declared to be thrown at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212) 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:108) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) 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:745) Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-ui-swin…>:[272,29] unreported exception java.io.IOException; must be caught or declared to be thrown at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:858) at org.apache.maven.plugin.compiler.CompilerMojo.execute(CompilerMojo.java:129) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 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/MojoFailureException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :faxtomail-ui-swing Sending e-mails to: faxtomail-commits(a)list.forge.codelutin.com channel stopped

1 13

Jenkins build became unstable: faxtomail-ci » FaxToMail :: Service #91
by admin+ci-codelutin.com＠codelutin.com 02 Jun '14

02 Jun '14

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

1 9

r125 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by kmorin＠users.forge.codelutin.com 02 Jun '14

02 Jun '14

Author: kmorin Date: 2014-06-02 23:06:54 +0200 (Mon, 02 Jun 2014) New Revision: 125 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/125 Log: find client for the incoming emails Added: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java 2014-06-02 20:34:14 UTC (rev 124) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java 2014-06-02 21:06:54 UTC (rev 125) @@ -26,6 +26,7 @@ import com.franciaflex.faxtomail.FaxToMailConfiguration; import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; +import com.franciaflex.faxtomail.services.service.ClientService; import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.services.service.FaxToMailWebApplicationContext; @@ -82,4 +83,8 @@ public ReferentielService getReferentielService() { return newService(ReferentielService.class); } + + public ClientService getClientService() { + return newService(ClientService.class); + } } Added: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java (rev 0) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-06-02 21:06:54 UTC (rev 125) @@ -0,0 +1,74 @@ +package com.franciaflex.faxtomail.services.service; + +import com.franciaflex.faxtomail.persistence.entities.Client; +import com.franciaflex.faxtomail.persistence.entities.ClientTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; +import com.google.common.base.Function; +import com.google.common.collect.Multimap; +import com.google.common.collect.Multimaps; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import static org.nuiton.i18n.I18n.t; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +public class ClientService extends FaxToMailServiceSupport { + + private static final Log log = LogFactory.getLog(ClientService.class); + + public Client getClientForEmailAddress(String emailAddress, MailFolder folder) { + ClientTopiaDao clientDao = getPersistenceContext().getClientDao(); + + Client client = null; + List<Client> clients; + if (StringUtils.isNotBlank(emailAddress)) { + clients = clientDao.forEmailAddressEquals(emailAddress).findAll(); + + if (CollectionUtils.isEmpty(clients)) { + clients = clientDao.forFaxNumberEquals(emailAddress).findAll(); + } + + if (CollectionUtils.isNotEmpty(clients)) { + if (clients.size() == 1) { + client = clients.get(0); + + } else if (folder != null) { + Multimap<String, Client> clientsByBrand = Multimaps.index(clients, new Function<Client, String>() { + @Override + public String apply(Client client) { + return client.getBrand(); + } + }); + Set<String> brands = clientsByBrand.keySet(); + while (client == null && folder != null) { + if (brands.contains(folder.getName())) { + client = new ArrayList<>(clientsByBrand.get(folder.getName())).get(0); + } + folder = folder.getParent(); + } + } + } + } + return client; + } + + public Client getClientForCode(String code) { + ClientTopiaDao clientDao = getPersistenceContext().getClientDao(); + Client client = null; + if (StringUtils.isNotBlank(code)) { + client = clientDao.forCodeEquals(code).findAnyOrNull(); + } + return client; + } +} Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-02 20:34:14 UTC (rev 124) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-02 21:06:54 UTC (rev 125) @@ -116,19 +116,19 @@ * @throws InvalidClientException if client code is not valid */ public Email saveEmail(Email email, FaxToMailUser user, String... modifiedFields) throws InvalidClientException { - return saveEmail(email, null, null, user, modifiedFields); + Client client = email.getClient(); + return saveEmail(email, null, client != null ? client.getCode() : null, user, modifiedFields); } public Email saveEmail(Email email, Collection<Attachment> attachments, String clientCode, FaxToMailUser user, String... modifiedFields) throws InvalidClientException { Date now = getNow(); - ClientTopiaDao clientDao = getPersistenceContext().getClientDao(); EmailTopiaDao dao = getPersistenceContext().getEmailDao(); HistoryTopiaDao historyDao = getPersistenceContext().getHistoryDao(); // if client code is null, do not manage client at all Client client = null; if (StringUtils.isNotBlank(clientCode)) { - client = clientDao.forCodeEquals(clientCode).findAnyOrNull(); + client = getClientService().getClientForCode(clientCode); if (client == null) { String message = t("faxtomail.service.email.save.clientCode.error", clientCode); throw new InvalidClientException(message); @@ -171,12 +171,14 @@ if (!attachment.isPersisted()) { // persist using cascade - currentAttachments.add(currentAttachment); + email.addAttachment(currentAttachment); } } // delete not found attachments - currentAttachments.removeAll(currentAttachmentIndex.values()); + for (Attachment attachment : currentAttachmentIndex.values()) { + email.removeAttachment(attachment); + } } if (email.getRangeRow() != null) { Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-02 20:34:14 UTC (rev 124) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-02 21:06:54 UTC (rev 125) @@ -55,6 +55,8 @@ import javax.mail.internet.MimeMultipart; import javax.mail.internet.MimeUtility; +import com.franciaflex.faxtomail.persistence.entities.Client; +import com.franciaflex.faxtomail.services.service.ClientService; import org.apache.commons.io.Charsets; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; @@ -171,7 +173,6 @@ for (int i = 0 ; i < count ; i++) { Email email = new EmailImpl(); - emailService.saveEmail(email, null); int messageNumber = count - i; Message message = folder.getMessage(messageNumber); @@ -184,12 +185,6 @@ // email.s(message.getSubject()); // modifiedProperties.add(Email.PROPERTY_OBJECT); - Address[] addresses = message.getFrom(); - if (addresses != null && addresses.length > 0) { - email.setSender(addresses[0].toString()); - modifiedProperties.add(Email.PROPERTY_SENDER); - } - List<Address> recipients = new ArrayList<>(); Address[] toRecipients = message.getRecipients(Message.RecipientType.TO); if (toRecipients != null) { @@ -214,7 +209,26 @@ break; } } + if (email.getMailFolder() == null) { + break; + } + emailService.saveEmail(email, null); + Address[] addresses = message.getFrom(); + if (addresses != null && addresses.length > 0) { + String sender = addresses[0].toString(); + email.setSender(sender); + modifiedProperties.add(Email.PROPERTY_SENDER); + + Client client = serviceContext.newService(ClientService.class) + .getClientForEmailAddress(sender, email.getMailFolder()); + //TODO kmorin 20140602 find the responsible's folder +// if (client != null) { +// client.getCustomerResponsible() +// } + email.setClient(client); + } + Date receivedDate = message.getReceivedDate(); if (receivedDate == null) { receivedDate = message.getSentDate();

1 0

r124 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin faxtomail-ui-web/src/main/webapp/js
by echatellier＠users.forge.codelutin.com 02 Jun '14

02 Jun '14

Author: echatellier Date: 2014-06-02 22:34:14 +0200 (Mon, 02 Jun 2014) New Revision: 124 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/124 Log: Correction de la sauvegarde des etats attente et mail folder cr?\195?\169?\195?\169s 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/ReferentielService.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 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-06-02 20:10:28 UTC (rev 123) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-06-02 20:34:14 UTC (rev 124) @@ -32,6 +32,7 @@ import java.util.Map; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaIdFactory; @@ -43,6 +44,7 @@ import com.franciaflex.faxtomail.persistence.entities.MailFilter; import com.franciaflex.faxtomail.persistence.entities.MailFilterTopiaDao; import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.MailFolderImpl; import com.franciaflex.faxtomail.persistence.entities.MailFolderTopiaDao; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import com.google.common.collect.Lists; @@ -101,15 +103,15 @@ } Collection<MailFolder> result = Lists.newArrayList(); MailFolderTopiaDao dao = getPersistenceContext().getMailFolderDao(); - TopiaIdFactory factory = getPersistenceContext().getTopiaIdFactory(); + //TopiaIdFactory factory = getPersistenceContext().getTopiaIdFactory(); Binder<MailFolder, MailFolder> binderMailFolder = BinderFactory.newBinder(MailFolder.class); for (MailFolder mailFolder : mailFolders) { Collection<MailFolder> children = saveMailFolders(mailFolder, mailFolder.getChildren()); MailFolder currentMailFolder; - if (!factory.isTopiaId(mailFolder.getTopiaId())) { - currentMailFolder = dao.create(); + if (StringUtils.isBlank(mailFolder.getTopiaId()) || mailFolder.getTopiaId().startsWith("new_")) { + currentMailFolder = new MailFolderImpl(); } else { currentMailFolder = dao.findByTopiaId(mailFolder.getTopiaId()); } 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-06-02 20:10:28 UTC (rev 123) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-06-02 20:34:14 UTC (rev 124) @@ -106,20 +106,23 @@ for (EtatAttente etatAttente : etatAttentes) { // get current etat attente EtatAttente currentEtatAttente; - if (StringUtils.isNoneBlank(etatAttente.getTopiaId())) { + if (StringUtils.isBlank(etatAttente.getTopiaId()) || etatAttente.getTopiaId().startsWith("new_")) { + currentEtatAttente = new EtatAttenteImpl(); + } else { currentEtatAttente = allEtatAttenteIndex.remove(etatAttente.getTopiaId()); - } else { - currentEtatAttente = new EtatAttenteImpl(); } // copy - binderEtatAttente.copy(etatAttente, currentEtatAttente); + binderEtatAttente.copyExcluding(etatAttente, currentEtatAttente, + EtatAttente.PROPERTY_TOPIA_ID, + EtatAttente.PROPERTY_TOPIA_CREATE_DATE, + EtatAttente.PROPERTY_TOPIA_VERSION); // persist if (currentEtatAttente.isPersisted()) { + etatAttenteDAO.update(currentEtatAttente); + } else { etatAttenteDAO.create(currentEtatAttente); - } else { - etatAttenteDAO.update(currentEtatAttente); } } Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-02 20:10:28 UTC (rev 123) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-02 20:34:14 UTC (rev 124) @@ -25,7 +25,6 @@ */ import java.lang.reflect.Type; -import java.util.Collections; import java.util.List; import java.util.Map; Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-02 20:10:28 UTC (rev 123) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-02 20:34:14 UTC (rev 124) @@ -78,8 +78,8 @@ $scope.selectedEtatAttente = etatAttente; // initialize le tableau d'action si vide - if (!$scope.selectedEtatAttente.actions) { - $scope.selectedEtatAttente.actions = []; + if (!$scope.selectedEtatAttente.mainActions) { + $scope.selectedEtatAttente.mainActions = []; } if (!$scope.selectedEtatAttente.fields) { $scope.selectedEtatAttente.fields = []; @@ -147,7 +147,8 @@ if (name) { var newRoot = { topiaId: "new_" + guid(), - name: name + name: name, + children: [] }; $scope.mailFolders.push(newRoot); @@ -167,8 +168,8 @@ if (!$scope.selectedMailFolder.replyAddresses) { $scope.selectedMailFolder.replyAddresses = []; } - if (!$scope.selectedMailFolder.folderActions) { - $scope.selectedMailFolder.folderActions = []; + if (!$scope.selectedMailFolder.contextActions) { + $scope.selectedMailFolder.contextActions = []; } if (!$scope.selectedMailFolder.folderTableColumns) { $scope.selectedMailFolder.folderTableColumns = []; @@ -203,6 +204,7 @@ var name = $window.prompt("Nom du nouveau noeud ? "); if (name) { nodeData.children.push({ + topiaId: "new_" + guid(), name: name, children: [] });

1 0

r123 - in trunk: faxtomail-persistence/src/main/xmi faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin faxtomail-ui-web/src/main/webapp/js
by echatellier＠users.forge.codelutin.com 02 Jun '14

02 Jun '14

Author: echatellier Date: 2014-06-02 22:10:28 +0200 (Mon, 02 Jun 2014) New Revision: 123 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/123 Log: Ajout des droits d'?\195?\169criture et des charg?\195?\169s de clientelle Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-02 18:45:22 UTC (rev 122) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-02 20:10:28 UTC (rev 123) @@ -181,15 +181,15 @@ <table class="table table-bordered"> <thead> <tr> - <th>Adresse email</th> + <th>Utilisateur</th> <th>Action</th> </tr> </thead> <tbody> - <tr ng-repeat="customerResponsible in selectedMailFolder.customerResponsibles track by $index"> + <tr ng-repeat="customerResponsible in selectedMailFolder.customerResponsibles"> <td> <span class="glyphicon glyphicon-user"></span> - {{customerResponsible}}</td> + {{customerResponsible.firstName}} {{customerResponsible.lastName}}</td> <td> <a class="pull-right btn btn-danger btn-xs" ng-click="removeCustomerResponsible($index)"> <span class="glyphicon glyphicon-remove"></span> @@ -199,7 +199,7 @@ </tbody> </table> - Nouveau : <input type="email" ng-model="newCustomerResponsible" placeholder="nom.prenom(a)franciaflex.fr" /> + Nouveau : <select ng-model="newCustomerResponsible" ng-options="user as user.firstName + ' ' + user.lastName for user in users"></select> <a class="btn btn-success btn-xs" ng-click="addCustomerResponsible()" ng-disabled="!newCustomerResponsible"> <span class="glyphicon glyphicon-ok"></span> </a> @@ -283,16 +283,30 @@ <tr> <th>Utilisateur ou groupe</th> <th>Type</th> + <th>Action</th> </tr> </thead> <tbody> - + <tr ng-repeat="user in selectedMailFolder.writeRightUsers"> + <td> + {{user.firstName}} {{user.lastName}} + </td> + <td> + Ecriture + </td> + <td> + <a class="pull-right btn btn-danger btn-xs" ng-click="removeWriteRightUser($index)"> + <span class="glyphicon glyphicon-remove"></span> + </a> + </td> + </tr> </tbody> </table> <div class="form-group"> - Nouveau utilisateur : <input type="email" ng-model="newReplyAddress" placeholder="nom.prenom(a)franciaflex.fr" /> - <a class="btn btn-success btn-xs" ng-click="addReplyAddress()" ng-disabled="!newReplyAddress"> + Nouveau utilisateur : + <select ng-model="newWriteRightUser" ng-options="user as user.firstName + ' ' + user.lastName for user in users"></select> + <a class="btn btn-success btn-xs" ng-click="addWriteRightUser()" ng-disabled="!newWriteRightUser"> <span class="glyphicon glyphicon-ok"></span> </a> </div> @@ -409,14 +423,17 @@ <input type="radio" name="rejectUnknownSenderField" ng-model="selectedMailFolder.rejectUnknownSender" ng-value="undefined"> valeur du noeud parent </label> - </div> + </div> - - <div class="form-group"> <label for="ediFolderField">Dossier (FS) de dépôt des demandes EDI</label> <input type="text" class="form-control" id="ediFolderField" ng-model="selectedMailFolder.ediFolder"> </div> + + <div class="form-group"> + <label for="faxDomainField">Domaines des fax</label> + <input type="text" class="form-control" id="faxDomainField" ng-model="selectedMailFolder.faxDomain"> + </div> </div> </div> </div> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-02 18:45:22 UTC (rev 122) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-02 20:10:28 UTC (rev 123) @@ -138,6 +138,8 @@ $scope.newReplyAddress; // {Array} Colonnes selectionnées pour le dossier courant $scope.folderTableColumns; + // {Array} Users + $scope.users = ConfigurationData.users; // creation d'un nouveau noeud racine $scope.newRoot = function() { @@ -171,6 +173,9 @@ if (!$scope.selectedMailFolder.folderTableColumns) { $scope.selectedMailFolder.folderTableColumns = []; } + if (!$scope.selectedMailFolder.writeRightUsers) { + $scope.selectedMailFolder.writeRightUsers = []; + } // initialise la liste des colonnes pour le dossier courant $scope.folderTableColumns = []; @@ -238,6 +243,17 @@ $scope.selectedMailFolder.replyAddresses.splice(index, 1); }; + // add reply address + $scope.addWriteRightUser = function() { + $scope.selectedMailFolder.writeRightUsers.push($scope.newWriteRightUser); + delete $scope.newWriteRightUser; + }; + + // remove customer responsible + $scope.removeWriteRightUser = function(index) { + $scope.selectedMailFolder.writeRightUsers.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);

1 0

r122 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-persistence/src/main/xmi faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/acti
by echatellier＠users.forge.codelutin.com 02 Jun '14

02 Jun '14

Author: echatellier Date: 2014-06-02 20:45:22 +0200 (Mon, 02 Jun 2014) New Revision: 122 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/122 Log: Rectaroring (retours kevin) Added: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ContextAction.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MainAction.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp Removed: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/Action.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/FakeLdapProvider.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapProvider.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/LdapJob.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo 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/LdapService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationService.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/MailFolderServiceTest.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 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/user-folder-input.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-06-02 15:45:55 UTC (rev 121) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-06-02 18:45:22 UTC (rev 122) @@ -251,10 +251,6 @@ public String getLdapPassword() { return applicationConfig.getOption(FaxToMailConfigurationOption.LDAP_PASSWORD.getKey()); } - - public boolean isLdapMock() { - return applicationConfig.getOptionAsBoolean(FaxToMailConfigurationOption.LDAP_MOCK.getKey()); - } public String getInstanceUrl() { return applicationConfig.getOption(FaxToMailConfigurationOption.INSTANCE_URL.getKey()); Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-06-02 15:45:55 UTC (rev 121) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-06-02 18:45:22 UTC (rev 122) @@ -103,10 +103,6 @@ "faxtomail.ldap.password", "Mot de passe pour la connexion au serveur LDAP", null, String.class), - LDAP_MOCK( - "faxtomail.ldap.mock", - "Use mock ldap provider for test purpose", "false", Boolean.class), - // TRANSIENT CONFIG VERSION( "faxtomail.version", Deleted: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/Action.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/Action.java 2014-06-02 15:45:55 UTC (rev 121) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/Action.java 2014-06-02 18:45:22 UTC (rev 122) @@ -1,40 +0,0 @@ -package com.franciaflex.faxtomail.persistence.entities; - -/* - * #%L - * FaxToMail :: Persistence - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2014 Franciaflex, Code Lutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -/** - * @author Kevin Morin (Code Lutin) - * @since x.x - */ -public enum Action { - - SAVE, - TRANSMIT, - PRINT, - ARCHIVE, - REPLY, - GROUP - -} Added: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ContextAction.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ContextAction.java (rev 0) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ContextAction.java 2014-06-02 18:45:22 UTC (rev 122) @@ -0,0 +1,36 @@ +package com.franciaflex.faxtomail.persistence.entities; + +/* + * #%L + * FaxToMail :: Persistence + * $Id: Action.java 48 2014-04-25 13:43:04Z echatellier $ + * $HeadURL: https://svn.codelutin.com/faxtomail/trunk/faxtomail-persistence/src/main/ja… $ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +public enum ContextAction { + + CHANGE_PRIORITY, + AUTO_SAVE + +} Property changes on: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ContextAction.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MainAction.java (from rev 121, trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/Action.java) =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MainAction.java (rev 0) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MainAction.java 2014-06-02 18:45:22 UTC (rev 122) @@ -0,0 +1,40 @@ +package com.franciaflex.faxtomail.persistence.entities; + +/* + * #%L + * FaxToMail :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +public enum MainAction { + + SAVE, + TRANSMIT, + PRINT, + ARCHIVE, + REPLY, + GROUP + +} Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-02 15:45:55 UTC (rev 121) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-02 18:45:22 UTC (rev 122) @@ -33,7 +33,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.Writer; -import java.net.URL; import java.util.ArrayList; import java.util.Collection; import java.util.Date; @@ -41,7 +40,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.Set; import javax.activation.DataSource; Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-06-02 15:45:55 UTC (rev 121) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-06-02 18:45:22 UTC (rev 122) @@ -24,6 +24,26 @@ * #L% */ +import static org.nuiton.i18n.I18n.t; + +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; + +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.application.ApplicationTechnicalException; + import com.franciaflex.faxtomail.FaxToMailConfiguration; import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; @@ -53,27 +73,6 @@ 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; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; - -import static org.nuiton.i18n.I18n.t; - public class InitFaxToMailService extends FaxToMailServiceSupport { private static final Log log = LogFactory.getLog(InitFaxToMailService.class); Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-06-02 15:45:55 UTC (rev 121) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-06-02 18:45:22 UTC (rev 122) @@ -1,6 +1,8 @@ package com.franciaflex.faxtomail.services.service; +import java.util.ArrayList; import java.util.Collection; +import java.util.List; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -15,29 +17,69 @@ import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserImpl; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserTopiaDao; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; -import com.franciaflex.faxtomail.services.service.ldap.FakeLdapProvider; -import com.franciaflex.faxtomail.services.service.ldap.LdapProvider; import com.franciaflex.faxtomail.services.service.ldap.LdapUser; +import com.unboundid.ldap.sdk.LDAPConnection; +import com.unboundid.ldap.sdk.LDAPException; +import com.unboundid.ldap.sdk.SearchResult; +import com.unboundid.ldap.sdk.SearchResultEntry; +import com.unboundid.ldap.sdk.SearchScope; public class LdapService extends FaxToMailServiceSupport { private static final Log log = LogFactory.getLog(LdapService.class); - protected LdapProvider ldapProvider; + /** + * Get ldap connection. + * + * @return + * @throws LDAPException + */ + protected LDAPConnection getLDAPConnection() throws LDAPException { + // host, port, username and password + return new LDAPConnection(getApplicationConfig().getLdapHost(), + getApplicationConfig().getLdapPort(), + getApplicationConfig().getLdapUser(), + getApplicationConfig().getLdapPassword()); + } - protected LdapProvider getLdapProvider() { - if (ldapProvider == null) { - FaxToMailConfiguration config = getApplicationConfig(); - if (config.isLdapMock()) { - ldapProvider = new FakeLdapProvider(); - if (log.isInfoEnabled()) { - log.info("Using fake ldap provider"); + /** + * Get all user from ldap. + * + * @return ldap users with group infos + */ + public Collection<LdapUser> getAllLdapUsers() { + Collection<LdapUser> results = new ArrayList<>(); + + // ldapsearch -h ldap.codelutin.home -b "ou=People,DC=codelutin,DC=home" "objectClass=posixGroup" + // ldapsearch -h ldap.codelutin.home -b "ou=People,DC=codelutin,DC=home" "objectClass=account" + String baseDN = "ou=People,DC=codelutin,DC=home"; + String filter = "(objectClass=account)"; + + LDAPConnection connection = null; + try { + connection = getLDAPConnection(); + if (connection.isConnected()) { + SearchResult searchResult = connection.search(baseDN, SearchScope.ONE, filter); + + List<SearchResultEntry> searchEntries = searchResult.getSearchEntries(); + for (SearchResultEntry searchEntry : searchEntries) { + LdapUser user = new LdapUser(); + user.setLogin(searchEntry.getAttributeValue("uid")); + user.setLogin(searchEntry.getAttributeValue("uid")); + user.setLogin(searchEntry.getAttributeValue("uid")); + + results.add(user); } - } else { - ldapProvider = new LdapProvider(config); } + } catch (LDAPException ex) { + throw new RuntimeException("Can't connect to ldap", ex); + } finally { + if (connection != null) { + connection.close(); + } } - return ldapProvider; + + return results; } /** @@ -55,7 +97,7 @@ } } - Collection<LdapUser> ldapUsers = getLdapProvider().getAllLdapUsers(); + Collection<LdapUser> ldapUsers = getAllLdapUsers(); FaxToMailUserTopiaDao faxtomailUserDao = getPersistenceContext().getFaxToMailUserDao(); FaxToMailUserGroupTopiaDao faxToMailUserGroupDao = getPersistenceContext().getFaxToMailUserGroupDao(); Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java 2014-06-02 15:45:55 UTC (rev 121) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java 2014-06-02 18:45:22 UTC (rev 122) @@ -24,15 +24,15 @@ * #L% */ +import java.util.ArrayList; +import java.util.List; + import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroup; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroupTopiaDao; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserTopiaDao; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; -import java.util.ArrayList; -import java.util.List; - /** * @author kmorin <kmorin(a)codelutin.com> * @since x.x Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationService.java 2014-06-02 15:45:55 UTC (rev 121) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationService.java 2014-06-02 18:45:22 UTC (rev 122) @@ -24,12 +24,13 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Email; -import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import org.nuiton.validator.NuitonValidator; import org.nuiton.validator.NuitonValidatorFactory; import org.nuiton.validator.NuitonValidatorResult; +import com.franciaflex.faxtomail.persistence.entities.Email; +import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; + /** * To validate some incoming data using nuiton-validators. * Deleted: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/FakeLdapProvider.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/FakeLdapProvider.java 2014-06-02 15:45:55 UTC (rev 121) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/FakeLdapProvider.java 2014-06-02 18:45:22 UTC (rev 122) @@ -1,33 +0,0 @@ -package com.franciaflex.faxtomail.services.service.ldap; - -import java.util.Arrays; -import java.util.Collection; - -import com.unboundid.ldap.sdk.LDAPException; - -/** - * Fake ldap provider for test/demo purpose. - * - * @author Eric Chatellier - */ -public class FakeLdapProvider extends LdapProvider { - - @Override - public Collection<LdapUser> getAllLdapUsers() { - - LdapUser ldapUser1 = new LdapUser(); - ldapUser1.setLogin("user1"); - ldapUser1.addGroup("Groupe 1"); - - LdapUser ldapUser2 = new LdapUser(); - ldapUser2.setLogin("user2"); - ldapUser2.addGroup("Groupe 1"); - - LdapUser ldapUser3 = new LdapUser(); - ldapUser3.setLogin("user3"); - ldapUser3.addGroup("Groupe 2"); - - return Arrays.asList(ldapUser1, ldapUser2, ldapUser3); - } - -} Deleted: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapProvider.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapProvider.java 2014-06-02 15:45:55 UTC (rev 121) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapProvider.java 2014-06-02 18:45:22 UTC (rev 122) @@ -1,85 +0,0 @@ -package com.franciaflex.faxtomail.services.service.ldap; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import com.franciaflex.faxtomail.FaxToMailConfiguration; -import com.unboundid.ldap.sdk.LDAPConnection; -import com.unboundid.ldap.sdk.LDAPException; -import com.unboundid.ldap.sdk.SearchResult; -import com.unboundid.ldap.sdk.SearchResultEntry; -import com.unboundid.ldap.sdk.SearchScope; - -/** - * Real ldap provider. - * - * @author Eric Chatellier - */ -public class LdapProvider { - - protected FaxToMailConfiguration config; - - protected LdapProvider() { - - } - - public LdapProvider(FaxToMailConfiguration config) { - this(); - this.config = config; - } - - /** - * Get ldap connection. - * - * @return - * @throws LDAPException - */ - protected LDAPConnection getLDAPConnection() throws LDAPException { - // host, port, username and password - return new LDAPConnection(config.getLdapHost(), - config.getLdapPort(), - config.getLdapUser(), - config.getLdapPassword()); - } - - /** - * Get all user from ldap. - * - * @return ldap users with group infos - */ - public Collection<LdapUser> getAllLdapUsers() { - Collection<LdapUser> results = new ArrayList<>(); - - // ldapsearch -h ldap.codelutin.home -b "ou=People,DC=codelutin,DC=home" "objectClass=posixGroup" - // ldapsearch -h ldap.codelutin.home -b "ou=People,DC=codelutin,DC=home" "objectClass=account" - String baseDN = "ou=People,DC=codelutin,DC=home"; - String filter = "(objectClass=account)"; - - LDAPConnection connection = null; - try { - connection = getLDAPConnection(); - if (connection.isConnected()) { - SearchResult searchResult = connection.search(baseDN, SearchScope.ONE, filter); - - List<SearchResultEntry> searchEntries = searchResult.getSearchEntries(); - for (SearchResultEntry searchEntry : searchEntries) { - LdapUser user = new LdapUser(); - user.setLogin(searchEntry.getAttributeValue("uid")); - user.setLogin(searchEntry.getAttributeValue("uid")); - user.setLogin(searchEntry.getAttributeValue("uid")); - - results.add(user); - } - } - } catch (LDAPException ex) { - throw new RuntimeException("Can't connect to ldap", ex); - } finally { - if (connection != null) { - connection.close(); - } - } - - return results; - } -} 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-06-02 15:45:55 UTC (rev 121) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java 2014-06-02 18:45:22 UTC (rev 122) @@ -24,11 +24,13 @@ * #L% */ -import com.franciaflex.faxtomail.FaxToMailConfiguration; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; -import com.franciaflex.faxtomail.services.FaxToMailService; -import com.franciaflex.faxtomail.services.FaxToMailServiceContext; +import java.io.File; +import java.io.IOException; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.UUID; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.SystemUtils; @@ -38,13 +40,11 @@ import org.junit.After; import org.nuiton.util.FileUtil; -import java.io.File; -import java.io.IOException; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import com.franciaflex.faxtomail.FaxToMailConfiguration; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; +import com.franciaflex.faxtomail.services.FaxToMailService; +import com.franciaflex.faxtomail.services.FaxToMailServiceContext; public class AbstractFaxToMailServiceTest { 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-06-02 15:45:55 UTC (rev 121) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java 2014-06-02 18:45:22 UTC (rev 122) @@ -26,14 +26,14 @@ 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; import org.junit.Before; import org.junit.Test; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; + /** * @author Kevin Morin (Code Lutin) * @since x.x Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-02 15:45:55 UTC (rev 121) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-02 18:45:22 UTC (rev 122) @@ -33,14 +33,16 @@ import org.apache.commons.logging.LogFactory; import org.apache.struts2.convention.annotation.Result; -import com.franciaflex.faxtomail.persistence.entities.Action; import com.franciaflex.faxtomail.persistence.entities.Configuration; import com.franciaflex.faxtomail.persistence.entities.ConfigurationImpl; +import com.franciaflex.faxtomail.persistence.entities.ContextAction; import com.franciaflex.faxtomail.persistence.entities.EmailAccount; import com.franciaflex.faxtomail.persistence.entities.EtatAttente; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.Field; import com.franciaflex.faxtomail.persistence.entities.MailFilter; import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.MainAction; import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.MailFolderService; import com.franciaflex.faxtomail.services.service.ReferentielService; @@ -70,7 +72,7 @@ protected List<MailFilter> mailFilters; - protected List<String> groupNames; + protected List<FaxToMailUser> users; protected List<EmailAccount> emailAccounts; @@ -84,7 +86,7 @@ public String input() throws Exception { etatAttentes = referentielService.getAllEtatAttente(); mailFolders = mailFolderService.getRootMailFolders(); - groupNames = Collections.emptyList(); //FIXME: configurationService.getAllGroups(); + users = configurationService.getAllUsers(); emailAccounts = configurationService.getEmailAccounts(); mailFilters = configurationService.getMailFilters(); return INPUT; @@ -133,11 +135,15 @@ this.etatAttentes = getGson().fromJson(json, type); } - public Map<Action, String> getEtatAttenteActions() { - return getEnumAsMap(Action.values()); + public Map<MainAction, String> getMainActions() { + return getEnumAsMap(MainAction.values()); } - public Map<Field, String> getEtatAttenteFields() { + public Map<ContextAction, String> getContextActions() { + return getEnumAsMap(ContextAction.values()); + } + + public Map<Field, String> getFields() { return getEnumAsMap(Field.values()); } @@ -150,8 +156,8 @@ this.mailFolders = getGson().fromJson(json, type); } - public List<String> getGroupNames() { - return groupNames; + public List<FaxToMailUser> getUsers() { + return users; } public List<MailFilter> getMailFilters() { @@ -167,7 +173,7 @@ return emailAccounts; } - public void setEmailAccounts(String json) { + public void setEmailAccountsJson(String json) { Type type = new TypeToken<List<EmailAccount>>() {}.getType(); this.emailAccounts = getGson().fromJson(json, type); } Added: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java (rev 0) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java 2014-06-02 18:45:22 UTC (rev 122) @@ -0,0 +1,57 @@ +package com.franciaflex.faxtomail.web.action.admin; + +/* + * #%L + * FaxToMail :: Web + * $Id: UserFolderAction.java 121 2014-06-02 15:45:55Z echatellier $ + * $HeadURL: https://svn.codelutin.com/faxtomail/trunk/faxtomail-ui-web/src/main/java/co… $ + * %% + * 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.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts2.convention.annotation.Result; + +import com.franciaflex.faxtomail.services.service.LdapService; +import com.franciaflex.faxtomail.web.FaxToMailActionSupport; + +public class LdapAction extends FaxToMailActionSupport { + + private static final Log log = LogFactory.getLog(LdapAction.class); + + protected LdapService ldapService; + + public void setLdapService(LdapService ldapService) { + this.ldapService = ldapService; + } + + @Override + @org.apache.struts2.convention.annotation.Action("ldap-input") + public String input() throws Exception { + return INPUT; + } + + @Override + @org.apache.struts2.convention.annotation.Action(results = { + @Result(type = "redirectAction", params = {"actionName", "ldap-input"})}) + public String execute() throws Exception { + ldapService.updateLdapData(); + return SUCCESS; + } +} Property changes on: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/LdapJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/LdapJob.java 2014-06-02 15:45:55 UTC (rev 121) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/LdapJob.java 2014-06-02 18:45:22 UTC (rev 122) @@ -1,28 +0,0 @@ -package com.franciaflex.faxtomail.web.job; - -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; - -import com.franciaflex.faxtomail.services.FaxToMailServiceContext; -import com.franciaflex.faxtomail.services.service.LdapService; - -/** - * Ce job interroge périodiquement l'annuaire ldap pour mettre à jour la liste - * des comptes et des utilisateurs directement dans la base de données faxtomail. - * - * @author Eric Chatellier - */ -public class LdapJob extends AbstractFaxToMailJob { - - protected FaxToMailServiceContext serviceContext; - - @Override - public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { - serviceContext = getServiceContext(jobExecutionContext); - - LdapService ldapService = serviceContext.newService(LdapService.class); - ldapService.updateLdapData(); - - } - -} Modified: trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 2014-06-02 15:45:55 UTC (rev 121) +++ trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 2014-06-02 18:45:22 UTC (rev 122) @@ -1,9 +1,5 @@ -com.franciaflex.faxtomail.persistence.entities.Action.ARCHIVE=Archiver -com.franciaflex.faxtomail.persistence.entities.Action.GROUP=Grouper -com.franciaflex.faxtomail.persistence.entities.Action.PRINT=Imprimer -com.franciaflex.faxtomail.persistence.entities.Action.REPLY=Repondre -com.franciaflex.faxtomail.persistence.entities.Action.SAVE=Sauver -com.franciaflex.faxtomail.persistence.entities.Action.TRANSMIT=Transfer +com.franciaflex.faxtomail.persistence.entities.ContextAction.AUTO_SAVE=Sauver automatiquement +com.franciaflex.faxtomail.persistence.entities.ContextAction.CHANGE_PRIORITY=Changer la priorité com.franciaflex.faxtomail.persistence.entities.Field.ARCHIVE_DATE=Date d'archive com.franciaflex.faxtomail.persistence.entities.Field.ATTACHMENT=Pièces jointes com.franciaflex.faxtomail.persistence.entities.Field.CLIENT=Client @@ -24,4 +20,10 @@ com.franciaflex.faxtomail.persistence.entities.Field.RECIPIENT=Destinataire com.franciaflex.faxtomail.persistence.entities.Field.SENDER=Expéditeur com.franciaflex.faxtomail.persistence.entities.Field.TAKEN_BY=Pris par +com.franciaflex.faxtomail.persistence.entities.MainAction.ARCHIVE=Archiver +com.franciaflex.faxtomail.persistence.entities.MainAction.GROUP=Grouper +com.franciaflex.faxtomail.persistence.entities.MainAction.PRINT=Imprimer +com.franciaflex.faxtomail.persistence.entities.MainAction.REPLY=Repondre +com.franciaflex.faxtomail.persistence.entities.MainAction.SAVE=Sauver +com.franciaflex.faxtomail.persistence.entities.MainAction.TRANSMIT=Déplacer faxtomail.email.projectReference.default= Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-02 15:45:55 UTC (rev 121) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-02 18:45:22 UTC (rev 122) @@ -46,12 +46,15 @@ <script type="text/javascript"> angular.module('ConfigurationModule', ['FaxToMail', 'ui.tree', 'ui.sortable', 'ui.select2.sortable']) .value('ConfigurationData', { + // enums + 'mainActions': <s:property value="toJson(mainActions)" escapeHtml="false"/>, + 'contextActions': <s:property value="toJson(contextActions)" escapeHtml="false"/>, + 'fields': <s:property value="toJson(fields)" escapeHtml="false"/>, + // datas 'etatAttentes' : <s:property value="toJson(etatAttentes)" escapeHtml="false"/>, - 'etatAttenteActions': <s:property value="toJson(etatAttenteActions)" escapeHtml="false"/>, - 'etatAttenteFields': <s:property value="toJson(etatAttenteFields)" escapeHtml="false"/>, 'mailFolders': <s:property value="toJson(mailFolders)" escapeHtml="false"/>, 'searchDisplayColumns': <s:property value="toJson(configuration.searchDisplayColumns)" escapeHtml="false"/>, - 'groupNames': <s:property value="toJson(groupNames)" escapeHtml="false"/>, + 'users': <s:property value="toJson(users)" escapeHtml="false"/>, 'mailFilters': <s:property value="toJson(mailFilters)" escapeHtml="false"/>, 'emailAccounts': <s:property value="toJson(emailAccounts)" escapeHtml="false"/> }); @@ -90,9 +93,6 @@ <s:textfield name="configuration.emailMaxSize" label="Taille maximale des email (en bits)"/> - - <s:checkbox name="configuration.rejectUnknownSender" - label="Refuser les mails dont l'email est inconnu de la base client"/>  @@ -119,14 +119,14 @@ <div class="col-md-7" ng-if="selectedEtatAttente"> <h3>Édition de l'état d'attente {{selectedEtatAttente.label}}</h3> Champs obligatoires pour l'état d'attente : - <label class="checkbox" ng-repeat="(etatAttenteField,label) in etatAttenteFields"> - <input type="checkbox" ng-checked="selectedEtatAttente.fields.indexOf(etatAttenteField) != -1" - ng-click="changeEtatAttenteField(etatAttenteField)"> {{label}} + <label class="checkbox" ng-repeat="(field,label) in fields"> + <input type="checkbox" ng-checked="selectedEtatAttente.fields.indexOf(field) != -1" + ng-click="changeEtatAttenteField(field)"> {{label}} </label> Actions autorisées pour l'état d'attente : - <label class="checkbox" ng-repeat="(etatAttenteAction,label) in etatAttenteActions"> - <input type="checkbox" ng-checked="selectedEtatAttente.actions.indexOf(etatAttenteAction) != -1" - ng-click="changeEtatAttenteAction(etatAttenteAction)"> {{label}} + <label class="checkbox" ng-repeat="(mainAction,label) in mainActions"> + <input type="checkbox" ng-checked="selectedEtatAttente.mainActions.indexOf(mainAction) != -1" + ng-click="changeEtatAttenteAction(mainAction)"> {{label}} </label> </div> <div class="col-md-7" ng-if="!selectedEtatAttente"> @@ -321,9 +321,9 @@ </div> <div id="collapse5" class="panel-collapse collapse"> <div class="panel-body"> - <label class="checkbox" ng-repeat="(etatAttenteAction,label) in etatAttenteActions"> - <input type="checkbox" ng-checked="selectedMailFolder.folderActions.indexOf(etatAttenteAction) != -1" - ng-click="changeFolderAction(etatAttenteAction)"> {{label}} + <label class="checkbox" ng-repeat="(contextAction,label) in contextActions"> + <input type="checkbox" ng-checked="selectedMailFolder.contextActions.indexOf(contextAction) != -1" + ng-click="changeFolderAction(contextAction)"> {{label}} </label> </div> </div> @@ -334,7 +334,7 @@ <div class="panel-heading"> <h4 class="panel-title"> <a data-toggle="collapse" data-parent="#accordion" href="#collapse6"> - Configuration des colonnes a afficher + Configuration des colonnes à afficher </a> </h4> </div> @@ -396,6 +396,24 @@ </div> <div class="form-group"> + <label class="control-label">Refuser les mails dont l'email est inconnu de la base client</label><br /> + <label class="radio-inline"> + <input type="radio" name="rejectUnknownSenderField" + ng-model="selectedMailFolder.rejectUnknownSender" ng-value="true"> oui + </label> + <label class="radio-inline"> + <input type="radio" name="rejectUnknownSenderField" + ng-model="selectedMailFolder.rejectUnknownSender" ng-value="false"> non + </label> + <label class="radio-inline"> + <input type="radio" name="rejectUnknownSenderField" + ng-model="selectedMailFolder.rejectUnknownSender" ng-value="undefined"> valeur du noeud parent + </label> + </div> + + + + <div class="form-group"> <label for="ediFolderField">Dossier (FS) de dépôt des demandes EDI</label> <input type="text" class="form-control" id="ediFolderField" ng-model="selectedMailFolder.ediFolder"> </div> Added: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp (rev 0) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp 2014-06-02 18:45:22 UTC (rev 122) @@ -0,0 +1,54 @@ +<%-- + #%L + FaxToMail :: Web + $Id: user-folder-input.jsp 121 2014-06-02 15:45:55Z echatellier $ + $HeadURL: https://svn.codelutin.com/faxtomail/trunk/faxtomail-ui-web/src/main/webapp/… $ + %% + 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% + --%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<!DOCTYPE html> +<%@taglib uri="/struts-tags" prefix="s" %> + +<html> + <head> + <title>Ldap</title> + <link rel="stylesheet" type="text/css" href="<s:url value='/css/faxtomail.css' />" /> + + <script type="text/javascript" src="<s:url value='/js/faxtomail.js' />"></script> + </head> + + <body> + + <div id="main-container" class="container"> + + <h1 class="page-header">Ldap</h1> + + <s:form id="main_form" action="ldap" method="post"> + + <button type="submit" class="btn btn-primary navbar-btn">Mettre à jour les groupes et utilisateurs LDAP</button> + + <nav class="navbar navbar-default navbar-fixed-bottom"> +  + </nav> + </s:form> + </div> + </body> +</html> Property changes on: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp 2014-06-02 15:45:55 UTC (rev 121) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp 2014-06-02 18:45:22 UTC (rev 122) @@ -27,7 +27,7 @@ <html> <head> - <title>Import</title> + <title>Dossiers mis en avant par utilisateur</title> <link rel="stylesheet" type="text/css" href="<s:url value='/webjars/select2/3.4.8/select2.css' />" /> <link rel="stylesheet" type="text/css" href="<s:url value='/css/faxtomail.css' />" /> @@ -55,7 +55,7 @@ <h1 class="page-header">Dossiers mis en avant par utilisateur</h1> - <s:form id="main_form" action="user-folder" method="post" enctype="multipart/form-data" ng-controller="UserFolderController"> + <s:form id="main_form" action="user-folder" method="post" ng-controller="UserFolderController"> <s:hidden name="userFoldersJson" value="{{userFolders}}" /> <table id='table-snapshot' class="table table-bordered"> Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-06-02 15:45:55 UTC (rev 121) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-06-02 18:45:22 UTC (rev 122) @@ -52,11 +52,13 @@ </div> <nav class="collapse navbar-collapse" role="navigation"> <ul class="nav navbar-nav"> - <li><a href="<s:url action='configuration-input' />"> + <li><a href="<s:url action='ldap-input' namespace="/admin" />"> + <span class="glyphicon glyphicon-retweet"></span> Ldap</a></li> + <li><a href="<s:url action='configuration-input' namespace="/admin" />"> <span class="glyphicon glyphicon-cog"></span> Configuration</a></li> - <li><a href="<s:url action='import-input' />"> + <li><a href="<s:url action='import-input' namespace="/admin" />"> <span class="glyphicon glyphicon-upload"></span> Import</a></li> - <li><a href="<s:url action='user-folder-input' />"> + <li><a href="<s:url action='user-folder-input' namespace="/admin" />"> <span class="glyphicon glyphicon-th-list"></span> Dossiers utilisateur</a></li> </ul> </nav> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-02 15:45:55 UTC (rev 121) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-02 18:45:22 UTC (rev 122) @@ -27,16 +27,16 @@ */ FaxToMailModule.controller('ConfigurationController', ['$scope', '$http', 'ConfigurationData', function($scope, $http, ConfigurationData) { - //{Array} mail folders - $scope.mailFolders = ConfigurationData.mailFolders; //{Map} les actions possibles pour les etats d'attentes - $scope.etatAttenteActions = ConfigurationData.etatAttenteActions; + $scope.mainActions = ConfigurationData.mainActions; //{Map} les champs obligatoires possibles - $scope.etatAttenteFields = ConfigurationData.etatAttenteFields; + $scope.fields = ConfigurationData.fields; + //{Map} les actions contextuelles possibles pour les dossiers + $scope.contextActions = ConfigurationData.contextActions; //{Array} les etats d'attentes disponibles $scope.etatAttentes = ConfigurationData.etatAttentes; - // {Array} Liste des groupes ldap - $scope.groupNames = ConfigurationData.groupNames; + //{Array} mail folders + $scope.mailFolders = ConfigurationData.mailFolders; // method privée recursive pour retourner l'ensemble des dossiers var recursiveAddMailFolder = function(result, mailFolders) { @@ -103,24 +103,24 @@ }; // selection/deselection d'une action - $scope.changeEtatAttenteAction = function(etatAttenteAction) { + $scope.changeEtatAttenteAction = function(action) { - var index = $scope.selectedEtatAttente.actions.indexOf(etatAttenteAction); + var index = $scope.selectedEtatAttente.mainActions.indexOf(action); if (index != -1) { - $scope.selectedEtatAttente.actions.splice(index, 1); + $scope.selectedEtatAttente.mainActions.splice(index, 1); } else { - $scope.selectedEtatAttente.actions.push(etatAttenteAction); + $scope.selectedEtatAttente.mainActions.push(action); } }; // selection/deselection d'un champ - $scope.changeEtatAttenteField = function(etatAttenteField) { + $scope.changeEtatAttenteField = function(field) { - var index = $scope.selectedEtatAttente.fields.indexOf(etatAttenteField); + var index = $scope.selectedEtatAttente.fields.indexOf(field); if (index != -1) { $scope.selectedEtatAttente.fields.splice(index, 1); } else { - $scope.selectedEtatAttente.fields.push(etatAttenteField); + $scope.selectedEtatAttente.fields.push(field); } }; }]); @@ -177,7 +177,7 @@ angular.forEach($scope.selectedMailFolder.folderTableColumns, function(folderTableColumn) { $scope.folderTableColumns.push({ id: folderTableColumn, - label: $scope.etatAttenteFields[folderTableColumn] + label: $scope.fields[folderTableColumn] }); }); }; @@ -207,7 +207,7 @@ // fonction retournant l'ensemble des options disponibles $scope.getObjectsData = function(term, result) { var resultArray = []; - angular.forEach($scope.etatAttenteFields, function(label, field) { + angular.forEach($scope.fields, function(label, field) { resultArray.push({ id: field, label: label @@ -249,12 +249,12 @@ }; // selection/deselection d'une action possible du menu contextuel pour ce dossier - $scope.changeFolderAction = function(etatAttenteAction) { - var index = $scope.selectedMailFolder.folderActions.indexOf(etatAttenteAction); + $scope.changeFolderAction = function(contextAction) { + var index = $scope.selectedMailFolder.contextActions.indexOf(contextAction); if (index != -1) { - $scope.selectedMailFolder.folderActions.splice(index, 1); + $scope.selectedMailFolder.contextActions.splice(index, 1); } else { - $scope.selectedMailFolder.folderActions.push(etatAttenteAction); + $scope.selectedMailFolder.contextActions.push(contextAction); } }; }]); @@ -294,14 +294,14 @@ angular.forEach(ConfigurationData.searchDisplayColumns, function(searchDisplayColumn) { $scope.searchDisplayColumns.push({ id: searchDisplayColumn, - label: $scope.etatAttenteFields[searchDisplayColumn] + label: $scope.fields[searchDisplayColumn] }); }); // fonction retournant l'ensemble des options disponibles $scope.getObjectsData = function(term, result) { var resultArray = []; - angular.forEach($scope.etatAttenteFields, function(label, field) { + angular.forEach($scope.fields, function(label, field) { resultArray.push({ id: field, label: label

1 0

r121 - in trunk: . faxtomail-persistence/src/main/xmi faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin faxtomail-ui-web/src/main/webapp/js
by echatellier＠users.forge.codelutin.com 02 Jun '14

02 Jun '14

Author: echatellier Date: 2014-06-02 17:45:55 +0200 (Mon, 02 Jun 2014) New Revision: 121 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/121 Log: refs #4662: Sauvegarde de la mise en avant des dossiers utilisateur Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js trunk/pom.xml Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-02 11:05:24 UTC (rev 120) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-02 15:45:55 UTC (rev 121) @@ -24,6 +24,7 @@ * #L% */ +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -45,6 +46,8 @@ import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserTopiaDao; import com.franciaflex.faxtomail.persistence.entities.MailFilter; import com.franciaflex.faxtomail.persistence.entities.MailFilterTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.MailFolderTopiaDao; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import com.google.common.collect.Maps; @@ -174,6 +177,27 @@ public List<FaxToMailUser> getAllUsers() { FaxToMailUserTopiaDao faxToMailUserDao = getPersistenceContext().getFaxToMailUserDao(); - return faxToMailUserDao.findAll(); + return faxToMailUserDao.forAll().setOrderByArguments(FaxToMailUser.PROPERTY_FIRST_NAME, FaxToMailUser.PROPERTY_LAST_NAME).findAll(); } + + public void saveUserFolders(Map<String, Collection<MailFolder>> userFolders) { + log.warn("user folders = " + userFolders); + + //MailFolderTopiaDao mailFolderTopiaDao = getPersistenceContext().getMailFolderDao(); + FaxToMailUserTopiaDao faxToMailUserTopiaDao = getPersistenceContext().getFaxToMailUserDao(); + + for (Map.Entry<String, Collection<MailFolder>> entry : userFolders.entrySet()) { + String userId = entry.getKey(); + Collection<MailFolder> mailFolders = entry.getValue(); + + FaxToMailUser user = faxToMailUserTopiaDao.findByTopiaId(userId); + user.clearAffectedFolders(); + for (MailFolder mailFolder : mailFolders) { + user.addAffectedFolders(mailFolder); + } + faxToMailUserTopiaDao.update(user); + } + + getPersistenceContext().commit(); + } } Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java 2014-06-02 11:05:24 UTC (rev 120) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java 2014-06-02 15:45:55 UTC (rev 121) @@ -24,9 +24,13 @@ * #L% */ -import java.util.Collections; +import java.lang.reflect.Type; +import java.util.Collection; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.convention.annotation.Result; @@ -36,6 +40,7 @@ import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.MailFolderService; import com.franciaflex.faxtomail.web.FaxToMailActionSupport; +import com.google.gson.reflect.TypeToken; public class UserFolderAction extends FaxToMailActionSupport { @@ -49,6 +54,8 @@ protected List<FaxToMailUser> users; + protected Map<String, Collection<MailFolder>> userFolders; + public void setConfigurationService(ConfigurationService configurationService) { this.configurationService = configurationService; } @@ -62,6 +69,11 @@ public String input() throws Exception { mailFolders = mailFolderService.getAllMailFolders(); users = configurationService.getAllUsers(); + + userFolders = new HashMap<>(); + for (FaxToMailUser user : users) { + userFolders.put(user.getTopiaId(), CollectionUtils.emptyIfNull(user.getAffectedFolders())); + } return INPUT; } @@ -69,9 +81,9 @@ @org.apache.struts2.convention.annotation.Action(results = { @Result(type = "redirectAction", params = {"actionName", "user-folder-input"})}) public String execute() throws Exception { - String result = super.execute(); - return result; + configurationService.saveUserFolders(userFolders); + return SUCCESS; } public List<MailFolder> getMailFolders() { @@ -81,4 +93,13 @@ public List<FaxToMailUser> getUsers() { return users; } + + public Map<String, Collection<MailFolder>> getUserFolders() { + return userFolders; + } + + public void setUserFoldersJson(String json) { + Type type = new TypeToken<Map<String, Collection<MailFolder>>>() {}.getType(); + this.userFolders = getGson().fromJson(json, type); + } } Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp 2014-06-02 11:05:24 UTC (rev 120) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp 2014-06-02 15:45:55 UTC (rev 121) @@ -28,18 +28,23 @@ <html> <head> <title>Import</title> + <link rel="stylesheet" type="text/css" href="<s:url value='/webjars/select2/3.4.8/select2.css' />" /> <link rel="stylesheet" type="text/css" href="<s:url value='/css/faxtomail.css' />" /> + <script type="text/javascript" src="<s:url value='/webjars/select2/3.4.8/select2.min.js' />"></script> + <script type="text/javascript" src="<s:url value='/webjars/select2/3.4.8/select2_locale_fr.js' />"></script> <script type="text/javascript" src="<s:url value='/webjars/angularjs/1.2.16/angular.min.js' />"></script> + <script type="text/javascript" src="<s:url value='/js/select2sortable.js' />"></script> <script type="text/javascript" src="<s:url value='/js/faxtomail.js' />"></script> <script type="text/javascript" src="<s:url value='/js/user-folder.js' />"></script> <script type="text/javascript"> - angular.module('UserFolderModule', ['FaxToMail']) + angular.module('UserFolderModule', ['FaxToMail', 'ui.select2.sortable']) .value('UserFolderData', { 'mailFolders': <s:property value="toJson(mailFolders)" escapeHtml="false"/>, - 'users': <s:property value="toJson(users)" escapeHtml="false"/> + 'users': <s:property value="toJson(users)" escapeHtml="false"/>, + 'userFolders': <s:property value="toJson(userFolders)" escapeHtml="false"/> }); </script> </head> @@ -48,12 +53,12 @@ <div id="main-container" class="container" ng-app="UserFolderModule"> - <h1 class="page-header">Import</h1> + <h1 class="page-header">Dossiers mis en avant par utilisateur</h1> - <s:form id="main_form" action="import" method="post" enctype="multipart/form-data" ng-controller="UserFolderController"> + <s:form id="main_form" action="user-folder" method="post" enctype="multipart/form-data" ng-controller="UserFolderController"> + <s:hidden name="userFoldersJson" value="{{userFolders}}" /> <table id='table-snapshot' class="table table-bordered"> - <caption>Dossiers mis en avant par utilisateur</caption> <thead> <tr> <th>Utilisateur</th> @@ -62,9 +67,11 @@ </thead> <tbody> <tr ng-repeat="user in users"> - <th>{{user.login}}</th> + <th>{{user.firstName}} {{user.lastName}}</th> <td> - <input type="text" /> + <div class="controls"> + <input type="hidden" ui-select2-sortable ng-model="userFolders[user.topiaId]" simple-query="getObjectsData" multiple sortable> + </div> </td> </tr> </tbody> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js 2014-06-02 11:05:24 UTC (rev 120) +++ trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js 2014-06-02 15:45:55 UTC (rev 121) @@ -31,6 +31,8 @@ $scope.mailFolders = UserFolderData.mailFolders; // {Array} Liste des utilisateurs ldap $scope.users = UserFolderData.users; + //{Map} Topia id : mailFolders + $scope.userFolders = UserFolderData.userFolders; // method privée recursive pour retourner l'ensemble des dossiers var recursiveAddMailFolder = function(result, mailFolders) { @@ -48,4 +50,16 @@ recursiveAddMailFolder(flatMailFolders, $scope.mailFolders); return flatMailFolders; }; + + // fonction retournant l'ensemble des options disponibles + $scope.getObjectsData = function(term, result) { + var resultArray = []; + angular.forEach($scope.mailFolders, function(mailFolder) { + // select 2 require an id field + mailFolder.id = mailFolder.topiaId; + // select 2 can use 'name' for display, so it's ok + resultArray.push(mailFolder); + }); + result(resultArray); + }; }]); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-02 11:05:24 UTC (rev 120) +++ trunk/pom.xml 2014-06-02 15:45:55 UTC (rev 121) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.7</version> + <version>5.0.8</version> </parent> <groupId>com.franciaflex</groupId> @@ -97,7 +97,7 @@ <nuitonI18nVersion>3.1</nuitonI18nVersion> <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> - <nuitonCsvVersion>3.0-rc-1</nuitonCsvVersion> + <nuitonCsvVersion>3.0-rc-2</nuitonCsvVersion> <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> <nuitonUpdaterVersion>3.0-alpha-2</nuitonUpdaterVersion> <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> @@ -109,7 +109,7 @@ <hibernateVersion>4.3.5.Final</hibernateVersion> <h2Version>1.3.176</h2Version> - <jaxxVersion>2.8.6-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.8.6</jaxxVersion>  <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.15.1</xworkVersion> @@ -553,7 +553,7 @@ <dependency> <groupId>org.webjars</groupId> <artifactId>select2</artifactId> - <version>3.4.8</version> + <version>3.4.8-1</version> <scope>runtime</scope> </dependency>

1 0