March 2013 - Cantharella-commits - mailman.cloud.codelutin.com

Build failed in Jenkins: cantharella #131
by admin+hudson＠codelutin.com March 27, 2013

March 27, 2013

See <http://ci.nuiton.org/jenkins/job/cantharella/131/changes> Changes: [Éric Chatellier] Gerer la modification/suppression des documents sans passer par l'edition de l'entité contenante. ------------------------------------------ [...truncated 203 lines...] mojoSucceeded org.apache.maven.plugins:maven-antrun-plugin:1.7(generate-surefire-workdir) mojoStarted org.apache.maven.plugins:maven-resources-plugin:2.6(default-testResources) [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ cantharella.data --- [INFO] Not copying test resources mojoSucceeded org.apache.maven.plugins:maven-resources-plugin:2.6(default-testResources) mojoStarted org.apache.maven.plugins:maven-compiler-plugin:3.0(default-testCompile) [INFO] [INFO] --- maven-compiler-plugin:3.0:testCompile (default-testCompile) @ cantharella.data --- [INFO] Not compiling test sources mojoSucceeded org.apache.maven.plugins:maven-compiler-plugin:3.0(default-testCompile) mojoStarted org.apache.maven.plugins:maven-surefire-plugin:2.14(default-test) [INFO] [INFO] --- maven-surefire-plugin:2.14:test (default-test) @ cantharella.data --- [INFO] Tests are skipped. mojoSucceeded org.apache.maven.plugins:maven-surefire-plugin:2.14(default-test) mojoStarted org.apache.maven.plugins:maven-jar-plugin:2.4(default-jar) [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ cantharella.data --- [INFO] Building jar: <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.data/targ…> mojoSucceeded org.apache.maven.plugins:maven-jar-plugin:2.4(default-jar) mojoStarted org.apache.maven.plugins:maven-site-plugin:3.2(attach-descriptor) [INFO] [INFO] --- maven-site-plugin:3.2:attach-descriptor (attach-descriptor) @ cantharella.data --- mojoSucceeded org.apache.maven.plugins:maven-site-plugin:3.2(attach-descriptor) mojoStarted org.apache.maven.plugins:maven-install-plugin:2.4(default-install) [INFO] [INFO] --- maven-install-plugin:2.4:install (default-install) @ cantharella.data --- [INFO] Installing <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.data/targ…> to /var/local/maven/data/repository/nc/ird/cantharella.data/1.1-SNAPSHOT/cantharella.data-1.1-SNAPSHOT.jar [INFO] Installing <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.data/pom.…> to /var/local/maven/data/repository/nc/ird/cantharella.data/1.1-SNAPSHOT/cantharella.data-1.1-SNAPSHOT.pom mojoSucceeded org.apache.maven.plugins:maven-install-plugin:2.4(default-install) projectSucceeded nc.ird:cantharella.data:1.1-SNAPSHOT projectStarted nc.ird:cantharella.service:1.1-SNAPSHOT [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Cantharella :: Service 1.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ mojoStarted org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cantharella.service --- [INFO] Deleting <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.service/t…> mojoSucceeded org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) mojoStarted org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ cantharella.service --- mojoSucceeded org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) mojoStarted org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources) [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ cantharella.service --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 3 resources mojoSucceeded org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources) mojoStarted org.apache.maven.plugins:maven-dependency-plugin:2.7(unpack-code-formatter-conf) [INFO] [INFO] --- maven-dependency-plugin:2.7:unpack (unpack-code-formatter-conf) @ cantharella.service --- [INFO] Configured Artifact: nc.ird:cantharella:code-formatter-conf:1.1-SNAPSHOT:zip [INFO] Unpacking <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/target/cantharella-1.…> to <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.service/t…> with includes "**/*.xml" and excludes "" mojoSucceeded org.apache.maven.plugins:maven-dependency-plugin:2.7(unpack-code-formatter-conf) mojoStarted com.googlecode.maven-java-formatter-plugin:maven-java-formatter-plugin:0.3.1(default) [INFO] [INFO] --- maven-java-formatter-plugin:0.3.1:format (default) @ cantharella.service --- [INFO] Using 'UTF-8' encoding to format source files. [INFO] Number of files to be formatted: 63 mojoSucceeded com.googlecode.maven-java-formatter-plugin:maven-java-formatter-plugin:0.3.1(default)[INFO] Successfully formatted: 0 file(s) [INFO] Fail to format : 0 file(s) [INFO] Skipped : 63 file(s) [INFO] Approximate time taken: 0s mojoStarted org.apache.maven.plugins:maven-compiler-plugin:3.0(default-compile) [INFO] [INFO] --- maven-compiler-plugin:3.0:compile (default-compile) @ cantharella.service --- [INFO] Changes detected - recompiling the module! [INFO] Compiling 54 source files to <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.service/t…> mojoSucceeded org.apache.maven.plugins:maven-compiler-plugin:3.0(default-compile) mojoStarted org.apache.maven.plugins:maven-antrun-plugin:1.7(generate-surefire-workdir) [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ cantharella.service --- mojoSucceeded org.apache.maven.plugins:maven-antrun-plugin:1.7(generate-surefire-workdir)[INFO] Executing tasks main: [mkdir] Created dir: <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.service/t…> [INFO] Executed tasks mojoStarted org.apache.maven.plugins:maven-resources-plugin:2.6(default-testResources)[INFO] Not copying test resources [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ cantharella.service --- mojoSucceeded org.apache.maven.plugins:maven-resources-plugin:2.6(default-testResources) mojoStarted org.apache.maven.plugins:maven-compiler-plugin:3.0(default-testCompile) [INFO] [INFO] --- maven-compiler-plugin:3.0:testCompile (default-testCompile) @ cantharella.service --- [INFO] Not compiling test sources mojoSucceeded org.apache.maven.plugins:maven-compiler-plugin:3.0(default-testCompile) mojoStarted org.apache.maven.plugins:maven-surefire-plugin:2.14(default-test) [INFO] [INFO] --- maven-surefire-plugin:2.14:test (default-test) @ cantharella.service --- mojoSucceeded org.apache.maven.plugins:maven-surefire-plugin:2.14(default-test)[INFO] Tests are skipped. mojoStarted org.apache.maven.plugins:maven-jar-plugin:2.4(default-jar) [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ cantharella.service --- [INFO] Building jar: <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.service/t…> mojoSucceeded org.apache.maven.plugins:maven-jar-plugin:2.4(default-jar) mojoStarted org.apache.maven.plugins:maven-site-plugin:3.2(attach-descriptor) [INFO] [INFO] --- maven-site-plugin:3.2:attach-descriptor (attach-descriptor) @ cantharella.service --- mojoSucceeded org.apache.maven.plugins:maven-site-plugin:3.2(attach-descriptor) mojoStarted org.apache.maven.plugins:maven-install-plugin:2.4(default-install) [INFO] [INFO] --- maven-install-plugin:2.4:install (default-install) @ cantharella.service --- [INFO] Installing <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.service/t…> to /var/local/maven/data/repository/nc/ird/cantharella.service/1.1-SNAPSHOT/cantharella.service-1.1-SNAPSHOT.jar [INFO] Installing <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.service/p…> to /var/local/maven/data/repository/nc/ird/cantharella.service/1.1-SNAPSHOT/cantharella.service-1.1-SNAPSHOT.pom mojoSucceeded org.apache.maven.plugins:maven-install-plugin:2.4(default-install) projectSucceeded nc.ird:cantharella.service:1.1-SNAPSHOT projectStarted nc.ird:cantharella.web:1.1-SNAPSHOT [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Cantharella :: Web 1.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Deleting <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/target> mojoStarted org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cantharella.web --- mojoSucceeded org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) mojoStarted org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ cantharella.web --- mojoSucceeded org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) mojoStarted org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources) [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ cantharella.web --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 72 resources [INFO] Copying 5 resources mojoSucceeded org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources) mojoStarted org.apache.maven.plugins:maven-dependency-plugin:2.7(unpack-code-formatter-conf) [INFO] [INFO] --- maven-dependency-plugin:2.7:unpack (unpack-code-formatter-conf) @ cantharella.web --- [INFO] Configured Artifact: nc.ird:cantharella:code-formatter-conf:1.1-SNAPSHOT:zip [INFO] Unpacking <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/target/cantharella-1.…> to <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/target> with includes "**/*.xml" and excludes "" mojoSucceeded org.apache.maven.plugins:maven-dependency-plugin:2.7(unpack-code-formatter-conf) mojoStarted com.googlecode.maven-java-formatter-plugin:maven-java-formatter-plugin:0.3.1(default) [INFO] [INFO] --- maven-java-formatter-plugin:0.3.1:format (default) @ cantharella.web --- [INFO] Using 'UTF-8' encoding to format source files. [INFO] Number of files to be formatted: 119 [INFO] Successfully formatted: 0 file(s) [INFO] Fail to format : 0 file(s) [INFO] Skipped : 119 file(s) [INFO] Approximate time taken: 1s mojoSucceeded com.googlecode.maven-java-formatter-plugin:maven-java-formatter-plugin:0.3.1(default) mojoStarted org.apache.maven.plugins:maven-compiler-plugin:3.0(default-compile) [INFO] [INFO] --- maven-compiler-plugin:3.0:compile (default-compile) @ cantharella.web --- [INFO] Changes detected - recompiling the module! [INFO] Compiling 118 source files to <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/targe…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/src/m…>:[80,1] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/src/m…>:[80,3] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/src/m…>:[80,5] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/src/m…>:[80,9] illegal start of type [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/src/m…>:[80,10] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/src/m…>:[80,14] ';' expected [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/src/m…>:[81,40] not a statement [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/src/m…>:[83,1] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/src/m…>:[83,3] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/src/m…>:[83,5] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/src/m…>:[83,7] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/src/m…>:[86,1] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/src/m…>:[86,4] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/src/m…>:[86,7] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/src/m…>:[86,9] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/src/m…>:[86,10] not a statement [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/src/m…>:[86,14] ';' expected [INFO] 17 errors [INFO] ------------------------------------------------------------- mojoFailed org.apache.maven.plugins:maven-compiler-plugin:3.0(default-compile) projectFailed nc.ird:cantharella.web:1.1-SNAPSHOT sessionEnded [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Cantharella ....................................... SUCCESS [7.506s] [INFO] Cantharella :: Utils .............................. SUCCESS [6.767s] [INFO] Cantharella :: Data ............................... SUCCESS [5.910s] [INFO] Cantharella :: Service ............................ SUCCESS [3.971s] [INFO] Cantharella :: Web ................................ FAILURE [2.337s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 28.439s [INFO] Finished at: Wed Mar 27 15:17:01 CET 2013 [INFO] Final Memory: 34M/125M [INFO] ------------------------------------------------------------------------ Projects to build: [MavenProject: nc.ird:cantharella:1.1-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/pom.xml,> MavenProject: nc.ird:cantharella.utils:1.1-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.utils/pom…,> MavenProject: nc.ird:cantharella.data:1.1-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.data/pom.…,> MavenProject: nc.ird:cantharella.service:1.1-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.service/p…,> MavenProject: nc.ird:cantharella.web:1.1-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/pom.x…]> [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.utils/pom…> to /var/local/jenkins/data/jobs/cantharella/modules/nc.ird$cantharella.utils/builds/2013-03-27_15-16-27/archive/nc.ird/cantharella.utils/1.1-SNAPSHOT/cantharella.utils-1.1-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.utils/tar…> to /var/local/jenkins/data/jobs/cantharella/modules/nc.ird$cantharella.utils/builds/2013-03-27_15-16-27/archive/nc.ird/cantharella.utils/1.1-SNAPSHOT/cantharella.utils-1.1-SNAPSHOT.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.service/p…> to /var/local/jenkins/data/jobs/cantharella/modules/nc.ird$cantharella.service/builds/2013-03-27_15-16-27/archive/nc.ird/cantharella.service/1.1-SNAPSHOT/cantharella.service-1.1-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.service/t…> to /var/local/jenkins/data/jobs/cantharella/modules/nc.ird$cantharella.service/builds/2013-03-27_15-16-27/archive/nc.ird/cantharella.service/1.1-SNAPSHOT/cantharella.service-1.1-SNAPSHOT.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.data/pom.…> to /var/local/jenkins/data/jobs/cantharella/modules/nc.ird$cantharella.data/builds/2013-03-27_15-16-27/archive/nc.ird/cantharella.data/1.1-SNAPSHOT/cantharella.data-1.1-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.data/targ…> to /var/local/jenkins/data/jobs/cantharella/modules/nc.ird$cantharella.data/builds/2013-03-27_15-16-27/archive/nc.ird/cantharella.data/1.1-SNAPSHOT/cantharella.data-1.1-SNAPSHOT.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/pom.x…> to /var/local/jenkins/data/jobs/cantharella/modules/nc.ird$cantharella.web/builds/2013-03-27_15-16-27/archive/nc.ird/cantharella.web/1.1-SNAPSHOT/cantharella.web-1.1-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/pom.xml> to /var/local/jenkins/data/jobs/cantharella/modules/nc.ird$cantharella/builds/2013-03-27_15-16-27/archive/nc.ird/cantharella/1.1-SNAPSHOT/cantharella-1.1-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/target/cantharella-1.…> to /var/local/jenkins/data/jobs/cantharella/modules/nc.ird$cantharella/builds/2013-03-27_15-16-27/archive/nc.ird/cantharella/1.1-SNAPSHOT/cantharella-1.1-SNAPSHOT-site.xml [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/target/cantharella-1.…> to /var/local/jenkins/data/jobs/cantharella/modules/nc.ird$cantharella/builds/2013-03-27_15-16-27/archive/nc.ird/cantharella/1.1-SNAPSHOT/cantharella-1.1-SNAPSHOT-code-formatter-conf.zip Waiting for Jenkins to finish collecting data mavenExecutionResult exceptions not empty message : Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.0:compile (default-compile) on project cantharella.web: Compilation failure cause : Compilation failure Stack trace : org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.0:compile (default-compile) on project cantharella.web: Compilation failure at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:213) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:320) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156) at org.jvnet.hudson.maven3.launcher.Maven3Launcher.main(Maven3Launcher.java:79) 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:601) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:329) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:239) at org.jvnet.hudson.maven3.agent.Maven3Main.launch(Maven3Main.java:158) at hudson.maven.Maven3Builder.call(Maven3Builder.java:100) at hudson.maven.Maven3Builder.call(Maven3Builder.java:66) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:326) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) at java.util.concurrent.FutureTask.run(FutureTask.java:166) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603) at java.lang.Thread.run(Thread.java:722) Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:745) at org.apache.maven.plugin.compiler.CompilerMojo.execute(CompilerMojo.java:118) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:101) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:209) ... 27 more Sending e-mails to: cantharella-commits(a)list.forge.codelutin.com echatellier(a)codelutin.com channel stopped

