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 @@ <!-- dependency versions --> <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>