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

r177 - trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model
by echatellier＠users.forge.codelutin.com 20 Mar '13

20 Mar '13

Author: echatellier Date: 2013-03-20 10:55:55 +0100 (Wed, 20 Mar 2013) New Revision: 177 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/177 Log: Remove lazy collection for droits due to HSEARCH-1260 bug, but should be lazy fetch 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/Lot.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-20 09:21:24 UTC (rev 176) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Campagne.java 2013-03-20 09:55:55 UTC (rev 177) @@ -52,6 +52,8 @@ import org.hibernate.annotations.CascadeType; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; +import org.hibernate.annotations.LazyCollection; +import org.hibernate.annotations.LazyCollectionOption; import org.hibernate.annotations.Type; import org.hibernate.search.annotations.ContainedIn; import org.hibernate.search.annotations.Field; @@ -141,6 +143,8 @@ @NotNull @OneToMany(mappedBy = "id.pk1", fetch = FetchType.LAZY) @IndexedEmbedded + // FIXME echatellier 20130320 EAGER du to HSEARCH-1260 bug, but should be lazy fetch + @LazyCollection(LazyCollectionOption.FALSE) private List<CampagnePersonneDroits> personnesDroits; /** Stations prospectées **/ Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Lot.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Lot.java 2013-03-20 09:21:24 UTC (rev 176) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Lot.java 2013-03-20 09:55:55 UTC (rev 177) @@ -55,6 +55,8 @@ import org.hibernate.annotations.CascadeType; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; +import org.hibernate.annotations.LazyCollection; +import org.hibernate.annotations.LazyCollectionOption; import org.hibernate.annotations.Type; import org.hibernate.search.annotations.ContainedIn; import org.hibernate.search.annotations.Field; @@ -151,6 +153,8 @@ @OneToMany(mappedBy = "id.pk1", fetch = FetchType.LAZY) @NotNull @IndexedEmbedded + // FIXME echatellier 20130320 EAGER du to HSEARCH-1260 bug, but should be lazy fetch + @LazyCollection(LazyCollectionOption.FALSE) private List<LotPersonneDroits> personnesDroits; /** Spécimen source */

1 0

r176 - in trunk: . cantharella.data cantharella.data/src/main/java/nc/ird/cantharella/data/config cantharella.service cantharella.service/src/main/java/nc/ird/cantharella/service/config cantharella.service/src/main/java/nc/ird/cantharella/service/services cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl cantharella.utils cantharella.utils/src/main/java/nc/ird/cantharella/utils cantharella.web cantharella.web/src/main/java/nc/ird/cantharella/web/config canthare
by echatellier＠users.forge.codelutin.com 20 Mar '13

20 Mar '13

