Author: echatellier Date: 2013-01-18 12:16:16 +0100 (Fri, 18 Jan 2013) New Revision: 51 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/51 Log: Update to hibernate-search 4.2.0 and lucene 3.6.2. Use commons-lang3 everywhere. Fix dependencies. Modified: trunk/cantharella.data/pom.xml trunk/cantharella.data/src/license/THIRD-PARTY.properties trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/ValidationIntegrator.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/ProduitBridge.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/utils/ModelValidatorImpl.java trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/SchemaExporter.java trunk/cantharella.service/pom.xml trunk/cantharella.service/src/license/THIRD-PARTY.properties trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/MailServiceImpl.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/ExcelColumnsReader.java trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/PopulateDB.java trunk/cantharella.web/pom.xml trunk/cantharella.web/src/license/THIRD-PARTY.properties trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeExtractionPanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodePurificationPanel.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/model/CaptchaModel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/LoadableDetachableSortableListDataProvider.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthSession.java trunk/pom.xml Modified: trunk/cantharella.data/pom.xml =================================================================== --- trunk/cantharella.data/pom.xml 2013-01-18 09:45:42 UTC (rev 50) +++ trunk/cantharella.data/pom.xml 2013-01-18 11:16:16 UTC (rev 51) @@ -130,7 +130,7 @@ </dependency> <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate-search-orm</artifactId> + <artifactId>hibernate-search-engine</artifactId> </dependency> <dependency> <groupId>org.springframework</groupId> @@ -157,6 +157,11 @@ <groupId>org.hibernate.javax.persistence</groupId> <artifactId>hibernate-jpa-2.0-api</artifactId> </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + </dependency> <dependency> <groupId>c3p0</groupId> Modified: trunk/cantharella.data/src/license/THIRD-PARTY.properties =================================================================== --- trunk/cantharella.data/src/license/THIRD-PARTY.properties 2013-01-18 09:45:42 UTC (rev 50) +++ trunk/cantharella.data/src/license/THIRD-PARTY.properties 2013-01-18 11:16:16 UTC (rev 51) @@ -2,35 +2,25 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Affero General Public License (AGPL) +# - Apache License 2.0 # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - Eclipse Public License - v 1.0 -# - ICU License +# - GNU Lesser General Public License, version 2.1 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 +# - New BSD License # - Public Domain # - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 # - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Nov 26 18:02:47 CET 2012 -antlr--antlr--2.7.6=BSD License +#Fri Jan 18 10:34:09 CET 2013 dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.8.0.GA=The Apache Software License, Version 2.0 -javax.transaction--jta--1.1=Java Transaction API (JTA) License -net.sf.jsr107cache--jsr107cache--1.0=The Apache Software License, Version 2.0 -org.springframework--spring-aop--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-asm--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-beans--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-context--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-core--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-expression--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-jdbc--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-orm--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-test--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-tx--3.1.0.RELEASE=The Apache Software License, Version 2.0 Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/ValidationIntegrator.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/ValidationIntegrator.java 2013-01-18 09:45:42 UTC (rev 50) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/ValidationIntegrator.java 2013-01-18 11:16:16 UTC (rev 51) @@ -1,5 +1,28 @@ package nc.ird.cantharella.data.config; +/* + * #%L + * Cantharella :: Data + * $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% + */ + import javax.validation.Validation; import javax.validation.ValidatorFactory; 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-01-18 09:45:42 UTC (rev 50) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/ProduitBridge.java 2013-01-18 11:16:16 UTC (rev 51) @@ -1,5 +1,28 @@ package nc.ird.cantharella.data.model.search; +/* + * #%L + * Cantharella :: Data + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 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% + */ + import nc.ird.cantharella.data.model.Extrait; import nc.ird.cantharella.data.model.Fraction; import nc.ird.cantharella.data.model.Produit; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/utils/ModelValidatorImpl.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/utils/ModelValidatorImpl.java 2013-01-18 09:45:42 UTC (rev 50) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/utils/ModelValidatorImpl.java 2013-01-18 11:16:16 UTC (rev 51) @@ -39,7 +39,7 @@ import nc.ird.module.utils.AssertTools; import nc.ird.module.utils.LogTools; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.springframework.context.NoSuchMessageException; import org.springframework.context.support.MessageSourceAccessor; Modified: trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/SchemaExporter.java =================================================================== --- trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/SchemaExporter.java 2013-01-18 09:45:42 UTC (rev 50) +++ trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/SchemaExporter.java 2013-01-18 11:16:16 UTC (rev 51) @@ -1,5 +1,28 @@ package nc.ird.cantharella.data; +/* + * #%L + * Cantharella :: Data + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 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% + */ + import java.io.IOException; import java.util.Properties; Modified: trunk/cantharella.service/pom.xml =================================================================== --- trunk/cantharella.service/pom.xml 2013-01-18 09:45:42 UTC (rev 50) +++ trunk/cantharella.service/pom.xml 2013-01-18 11:16:16 UTC (rev 51) @@ -72,8 +72,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -81,6 +81,23 @@ </dependency> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search-engine</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search-orm</artifactId> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + </dependency> + + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> </dependency> @@ -141,6 +158,7 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> + <scope>test</scope> </dependency> <dependency> Modified: trunk/cantharella.service/src/license/THIRD-PARTY.properties =================================================================== --- trunk/cantharella.service/src/license/THIRD-PARTY.properties 2013-01-18 09:45:42 UTC (rev 50) +++ trunk/cantharella.service/src/license/THIRD-PARTY.properties 2013-01-18 11:16:16 UTC (rev 51) @@ -2,37 +2,27 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Affero General Public License (AGPL) +# - Apache License 2.0 # - BSD License +# - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - Eclipse Public License - v 1.0 -# - ICU License +# - GNU Lesser General Public License, version 2.1 +# - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - Java Transaction API (JTA) License # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 +# - New BSD License # - Public Domain # - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 # - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Nov 26 18:07:22 CET 2012 -antlr--antlr--2.7.6=BSD License +#Fri Jan 18 10:45:39 CET 2013 dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.8.0.GA=The Apache Software License, Version 2.0 -javax.transaction--jta--1.1=Java Transaction API (JTA) License -net.sf.jsr107cache--jsr107cache--1.0=The Apache Software License, Version 2.0 -org.springframework--spring-aop--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-asm--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-beans--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-context--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-context-support--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-core--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-expression--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-jdbc--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-orm--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-test--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-tx--3.1.0.RELEASE=The Apache Software License, Version 2.0 Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/MailServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/MailServiceImpl.java 2013-01-18 09:45:42 UTC (rev 50) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/MailServiceImpl.java 2013-01-18 11:16:16 UTC (rev 51) @@ -33,7 +33,7 @@ import nc.ird.module.utils.AssertTools; import nc.ird.module.utils.LogTools; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mail.MailSender; 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-01-18 09:45:42 UTC (rev 50) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java 2013-01-18 11:16:16 UTC (rev 51) @@ -22,7 +22,6 @@ */ package nc.ird.cantharella.service.services.impl; -import java.util.Collection; import java.util.List; import javax.annotation.Resource; @@ -39,12 +38,15 @@ import nc.ird.module.utils.LogTools; import org.apache.commons.logging.Log; +import org.apache.lucene.index.FieldInfos; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.MultiReader; import org.apache.lucene.queryParser.MultiFieldQueryParser; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.queryParser.QueryParser.Operator; import org.apache.lucene.search.Query; +import org.apache.lucene.util.ReaderUtil; import org.apache.lucene.util.Version; import org.hibernate.Session; import org.hibernate.SessionFactory; @@ -149,9 +151,12 @@ // build a multi field query parser to search in all fields IndexReader reader = searchFactory.getIndexReaderAccessor().open(clazz); - Collection<String> fieldNames = reader.getFieldNames(IndexReader.FieldOption.ALL); - String[] fieldArray = fieldNames.toArray(new String[fieldNames.size()]); - QueryParser parser = new MultiFieldQueryParser(Version.LUCENE_35, fieldArray, searchFactory.getAnalyzer(clazz)); + FieldInfos fieldInfos = ReaderUtil.getMergedFieldInfos(reader); + String[] fieldArray = new String[fieldInfos.size()]; + for (int i = 0 ; i < fieldInfos.size(); i++) { + fieldArray[i] = fieldInfos.fieldName(i); + } + QueryParser parser = new MultiFieldQueryParser(Version.LUCENE_36, fieldArray, searchFactory.getAnalyzer(clazz)); searchFactory.getIndexReaderAccessor().close(reader); // autorisation de "*" en premier caractere Modified: trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/ExcelColumnsReader.java =================================================================== --- trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/ExcelColumnsReader.java 2013-01-18 09:45:42 UTC (rev 50) +++ trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/ExcelColumnsReader.java 2013-01-18 11:16:16 UTC (rev 51) @@ -34,7 +34,7 @@ import nc.ird.cantharella.service.exceptions.ExcelImportException; import nc.ird.module.utils.AssertTools; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; Modified: trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/PopulateDB.java =================================================================== --- trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/PopulateDB.java 2013-01-18 09:45:42 UTC (rev 50) +++ trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/PopulateDB.java 2013-01-18 11:16:16 UTC (rev 51) @@ -64,7 +64,7 @@ import nc.ird.module.utils.LogTools; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; Modified: trunk/cantharella.web/pom.xml =================================================================== --- trunk/cantharella.web/pom.xml 2013-01-18 09:45:42 UTC (rev 50) +++ trunk/cantharella.web/pom.xml 2013-01-18 11:16:16 UTC (rev 51) @@ -205,8 +205,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> <groupId>commons-logging</groupId> Modified: trunk/cantharella.web/src/license/THIRD-PARTY.properties =================================================================== --- trunk/cantharella.web/src/license/THIRD-PARTY.properties 2013-01-18 09:45:42 UTC (rev 50) +++ trunk/cantharella.web/src/license/THIRD-PARTY.properties 2013-01-18 11:16:16 UTC (rev 51) @@ -2,16 +2,22 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Affero General Public License (AGPL) +# - Apache License 2.0 # - BSD License +# - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 +# - Copyright (c) 2000-2011 INRIA, France Telecom # - Eclipse Public License - v 1.0 -# - ICU License +# - GNU Lesser General Public License, version 2.1 +# - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - Java Transaction API (JTA) License # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 +# - License Agreement for Java(TM) Servlet API Specification Interface Classes # - MIT License +# - MPL 1.1 +# - New BSD License # - Public Domain # - The Apache Software License, Version 2.0 # - license.txt @@ -19,23 +25,7 @@ # Please fill the missing licenses for dependencies : # # -#Mon Nov 26 18:10:35 CET 2012 -antlr--antlr--2.7.6=BSD License +#Fri Jan 18 11:06:20 CET 2013 asm--asm--3.1=Copyright (c) 2000-2011 INRIA, France Telecom dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.8.0.GA=The Apache Software License, Version 2.0 javax.servlet--servlet-api--2.5=License Agreement for Java(TM) Servlet API Specification Interface Classes -javax.transaction--jta--1.1=Java Transaction API (JTA) License -net.sf.jsr107cache--jsr107cache--1.0=The Apache Software License, Version 2.0 -org.springframework--spring-aop--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-asm--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-beans--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-context--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-context-support--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-core--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-expression--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-jdbc--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-orm--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-test--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-tx--3.1.0.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-web--3.1.0.RELEASE=The Apache Software License, Version 2.0 Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeExtractionPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeExtractionPanel.java 2013-01-18 09:45:42 UTC (rev 50) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeExtractionPanel.java 2013-01-18 11:16:16 UTC (rev 51) @@ -29,7 +29,7 @@ import nc.ird.cantharella.web.pages.domain.config.ManageMethodeExtractionPage; import nc.ird.cantharella.web.utils.models.LoadableDetachableSortableListDataProvider; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.wicket.AttributeModifier; import org.apache.wicket.MarkupContainer; import org.apache.wicket.markup.html.WebMarkupContainer; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodePurificationPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodePurificationPanel.java 2013-01-18 09:45:42 UTC (rev 50) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodePurificationPanel.java 2013-01-18 11:16:16 UTC (rev 51) @@ -29,7 +29,7 @@ import nc.ird.cantharella.web.pages.domain.config.ManageMethodePurificationPage; import nc.ird.cantharella.web.utils.models.LoadableDetachableSortableListDataProvider; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.wicket.AttributeModifier; import org.apache.wicket.MarkupContainer; import org.apache.wicket.markup.html.WebMarkupContainer; 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-01-18 09:45:42 UTC (rev 50) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ManageTestBioPage.java 2013-01-18 11:16:16 UTC (rev 51) @@ -70,7 +70,7 @@ import nc.ird.module.utils.CollectionTools; import nc.ird.module.utils.LogTools; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.wicket.AttributeModifier; import org.apache.wicket.MarkupContainer; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/CaptchaModel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/CaptchaModel.java 2013-01-18 09:45:42 UTC (rev 50) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/CaptchaModel.java 2013-01-18 11:16:16 UTC (rev 51) @@ -24,7 +24,7 @@ import java.io.Serializable; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.validator.constraints.NotEmpty; /** Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/LoadableDetachableSortableListDataProvider.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/LoadableDetachableSortableListDataProvider.java 2013-01-18 09:45:42 UTC (rev 50) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/LoadableDetachableSortableListDataProvider.java 2013-01-18 11:16:16 UTC (rev 51) @@ -39,7 +39,7 @@ import nc.ird.module.utils.LogTools; import org.apache.commons.collections.comparators.NullComparator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthSession.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthSession.java 2013-01-18 09:45:42 UTC (rev 50) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthSession.java 2013-01-18 11:16:16 UTC (rev 51) @@ -34,7 +34,7 @@ import nc.ird.cantharella.web.config.WebApplicationImpl; import nc.ird.module.utils.LogTools; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.protocol.http.WebSession; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-18 09:45:42 UTC (rev 50) +++ trunk/pom.xml 2013-01-18 11:16:16 UTC (rev 51) @@ -119,8 +119,8 @@ <version.hibernate>4.1.9.Final</version.hibernate> <version.hibernate-validator>4.3.1.Final</version.hibernate-validator> <version.hibernate3-maven-plugin>3.0</version.hibernate3-maven-plugin> - <version.hibernate-search>4.1.1.Final</version.hibernate-search> - <version.lucene>3.5.0</version.lucene> + <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.6.8</version.aspectj> @@ -315,6 +315,11 @@ <version>${version.hibernate-search}</version> </dependency> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search-engine</artifactId> + <version>${version.hibernate-search}</version> + </dependency> + <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> <version>${version.lucene}</version>