Author: echatellier Date: 2013-02-04 11:31:18 +0100 (Mon, 04 Feb 2013) New Revision: 68 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/68 Log: Move log over slf4j instead of java commons logging Added: trunk/cantharella.web/src/main/resources/commons/log4j.xml Removed: trunk/cantharella.utils/src/main/java/nc/ird/module/utils/LogTools.java trunk/cantharella.utils/src/test/java/nc/ird/module/utils/LogToolsTest.java trunk/licenses/icu4j-license.txt Modified: trunk/cantharella.data/pom.xml trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/ValidationIntegrator.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Molecule.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Produit.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Purification.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/ResultatTestBio.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/CampagnePersonneDroitsComp.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/ExtraitsOfExtractionComp.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/FractionsOfPurificationComp.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/ResultatsOfTestBioComp.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/model/search/UtilisateurSearchFilter.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/utils/AbstractModel.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/CollectionUniqueFieldValidator.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/DbUniqueFieldValidator.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/QueryConstraintValidator.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/utils/ModelValidatorEventListener.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/dao/utils/TestAppender.java trunk/cantharella.service/pom.xml trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/CampagneServiceImpl.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/ExtractionServiceImpl.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/MailServiceImpl.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/MoleculeServiceImpl.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/PersonneServiceImpl.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/ProduitServiceImpl.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/PurificationServiceImpl.java 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/SpecimenServiceImpl.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/StationServiceImpl.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/TestBioServiceImpl.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/utils/Normalizer.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/utils/NormalizerAspect.java trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/PopulateDB.java trunk/cantharella.utils/pom.xml trunk/cantharella.utils/src/main/java/nc/ird/module/utils/BeanTools.java trunk/cantharella.utils/src/main/java/nc/ird/module/utils/CoordTools.java trunk/cantharella.utils/src/main/java/nc/ird/module/utils/GenericsTools.java trunk/cantharella.web/pom.xml trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebApplicationImpl.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/SandboxPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ReadCampagnePage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageErreurTestBioPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeExtractionPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodePurificationPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeTestBioPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManagePartiePage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ManageExtractionPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ReadExtractionPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ManageLotPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ListPersonnesPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ManagePersonnePage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ReadPersonnePage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ListPurificationsPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ManagePurificationPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ReadPurificationPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ManageSpecimenPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ReadSpecimenPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ManageStationPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ReadStationPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ManageTestBioPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ReadTestBioPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ManageUtilisateurPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ReadUtilisateurPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/MoleculeEditorBehavior.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/MoleculeViewBehavior.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/converters/BigDecimalConverterImpl.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/converters/DoubleConverterImpl.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/forms/SubmittableButton.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/GenericLoadableDetachableModel.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/cantharella.web/src/main/webapp/js/moleditor.js trunk/cantharella.web/src/main/webapp/js/molviewer.js trunk/cantharella.web/src/site/rst/devel/integration-chemdoodle.rst trunk/pom.xml Modified: trunk/cantharella.data/pom.xml =================================================================== --- trunk/cantharella.data/pom.xml 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.data/pom.xml 2013-02-04 10:31:18 UTC (rev 68) @@ -95,6 +95,20 @@ </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> @@ -106,10 +120,6 @@ <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> <dependency> <groupId>org.aspectj</groupId> @@ -184,12 +194,6 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <scope>test</scope> 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-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java 2013-02-04 10:31:18 UTC (rev 68) @@ -40,9 +40,9 @@ import nc.ird.cantharella.data.exceptions.UnexpectedException; import nc.ird.cantharella.data.validation.utils.ModelValidator; import nc.ird.cantharella.data.validation.utils.ModelValidatorImpl; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.hibernate.SessionFactory; import org.hibernate.cache.ehcache.SingletonEhCacheRegionFactory; import org.hibernate.cfg.Environment; @@ -81,7 +81,7 @@ public abstract class DataContext { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(DataContext.class); /** Country codes */ public static final List<String> COUNTRY_CODES = Collections.unmodifiableList(Arrays.asList(Locale @@ -183,7 +183,7 @@ try { dataSource.setDriverClass(Driver.class.getName()); } catch (PropertyVetoException e) { - LOG.fatal(e.getMessage(), e); + LOG.error(e.getMessage(), e); throw new UnexpectedException(e); } dataSource.setJdbcUrl(dbUrlProperty); @@ -199,7 +199,7 @@ try { dataSource.setConnectionTesterClassName(DefaultConnectionTester.class.getName()); } catch (PropertyVetoException e) { - LOG.fatal(e.getMessage(), e); + LOG.error(e.getMessage(), e); throw new UnexpectedException(e); } dataSource.setPreferredTestQuery(null); 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-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/ValidationIntegrator.java 2013-02-04 10:31:18 UTC (rev 68) @@ -27,9 +27,9 @@ import javax.validation.ValidatorFactory; import nc.ird.cantharella.data.validation.utils.ModelValidatorEventListener; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.hibernate.cfg.Configuration; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.event.service.spi.EventListenerRegistry; @@ -46,7 +46,7 @@ public class ValidationIntegrator implements Integrator { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(ValidationIntegrator.class); @Override public void integrate(Configuration configuration, Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Molecule.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Molecule.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Molecule.java 2013-02-04 10:31:18 UTC (rev 68) @@ -27,8 +27,6 @@ import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.Id; @@ -41,7 +39,6 @@ import javax.validation.constraints.NotNull; import nc.ird.cantharella.data.config.DataContext; -import nc.ird.cantharella.data.model.Specimen.TypeOrganisme; import nc.ird.cantharella.data.model.search.UtilisateurSearchFilter; import nc.ird.cantharella.data.model.utils.AbstractModel; @@ -329,7 +326,7 @@ } /** - * @param provenance the provenances to set + * @param provenances the provenances to set */ public void setProvenances(List<MoleculeProvenance> provenances) { this.provenances = provenances; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Produit.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Produit.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Produit.java 2013-02-04 10:31:18 UTC (rev 68) @@ -64,8 +64,6 @@ impl = ProduitBridge.class) public abstract class Produit extends AbstractModel implements Cloneable, Comparable<Produit> { - /** Logger */ - // private static final Log LOG = LogTools.getLog(); /** Id du produit */ @Id @GeneratedValue Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Purification.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Purification.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Purification.java 2013-02-04 10:31:18 UTC (rev 68) @@ -76,8 +76,6 @@ }) public class Purification extends AbstractModel implements Comparable<Purification> { - /** Logger */ - // private static final Log LOG = LogTools.getLog(); /** Id de la purification */ @Id @GeneratedValue Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/ResultatTestBio.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/ResultatTestBio.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/ResultatTestBio.java 2013-02-04 10:31:18 UTC (rev 68) @@ -69,8 +69,6 @@ public class ResultatTestBio extends AbstractModel implements Cloneable, Comparable<ResultatTestBio> { - /** Logger */ - // private static final Log LOG = LogTools.getLog(); /** * Type du résultat de test biologique */ Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/CampagnePersonneDroitsComp.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/CampagnePersonneDroitsComp.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/CampagnePersonneDroitsComp.java 2013-02-04 10:31:18 UTC (rev 68) @@ -25,10 +25,10 @@ import java.util.Comparator; import nc.ird.cantharella.data.model.CampagnePersonneDroits; -import nc.ird.module.utils.LogTools; import org.apache.commons.beanutils.BeanComparator; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * CampagnePersonneDroits comparator. Compare on campagne. @@ -38,7 +38,7 @@ public class CampagnePersonneDroitsComp implements Comparator<CampagnePersonneDroits> { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(CampagnePersonneDroitsComp.class); /** {@inheritDoc} */ @Override Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/ExtraitsOfExtractionComp.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/ExtraitsOfExtractionComp.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/ExtraitsOfExtractionComp.java 2013-02-04 10:31:18 UTC (rev 68) @@ -34,8 +34,6 @@ */ public class ExtraitsOfExtractionComp implements Comparator<Extrait> { - /** Logger */ - // private static final Log LOG = LogTools.getLog(); /** {@inheritDoc} */ @Override public int compare(Extrait obj1, Extrait obj2) { Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/FractionsOfPurificationComp.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/FractionsOfPurificationComp.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/FractionsOfPurificationComp.java 2013-02-04 10:31:18 UTC (rev 68) @@ -36,8 +36,6 @@ */ public class FractionsOfPurificationComp implements Comparator<Fraction> { - /** Logger */ - // private static final Log LOG = LogTools.getLog(); /** {@inheritDoc} */ @Override public int compare(Fraction obj1, Fraction obj2) { Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/ResultatsOfTestBioComp.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/ResultatsOfTestBioComp.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/ResultatsOfTestBioComp.java 2013-02-04 10:31:18 UTC (rev 68) @@ -36,8 +36,6 @@ */ public class ResultatsOfTestBioComp implements Comparator<ResultatTestBio> { - /** Logger */ - // private static final Log LOG = LogTools.getLog(); /** {@inheritDoc} */ @Override public int compare(ResultatTestBio obj1, ResultatTestBio obj2) { 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-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/ProduitBridge.java 2013-02-04 10:31:18 UTC (rev 68) @@ -27,10 +27,10 @@ import nc.ird.cantharella.data.model.Fraction; import nc.ird.cantharella.data.model.Produit; import nc.ird.cantharella.data.model.ResultatTestBio; -import nc.ird.module.utils.LogTools; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.hibernate.search.bridge.FieldBridge; @@ -45,7 +45,7 @@ public class ProduitBridge implements FieldBridge { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(ProduitBridge.class); @Override public void set(String name, Object value, Document document, Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/UtilisateurSearchFilter.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/UtilisateurSearchFilter.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/UtilisateurSearchFilter.java 2013-02-04 10:31:18 UTC (rev 68) @@ -26,9 +26,9 @@ import nc.ird.cantharella.data.model.Utilisateur; import nc.ird.cantharella.data.model.Utilisateur.TypeDroit; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Term; import org.apache.lucene.index.TermDocs; @@ -51,7 +51,7 @@ private static final long serialVersionUID = 5599764509232575010L; /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(UtilisateurSearchFilter.class); /** Utilisateur performing the query. */ protected Utilisateur utilisateur; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/utils/AbstractModel.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/utils/AbstractModel.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/utils/AbstractModel.java 2013-02-04 10:31:18 UTC (rev 68) @@ -35,9 +35,9 @@ import nc.ird.module.utils.AssertTools; import nc.ird.module.utils.BeanTools; import nc.ird.module.utils.BeanTools.AccessType; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Abstract model @@ -65,7 +65,7 @@ protected static final int LENGTH_TINY_TEXT = 10; /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(AbstractModel.class); /** * Retrieve the @Id or @EmbeddedId field Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/CollectionUniqueFieldValidator.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/CollectionUniqueFieldValidator.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/CollectionUniqueFieldValidator.java 2013-02-04 10:31:18 UTC (rev 68) @@ -38,8 +38,6 @@ */ public final class CollectionUniqueFieldValidator implements ConstraintValidator<CollectionUniqueField, Object> { - /** Logger */ - // private static final Log LOG = LogTools.getLog(); /** * field name of the list which must be unique */ Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/DbUniqueFieldValidator.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/DbUniqueFieldValidator.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/DbUniqueFieldValidator.java 2013-02-04 10:31:18 UTC (rev 68) @@ -42,8 +42,6 @@ */ public final class DbUniqueFieldValidator implements ConstraintValidator<DbUniqueField, Object> { - /** Logger */ - // private static final Log LOG = LogTools.getLog(); /** * field name of the list which must be unique */ Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/QueryConstraintValidator.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/QueryConstraintValidator.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/QueryConstraintValidator.java 2013-02-04 10:31:18 UTC (rev 68) @@ -30,9 +30,9 @@ import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.SessionFactory; @@ -50,7 +50,7 @@ public class QueryConstraintValidator implements ConstraintValidator<QueryConstraint, String> { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(QueryConstraintValidator.class); /** Hql query to request */ private String hql; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/utils/ModelValidatorEventListener.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/utils/ModelValidatorEventListener.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/utils/ModelValidatorEventListener.java 2013-02-04 10:31:18 UTC (rev 68) @@ -31,9 +31,9 @@ import javax.validation.ValidatorFactory; import nc.ird.module.utils.AssertTools; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.hibernate.EntityMode; import org.hibernate.event.spi.AbstractPreDatabaseOperationEvent; import org.hibernate.event.spi.PreInsertEvent; @@ -59,7 +59,7 @@ } /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(ModelValidatorEventListener.class); /** Validator */ private final Validator validator; 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-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/utils/ModelValidatorImpl.java 2013-02-04 10:31:18 UTC (rev 68) @@ -37,10 +37,10 @@ import nc.ird.cantharella.data.model.utils.AbstractModel; import nc.ird.module.utils.AssertTools; -import nc.ird.module.utils.LogTools; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.context.NoSuchMessageException; import org.springframework.context.support.MessageSourceAccessor; @@ -52,7 +52,7 @@ public final class ModelValidatorImpl implements ModelValidator { /** Logger */ - static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(ModelValidatorImpl.class); /** Pattern error property: "property message" */ private static final String PATTERN_ERROR_MESSAGE = "%s - %s"; Modified: trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/dao/utils/TestAppender.java =================================================================== --- trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/dao/utils/TestAppender.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/dao/utils/TestAppender.java 2013-02-04 10:31:18 UTC (rev 68) @@ -25,13 +25,12 @@ import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.log4j.AppenderSkeleton; import org.apache.log4j.Level; import org.apache.log4j.LogManager; import org.apache.log4j.Logger; import org.apache.log4j.spi.LoggingEvent; +import org.slf4j.LoggerFactory; /** * Base test appender used to capture logging events for test purposes. @@ -39,9 +38,9 @@ * @version $Id: $ */ public class TestAppender extends AppenderSkeleton { + /** Logger */ + private static org.slf4j.Logger log = LoggerFactory.getLogger(TestAppender.class); /** */ - private static Log log = LogFactory.getLog(TestAppender.class); - /** */ @SuppressWarnings("rawtypes") private final Class[] monitoredClasses; /** */ Modified: trunk/cantharella.service/pom.xml =================================================================== --- trunk/cantharella.service/pom.xml 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.service/pom.xml 2013-02-04 10:31:18 UTC (rev 68) @@ -71,15 +71,25 @@ </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency> @@ -138,12 +148,6 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <scope>test</scope> Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/CampagneServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/CampagneServiceImpl.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/CampagneServiceImpl.java 2013-02-04 10:31:18 UTC (rev 68) @@ -38,9 +38,9 @@ import nc.ird.cantharella.data.model.Utilisateur.TypeDroit; import nc.ird.cantharella.service.services.CampagneService; import nc.ird.module.utils.AssertTools; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -53,7 +53,7 @@ public final class CampagneServiceImpl implements CampagneService { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(CampagneServiceImpl.class); /** Accès aux données */ @Autowired 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-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/DocumentServiceImpl.java 2013-02-04 10:31:18 UTC (rev 68) @@ -31,9 +31,9 @@ import nc.ird.cantharella.data.model.TypeDocument; import nc.ird.cantharella.service.services.DocumentService; import nc.ird.module.utils.AssertTools; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -45,7 +45,7 @@ public final class DocumentServiceImpl implements DocumentService { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(DocumentServiceImpl.class); /** DAO */ @Autowired Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/ExtractionServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/ExtractionServiceImpl.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/ExtractionServiceImpl.java 2013-02-04 10:31:18 UTC (rev 68) @@ -42,9 +42,9 @@ import nc.ird.cantharella.service.services.ExtractionService; import nc.ird.cantharella.service.services.LotService; import nc.ird.module.utils.AssertTools; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -57,7 +57,7 @@ public final class ExtractionServiceImpl implements ExtractionService { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(ExtractionServiceImpl.class); /** DAO */ @Autowired 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-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/LotServiceImpl.java 2013-02-04 10:31:18 UTC (rev 68) @@ -38,9 +38,9 @@ import nc.ird.cantharella.data.model.Utilisateur.TypeDroit; import nc.ird.cantharella.service.services.LotService; import nc.ird.module.utils.AssertTools; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -53,7 +53,7 @@ public final class LotServiceImpl implements LotService { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(LotServiceImpl.class); /** DAO */ @Autowired 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-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/MailServiceImpl.java 2013-02-04 10:31:18 UTC (rev 68) @@ -31,10 +31,10 @@ import nc.ird.cantharella.service.exceptions.EmailException; import nc.ird.cantharella.service.services.MailService; import nc.ird.module.utils.AssertTools; -import nc.ird.module.utils.LogTools; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mail.MailSender; import org.springframework.mail.SimpleMailMessage; @@ -49,7 +49,7 @@ public final class MailServiceImpl implements MailService { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(MailServiceImpl.class); /** E-mail message template */ @Autowired Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/MoleculeServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/MoleculeServiceImpl.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/MoleculeServiceImpl.java 2013-02-04 10:31:18 UTC (rev 68) @@ -35,9 +35,9 @@ import nc.ird.cantharella.data.model.Utilisateur.TypeDroit; import nc.ird.cantharella.service.services.MoleculeService; import nc.ird.module.utils.AssertTools; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -50,7 +50,7 @@ public final class MoleculeServiceImpl implements MoleculeService { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(MoleculeServiceImpl.class); /** DAO */ @Autowired Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/PersonneServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/PersonneServiceImpl.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/PersonneServiceImpl.java 2013-02-04 10:31:18 UTC (rev 68) @@ -40,10 +40,10 @@ import nc.ird.cantharella.service.utils.normalizers.EmailNormalizer; import nc.ird.cantharella.service.utils.normalizers.utils.Normalize; import nc.ird.module.utils.AssertTools; -import nc.ird.module.utils.LogTools; import nc.ird.module.utils.PasswordTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.NoSuchMessageException; import org.springframework.context.support.MessageSourceAccessor; @@ -63,7 +63,7 @@ public final class PersonneServiceImpl implements PersonneService { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(PersonneServiceImpl.class); /** Accès aux données */ @Autowired Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/ProduitServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/ProduitServiceImpl.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/ProduitServiceImpl.java 2013-02-04 10:31:18 UTC (rev 68) @@ -52,8 +52,6 @@ @Service public final class ProduitServiceImpl implements ProduitService { - /** Logger */ - // private static final Log LOG = LogTools.getLog(); /** DAO */ @Autowired private GenericDao dao; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/PurificationServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/PurificationServiceImpl.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/PurificationServiceImpl.java 2013-02-04 10:31:18 UTC (rev 68) @@ -46,9 +46,9 @@ import nc.ird.cantharella.service.services.ExtractionService; import nc.ird.cantharella.service.services.PurificationService; import nc.ird.module.utils.AssertTools; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -60,7 +60,7 @@ public final class PurificationServiceImpl implements PurificationService { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(PurificationServiceImpl.class); /** DAO */ @Autowired 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-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java 2013-02-04 10:31:18 UTC (rev 68) @@ -36,9 +36,9 @@ import nc.ird.cantharella.data.model.Utilisateur; import nc.ird.cantharella.service.model.SearchResult; import nc.ird.cantharella.service.services.SearchService; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.lucene.index.FieldInfos; import org.apache.lucene.index.IndexReader; import org.apache.lucene.queryParser.MultiFieldQueryParser; @@ -67,7 +67,7 @@ public class SearchServiceImpl implements SearchService { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(SearchServiceImpl.class); @Resource private SessionFactory sessionFactory; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SpecimenServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SpecimenServiceImpl.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SpecimenServiceImpl.java 2013-02-04 10:31:18 UTC (rev 68) @@ -40,9 +40,9 @@ import nc.ird.cantharella.data.model.Utilisateur.TypeDroit; import nc.ird.cantharella.service.services.SpecimenService; import nc.ird.module.utils.AssertTools; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -55,7 +55,7 @@ public final class SpecimenServiceImpl implements SpecimenService { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(SpecimenServiceImpl.class); /** Accès aux données */ @Autowired Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/StationServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/StationServiceImpl.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/StationServiceImpl.java 2013-02-04 10:31:18 UTC (rev 68) @@ -39,9 +39,9 @@ import nc.ird.cantharella.data.model.Utilisateur.TypeDroit; import nc.ird.cantharella.service.services.StationService; import nc.ird.module.utils.AssertTools; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -54,7 +54,7 @@ public final class StationServiceImpl implements StationService { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(StationServiceImpl.class); /** DAO */ @Autowired Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/TestBioServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/TestBioServiceImpl.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/TestBioServiceImpl.java 2013-02-04 10:31:18 UTC (rev 68) @@ -42,9 +42,9 @@ import nc.ird.cantharella.service.services.LotService; import nc.ird.cantharella.service.services.TestBioService; import nc.ird.module.utils.AssertTools; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -56,7 +56,7 @@ public final class TestBioServiceImpl implements TestBioService { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(TestBioServiceImpl.class); /** Service : lots */ @Autowired Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/utils/Normalizer.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/utils/Normalizer.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/utils/Normalizer.java 2013-02-04 10:31:18 UTC (rev 68) @@ -27,9 +27,9 @@ import java.util.Map; import nc.ird.cantharella.data.exceptions.UnexpectedException; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Data normalizer @@ -40,7 +40,7 @@ public abstract class Normalizer<O> { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(Normalizer.class); /** Normalizers cache: normalizerClass + normalizer */ private static final Map<Class<? extends Normalizer<?>>, Normalizer<?>> NORMALIZERS = Collections Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/utils/NormalizerAspect.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/utils/NormalizerAspect.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/utils/NormalizerAspect.java 2013-02-04 10:31:18 UTC (rev 68) @@ -26,9 +26,9 @@ import java.lang.reflect.Method; import java.util.Arrays; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -45,7 +45,7 @@ public final class NormalizerAspect { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(NormalizerAspect.class); /** * Automatically normalizes data by wrapping methods with Normalize annotation on its parameters 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-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/PopulateDB.java 2013-02-04 10:31:18 UTC (rev 68) @@ -61,11 +61,11 @@ import nc.ird.cantharella.service.services.StationService; import nc.ird.cantharella.service.utils.ExcelColumnStructure.ExcelColumnType; import nc.ird.module.utils.CoordTools; -import nc.ird.module.utils.LogTools; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; @@ -78,7 +78,7 @@ public final class PopulateDB { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(PopulateDB.class); /** Date format */ private static final DateFormat DATE_FORMAT = new SimpleDateFormat("d/M/y"); Modified: trunk/cantharella.utils/pom.xml =================================================================== --- trunk/cantharella.utils/pom.xml 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.utils/pom.xml 2013-02-04 10:31:18 UTC (rev 68) @@ -30,10 +30,6 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> <dependency> <groupId>net.sf.opencsv</groupId> Modified: trunk/cantharella.utils/src/main/java/nc/ird/module/utils/BeanTools.java =================================================================== --- trunk/cantharella.utils/src/main/java/nc/ird/module/utils/BeanTools.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.utils/src/main/java/nc/ird/module/utils/BeanTools.java 2013-02-04 10:31:18 UTC (rev 68) @@ -45,8 +45,6 @@ */ public final class BeanTools { - /** Logger */ - // private static final Log LOG = LogTools.getLog(); /** * Access type */ Modified: trunk/cantharella.utils/src/main/java/nc/ird/module/utils/CoordTools.java =================================================================== --- trunk/cantharella.utils/src/main/java/nc/ird/module/utils/CoordTools.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.utils/src/main/java/nc/ird/module/utils/CoordTools.java 2013-02-04 10:31:18 UTC (rev 68) @@ -36,8 +36,6 @@ */ public final class CoordTools { - /** Logger */ - // private static final Log LOG = LogTools.getLog(); /** Degrees character */ public static final char DEGREES = '°'; Modified: trunk/cantharella.utils/src/main/java/nc/ird/module/utils/GenericsTools.java =================================================================== --- trunk/cantharella.utils/src/main/java/nc/ird/module/utils/GenericsTools.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.utils/src/main/java/nc/ird/module/utils/GenericsTools.java 2013-02-04 10:31:18 UTC (rev 68) @@ -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 @@ -22,14 +22,11 @@ */ package nc.ird.module.utils; -import sun.reflect.Reflection; - /** * Tools for generics classes * @author Mickael Tricot * @author Adrien Cheype */ -@SuppressWarnings("restriction") public final class GenericsTools { /** @@ -50,15 +47,4 @@ private GenericsTools() { // } - - /** - * Return the class where this method is called - * @return this class - */ - public static Class<?> getCallerClass(){ - // Warning, access type of this method is forbidden (you must configure your IDE tu use it) - // work only with SUN JVM - return Reflection.getCallerClass(1); - } - } Deleted: trunk/cantharella.utils/src/main/java/nc/ird/module/utils/LogTools.java =================================================================== --- trunk/cantharella.utils/src/main/java/nc/ird/module/utils/LogTools.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.utils/src/main/java/nc/ird/module/utils/LogTools.java 2013-02-04 10:31:18 UTC (rev 68) @@ -1,52 +0,0 @@ -/* - * #%L - * Cantharella :: Utils - * $Id:$ - * $HeadURL:$ - * %% - * Copyright (C) 2009 - 2012 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.module.utils; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * Tools for logging - * @author Mickael Tricot - * @author Adrien Cheype - */ -public final class LogTools { - - /** - * Create a logger by retrieving the caller class. This method is expensive, so you may use it only once in each - * class. - * @return Logger - */ - public static Log getLog() { - //old methode to get the class in a static methode - //new LogConfigurationException().fillInStackTrace().getStackTrace()[1].getClassName() - return LogFactory.getLog(GenericsTools.getCallerClass()); - } - - /** - * Constructor (prevents from instantiation) - */ - private LogTools() { - // - } -} Deleted: trunk/cantharella.utils/src/test/java/nc/ird/module/utils/LogToolsTest.java =================================================================== --- trunk/cantharella.utils/src/test/java/nc/ird/module/utils/LogToolsTest.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.utils/src/test/java/nc/ird/module/utils/LogToolsTest.java 2013-02-04 10:31:18 UTC (rev 68) @@ -1,44 +0,0 @@ -/* - * #%L - * Cantharella :: Utils - * $Id:$ - * $HeadURL:$ - * %% - * Copyright (C) 2009 - 2012 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.module.utils; - -import org.apache.commons.logging.Log; -import org.junit.Assert; -import org.junit.Test; - -/** - * LogTools test - * @author Mickael Tricot - */ -public final class LogToolsTest { - - /** - * getLog test - */ - @Test - public void getLog() { - Log log = LogTools.getLog(); - Assert.assertNotNull(log); - log.debug(null); - } -} Modified: trunk/cantharella.web/pom.xml =================================================================== --- trunk/cantharella.web/pom.xml 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/pom.xml 2013-02-04 10:31:18 UTC (rev 68) @@ -204,14 +204,23 @@ </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </dependency> @@ -291,12 +300,6 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> </dependency> 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-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebApplicationImpl.java 2013-02-04 10:31:18 UTC (rev 68) @@ -71,9 +71,9 @@ import nc.ird.cantharella.web.utils.security.AuthSession; import nc.ird.cantharella.web.utils.security.AuthStrategy; import nc.ird.module.utils.AssertTools; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.ConverterLocator; import org.apache.wicket.IConverterLocator; import org.apache.wicket.RuntimeConfigurationType; @@ -106,7 +106,7 @@ public final class WebApplicationImpl extends WebApplication { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(WebApplicationImpl.class); /** * SpringBeans injector (some objects such as Pages are automatically injected, by not all of them) Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -52,9 +52,9 @@ import nc.ird.cantharella.web.utils.security.AuthRole; import nc.ird.module.utils.BeanTools.AccessType; import nc.ird.module.utils.CollectionTools; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxFallbackLink; @@ -82,7 +82,7 @@ public final class HomePage extends TemplatePage { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(HomePage.class); /** Action : login */ private static final String ACTION_LOGIN = "Login"; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/SandboxPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/SandboxPage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/SandboxPage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -28,9 +28,9 @@ import nc.ird.cantharella.data.dao.impl.PersonneDao; import nc.ird.cantharella.data.model.Utilisateur; import nc.ird.cantharella.data.model.Utilisateur.TypeDroit; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.spring.injection.annot.SpringBean; import org.hibernate.criterion.DetachedCriteria; @@ -43,7 +43,7 @@ public class SandboxPage extends WebPage { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(SandboxPage.class); /** DAO */ @SpringBean @@ -58,20 +58,20 @@ @SuppressWarnings("unchecked") public SandboxPage() { long count = dao.count(PersonneDao.CRITERIA_LIST_ADMINS); - LOG.debug(count); + LOG.debug(String.valueOf(count)); List<Utilisateur> users = (List<Utilisateur>) dao.list(DetachedCriteria.forClass(Utilisateur.class) .add(Restrictions.eq("typeDroit", TypeDroit.ADMINISTRATEUR)) .add(Restrictions.eq("estValide", Boolean.TRUE))); - LOG.debug(users); + LOG.debug(users.toString()); for (Utilisateur u : users) { - LOG.debug(u); + LOG.debug(u.toString()); } List<Utilisateur> users2 = (List<Utilisateur>) dao.list(PersonneDao.CRITERIA_LIST_ADMINS); - LOG.debug(users2); + LOG.debug(users2.toString()); for (Utilisateur u : users2) { - LOG.debug(u); + LOG.debug(u.toString()); } // LOG.debug("createur proxy : " + (p1.createur instanceof HibernateProxy)); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -44,10 +44,10 @@ import nc.ird.cantharella.web.utils.security.AuthRole; import nc.ird.cantharella.web.utils.security.AuthSession; import nc.ird.module.utils.AssertTools; -import nc.ird.module.utils.LogTools; import nc.ird.module.utils.Pair; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -81,7 +81,7 @@ private static final String ID_AJAX_INDICATOR = "AjaxIndicator"; /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(TemplatePage.class); /** Pattern: enum value label (simpleClassName.valueString) */ public static final String PATTERN_ENUM_VALUE_LABEL = "%s.%s"; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -55,9 +55,9 @@ import nc.ird.cantharella.web.utils.security.AuthRole; import nc.ird.cantharella.web.utils.security.AuthRoles; import nc.ird.module.utils.CollectionTools; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.AttributeModifier; import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -102,7 +102,7 @@ private static final String ACTION_UPDATE = "Update"; /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(ManageCampagnePage.class); /** Bouton d'ajout d'un participant */ private Button addParticipant; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ReadCampagnePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ReadCampagnePage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ReadCampagnePage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -69,7 +69,7 @@ public final class ReadCampagnePage extends TemplatePage { /** Logger */ - // private static final Log LOG = LogTools.getLog(); + //private static final Logger LOG = LoggerFactory.getLogger(ReadCampagnePage.class); /** Action : delete */ public static final String ACTION_DELETE = "Delete"; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageErreurTestBioPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageErreurTestBioPage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageErreurTestBioPage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -34,9 +34,9 @@ import nc.ird.cantharella.web.utils.forms.SubmittableButtonEvents; import nc.ird.cantharella.web.utils.security.AuthRole; import nc.ird.cantharella.web.utils.security.AuthRoles; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.markup.html.form.Button; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextArea; @@ -69,7 +69,7 @@ final private String[] RETURN_PARAM = { "erreurTestBio", "opened" }; /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(ManageErreurTestBioPage.class); /** erreurTest Model */ private final IModel<ErreurTestBio> erreurTestModel; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeExtractionPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeExtractionPage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeExtractionPage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -41,9 +41,9 @@ import nc.ird.cantharella.web.utils.forms.SubmittableButtonEvents; import nc.ird.cantharella.web.utils.security.AuthRole; import nc.ird.cantharella.web.utils.security.AuthRoles; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.AttributeModifier; import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -84,7 +84,7 @@ final private String[] RETURN_PARAM = { "methodeExtraction", "opened" }; /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(ManageMethodeExtractionPage.class); /** erreurTest Model */ private final IModel<MethodeExtraction> methodeExtractionModel; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodePurificationPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodePurificationPage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodePurificationPage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -41,9 +41,9 @@ import nc.ird.cantharella.web.utils.forms.SubmittableButtonEvents; import nc.ird.cantharella.web.utils.security.AuthRole; import nc.ird.cantharella.web.utils.security.AuthRoles; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.AttributeModifier; import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -84,7 +84,7 @@ final private String[] RETURN_PARAM = { "methodePurification", "opened" }; /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(ManageMethodePurificationPage.class); /** erreurTest Model */ private final IModel<MethodePurification> methodePurificationModel; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeTestBioPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeTestBioPage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeTestBioPage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -38,9 +38,9 @@ import nc.ird.cantharella.web.utils.forms.SubmittableButtonEvents; import nc.ird.cantharella.web.utils.security.AuthRole; import nc.ird.cantharella.web.utils.security.AuthRoles; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.markup.html.form.Button; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextArea; @@ -72,7 +72,7 @@ final private String[] RETURN_PARAM = { "methodeTestBio", "opened" }; /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(ManageMethodeTestBioPage.class); /** erreurTest Model */ private final IModel<MethodeTestBio> methodeTestModel; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManagePartiePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManagePartiePage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManagePartiePage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -34,9 +34,9 @@ import nc.ird.cantharella.web.utils.forms.SubmittableButtonEvents; import nc.ird.cantharella.web.utils.security.AuthRole; import nc.ird.cantharella.web.utils.security.AuthRoles; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.markup.html.form.Button; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextField; @@ -68,7 +68,7 @@ final private String[] RETURN_PARAM = { "partie", "opened" }; /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(ManagePartiePage.class); /** partie Model */ private final IModel<Partie> partieModel; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ManageExtractionPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ManageExtractionPage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ManageExtractionPage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -59,9 +59,9 @@ import nc.ird.cantharella.web.utils.security.AuthRoles; import nc.ird.module.utils.BeanTools.AccessType; import nc.ird.module.utils.CollectionTools; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.AttributeModifier; import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -107,7 +107,7 @@ public static final String ACTION_DELETE = "Delete"; /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(ManageExtractionPage.class); /** extraction Model */ private final IModel<Extraction> extractionModel; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ReadExtractionPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ReadExtractionPage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ReadExtractionPage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -72,7 +72,7 @@ public static final String ACTION_DELETE = "Delete"; /** Logger */ - // private static final Log LOG = LogTools.getLog(); + //private static final Logger LOG = LoggerFactory.getLogger(ReadExtractionPage.class); /** extraction Model */ private final IModel<Extraction> extractionModel; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ManageLotPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ManageLotPage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ManageLotPage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -51,9 +51,9 @@ import nc.ird.cantharella.web.utils.security.AuthRoles; import nc.ird.module.utils.BeanTools.AccessType; import nc.ird.module.utils.CollectionTools; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink; @@ -90,7 +90,7 @@ private static final String ACTION_UPDATE = "Update"; /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(ManageLotPage.class); /** Campagnes */ private final List<Campagne> campagnes; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -65,7 +65,7 @@ public static final String ACTION_DELETE = "Delete"; /** Logger */ - // private static final Log LOG = LogTools.getLog(); + //private static final Logger LOG = LoggerFactory.getLogger(ReadLotPage.class); /** Modèle : lot */ private final IModel<Lot> lotModel; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -60,9 +60,9 @@ import nc.ird.cantharella.web.utils.panels.PropertyLabelLinkProduitPanel; import nc.ird.cantharella.web.utils.security.AuthRole; import nc.ird.cantharella.web.utils.security.AuthRoles; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.AttributeModifier; import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -103,7 +103,7 @@ private static final String ACTION_UPDATE = "Update"; /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(ManageMoleculePage.class); /** Campagnes */ private final List<Campagne> campagnes; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ListPersonnesPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ListPersonnesPage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ListPersonnesPage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -65,7 +65,7 @@ public final class ListPersonnesPage extends TemplatePage { /** Logger */ - // private static final Log LOG = LogTools.getLog(); + //private static final Logger LOG = LoggerFactory.getLogger(ListPersonnesPage.class); /** Service : personne */ @SpringBean private PersonneService personneService; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ManagePersonnePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ManagePersonnePage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ManagePersonnePage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -37,9 +37,9 @@ import nc.ird.cantharella.web.utils.forms.SubmittableButtonEvents; import nc.ird.cantharella.web.utils.security.AuthRole; import nc.ird.cantharella.web.utils.security.AuthRoles; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.markup.html.form.Button; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.link.Link; @@ -68,7 +68,7 @@ private static final String ACTION_UPDATE = "Update"; /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(ManagePersonnePage.class); /** Page appelante */ private final CallerPage callerPage; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ReadPersonnePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ReadPersonnePage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ReadPersonnePage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -50,7 +50,7 @@ public static final String ACTION_DELETE = "Delete"; /** Logger */ - // private static final Log LOG = LogTools.getLog(); + //private static final Logger LOG = LoggerFactory.getLogger(ReadPersonnePage.class); /** Page appelante */ private final CallerPage callerPage; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ListPurificationsPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ListPurificationsPage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ListPurificationsPage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -65,7 +65,7 @@ public final class ListPurificationsPage extends TemplatePage { /** Logger */ - // private static final Log LOG = LogTools.getLog(); + //private static final Logger LOG = LoggerFactory.getLogger(ListPurificationsPage.class); /** Service : manipPurification */ @SpringBean private PurificationService purificationService; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ManagePurificationPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ManagePurificationPage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ManagePurificationPage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -58,9 +58,9 @@ import nc.ird.cantharella.web.utils.security.AuthRoles; import nc.ird.module.utils.BeanTools.AccessType; import nc.ird.module.utils.CollectionTools; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.AttributeModifier; import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -96,7 +96,7 @@ public final class ManagePurificationPage extends TemplatePage { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(ManagePurificationPage.class); /** Action : create */ private static final String ACTION_CREATE = "Create"; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ReadPurificationPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ReadPurificationPage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ReadPurificationPage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -73,7 +73,7 @@ public final class ReadPurificationPage extends TemplatePage { /** Logger */ - // private static final Log LOG = LogTools.getLog(); + //private static final Logger LOG = LoggerFactory.getLogger(ReadPurificationPage.class); /** Action : delete */ public static final String ACTION_DELETE = "Delete"; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ManageSpecimenPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ManageSpecimenPage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ManageSpecimenPage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -52,9 +52,9 @@ import nc.ird.cantharella.web.utils.security.AuthRoles; import nc.ird.module.utils.BeanTools.AccessType; import nc.ird.module.utils.CollectionTools; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink; import org.apache.wicket.extensions.markup.html.form.DateTextField; @@ -89,7 +89,7 @@ private static final String ACTION_UPDATE = "Update"; /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(ManageSpecimenPage.class); /** Modèle : specimen */ private final IModel<Specimen> specimenModel; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ReadSpecimenPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ReadSpecimenPage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ReadSpecimenPage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -61,7 +61,7 @@ public static final String ACTION_DELETE = "Delete"; /** Logger */ - // private static final Log LOG = LogTools.getLog(); + //private static final Logger LOG = LoggerFactory.getLogger(ReadSpecimenPage.class); /** Modèle : specimen */ private final IModel<Specimen> specimenModel; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ManageStationPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ManageStationPage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ManageStationPage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -46,9 +46,9 @@ import nc.ird.cantharella.web.utils.security.AuthRole; import nc.ird.cantharella.web.utils.security.AuthRoles; import nc.ird.module.utils.CoordTools; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Button; import org.apache.wicket.markup.html.form.DropDownChoice; @@ -79,7 +79,7 @@ public static final String ACTION_UPDATE = "Update"; /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(ManageStationPage.class); /** Page appelante */ private final CallerPage callerPage; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ReadStationPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ReadStationPage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ReadStationPage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -56,7 +56,7 @@ public final class ReadStationPage extends TemplatePage { /** Logger */ - // private static final Log LOG = LogTools.getLog(); + //private static final Logger LOG = LoggerFactory.getLogger(ReadStationPage.class); /** Action : delete */ public static final String ACTION_DELETE = "Delete"; 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-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ManageTestBioPage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -68,10 +68,10 @@ import nc.ird.cantharella.web.utils.security.AuthRoles; import nc.ird.module.utils.BeanTools.AccessType; import nc.ird.module.utils.CollectionTools; -import nc.ird.module.utils.LogTools; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.AttributeModifier; import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -107,7 +107,7 @@ public final class ManageTestBioPage extends TemplatePage { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(ManageTestBioPage.class); /** Action : create */ private static final String ACTION_CREATE = "Create"; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ReadTestBioPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ReadTestBioPage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ReadTestBioPage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -78,7 +78,7 @@ public final class ReadTestBioPage extends TemplatePage { /** Logger */ - // private static final Log LOG = LogTools.getLog(); + //private static final Logger LOG = LoggerFactory.getLogger(ReadTestBioPage.class); /** Action : update */ private static final String ACTION_DELETE = "Delete"; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ManageUtilisateurPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ManageUtilisateurPage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ManageUtilisateurPage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -53,10 +53,10 @@ import nc.ird.module.utils.BeanTools; import nc.ird.module.utils.BeanTools.AccessType; import nc.ird.module.utils.CollectionTools; -import nc.ird.module.utils.LogTools; import org.apache.commons.collections.comparators.ComparatorChain; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.AttributeModifier; import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -98,7 +98,7 @@ public static final String ACTION_VALID = "Valid"; /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(ManageUtilisateurPage.class); /** Ajout d'une autorisation sur une campagne ou un lot */ private final Button addAuthorization; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ReadUtilisateurPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ReadUtilisateurPage.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ReadUtilisateurPage.java 2013-02-04 10:31:18 UTC (rev 68) @@ -56,7 +56,7 @@ public static final String ACTION_DELETE = "Delete"; /** Logger */ - // private static final Log LOG = LogTools.getLog(); + //private static final Logger LOG = LoggerFactory.getLogger(ReadUtilisateurPage.class); /** Page appelante */ private final CallerPage callerPage; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/MoleculeEditorBehavior.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/MoleculeEditorBehavior.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/MoleculeEditorBehavior.java 2013-02-04 10:31:18 UTC (rev 68) @@ -10,12 +10,12 @@ * 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% Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/MoleculeViewBehavior.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/MoleculeViewBehavior.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/MoleculeViewBehavior.java 2013-02-04 10:31:18 UTC (rev 68) @@ -10,12 +10,12 @@ * 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% Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/converters/BigDecimalConverterImpl.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/converters/BigDecimalConverterImpl.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/converters/BigDecimalConverterImpl.java 2013-02-04 10:31:18 UTC (rev 68) @@ -45,7 +45,7 @@ public static final int DECIMAL_MIN_FRACTION_DIGIT = 0; /** Logger */ - // private static final Log LOG = LogTools.getLog(); + //private static final Logger LOG = LoggerFactory.getLogger(BigDecimalConverterImpl.class); /** The singleton instance for a big integer converter */ public static final IConverter<BigDecimal> INSTANCE = new BigDecimalConverterImpl(); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/converters/DoubleConverterImpl.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/converters/DoubleConverterImpl.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/converters/DoubleConverterImpl.java 2013-02-04 10:31:18 UTC (rev 68) @@ -41,7 +41,7 @@ public static final int DECIMAL_MIN_FRACTION_DIGIT = 0; /** Logger */ - // private static final Log LOG = LogTools.getLog(); + //private static final Logger LOG = LoggerFactory.getLogger(DoubleConverterImpl.class); /** The singleton instance for a float converter */ public static final IConverter<Double> INSTANCE = new DoubleConverterImpl(); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/forms/SubmittableButton.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/forms/SubmittableButton.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/forms/SubmittableButton.java 2013-02-04 10:31:18 UTC (rev 68) @@ -24,9 +24,9 @@ import nc.ird.cantharella.data.exceptions.UnexpectedException; import nc.ird.cantharella.web.pages.TemplatePage; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.markup.html.form.Button; import org.apache.wicket.model.IModel; @@ -37,7 +37,7 @@ public final class SubmittableButton extends Button { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(SubmittableButton.class); /** Submittable */ private final SubmittableButtonEvents submittable; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/GenericLoadableDetachableModel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/GenericLoadableDetachableModel.java 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/GenericLoadableDetachableModel.java 2013-02-04 10:31:18 UTC (rev 68) @@ -29,9 +29,9 @@ import nc.ird.cantharella.data.model.utils.AbstractModel; import nc.ird.cantharella.web.config.WebApplicationImpl; import nc.ird.module.utils.AssertTools; -import nc.ird.module.utils.LogTools; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.spring.injection.annot.SpringBean; @@ -45,7 +45,7 @@ public final class GenericLoadableDetachableModel<M extends AbstractModel> extends LoadableDetachableModel<M> { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(GenericLoadableDetachableModel.class); /** DAO */ @SpringBean 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-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/LoadableDetachableSortableListDataProvider.java 2013-02-04 10:31:18 UTC (rev 68) @@ -36,11 +36,11 @@ import nc.ird.module.utils.BeanTools; import nc.ird.module.utils.BeanTools.AccessType; import nc.ird.module.utils.GenericsTools; -import nc.ird.module.utils.LogTools; import org.apache.commons.collections.comparators.NullComparator; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider; /** @@ -53,7 +53,7 @@ public final class LoadableDetachableSortableListDataProvider<M extends AbstractModel> extends SortableDataProvider<M> { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(LoadableDetachableSortableListDataProvider.class); /** Comparator */ private final Comparator<Object> comparator; 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-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthSession.java 2013-02-04 10:31:18 UTC (rev 68) @@ -32,10 +32,10 @@ import nc.ird.cantharella.data.model.Utilisateur.TypeDroit; import nc.ird.cantharella.service.services.PersonneService; import nc.ird.cantharella.web.config.WebApplicationImpl; -import nc.ird.module.utils.LogTools; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.protocol.http.WebSession; import org.apache.wicket.request.Request; @@ -49,7 +49,7 @@ public final class AuthSession extends WebSession implements Serializable { /** Logger */ - private static final Log LOG = LogTools.getLog(); + private static final Logger LOG = LoggerFactory.getLogger(AuthSession.class); /** Attribute: rememberMe */ private static final String ATTRIBUTE_REMEMBER_ME = "rememberMe"; @@ -108,8 +108,9 @@ /** {@inheritDoc} */ @Override public boolean authenticate(String username, String password) { - LOG.debug(personneService.authenticateUtilisateur(username, password)); - return personneService.authenticateUtilisateur(username, password); + boolean authenticate = personneService.authenticateUtilisateur(username, password); + LOG.debug(String.valueOf(authenticate)); + return authenticate; } /** Added: trunk/cantharella.web/src/main/resources/commons/log4j.xml =================================================================== (Binary files differ) Property changes on: trunk/cantharella.web/src/main/resources/commons/log4j.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Modified: trunk/cantharella.web/src/main/webapp/js/moleditor.js =================================================================== --- trunk/cantharella.web/src/main/webapp/js/moleditor.js 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/webapp/js/moleditor.js 2013-02-04 10:31:18 UTC (rev 68) @@ -1,3 +1,25 @@ +/* + * #%L + * Cantharella :: Web + * $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% + */ function addEditorMolecule(tagId) { if (tagId) { tagId = '#' + tagId.replace( /(:|\.)/g, "\\$1" ); Modified: trunk/cantharella.web/src/main/webapp/js/molviewer.js =================================================================== --- trunk/cantharella.web/src/main/webapp/js/molviewer.js 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/main/webapp/js/molviewer.js 2013-02-04 10:31:18 UTC (rev 68) @@ -1,3 +1,25 @@ +/* + * #%L + * Cantharella :: Web + * $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% + */ function addViewerMolecule(tagId) { if (tagId) { tagId = '#' + tagId.replace( /(:|\.)/g, "\\$1" ); Modified: trunk/cantharella.web/src/site/rst/devel/integration-chemdoodle.rst =================================================================== --- trunk/cantharella.web/src/site/rst/devel/integration-chemdoodle.rst 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/cantharella.web/src/site/rst/devel/integration-chemdoodle.rst 2013-02-04 10:31:18 UTC (rev 68) @@ -1,3 +1,25 @@ +.. - +.. * #%L +.. * Cantharella :: Web +.. * $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% +.. - Principe ======== Deleted: trunk/licenses/icu4j-license.txt =================================================================== --- trunk/licenses/icu4j-license.txt 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/licenses/icu4j-license.txt 2013-02-04 10:31:18 UTC (rev 68) @@ -1,20 +0,0 @@ -Copyright (c) 1995-2012 International Business Machines Corporation and others - -All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated -documentation files (the "Software"), to deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons to -whom the Software is furnished to do so, provided that the above copyright notice(s) and this permission notice appear -in all copies of the Software and that both the above copyright notice(s) and this permission notice appear in -supporting documentation. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT -SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR -CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF -CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - -Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to -promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder. \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-04 09:18:54 UTC (rev 67) +++ trunk/pom.xml 2013-02-04 10:31:18 UTC (rev 68) @@ -98,18 +98,14 @@ <!-- license header configuration --> <license.organizationName> - IRD (Institut de Recherche pour le - Developpement) and by respective authors (see below) + IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) </license.organizationName> <license.licenseName>agpl_v3</license.licenseName> - <commonsBeanutilsVersion>1.8.3</commonsBeanutilsVersion> <version.commons-codec>1.7</version.commons-codec> <commonsIoVersion>2.4</commonsIoVersion> <commonsLang3Version>3.1</commonsLang3Version> - <commonsLoggingVersion>1.1.1</commonsLoggingVersion> <commonsCollectionsVersion>3.2.1</commonsCollectionsVersion> - <log4jVersion>1.2.17</log4jVersion> <junitVersion>4.11</junitVersion> <version.slf4j>1.7.2</version.slf4j> @@ -204,13 +200,25 @@ <dependencyManagement> <dependencies> - <!-- Dependencies for all layers --> + <!-- Dependencies for all layers --> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> <version>${version.commons-codec}</version> </dependency> + + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.8.3</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>net.sf.opencsv</groupId> @@ -218,9 +226,6 @@ <version>${version.opencsv}</version> </dependency> - <!-- <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> - <version>${version.javassist}</version> <scope>runtime</scope> </dependency> --> - <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjrt</artifactId> @@ -233,13 +238,13 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> + <artifactId>slf4j-api</artifactId> <version>${version.slf4j}</version> - <scope>runtime</scope> + <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>jcl-over-slf4j</artifactId> <version>${version.slf4j}</version> <scope>runtime</scope> </dependency> @@ -278,6 +283,12 @@ <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> <version>${version.spring}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework</groupId> @@ -292,8 +303,6 @@ <version>${version.jpa}</version> </dependency> - <!--<dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-c3p0</artifactId> - <version>${version.hibernate}</version> </dependency> --> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> @@ -440,38 +449,4 @@ </dependencies> </dependencyManagement> - - <!--dependencies --> - - <!-- Dependencies for all layers --> - - <!--dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>${version.commons-codec}</version> </dependency> <dependency> <groupId>javassist</groupId> - <artifactId>javassist</artifactId> <version>${version.javassist}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.aspectj</groupId> - <artifactId>aspectjrt</artifactId> <version>${version.aspectj}</version> - </dependency> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - <version>${version.aspectj}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> <version>${version.slf4j}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> <version>${version.slf4j}</version> <scope>runtime</scope> - </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>${version.slf4j}</version> <scope>runtime</scope> </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>${version.spring}</version> </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-context-support</artifactId> <version>${version.spring}</version> - </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> - <version>${version.spring}</version> <scope>test</scope> </dependency> <dependency> - <groupId>cglib</groupId> <artifactId>cglib-nodep</artifactId> <version>${version.cglib}</version> - <scope>test</scope> </dependency> <dependency> <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> <version>${version.mail}</version> </dependency> - <dependency> <groupId>com.ibm.icu</groupId> <artifactId>icu4j</artifactId> - <version>${version.icu4j}</version> </dependency --> - - <!--/dependencies --> - - - <!--repositories> <repository> <id>repository.springframework.milestone</id> - <name>Spring Framework Maven Milestone Repository</name> <url>http://maven.springframework.org/milestone</url> - </repository> </repositories --> </project>