1 6

Build failed in Jenkins: cantharella » Cantharella :: Web #131
by admin+hudson＠codelutin.com March 27, 2013

March 27, 2013

See <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.web/131/cha…> Changes: [Éric Chatellier] Gerer la modification/suppression des documents sans passer par l'edition de l'entité contenante. ------------------------------------------ projectStarted nc.ird:cantharella.web:1.1-SNAPSHOT [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Cantharella :: Web 1.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Deleting <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.web/ws/targ…> mojoStarted org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cantharella.web --- mojoSucceeded org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) mojoStarted org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ cantharella.web --- mojoSucceeded org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) mojoStarted org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources) [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ cantharella.web --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 72 resources [INFO] Copying 5 resources mojoSucceeded org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources) mojoStarted org.apache.maven.plugins:maven-dependency-plugin:2.7(unpack-code-formatter-conf) [INFO] [INFO] --- maven-dependency-plugin:2.7:unpack (unpack-code-formatter-conf) @ cantharella.web --- [INFO] Configured Artifact: nc.ird:cantharella:code-formatter-conf:1.1-SNAPSHOT:zip [INFO] Unpacking /var/local/jenkins/data/jobs/cantharella/workspace/trunk/target/cantharella-1.1-SNAPSHOT-code-formatter-conf.zip to <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.web/ws/targ…> with includes "**/*.xml" and excludes "" mojoSucceeded org.apache.maven.plugins:maven-dependency-plugin:2.7(unpack-code-formatter-conf) mojoStarted com.googlecode.maven-java-formatter-plugin:maven-java-formatter-plugin:0.3.1(default) [INFO] [INFO] --- maven-java-formatter-plugin:0.3.1:format (default) @ cantharella.web --- [INFO] Using 'UTF-8' encoding to format source files. [INFO] Number of files to be formatted: 119 [INFO] Successfully formatted: 0 file(s) [INFO] Fail to format : 0 file(s) [INFO] Skipped : 119 file(s) [INFO] Approximate time taken: 1s mojoSucceeded com.googlecode.maven-java-formatter-plugin:maven-java-formatter-plugin:0.3.1(default) mojoStarted org.apache.maven.plugins:maven-compiler-plugin:3.0(default-compile) [INFO] [INFO] --- maven-compiler-plugin:3.0:compile (default-compile) @ cantharella.web --- [INFO] Changes detected - recompiling the module! [INFO] Compiling 118 source files to <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.web/ws/targ…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.web/ws/src/…>:[80,1] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.web/ws/src/…>:[80,3] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.web/ws/src/…>:[80,5] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.web/ws/src/…>:[80,9] illegal start of type [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.web/ws/src/…>:[80,10] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.web/ws/src/…>:[80,14] ';' expected [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.web/ws/src/…>:[81,40] not a statement [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.web/ws/src/…>:[83,1] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.web/ws/src/…>:[83,3] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.web/ws/src/…>:[83,5] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.web/ws/src/…>:[83,7] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.web/ws/src/…>:[86,1] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.web/ws/src/…>:[86,4] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.web/ws/src/…>:[86,7] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.web/ws/src/…>:[86,9] illegal start of expression [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.web/ws/src/…>:[86,10] not a statement [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.web/ws/src/…>:[86,14] ';' expected [INFO] 17 errors [INFO] ------------------------------------------------------------- mojoFailed org.apache.maven.plugins:maven-compiler-plugin:3.0(default-compile) projectFailed nc.ird:cantharella.web:1.1-SNAPSHOT

1 6

r192 - in trunk/cantharella.web/src/main: java/nc/ird/cantharella/web/utils/data webapp/images
by echatellier＠users.forge.codelutin.com March 27, 2013

March 27, 2013

Author: echatellier Date: 2013-03-27 18:04:30 +0100 (Wed, 27 Mar 2013) New Revision: 192 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/192 Log: Add icone for csv export link Added: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/TableExportToolbar$ImageResourceLink.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/TableExportToolbar.html trunk/cantharella.web/src/main/webapp/images/csv_text.png Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/TableExportToolbar.java Added: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/TableExportToolbar$ImageResourceLink.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/TableExportToolbar$ImageResourceLink.html (rev 0) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/TableExportToolbar$ImageResourceLink.html 2013-03-27 17:04:30 UTC (rev 192) @@ -0,0 +1,31 @@ + +<!DOCTYPE html> +<html xmlns:wicket="http://wicket.apache.org"> +<body> +<wicket:panel> + <img wicket:id="img" alt="i" /> + <a wicket:id="link" ></a> +</wicket:panel> +</body> +</html> \ No newline at end of file Added: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/TableExportToolbar.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/TableExportToolbar.html (rev 0) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/TableExportToolbar.html 2013-03-27 17:04:30 UTC (rev 192) @@ -0,0 +1,31 @@ + + +<wicket:panel xmlns:wicket="http://wicket.apache.org"> + <tr class="export-tr"> + <td wicket:id="td" class="export-td"> + <span wicket:id="exportTo">[export to message]</span> + <span wicket:id="linkContainer"><span wicket:id="exportLink">[data format name]</span></span> + </td> + </tr> +</wicket:panel> \ No newline at end of file Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/TableExportToolbar.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/TableExportToolbar.java 2013-03-27 16:15:59 UTC (rev 191) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/TableExportToolbar.java 2013-03-27 17:04:30 UTC (rev 192) @@ -27,10 +27,26 @@ import java.util.Date; import java.util.Locale; +import nc.ird.cantharella.web.pages.domain.document.DocumentTooltipColumn; + +import org.apache.wicket.AttributeModifier; +import org.apache.wicket.Component; import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable; import org.apache.wicket.extensions.markup.html.repeater.data.table.export.CSVDataExporter; import org.apache.wicket.extensions.markup.html.repeater.data.table.export.ExportToolbar; +import org.apache.wicket.extensions.markup.html.repeater.data.table.export.IDataExporter; +import org.apache.wicket.extensions.markup.html.repeater.data.table.export.ExportToolbar.DataExportResourceStreamWriter; +import org.apache.wicket.markup.html.WebComponent; +import org.apache.wicket.markup.html.image.Image; +import org.apache.wicket.markup.html.link.Link; +import org.apache.wicket.markup.html.link.ResourceLink; +import org.apache.wicket.markup.html.panel.Panel; +import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; +import org.apache.wicket.request.resource.ContextRelativeResource; +import org.apache.wicket.request.resource.IResource; +import org.apache.wicket.request.resource.ResourceStreamResource; +import org.apache.wicket.util.resource.IResourceStream; /** * Cantharella customisation of wicket {@link ExportToolbar}. @@ -68,4 +84,53 @@ } addDataExporter(csvDataExporter); } + + /** + * Creates a new link to the exported data for the provided {@link IDataExporter}. + * + * @param componentId + * The component of the link. + * @param dataExporter + * The data exporter to use to export the data. + * @return a new link to the exported data for the provided {@link IDataExporter}. + */ + protected Component createExportLink(String componentId, final IDataExporter dataExporter) + { + IResource resource = new ResourceStreamResource() + { + @Override + protected IResourceStream getResourceStream() + { + return new DataExportResourceStreamWriter(dataExporter, getTable()); + } + }.setFileName(getFileNameModel().getObject() + "." + dataExporter.getFileNameExtension()); + + return new ImageResourceLink(componentId, resource, dataExporter); + } + + /** + * Panel which include a image. Used with the LinkableImagePropertyColumn$LinkablePanel.html file + */ + public class ImageResourceLink extends Panel { + + /** + * Constructor + * @param id Component id + * @param resource link resource + * @param dataExporter data exporter + */ + public ImageResourceLink(String id, IResource resource, IDataExporter dataExporter) { + super(id); + + ResourceLink<Void> link = new ResourceLink<Void>("link", resource); + link.setBody(dataExporter.getDataFormatNameModel()); + add(link); + + // add a link on <type>_text.png image + // for CSV : csv_text.png image + String type = dataExporter.getDataFormatNameModel().getObject().toLowerCase(); + WebComponent img = new Image("img", new ContextRelativeResource("images/" + type + "_text.png")); + add(img); + } + } } Added: trunk/cantharella.web/src/main/webapp/images/csv_text.png =================================================================== (Binary files differ) Property changes on: trunk/cantharella.web/src/main/webapp/images/csv_text.png ___________________________________________________________________ Added: svn:mime-type + image/png

1 0

r191 - in trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain: campagne document extraction lot molecule personne purification specimen station testBio
by echatellier＠users.forge.codelutin.com March 27, 2013

March 27, 2013

Author: echatellier Date: 2013-03-27 17:15:59 +0100 (Wed, 27 Mar 2013) New Revision: 191 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/191 Log: Ajout d'une tooltip sur les liens images de la collone documents attach?\195?\169s. Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ListCampagnesPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ListExtractionsPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ListLotsPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ListPersonnesPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ListPurificationsPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ListSpecimensPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ListStationsPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ListTestsBioPage.java Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ListCampagnesPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ListCampagnesPage.java 2013-03-27 15:21:42 UTC (rev 190) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ListCampagnesPage.java 2013-03-27 16:15:59 UTC (rev 191) @@ -122,7 +122,7 @@ getString("Campagne.codePays")), "codePays", "codePays", WebContext.COUNTRIES.get(getSession() .getLocale()))); - columns.add(new DocumentTooltipColumn<Campagne, String>(Model.of("")) { + columns.add(new DocumentTooltipColumn<Campagne, String>(Model.of(getString("ListDocumentsPage.AttachedDocuments"))) { @Override public void onClick(IModel<Campagne> model) { int idCampagne = model.getObject().getIdCampagne(); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java 2013-03-27 15:21:42 UTC (rev 190) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java 2013-03-27 16:15:59 UTC (rev 191) @@ -61,7 +61,9 @@ /** {@inheritDoc} */ @Override public Component getHeader(final String componentId) { - return new ImagePanel(componentId, Model.of("images/open_folder_yellow.png")); + ImagePanel panel = new ImagePanel(componentId, Model.of("images/open_folder_yellow.png")); + panel.add(new AttributeModifier("title", getDisplayModel())); + return panel; } /** {@inheritDoc} */ Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ListExtractionsPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ListExtractionsPage.java 2013-03-27 15:21:42 UTC (rev 190) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ListExtractionsPage.java 2013-03-27 16:15:59 UTC (rev 191) @@ -165,7 +165,7 @@ columns.add(new ExtraitsColumn(new Model<String>(templatePage.getString("Extraction.extraits")), templatePage .getLocale())); - columns.add(new DocumentTooltipColumn<Extraction, String>(Model.of("")) { + columns.add(new DocumentTooltipColumn<Extraction, String>(Model.of(templatePage.getString("ListDocumentsPage.AttachedDocuments"))) { @Override public void onClick(IModel<Extraction> model) { int idExtraction = model.getObject().getIdExtraction(); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ListLotsPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ListLotsPage.java 2013-03-27 15:21:42 UTC (rev 190) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ListLotsPage.java 2013-03-27 16:15:59 UTC (rev 191) @@ -196,7 +196,7 @@ .getString("Campagne.codePays")), "campagne.codePays", "campagne.codePays", WebContext.COUNTRIES .get(templatePage.getSession().getLocale()))); - columns.add(new DocumentTooltipColumn<Lot, String>(Model.of("")) { + columns.add(new DocumentTooltipColumn<Lot, String>(Model.of(templatePage.getString("ListDocumentsPage.AttachedDocuments"))) { @Override public void onClick(IModel<Lot> model) { int idLot = model.getObject().getIdLot(); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java 2013-03-27 15:21:42 UTC (rev 190) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java 2013-03-27 16:15:59 UTC (rev 191) @@ -191,7 +191,7 @@ columns.add(new PropertyColumn<MoleculeProvenanceBean, String>(new Model<String>(templatePage .getString("Molecule.provenance.programme")), "lot.campagne.programme", "lot.campagne.programme")); - columns.add(new DocumentTooltipColumn<MoleculeProvenanceBean, String>(Model.of("")) { + columns.add(new DocumentTooltipColumn<MoleculeProvenanceBean, String>(Model.of(templatePage.getString("ListDocumentsPage.AttachedDocuments"))) { @Override public void onClick(IModel<MoleculeProvenanceBean> model) { int idMolecule = model.getObject().getIdMolecule(); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ListPersonnesPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ListPersonnesPage.java 2013-03-27 15:21:42 UTC (rev 190) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ListPersonnesPage.java 2013-03-27 16:15:59 UTC (rev 191) @@ -152,7 +152,7 @@ } }); - columns.add(new DocumentTooltipColumn<Personne, String>(Model.of("")) { + columns.add(new DocumentTooltipColumn<Personne, String>(Model.of(getString("ListDocumentsPage.AttachedDocuments"))) { @Override public void onClick(IModel<Personne> model) { int idPersonne = model.getObject().getIdPersonne(); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ListPurificationsPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ListPurificationsPage.java 2013-03-27 15:21:42 UTC (rev 190) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ListPurificationsPage.java 2013-03-27 16:15:59 UTC (rev 191) @@ -177,7 +177,7 @@ } }); - columns.add(new DocumentTooltipColumn<Purification, String>(Model.of("")) { + columns.add(new DocumentTooltipColumn<Purification, String>(Model.of(templatePage.getString("ListDocumentsPage.AttachedDocuments"))) { @Override public void onClick(IModel<Purification> model) { int idPurification = model.getObject().getIdPurification(); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ListSpecimensPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ListSpecimensPage.java 2013-03-27 15:21:42 UTC (rev 190) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ListSpecimensPage.java 2013-03-27 16:15:59 UTC (rev 191) @@ -156,7 +156,7 @@ } }); - columns.add(new DocumentTooltipColumn<Specimen, String>(Model.of("")) { + columns.add(new DocumentTooltipColumn<Specimen, String>(Model.of(templatePage.getString("ListDocumentsPage.AttachedDocuments"))) { @Override public void onClick(IModel<Specimen> model) { int idSpecimen = model.getObject().getIdSpecimen(); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ListStationsPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ListStationsPage.java 2013-03-27 15:21:42 UTC (rev 190) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ListStationsPage.java 2013-03-27 16:15:59 UTC (rev 191) @@ -146,7 +146,7 @@ columns.add(new PropertyColumn<Station, String>(new Model<String>(templatePage.getString("Station.longitude")), "longitude", "longitude")); - columns.add(new DocumentTooltipColumn<Station, String>(Model.of("")) { + columns.add(new DocumentTooltipColumn<Station, String>(Model.of(templatePage.getString("ListDocumentsPage.AttachedDocuments"))) { @Override public void onClick(IModel<Station> model) { int idStation = model.getObject().getIdStation(); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ListTestsBioPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ListTestsBioPage.java 2013-03-27 15:21:42 UTC (rev 190) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ListTestsBioPage.java 2013-03-27 16:15:59 UTC (rev 191) @@ -199,7 +199,7 @@ } }); - columns.add(new DocumentTooltipColumn<ResultatTestBio, String>(Model.of("")) { + columns.add(new DocumentTooltipColumn<ResultatTestBio, String>(Model.of(templatePage.getString("ListDocumentsPage.AttachedDocuments"))) { @Override public void onClick(IModel<ResultatTestBio> model) { int idTestBio = model.getObject().getTestBio().getIdTestBio();

1 0

r190 - trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document
by echatellier＠users.forge.codelutin.com March 27, 2013

March 27, 2013

Author: echatellier Date: 2013-03-27 16:21:42 +0100 (Wed, 27 Mar 2013) New Revision: 190 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/190 Log: Ajout de fieldset pour les type de documents et la class quote pour les champs mis ?\195?\160 jour en ajax Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.html 2013-03-27 15:07:49 UTC (rev 189) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.html 2013-03-27 15:21:42 UTC (rev 190) @@ -67,23 +67,27 @@ <label for="Document.ajoutePar"><wicket:message key="Document.ajoutePar" /></label> <input type="text" id="Document.ajoutePar" wicket:id="Document.ajoutePar" /> </div> + + <fieldset> + <legend><wicket:message key="Document.typeDocument" /></legend> + + <div class="property required"> + <label for="Document.typeDocument"><wicket:message key="TypeDocument.nom" /></label> + <select id="Document.typeDocument" wicket:id="TypeDocument.nom" /> + </div> + + <div class="property"> + <label for="TypeDocument.domaine"><wicket:message key="TypeDocument.domaine" /></label> + <span class="quote" id="TypeDocument.domain" wicket:id="TypeDocument.domaine" /> + </div> + + <div class="property"> + <label for="TypeDocument.description"><wicket:message key="TypeDocument.description" /></label> + <span class="quote" id="TypeDocument.description" wicket:id="TypeDocument.description" /> + </div> + </fieldset> <div class="property required"> - <label for="Document.typeDocument"><wicket:message key="Document.typeDocument" /></label> - <select id="Document.typeDocument" wicket:id="Document.typeDocument" /> - </div> - - <div class="property"> - <label for="TypeDocument.domaine"><wicket:message key="TypeDocument.domaine" /></label> - <span id="TypeDocument.domain" wicket:id="TypeDocument.domaine" /> - </div> - - <div class="property"> - <label for="TypeDocument.description"><wicket:message key="TypeDocument.description" /></label> - <span id="TypeDocument.description" wicket:id="TypeDocument.description" /> - </div> - - <div class="property required"> <label for="Document.file"><wicket:message key="Document.file" /> <wicket:container wicket:id="Document.file.info"/></label> <input type="file" id="Document.file" wicket:id="Document.file" /> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java 2013-03-27 15:07:49 UTC (rev 189) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java 2013-03-27 15:21:42 UTC (rev 190) @@ -42,6 +42,7 @@ import nc.ird.cantharella.web.pages.domain.personne.ManagePersonnePage; import nc.ird.cantharella.web.utils.CallerPage; import nc.ird.cantharella.web.utils.behaviors.JSConfirmationBehavior; +import nc.ird.cantharella.web.utils.behaviors.ReplaceEmptyLabelBehavior; import nc.ird.cantharella.web.utils.forms.AutoCompleteTextFieldString; import nc.ird.cantharella.web.utils.forms.AutoCompleteTextFieldString.ComparisonMode; import nc.ird.cantharella.web.utils.forms.SubmittableButton; @@ -242,7 +243,7 @@ // Type de document final DropDownChoice<TypeDocument> typeDocumentChoice = new DropDownChoice<TypeDocument>( - "Document.typeDocument", new PropertyModel<TypeDocument>(documentModel, "typeDocument"), typeDocuments); + "TypeDocument.nom", new PropertyModel<TypeDocument>(documentModel, "typeDocument"), typeDocuments); typeDocumentChoice.setOutputMarkupId(true); typeDocumentChoice.setNullValid(false); formView.add(typeDocumentChoice); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.html 2013-03-27 15:07:49 UTC (rev 189) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.html 2013-03-27 15:21:42 UTC (rev 190) @@ -64,23 +64,27 @@ <span class="label"><wicket:message key="Document.ajoutePar" /></span> <span class="value" wicket:id="Document.ajoutePar" ></span> </div> - + + <fieldset> + <legend><wicket:message key="Document.typeDocument" /></legend> + + <div class="property"> + <span class="label"><wicket:message key="TypeDocument.nom" /></span> + <span class="value" wicket:id="TypeDocument.nom" ></span> + </div> + + <div class="property"> + <span class="label"><wicket:message key="TypeDocument.domaine" /></span> + <span class="value" wicket:id="TypeDocument.domaine" ></span> + </div> + + <div class="property"> + <span class="label"><wicket:message key="TypeDocument.description" /></span> + <span class="value" wicket:id="TypeDocument.description" ></span> + </div> + </fieldset> + <div class="property"> - <span class="label"><wicket:message key="Document.typeDocument" /></span> - <span class="value" wicket:id="Document.typeDocument" ></span> - </div> - - <div class="property"> - <span class="label"><wicket:message key="TypeDocument.domaine" /></span> - <span class="value" wicket:id="TypeDocument.domaine" ></span> - </div> - - <div class="property"> - <span class="label"><wicket:message key="TypeDocument.description" /></span> - <span class="value" wicket:id="TypeDocument.description" ></span> - </div> - - <div class="property"> <span class="label"><wicket:message key="Document.file" /></span> <span class="value" wicket:id="Document.file"></span> </div> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java 2013-03-27 15:07:49 UTC (rev 189) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java 2013-03-27 15:21:42 UTC (rev 190) @@ -110,7 +110,7 @@ .add(new ReplaceEmptyLabelBehavior())); add(new Label("Document.ajoutePar", new PropertyModel<String>(documentModel, "ajoutePar")) .add(new ReplaceEmptyLabelBehavior())); - add(new Label("Document.typeDocument", new PropertyModel<String>(documentModel, "typeDocument.nom")) + add(new Label("TypeDocument.nom", new PropertyModel<String>(documentModel, "typeDocument.nom")) .add(new ReplaceEmptyLabelBehavior())); add(new Label("TypeDocument.domaine", new PropertyModel<String>(documentModel, "typeDocument.domaine")) .add(new ReplaceEmptyLabelBehavior()));

1 0

r189 - in trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document: . panel
by echatellier＠users.forge.codelutin.com March 27, 2013

March 27, 2013

Author: echatellier Date: 2013-03-27 16:07:49 +0100 (Wed, 27 Mar 2013) New Revision: 189 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/189 Log: Ajout du message "Liste en vide" en ?\195?\169dition. Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java 2013-03-27 14:28:23 UTC (rev 188) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java 2013-03-27 15:07:49 UTC (rev 189) @@ -22,8 +22,6 @@ */ package nc.ird.cantharella.web.pages.domain.document; -import javax.inject.Inject; - import nc.ird.cantharella.data.exceptions.DataConstraintException; import nc.ird.cantharella.data.model.Document; import nc.ird.cantharella.data.model.utils.DocumentAttachable; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.html 2013-03-27 14:28:23 UTC (rev 188) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.html 2013-03-27 15:07:49 UTC (rev 189) @@ -70,7 +70,14 @@ </tr> </tbody> <tfoot> - <td colspan="5"><a wicket:id="NewDocument" class="add"><wicket:message key="ListDocumentsPage.NewDocument" /></a></td> + <tr wicket:id="ListDocumentsPage.AttachedDocuments.noTable"> + <td colspan="5"> + <wicket:message key="List.none" /> + </td> + </tr> + <tr wicket:id="ListDocumentsPage.AttachedDocuments.NewDocument"> + <td colspan="5"><a wicket:id="NewDocument" class="add"><wicket:message key="ListDocumentsPage.NewDocument" /></a></td> + </tr> </tfoot> </table> </fieldset> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java 2013-03-27 14:28:23 UTC (rev 188) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java 2013-03-27 15:07:49 UTC (rev 189) @@ -57,7 +57,7 @@ protected boolean updateOrDeleteEnabled; /** New Document link (for disable). */ - protected AjaxSubmitLink newDocumentLink; + protected MarkupContainer newDocumentMarkup; /** * Constructeur. @@ -126,8 +126,20 @@ }; documentsTable.add(documentsListView); - newDocumentLink = new AjaxSubmitLink("NewDocument") { + // Selon la non existence d'elements dans la liste on affiche le span + MarkupContainer noTableDocuments = new WebMarkupContainer("ListDocumentsPage.AttachedDocuments.noTable") { @Override + public boolean isVisible() { + return listDocumentModel.getObject().isEmpty(); + } + }; + documentsTable.add(noTableDocuments); + + newDocumentMarkup = new WebMarkupContainer("ListDocumentsPage.AttachedDocuments.NewDocument"); + documentsTable.add(newDocumentMarkup); + + AjaxSubmitLink newDocumentLink = new AjaxSubmitLink("NewDocument") { + @Override protected void onSubmit(AjaxRequestTarget request, Form<?> form) { setResponsePage(new ManageDocumentPage(currentPage, documentAttachableModel.getObject(), false)); } @@ -138,7 +150,7 @@ setResponsePage(new ManageDocumentPage(currentPage, documentAttachableModel.getObject(), false)); } }; - documentsTable.add(newDocumentLink); + newDocumentMarkup.add(newDocumentLink); } /** @@ -149,6 +161,6 @@ public void setUpdateOrDeleteEnabled(boolean updateOrDeleteEnabled) { this.updateOrDeleteEnabled = updateOrDeleteEnabled; - newDocumentLink.setVisibilityAllowed(updateOrDeleteEnabled); + newDocumentMarkup.setVisibilityAllowed(updateOrDeleteEnabled); } }

1 0

r188 - trunk/cantharella.web/src/main/resources
by echatellier＠users.forge.codelutin.com March 27, 2013

March 27, 2013

Author: echatellier Date: 2013-03-27 15:28:23 +0100 (Wed, 27 Mar 2013) New Revision: 188 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/188 Log: Amelioration des tailles d'unit?\195?\169s lors d'un d?\195?\169passement de taille accept?\195?\169e Modified: trunk/cantharella.web/src/main/resources/web_en.properties trunk/cantharella.web/src/main/resources/web_fr.properties Modified: trunk/cantharella.web/src/main/resources/web_en.properties =================================================================== --- trunk/cantharella.web/src/main/resources/web_en.properties 2013-03-27 14:11:48 UTC (rev 187) +++ trunk/cantharella.web/src/main/resources/web_en.properties 2013-03-27 14:28:23 UTC (rev 188) @@ -219,7 +219,7 @@ ManageDocumentPage.DeleteLater.OK=Document will be deleted on form submit ManageDocumentPage.Error.notAllowedExtension=File extension not allowed ManageDocumentPage.Error.emptyFile=File is mandatory -ManageDocumentPage.Form.uploadTooLarge=Document size can't be bigger than ${maxSize} +ManageDocumentPage.Form.uploadTooLarge=Document size can't be bigger than ${maxSize.megabytes()} Mb UpdateUtilisateurPage=Account management UpdateUtilisateurPage.Password=Password Modified: trunk/cantharella.web/src/main/resources/web_fr.properties =================================================================== --- trunk/cantharella.web/src/main/resources/web_fr.properties 2013-03-27 14:11:48 UTC (rev 187) +++ trunk/cantharella.web/src/main/resources/web_fr.properties 2013-03-27 14:28:23 UTC (rev 188) @@ -218,7 +218,7 @@ ManageDocumentPage.DeleteLater.OK=La suppression du document s'effectuera à la validation du formulaire ManageDocumentPage.Error.notAllowedExtension=Extension de fichier non autorisée ManageDocumentPage.Error.emptyFile=Le fichier est requis -ManageDocumentPage.Form.uploadTooLarge=La taille du document ne peut pas dépasser ${maxSize} +ManageDocumentPage.Form.uploadTooLarge=La taille du document ne peut pas dépasser ${maxSize.megabytes()} Mo UpdateUtilisateurPage=Gestion du compte UpdateUtilisateurPage.Password=Mot de passe

1 0

r187 - in trunk: cantharella.data/src/main/java/nc/ird/cantharella/data/model/search cantharella.service/src/main/java/nc/ird/cantharella/service/services cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel cantharella.web/src/main/resources
by echatellier＠users.forge.codelutin.com March 27, 2013

March 27, 2013

Author: echatellier Date: 2013-03-27 15:11:48 +0100 (Wed, 27 Mar 2013) New Revision: 187 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/187 Log: Gerer la modification/suppression des documents sans passer par l'edition de l'entit?\195?\169 contenante. Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/ProduitBridge.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/DocumentService.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/DocumentServiceImpl.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ReadListDocumentsPanel.java trunk/cantharella.web/src/main/resources/web_en.properties trunk/cantharella.web/src/main/resources/web_fr.properties Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/ProduitBridge.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/ProduitBridge.java 2013-03-27 12:42:48 UTC (rev 186) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/ProduitBridge.java 2013-03-27 14:11:48 UTC (rev 187) @@ -97,8 +97,8 @@ } document.add(new Field("produit.lot.campagne.nom", lot.getCampagne().getNom(), luceneOptions.getStore(), luceneOptions.getIndex(), luceneOptions.getTermVector())); - document.add(new Field("produit.lot.campagne.codePays", lot.getCampagne().getCodePays(), luceneOptions.getStore(), - luceneOptions.getIndex(), luceneOptions.getTermVector())); + document.add(new Field("produit.lot.campagne.codePays", lot.getCampagne().getCodePays(), luceneOptions + .getStore(), luceneOptions.getIndex(), luceneOptions.getTermVector())); // commons information for all produit List<LotPersonneDroits> personnesDroits = lot.getPersonnesDroits(); Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/DocumentService.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/DocumentService.java 2013-03-27 12:42:48 UTC (rev 186) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/DocumentService.java 2013-03-27 14:11:48 UTC (rev 187) @@ -28,7 +28,9 @@ import nc.ird.cantharella.data.exceptions.DataNotFoundException; import nc.ird.cantharella.data.model.Document; import nc.ird.cantharella.data.model.TypeDocument; +import nc.ird.cantharella.data.model.utils.DocumentAttachable; import nc.ird.cantharella.service.exceptions.InvalidFileExtensionException; +import nc.ird.cantharella.service.utils.normalizers.DocumentNormalizer; import nc.ird.cantharella.service.utils.normalizers.TypeDocumentNormalizer; import nc.ird.cantharella.service.utils.normalizers.UniqueFieldNormalizer; import nc.ird.cantharella.service.utils.normalizers.utils.Normalize; @@ -103,6 +105,13 @@ List<String> listDocumentContrainteLegales(); /** + * Modify a document attachable + * @param documentAttachable The document attachable to modify + * @throws DataConstraintException If an unique constraint is broken with another document + */ + void updateDocumentAttachable(DocumentAttachable documentAttachable) throws DataConstraintException; + + /** * Manage attached file data as image and image thumbnail if possible. * * @param document current document Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/DocumentServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/DocumentServiceImpl.java 2013-03-27 12:42:48 UTC (rev 186) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/DocumentServiceImpl.java 2013-03-27 14:11:48 UTC (rev 187) @@ -39,6 +39,8 @@ import nc.ird.cantharella.data.exceptions.UnexpectedException; import nc.ird.cantharella.data.model.Document; import nc.ird.cantharella.data.model.TypeDocument; +import nc.ird.cantharella.data.model.utils.AbstractModel; +import nc.ird.cantharella.data.model.utils.DocumentAttachable; import nc.ird.cantharella.service.exceptions.InvalidFileExtensionException; import nc.ird.cantharella.service.services.DocumentService; import nc.ird.cantharella.utils.AssertTools; @@ -130,6 +132,22 @@ /** {@inheritDoc} */ @Override + public void updateDocumentAttachable(DocumentAttachable documentAttachable) throws DataConstraintException { + AssertTools.assertNotNull(documentAttachable); + LOG.info("updateDocumentAttachable: " + documentAttachable.toString()); + try { + // DocumentAttachable est une interface mais toutes + // les entity qui en herite herite aussi de AbstractModel + dao.update((AbstractModel) documentAttachable); + } catch (DataNotFoundException e) { + LOG.error(e.getMessage(), e); + throw new UnexpectedException(e); + } + + } + + /** {@inheritDoc} */ + @Override @SuppressWarnings("unchecked") public List<String> listDocumentEditeurs() { List<String> result = (List<String>) dao.list(DocumentDao.CRITERIA_DISTINCT_DOCUMENT_EDITEURS); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java 2013-03-27 12:42:48 UTC (rev 186) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java 2013-03-27 14:11:48 UTC (rev 187) @@ -77,13 +77,22 @@ */ public class ManageDocumentPage extends TemplatePage { - /** Action : create */ + /** Action : create later (delegate to entity cascade). */ + private static final String ACTION_CREATE_LATER = "CreateLater"; + + /** Action : delete later (delegate to entity cascade). */ + private static final String ACTION_DELETE_LATER = "DeleteLater"; + + /** Action : update later (delegate to entity cascade). */ + private static final String ACTION_UPDATE_LATER = "UpdateLater"; + + /** Action : create. */ private static final String ACTION_CREATE = "Create"; - /** Action : delete */ + /** Action : delete. */ private static final String ACTION_DELETE = "Delete"; - /** Action : update */ + /** Action : update. */ private static final String ACTION_UPDATE = "Update"; /** Model : document. */ @@ -104,6 +113,9 @@ /** Caller page. */ private final CallerPage callerPage; + /** Update with service flag. */ + private boolean updateWithService; + /** * Constructeur (mode création) * @param callerPage Page appelante @@ -111,7 +123,7 @@ * @param multipleEntry Saisie multiple */ public ManageDocumentPage(CallerPage callerPage, DocumentAttachable documentAttachable, boolean multipleEntry) { - this(null, documentAttachable, callerPage, multipleEntry); + this(null, documentAttachable, callerPage, multipleEntry, false); } /** @@ -119,9 +131,11 @@ * @param document document to edit * @param documentAttachable document sur le * @param callerPage Page appelante + * @param updateWithService if {@code true} should update entity with service */ - public ManageDocumentPage(Document document, DocumentAttachable documentAttachable, CallerPage callerPage) { - this(document, documentAttachable, callerPage, false); + public ManageDocumentPage(Document document, DocumentAttachable documentAttachable, CallerPage callerPage, + boolean updateWithService) { + this(document, documentAttachable, callerPage, false, updateWithService); } /** @@ -135,9 +149,10 @@ * @param multipleEntry Saisie multiple */ private ManageDocumentPage(Document document, final DocumentAttachable documentAttachable, - final CallerPage callerPage, boolean multipleEntry) { + final CallerPage callerPage, boolean multipleEntry, final boolean updateWithService) { super(ManageDocumentPage.class); this.callerPage = callerPage; + this.updateWithService = updateWithService; final CallerPage currentPage = new CallerPage(this); @@ -278,13 +293,15 @@ @Override public void onProcess() throws DataConstraintException { + // document can only be created from an attached entity Document document = documentModel.getObject(); documentAttachable.addDocument(document); } @Override public void onSuccess() { - successNextPage(ACTION_CREATE); + // document can only be created from an attached entity + successNextPage(ACTION_CREATE_LATER); redirect(); } }); @@ -295,12 +312,18 @@ Button updateButton = new SubmittableButton(ACTION_UPDATE, new SubmittableButtonEvents() { @Override public void onProcess() throws DataConstraintException { - // nothing, will be updated by cascade + if (updateWithService) { + documentService.updateDocumentAttachable(documentAttachable); + } // otherwise, nothing, will be updated by cascade } @Override public void onSuccess() { - successNextPage(ACTION_UPDATE); + if (updateWithService) { + successNextPage(ACTION_UPDATE); + } else { + successNextPage(ACTION_UPDATE_LATER); + } callerPage.responsePage((TemplatePage) getPage()); } @@ -316,13 +339,29 @@ Button deleteButton = new SubmittableButton(ACTION_DELETE, new SubmittableButtonEvents() { @Override public void onProcess() throws DataConstraintException { - documentAttachable.removeDocument(documentModel.getObject()); + Document document = documentModel.getObject(); + if (updateWithService) { + documentAttachable.removeDocument(document); + documentService.updateDocumentAttachable(documentAttachable); + } else { + // remove document from attached entity + // and save will be performed by cascade + documentAttachable.removeDocument(document); + } } @Override public void onSuccess() { - successNextPage(ACTION_DELETE); - callerPage.responsePage((TemplatePage) getPage()); + if (updateWithService) { + successNextPage(ACTION_DELETE); + // first getPage() is read document + // it has been deleted so go to previous one + callerPage.responsePage((TemplatePage) getPage().getPage()); + } else { + successNextPage(ACTION_DELETE_LATER); + callerPage.responsePage((TemplatePage) getPage()); + } + } }); deleteButton.setVisibilityAllowed(!createMode); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java 2013-03-27 12:42:48 UTC (rev 186) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java 2013-03-27 14:11:48 UTC (rev 187) @@ -22,9 +22,12 @@ */ package nc.ird.cantharella.web.pages.domain.document; +import javax.inject.Inject; + import nc.ird.cantharella.data.exceptions.DataConstraintException; import nc.ird.cantharella.data.model.Document; import nc.ird.cantharella.data.model.utils.DocumentAttachable; +import nc.ird.cantharella.service.services.DocumentService; import nc.ird.cantharella.web.config.WebContext; import nc.ird.cantharella.web.pages.TemplatePage; import nc.ird.cantharella.web.pages.domain.document.panel.DocumentLinkPanel; @@ -43,6 +46,7 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; +import org.apache.wicket.spring.injection.annot.SpringBean; /** * Document read page. @@ -51,12 +55,19 @@ */ public class ReadDocumentPage extends TemplatePage { - /** Action : delete */ + /** Action : delete later (delegate to entity cascade). */ + public static final String ACTION_DELETE_LATER = "DeleteLater"; + + /** Action : delete. */ public static final String ACTION_DELETE = "Delete"; /** Model : document */ private final IModel<Document> documentModel; + /** Service : document */ + @SpringBean + private DocumentService documentService; + /** Caller page. */ private final CallerPage callerPage; @@ -74,9 +85,10 @@ * @param document document * @param documentAttachable entity where document is attached to * @param callerPage caller page + * @param fromEditEntity page called from entity in edition mode */ public ReadDocumentPage(final Document document, final DocumentAttachable documentAttachable, - final CallerPage callerPage) { + final CallerPage callerPage, final boolean fromEditEntity) { super(ReadDocumentPage.class); this.callerPage = callerPage; final CallerPage currentPage = new CallerPage(this); @@ -120,7 +132,8 @@ .getObject())) { @Override public void onClick() { - setResponsePage(new ManageDocumentPage(getModelObject(), documentAttachable, currentPage)); + setResponsePage(new ManageDocumentPage(getModelObject(), documentAttachable, currentPage, + !fromEditEntity)); } }; formView.add(updateLink); @@ -130,11 +143,18 @@ @Override public void onProcess() throws DataConstraintException { documentAttachable.removeDocument(documentModel.getObject()); + if (!fromEditEntity) { + documentService.updateDocumentAttachable(documentAttachable); + } } @Override public void onSuccess() { - successNextPage(ManageDocumentPage.class, ACTION_DELETE); + if (!fromEditEntity) { + successNextPage(ManageDocumentPage.class, ACTION_DELETE); + } else { + successNextPage(ManageDocumentPage.class, ACTION_DELETE_LATER); + } redirect(); } }); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java 2013-03-27 12:42:48 UTC (rev 186) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java 2013-03-27 14:11:48 UTC (rev 187) @@ -65,7 +65,8 @@ * @param documentAttachableModel entity model where documents are attached to * @param currentPage currentPage */ - public ManageListDocumentsPanel(String id, final IModel<? extends DocumentAttachable> documentAttachableModel, final CallerPage currentPage) { + public ManageListDocumentsPanel(String id, final IModel<? extends DocumentAttachable> documentAttachableModel, + final CallerPage currentPage) { super(id, documentAttachableModel); // edit mode enabled by default @@ -78,7 +79,8 @@ documentsTable.setOutputMarkupId(true); formView.add(documentsTable); - final IModel<List<Document>> listDocumentModel = new PropertyModel<List<Document>>(documentAttachableModel, "documents"); + final IModel<List<Document>> listDocumentModel = new PropertyModel<List<Document>>(documentAttachableModel, + "documents"); // Contenu tableaux provenance ListView<Document> documentsListView = new ListView<Document>("ListDocumentsPage.AttachedDocuments.List", @@ -95,7 +97,7 @@ @Override public void onClick() { ReadDocumentPage readDocumentPage = new ReadDocumentPage(documentModel.getObject(), - documentAttachableModel.getObject(), currentPage); + documentAttachableModel.getObject(), currentPage, true); readDocumentPage.setUpdateOrDeleteEnabled(updateOrDeleteEnabled); setResponsePage(readDocumentPage); } Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ReadListDocumentsPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ReadListDocumentsPanel.java 2013-03-27 12:42:48 UTC (rev 186) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ReadListDocumentsPanel.java 2013-03-27 14:11:48 UTC (rev 187) @@ -52,14 +52,16 @@ * @param documentAttachableModel document attachable model * @param currentPage current page */ - public ReadListDocumentsPanel(String id, final IModel<? extends DocumentAttachable> documentAttachableModel, final CallerPage currentPage) { + public ReadListDocumentsPanel(String id, final IModel<? extends DocumentAttachable> documentAttachableModel, + final CallerPage currentPage) { super(id, documentAttachableModel); final MarkupContainer documentsTable = new WebMarkupContainer("ListDocumentsPage.AttachedDocuments.Table"); documentsTable.setOutputMarkupId(true); add(documentsTable); - final IModel<List<Document>> listDocumentModel = new PropertyModel<List<Document>>(documentAttachableModel, "documents"); + final IModel<List<Document>> listDocumentModel = new PropertyModel<List<Document>>(documentAttachableModel, + "documents"); // Contenu tableaux provenance ListView<Document> documentsListView = new ListView<Document>("ListDocumentsPage.AttachedDocuments.List", @@ -75,7 +77,8 @@ Link<Document> documentLink = new Link<Document>("Document.titre.List") { @Override public void onClick() { - setResponsePage(new ReadDocumentPage(documentModel.getObject(), documentAttachableModel.getObject(), currentPage)); + setResponsePage(new ReadDocumentPage(documentModel.getObject(), documentAttachableModel + .getObject(), currentPage, false)); } }; documentLink.add(new Label("Document.titre.Label.List", new PropertyModel<Document>(documentModel, Modified: trunk/cantharella.web/src/main/resources/web_en.properties =================================================================== --- trunk/cantharella.web/src/main/resources/web_en.properties 2013-03-27 12:42:48 UTC (rev 186) +++ trunk/cantharella.web/src/main/resources/web_en.properties 2013-03-27 14:11:48 UTC (rev 187) @@ -211,11 +211,14 @@ ManageTestBioPage.Delete.DataConstraintException=There are data linked to this biassay ManageDocumentPage=Document management -ManageDocumentPage.Create.OK=Document will be saved on form submit -ManageDocumentPage.Update.OK=Document will be updated on form submit +ManageDocumentPage.Create.OK=Document added +ManageDocumentPage.CreateLater.OK=Document will be saved on form submit +ManageDocumentPage.Update.OK=Document updated +ManageDocumentPage.UpdateLater.OK=Document will be updated on form submit +ManageDocumentPage.Delete.OK=Document deleted +ManageDocumentPage.DeleteLater.OK=Document will be deleted on form submit ManageDocumentPage.Error.notAllowedExtension=File extension not allowed ManageDocumentPage.Error.emptyFile=File is mandatory -ManageDocumentPage.Delete.OK=Document will be deleted on form submit ManageDocumentPage.Form.uploadTooLarge=Document size can't be bigger than ${maxSize} UpdateUtilisateurPage=Account management Modified: trunk/cantharella.web/src/main/resources/web_fr.properties =================================================================== --- trunk/cantharella.web/src/main/resources/web_fr.properties 2013-03-27 12:42:48 UTC (rev 186) +++ trunk/cantharella.web/src/main/resources/web_fr.properties 2013-03-27 14:11:48 UTC (rev 187) @@ -210,9 +210,12 @@ ManageTestBioPage.Delete.DataConstraintException=Il existe des données liées à ce test biologique ManageDocumentPage=Gestion d'un document -ManageDocumentPage.Create.OK=L'enregistrement du document s'effectuera à la validation du formulaire -ManageDocumentPage.Update.OK=La modification du document s'effectuera à la validation du formulaire -ManageDocumentPage.Delete.OK=La suppression du document s'effectuera à la validation du formulaire +ManageDocumentPage.Create.OK=Document ajouté +ManageDocumentPage.CreateLater.OK=L'enregistrement du document s'effectuera à la validation du formulaire +ManageDocumentPage.Update.OK=Document mis à jour +ManageDocumentPage.UpdateLater.OK=La modification du document s'effectuera à la validation du formulaire +ManageDocumentPage.Delete.OK=Document supprimé +ManageDocumentPage.DeleteLater.OK=La suppression du document s'effectuera à la validation du formulaire ManageDocumentPage.Error.notAllowedExtension=Extension de fichier non autorisée ManageDocumentPage.Error.emptyFile=Le fichier est requis ManageDocumentPage.Form.uploadTooLarge=La taille du document ne peut pas dépasser ${maxSize}

1 0

r186 - in trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain: campagne document/panel extraction lot molecule personne purification specimen station testBio
by echatellier＠users.forge.codelutin.com March 27, 2013

March 27, 2013

Author: echatellier Date: 2013-03-27 13:42:48 +0100 (Wed, 27 Mar 2013) New Revision: 186 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/186 Log: Instanciate read/modify list document panel with model for wicket to update it. Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ReadCampagnePage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ReadListDocumentsPanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ManageExtractionPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ReadExtractionPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ManageLotPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ManagePersonnePage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ReadPersonnePage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ManagePurificationPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ReadPurificationPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ManageSpecimenPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ReadSpecimenPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ManageStationPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ReadStationPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ManageTestBioPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ReadTestBioPage.java Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java 2013-03-27 11:22:40 UTC (rev 185) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java 2013-03-27 12:42:48 UTC (rev 186) @@ -263,7 +263,7 @@ // add list document panel ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel", - campagneModel.getObject(), currentPage); + campagneModel, currentPage); manageListDocumentsPanel.setUpdateOrDeleteEnabled(createMode || campagneService.updateOrdeleteCampagneEnabled(campagneModel.getObject(), getSession() .getUtilisateur())); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ReadCampagnePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ReadCampagnePage.java 2013-03-27 11:22:40 UTC (rev 185) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ReadCampagnePage.java 2013-03-27 12:42:48 UTC (rev 186) @@ -137,7 +137,7 @@ // add list document panel ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel", - campagneModel.getObject(), currentPage); + campagneModel, currentPage); add(readListDocumentsPanel); // Ajout du formulaire pour les actions Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java 2013-03-27 11:22:40 UTC (rev 185) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java 2013-03-27 12:42:48 UTC (rev 186) @@ -62,11 +62,12 @@ /** * Constructeur. * @param id ID - * @param documentAttachable entity where documents are attached to + * @param documentAttachableModel entity model where documents are attached to * @param currentPage currentPage */ - public ManageListDocumentsPanel(String id, final DocumentAttachable documentAttachable, final CallerPage currentPage) { - super(id); + public ManageListDocumentsPanel(String id, final IModel<? extends DocumentAttachable> documentAttachableModel, final CallerPage currentPage) { + super(id, documentAttachableModel); + // edit mode enabled by default this.updateOrDeleteEnabled = true; @@ -77,11 +78,11 @@ documentsTable.setOutputMarkupId(true); formView.add(documentsTable); - final IModel<List<Document>> documentModel = new PropertyModel<List<Document>>(documentAttachable, "documents"); + final IModel<List<Document>> listDocumentModel = new PropertyModel<List<Document>>(documentAttachableModel, "documents"); // Contenu tableaux provenance ListView<Document> documentsListView = new ListView<Document>("ListDocumentsPage.AttachedDocuments.List", - documentModel) { + listDocumentModel) { @Override protected void populateItem(ListItem<Document> item) { if (item.getIndex() % 2 == 1) { @@ -94,7 +95,7 @@ @Override public void onClick() { ReadDocumentPage readDocumentPage = new ReadDocumentPage(documentModel.getObject(), - documentAttachable, currentPage); + documentAttachableModel.getObject(), currentPage); readDocumentPage.setUpdateOrDeleteEnabled(updateOrDeleteEnabled); setResponsePage(readDocumentPage); } @@ -112,7 +113,7 @@ @Override protected void onSubmit(AjaxRequestTarget target, Form<?> form) { Document document = documentModel.getObject(); - documentAttachable.removeDocument(document); + documentAttachableModel.getObject().removeDocument(document); if (target != null) { target.add(documentsTable); @@ -126,13 +127,13 @@ newDocumentLink = new AjaxSubmitLink("NewDocument") { @Override protected void onSubmit(AjaxRequestTarget request, Form<?> form) { - setResponsePage(new ManageDocumentPage(currentPage, documentAttachable, false)); + setResponsePage(new ManageDocumentPage(currentPage, documentAttachableModel.getObject(), false)); } // si erreur, le formulaire est également enregistré puis la redirection effectuée @Override protected void onError(AjaxRequestTarget target, Form<?> form) { - setResponsePage(new ManageDocumentPage(currentPage, documentAttachable, false)); + setResponsePage(new ManageDocumentPage(currentPage, documentAttachableModel.getObject(), false)); } }; documentsTable.add(newDocumentLink); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ReadListDocumentsPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ReadListDocumentsPanel.java 2013-03-27 11:22:40 UTC (rev 185) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ReadListDocumentsPanel.java 2013-03-27 12:42:48 UTC (rev 186) @@ -49,21 +49,21 @@ /** * Constructeur * @param id ID - * @param documentAttachable document attachable + * @param documentAttachableModel document attachable model * @param currentPage current page */ - public ReadListDocumentsPanel(String id, final DocumentAttachable documentAttachable, final CallerPage currentPage) { - super(id); + public ReadListDocumentsPanel(String id, final IModel<? extends DocumentAttachable> documentAttachableModel, final CallerPage currentPage) { + super(id, documentAttachableModel); final MarkupContainer documentsTable = new WebMarkupContainer("ListDocumentsPage.AttachedDocuments.Table"); documentsTable.setOutputMarkupId(true); add(documentsTable); - final IModel<List<Document>> documentModel = new PropertyModel<List<Document>>(documentAttachable, "documents"); + final IModel<List<Document>> listDocumentModel = new PropertyModel<List<Document>>(documentAttachableModel, "documents"); // Contenu tableaux provenance ListView<Document> documentsListView = new ListView<Document>("ListDocumentsPage.AttachedDocuments.List", - documentModel) { + listDocumentModel) { @Override protected void populateItem(ListItem<Document> item) { if (item.getIndex() % 2 == 1) { @@ -75,7 +75,7 @@ Link<Document> documentLink = new Link<Document>("Document.titre.List") { @Override public void onClick() { - setResponsePage(new ReadDocumentPage(documentModel.getObject(), documentAttachable, currentPage)); + setResponsePage(new ReadDocumentPage(documentModel.getObject(), documentAttachableModel.getObject(), currentPage)); } }; documentLink.add(new Label("Document.titre.Label.List", new PropertyModel<Document>(documentModel, @@ -95,7 +95,7 @@ MarkupContainer noTableDocuments = new WebMarkupContainer("ListDocumentsPage.AttachedDocuments.noTable") { @Override public boolean isVisible() { - return documentModel.getObject().isEmpty(); + return listDocumentModel.getObject().isEmpty(); } }; add(noTableDocuments); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ManageExtractionPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ManageExtractionPage.java 2013-03-27 11:22:40 UTC (rev 185) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ManageExtractionPage.java 2013-03-27 12:42:48 UTC (rev 186) @@ -274,7 +274,7 @@ // add list document panel ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel", - extractionModel.getObject(), currentPage); + extractionModel, currentPage); formView.add(manageListDocumentsPanel); // Action : create the extraction Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ReadExtractionPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ReadExtractionPage.java 2013-03-27 11:22:40 UTC (rev 185) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ReadExtractionPage.java 2013-03-27 12:42:48 UTC (rev 186) @@ -187,7 +187,7 @@ // add list document panel ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel", - extractionModel.getObject(), currentPage); + extractionModel, currentPage); add(readListDocumentsPanel); // Formulaire des actions Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ManageLotPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ManageLotPage.java 2013-03-27 11:22:40 UTC (rev 185) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ManageLotPage.java 2013-03-27 12:42:48 UTC (rev 186) @@ -294,7 +294,7 @@ // add list document panel ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel", - lotModel.getObject(), currentPage); + lotModel, currentPage); manageListDocumentsPanel.setUpdateOrDeleteEnabled(createMode || lotService.updateOrdeleteLotEnabled(lotModel.getObject(), getSession().getUtilisateur())); formView.add(manageListDocumentsPanel); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.java 2013-03-27 11:22:40 UTC (rev 185) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.java 2013-03-27 12:42:48 UTC (rev 186) @@ -141,8 +141,8 @@ }); // add list document panel - ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel", lotModel - .getObject(), currentPage); + ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel", lotModel, + currentPage); add(readListDocumentsPanel); // Formulaire des actions Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java 2013-03-27 11:22:40 UTC (rev 185) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java 2013-03-27 12:42:48 UTC (rev 186) @@ -162,14 +162,6 @@ .getString("Molecule.masseMolaire")), "molecule.masseMolaire", "molecule.masseMolaire", DecimalDisplFormat.SMALL, templatePage.getLocale())); - columns.add(new DocumentTooltipColumn<MoleculeProvenanceBean, String>(Model.of("")) { - @Override - public void onClick(IModel<MoleculeProvenanceBean> model) { - int idMolecule = model.getObject().getIdMolecule(); - templatePage.setResponsePage(new ReadMoleculePage(idMolecule, callerPage)); - } - }); - columns.add(new BooleanPropertyColumn<MoleculeProvenanceBean, String>(new Model<String>(templatePage .getString("Molecule.nouvMolecul")), "molecule.nouvMolecul", "molecule.nouvMolecul", templatePage)); @@ -199,6 +191,14 @@ columns.add(new PropertyColumn<MoleculeProvenanceBean, String>(new Model<String>(templatePage .getString("Molecule.provenance.programme")), "lot.campagne.programme", "lot.campagne.programme")); + columns.add(new DocumentTooltipColumn<MoleculeProvenanceBean, String>(Model.of("")) { + @Override + public void onClick(IModel<MoleculeProvenanceBean> model) { + int idMolecule = model.getObject().getIdMolecule(); + templatePage.setResponsePage(new ReadMoleculePage(idMolecule, callerPage)); + } + }); + columns.add(new LinkableImagePropertyColumn<MoleculeProvenanceBean, String>("images/edit.png", templatePage .getString("Update"), templatePage.getString("Update")) { @Override Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java 2013-03-27 11:22:40 UTC (rev 185) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java 2013-03-27 12:42:48 UTC (rev 186) @@ -274,7 +274,7 @@ // add list document panel ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel", - moleculeModel.getObject(), currentPage); + moleculeModel, currentPage); manageListDocumentsPanel.setUpdateOrDeleteEnabled(updateOrDeleteEnabled); formView.add(manageListDocumentsPanel); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java 2013-03-27 11:22:40 UTC (rev 185) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java 2013-03-27 12:42:48 UTC (rev 186) @@ -152,7 +152,7 @@ // add list document panel ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel", - moleculeModel.getObject(), currentPage); + moleculeModel, currentPage); add(readListDocumentsPanel); // Formulaire des actions Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ManagePersonnePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ManagePersonnePage.java 2013-03-27 11:22:40 UTC (rev 185) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ManagePersonnePage.java 2013-03-27 12:42:48 UTC (rev 186) @@ -144,7 +144,7 @@ // add list document panel ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel", - personneModel.getObject(), currentPage); + personneModel, currentPage); manageListDocumentsPanel.setUpdateOrDeleteEnabled(createMode || getSession().getUtilisateur().getTypeDroit() == TypeDroit.ADMINISTRATEUR); formView.add(manageListDocumentsPanel); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ReadPersonnePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ReadPersonnePage.java 2013-03-27 11:22:40 UTC (rev 185) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ReadPersonnePage.java 2013-03-27 12:42:48 UTC (rev 186) @@ -87,7 +87,7 @@ // add list document panel ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel", - personneModel.getObject(), currentPage); + personneModel, currentPage); add(readListDocumentsPanel); // Action : mise à jour (redirection vers le formulaire) Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ManagePurificationPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ManagePurificationPage.java 2013-03-27 11:22:40 UTC (rev 185) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ManagePurificationPage.java 2013-03-27 12:42:48 UTC (rev 186) @@ -248,7 +248,7 @@ // add list document panel ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel", - purificationModel.getObject(), currentPage); + purificationModel, currentPage); formView.add(manageListDocumentsPanel); // Action : create the purification Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ReadPurificationPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ReadPurificationPage.java 2013-03-27 11:22:40 UTC (rev 185) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ReadPurificationPage.java 2013-03-27 12:42:48 UTC (rev 186) @@ -236,7 +236,7 @@ // add list document panel ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel", - purificationModel.getObject(), currentPage); + purificationModel, currentPage); add(readListDocumentsPanel); // Formulaire des actions Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ManageSpecimenPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ManageSpecimenPage.java 2013-03-27 11:22:40 UTC (rev 185) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ManageSpecimenPage.java 2013-03-27 12:42:48 UTC (rev 186) @@ -282,7 +282,7 @@ // add list document panel ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel", - specimenModel.getObject(), currentPage); + specimenModel, currentPage); manageListDocumentsPanel.setUpdateOrDeleteEnabled(createMode || specimenService.updateOrdeleteSpecimenEnabled(specimenModel.getObject(), getSession() .getUtilisateur())); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ReadSpecimenPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ReadSpecimenPage.java 2013-03-27 11:22:40 UTC (rev 185) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ReadSpecimenPage.java 2013-03-27 12:42:48 UTC (rev 186) @@ -146,7 +146,7 @@ // add list document panel ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel", - specimenModel.getObject(), currentPage); + specimenModel, currentPage); add(readListDocumentsPanel); final Form<Void> formView = new Form<Void>("Form"); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ManageStationPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ManageStationPage.java 2013-03-27 11:22:40 UTC (rev 185) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ManageStationPage.java 2013-03-27 12:42:48 UTC (rev 186) @@ -228,7 +228,7 @@ // add list document panel ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel", - stationModel.getObject(), currentPage); + stationModel, currentPage); manageListDocumentsPanel .setUpdateOrDeleteEnabled(createMode || stationService.updateOrdeleteStationEnabled(stationModel.getObject(), getSession() Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ReadStationPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ReadStationPage.java 2013-03-27 11:22:40 UTC (rev 185) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ReadStationPage.java 2013-03-27 12:42:48 UTC (rev 186) @@ -111,7 +111,7 @@ // add list document panel ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel", - stationModel.getObject(), currentPage); + stationModel, currentPage); add(readListDocumentsPanel); // Ajout du formulaire pour les actions Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ManageTestBioPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ManageTestBioPage.java 2013-03-27 11:22:40 UTC (rev 185) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ManageTestBioPage.java 2013-03-27 12:42:48 UTC (rev 186) @@ -279,7 +279,7 @@ // add list document panel ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel", - testBioModel.getObject(), currentPage); + testBioModel, currentPage); formView.add(manageListDocumentsPanel); // Action : create the testBio Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ReadTestBioPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ReadTestBioPage.java 2013-03-27 11:22:40 UTC (rev 185) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ReadTestBioPage.java 2013-03-27 12:42:48 UTC (rev 186) @@ -120,7 +120,7 @@ // add list document panel ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel", - testBioModel.getObject(), currentPage); + testBioModel, currentPage); add(readListDocumentsPanel); // Ajout du formulaire pour les actions

1 0

r185 - in trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model: . search
by echatellier＠users.forge.codelutin.com March 27, 2013

March 27, 2013

Author: echatellier Date: 2013-03-27 12:22:40 +0100 (Wed, 27 Mar 2013) New Revision: 185 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/185 Log: Fix indexation configuration (Station & specimen avec les campagnes) Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Campagne.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Specimen.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Station.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/ProduitBridge.java Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Campagne.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Campagne.java 2013-03-27 11:14:59 UTC (rev 184) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Campagne.java 2013-03-27 11:22:40 UTC (rev 185) @@ -151,6 +151,7 @@ @NotNull @ManyToMany(fetch = FetchType.LAZY) @Cascade( { CascadeType.SAVE_UPDATE }) + @ContainedIn private List<Station> stations; /** Attached documents. */ Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Specimen.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Specimen.java 2013-03-27 11:14:59 UTC (rev 184) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Specimen.java 2013-03-27 11:22:40 UTC (rev 185) @@ -158,7 +158,7 @@ /** Station */ @ManyToOne(fetch = FetchType.EAGER) - @IndexedEmbedded(depth = 1) + @IndexedEmbedded private Station station; /** Compléments d'information */ Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Station.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Station.java 2013-03-27 11:14:59 UTC (rev 184) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Station.java 2013-03-27 11:22:40 UTC (rev 185) @@ -133,6 +133,7 @@ /** Stations */ @NotNull @ManyToMany(mappedBy = "stations", fetch = FetchType.LAZY) + @IndexedEmbedded private List<Campagne> campagnes; /** Spécimens de référence qui sont rattachés à cette station */ Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/ProduitBridge.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/ProduitBridge.java 2013-03-27 11:14:59 UTC (rev 184) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/ProduitBridge.java 2013-03-27 11:22:40 UTC (rev 185) @@ -36,7 +36,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.hibernate.LazyInitializationException; import org.hibernate.search.bridge.FieldBridge; import org.hibernate.search.bridge.LuceneOptions; import org.slf4j.Logger;

1 0