Cantharella-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
February 2013
- 3 participants
- 101 discussions
r76 - in trunk: cantharella.data/src/main/java/nc/ird/cantharella/data/exceptions cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl
by echatellier＠users.forge.codelutin.com 05 Feb '13
by echatellier＠users.forge.codelutin.com 05 Feb '13
05 Feb '13
Author: echatellier
Date: 2013-02-05 18:23:48 +0100 (Tue, 05 Feb 2013)
New Revision: 76
Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/76
Log:
Remove e.printStackTrace()
Modified:
trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/exceptions/UnexpectedException.java
trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java
Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/exceptions/UnexpectedException.java
===================================================================
--- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/exceptions/UnexpectedException.java 2013-02-05 17:19:14 UTC (rev 75)
+++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/exceptions/UnexpectedException.java 2013-02-05 17:23:48 UTC (rev 76)
@@ -36,5 +36,14 @@
public UnexpectedException(Exception cause) {
super(cause.getMessage(), cause);
}
+
+ /**
+ * Constructor
+ * @param message Message
+ * @param cause Cause
+ */
+ public UnexpectedException(String message, Exception cause) {
+ super(message, cause);
+ }
}
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-05 17:19:14 UTC (rev 75)
+++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java 2013-02-05 17:23:48 UTC (rev 76)
@@ -26,6 +26,7 @@
import javax.annotation.Resource;
+import nc.ird.cantharella.data.exceptions.UnexpectedException;
import nc.ird.cantharella.data.model.Extraction;
import nc.ird.cantharella.data.model.Lot;
import nc.ird.cantharella.data.model.Molecule;
@@ -37,8 +38,6 @@
import nc.ird.cantharella.service.model.SearchResult;
import nc.ird.cantharella.service.services.SearchService;
-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;
@@ -56,6 +55,8 @@
import org.hibernate.search.MassIndexer;
import org.hibernate.search.Search;
import org.hibernate.search.SearchFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
/**
@@ -92,9 +93,8 @@
long after = System.currentTimeMillis();
LOG.info("Lucene index rebuilded in " + (after-before) + " ms");
}
- } catch (InterruptedException e) {
- LOG.error(e.toString());
- e.printStackTrace();
+ } catch (InterruptedException ex) {
+ throw new UnexpectedException("Can't rebuild index", ex);
}
}
@@ -143,8 +143,8 @@
result.setStations(resultatStations);
result.setMolecules(resultatMolecules);
- } catch (ParseException e) {
- e.printStackTrace();
+ } catch (ParseException ex) {
+ throw new UnexpectedException("Can't parse query", ex);
}
//tx.commit();
1
0
r75 - trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/links
by echatellier＠users.forge.codelutin.com 05 Feb '13
by echatellier＠users.forge.codelutin.com 05 Feb '13
05 Feb '13
Author: echatellier
Date: 2013-02-05 18:19:14 +0100 (Tue, 05 Feb 2013)
New Revision: 75
Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/75
Log:
Remove static date format (not thread safe)
Modified:
trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/links/CsvExportLink.java
Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/links/CsvExportLink.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/links/CsvExportLink.java 2013-02-05 17:09:49 UTC (rev 74)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/links/CsvExportLink.java 2013-02-05 17:19:14 UTC (rev 75)
@@ -49,9 +49,6 @@
/** For serializable methods */
private static final long serialVersionUID = 20130204L;
-
- /** Date format for download filename. */
- private static final DateFormat FILENAME_DF = new SimpleDateFormat("yyyy_MM_dd-HH_mm-");
/** Data table containing data to export. */
private final DataTable<T> table;
@@ -81,7 +78,8 @@
response.setContentType("text/csv");
// configuration du nom de fichier
- String headerFilename = FILENAME_DF.format(new Date());
+ DateFormat dateFormat = new SimpleDateFormat("yyyy_MM_dd-HH_mm-");
+ String headerFilename = dateFormat.format(new Date());
headerFilename += this.filename;
response.setAttachmentHeader(headerFilename);
1
0
05 Feb '13
Author: echatellier
Date: 2013-02-05 18:09:49 +0100 (Tue, 05 Feb 2013)
New Revision: 74
Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/74
Log:
Fix missing javadoc.
Modified:
trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/MoleculeDao.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/MoleculeProvenance.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/SearchServiceImpl.java
trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java
trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java
trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java
trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.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/columns/BooleanPropertyColumn.java
trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/CsvWriter.java
trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/DecimalPropertyColumn.java
trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/EnumPropertyColumn.java
trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ExportablePropertyColumn.java
trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ExportableTextFilteredPropertyColumn.java
trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkPropertyColumn.java
trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/MapValuePropertyColumn.java
trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ShortDatePropertyColumn.java
trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/links/CsvExportLink.java
Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/MoleculeDao.java
===================================================================
--- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/MoleculeDao.java 2013-02-04 11:06:26 UTC (rev 73)
+++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/MoleculeDao.java 2013-02-05 17:09:49 UTC (rev 74)
@@ -37,7 +37,7 @@
*/
public final class MoleculeDao extends AbstractModelDao {
- /** Criteria : différents programmes des campagnes déjà saisis */
+ /** Criteria : différents organismes des molécules déjà saisis */
public static final DetachedCriteria CRITERIA_DISTINCT_MOLECULE_ORGANISMES = DetachedCriteria
.forClass(Molecule.class).setProjection(Projections.distinct(Projections.property("identifieePar")))
.addOrder(Order.asc("identifieePar"));
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 11:06:26 UTC (rev 73)
+++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Molecule.java 2013-02-05 17:09:49 UTC (rev 74)
@@ -56,6 +56,11 @@
import org.hibernate.validator.constraints.Length;
import org.hibernate.validator.constraints.NotEmpty;
+/**
+ * Molecule entity.
+ *
+ * @author Eric Chatellier
+ */
@Entity
@Indexed
@FullTextFilterDefs( {
@@ -106,6 +111,7 @@
/** Est-ce une nouvelle molécule ? */
private boolean nouvMolecul;
+ /** Campagne. */
@ManyToOne(fetch = FetchType.EAGER)
@IndexedEmbedded(depth=1)
private Campagne campagne;
@@ -137,6 +143,8 @@
private List<MoleculeProvenance> provenances;
/**
+ * Id molecule getter.
+ *
* @return the idMolecule
*/
public Integer getIdMolecule() {
@@ -144,6 +152,8 @@
}
/**
+ * Id molecule setter.
+ *
* @param idMolecule the idMolecule to set
*/
public void setIdMolecule(Integer idMolecule) {
@@ -151,6 +161,8 @@
}
/**
+ * Nom commun getter.
+ *
* @return the nomCommun
*/
public String getNomCommun() {
@@ -158,6 +170,8 @@
}
/**
+ * Nom commun getter.
+ *
* @param nomCommun the nomCommun to set
*/
public void setNomCommun(String nomCommun) {
@@ -165,6 +179,8 @@
}
/**
+ * Famille chimique getter.
+ *
* @return the familleChimique
*/
public String getFamilleChimique() {
@@ -172,6 +188,8 @@
}
/**
+ * Famille chimique setter.
+ *
* @param familleChimique the familleChimique to set
*/
public void setFamilleChimique(String familleChimique) {
@@ -179,6 +197,8 @@
}
/**
+ * Fomule dev mol getter.
+ *
* @return the formuleDevMol
*/
public String getFormuleDevMol() {
@@ -186,6 +206,8 @@
}
/**
+ * Formule dev mol setter.
+ *
* @param formuleDevMol the formuleDevMol to set
*/
public void setFormuleDevMol(String formuleDevMol) {
@@ -193,6 +215,8 @@
}
/**
+ * Nom iupca getter.
+ *
* @return the nomIupca
*/
public String getNomIupca() {
@@ -200,6 +224,8 @@
}
/**
+ * Nom iupca setter.
+ *
* @param nomIupca the nomIupca to set
*/
public void setNomIupca(String nomIupca) {
@@ -207,6 +233,8 @@
}
/**
+ * Formule brute getter.
+ *
* @return the formuleBrute
*/
public String getFormuleBrute() {
@@ -214,6 +242,8 @@
}
/**
+ * Formule brute setter.
+ *
* @param formuleBrute the formuleBrute to set
*/
public void setFormuleBrute(String formuleBrute) {
@@ -221,6 +251,8 @@
}
/**
+ * Masse molaire getter.
+ *
* @return the masseMolaire
*/
public BigDecimal getMasseMolaire() {
@@ -228,6 +260,8 @@
}
/**
+ * Masse molaire setter.
+ *
* @param masseMolaire the masseMolaire to set
*/
public void setMasseMolaire(BigDecimal masseMolaire) {
@@ -235,6 +269,8 @@
}
/**
+ * Nouv molecule getter.
+ *
* @return the nouvMolecul
*/
public boolean isNouvMolecul() {
@@ -242,6 +278,8 @@
}
/**
+ * Nouv molecule setter.
+ *
* @param nouvMolecul the nouvMolecul to set
*/
public void setNouvMolecul(boolean nouvMolecul) {
@@ -249,6 +287,8 @@
}
/**
+ * Campagne getter.
+ *
* @return the campagne
*/
public Campagne getCampagne() {
@@ -256,6 +296,8 @@
}
/**
+ * Campagne setter.
+ *
* @param campagne the campagne to set
*/
public void setCampagne(Campagne campagne) {
@@ -263,6 +305,8 @@
}
/**
+ * Identifiee par getter.
+ *
* @return the identifieePar
*/
public String getIdentifieePar() {
@@ -270,6 +314,8 @@
}
/**
+ * Identifiee par setter.
+ *
* @param identifieePar the identifieePar to set
*/
public void setIdentifieePar(String identifieePar) {
@@ -277,6 +323,8 @@
}
/**
+ * Publi origine getter.
+ *
* @return the publiOrigine
*/
public String getPubliOrigine() {
@@ -284,6 +332,8 @@
}
/**
+ * Publi origine setter.
+ *
* @param publiOrigine the publiOrigine to set
*/
public void setPubliOrigine(String publiOrigine) {
@@ -291,6 +341,8 @@
}
/**
+ * Complement getter.
+ *
* @return the complement
*/
public String getComplement() {
@@ -298,6 +350,8 @@
}
/**
+ * Complement setter.
+ *
* @param complement the complement to set
*/
public void setComplement(String complement) {
@@ -305,6 +359,8 @@
}
/**
+ * Createur getter.
+ *
* @return the createur
*/
public Personne getCreateur() {
@@ -312,6 +368,8 @@
}
/**
+ * Createur setter.
+ *
* @param createur the createur to set
*/
public void setCreateur(Personne createur) {
@@ -319,6 +377,8 @@
}
/**
+ * Provenances getter.
+ *
* @return the provenances
*/
public List<MoleculeProvenance> getProvenances() {
@@ -326,6 +386,8 @@
}
/**
+ * Provenances setter.
+ *
* @param provenances the provenances to set
*/
public void setProvenances(List<MoleculeProvenance> provenances) {
Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MoleculeProvenance.java
===================================================================
--- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MoleculeProvenance.java 2013-02-04 11:06:26 UTC (rev 73)
+++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MoleculeProvenance.java 2013-02-05 17:09:49 UTC (rev 74)
@@ -37,6 +37,11 @@
import nc.ird.cantharella.data.config.DataContext;
import nc.ird.cantharella.data.model.utils.AbstractModel;
+/**
+ * MoleculeProvenance association entity between {@link Molecule} and {@Produit}.
+ *
+ * @author Eric Chatellier
+ */
@Entity
public class MoleculeProvenance extends AbstractModel implements Cloneable {
@@ -62,6 +67,8 @@
private Produit produit;
/**
+ * Id getter.
+ *
* @return the id
*/
public Integer getId() {
@@ -69,6 +76,8 @@
}
/**
+ * Id setter.
+ *
* @param id the id to set
*/
public void setId(Integer id) {
@@ -76,6 +85,8 @@
}
/**
+ * Pourcentage getter.
+ *
* @return the pourcentage
*/
public BigDecimal getPourcentage() {
@@ -83,6 +94,8 @@
}
/**
+ * Pourcentage setter.
+ *
* @param pourcentage the pourcentage to set
*/
public void setPourcentage(BigDecimal pourcentage) {
@@ -90,6 +103,8 @@
}
/**
+ * Molecule getter.
+ *
* @return the molecule
*/
public Molecule getMolecule() {
@@ -97,6 +112,8 @@
}
/**
+ * Molecule setter.
+ *
* @param molecule the molecule to set
*/
public void setMolecule(Molecule molecule) {
@@ -104,6 +121,8 @@
}
/**
+ * Produit getter.
+ *
* @return the produit
*/
public Produit getProduit() {
@@ -111,6 +130,8 @@
}
/**
+ * Produit setter.
+ *
* @param produit the produit to set
*/
public void setProduit(Produit produit) {
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 11:06:26 UTC (rev 73)
+++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/MoleculeServiceImpl.java 2013-02-05 17:09:49 UTC (rev 74)
@@ -55,11 +55,13 @@
@Autowired
private GenericDao dao;
+ /** {@inheritDoc} */
@Override
public long countMolecules() {
return dao.count(Molecule.class);
}
+ /** {@inheritDoc} */
@Override
public void createMolecule(Molecule molecule)
throws DataConstraintException {
@@ -67,6 +69,7 @@
dao.create(molecule);
}
+ /** {@inheritDoc} */
@Override
public void deleteMolecule(Molecule molecule)
throws DataConstraintException {
@@ -78,19 +81,21 @@
LOG.error(e.getMessage(), e);
throw new UnexpectedException(e);
}
-
}
+ /** {@inheritDoc} */
@Override
public List<Molecule> listMolecules() {
return dao.readList(Molecule.class, "idMolecule");
}
+ /** {@inheritDoc} */
@Override
public Molecule loadMolecule(Integer numero) throws DataNotFoundException {
return dao.read(Molecule.class, numero);
}
+ /** {@inheritDoc} */
@Override
public void updateMolecule(Molecule molecule)
throws DataConstraintException {
@@ -101,9 +106,9 @@
LOG.error(e.getMessage(), e);
throw new UnexpectedException(e);
}
-
}
+ /** {@inheritDoc} */
@Override
public boolean updateOrdeleteMoleculeEnabled(Molecule molecule, Utilisateur utilisateur) {
return utilisateur.getTypeDroit() == TypeDroit.ADMINISTRATEUR
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 11:06:26 UTC (rev 73)
+++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java 2013-02-05 17:09:49 UTC (rev 74)
@@ -69,9 +69,11 @@
/** Logger */
private static final Logger LOG = LoggerFactory.getLogger(SearchServiceImpl.class);
+ /** Hibernate session factory. */
@Resource
private SessionFactory sessionFactory;
+ /** {@inheritDoc} */
@Override
public void reIndex() {
long before = System.currentTimeMillis();
@@ -96,6 +98,7 @@
}
}
+ /** {@inheritDoc} */
@Override
@SuppressWarnings("unchecked")
public SearchResult search(String strQuery, Utilisateur utilisateur) {
@@ -149,6 +152,17 @@
return result;
}
+ /**
+ * Prepare hibernate query with lucene query implementation to
+ * search for query string on specified single type.
+ *
+ * @param fullTextSession search session
+ * @param clazz type
+ * @param strQuery query string
+ * @param utilisateur user
+ * @return hibernate query implemented by lucene query
+ * @throws ParseException
+ */
protected org.hibernate.Query getQuery(FullTextSession fullTextSession,
Class<?> clazz, String strQuery, Utilisateur utilisateur) throws ParseException {
Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java 2013-02-04 11:06:26 UTC (rev 73)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java 2013-02-05 17:09:49 UTC (rev 74)
@@ -58,7 +58,7 @@
import org.apache.wicket.spring.injection.annot.SpringBean;
/**
- * Liste des molécules.
+ * Molecules list page.
*
* @author Eric Chatellier
*/
@@ -69,6 +69,9 @@
@SpringBean
private MoleculeService moleculeService;
+ /**
+ * Constructor.
+ */
public ListMoleculesPage() {
super(ListMoleculesPage.class);
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 11:06:26 UTC (rev 73)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java 2013-02-05 17:09:49 UTC (rev 74)
@@ -84,7 +84,7 @@
import org.apache.wicket.spring.injection.annot.SpringBean;
/**
- * Gestion des molecules.
+ * Manage molecule page.
*
* @author Eric Chatellier
*/
@@ -134,12 +134,12 @@
/** Page appelante */
private final CallerPage callerPage;
-
+
/** Bouton d'ajout d'une provenance **/
- Button addProvenanceButton;
+ protected Button addProvenanceButton;
/**
- * Constructeur (mode création)
+ * Constructeur (mode création).
* @param callerPage Page appelante
* @param multipleEntry Saisie multiple
*/
Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java 2013-02-04 11:06:26 UTC (rev 73)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java 2013-02-05 17:09:49 UTC (rev 74)
@@ -88,6 +88,12 @@
/** Page appelante */
private final CallerPage callerPage;
+ /**
+ * Constructor with molecule id to render.
+ *
+ * @param idMolecule molecul id
+ * @param callerPage caller page
+ */
public ReadMoleculePage(Integer idMolecule, final CallerPage callerPage) {
super(ReadMoleculePage.class);
this.callerPage = callerPage;
Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java 2013-02-04 11:06:26 UTC (rev 73)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java 2013-02-05 17:09:49 UTC (rev 74)
@@ -89,26 +89,27 @@
import org.apache.wicket.util.value.ValueMap;
/**
- * Resultat de page de recherche.
+ * Search results page.
*
* @author echatellier
*/
@AuthRoles({ AuthRole.ADMIN, AuthRole.USER })
public class SearchPage extends TemplatePage {
+ /** Form query. */
protected String query;
+ /** Search service. */
@SpringBean
protected SearchService searchService;
- /**
- * Nombre d'extraits affichés dans la colonne de résumés des extraits
- */
+ /** Nombre d'extraits affichés dans la colonne de résumés des extraits. */
private static int MAX_EXTRAITS_DISPLAY = 4;
/**
- * Constructeur.
- * @param query
+ * Constructor.
+ *
+ * @param query form query
*/
public SearchPage(String query) {
super(SearchPage.class);
@@ -116,7 +117,7 @@
final CallerPage currentPage = new CallerPage(ListSpecimensPage.class);
// ca sert a rien, mais wicket est pas content
- ExternalLink link = new ExternalLink("advancedLink", "http://lucene.apache.org/core/3_6_1/queryparsersyntax.html");
+ ExternalLink link = new ExternalLink("advancedLink", "http://lucene.apache.org/core/3_6_2/queryparsersyntax.html");
add(link);
// search form
@@ -140,14 +141,21 @@
addMoleculesTable(currentPage, searchResult);
}
+ /**
+ * Get current form query value.
+ *
+ * @return form query value
+ */
public String getQuery() {
return query;
}
- public void setQuery(String query) {
- this.query = query;
- }
-
+ /**
+ * Format specimens result into table.
+ *
+ * @param currentPage current page
+ * @param searchResult search results
+ */
protected void addSpecimensTable(final CallerPage currentPage, SearchResult searchResult) {
// search result : specimens
List<Specimen> specimens = searchResult.getSpecimens();
@@ -197,7 +205,13 @@
add(specimensDataTable);
add(new CsvExportLink("SearchPage.Specimens.ExportCSV", specimensDataTable, "specimens.csv"));
}
-
+
+ /**
+ * Format lots result into table.
+ *
+ * @param currentPage current page
+ * @param searchResult search results
+ */
protected void addLotsTable(final CallerPage currentPage, SearchResult searchResult) {
// search result : lots
List<Lot> lots = searchResult.getLots();
@@ -278,7 +292,13 @@
add(lotsDataTable);
add(new CsvExportLink("SearchPage.Lots.ExportCSV", lotsDataTable, "lots.csv"));
}
-
+
+ /**
+ * Format extractions result into table.
+ *
+ * @param currentPage current page
+ * @param searchResult search results
+ */
protected void addExtractionsTable(final CallerPage currentPage, SearchResult searchResult) {
// search result : extractions
List<Extraction> extractions = searchResult.getExtractions();
@@ -373,6 +393,12 @@
add(new CsvExportLink("SearchPage.Extractions.ExportCSV", extractionsDataTable, "extractions.csv"));
}
+ /**
+ * Format purification result into table.
+ *
+ * @param currentPage current page
+ * @param searchResult search results
+ */
protected void addPurificationsTable(final CallerPage currentPage, SearchResult searchResult) {
List<Purification> purifications = searchResult.getPurifications();
LoadableDetachableSortableListDataProvider<Purification> purificationsDataProvider = new LoadableDetachableSortableListDataProvider<Purification>(
@@ -438,6 +464,12 @@
add(new CsvExportLink("SearchPage.Purifications.ExportCSV", purificationsDataTable, "purifications.csv"));
}
+ /**
+ * Format testBios result into table.
+ *
+ * @param currentPage current page
+ * @param searchResult search results
+ */
protected void addTestBiosTable(final CallerPage currentPage, SearchResult searchResult) {
List<ResultatTestBio> resultatTestBios = searchResult.getResultatTestBios();
LoadableDetachableSortableListDataProvider<ResultatTestBio> resTestBiosDataProvider = new LoadableDetachableSortableListDataProvider<ResultatTestBio>(
@@ -521,7 +553,13 @@
add(new CsvExportLink("SearchPage.ResultatTestBios.ExportCSV", resTestBiosDataTable, "testbios.csv"));
}
-
+
+ /**
+ * Format stations result into table.
+ *
+ * @param currentPage current page
+ * @param searchResult search results
+ */
protected void addStationsTable(final CallerPage currentPage, SearchResult searchResult) {
// Liste des stations
@@ -566,7 +604,13 @@
add(stationsDataTable);
add(new CsvExportLink("SearchPage.Stations.ExportCSV", stationsDataTable, "stations.csv"));
}
-
+
+ /**
+ * Format molécules result into table.
+ *
+ * @param currentPage current page
+ * @param searchResult search results
+ */
protected void addMoleculesTable(final CallerPage currentPage, SearchResult searchResult) {
// Liste des molecules
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 11:06:26 UTC (rev 73)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/MoleculeEditorBehavior.java 2013-02-05 17:09:49 UTC (rev 74)
@@ -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
@@ -41,12 +41,16 @@
*/
public class MoleculeEditorBehavior extends AttributeModifier {
- private static final long serialVersionUID = 1L;
-
+ /**
+ * Constructor.
+ *
+ * @param replaceModel replace model
+ */
public MoleculeEditorBehavior(IModel<?> replaceModel) {
super("formula", replaceModel);
}
-
+
+ /** {@inheritDoc} */
@Override
protected String newValue(String currentValue, String replacementValue) {
// on ajoute toujours un premier caractere pour oblige l'existance de
@@ -54,6 +58,7 @@
return "." + replacementValue;
}
+ /** {@inheritDoc} */
@Override
public void renderHead(Component component, IHeaderResponse response) {
response.renderCSSReference("ChemDoodleWeb/css/ChemDoodleWeb.css");
@@ -66,6 +71,7 @@
response.renderJavaScriptReference("js/moleditor.js");
}
+ /** {@inheritDoc} */
@Override
public void beforeRender(Component component) {
// il faut que l'element HTML est forcement un identifiant pour pouvoir
@@ -73,6 +79,7 @@
component.setOutputMarkupId(true);
}
+ /** {@inheritDoc} */
@Override
public void afterRender(Component component) {
Response response = component.getResponse();
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 11:06:26 UTC (rev 73)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/MoleculeViewBehavior.java 2013-02-05 17:09:49 UTC (rev 74)
@@ -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
@@ -41,12 +41,16 @@
*/
public class MoleculeViewBehavior extends AttributeModifier {
- private static final long serialVersionUID = 1L;
-
+ /**
+ * Constructor.
+ *
+ * @param replaceModel replace model
+ */
public MoleculeViewBehavior(IModel<?> replaceModel) {
super("formula", replaceModel);
}
+ /** {@inheritDoc} */
@Override
protected String newValue(String currentValue, String replacementValue) {
// on ajoute toujours un premier caractere pour oblige l'existance de
@@ -54,6 +58,7 @@
return "." + replacementValue;
}
+ /** {@inheritDoc} */
@Override
public void renderHead(Component component, IHeaderResponse response) {
response.renderCSSReference("ChemDoodleWeb/css/ChemDoodleWeb.css");
@@ -63,6 +68,7 @@
response.renderJavaScriptReference("js/molviewer.js");
}
+ /** {@inheritDoc} */
@Override
public void beforeRender(Component component) {
// il faut que l'element HTML est forcement un identifiant pour pouvoir
@@ -70,6 +76,7 @@
component.setOutputMarkupId(true);
}
+ /** {@inheritDoc} */
@Override
public void afterRender(Component component) {
Response response = component.getResponse();
Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/BooleanPropertyColumn.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/BooleanPropertyColumn.java 2013-02-04 11:06:26 UTC (rev 73)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/BooleanPropertyColumn.java 2013-02-05 17:09:49 UTC (rev 74)
@@ -66,11 +66,13 @@
page)));
}
+ /** {@inheritDoc} */
@Override
public String getHeaderName() {
return getDisplayModel().getObject().toString();
}
+ /** {@inheritDoc} */
@Override
public void exportCsv(final T object, CsvWriter writer) {
IModel<?> textModel = new DisplayBooleanPropertyModel(new AbstractReadOnlyModel<T>() {
Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/CsvWriter.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/CsvWriter.java 2013-02-04 11:06:26 UTC (rev 73)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/CsvWriter.java 2013-02-05 17:09:49 UTC (rev 74)
@@ -31,15 +31,33 @@
* @author echatellier
*/
public class CsvWriter {
+
+ /** Output writer. */
private final PrintWriter out;
+
+ /** First column flag. */
private boolean first = true;
+
+ /** Csv separator. */
private char separator;
+ /**
+ * Constructor.
+ *
+ * @param os output stream
+ * @param separator csv separator
+ */
public CsvWriter(OutputStream os, char separator) {
out = new PrintWriter(os);
this.separator = separator;
}
+ /**
+ * Write simple column data.
+ *
+ * @param value value to write
+ * @return {@code this}
+ */
public CsvWriter write(Object value) {
if (!first) {
out.append(separator);
@@ -54,17 +72,30 @@
return this;
}
+ /**
+ * End current line.
+ *
+ * @return {@code this}
+ */
public CsvWriter endLine() {
out.append("\r\n");
first = true;
return this;
}
+ /**
+ * Flush output stream.
+ *
+ * @return {@code this}
+ */
public CsvWriter flush() {
out.flush();
return this;
}
+ /**
+ * Close output stream.
+ */
public void close() {
out.close();
}
Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/DecimalPropertyColumn.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/DecimalPropertyColumn.java 2013-02-04 11:06:26 UTC (rev 73)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/DecimalPropertyColumn.java 2013-02-05 17:09:49 UTC (rev 74)
@@ -72,12 +72,14 @@
cellItem.add(new Label(componentId, new DisplayDecimalPropertyModel(rowModel.getObject(), propertyExpression,
format, locale)));
}
-
+
+ /** {@inheritDoc} */
@Override
public String getHeaderName() {
return getDisplayModel().getObject().toString();
}
+ /** {@inheritDoc} */
@Override
public void exportCsv(final T object, CsvWriter writer) {
IModel<?> textModel = new DisplayDecimalPropertyModel(new AbstractReadOnlyModel<T>() {
Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/EnumPropertyColumn.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/EnumPropertyColumn.java 2013-02-04 11:06:26 UTC (rev 73)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/EnumPropertyColumn.java 2013-02-05 17:09:49 UTC (rev 74)
@@ -66,11 +66,13 @@
new DisplayEnumPropertyModel(rowModel.getObject(), propertyExpression, page)));
}
+ /** {@inheritDoc} */
@Override
public String getHeaderName() {
return getDisplayModel().getObject().toString();
}
+ /** {@inheritDoc} */
@Override
public void exportCsv(final T object, CsvWriter writer) {
IModel<?> textModel = new DisplayEnumPropertyModel(new AbstractReadOnlyModel<T>() {
Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ExportablePropertyColumn.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ExportablePropertyColumn.java 2013-02-04 11:06:26 UTC (rev 73)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ExportablePropertyColumn.java 2013-02-05 17:09:49 UTC (rev 74)
@@ -36,15 +36,24 @@
public class ExportablePropertyColumn<T> extends PropertyColumn<T> implements
ExportableColumn<T> {
+ /**
+ * Constructor.
+ *
+ * @param displayModel display model
+ * @param sortProperty wicket sort property
+ * @param propertyExpression wicket sort expression
+ */
public ExportablePropertyColumn(IModel<String> displayModel, String sortProperty, String propertyExpression) {
super(displayModel, sortProperty, propertyExpression);
}
+ /** {@inheritDoc} */
@Override
public String getHeaderName() {
return getDisplayModel().getObject().toString();
}
+ /** {@inheritDoc} */
@Override
public void exportCsv(final T object, CsvWriter writer) {
IModel<?> textModel = createLabelModel(new AbstractReadOnlyModel<T>() {
Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ExportableTextFilteredPropertyColumn.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ExportableTextFilteredPropertyColumn.java 2013-02-04 11:06:26 UTC (rev 73)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ExportableTextFilteredPropertyColumn.java 2013-02-05 17:09:49 UTC (rev 74)
@@ -36,16 +36,25 @@
*/
public class ExportableTextFilteredPropertyColumn<T, F> extends TextFilteredPropertyColumn<T, F> implements ExportableColumn<T> {
+ /**
+ * Constructor.
+ *
+ * @param displayModel display model
+ * @param sortProperty wicket sort property
+ * @param propertyExpression wicket sort expression
+ */
public ExportableTextFilteredPropertyColumn(IModel<String> displayModel,
String sortProperty, String propertyExpression) {
super(displayModel, sortProperty, propertyExpression);
}
+ /** {@inheritDoc} */
@Override
public String getHeaderName() {
return getDisplayModel().getObject().toString();
}
+ /** {@inheritDoc} */
@Override
public void exportCsv(final T object, CsvWriter writer) {
IModel<?> textModel = createLabelModel(new AbstractReadOnlyModel<T>() {
Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkPropertyColumn.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkPropertyColumn.java 2013-02-04 11:06:26 UTC (rev 73)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkPropertyColumn.java 2013-02-05 17:09:49 UTC (rev 74)
@@ -171,12 +171,14 @@
link.add(new Label("label", tmpLabelModel));
}
}
-
+
+ /** {@inheritDoc} */
@Override
public String getHeaderName() {
return getDisplayModel().getObject().toString();
}
+ /** {@inheritDoc} */
@Override
public void exportCsv(final T object, CsvWriter writer) {
IModel<?> textModel = createLabelModel(new AbstractReadOnlyModel<T>() {
Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/MapValuePropertyColumn.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/MapValuePropertyColumn.java 2013-02-04 11:06:26 UTC (rev 73)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/MapValuePropertyColumn.java 2013-02-05 17:09:49 UTC (rev 74)
@@ -68,11 +68,13 @@
propertyExpression, map)));
}
+ /** {@inheritDoc} */
@Override
public String getHeaderName() {
return getDisplayModel().getObject().toString();
}
+ /** {@inheritDoc} */
@Override
public void exportCsv(final T object, CsvWriter writer) {
IModel<?> textModel = new DisplayMapValuePropertyModel<U>(new AbstractReadOnlyModel<T>() {
Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ShortDatePropertyColumn.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ShortDatePropertyColumn.java 2013-02-04 11:06:26 UTC (rev 73)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ShortDatePropertyColumn.java 2013-02-05 17:09:49 UTC (rev 74)
@@ -66,12 +66,14 @@
cellItem.add(new Label(componentId, new DisplayShortDatePropertyModel(rowModel.getObject(), propertyExpression,
locale)));
}
-
+
+ /** {@inheritDoc} */
@Override
public String getHeaderName() {
return getDisplayModel().getObject().toString();
}
+ /** {@inheritDoc} */
@Override
public void exportCsv(final T object, CsvWriter writer) {
IModel<?> textModel = new DisplayShortDatePropertyModel(new AbstractReadOnlyModel<T>() {
Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/links/CsvExportLink.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/links/CsvExportLink.java 2013-02-04 11:06:26 UTC (rev 73)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/links/CsvExportLink.java 2013-02-05 17:09:49 UTC (rev 74)
@@ -39,6 +39,12 @@
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.http.WebResponse;
+/**
+ * Link used to export associated table into csv file.
+ *
+ * @author Eric Chatellier
+ * @param <T> datatable type
+ */
public class CsvExportLink<T> extends Link<Void> {
/** For serializable methods */
@@ -47,17 +53,28 @@
/** Date format for download filename. */
private static final DateFormat FILENAME_DF = new SimpleDateFormat("yyyy_MM_dd-HH_mm-");
-
+ /** Data table containing data to export. */
private final DataTable<T> table;
+ /** Download filename. */
private final String filename;
+ /**
+ * Constructor.
+ *
+ * @param id wicket id
+ * @param table data table
+ * @param filename csv filename
+ */
public CsvExportLink(String id, DataTable<T> table, String filename) {
super(id);
this.table = table;
this.filename = filename;
}
+ /**
+ * Link clic event.
+ */
@Override
public void onClick() {
WebResponse response = (WebResponse) getResponse();
@@ -98,6 +115,11 @@
writer.close();
}
+ /**
+ * Get list of only {@link ExportableColumn} of datatable columns.
+ *
+ * @return exportable column list
+ */
@SuppressWarnings("unchecked")
private List<ExportableColumn<T>> getExportableColumns() {
List<ExportableColumn<T>> exportable = new ArrayList<ExportableColumn<T>>(table.getColumns().size());
1
0
r73 - trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config
by echatellier＠users.forge.codelutin.com 04 Feb '13
by echatellier＠users.forge.codelutin.com 04 Feb '13
04 Feb '13
Author: echatellier
Date: 2013-02-04 12:06:26 +0100 (Mon, 04 Feb 2013)
New Revision: 73
Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/73
Log:
Add missing brackets
Modified:
trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ListConfigurationPage.java
Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ListConfigurationPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ListConfigurationPage.java 2013-02-04 11:03:37 UTC (rev 72)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ListConfigurationPage.java 2013-02-04 11:06:26 UTC (rev 73)
@@ -66,7 +66,7 @@
partieOpened = true;
} else if (params.get("openedTab").equals("methodeExtraction")) {
methExtrOpened = true;
- } else
+ } else {
// initialize the Partie panel
add(new CollapsiblePanel(getResource() + ".ListPartiePanel", new Model<String>(
@@ -77,6 +77,7 @@
return new ListPartiePanel(markupId);
}
});
+ }
// initialize the MethodeExtraction panel
add(new CollapsiblePanel(getResource() + ".ListMethodeExtractionPanel", new Model<String>(
1
0
r72 - in trunk: cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config
by echatellier＠users.forge.codelutin.com 04 Feb '13
by echatellier＠users.forge.codelutin.com 04 Feb '13
04 Feb '13
Author: echatellier
Date: 2013-02-04 12:03:37 +0100 (Mon, 04 Feb 2013)
New Revision: 72
Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/72
Log:
Various quality fix
Modified:
trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/PersonneServiceImpl.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/config/ListConfigurationPage.java
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 10:57:28 UTC (rev 71)
+++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/PersonneServiceImpl.java 2013-02-04 11:03:37 UTC (rev 72)
@@ -312,7 +312,7 @@
* {@inheritDoc}
*/
@Override
- public void rejectUtilisateur(Utilisateur utilisateur) throws NoSuchMessageException {
+ public void rejectUtilisateur(Utilisateur utilisateur) {
try {
deleteUtilisateur(utilisateur, messages.getMessage("reject.subject"), messages.getMessage("reject.text"));
} catch (EmailException e) {
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 10:57:28 UTC (rev 71)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java 2013-02-04 11:03:37 UTC (rev 72)
@@ -711,7 +711,7 @@
List<String> dateErrors = validator.validate(campagneModel.getObject(), getSession().getLocale(), "dateDeb",
"dateFin");
addValidationErrors(dateErrors);
- if (dateErrors.size() == 0
+ if (dateErrors.isEmpty()
&& (campagneModel.getObject().getDateDeb() == null || campagneModel.getObject().getDateFin() == null || !campagneModel
.getObject().getDateDeb().before(campagneModel.getObject().getDateFin()))) {
getPage().error(getString("Campagne.dates.KO"));
Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ListConfigurationPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ListConfigurationPage.java 2013-02-04 10:57:28 UTC (rev 71)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ListConfigurationPage.java 2013-02-04 11:03:37 UTC (rev 72)
@@ -45,7 +45,7 @@
public final class ListConfigurationPage extends TemplatePage {
/** The opened param value */
- final private String OPENED_PARAM_VALUE = "opened";
+ private static final String OPENED_PARAM_VALUE = "opened";
/**
* Constructor
1
0
r71 - trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services
by echatellier＠users.forge.codelutin.com 04 Feb '13
by echatellier＠users.forge.codelutin.com 04 Feb '13
04 Feb '13
Author: echatellier
Date: 2013-02-04 11:57:28 +0100 (Mon, 04 Feb 2013)
New Revision: 71
Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/71
Log:
Remove useless modifiers
Modified:
trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/MoleculeService.java
trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/SearchService.java
Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/MoleculeService.java
===================================================================
--- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/MoleculeService.java 2013-02-04 10:54:03 UTC (rev 70)
+++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/MoleculeService.java 2013-02-04 10:57:28 UTC (rev 71)
@@ -95,5 +95,5 @@
* Liste les programmes des organismes déjà saisis
* @return Organisme des molécules
*/
- public List<String> listMoleculeOrganisme();
+ List<String> listMoleculeOrganisme();
}
Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/SearchService.java
===================================================================
--- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/SearchService.java 2013-02-04 10:54:03 UTC (rev 70)
+++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/SearchService.java 2013-02-04 10:57:28 UTC (rev 71)
@@ -37,7 +37,7 @@
/**
* Rebuild all indexed with existing database entities.
*/
- public void reIndex();
+ void reIndex();
/**
* Search for query result into data model.
@@ -47,5 +47,5 @@
* @return search result
*/
@Transactional(readOnly = true)
- public SearchResult search(String query, Utilisateur utilisateur);
+ SearchResult search(String query, Utilisateur utilisateur);
}
1
0
r70 - in trunk: cantharella.service/src/main/java/nc/ird/cantharella/service/services cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule
by echatellier＠users.forge.codelutin.com 04 Feb '13
by echatellier＠users.forge.codelutin.com 04 Feb '13
04 Feb '13
Author: echatellier
Date: 2013-02-04 11:54:03 +0100 (Mon, 04 Feb 2013)
New Revision: 70
Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/70
Log:
Remove unused imports
Modified:
trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/DocumentService.java
trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/MoleculeServiceImpl.java
trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java
trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java
Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/DocumentService.java
===================================================================
--- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/DocumentService.java 2013-02-04 10:53:27 UTC (rev 69)
+++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/DocumentService.java 2013-02-04 10:54:03 UTC (rev 70)
@@ -26,7 +26,6 @@
import nc.ird.cantharella.data.exceptions.DataConstraintException;
import nc.ird.cantharella.data.exceptions.DataNotFoundException;
-import nc.ird.cantharella.data.model.Partie;
import nc.ird.cantharella.data.model.TypeDocument;
import nc.ird.cantharella.service.utils.normalizers.TypeDocumentNormalizer;
import nc.ird.cantharella.service.utils.normalizers.UniqueFieldNormalizer;
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 10:53:27 UTC (rev 69)
+++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/MoleculeServiceImpl.java 2013-02-04 10:54:03 UTC (rev 70)
@@ -25,7 +25,6 @@
import java.util.List;
import nc.ird.cantharella.data.dao.GenericDao;
-import nc.ird.cantharella.data.dao.impl.CampagneDao;
import nc.ird.cantharella.data.dao.impl.MoleculeDao;
import nc.ird.cantharella.data.exceptions.DataConstraintException;
import nc.ird.cantharella.data.exceptions.DataNotFoundException;
Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java 2013-02-04 10:53:27 UTC (rev 69)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java 2013-02-04 10:54:03 UTC (rev 70)
@@ -34,7 +34,6 @@
import nc.ird.cantharella.web.utils.behaviors.MoleculeViewBehavior;
import nc.ird.cantharella.web.utils.columns.BooleanPropertyColumn;
import nc.ird.cantharella.web.utils.columns.DecimalPropertyColumn;
-import nc.ird.cantharella.web.utils.columns.EnumPropertyColumn;
import nc.ird.cantharella.web.utils.columns.LinkPropertyColumn;
import nc.ird.cantharella.web.utils.columns.LinkableImagePropertyColumn;
import nc.ird.cantharella.web.utils.models.DisplayDecimalPropertyModel.DecimalDisplFormat;
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 10:53:27 UTC (rev 69)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java 2013-02-04 10:54:03 UTC (rev 70)
@@ -23,7 +23,6 @@
package nc.ird.cantharella.web.pages.domain.molecule;
import java.math.BigDecimal;
-import java.util.Arrays;
import java.util.List;
import nc.ird.cantharella.data.exceptions.DataConstraintException;
@@ -36,7 +35,6 @@
import nc.ird.cantharella.data.model.MoleculeProvenance;
import nc.ird.cantharella.data.model.Produit;
import nc.ird.cantharella.data.model.Utilisateur;
-import nc.ird.cantharella.data.model.Specimen.TypeOrganisme;
import nc.ird.cantharella.data.validation.utils.ModelValidator;
import nc.ird.cantharella.service.services.CampagneService;
import nc.ird.cantharella.service.services.MoleculeService;
1
0
Author: echatellier
Date: 2013-02-04 11:53:27 +0100 (Mon, 04 Feb 2013)
New Revision: 69
Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/69
Log:
Update aspectj and wicket
Modified:
trunk/cantharella.data/pom.xml
trunk/pom.xml
Modified: trunk/cantharella.data/pom.xml
===================================================================
--- trunk/cantharella.data/pom.xml 2013-02-04 10:31:18 UTC (rev 68)
+++ trunk/cantharella.data/pom.xml 2013-02-04 10:53:27 UTC (rev 69)
@@ -107,6 +107,11 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2013-02-04 10:31:18 UTC (rev 68)
+++ trunk/pom.xml 2013-02-04 10:53:27 UTC (rev 69)
@@ -121,7 +121,7 @@
<version.lucene>3.6.2</version.lucene>
<version.c3p0>0.9.1</version.c3p0>
- <version.aspectj>1.6.8</version.aspectj>
+ <version.aspectj>1.7.1</version.aspectj>
<version.opencsv>2.3</version.opencsv>
<version.javassist>3.8.0.GA</version.javassist>
<version.spring>3.2.1.RELEASE</version.spring>
@@ -132,7 +132,7 @@
<version.servlet-api>2.5</version.servlet-api>
- <version.wicket>1.5.6</version.wicket>
+ <version.wicket>1.5.9</version.wicket>
<!-- FIXME echatellier Probleme de parallelisation des tests unitaire,
cause org.hibernate.HibernateException: Don't change the reference to a collection
@@ -249,6 +249,12 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${version.slf4j}</version>
1
0
04 Feb '13
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>
1
0
r67 - trunk/cantharella.utils/src/main/java/nc/ird/module/utils
by echatellier＠users.forge.codelutin.com 04 Feb '13
by echatellier＠users.forge.codelutin.com 04 Feb '13
04 Feb '13
Author: echatellier
Date: 2013-02-04 10:18:54 +0100 (Mon, 04 Feb 2013)
New Revision: 67
Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/67
Log:
Replace deprecated method (shaHex > sha1Hex)
Modified:
trunk/cantharella.utils/src/main/java/nc/ird/module/utils/PasswordTools.java
Modified: trunk/cantharella.utils/src/main/java/nc/ird/module/utils/PasswordTools.java
===================================================================
--- trunk/cantharella.utils/src/main/java/nc/ird/module/utils/PasswordTools.java 2013-02-04 00:22:15 UTC (rev 66)
+++ trunk/cantharella.utils/src/main/java/nc/ird/module/utils/PasswordTools.java 2013-02-04 09:18:54 UTC (rev 67)
@@ -67,10 +67,9 @@
* @param password Password
* @return Hashed password
*/
- @SuppressWarnings("deprecation")
public static String sha1(String password) {
AssertTools.assertNotNull(password);
- return DigestUtils.shaHex(password);
+ return DigestUtils.sha1Hex(password);
}
/**
1
0