Author: echatellier Date: 2013-03-20 10:21:24 +0100 (Wed, 20 Mar 2013) New Revision: 176 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/176 Log: Update libs (hibernate, spring, h2, nuiton-utils) Modified: trunk/cantharella.data/pom.xml trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java trunk/cantharella.service/pom.xml trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.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.utils/pom.xml trunk/cantharella.utils/src/main/java/nc/ird/cantharella/utils/CantharellaConfig.java trunk/cantharella.web/pom.xml trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebContext.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/search/SearchPage.java trunk/pom.xml Modified: trunk/cantharella.data/pom.xml =================================================================== --- trunk/cantharella.data/pom.xml 2013-03-04 15:46:24 UTC (rev 175) +++ trunk/cantharella.data/pom.xml 2013-03-20 09:21:24 UTC (rev 176) @@ -83,7 +83,7 @@ </dependency> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <artifactId>nuiton-config</artifactId> </dependency> <dependency> <groupId>postgresql</groupId> Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java 2013-03-04 15:46:24 UTC (rev 175) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java 2013-03-20 09:21:24 UTC (rev 176) @@ -46,7 +46,7 @@ import org.hibernate.cache.ehcache.SingletonEhCacheRegionFactory; import org.hibernate.cfg.Environment; import org.hibernate.dialect.PostgreSQL82Dialect; -import org.nuiton.util.ArgumentsParserException; +import org.nuiton.util.config.ArgumentsParserException; import org.postgresql.Driver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: trunk/cantharella.service/pom.xml =================================================================== --- trunk/cantharella.service/pom.xml 2013-03-04 15:46:24 UTC (rev 175) +++ trunk/cantharella.service/pom.xml 2013-03-20 09:21:24 UTC (rev 176) @@ -53,7 +53,7 @@ </dependency> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <artifactId>nuiton-config</artifactId> </dependency> <dependency> <groupId>com.h2database</groupId> Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java 2013-03-04 15:46:24 UTC (rev 175) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java 2013-03-20 09:21:24 UTC (rev 176) @@ -33,7 +33,7 @@ import nc.ird.cantharella.utils.CantharellaConfig; import nc.ird.cantharella.utils.PasswordTools; -import org.nuiton.util.ArgumentsParserException; +import org.nuiton.util.config.ArgumentsParserException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; 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-04 15:46:24 UTC (rev 175) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/DocumentService.java 2013-03-20 09:21:24 UTC (rev 176) @@ -112,5 +112,6 @@ * @throws InvalidFileExtensionException when file name extension is not valid */ @Transactional(readOnly = true) - void addDocumentContent(Document document, String clientFileName, String contentType, byte[] content) throws InvalidFileExtensionException; + void addDocumentContent(Document document, String clientFileName, String contentType, byte[] content) + throws InvalidFileExtensionException; } 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-04 15:46:24 UTC (rev 175) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/DocumentServiceImpl.java 2013-03-20 09:21:24 UTC (rev 176) @@ -147,7 +147,7 @@ /** {@inheritDoc} */ @Override public void addDocumentContent(Document document, String clientFileName, String contentType, byte[] content) - throws InvalidFileExtensionException { + throws InvalidFileExtensionException { AssertTools.assertNotEmpty(clientFileName); String extension = FilenameUtils.getExtension(clientFileName); Modified: trunk/cantharella.utils/pom.xml =================================================================== --- trunk/cantharella.utils/pom.xml 2013-03-04 15:46:24 UTC (rev 175) +++ trunk/cantharella.utils/pom.xml 2013-03-20 09:21:24 UTC (rev 176) @@ -48,7 +48,7 @@ </dependency> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <artifactId>nuiton-config</artifactId> </dependency> </dependencies> Modified: trunk/cantharella.utils/src/main/java/nc/ird/cantharella/utils/CantharellaConfig.java =================================================================== --- trunk/cantharella.utils/src/main/java/nc/ird/cantharella/utils/CantharellaConfig.java 2013-03-04 15:46:24 UTC (rev 175) +++ trunk/cantharella.utils/src/main/java/nc/ird/cantharella/utils/CantharellaConfig.java 2013-03-20 09:21:24 UTC (rev 176) @@ -24,8 +24,8 @@ */ import java.util.Properties; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ArgumentsParserException; +import org.nuiton.util.config.ApplicationConfig; +import org.nuiton.util.config.ArgumentsParserException; /** * Used as factory in spring configuration to get configuration file as properties Modified: trunk/cantharella.web/pom.xml =================================================================== --- trunk/cantharella.web/pom.xml 2013-03-04 15:46:24 UTC (rev 175) +++ trunk/cantharella.web/pom.xml 2013-03-20 09:21:24 UTC (rev 176) @@ -92,7 +92,7 @@ </dependency> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <artifactId>nuiton-config</artifactId> </dependency> <dependency> <groupId>com.h2database</groupId> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebContext.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebContext.java 2013-03-04 15:46:24 UTC (rev 175) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebContext.java 2013-03-20 09:21:24 UTC (rev 176) @@ -50,7 +50,7 @@ import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.util.lang.Bytes; import org.apache.wicket.util.time.Duration; -import org.nuiton.util.ArgumentsParserException; +import org.nuiton.util.config.ArgumentsParserException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; 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-04 15:46:24 UTC (rev 175) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java 2013-03-20 09:21:24 UTC (rev 176) @@ -250,7 +250,7 @@ // Fichier formView.add(new SimpleTooltipPanel("Document.file.info", new Model<String>(getString("Document.file.info", - Model.of(new Object[] { documentMaxUploadSize, documentExtensionAllowed}))))); + Model.of(new Object[] { documentMaxUploadSize, documentExtensionAllowed }))))); formView.add(fileUploadField); // Action : création du document @@ -262,8 +262,8 @@ if (uploadedFile != null) { try { documentService.addDocumentContent(document, uploadedFile.getClientFileName(), uploadedFile - .getContentType(), uploadedFile.getBytes()); - + .getContentType(), uploadedFile.getBytes()); + // if no error validateModel(); } catch (InvalidFileExtensionException ex) { Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java 2013-03-04 15:46:24 UTC (rev 175) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java 2013-03-20 09:21:24 UTC (rev 176) @@ -141,9 +141,10 @@ } }; searchForm.add(new TextField<String>("SearchPage.Query", new PropertyModel<String>(queryModel, "query"))); - searchForm.add(new DropDownChoice<String>("SearchPage.Country", new PropertyModel<String>(queryModel, "country"), - WebContext.COUNTRY_CODES.get(getSession().getLocale()), new MapChoiceRenderer<String, String>( - WebContext.COUNTRIES.get(getSession().getLocale())))); + searchForm.add(new DropDownChoice<String>("SearchPage.Country", + new PropertyModel<String>(queryModel, "country"), WebContext.COUNTRY_CODES + .get(getSession().getLocale()), new MapChoiceRenderer<String, String>(WebContext.COUNTRIES + .get(getSession().getLocale())))); add(searchForm); // search results Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-04 15:46:24 UTC (rev 175) +++ trunk/pom.xml 2013-03-20 09:21:24 UTC (rev 176) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.7</version> + <version>3.4.8</version> </parent> <groupId>nc.ird</groupId> @@ -116,29 +116,29 @@  <version.junit>4.11</version.junit> - <version.slf4j>1.7.2</version.slf4j> + <version.slf4j>1.7.4</version.slf4j> <version.commons-lang3>3.1</version.commons-lang3> <version.commons-beanutils>1.8.3</version.commons-beanutils> <version.commons-io>2.4</version.commons-io> <version.commons-collections>3.2.1</version.commons-collections> <version.commons-codec>1.7</version.commons-codec> <version.postgresql>9.1-901-1.jdbc4</version.postgresql> - <version.h2>1.3.170</version.h2> + <version.h2>1.3.171</version.h2> <version.validation-api>1.0.0.GA</version.validation-api> <version.hibernate-jpa-2.0-api>1.0.1.Final</version.hibernate-jpa-2.0-api> - <version.hibernate>4.1.9.Final</version.hibernate> + <version.hibernate>4.2.0.Final</version.hibernate> <version.hibernate-validator>4.3.1.Final</version.hibernate-validator> <version.hibernate-search>4.2.0.Final</version.hibernate-search> <version.lucene>3.6.2</version.lucene> <version.c3p0>0.9.1</version.c3p0> <version.aspectj>1.7.2</version.aspectj> - <version.spring>3.2.1.RELEASE</version.spring> + <version.spring>3.2.2.RELEASE</version.spring> <version.mail>1.4.6</version.mail> <version.backport-util-concurrent>3.1</version.backport-util-concurrent> <version.cglib>2.2.2</version.cglib> <version.opencsv>2.3</version.opencsv> <version.poi>3.9</version.poi> - <version.nuiton-utils>2.6.9</version.nuiton-utils> + <version.nuiton-utils>2.6.11</version.nuiton-utils> <version.servlet-api>2.5</version.servlet-api> <version.wicket>6.6.0</version.wicket> @@ -493,7 +493,7 @@ </dependency> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <artifactId>nuiton-config</artifactId> <version>${version.nuiton-utils}</version> <exclusions> <exclusion>

1 0

Build failed in Jenkins: cantharella #120
by admin+hudson＠codelutin.com 04 Mar '13

04 Mar '13

See <http://ci.nuiton.org/jenkins/job/cantharella/120/changes> Changes: [Éric Chatellier] Fix indexing and document missing file management ------------------------------------------ [...truncated 112 lines...] [INFO] Approximate time taken: 1s mojoStarted org.apache.maven.plugins:maven-compiler-plugin:3.0(default-compile) [INFO] [INFO] --- maven-compiler-plugin:3.0:compile (default-compile) @ cantharella.utils --- [INFO] Changes detected - recompiling the module! [INFO] Compiling 14 source files to <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.utils/tar…> 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.utils --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.utils/tar…> [INFO] Executed tasks 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] Not copying test resources [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ cantharella.utils --- 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.utils --- [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.13(default-test) [INFO] [INFO] --- maven-surefire-plugin:2.13:test (default-test) @ cantharella.utils --- [INFO] Tests are skipped. mojoSucceeded org.apache.maven.plugins:maven-surefire-plugin:2.13(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.utils --- [INFO] Building jar: <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.utils/tar…> 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.utils --- 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.utils --- [INFO] Installing <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.utils/tar…> to /var/local/maven/data/repository/nc/ird/cantharella.utils/1.1-SNAPSHOT/cantharella.utils-1.1-SNAPSHOT.jar [INFO] Installing <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.utils/pom…> to /var/local/maven/data/repository/nc/ird/cantharella.utils/1.1-SNAPSHOT/cantharella.utils-1.1-SNAPSHOT.pom mojoSucceeded org.apache.maven.plugins:maven-install-plugin:2.4(default-install) projectSucceeded nc.ird:cantharella.utils:1.1-SNAPSHOT projectStarted nc.ird:cantharella.data:1.1-SNAPSHOT [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Cantharella :: Data 1.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ mojoStarted org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean)[INFO] Deleting <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.data/targ…> [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cantharella.data --- 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.data --- 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.data --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources mojoSucceeded org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources) mojoStarted org.apache.maven.plugins:maven-dependency-plugin:2.6(unpack-code-formatter-conf) [INFO] [INFO] --- maven-dependency-plugin:2.6:unpack (unpack-code-formatter-conf) @ cantharella.data --- [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.data/targ…> with includes "**/*.xml" and excludes "" mojoSucceeded org.apache.maven.plugins:maven-dependency-plugin:2.6(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.data --- [INFO] Using 'UTF-8' encoding to format source files. [INFO] Number of files to be formatted: 99 [INFO] Successfully formatted: 0 file(s) [INFO] Fail to format : 0 file(s) [INFO] Skipped : 99 file(s) [INFO] Approximate time taken: 0s 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.data --- [INFO] Changes detected - recompiling the module! [INFO] Compiling 89 source files to <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.data/targ…> 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.data --- 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.data/targ…> [INFO] Executed tasks mojoStarted org.apache.maven.plugins:maven-resources-plugin:2.6(default-testResources) [INFO] [INFO] Not copying test resources [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ cantharella.data --- 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.13(default-test) [INFO] [INFO] --- maven-surefire-plugin:2.13:test (default-test) @ cantharella.data --- [INFO] Tests are skipped. mojoSucceeded org.apache.maven.plugins:maven-surefire-plugin:2.13(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] ------------------------------------------------------------------------ [INFO] Deleting <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.service/t…> mojoStarted org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cantharella.service --- 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) [INFO] Using 'UTF-8' encoding to copy filtered resources. 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] Copying 3 resources mojoSucceeded org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources) mojoStarted org.apache.maven.plugins:maven-dependency-plugin:2.6(unpack-code-formatter-conf) [INFO] [INFO] --- maven-dependency-plugin:2.6: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.6(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 [INFO] Successfully formatted: 2 file(s) [INFO] Fail to format : 0 file(s) [INFO] Skipped : 61 file(s) [INFO] Approximate time taken: 0s 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.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…> [INFO] ------------------------------------------------------------- mojoFailed org.apache.maven.plugins:maven-compiler-plugin:3.0(default-compile)[ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.service/s…>:[46,29] package org.apache.commons.io does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.service/s…>:[153,28] cannot find symbol symbol: variable FilenameUtils location: class nc.ird.cantharella.service.services.impl.DocumentServiceImpl [INFO] 2 errors [INFO] ------------------------------------------------------------- projectFailed nc.ird:cantharella.service:1.1-SNAPSHOT sessionEnded [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Cantharella ....................................... SUCCESS [7.132s] [INFO] Cantharella :: Utils .............................. SUCCESS [6.409s] [INFO] Cantharella :: Data ............................... SUCCESS [6.578s] [INFO] Cantharella :: Service ............................ FAILURE [2.429s] [INFO] Cantharella :: Web ................................ SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 24.248s [INFO] Finished at: Mon Mar 04 16:33:13 CET 2013 [INFO] Final Memory: 32M/124M [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-04_16-32-44/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-04_16-32-44/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-04_16-32-44/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.data/pom.…> to /var/local/jenkins/data/jobs/cantharella/modules/nc.ird$cantharella.data/builds/2013-03-04_16-32-44/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-04_16-32-44/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-04_16-32-44/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-04_16-32-44/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-04_16-32-44/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-04_16-32-44/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.service: 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.service: 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 1

Build failed in Jenkins: cantharella » Cantharella :: Service #120
by admin+hudson＠codelutin.com 04 Mar '13

04 Mar '13

See <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.service/120…> Changes: [Éric Chatellier] Fix indexing and document missing file management ------------------------------------------ projectStarted nc.ird:cantharella.service:1.1-SNAPSHOT [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Cantharella :: Service 1.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Deleting <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.service/ws/…> mojoStarted org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cantharella.service --- 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) [INFO] Using 'UTF-8' encoding to copy filtered resources. 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] Copying 3 resources mojoSucceeded org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources) mojoStarted org.apache.maven.plugins:maven-dependency-plugin:2.6(unpack-code-formatter-conf) [INFO] [INFO] --- maven-dependency-plugin:2.6:unpack (unpack-code-formatter-conf) @ cantharella.service --- [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.service/ws/…> with includes "**/*.xml" and excludes "" mojoSucceeded org.apache.maven.plugins:maven-dependency-plugin:2.6(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 [INFO] Successfully formatted: 2 file(s) [INFO] Fail to format : 0 file(s) [INFO] Skipped : 61 file(s) [INFO] Approximate time taken: 0s 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.service --- [INFO] Changes detected - recompiling the module! [INFO] Compiling 54 source files to <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.service/ws/…> [INFO] ------------------------------------------------------------- mojoFailed org.apache.maven.plugins:maven-compiler-plugin:3.0(default-compile)[ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.service/ws/…>:[46,29] package org.apache.commons.io does not exist [ERROR] <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.service/ws/…>:[153,28] cannot find symbol symbol: variable FilenameUtils location: class nc.ird.cantharella.service.services.impl.DocumentServiceImpl [INFO] 2 errors [INFO] ------------------------------------------------------------- projectFailed nc.ird:cantharella.service:1.1-SNAPSHOT

1 1

r175 - in trunk/cantharella.data/src/main: java/nc/ird/cantharella/data/model sql
by echatellier＠users.forge.codelutin.com 04 Mar '13

04 Mar '13

Author: echatellier Date: 2013-03-04 16:46:24 +0100 (Mon, 04 Mar 2013) New Revision: 175 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/175 Log: Remove estImage attribute (unused) Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TypeDocument.java trunk/cantharella.data/src/main/sql/dev_update.sql Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TypeDocument.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TypeDocument.java 2013-03-04 15:44:37 UTC (rev 174) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TypeDocument.java 2013-03-04 15:46:24 UTC (rev 175) @@ -29,7 +29,6 @@ import javax.persistence.Lob; import javax.persistence.Table; import javax.persistence.UniqueConstraint; -import javax.validation.constraints.NotNull; import nc.ird.cantharella.data.model.utils.AbstractModel; @@ -68,10 +67,6 @@ // see HHH-6105 private String description; - /** If the type document represents an image ? */ - @NotNull - private Boolean estImage; - /** {@inheritDoc} */ @Override public TypeDocument clone() throws CloneNotSupportedException { @@ -80,7 +75,6 @@ clone.nom = nom; clone.domaine = domaine; clone.description = description; - clone.estImage = estImage; return clone; } @@ -159,21 +153,4 @@ public void setDescription(String description) { this.description = description; } - - /** - * estImage getter - * @return estImage - */ - public Boolean getEstImage() { - return estImage; - } - - /** - * estImage setter - * @param estImage estImage - */ - public void setEstImage(Boolean estImage) { - this.estImage = estImage; - } - } Modified: trunk/cantharella.data/src/main/sql/dev_update.sql =================================================================== --- trunk/cantharella.data/src/main/sql/dev_update.sql 2013-03-04 15:44:37 UTC (rev 174) +++ trunk/cantharella.data/src/main/sql/dev_update.sql 2013-03-04 15:46:24 UTC (rev 175) @@ -171,4 +171,6 @@ add constraint FK3737353B20FEEDAC foreign key (molecule) references Molecule; + + alter table typedocument drop column estimage; COMMIT; \ No newline at end of file

1 0

r174 - trunk/cantharella.service
by echatellier＠users.forge.codelutin.com 04 Mar '13

04 Mar '13

Author: echatellier Date: 2013-03-04 16:44:37 +0100 (Mon, 04 Mar 2013) New Revision: 174 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/174 Log: Fix common io Modified: trunk/cantharella.service/pom.xml Modified: trunk/cantharella.service/pom.xml =================================================================== --- trunk/cantharella.service/pom.xml 2013-03-04 15:37:36 UTC (rev 173) +++ trunk/cantharella.service/pom.xml 2013-03-04 15:44:37 UTC (rev 174) @@ -50,7 +50,6 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>org.nuiton</groupId>

1 0

r173 - trunk/cantharella.data/src/main/resources
by echatellier＠users.forge.codelutin.com 04 Mar '13

04 Mar '13

Author: echatellier Date: 2013-03-04 16:37:36 +0100 (Mon, 04 Mar 2013) New Revision: 173 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/173 Log: Fix i18n Modified: trunk/cantharella.data/src/main/resources/data_en.properties Modified: trunk/cantharella.data/src/main/resources/data_en.properties =================================================================== --- trunk/cantharella.data/src/main/resources/data_en.properties 2013-03-04 15:31:05 UTC (rev 172) +++ trunk/cantharella.data/src/main/resources/data_en.properties 2013-03-04 15:37:36 UTC (rev 173) @@ -244,20 +244,20 @@ ErreurTestBio.nom=Name ErreurTestBio.description=Description -TypeDocument.nom=Nom -TypeDocument.domaine=Domaine +TypeDocument.nom=Name +TypeDocument.domaine=Domain TypeDocument.description=Description -Document.titre=Titre -Document.createur=Créateur -Document.dateCreation=Date de création -Document.editeur=Éditeur +Document.titre=Title +Document.createur=Creator +Document.dateCreation=Creation date +Document.editeur=Editor Document.description=Description -Document.langue=Langue -Document.contrainteLegale=Contrainte légale -Document.ajoutePar=Ajouté par -Document.typeDocument=Type de document -Document.fileName=Nom +Document.langue=Language +Document.contrainteLegale=Legal constraint +Document.ajoutePar=Added by +Document.typeDocument=Document type +Document.fileName=Name Document.fileMimetype=Format #Internationalisation des enums#

1 0

r172 - in trunk: cantharella.data/src/main/java/nc/ird/cantharella/data/model/search cantharella.service/src/main/java/nc/ird/cantharella/service/exceptions cantharella.service/src/main/java/nc/ird/cantharella/service/model cantharella.service/src/main/java/nc/ird/cantharella/service/services cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl cantharella.service/src/main/resources cantharella.web/src/main/java/nc/ird/cantharella/web/config cantharella.web/src/ma
by echatellier＠users.forge.codelutin.com 04 Mar '13

04 Mar '13

Author: echatellier Date: 2013-03-04 16:31:05 +0100 (Mon, 04 Mar 2013) New Revision: 172 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/172 Log: Fix indexing and document missing file management Added: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/exceptions/InvalidFileExtensionException.java 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/model/SearchBean.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.service/src/main/java/nc/ird/cantharella/service/services/impl/LotServiceImpl.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java trunk/cantharella.service/src/main/resources/cantharella.conf trunk/cantharella.service/src/main/resources/service_fr.properties trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebApplicationImpl.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/search/SearchPage.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.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-04 13:33:53 UTC (rev 171) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/ProduitBridge.java 2013-03-04 15:31:05 UTC (rev 172) @@ -36,6 +36,7 @@ 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; @@ -98,16 +99,21 @@ document.add(new Field("produit.lot.campagne.nom", lot.getCampagne().getNom(), luceneOptions.getStore(), luceneOptions.getIndex(), luceneOptions.getTermVector())); - // commons information for all produit - List<LotPersonneDroits> personnesDroits = lot.getPersonnesDroits(); - for (LotPersonneDroits lotPersonneDroit : personnesDroits) { - document.add(new Field("droit.pk2", String.valueOf(lotPersonneDroit.getId().getPk2().getIdPersonne()), - luceneOptions.getStore(), luceneOptions.getIndex(), luceneOptions.getTermVector())); + try { + // commons information for all produit + List<LotPersonneDroits> personnesDroits = lot.getPersonnesDroits(); + for (LotPersonneDroits lotPersonneDroit : personnesDroits) { + document.add(new Field("droit.pk2", String.valueOf(lotPersonneDroit.getId().getPk2().getIdPersonne()), + luceneOptions.getStore(), luceneOptions.getIndex(), luceneOptions.getTermVector())); + } + List<CampagnePersonneDroits> campagnesDroits = lot.getCampagne().getPersonnesDroits(); + for (CampagnePersonneDroits campagnesDroit : campagnesDroits) { + document.add(new Field("droit.pk2", String.valueOf(campagnesDroit.getId().getPk2().getIdPersonne()), + luceneOptions.getStore(), luceneOptions.getIndex(), luceneOptions.getTermVector())); + } + } catch (LazyInitializationException ex) { + // FIXME echatellier 20130304 caused by https://hibernate.onjira.com/browse/HSEARCH-1260 + LOG.warn("Can't index security due to exception", ex); } - List<CampagnePersonneDroits> campagnesDroits = lot.getCampagne().getPersonnesDroits(); - for (CampagnePersonneDroits campagnesDroit : campagnesDroits) { - document.add(new Field("droit.pk2", String.valueOf(campagnesDroit.getId().getPk2().getIdPersonne()), - luceneOptions.getStore(), luceneOptions.getIndex(), luceneOptions.getTermVector())); - } } } Added: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/exceptions/InvalidFileExtensionException.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/exceptions/InvalidFileExtensionException.java (rev 0) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/exceptions/InvalidFileExtensionException.java 2013-03-04 15:31:05 UTC (rev 172) @@ -0,0 +1,42 @@ +/* + * #%L + * Cantharella :: Service + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package nc.ird.cantharella.service.exceptions; + +import nc.ird.cantharella.data.exceptions.AbstractException; + +/** + * Exception thrown when file extension is not valid. + * + * @author Eric Chatellier + */ +public class InvalidFileExtensionException extends AbstractException { + + /** + * Constructor + * @param message message + */ + public InvalidFileExtensionException(String message) { + super(message); + } + +} Property changes on: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/exceptions/InvalidFileExtensionException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/model/SearchBean.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/model/SearchBean.java 2013-03-04 13:33:53 UTC (rev 171) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/model/SearchBean.java 2013-03-04 15:31:05 UTC (rev 172) @@ -34,8 +34,8 @@ /** Search query. */ protected String query; - /** Search locale. */ - protected String locale; + /** Search country. */ + protected String country; /** * Constructor. @@ -72,20 +72,20 @@ } /** - * Search locale getter. + * Search country getter. * - * @return locale + * @return country */ - public String getLocale() { - return locale; + public String getCountry() { + return country; } /** - * Search query setter. + * Search country setter. * - * @param locale locale + * @param country country */ - public void setLocale(String locale) { - this.locale = locale; + public void setCountry(String country) { + this.country = country; } } 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-04 13:33:53 UTC (rev 171) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/DocumentService.java 2013-03-04 15:31:05 UTC (rev 172) @@ -28,6 +28,7 @@ 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.service.exceptions.InvalidFileExtensionException; 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; @@ -108,7 +109,8 @@ * @param clientFileName file name * @param contentType content type * @param content content data + * @throws InvalidFileExtensionException when file name extension is not valid */ @Transactional(readOnly = true) - void addDocumentContent(Document document, String clientFileName, String contentType, byte[] content); + void addDocumentContent(Document document, String clientFileName, String contentType, byte[] content) throws InvalidFileExtensionException; } 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-04 13:33:53 UTC (rev 171) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/DocumentServiceImpl.java 2013-03-04 15:31:05 UTC (rev 172) @@ -26,6 +26,8 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.util.Arrays; +import java.util.Collection; import java.util.List; import javax.imageio.ImageIO; @@ -37,13 +39,16 @@ 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.service.exceptions.InvalidFileExtensionException; import nc.ird.cantharella.service.services.DocumentService; import nc.ird.cantharella.utils.AssertTools; +import org.apache.commons.io.FilenameUtils; import org.imgscalr.Scalr; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; /** @@ -60,6 +65,19 @@ @Autowired private GenericDao dao; + /** Configuration allowed extension list */ + private Collection<String> documentExtensionAllowed; + + /** + * Configuration allowed extension list setter. + * @param documentExtensionAllowed configuration value + */ + @Value("${document.extension.allowed}") + private void setDcumentExtensionAllowed(String documentExtensionAllowed) { + String[] values = documentExtensionAllowed.split("\\s*,\\s*"); + this.documentExtensionAllowed = Arrays.asList(values); + } + /** {@inheritDoc} */ @Override public List<TypeDocument> listTypeDocuments() { @@ -128,14 +146,23 @@ /** {@inheritDoc} */ @Override - public void addDocumentContent(Document document, String clientFileName, String contentType, byte[] content) { + public void addDocumentContent(Document document, String clientFileName, String contentType, byte[] content) + throws InvalidFileExtensionException { + AssertTools.assertNotEmpty(clientFileName); + String extension = FilenameUtils.getExtension(clientFileName); + extension = extension.toLowerCase(); // check lower case + if (!documentExtensionAllowed.contains(extension)) { + throw new InvalidFileExtensionException("File extension is not valid"); + } + try { // resize original image document.setFileName(clientFileName); document.setFileMimetype(contentType); document.setFileContent(content); + // image detection is based on file mimetype if (contentType.startsWith("image/")) { BufferedImage originalImage = ImageIO.read(new ByteArrayInputStream(content)); BufferedImage thumbImage = Scalr.resize(originalImage, 100, 100); Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/LotServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/LotServiceImpl.java 2013-03-04 13:33:53 UTC (rev 171) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/LotServiceImpl.java 2013-03-04 15:31:05 UTC (rev 172) @@ -41,10 +41,7 @@ import nc.ird.cantharella.service.services.LotService; import nc.ird.cantharella.utils.AssertTools; -import org.hibernate.Session; import org.hibernate.SessionFactory; -import org.hibernate.search.FullTextSession; -import org.hibernate.search.Search; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -215,17 +212,12 @@ @Override public void updateLot(Lot lot) throws DataConstraintException { LOG.info("updateLot " + lot.getRef()); - //try { - dao.merge(lot); - - Session session = sessionFactory.getCurrentSession(); - FullTextSession fullTextSession = Search.getFullTextSession(session); - fullTextSession.index(lot); - - /*} catch (DataNotFoundException e) { + try { + dao.update(lot); + } catch (DataNotFoundException e) { LOG.error(e.getMessage(), e); throw new UnexpectedException(e); - }*/ + } } /** {@inheritDoc} */ Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java 2013-03-04 13:33:53 UTC (rev 171) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java 2013-03-04 15:31:05 UTC (rev 172) @@ -128,8 +128,8 @@ strQuery += search.getQuery(); } strQuery += " "; - if (search.getLocale() != null) { - strQuery += search.getLocale(); + if (search.getCountry() != null) { + strQuery += search.getCountry(); } strQuery = strQuery.trim(); Modified: trunk/cantharella.service/src/main/resources/cantharella.conf =================================================================== --- trunk/cantharella.service/src/main/resources/cantharella.conf 2013-03-04 13:33:53 UTC (rev 171) +++ trunk/cantharella.service/src/main/resources/cantharella.conf 2013-03-04 15:31:05 UTC (rev 172) @@ -4,7 +4,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2009 - 2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) +# Copyright (C) 2009 - 2013 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -32,3 +32,6 @@ admin.courriel=ISlog(a)ird.fr admin.password=password + +# Document's allowed extensions +document.extension.allowed=jpeg,jpg,gif,png,xls,doc,pdf,cdx,mol Modified: trunk/cantharella.service/src/main/resources/service_fr.properties =================================================================== --- trunk/cantharella.service/src/main/resources/service_fr.properties 2013-03-04 13:33:53 UTC (rev 171) +++ trunk/cantharella.service/src/main/resources/service_fr.properties 2013-03-04 15:31:05 UTC (rev 172) @@ -21,7 +21,7 @@ # #L% ### updatePassword.subject=Cantharella - Nouveau mot de passe -updatePassword.text=Vote mot de passe Cantharella a été regénéré : {0} +updatePassword.text=Votre mot de passe Cantharella a été regénéré : {0} register.subject=Cantharella - Demande de création de compte register.text=Nous avons bien reçu votre demande de création de compte Cantharella. Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebApplicationImpl.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebApplicationImpl.java 2013-03-04 13:33:53 UTC (rev 171) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebApplicationImpl.java 2013-03-04 15:31:05 UTC (rev 172) @@ -139,6 +139,10 @@ @Value("${document.maxUploadSize}") protected long documentMaxUploadSize; + /** Configuration document's allowed extensions. */ + @Value("${document.extension.allowed}") + protected String documentExtensionAllowed; + /** * Constructor * @param debug Debug mode @@ -436,4 +440,13 @@ public long getDocumentMaxUploadSize() { return documentMaxUploadSize; } + + /** + * Get document allowed extension. + * + * @return document allowed extension + */ + public String getDocumentExtensionAllowed() { + return documentExtensionAllowed; + } } \ No newline at end of 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-04 13:33:53 UTC (rev 171) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java 2013-03-04 15:31:05 UTC (rev 172) @@ -31,10 +31,11 @@ import nc.ird.cantharella.data.model.TypeDocument; import nc.ird.cantharella.data.model.utils.DocumentAttachable; import nc.ird.cantharella.data.validation.utils.ModelValidator; +import nc.ird.cantharella.service.exceptions.InvalidFileExtensionException; import nc.ird.cantharella.service.services.DocumentService; import nc.ird.cantharella.service.services.PersonneService; +import nc.ird.cantharella.utils.BeanTools.AccessType; import nc.ird.cantharella.utils.CollectionTools; -import nc.ird.cantharella.utils.BeanTools.AccessType; import nc.ird.cantharella.web.config.WebApplicationImpl; import nc.ird.cantharella.web.config.WebContext; import nc.ird.cantharella.web.pages.TemplatePage; @@ -48,6 +49,7 @@ import nc.ird.cantharella.web.utils.panels.SimpleTooltipPanel; import nc.ird.cantharella.web.utils.renderers.MapChoiceRenderer; +import org.apache.commons.lang3.StringUtils; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink; @@ -141,13 +143,16 @@ // get configuration long documentMaxUploadSize = ((WebApplicationImpl) getApplication()).getDocumentMaxUploadSize(); + String documentExtensionAllowed = ((WebApplicationImpl) getApplication()).getDocumentExtensionAllowed(); // Initialisation du modèle documentModel = new Model<Document>(document == null ? new Document() : document); - boolean createMode = document == null; + final boolean createMode = document == null; if (createMode) { + documentModel.getObject().setDateCreation(new Date()); documentModel.getObject().setCreateur(getSession().getUtilisateur()); + documentModel.getObject().setEditeur(getSession().getUtilisateur().getOrganisme()); documentModel.getObject().setAjoutePar(getSession().getUtilisateur()); } @@ -245,12 +250,33 @@ // Fichier formView.add(new SimpleTooltipPanel("Document.file.info", new Model<String>(getString("Document.file.info", - Model.of(new Object[] { documentMaxUploadSize }))))); + Model.of(new Object[] { documentMaxUploadSize, documentExtensionAllowed}))))); formView.add(fileUploadField); // Action : création du document Button createButton = new SubmittableButton(ACTION_CREATE, new SubmittableButtonEvents() { @Override + public void onValidate() { + Document document = documentModel.getObject(); + final FileUpload uploadedFile = fileUploadField.getFileUpload(); + if (uploadedFile != null) { + try { + documentService.addDocumentContent(document, uploadedFile.getClientFileName(), uploadedFile + .getContentType(), uploadedFile.getBytes()); + + // if no error + validateModel(); + } catch (InvalidFileExtensionException ex) { + error(getString("ManageDocumentPage.Error.notAllowedExtension")); + } + } else if (StringUtils.isEmpty(document.getFileName())) { + error(getString("ManageDocumentPage.Error.emptyFile")); + } else { + validateModel(); + } + } + + @Override public void onProcess() throws DataConstraintException { Document document = documentModel.getObject(); documentAttachable.addDocument(document); @@ -261,17 +287,6 @@ successNextPage(ACTION_CREATE); redirect(); } - - @Override - public void onValidate() { - final FileUpload uploadedFile = fileUploadField.getFileUpload(); - if (uploadedFile != null) { - Document document = documentModel.getObject(); - documentService.addDocumentContent(document, uploadedFile.getClientFileName(), uploadedFile - .getContentType(), uploadedFile.getBytes()); - } - validateModel(); - } }); createButton.setVisibilityAllowed(createMode); formView.add(createButton); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.html 2013-03-04 13:33:53 UTC (rev 171) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.html 2013-03-04 15:31:05 UTC (rev 172) @@ -38,8 +38,8 @@ <input type="text" wicket:id="SearchPage.Query" /> </div> <div class="property"> - <label for="SearchPage.Locale"><wicket:message key="SearchPage.Locale" /></label> - <select id="SearchPage.Locale" wicket:id="SearchPage.Locale" /> + <label for="SearchPage.Country"><wicket:message key="SearchPage.Country" /></label> + <select id="SearchPage.Country" wicket:id="SearchPage.Country" /> </div> <div class="actions"> <input type="submit" wicket:message="value:SearchPage.Search" /> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java 2013-03-04 13:33:53 UTC (rev 171) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java 2013-03-04 15:31:05 UTC (rev 172) @@ -141,7 +141,7 @@ } }; searchForm.add(new TextField<String>("SearchPage.Query", new PropertyModel<String>(queryModel, "query"))); - searchForm.add(new DropDownChoice<String>("SearchPage.Locale", new PropertyModel<String>(queryModel, "locale"), + searchForm.add(new DropDownChoice<String>("SearchPage.Country", new PropertyModel<String>(queryModel, "country"), WebContext.COUNTRY_CODES.get(getSession().getLocale()), new MapChoiceRenderer<String, String>( WebContext.COUNTRIES.get(getSession().getLocale())))); add(searchForm); Modified: trunk/cantharella.web/src/main/resources/web_en.properties =================================================================== --- trunk/cantharella.web/src/main/resources/web_en.properties 2013-03-04 13:33:53 UTC (rev 171) +++ trunk/cantharella.web/src/main/resources/web_en.properties 2013-03-04 15:31:05 UTC (rev 172) @@ -213,6 +213,8 @@ ManageDocumentPage=Document management ManageDocumentPage.Create.OK=Document will be saved on form submit ManageDocumentPage.Update.OK=Document will be updated 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} @@ -294,7 +296,7 @@ SearchPage=Search SearchPage.Search=Search SearchPage.Query=Query -SearchPage.Locale=Language +SearchPage.Country=Country SearchPage.Specimens=Specimens SearchPage.Lots=Samples SearchPage.Extractions=Extractions @@ -415,7 +417,7 @@ Document.link=Link Document.type=Type Document.file=File -Document.file.info=File size must be less than ${0}Mb +Document.file.info=File size must be less than ${0}Mb\nFile extension must be in the following : ${1} #BASIC# Actions=Actions Modified: trunk/cantharella.web/src/main/resources/web_fr.properties =================================================================== --- trunk/cantharella.web/src/main/resources/web_fr.properties 2013-03-04 13:33:53 UTC (rev 171) +++ trunk/cantharella.web/src/main/resources/web_fr.properties 2013-03-04 15:31:05 UTC (rev 172) @@ -213,6 +213,8 @@ 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.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} UpdateUtilisateurPage=Gestion du compte @@ -293,7 +295,7 @@ SearchPage=Recherche SearchPage.Search=Rechercher SearchPage.Query=Requête -SearchPage.Locale=Langue +SearchPage.Country=Pays SearchPage.Specimens=Specimens SearchPage.Lots=Lots SearchPage.Extractions=Extractions @@ -413,7 +415,7 @@ Document.link=Lien Document.type=Type Document.file=Fichier -Document.file.info=La taille du fichier doit faire moins de ${0}Mo +Document.file.info=La taille du fichier doit faire moins de ${0}Mo\nL'extension du fichier doit être une des suivantes : ${1} #BASIC# Actions=Actions

1 0

r171 - trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config
by echatellier＠users.forge.codelutin.com 04 Mar '13

04 Mar '13

Author: echatellier Date: 2013-03-04 14:33:53 +0100 (Mon, 04 Mar 2013) New Revision: 171 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/171 Log: Remove property that handle exception Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java 2013-03-04 13:26:12 UTC (rev 170) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java 2013-03-04 13:33:53 UTC (rev 171) @@ -153,11 +153,6 @@ properties.put("mail.debug", mailDebugProperty); properties.put("mail.smtp.connectiontimeout", MAIL_SMTP_TIMEOUT); properties.put("mail.smtp.timeout", MAIL_SMTP_TIMEOUT); - if (mailDebugProperty) { - // this next line generate a SMTPAddressSucceededException - // when sending an email - properties.put("mail.smtp.reportsuccess", Boolean.TRUE); - } mailSender.setJavaMailProperties(properties); mailSender.setHost(mailHostProperty); mailSender.setPort(MAIL_SMTP_PORT);

1 0

r170 - trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config
by echatellier＠users.forge.codelutin.com 04 Mar '13

04 Mar '13

Author: echatellier Date: 2013-03-04 14:26:12 +0100 (Mon, 04 Mar 2013) New Revision: 170 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/170 Log: Add comment Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java 2013-03-04 13:24:47 UTC (rev 169) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java 2013-03-04 13:26:12 UTC (rev 170) @@ -154,6 +154,8 @@ properties.put("mail.smtp.connectiontimeout", MAIL_SMTP_TIMEOUT); properties.put("mail.smtp.timeout", MAIL_SMTP_TIMEOUT); if (mailDebugProperty) { + // this next line generate a SMTPAddressSucceededException + // when sending an email properties.put("mail.smtp.reportsuccess", Boolean.TRUE); } mailSender.setJavaMailProperties(properties);

1 0