Cantharella-commits

Download

cantharella-commits@list.forge.codelutin.com

November 2012

4 participants
21 discussions

r35 - trunk/cantharella.service/src/test/resources
by echatellier＠users.forge.codelutin.com 28 Nov '12

28 Nov '12

Author: echatellier Date: 2012-11-28 15:58:12 +0100 (Wed, 28 Nov 2012) New Revision: 35 Url: http://forge.codelutin.com/repositories/revision/cantharella/35 Log: Fix project tests during "mvn install" Added: trunk/cantharella.service/src/test/resources/service.properties Added: trunk/cantharella.service/src/test/resources/service.properties =================================================================== --- trunk/cantharella.service/src/test/resources/service.properties (rev 0) +++ trunk/cantharella.service/src/test/resources/service.properties 2012-11-28 14:58:12 UTC (rev 35) @@ -0,0 +1,28 @@ +### +# #%L +# Cantharella :: Service +# $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% +### +mail.debug=true +mail.from=no-reply(a)ird.fr +mail.host=localhost + +admin.courriel=admin@localhost +admin.password=password \ No newline at end of file

1 0

r34 - trunk/cantharella.service/src/test/resources
by echatellier＠users.forge.codelutin.com 28 Nov '12

28 Nov '12

Author: echatellier Date: 2012-11-28 15:55:28 +0100 (Wed, 28 Nov 2012) New Revision: 34 Url: http://forge.codelutin.com/repositories/revision/cantharella/34 Log: Fix project tests during "mvn install" Added: trunk/cantharella.service/src/test/resources/data.properties Added: trunk/cantharella.service/src/test/resources/data.properties =================================================================== --- trunk/cantharella.service/src/test/resources/data.properties (rev 0) +++ trunk/cantharella.service/src/test/resources/data.properties 2012-11-28 14:55:28 UTC (rev 34) @@ -0,0 +1,27 @@ +### +# #%L +# Cantharella :: Data +# $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% +### +db.url=jdbc:h2:file:/tmp/cantharella/db +db.user=sa +db.password= +db.debug=false +db.hbm2ddl=create \ No newline at end of file

1 0

r33 - in trunk: . cantharella.data cantharella.data/src/main/java/nc/ird/cantharella/data/config cantharella.data/src/main/resources/development cantharella.data/src/main/resources/integration cantharella.data/src/main/resources/production cantharella.data/src/test/resources cantharella.service
by echatellier＠users.forge.codelutin.com 28 Nov '12

28 Nov '12

Author: echatellier Date: 2012-11-28 15:53:21 +0100 (Wed, 28 Nov 2012) New Revision: 33 Url: http://forge.codelutin.com/repositories/revision/cantharella/33 Log: Fix project tests during "mvn install" Added: trunk/cantharella.data/src/test/resources/data.properties Removed: trunk/cantharella.data/src/main/resources/development/hibernate.cfg.xml trunk/cantharella.data/src/main/resources/integration/hibernate.cfg.xml trunk/cantharella.data/src/main/resources/production/hibernate.cfg.xml trunk/cantharella.data/src/test/resources/nc/ Modified: trunk/cantharella.data/pom.xml trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java trunk/cantharella.data/src/main/resources/development/data.properties trunk/cantharella.service/pom.xml trunk/pom.xml Modified: trunk/cantharella.data/pom.xml =================================================================== --- trunk/cantharella.data/pom.xml 2012-11-28 13:57:26 UTC (rev 32) +++ trunk/cantharella.data/pom.xml 2012-11-28 14:53:21 UTC (rev 33) @@ -197,6 +197,12 @@ <artifactId>log4j</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.springframework</groupId> Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java 2012-11-28 13:57:26 UTC (rev 32) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java 2012-11-28 14:53:21 UTC (rev 33) @@ -143,6 +143,10 @@ @Value("${db.user}") protected String dbUserProperty; + /** DB user */ + @Value("${db.hbm2ddl:validate}") + protected String hbm2ddl; + static { // The first Locale in the list is the default one List<Locale> locales = new ArrayList<Locale>(); @@ -235,7 +239,7 @@ // Hibernate: basic hibernateProperties.setProperty("hibernate.dialect", PostgreSQLDialect.class.getName()); // System.setProperty(Environment.BYTECODE_PROVIDER, "cglib"); - hibernateProperties.setProperty("hibernate.hbm2ddl.auto", "validate"); + hibernateProperties.setProperty("hibernate.hbm2ddl.auto", hbm2ddl); // hibernateProperties.setProperty("hibernate.hbm2ddl.auto", "create-drop"); hibernateProperties.setProperty("hibernate.generate_statistics", String.valueOf(dbDebugProperty)); hibernateProperties.setProperty("hibernate.cache.use_structured_entries", String.valueOf(dbDebugProperty)); Modified: trunk/cantharella.data/src/main/resources/development/data.properties =================================================================== --- trunk/cantharella.data/src/main/resources/development/data.properties 2012-11-28 13:57:26 UTC (rev 32) +++ trunk/cantharella.data/src/main/resources/development/data.properties 2012-11-28 14:53:21 UTC (rev 33) @@ -24,7 +24,8 @@ #db.user=${pom.db.user} #db.password=${pom.db.password} #db.debug=true -db.url=jdbc:postgresql://isdev:5432/cantharella +db.url=jdbc:postgresql:cantharella db.user=cantharella -db.password=ctrl4 -db.debug=true \ No newline at end of file +db.password=cantharella +db.debug=true +db.hbm2ddl=validate \ No newline at end of file Deleted: trunk/cantharella.data/src/main/resources/development/hibernate.cfg.xml =================================================================== --- trunk/cantharella.data/src/main/resources/development/hibernate.cfg.xml 2012-11-28 13:57:26 UTC (rev 32) +++ trunk/cantharella.data/src/main/resources/development/hibernate.cfg.xml 2012-11-28 14:53:21 UTC (rev 33) @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> -<hibernate-configuration> - <session-factory name="cantharella"> - <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property> - </session-factory> -</hibernate-configuration> Deleted: trunk/cantharella.data/src/main/resources/integration/hibernate.cfg.xml =================================================================== --- trunk/cantharella.data/src/main/resources/integration/hibernate.cfg.xml 2012-11-28 13:57:26 UTC (rev 32) +++ trunk/cantharella.data/src/main/resources/integration/hibernate.cfg.xml 2012-11-28 14:53:21 UTC (rev 33) @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> -<hibernate-configuration> - <session-factory name="cantharella"> - <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property> - </session-factory> -</hibernate-configuration> Deleted: trunk/cantharella.data/src/main/resources/production/hibernate.cfg.xml =================================================================== --- trunk/cantharella.data/src/main/resources/production/hibernate.cfg.xml 2012-11-28 13:57:26 UTC (rev 32) +++ trunk/cantharella.data/src/main/resources/production/hibernate.cfg.xml 2012-11-28 14:53:21 UTC (rev 33) @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> -<hibernate-configuration> - <session-factory name="cantharella"> - <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property> - </session-factory> -</hibernate-configuration> Added: trunk/cantharella.data/src/test/resources/data.properties =================================================================== --- trunk/cantharella.data/src/test/resources/data.properties (rev 0) +++ trunk/cantharella.data/src/test/resources/data.properties 2012-11-28 14:53:21 UTC (rev 33) @@ -0,0 +1,27 @@ +### +# #%L +# Cantharella :: Data +# $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% +### +db.url=jdbc:h2:file:/tmp/cantharella/db +db.user=sa +db.password= +db.debug=false +db.hbm2ddl=create \ No newline at end of file Modified: trunk/cantharella.service/pom.xml =================================================================== --- trunk/cantharella.service/pom.xml 2012-11-28 13:57:26 UTC (rev 32) +++ trunk/cantharella.service/pom.xml 2012-11-28 14:53:21 UTC (rev 33) @@ -105,10 +105,11 @@ <artifactId>aspectjrt</artifactId> </dependency> -  + <scope>runtime</scope> + </dependency> <dependency> <groupId>junit</groupId> @@ -122,6 +123,12 @@ </dependency> <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-28 13:57:26 UTC (rev 32) +++ trunk/pom.xml 2012-11-28 14:53:21 UTC (rev 33) @@ -110,6 +110,7 @@ <log4jVersion>1.2.16</log4jVersion> <junitVersion>4.5</junitVersion> <version.slf4j>1.6.0</version.slf4j> + <version.h2>1.3.168</version.h2> <version.jpa>1.0.0.Final</version.jpa> <version.hibernate-annotations>3.5.6-Final</version.hibernate-annotations> @@ -320,7 +321,6 @@ <version>${version.c3p0}</version> </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-orm</artifactId> @@ -396,6 +396,12 @@ <version>${version.wicket}</version> </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${version.h2}</version> + </dependency> +  <dependency> <groupId>cglib</groupId>

1 0

r32 - trunk/cantharella.service/src/main/resources/commons
by echatellier＠users.forge.codelutin.com 28 Nov '12

28 Nov '12

Author: echatellier Date: 2012-11-28 14:57:26 +0100 (Wed, 28 Nov 2012) New Revision: 32 Url: http://forge.codelutin.com/repositories/revision/cantharella/32 Log: Fix strange char Modified: trunk/cantharella.service/src/main/resources/commons/service_en.properties Modified: trunk/cantharella.service/src/main/resources/commons/service_en.properties =================================================================== --- trunk/cantharella.service/src/main/resources/commons/service_en.properties 2012-11-28 13:56:27 UTC (rev 31) +++ trunk/cantharella.service/src/main/resources/commons/service_en.properties 2012-11-28 13:57:26 UTC (rev 32) @@ -20,7 +20,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -updatePassword.subject=Cantharella – New password +updatePassword.subject=Cantharella – New password updatePassword.text=Your password was regenerated : {0} register.subject=Cantharella – Account creation request

1 0

r31 - trunk/cantharella.data/src/main/resources/commons
by echatellier＠users.forge.codelutin.com 28 Nov '12

28 Nov '12

Author: echatellier Date: 2012-11-28 14:56:27 +0100 (Wed, 28 Nov 2012) New Revision: 31 Url: http://forge.codelutin.com/repositories/revision/cantharella/31 Log: Fix strange char Modified: trunk/cantharella.data/src/main/resources/commons/data_en.properties Modified: trunk/cantharella.data/src/main/resources/commons/data_en.properties =================================================================== --- trunk/cantharella.data/src/main/resources/commons/data_en.properties 2012-11-26 18:27:52 UTC (rev 30) +++ trunk/cantharella.data/src/main/resources/commons/data_en.properties 2012-11-28 13:56:27 UTC (rev 31) @@ -20,7 +20,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -Campagne=Campaign +Campagne=Campaign Campagne.codePays=Country Campagne.mentionLegale=Legal notice Campagne.complement=Comments

1 0

r30 - in trunk: . src/site src/site/rst
by echatellier＠users.forge.codelutin.com 26 Nov '12

26 Nov '12

Author: echatellier Date: 2012-11-26 19:27:52 +0100 (Mon, 26 Nov 2012) New Revision: 30 Url: http://forge.codelutin.com/repositories/revision/cantharella/30 Log: Fix site deploy Modified: trunk/pom.xml trunk/src/site/rst/index.rst trunk/src/site/site_en.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-26 18:13:04 UTC (rev 29) +++ trunk/pom.xml 2012-11-26 18:27:52 UTC (rev 30) @@ -83,35 +83,6 @@ </site> </distributionManagement> -  - <modules> <module>cantharella.utils</module> <module>cantharella.data</module> @@ -130,8 +101,6 @@ </license.organizationName> <license.licenseName>agpl_v3</license.licenseName> - <skipTests>true</skipTests> - <commonsBeanutilsVersion>1.8.2</commonsBeanutilsVersion> <version.commons-codec>1.4</version.commons-codec> <commonsIoVersion>1.3.2</commonsIoVersion> Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-11-26 18:13:04 UTC (rev 29) +++ trunk/src/site/rst/index.rst 2012-11-26 18:27:52 UTC (rev 30) @@ -4,7 +4,7 @@ .. * $Id:$ .. * $HeadURL:$ .. * %% -.. * Copyright (C) 2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) +.. * 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 @@ -20,6 +20,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + Description =========== Modified: trunk/src/site/site_en.xml =================================================================== (Binary files differ)

1 0

26 Nov '12

Author: echatellier Date: 2012-11-26 19:13:04 +0100 (Mon, 26 Nov 2012) New Revision: 29 Url: http://forge.codelutin.com/repositories/revision/cantharella/29 Log: Update license headers Fix release (deps and checks) Added: trunk/cantharella.data/src/license/ trunk/cantharella.data/src/license/THIRD-PARTY.properties trunk/cantharella.service/src/license/ trunk/cantharella.service/src/license/THIRD-PARTY.properties trunk/cantharella.web/src/license/ trunk/cantharella.web/src/license/THIRD-PARTY.properties Removed: trunk/cantharella.data/src/main/java/META-INF/ trunk/cantharella.data/src/main/resources/commons/META-INF/ trunk/cantharella.service/src/main/resources/commons/META-INF/ trunk/cantharella.utils/src/main/java/META-INF/ trunk/cantharella.web/src/main/webapp/META-INF/ trunk/cantharella.web/src/main/webapp/WEB-INF/lib/ Modified: trunk/LICENSE.txt trunk/cantharella.data/LICENSE.txt 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/dao/AbstractModelDao.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/GenericDao.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/CampagneDao.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/ExtractionDao.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/HibernateTemplateDao.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/PersonneDao.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/ProduitDao.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/PurificationDao.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/SpecimenDao.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/StationDao.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/TestBioDao.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/utils/GenericDaoAspect.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/exceptions/AbstractException.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/exceptions/DataConstraintException.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/exceptions/DataNotFoundException.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/exceptions/UnexpectedException.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Campagne.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/CampagneGroupeDroits.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/CampagnePersonneDroits.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/CampagnePersonneParticipant.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Droits.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/ErreurTestBio.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Extraction.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Extrait.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Fraction.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Groupe.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Lot.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/LotGroupeDroits.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/LotPersonneDroits.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MethodeExtraction.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MethodePurification.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MethodeTestBio.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/ParamMethoPuri.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/ParamMethoPuriEffectif.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Partie.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Personne.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/Specimen.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Station.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TestBio.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TypeDocument.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TypeExtrait.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Utilisateur.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/LotPersonneDroitsComp.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/utils/AbstractModel.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/utils/CompositeId.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/CollectionUniqueField.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/CountryCode.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/CountryCodeValidator.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/DbUniqueField.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/Latitude.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LatitudeOrientation.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LatitudeOrientationValidator.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LatitudeValidator.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/Longitude.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LongitudeOrientation.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LongitudeOrientationValidator.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LongitudeValidator.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/QueryConstraint.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/Referentiel.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/ReferentielValidator.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/utils/ModelValidator.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/main/resources/commons/ValidationMessages_fr.properties trunk/cantharella.data/src/main/resources/commons/c3p0.properties trunk/cantharella.data/src/main/resources/commons/dataContext.xml trunk/cantharella.data/src/main/resources/commons/data_en.properties trunk/cantharella.data/src/main/resources/commons/data_fr.properties trunk/cantharella.data/src/main/resources/commons/ehcache.xml trunk/cantharella.data/src/main/resources/commons/sql/cantharella_schema_1.0.sql trunk/cantharella.data/src/main/resources/commons/sql/create_db.sql trunk/cantharella.data/src/main/resources/development/data.properties trunk/cantharella.data/src/main/resources/development/hibernate.cfg.xml trunk/cantharella.data/src/main/resources/development/init.sql trunk/cantharella.data/src/main/resources/development/log4j.dtd trunk/cantharella.data/src/main/resources/development/log4j.xml trunk/cantharella.data/src/main/resources/integration/data.properties trunk/cantharella.data/src/main/resources/integration/hibernate.cfg.xml trunk/cantharella.data/src/main/resources/integration/log4j.dtd trunk/cantharella.data/src/main/resources/integration/log4j.xml trunk/cantharella.data/src/main/resources/production/data.properties trunk/cantharella.data/src/main/resources/production/hibernate.cfg.xml trunk/cantharella.data/src/main/resources/production/log4j.dtd trunk/cantharella.data/src/main/resources/production/log4j.xml trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/AbstractDataTest.java trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/DataContextTest.java trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/dao/GenericDaoTest.java trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/dao/utils/SpringTransactionTestAppender.java trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/dao/utils/TestAppender.java trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/GroupeTest.java trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/GroupeTransactionTest.java trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/ModelValidatorTest.java trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/PersonneTest.java trunk/cantharella.service/LICENSE.txt trunk/cantharella.service/pom.xml trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/exceptions/EmailException.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/CampagneService.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/DocumentService.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/ExtractionService.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/LotService.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/MailService.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/PersonneService.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/ProduitService.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/PurificationService.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/SpecimenService.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/StationService.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/TestBioService.java 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/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/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/CampagneNormalizer.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/ConfigNameNormalizer.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/EmailNormalizer.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/ErreurTestNormalizer.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/ExtractionNormalizer.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/LotNormalizer.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/MethodeExtractionNormalizer.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/MethodePurificationNormalizer.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/MethodeTestBioNormalizer.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/PartieNormalizer.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/PersonneNormalizer.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/PurificationNormalizer.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/SpecimenNormalizer.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/StationNormalizer.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/TestBioNormalizer.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/TypeDocumentNormalizer.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/UniqueFieldNormalizer.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/utils/Normalize.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/main/resources/commons/serviceContext.xml trunk/cantharella.service/src/main/resources/commons/service_en.properties trunk/cantharella.service/src/main/resources/commons/service_fr.properties trunk/cantharella.service/src/main/resources/development/service.properties trunk/cantharella.service/src/main/resources/integration/service.properties trunk/cantharella.service/src/main/resources/production/service.properties trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/AbstractServiceTest.java trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/ServiceContextTest.java trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/exceptions/ExcelImportException.java trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/services/PersonneServiceTest.java trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/ExcelColumnStructure.java trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/ExcelColumnsReader.java trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/ExcelSheetStructure.java trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/PopulateDB.java trunk/cantharella.utils/LICENSE.txt trunk/cantharella.utils/pom.xml trunk/cantharella.utils/src/main/java/nc/ird/module/utils/AssertTools.java trunk/cantharella.utils/src/main/java/nc/ird/module/utils/BeanLookup.java trunk/cantharella.utils/src/main/java/nc/ird/module/utils/BeanTools.java trunk/cantharella.utils/src/main/java/nc/ird/module/utils/CaptchaTools.java trunk/cantharella.utils/src/main/java/nc/ird/module/utils/CollectionTools.java trunk/cantharella.utils/src/main/java/nc/ird/module/utils/CoordTools.java trunk/cantharella.utils/src/main/java/nc/ird/module/utils/GenerateCsv.java trunk/cantharella.utils/src/main/java/nc/ird/module/utils/GenericsTools.java trunk/cantharella.utils/src/main/java/nc/ird/module/utils/IntuitiveStringComparator.java trunk/cantharella.utils/src/main/java/nc/ird/module/utils/LogTools.java trunk/cantharella.utils/src/main/java/nc/ird/module/utils/NumberTools.java trunk/cantharella.utils/src/main/java/nc/ird/module/utils/Pair.java trunk/cantharella.utils/src/main/java/nc/ird/module/utils/PasswordTools.java trunk/cantharella.utils/src/main/java/nc/ird/module/utils/StringTools.java trunk/cantharella.utils/src/main/java/nc/ird/module/utils/StringTransformer.java trunk/cantharella.utils/src/test/java/nc/ird/module/utils/AssertToolsTest.java trunk/cantharella.utils/src/test/java/nc/ird/module/utils/BeanLookupTest.java trunk/cantharella.utils/src/test/java/nc/ird/module/utils/BeanToolsTest.java trunk/cantharella.utils/src/test/java/nc/ird/module/utils/CaptchaToolsTest.java trunk/cantharella.utils/src/test/java/nc/ird/module/utils/CollectionToolsTest.java trunk/cantharella.utils/src/test/java/nc/ird/module/utils/CoordToolsTest.java trunk/cantharella.utils/src/test/java/nc/ird/module/utils/GenericsToolsTest.java trunk/cantharella.utils/src/test/java/nc/ird/module/utils/LogToolsTest.java trunk/cantharella.utils/src/test/java/nc/ird/module/utils/NumberToolsTest.java trunk/cantharella.utils/src/test/java/nc/ird/module/utils/PairTest.java trunk/cantharella.utils/src/test/java/nc/ird/module/utils/PasswordToolsTest.java trunk/cantharella.utils/src/test/java/nc/ird/module/utils/StringToolsTest.java trunk/cantharella.utils/src/test/java/nc/ird/module/utils/StringTransformerTest.java trunk/cantharella.web/LICENSE.txt 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/config/WebContext.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/ContactPage.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/ContactPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.html 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.html 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.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/columns/LinkProduitPropertyColumn.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/columns/TaxonomyPropertyColumn.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ListCampagnesPage.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ListCampagnesPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.html 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.html 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/ListConfigurationPage.html 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/ManageErreurTestBioPage.html 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.html 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.html 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.html 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.html 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/panels/ListErreurTestBioPanel.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListErreurTestBioPanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeExtractionPanel.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeExtractionPanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodePurificationPanel.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodePurificationPanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeTestBioPanel.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeTestBioPanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListPartiePanel.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListPartiePanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ListExtractionsPage.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ListExtractionsPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ManageExtractionPage.html 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.html 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/ListLotsPage.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ListLotsPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ManageLotPage.html 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.html 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/personne/ListPersonnesPage.html 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.html 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.html 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/panels/ManagePersonnePanel.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/panels/ManagePersonnePanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/panels/ReadPersonnePanel.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/panels/ReadPersonnePanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ListPurificationsPage.html 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.html 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.html 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/ListSpecimensPage.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ListSpecimensPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ManageSpecimenPage.html 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.html 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/ListStationsPage.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ListStationsPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ManageStationPage.html 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.html 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/ListTestsBioPage.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ListTestsBioPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ManageTestBioPage.html 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.html 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.html 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.html 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/RegisterPage.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/RegisterPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ResetPasswordPage.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ResetPasswordPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/UpdateUtilisateurPage.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/UpdateUtilisateurPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/panels/ReadDroitsUtilisateurPanel.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/panels/ReadDroitsUtilisateurPanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/errors/AccessDeniedPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/errors/ErrorPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/errors/InternalErrorPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/errors/PageExpiredErrorPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/CaptchaModel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/ContactModel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/LoginModel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/ManageCampagneModel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/ManageStationModel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/ManageUtilisateurModel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/RegisterModel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/UpdateUtilisateurModel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/renderers/PersonneRenderer.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/CallerPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/JSConfirmationBehavior.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/ReplaceEmptyLabelBehavior.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/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/LinkPropertyColumn$LinkPanel.html 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/LinkableImagePropertyColumn$LinkableImagePanel.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkableImagePropertyColumn.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/PercentPropertyColumn.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/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/AutoCompleteTextFieldString.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/forms/SubmittableButtonEvents.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayBooleanPropertyModel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayDecimalPropertyModel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayEnumPropertyModel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayMapValuePropertyModel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayPercentPropertyModel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayShortDatePropertyModel.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/panels/CollapsiblePanel.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/CollapsiblePanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkPanel.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkPanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkProduitPanel.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkProduitPanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/SimpleTooltipPanel.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/SimpleTooltipPanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/renderers/EnumChoiceRenderer.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/renderers/MapChoiceRenderer.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/resources/WebMessages.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthContainer.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthRole.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthRoles.java 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/AuthStrategy.java trunk/cantharella.web/src/main/resources/commons/webContext.xml trunk/cantharella.web/src/main/resources/commons/web_en.properties trunk/cantharella.web/src/main/resources/commons/web_fr.properties trunk/cantharella.web/src/main/resources/development/web.properties trunk/cantharella.web/src/main/resources/integration/web.properties trunk/cantharella.web/src/main/resources/production/web.properties trunk/cantharella.web/src/main/webapp/WEB-INF/web.xml trunk/cantharella.web/src/main/webapp/css/general.css trunk/cantharella.web/src/main/webapp/css/menu_en.css trunk/cantharella.web/src/main/webapp/css/menu_fr.css trunk/cantharella.web/src/main/webapp/js/slidemenu.js trunk/cantharella.web/src/test/java/nc/ird/cantharella/web/AbstractWebTest.java trunk/pom.xml trunk/src/site/rst/index.rst trunk/src/site/site_en.xml Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/LICENSE.txt 2012-11-26 18:13:04 UTC (rev 29) @@ -1,5 +1,5 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies @@ -7,17 +7,15 @@ Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to +our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +software for all its users. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you @@ -26,45 +24,35 @@ want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - The precise terms and conditions for copying, distribution and modification follow. @@ -72,7 +60,7 @@ 0. Definitions. - "This License" refers to version 3 of the GNU General Public License. + "This License" refers to version 3 of the GNU Affero General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. @@ -549,35 +537,45 @@ the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - 13. Use with the GNU Affero General Public License. + 13. Remote Network Interaction; Use with the GNU General Public License. + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single +under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General +Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published +GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's +versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. @@ -635,40 +633,29 @@ Copyright (C) <year> <name of author> This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by + 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. + GNU Affero General Public License for more details. - You should have received a copy of the GNU General Public License + 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/>. Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<http://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Modified: trunk/cantharella.data/LICENSE.txt =================================================================== --- trunk/cantharella.data/LICENSE.txt 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/LICENSE.txt 2012-11-26 18:13:04 UTC (rev 29) @@ -1,5 +1,5 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies @@ -7,17 +7,15 @@ Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to +our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +software for all its users. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you @@ -26,45 +24,35 @@ want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - The precise terms and conditions for copying, distribution and modification follow. @@ -72,7 +60,7 @@ 0. Definitions. - "This License" refers to version 3 of the GNU General Public License. + "This License" refers to version 3 of the GNU Affero General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. @@ -549,35 +537,45 @@ the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - 13. Use with the GNU Affero General Public License. + 13. Remote Network Interaction; Use with the GNU General Public License. + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single +under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General +Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published +GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's +versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. @@ -635,40 +633,29 @@ Copyright (C) <year> <name of author> This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by + 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. + GNU Affero General Public License for more details. - You should have received a copy of the GNU General Public License + 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/>. Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<http://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Modified: trunk/cantharella.data/pom.xml =================================================================== --- trunk/cantharella.data/pom.xml 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/pom.xml 2012-11-26 18:13:04 UTC (rev 29) @@ -6,7 +6,7 @@ <parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.1-SNAPSHOT</version> </parent> <artifactId>cantharella.data</artifactId> Added: trunk/cantharella.data/src/license/THIRD-PARTY.properties =================================================================== --- trunk/cantharella.data/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/cantharella.data/src/license/THIRD-PARTY.properties 2012-11-26 18:13:04 UTC (rev 29) @@ -0,0 +1,36 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Affero General Public License (AGPL) +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - Eclipse Public License - v 1.0 +# - ICU License +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - Public Domain +# - The Apache Software License, Version 2.0 +# - license.txt +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Nov 26 18:02:47 CET 2012 +antlr--antlr--2.7.6=BSD License +dom4j--dom4j--1.6.1=BSD License +javassist--javassist--3.8.0.GA=The Apache Software License, Version 2.0 +javax.transaction--jta--1.1=Java Transaction API (JTA) License +net.sf.jsr107cache--jsr107cache--1.0=The Apache Software License, Version 2.0 +org.springframework--spring-aop--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-asm--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-beans--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-context--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-core--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-expression--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-jdbc--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-orm--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-test--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-tx--3.1.0.RELEASE=The Apache Software License, Version 2.0 Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.config; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/AbstractModelDao.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/AbstractModelDao.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/AbstractModelDao.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.dao; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/GenericDao.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/GenericDao.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/GenericDao.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.dao; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/CampagneDao.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/CampagneDao.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/CampagneDao.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.dao.impl; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/ExtractionDao.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/ExtractionDao.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/ExtractionDao.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,19 +1,26 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ + package nc.ird.cantharella.data.dao.impl; import nc.ird.cantharella.data.model.Extrait; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/HibernateTemplateDao.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/HibernateTemplateDao.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/HibernateTemplateDao.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.dao.impl; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/PersonneDao.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/PersonneDao.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/PersonneDao.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.dao.impl; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/ProduitDao.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/ProduitDao.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/ProduitDao.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.dao.impl; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/PurificationDao.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/PurificationDao.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/PurificationDao.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.dao.impl; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/SpecimenDao.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/SpecimenDao.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/SpecimenDao.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.dao.impl; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/StationDao.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/StationDao.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/StationDao.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.dao.impl; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/TestBioDao.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/TestBioDao.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/TestBioDao.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.dao.impl; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/utils/GenericDaoAspect.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/utils/GenericDaoAspect.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/utils/GenericDaoAspect.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.dao.utils; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/exceptions/AbstractException.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/exceptions/AbstractException.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/exceptions/AbstractException.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.exceptions; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/exceptions/DataConstraintException.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/exceptions/DataConstraintException.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/exceptions/DataConstraintException.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.exceptions; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/exceptions/DataNotFoundException.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/exceptions/DataNotFoundException.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/exceptions/DataNotFoundException.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.exceptions; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/exceptions/UnexpectedException.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.exceptions; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Campagne.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Campagne.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Campagne.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/CampagneGroupeDroits.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/CampagneGroupeDroits.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/CampagneGroupeDroits.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/CampagnePersonneDroits.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/CampagnePersonneDroits.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/CampagnePersonneDroits.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/CampagnePersonneParticipant.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/CampagnePersonneParticipant.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/CampagnePersonneParticipant.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Droits.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Droits.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Droits.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/ErreurTestBio.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/ErreurTestBio.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/ErreurTestBio.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Extraction.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Extraction.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Extraction.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Extrait.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Extrait.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Extrait.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Fraction.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Fraction.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Fraction.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Groupe.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Groupe.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Groupe.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Lot.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Lot.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Lot.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/LotGroupeDroits.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/LotGroupeDroits.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/LotGroupeDroits.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/LotPersonneDroits.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/LotPersonneDroits.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/LotPersonneDroits.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MethodeExtraction.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MethodeExtraction.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MethodeExtraction.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MethodePurification.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MethodePurification.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MethodePurification.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MethodeTestBio.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MethodeTestBio.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MethodeTestBio.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/ParamMethoPuri.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/ParamMethoPuri.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/ParamMethoPuri.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/ParamMethoPuriEffectif.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/ParamMethoPuriEffectif.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/ParamMethoPuriEffectif.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Partie.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Partie.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Partie.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Personne.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Personne.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Personne.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Produit.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Purification.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/ResultatTestBio.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Specimen.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Specimen.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Specimen.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Station.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Station.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Station.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TestBio.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TestBio.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TestBio.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TypeDocument.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TypeDocument.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TypeDocument.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TypeExtrait.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TypeExtrait.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TypeExtrait.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,12 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ Copyright (C) - * 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) Cantharella is free - * software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * #%L + * Cantharella :: Data + * $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.cantharella.data.model; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Utilisateur.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Utilisateur.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Utilisateur.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/CampagnePersonneDroitsComp.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,21 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. - */ -/** + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model.comparators; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/ExtraitsOfExtractionComp.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,21 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. - */ -/** + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model.comparators; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/FractionsOfPurificationComp.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model.comparators; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/LotPersonneDroitsComp.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/LotPersonneDroitsComp.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/LotPersonneDroitsComp.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,21 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. - */ -/** + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model.comparators; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/ResultatsOfTestBioComp.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model.comparators; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/utils/AbstractModel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model.utils; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/utils/CompositeId.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/utils/CompositeId.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/utils/CompositeId.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model.utils; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/CollectionUniqueField.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/CollectionUniqueField.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/CollectionUniqueField.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.validation; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/CollectionUniqueFieldValidator.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.validation; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/CountryCode.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/CountryCode.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/CountryCode.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.validation; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/CountryCodeValidator.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/CountryCodeValidator.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/CountryCodeValidator.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.validation; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/DbUniqueField.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/DbUniqueField.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/DbUniqueField.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.validation; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/DbUniqueFieldValidator.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.validation; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/Latitude.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/Latitude.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/Latitude.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.validation; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LatitudeOrientation.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LatitudeOrientation.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LatitudeOrientation.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.validation; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LatitudeOrientationValidator.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LatitudeOrientationValidator.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LatitudeOrientationValidator.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.validation; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LatitudeValidator.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LatitudeValidator.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LatitudeValidator.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.validation; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/Longitude.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/Longitude.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/Longitude.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.validation; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LongitudeOrientation.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LongitudeOrientation.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LongitudeOrientation.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.validation; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LongitudeOrientationValidator.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LongitudeOrientationValidator.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LongitudeOrientationValidator.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.validation; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LongitudeValidator.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LongitudeValidator.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/LongitudeValidator.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.validation; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/QueryConstraint.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/QueryConstraint.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/QueryConstraint.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.validation; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/QueryConstraintValidator.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.validation; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/Referentiel.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/Referentiel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/Referentiel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.validation; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/ReferentielValidator.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/ReferentielValidator.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/ReferentielValidator.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.validation; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/utils/ModelValidator.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/utils/ModelValidator.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/utils/ModelValidator.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.validation.utils; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/utils/ModelValidatorEventListener.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.validation.utils; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/utils/ModelValidatorImpl.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.validation.utils; Modified: trunk/cantharella.data/src/main/resources/commons/ValidationMessages_fr.properties =================================================================== --- trunk/cantharella.data/src/main/resources/commons/ValidationMessages_fr.properties 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/resources/commons/ValidationMessages_fr.properties 2012-11-26 18:13:04 UTC (rev 29) @@ -1,9 +1,31 @@ -#TODO : d�clarer en UTF8 +### +# #%L +# Cantharella :: Data +# $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% +### +#TODO : d�clarer en UTF8 -javax.validation.constraints.Max.message=doit �tre plus petit ou �gal � {value} -javax.validation.constraints.Min.message=doit �tre plus grand ou �gal � {value} -javax.validation.constraints.DecimalMax.message=doit �tre plus petit ou �gal � {value} -javax.validation.constraints.DecimalMin.message=doit �tre plus grand ou �gal � {value} +javax.validation.constraints.Max.message=doit �tre plus petit ou �gal � {value} +javax.validation.constraints.Min.message=doit �tre plus grand ou �gal � {value} +javax.validation.constraints.DecimalMax.message=doit �tre plus petit ou �gal � {value} +javax.validation.constraints.DecimalMin.message=doit �tre plus grand ou �gal � {value} nc.ird.cantharella.data.validation.CountryCode.message=est invalide nc.ird.cantharella.data.validation.Latitude.message=est invalide @@ -12,4 +34,4 @@ nc.ird.cantharella.data.validation.LatitudeOrientation.message=est invalide nc.ird.cantharella.data.validation.LongitudeOrientation.message=est invalide -nc.ird.cantharella.data.validation.UniqueFieldList.message=existe d�j� +nc.ird.cantharella.data.validation.UniqueFieldList.message=existe d�j� \ No newline at end of file Modified: trunk/cantharella.data/src/main/resources/commons/c3p0.properties =================================================================== --- trunk/cantharella.data/src/main/resources/commons/c3p0.properties 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/resources/commons/c3p0.properties 2012-11-26 18:13:04 UTC (rev 29) @@ -1,2 +1,24 @@ +### +# #%L +# Cantharella :: Data +# $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% +### #Disable JMX management com.mchange.v2.c3p0.management.ManagementCoordinator=com.mchange.v2.c3p0.management.NullManagementCoordinator \ No newline at end of file Modified: trunk/cantharella.data/src/main/resources/commons/dataContext.xml =================================================================== --- trunk/cantharella.data/src/main/resources/commons/dataContext.xml 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/resources/commons/dataContext.xml 2012-11-26 18:13:04 UTC (rev 29) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" Modified: trunk/cantharella.data/src/main/resources/commons/data_en.properties =================================================================== --- trunk/cantharella.data/src/main/resources/commons/data_en.properties 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/resources/commons/data_en.properties 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +### +# #%L +# Cantharella :: Data +# $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% +### Campagne=Campaign Campagne.codePays=Country Campagne.mentionLegale=Legal notice Modified: trunk/cantharella.data/src/main/resources/commons/data_fr.properties =================================================================== --- trunk/cantharella.data/src/main/resources/commons/data_fr.properties 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/resources/commons/data_fr.properties 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +### +# #%L +# Cantharella :: Data +# $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% +### Campagne=Campagne Campagne.codePays=Pays Campagne.mentionLegale=Mention légale Modified: trunk/cantharella.data/src/main/resources/commons/ehcache.xml =================================================================== --- trunk/cantharella.data/src/main/resources/commons/ehcache.xml 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/resources/commons/ehcache.xml 2012-11-26 18:13:04 UTC (rev 29) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ehcache.org/ehcache.xsd"> Modified: trunk/cantharella.data/src/main/resources/commons/sql/cantharella_schema_1.0.sql =================================================================== --- trunk/cantharella.data/src/main/resources/commons/sql/cantharella_schema_1.0.sql 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/resources/commons/sql/cantharella_schema_1.0.sql 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +--- +-- #%L +-- Cantharella :: Data +-- $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% +--- -- insert once connected to cantharella database with the user cantharella BEGIN; @@ -554,4 +576,4 @@ create sequence hibernate_sequence; -COMMIT; \ No newline at end of file +COMMIT; Modified: trunk/cantharella.data/src/main/resources/commons/sql/create_db.sql =================================================================== --- trunk/cantharella.data/src/main/resources/commons/sql/create_db.sql 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/resources/commons/sql/create_db.sql 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +--- +-- #%L +-- Cantharella :: Data +-- $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% +--- CREATE ROLE cantharella LOGIN PASSWORD 'ctrl4'; CREATE DATABASE cantharella WITH ENCODING='UTF8' OWNER=cantharella; GRANT ALL ON DATABASE cantharella TO cantharella; @@ -4,4 +26,4 @@ \connect cantharella ALTER SCHEMA public OWNER TO cantharella; GRANT ALL ON SCHEMA public TO cantharella; -\q \ No newline at end of file +\q Modified: trunk/cantharella.data/src/main/resources/development/data.properties =================================================================== --- trunk/cantharella.data/src/main/resources/development/data.properties 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/resources/development/data.properties 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +### +# #%L +# Cantharella :: Data +# $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% +### #db.url=${pom.db.url} #db.user=${pom.db.user} #db.password=${pom.db.password} Modified: trunk/cantharella.data/src/main/resources/development/hibernate.cfg.xml =================================================================== --- trunk/cantharella.data/src/main/resources/development/hibernate.cfg.xml 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/resources/development/hibernate.cfg.xml 2012-11-26 18:13:04 UTC (rev 29) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> Modified: trunk/cantharella.data/src/main/resources/development/init.sql =================================================================== --- trunk/cantharella.data/src/main/resources/development/init.sql 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/resources/development/init.sql 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +--- +-- #%L +-- Cantharella :: Data +-- $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% +--- CREATE ROLE cantharella LOGIN PASSWORD 'ctrl4'; CREATE DATABASE cantharella WITH ENCODING='UTF8' OWNER=cantharella; GRANT ALL ON DATABASE cantharella TO cantharella; @@ -10,4 +32,4 @@ -- mvn hibernate3:hbm2ddl -- Caution : the NOT NULL constraints are not generated --- Go to src/main/resources/commons/sql for production schema scripts \ No newline at end of file +-- Go to src/main/resources/commons/sql for production schema scripts Modified: trunk/cantharella.data/src/main/resources/development/log4j.dtd =================================================================== --- trunk/cantharella.data/src/main/resources/development/log4j.dtd 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/resources/development/log4j.dtd 2012-11-26 18:13:04 UTC (rev 29) @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="UTF-8" ?> - + <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> Modified: trunk/cantharella.data/src/main/resources/integration/data.properties =================================================================== --- trunk/cantharella.data/src/main/resources/integration/data.properties 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/resources/integration/data.properties 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +### +# #%L +# Cantharella :: Data +# $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% +### db.url=jdbc:postgresql://isdev:5432/cantharella db.user=cantharella db.password=ctrl4 Modified: trunk/cantharella.data/src/main/resources/integration/hibernate.cfg.xml =================================================================== --- trunk/cantharella.data/src/main/resources/integration/hibernate.cfg.xml 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/resources/integration/hibernate.cfg.xml 2012-11-26 18:13:04 UTC (rev 29) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> Modified: trunk/cantharella.data/src/main/resources/integration/log4j.dtd =================================================================== --- trunk/cantharella.data/src/main/resources/integration/log4j.dtd 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/resources/integration/log4j.dtd 2012-11-26 18:13:04 UTC (rev 29) @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="UTF-8" ?> - + <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> Modified: trunk/cantharella.data/src/main/resources/production/data.properties =================================================================== --- trunk/cantharella.data/src/main/resources/production/data.properties 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/resources/production/data.properties 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +### +# #%L +# Cantharella :: Data +# $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% +### #The password will be changed in production environment db.url=jdbc:postgresql://localhost:5432/cantharella db.user=cantharella Modified: trunk/cantharella.data/src/main/resources/production/hibernate.cfg.xml =================================================================== --- trunk/cantharella.data/src/main/resources/production/hibernate.cfg.xml 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/resources/production/hibernate.cfg.xml 2012-11-26 18:13:04 UTC (rev 29) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> Modified: trunk/cantharella.data/src/main/resources/production/log4j.dtd =================================================================== --- trunk/cantharella.data/src/main/resources/production/log4j.dtd 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/main/resources/production/log4j.dtd 2012-11-26 18:13:04 UTC (rev 29) @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="UTF-8" ?> - + <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> Modified: trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/AbstractDataTest.java =================================================================== --- trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/AbstractDataTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/AbstractDataTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data; Modified: trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/DataContextTest.java =================================================================== --- trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/DataContextTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/DataContextTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data; Modified: trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/dao/GenericDaoTest.java =================================================================== --- trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/dao/GenericDaoTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/dao/GenericDaoTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.dao; Modified: trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/dao/utils/SpringTransactionTestAppender.java =================================================================== --- trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/dao/utils/SpringTransactionTestAppender.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/dao/utils/SpringTransactionTestAppender.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,22 +1,27 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.dao.utils; - import org.springframework.transaction.interceptor.TransactionInterceptor; /** 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/dao/utils/TestAppender.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.dao.utils; Modified: trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/GroupeTest.java =================================================================== --- trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/GroupeTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/GroupeTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/GroupeTransactionTest.java =================================================================== --- trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/GroupeTransactionTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/GroupeTransactionTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/ModelValidatorTest.java =================================================================== --- trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/ModelValidatorTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/ModelValidatorTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/PersonneTest.java =================================================================== --- trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/PersonneTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/model/PersonneTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Data + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.data.model; Modified: trunk/cantharella.service/LICENSE.txt =================================================================== --- trunk/cantharella.service/LICENSE.txt 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/LICENSE.txt 2012-11-26 18:13:04 UTC (rev 29) @@ -1,5 +1,5 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies @@ -7,17 +7,15 @@ Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to +our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +software for all its users. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you @@ -26,45 +24,35 @@ want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - The precise terms and conditions for copying, distribution and modification follow. @@ -72,7 +60,7 @@ 0. Definitions. - "This License" refers to version 3 of the GNU General Public License. + "This License" refers to version 3 of the GNU Affero General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. @@ -549,35 +537,45 @@ the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - 13. Use with the GNU Affero General Public License. + 13. Remote Network Interaction; Use with the GNU General Public License. + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single +under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General +Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published +GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's +versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. @@ -635,40 +633,29 @@ Copyright (C) <year> <name of author> This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by + 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. + GNU Affero General Public License for more details. - You should have received a copy of the GNU General Public License + 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/>. Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<http://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Modified: trunk/cantharella.service/pom.xml =================================================================== --- trunk/cantharella.service/pom.xml 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/pom.xml 2012-11-26 18:13:04 UTC (rev 29) @@ -7,7 +7,7 @@ <parent> <artifactId>cantharella</artifactId> <groupId>nc.ird</groupId> - <version>1.0.2-SNAPSHOT</version> + <version>1.1-SNAPSHOT</version> </parent> <artifactId>cantharella.service</artifactId> @@ -130,6 +130,11 @@ <groupId>cglib</groupId> <artifactId>cglib-nodep</artifactId> </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> <dependency> <groupId>org.aspectj</groupId> Added: trunk/cantharella.service/src/license/THIRD-PARTY.properties =================================================================== --- trunk/cantharella.service/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/cantharella.service/src/license/THIRD-PARTY.properties 2012-11-26 18:13:04 UTC (rev 29) @@ -0,0 +1,38 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Affero General Public License (AGPL) +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - Eclipse Public License - v 1.0 +# - ICU License +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Java Transaction API (JTA) License +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - Public Domain +# - The Apache Software License, Version 2.0 +# - license.txt +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Nov 26 18:07:22 CET 2012 +antlr--antlr--2.7.6=BSD License +dom4j--dom4j--1.6.1=BSD License +javassist--javassist--3.8.0.GA=The Apache Software License, Version 2.0 +javax.transaction--jta--1.1=Java Transaction API (JTA) License +net.sf.jsr107cache--jsr107cache--1.0=The Apache Software License, Version 2.0 +org.springframework--spring-aop--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-asm--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-beans--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-context--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-context-support--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-core--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-expression--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-jdbc--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-orm--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-test--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-tx--3.1.0.RELEASE=The Apache Software License, Version 2.0 Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.config; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/exceptions/EmailException.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/exceptions/EmailException.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/exceptions/EmailException.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.exceptions; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/CampagneService.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/CampagneService.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/CampagneService.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.services; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/DocumentService.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,12 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ Copyright (C) - * 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) Cantharella is free - * software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * #%L + * Cantharella :: Service + * $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.cantharella.service.services; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/ExtractionService.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/ExtractionService.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/ExtractionService.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.services; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/LotService.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/LotService.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/LotService.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.services; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/MailService.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/MailService.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/MailService.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.services; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/PersonneService.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/PersonneService.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/PersonneService.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.services; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/ProduitService.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/ProduitService.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/ProduitService.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.services; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/PurificationService.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/PurificationService.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/PurificationService.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.services; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/SpecimenService.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/SpecimenService.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/SpecimenService.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.services; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/StationService.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/StationService.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/StationService.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.services; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/TestBioService.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/TestBioService.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/TestBioService.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.services; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/CampagneServiceImpl.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.services.impl; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/DocumentServiceImpl.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.services.impl; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/ExtractionServiceImpl.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.services.impl; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/LotServiceImpl.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.services.impl; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/MailServiceImpl.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.services.impl; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/PersonneServiceImpl.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.services.impl; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/ProduitServiceImpl.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.services.impl; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/PurificationServiceImpl.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.services.impl; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SpecimenServiceImpl.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.services.impl; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/StationServiceImpl.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.services.impl; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/TestBioServiceImpl.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.services.impl; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/CampagneNormalizer.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/CampagneNormalizer.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/CampagneNormalizer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils.normalizers; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/ConfigNameNormalizer.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/ConfigNameNormalizer.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/ConfigNameNormalizer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils.normalizers; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/EmailNormalizer.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/EmailNormalizer.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/EmailNormalizer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils.normalizers; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/ErreurTestNormalizer.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/ErreurTestNormalizer.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/ErreurTestNormalizer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils.normalizers; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/ExtractionNormalizer.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/ExtractionNormalizer.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/ExtractionNormalizer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils.normalizers; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/LotNormalizer.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/LotNormalizer.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/LotNormalizer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils.normalizers; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/MethodeExtractionNormalizer.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/MethodeExtractionNormalizer.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/MethodeExtractionNormalizer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils.normalizers; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/MethodePurificationNormalizer.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/MethodePurificationNormalizer.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/MethodePurificationNormalizer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils.normalizers; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/MethodeTestBioNormalizer.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/MethodeTestBioNormalizer.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/MethodeTestBioNormalizer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils.normalizers; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/PartieNormalizer.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/PartieNormalizer.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/PartieNormalizer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils.normalizers; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/PersonneNormalizer.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/PersonneNormalizer.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/PersonneNormalizer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils.normalizers; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/PurificationNormalizer.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/PurificationNormalizer.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/PurificationNormalizer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils.normalizers; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/SpecimenNormalizer.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/SpecimenNormalizer.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/SpecimenNormalizer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils.normalizers; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/StationNormalizer.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/StationNormalizer.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/StationNormalizer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils.normalizers; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/TestBioNormalizer.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/TestBioNormalizer.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/TestBioNormalizer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils.normalizers; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/TypeDocumentNormalizer.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/TypeDocumentNormalizer.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/TypeDocumentNormalizer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils.normalizers; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/UniqueFieldNormalizer.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/UniqueFieldNormalizer.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/UniqueFieldNormalizer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils.normalizers; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/utils/Normalize.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/utils/Normalize.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/utils/Normalize.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils.normalizers.utils; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/utils/Normalizer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils.normalizers.utils; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/utils/NormalizerAspect.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils.normalizers.utils; Modified: trunk/cantharella.service/src/main/resources/commons/serviceContext.xml =================================================================== --- trunk/cantharella.service/src/main/resources/commons/serviceContext.xml 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/resources/commons/serviceContext.xml 2012-11-26 18:13:04 UTC (rev 29) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" Modified: trunk/cantharella.service/src/main/resources/commons/service_en.properties =================================================================== --- trunk/cantharella.service/src/main/resources/commons/service_en.properties 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/resources/commons/service_en.properties 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +### +# #%L +# Cantharella :: Service +# $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% +### updatePassword.subject=Cantharella – New password updatePassword.text=Your password was regenerated : {0} Modified: trunk/cantharella.service/src/main/resources/commons/service_fr.properties =================================================================== --- trunk/cantharella.service/src/main/resources/commons/service_fr.properties 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/resources/commons/service_fr.properties 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +### +# #%L +# Cantharella :: Service +# $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% +### updatePassword.subject=Cantharella - Nouveau mot de passe updatePassword.text=Vote mot de passe Cantharella a été regénéré : {0} Modified: trunk/cantharella.service/src/main/resources/development/service.properties =================================================================== --- trunk/cantharella.service/src/main/resources/development/service.properties 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/resources/development/service.properties 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +### +# #%L +# Cantharella :: Service +# $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% +### mail.debug=true mail.from=no-reply(a)ird.fr mail.host=smtp.ird.nc Modified: trunk/cantharella.service/src/main/resources/integration/service.properties =================================================================== --- trunk/cantharella.service/src/main/resources/integration/service.properties 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/resources/integration/service.properties 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +### +# #%L +# Cantharella :: Service +# $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% +### mail.debug=true mail.from=no-reply(a)ird.fr mail.host=smtp.ird.nc Modified: trunk/cantharella.service/src/main/resources/production/service.properties =================================================================== --- trunk/cantharella.service/src/main/resources/production/service.properties 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/main/resources/production/service.properties 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +### +# #%L +# Cantharella :: Service +# $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% +### mail.debug=false mail.from=no-reply(a)ird.fr mail.host=smtp.ird.nc Modified: trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/AbstractServiceTest.java =================================================================== --- trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/AbstractServiceTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/AbstractServiceTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service; Modified: trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/ServiceContextTest.java =================================================================== --- trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/ServiceContextTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/ServiceContextTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service; Modified: trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/exceptions/ExcelImportException.java =================================================================== --- trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/exceptions/ExcelImportException.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/exceptions/ExcelImportException.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.exceptions; Modified: trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/services/PersonneServiceTest.java =================================================================== --- trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/services/PersonneServiceTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/services/PersonneServiceTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.services; Modified: trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/ExcelColumnStructure.java =================================================================== --- trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/ExcelColumnStructure.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/ExcelColumnStructure.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils; Modified: trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/ExcelColumnsReader.java =================================================================== --- trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/ExcelColumnsReader.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/ExcelColumnsReader.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils; Modified: trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/ExcelSheetStructure.java =================================================================== --- trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/ExcelSheetStructure.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/ExcelSheetStructure.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.service/src/test/java/nc/ird/cantharella/service/utils/PopulateDB.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Service + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.service.utils; Modified: trunk/cantharella.utils/LICENSE.txt =================================================================== --- trunk/cantharella.utils/LICENSE.txt 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/LICENSE.txt 2012-11-26 18:13:04 UTC (rev 29) @@ -1,5 +1,5 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies @@ -7,17 +7,15 @@ Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to +our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +software for all its users. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you @@ -26,45 +24,35 @@ want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - The precise terms and conditions for copying, distribution and modification follow. @@ -72,7 +60,7 @@ 0. Definitions. - "This License" refers to version 3 of the GNU General Public License. + "This License" refers to version 3 of the GNU Affero General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. @@ -549,35 +537,45 @@ the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - 13. Use with the GNU Affero General Public License. + 13. Remote Network Interaction; Use with the GNU General Public License. + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single +under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General +Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published +GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's +versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. @@ -635,40 +633,29 @@ Copyright (C) <year> <name of author> This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by + 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. + GNU Affero General Public License for more details. - You should have received a copy of the GNU General Public License + 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/>. Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<http://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Modified: trunk/cantharella.utils/pom.xml =================================================================== --- trunk/cantharella.utils/pom.xml 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/pom.xml 2012-11-26 18:13:04 UTC (rev 29) @@ -7,7 +7,7 @@ <parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.1-SNAPSHOT</version> </parent> <artifactId>cantharella.utils</artifactId> Modified: trunk/cantharella.utils/src/main/java/nc/ird/module/utils/AssertTools.java =================================================================== --- trunk/cantharella.utils/src/main/java/nc/ird/module/utils/AssertTools.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/main/java/nc/ird/module/utils/AssertTools.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/main/java/nc/ird/module/utils/BeanLookup.java =================================================================== --- trunk/cantharella.utils/src/main/java/nc/ird/module/utils/BeanLookup.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/main/java/nc/ird/module/utils/BeanLookup.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/main/java/nc/ird/module/utils/BeanTools.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/main/java/nc/ird/module/utils/CaptchaTools.java =================================================================== --- trunk/cantharella.utils/src/main/java/nc/ird/module/utils/CaptchaTools.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/main/java/nc/ird/module/utils/CaptchaTools.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/main/java/nc/ird/module/utils/CollectionTools.java =================================================================== --- trunk/cantharella.utils/src/main/java/nc/ird/module/utils/CollectionTools.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/main/java/nc/ird/module/utils/CollectionTools.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/main/java/nc/ird/module/utils/CoordTools.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/main/java/nc/ird/module/utils/GenerateCsv.java =================================================================== --- trunk/cantharella.utils/src/main/java/nc/ird/module/utils/GenerateCsv.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/main/java/nc/ird/module/utils/GenerateCsv.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,20 +1,26 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; +package nc.ird.module.utils; import java.io.ByteArrayOutputStream; import java.io.IOException; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/main/java/nc/ird/module/utils/GenericsTools.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/main/java/nc/ird/module/utils/IntuitiveStringComparator.java =================================================================== --- trunk/cantharella.utils/src/main/java/nc/ird/module/utils/IntuitiveStringComparator.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/main/java/nc/ird/module/utils/IntuitiveStringComparator.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/main/java/nc/ird/module/utils/LogTools.java =================================================================== --- trunk/cantharella.utils/src/main/java/nc/ird/module/utils/LogTools.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/main/java/nc/ird/module/utils/LogTools.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/main/java/nc/ird/module/utils/NumberTools.java =================================================================== --- trunk/cantharella.utils/src/main/java/nc/ird/module/utils/NumberTools.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/main/java/nc/ird/module/utils/NumberTools.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/main/java/nc/ird/module/utils/Pair.java =================================================================== --- trunk/cantharella.utils/src/main/java/nc/ird/module/utils/Pair.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/main/java/nc/ird/module/utils/Pair.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/main/java/nc/ird/module/utils/PasswordTools.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/main/java/nc/ird/module/utils/StringTools.java =================================================================== --- trunk/cantharella.utils/src/main/java/nc/ird/module/utils/StringTools.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/main/java/nc/ird/module/utils/StringTools.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/main/java/nc/ird/module/utils/StringTransformer.java =================================================================== --- trunk/cantharella.utils/src/main/java/nc/ird/module/utils/StringTransformer.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/main/java/nc/ird/module/utils/StringTransformer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/test/java/nc/ird/module/utils/AssertToolsTest.java =================================================================== --- trunk/cantharella.utils/src/test/java/nc/ird/module/utils/AssertToolsTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/test/java/nc/ird/module/utils/AssertToolsTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/test/java/nc/ird/module/utils/BeanLookupTest.java =================================================================== --- trunk/cantharella.utils/src/test/java/nc/ird/module/utils/BeanLookupTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/test/java/nc/ird/module/utils/BeanLookupTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/test/java/nc/ird/module/utils/BeanToolsTest.java =================================================================== --- trunk/cantharella.utils/src/test/java/nc/ird/module/utils/BeanToolsTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/test/java/nc/ird/module/utils/BeanToolsTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/test/java/nc/ird/module/utils/CaptchaToolsTest.java =================================================================== --- trunk/cantharella.utils/src/test/java/nc/ird/module/utils/CaptchaToolsTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/test/java/nc/ird/module/utils/CaptchaToolsTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/test/java/nc/ird/module/utils/CollectionToolsTest.java =================================================================== --- trunk/cantharella.utils/src/test/java/nc/ird/module/utils/CollectionToolsTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/test/java/nc/ird/module/utils/CollectionToolsTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/test/java/nc/ird/module/utils/CoordToolsTest.java =================================================================== --- trunk/cantharella.utils/src/test/java/nc/ird/module/utils/CoordToolsTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/test/java/nc/ird/module/utils/CoordToolsTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/test/java/nc/ird/module/utils/GenericsToolsTest.java =================================================================== --- trunk/cantharella.utils/src/test/java/nc/ird/module/utils/GenericsToolsTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/test/java/nc/ird/module/utils/GenericsToolsTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/test/java/nc/ird/module/utils/LogToolsTest.java =================================================================== --- trunk/cantharella.utils/src/test/java/nc/ird/module/utils/LogToolsTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/test/java/nc/ird/module/utils/LogToolsTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/test/java/nc/ird/module/utils/NumberToolsTest.java =================================================================== --- trunk/cantharella.utils/src/test/java/nc/ird/module/utils/NumberToolsTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/test/java/nc/ird/module/utils/NumberToolsTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/test/java/nc/ird/module/utils/PairTest.java =================================================================== --- trunk/cantharella.utils/src/test/java/nc/ird/module/utils/PairTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/test/java/nc/ird/module/utils/PairTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/test/java/nc/ird/module/utils/PasswordToolsTest.java =================================================================== --- trunk/cantharella.utils/src/test/java/nc/ird/module/utils/PasswordToolsTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/test/java/nc/ird/module/utils/PasswordToolsTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/test/java/nc/ird/module/utils/StringToolsTest.java =================================================================== --- trunk/cantharella.utils/src/test/java/nc/ird/module/utils/StringToolsTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/test/java/nc/ird/module/utils/StringToolsTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.utils/src/test/java/nc/ird/module/utils/StringTransformerTest.java =================================================================== --- trunk/cantharella.utils/src/test/java/nc/ird/module/utils/StringTransformerTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.utils/src/test/java/nc/ird/module/utils/StringTransformerTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * 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; Modified: trunk/cantharella.web/LICENSE.txt =================================================================== --- trunk/cantharella.web/LICENSE.txt 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/LICENSE.txt 2012-11-26 18:13:04 UTC (rev 29) @@ -1,5 +1,5 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies @@ -7,17 +7,15 @@ Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to +our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +software for all its users. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you @@ -26,45 +24,35 @@ want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - The precise terms and conditions for copying, distribution and modification follow. @@ -72,7 +60,7 @@ 0. Definitions. - "This License" refers to version 3 of the GNU General Public License. + "This License" refers to version 3 of the GNU Affero General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. @@ -549,35 +537,45 @@ the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - 13. Use with the GNU Affero General Public License. + 13. Remote Network Interaction; Use with the GNU General Public License. + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single +under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General +Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published +GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's +versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. @@ -635,40 +633,29 @@ Copyright (C) <year> <name of author> This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by + 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. + GNU Affero General Public License for more details. - You should have received a copy of the GNU General Public License + 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/>. Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<http://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Modified: trunk/cantharella.web/pom.xml =================================================================== --- trunk/cantharella.web/pom.xml 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/pom.xml 2012-11-26 18:13:04 UTC (rev 29) @@ -7,7 +7,7 @@ <parent> <artifactId>cantharella</artifactId> <groupId>nc.ird</groupId> - <version>1.0.2-SNAPSHOT</version> + <version>1.1-SNAPSHOT</version> </parent> <artifactId>cantharella.web</artifactId> Added: trunk/cantharella.web/src/license/THIRD-PARTY.properties =================================================================== --- trunk/cantharella.web/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/cantharella.web/src/license/THIRD-PARTY.properties 2012-11-26 18:13:04 UTC (rev 29) @@ -0,0 +1,41 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Affero General Public License (AGPL) +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - Eclipse Public License - v 1.0 +# - ICU License +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Java Transaction API (JTA) License +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - Public Domain +# - The Apache Software License, Version 2.0 +# - license.txt +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Nov 26 18:10:35 CET 2012 +antlr--antlr--2.7.6=BSD License +asm--asm--3.1=Copyright (c) 2000-2011 INRIA, France Telecom +dom4j--dom4j--1.6.1=BSD License +javassist--javassist--3.8.0.GA=The Apache Software License, Version 2.0 +javax.servlet--servlet-api--2.5=License Agreement for Java(TM) Servlet API Specification Interface Classes +javax.transaction--jta--1.1=Java Transaction API (JTA) License +net.sf.jsr107cache--jsr107cache--1.0=The Apache Software License, Version 2.0 +org.springframework--spring-aop--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-asm--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-beans--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-context--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-context-support--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-core--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-expression--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-jdbc--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-orm--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-test--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-tx--3.1.0.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-web--3.1.0.RELEASE=The Apache Software License, Version 2.0 Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebApplicationImpl.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebApplicationImpl.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebApplicationImpl.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,20 +1,26 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ -package nc.ird.cantharella.web.config; +package nc.ird.cantharella.web.config; import java.math.BigDecimal; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebContext.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebContext.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebContext.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.config; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/ContactPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/ContactPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/ContactPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/ContactPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/ContactPage.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/ContactPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,20 +1,26 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ -package nc.ird.cantharella.web.pages; +package nc.ird.cantharella.web.pages; import java.text.MessageFormat; import java.util.List; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/SandboxPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/SandboxPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/SandboxPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> <head> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/SandboxPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd" wicket:message="lang:TemplatePage.Lang"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/columns/LinkProduitPropertyColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/columns/LinkProduitPropertyColumn.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/columns/LinkProduitPropertyColumn.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.columns; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/columns/TaxonomyPropertyColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/columns/TaxonomyPropertyColumn.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/columns/TaxonomyPropertyColumn.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.columns; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ListCampagnesPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ListCampagnesPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ListCampagnesPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ListCampagnesPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ListCampagnesPage.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ListCampagnesPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.campagne; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.campagne; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ReadCampagnePage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ReadCampagnePage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ReadCampagnePage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ReadCampagnePage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.campagne; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ListConfigurationPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ListConfigurationPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ListConfigurationPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ListConfigurationPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.config; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageErreurTestBioPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageErreurTestBioPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageErreurTestBioPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageErreurTestBioPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.config; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeExtractionPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeExtractionPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeExtractionPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeExtractionPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.config; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodePurificationPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodePurificationPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodePurificationPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodePurificationPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.config; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeTestBioPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeTestBioPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeTestBioPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeTestBioPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.config; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManagePartiePage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManagePartiePage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManagePartiePage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManagePartiePage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.config; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListErreurTestBioPanel.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListErreurTestBioPanel.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListErreurTestBioPanel.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListErreurTestBioPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListErreurTestBioPanel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListErreurTestBioPanel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,21 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. - */ -/** + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.config.panels; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeExtractionPanel.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeExtractionPanel.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeExtractionPanel.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeExtractionPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeExtractionPanel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeExtractionPanel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.config.panels; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodePurificationPanel.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodePurificationPanel.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodePurificationPanel.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodePurificationPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodePurificationPanel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodePurificationPanel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.config.panels; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeTestBioPanel.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeTestBioPanel.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeTestBioPanel.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeTestBioPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeTestBioPanel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeTestBioPanel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,21 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. - */ -/** + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.config.panels; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListPartiePanel.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListPartiePanel.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListPartiePanel.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListPartiePanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListPartiePanel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListPartiePanel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,21 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. - */ -/** + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.config.panels; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ListExtractionsPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ListExtractionsPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ListExtractionsPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ListExtractionsPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ListExtractionsPage.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ListExtractionsPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.extraction; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ManageExtractionPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ManageExtractionPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ManageExtractionPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ManageExtractionPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.extraction; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ReadExtractionPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ReadExtractionPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ReadExtractionPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ReadExtractionPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.extraction; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ListLotsPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ListLotsPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ListLotsPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ListLotsPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ListLotsPage.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ListLotsPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.lot; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ManageLotPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ManageLotPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ManageLotPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ManageLotPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.lot; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.lot; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ListPersonnesPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ListPersonnesPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ListPersonnesPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ListPersonnesPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.personne; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ManagePersonnePage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ManagePersonnePage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ManagePersonnePage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ManagePersonnePage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.personne; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ReadPersonnePage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ReadPersonnePage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ReadPersonnePage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ReadPersonnePage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.personne; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/panels/ManagePersonnePanel.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/panels/ManagePersonnePanel.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/panels/ManagePersonnePanel.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/panels/ManagePersonnePanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/panels/ManagePersonnePanel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/panels/ManagePersonnePanel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.personne.panels; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/panels/ReadPersonnePanel.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/panels/ReadPersonnePanel.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/panels/ReadPersonnePanel.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/panels/ReadPersonnePanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/panels/ReadPersonnePanel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/panels/ReadPersonnePanel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.personne.panels; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ListPurificationsPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ListPurificationsPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ListPurificationsPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ListPurificationsPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.purification; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ManagePurificationPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ManagePurificationPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ManagePurificationPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ManagePurificationPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.purification; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ReadPurificationPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ReadPurificationPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ReadPurificationPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ReadPurificationPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.purification; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ListSpecimensPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ListSpecimensPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ListSpecimensPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ListSpecimensPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ListSpecimensPage.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ListSpecimensPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.specimen; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ManageSpecimenPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ManageSpecimenPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ManageSpecimenPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ManageSpecimenPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.specimen; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ReadSpecimenPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ReadSpecimenPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ReadSpecimenPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ReadSpecimenPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.specimen; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ListStationsPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ListStationsPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ListStationsPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ListStationsPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ListStationsPage.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ListStationsPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.station; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ManageStationPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ManageStationPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ManageStationPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ManageStationPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.station; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ReadStationPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ReadStationPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ReadStationPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ReadStationPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.station; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ListTestsBioPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ListTestsBioPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ListTestsBioPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ListTestsBioPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ListTestsBioPage.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ListTestsBioPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.testBio; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ManageTestBioPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ManageTestBioPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ManageTestBioPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ManageTestBioPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.testBio; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ReadTestBioPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ReadTestBioPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ReadTestBioPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ReadTestBioPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.testBio; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ManageUtilisateurPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ManageUtilisateurPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ManageUtilisateurPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> <body> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ManageUtilisateurPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.utilisateur; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ReadUtilisateurPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ReadUtilisateurPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ReadUtilisateurPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ReadUtilisateurPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.utilisateur; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/RegisterPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/RegisterPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/RegisterPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/RegisterPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/RegisterPage.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/RegisterPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.utilisateur; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ResetPasswordPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ResetPasswordPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ResetPasswordPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ResetPasswordPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ResetPasswordPage.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ResetPasswordPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.utilisateur; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/UpdateUtilisateurPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/UpdateUtilisateurPage.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/UpdateUtilisateurPage.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/UpdateUtilisateurPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/UpdateUtilisateurPage.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/UpdateUtilisateurPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.utilisateur; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/panels/ReadDroitsUtilisateurPanel.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/panels/ReadDroitsUtilisateurPanel.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/panels/ReadDroitsUtilisateurPanel.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/panels/ReadDroitsUtilisateurPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/panels/ReadDroitsUtilisateurPanel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/panels/ReadDroitsUtilisateurPanel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.domain.utilisateur.panels; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/errors/AccessDeniedPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/errors/AccessDeniedPage.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/errors/AccessDeniedPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.errors; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/errors/ErrorPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/errors/ErrorPage.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/errors/ErrorPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.errors; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/errors/InternalErrorPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/errors/InternalErrorPage.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/errors/InternalErrorPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.errors; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/errors/PageExpiredErrorPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/errors/PageExpiredErrorPage.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/errors/PageExpiredErrorPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.errors; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/CaptchaModel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/CaptchaModel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/CaptchaModel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.model; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/ContactModel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/ContactModel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/ContactModel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.model; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/LoginModel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/LoginModel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/LoginModel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.model; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/ManageCampagneModel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/ManageCampagneModel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/ManageCampagneModel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.model; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/ManageStationModel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/ManageStationModel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/ManageStationModel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.model; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/ManageUtilisateurModel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/ManageUtilisateurModel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/ManageUtilisateurModel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.model; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/RegisterModel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/RegisterModel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/RegisterModel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.model; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/UpdateUtilisateurModel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/UpdateUtilisateurModel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/model/UpdateUtilisateurModel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.model; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/renderers/PersonneRenderer.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/renderers/PersonneRenderer.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/renderers/PersonneRenderer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.pages.renderers; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/CallerPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/CallerPage.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/CallerPage.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/JSConfirmationBehavior.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/JSConfirmationBehavior.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/JSConfirmationBehavior.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.behaviors; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/ReplaceEmptyLabelBehavior.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/ReplaceEmptyLabelBehavior.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/ReplaceEmptyLabelBehavior.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.behaviors; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/BooleanPropertyColumn.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.columns; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/DecimalPropertyColumn.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.columns; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/EnumPropertyColumn.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.columns; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkPropertyColumn$LinkPanel.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkPropertyColumn$LinkPanel.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkPropertyColumn$LinkPanel.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkPropertyColumn.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.columns; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkableImagePropertyColumn$LinkableImagePanel.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkableImagePropertyColumn$LinkableImagePanel.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkableImagePropertyColumn$LinkableImagePanel.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkableImagePropertyColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkableImagePropertyColumn.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkableImagePropertyColumn.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.columns; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/MapValuePropertyColumn.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.columns; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/PercentPropertyColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/PercentPropertyColumn.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/PercentPropertyColumn.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.columns; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ShortDatePropertyColumn.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.columns; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/converters/BigDecimalConverterImpl.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.converters; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/converters/DoubleConverterImpl.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.converters; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/forms/AutoCompleteTextFieldString.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/forms/AutoCompleteTextFieldString.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/forms/AutoCompleteTextFieldString.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.forms; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/forms/SubmittableButton.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.forms; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/forms/SubmittableButtonEvents.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/forms/SubmittableButtonEvents.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/forms/SubmittableButtonEvents.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.forms; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayBooleanPropertyModel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayBooleanPropertyModel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayBooleanPropertyModel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.models; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayDecimalPropertyModel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayDecimalPropertyModel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayDecimalPropertyModel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.models; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayEnumPropertyModel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayEnumPropertyModel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayEnumPropertyModel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.models; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayMapValuePropertyModel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayMapValuePropertyModel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayMapValuePropertyModel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.models; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayPercentPropertyModel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayPercentPropertyModel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayPercentPropertyModel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.models; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayShortDatePropertyModel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayShortDatePropertyModel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/DisplayShortDatePropertyModel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.models; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/GenericLoadableDetachableModel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.models; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/LoadableDetachableSortableListDataProvider.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.models; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/CollapsiblePanel.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/CollapsiblePanel.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/CollapsiblePanel.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/CollapsiblePanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/CollapsiblePanel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/CollapsiblePanel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.panels; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkPanel.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkPanel.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkPanel.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkPanel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkPanel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.panels; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkProduitPanel.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkProduitPanel.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkProduitPanel.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkProduitPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkProduitPanel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkProduitPanel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,21 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. - */ -/** + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.panels; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/SimpleTooltipPanel.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/SimpleTooltipPanel.html 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/SimpleTooltipPanel.html 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/SimpleTooltipPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/SimpleTooltipPanel.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/SimpleTooltipPanel.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,21 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. - */ -/** + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.panels; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/renderers/EnumChoiceRenderer.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/renderers/EnumChoiceRenderer.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/renderers/EnumChoiceRenderer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.renderers; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/renderers/MapChoiceRenderer.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/renderers/MapChoiceRenderer.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/renderers/MapChoiceRenderer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.renderers; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/resources/WebMessages.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/resources/WebMessages.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/resources/WebMessages.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.resources; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthContainer.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthContainer.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthContainer.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.security; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthRole.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthRole.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthRole.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.security; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthRoles.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthRoles.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthRoles.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.security; 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 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthSession.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.security; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthStrategy.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthStrategy.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthStrategy.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web.utils.security; Modified: trunk/cantharella.web/src/main/resources/commons/webContext.xml =================================================================== --- trunk/cantharella.web/src/main/resources/commons/webContext.xml 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/resources/commons/webContext.xml 2012-11-26 18:13:04 UTC (rev 29) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" Modified: trunk/cantharella.web/src/main/resources/commons/web_en.properties =================================================================== --- trunk/cantharella.web/src/main/resources/commons/web_en.properties 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/resources/commons/web_en.properties 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +### +# #%L +# Cantharella :: Web +# $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% +### #Header & footer TemplatePage.Subtitle=Pharmacochemical database of natural substances TemplatePage.Copyright=All rights reserved Modified: trunk/cantharella.web/src/main/resources/commons/web_fr.properties =================================================================== --- trunk/cantharella.web/src/main/resources/commons/web_fr.properties 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/resources/commons/web_fr.properties 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +### +# #%L +# Cantharella :: Web +# $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% +### #Header & footer TemplatePage.Subtitle=Base de données pharmacochimique des substances naturelles TemplatePage.Copyright=Tous droits réservés Modified: trunk/cantharella.web/src/main/resources/development/web.properties =================================================================== --- trunk/cantharella.web/src/main/resources/development/web.properties 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/resources/development/web.properties 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +### +# #%L +# Cantharella :: Web +# $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% +### app.debug=true app.optimize=false wicket.configuration=development \ No newline at end of file Modified: trunk/cantharella.web/src/main/resources/integration/web.properties =================================================================== --- trunk/cantharella.web/src/main/resources/integration/web.properties 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/resources/integration/web.properties 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +### +# #%L +# Cantharella :: Web +# $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% +### app.debug=true app.optimize=true wicket.configuration=deployment \ No newline at end of file Modified: trunk/cantharella.web/src/main/resources/production/web.properties =================================================================== --- trunk/cantharella.web/src/main/resources/production/web.properties 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/resources/production/web.properties 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +### +# #%L +# Cantharella :: Web +# $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% +### app.debug=false app.optimize=true wicket.configuration=deployment \ No newline at end of file Modified: trunk/cantharella.web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/cantharella.web/src/main/webapp/WEB-INF/web.xml 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/webapp/WEB-INF/web.xml 2012-11-26 18:13:04 UTC (rev 29) @@ -1,4 +1,27 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> + + <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> Modified: trunk/cantharella.web/src/main/webapp/css/general.css =================================================================== --- trunk/cantharella.web/src/main/webapp/css/general.css 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/webapp/css/general.css 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +/* + * #%L + * Cantharella :: Web + * $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% + */ /* CSS Document */ body{ Modified: trunk/cantharella.web/src/main/webapp/css/menu_en.css =================================================================== --- trunk/cantharella.web/src/main/webapp/css/menu_en.css 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/webapp/css/menu_en.css 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +/* + * #%L + * Cantharella :: Web + * $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% + */ .ech{ background:url(../images/bkg_ech_en.png) no-repeat top left; } Modified: trunk/cantharella.web/src/main/webapp/css/menu_fr.css =================================================================== --- trunk/cantharella.web/src/main/webapp/css/menu_fr.css 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/webapp/css/menu_fr.css 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +/* + * #%L + * Cantharella :: Web + * $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% + */ .ech{ background:url(../images/bkg_ech_fr.png) no-repeat top left; } Modified: trunk/cantharella.web/src/main/webapp/js/slidemenu.js =================================================================== --- trunk/cantharella.web/src/main/webapp/js/slidemenu.js 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/main/webapp/js/slidemenu.js 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +/* + * #%L + * Cantharella :: Web + * $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% + */ var slideMenu=function(){ var sp,st,t,m,sa,l,w,sw,ot; return{ Modified: trunk/cantharella.web/src/test/java/nc/ird/cantharella/web/AbstractWebTest.java =================================================================== --- trunk/cantharella.web/src/test/java/nc/ird/cantharella/web/AbstractWebTest.java 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/cantharella.web/src/test/java/nc/ird/cantharella/web/AbstractWebTest.java 2012-11-26 18:13:04 UTC (rev 29) @@ -1,18 +1,24 @@ /* - * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * #%L + * Cantharella :: Web + * $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. * - * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - * - * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * Cantharella 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 General Public License along with Cantharella. If not, see - * <http://www.gnu.org/licenses/>. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package nc.ird.cantharella.web; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/pom.xml 2012-11-26 18:13:04 UTC (rev 29) @@ -5,16 +5,16 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.3</version> + <version>3.4.4</version> </parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Cantharella</name> <description>Pharmacochemical database of natural substances</description> - <inceptionYear>2012</inceptionYear> + <inceptionYear>2009</inceptionYear> <url>http://maven-site.forge.codelutin.com/cantharella</url> <organization> @@ -83,7 +83,7 @@ </site> </distributionManagement> - <repositories> +  <modules> <module>cantharella.utils</module> @@ -130,6 +130,8 @@ </license.organizationName> <license.licenseName>agpl_v3</license.licenseName> + <skipTests>true</skipTests> + <commonsBeanutilsVersion>1.8.2</commonsBeanutilsVersion> <version.commons-codec>1.4</version.commons-codec> <commonsIoVersion>1.3.2</commonsIoVersion> @@ -210,6 +212,17 @@ </excludes> </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java16-sun</artifactId> + <version>1.10</version> + </signature> + </configuration> + </plugin> </plugins> </pluginManagement> Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-11-26 16:34:55 UTC (rev 28) +++ trunk/src/site/rst/index.rst 2012-11-26 18:13:04 UTC (rev 29) @@ -1,3 +1,25 @@ +.. - +.. * #%L +.. * Cantharella +.. * $Id:$ +.. * $HeadURL:$ +.. * %% +.. * Copyright (C) 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% +.. - Description =========== Modified: trunk/src/site/site_en.xml =================================================================== (Binary files differ)

1 0

r28 - in trunk: . cantharella.data cantharella.service cantharella.utils cantharella.web
by echatellier＠users.forge.codelutin.com 26 Nov '12

26 Nov '12

Author: echatellier Date: 2012-11-26 17:34:55 +0100 (Mon, 26 Nov 2012) New Revision: 28 Url: http://forge.codelutin.com/repositories/revision/cantharella/28 Log: fix svn:ignore Modified: trunk/ trunk/cantharella.data/ trunk/cantharella.service/ trunk/cantharella.utils/ trunk/cantharella.web/ Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target *.ipr *.iws *.iml .idea .classpath .project + target *.ipr *.iws *.iml .idea .classpath .project .settings Property changes on: trunk/cantharella.data ___________________________________________________________________ Modified: svn:ignore - target *.ipr *.iws *.iml .idea .classpath .project .apt_generated + target *.ipr *.iws *.iml .idea .classpath .project .apt_generated .settings Property changes on: trunk/cantharella.service ___________________________________________________________________ Modified: svn:ignore - target *.ipr *.iws *.iml .idea .classpath .project .apt_generated + target *.ipr *.iws *.iml .idea .classpath .project .apt_generated .settings Property changes on: trunk/cantharella.utils ___________________________________________________________________ Modified: svn:ignore - target *.ipr *.iws *.iml .idea .classpath .project + target *.ipr *.iws *.iml .idea .classpath .project .settings Property changes on: trunk/cantharella.web ___________________________________________________________________ Modified: svn:ignore - .apt_generated target *.ipr *.iws *.iml .idea .classpath .project + .apt_generated target *.ipr *.iws *.iml .idea .classpath .project .settings

1 0

r27 - in trunk: . src src/resources src/resources/images src/site src/site/rst
by bpoussin＠users.forge.codelutin.com 23 Nov '12

23 Nov '12

Author: bpoussin Date: 2012-11-23 17:54:05 +0100 (Fri, 23 Nov 2012) New Revision: 27 Url: http://forge.codelutin.com/repositories/revision/cantharella/27 Log: add file for web site presentation Added: trunk/src/ trunk/src/resources/ trunk/src/resources/images/ trunk/src/resources/images/Extraction.png trunk/src/resources/images/Home.png trunk/src/resources/images/Station.png trunk/src/site/ trunk/src/site/rst/ trunk/src/site/rst/index.rst trunk/src/site/site_en.xml Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-16 05:13:26 UTC (rev 26) +++ trunk/pom.xml 2012-11-23 16:54:05 UTC (rev 27) @@ -176,7 +176,21 @@ <pluginManagement> <plugins> + +  <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrstPluginVersion}</version> + </dependency> + </dependencies> + </plugin> + + + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>hibernate3-maven-plugin</artifactId> <version>${version.hibernate3-maven-plugin}</version> Added: trunk/src/resources/images/Extraction.png =================================================================== (Binary files differ) Property changes on: trunk/src/resources/images/Extraction.png ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: trunk/src/resources/images/Home.png =================================================================== (Binary files differ) Property changes on: trunk/src/resources/images/Home.png ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: trunk/src/resources/images/Station.png =================================================================== (Binary files differ) Property changes on: trunk/src/resources/images/Station.png ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst (rev 0) +++ trunk/src/site/rst/index.rst 2012-11-23 16:54:05 UTC (rev 27) @@ -0,0 +1,20 @@ +Description +=========== + +The information system (IS) “Cantharella: Pharmacochemical database of natural +substances” share and sustain pharmacochemical data of all organisms collected +for the study of their natural substances, with a controlled access via +internet. + +.. image: images/Home.png +.. image: images/Station.png +.. image: images/Extraction.png + +Features +======== + +- Collaborative work between spatially disparate people +- Secure access and "compartmentalized” according to data access rights +- Traceability of the chemical process leading to the active compounds +- Capitalization of data and related documents (to be developed) +- Interoperability with other IS (to be developed) Added: trunk/src/site/site_en.xml =================================================================== (Binary files differ) Property changes on: trunk/src/site/site_en.xml ___________________________________________________________________ Added: svn:mime-type + application/xml

1 0

r26 - in trunk: cantharella.data/src/main/java/nc/ird/cantharella/data/model cantharella.service/src/main/java/nc/ird/cantharella/service/services cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers
by acheype＠users.forge.codelutin.com 16 Nov '12

16 Nov '12

Author: acheype Date: 2012-11-16 06:13:26 +0100 (Fri, 16 Nov 2012) New Revision: 26 Url: http://forge.codelutin.com/repositories/revision/cantharella/26 Log: Add TypeDocument class in the DAO and service layers Added: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TypeDocument.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/DocumentService.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/DocumentServiceImpl.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/TypeDocumentNormalizer.java Added: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TypeDocument.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TypeDocument.java (rev 0) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TypeDocument.java 2012-11-16 05:13:26 UTC (rev 26) @@ -0,0 +1,170 @@ +/* + * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * + * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) + * + * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any + * later version. + * + * Cantharella 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 General Public License along with Cantharella. If not, see + * <http://www.gnu.org/licenses/>. + */ +package nc.ird.cantharella.data.model; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Lob; +import javax.persistence.Table; +import javax.persistence.UniqueConstraint; +import javax.validation.constraints.NotNull; + +import nc.ird.cantharella.data.model.utils.AbstractModel; + +import org.apache.commons.beanutils.BeanComparator; +import org.hibernate.validator.constraints.Length; +import org.hibernate.validator.constraints.NotEmpty; + +/** + * Model : Document type + * @author Adrien Cheype + */ +@Entity +@Table(uniqueConstraints = { @UniqueConstraint(columnNames = { "nom" }) }) +public class TypeDocument extends AbstractModel implements Cloneable, Comparable<TypeDocument> { + + /** Document type ID */ + @Id + @GeneratedValue + private Integer idTypeDocument; + + /** Document type name */ + @Length(max = LENGTH_MEDIUM_TEXT) + @NotEmpty + @Column(unique = true) + private String nom; + + /** Document type domain */ + @Length(max = LENGTH_MEDIUM_TEXT) + private String domaine; + + /** Document type description */ + @NotEmpty + @Lob + private String description; + + /** If the type document represents an image ? */ + @NotNull + private Boolean estImage; + + /** {@inheritDoc} */ + @Override + public TypeDocument clone() throws CloneNotSupportedException { + TypeDocument clone = (TypeDocument) super.clone(); + clone.idTypeDocument = idTypeDocument; + clone.nom = nom; + clone.domaine = domaine; + clone.description = description; + clone.estImage = estImage; + return clone; + } + + /** {@inheritDoc} */ + @Override + public String toString() { + return this.nom; + } + + /** {@inheritDoc} */ + @Override + public int compareTo(TypeDocument typeExtrait) { + return new BeanComparator("nom").compare(this, typeExtrait); + } + + /** + * idTypeDocument getter + * @return idTypeDocument + */ + public Integer getIdTypeDocument() { + return idTypeDocument; + } + + /** + * idTypeDocument setter + * @param idTypeDocument idTypeDocument + */ + public void setIdTypeDocument(Integer idTypeDocument) { + this.idTypeDocument = idTypeDocument; + } + + /** + * nom getter + * @return nom + */ + public String getNom() { + return nom; + } + + /** + * nom setter + * @param nom nom + */ + public void setNom(String nom) { + this.nom = nom; + } + + /** + * domaine getter + * @return domaine + */ + public String getDomaine() { + return domaine; + } + + /** + * domaine setter + * @param domaine domaine + */ + public void setDomaine(String domaine) { + this.domaine = domaine; + } + + /** + * description getter + * @return description + */ + public String getDescription() { + return description; + } + + /** + * description setter + * @param description description + */ + public void setDescription(String description) { + this.description = description; + } + + /** + * estImage getter + * @return estImage + */ + public Boolean getEstImage() { + return estImage; + } + + /** + * estImage setter + * @param estImage estImage + */ + public void setEstImage(Boolean estImage) { + this.estImage = estImage; + } + +} Property changes on: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TypeDocument.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: 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 (rev 0) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/DocumentService.java 2012-11-16 05:13:26 UTC (rev 26) @@ -0,0 +1,77 @@ +/* + * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ Copyright (C) + * 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) Cantharella is free + * software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Cantharella 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 General Public License along with Cantharella. If not, see + * <http://www.gnu.org/licenses/>. + */ +package nc.ird.cantharella.service.services; + +import java.util.List; + +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; +import nc.ird.cantharella.service.utils.normalizers.utils.Normalize; + +import org.springframework.transaction.annotation.Transactional; + +/** + * Services for documents + * @author Adrien Cheype + */ +public interface DocumentService { + + /** + * List the document types available + * @return The list of document types + */ + @Transactional(readOnly = true) + List<TypeDocument> listTypeDocuments(); + + /** + * Create a document type + * @param typeDocument The document type to create + * @throws DataConstraintException If the document type already exists (unique constraints) + */ + void createTypeDocument((a)Normalize(TypeDocumentNormalizer.class) TypeDocument typeDocument) + throws DataConstraintException; + + /** + * Load a document type + * @param idTypeDocument ID + * @return The corresponding document type + * @throws DataNotFoundException If not found + */ + TypeDocument loadTypeDocument(Integer idTypeDocument) throws DataNotFoundException; + + /** + * Charger a document type + * @param nom The document type name + * @return The corresponding document type + * @throws DataNotFoundException If not found + */ + TypeDocument loadTypeDocument((a)Normalize(UniqueFieldNormalizer.class) String nom) throws DataNotFoundException; + + /** + * Modify a document type + * @param typeDocument The document type to modify + * @throws DataConstraintException If an unique constraint is broken with another document type + */ + void updateTypeDocument((a)Normalize(TypeDocumentNormalizer.class) TypeDocument typeDocument) + throws DataConstraintException; + + /** + * Delete a document type + * @param typeDocument The document type to delete + * @throws DataConstraintException If the document type has linked data + */ + void deleteTypeDocument(TypeDocument typeDocument) throws DataConstraintException; + +} Property changes on: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/DocumentService.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: 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 (rev 0) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/DocumentServiceImpl.java 2012-11-16 05:13:26 UTC (rev 26) @@ -0,0 +1,98 @@ +/* + * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * + * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) + * + * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any + * later version. + * + * Cantharella 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 General Public License along with Cantharella. If not, see + * <http://www.gnu.org/licenses/>. + */ +package nc.ird.cantharella.service.services.impl; + +import java.util.List; + +import nc.ird.cantharella.data.dao.GenericDao; +import nc.ird.cantharella.data.exceptions.DataConstraintException; +import nc.ird.cantharella.data.exceptions.DataNotFoundException; +import nc.ird.cantharella.data.exceptions.UnexpectedException; +import nc.ird.cantharella.data.model.Partie; +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.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * Document service implementation + * @author Adrien Cheype + */ +@Service +public final class DocumentServiceImpl implements DocumentService { + + /** Logger */ + private static final Log LOG = LogTools.getLog(); + + /** DAO */ + @Autowired + private GenericDao dao; + + /** {@inheritDoc} */ + @Override + public List<TypeDocument> listTypeDocuments() { + return dao.readList(TypeDocument.class, "nom"); + } + + /** {@inheritDoc} */ + @Override + public void createTypeDocument(TypeDocument typeDocument) throws DataConstraintException { + LOG.info("createTypeDocument: " + typeDocument.getNom()); + dao.create(typeDocument); + } + + /** {@inheritDoc} */ + @Override + public TypeDocument loadTypeDocument(Integer idTypeDocument) throws DataNotFoundException { + return dao.read(TypeDocument.class, idTypeDocument); + } + + /** {@inheritDoc} */ + @Override + public TypeDocument loadTypeDocument(String nom) throws DataNotFoundException { + return dao.read(TypeDocument.class, "nom", nom); + } + + /** {@inheritDoc} */ + @Override + public void updateTypeDocument(TypeDocument typeDocument) throws DataConstraintException { + LOG.info("updateTypeDocument: " + typeDocument.getNom()); + try { + dao.update(typeDocument); + } catch (DataNotFoundException e) { + LOG.error(e.getMessage(), e); + throw new UnexpectedException(e); + } + } + + /** {@inheritDoc} */ + @Override + public void deleteTypeDocument(TypeDocument typeDocument) throws DataConstraintException { + AssertTools.assertNotNull(typeDocument); + LOG.info("deleteTypeDocument: " + typeDocument.getNom()); + try { + dao.delete(typeDocument); + } catch (DataNotFoundException e) { + LOG.error(e.getMessage(), e); + throw new UnexpectedException(e); + } + } +} Property changes on: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/DocumentServiceImpl.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/TypeDocumentNormalizer.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/TypeDocumentNormalizer.java (rev 0) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/TypeDocumentNormalizer.java 2012-11-16 05:13:26 UTC (rev 26) @@ -0,0 +1,37 @@ +/* + * Cantharella, Pharmacochemical database of natural substances - http://sourceforge.net/p/cantharella/ + * + * Copyright (C) 2009-2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) + * + * Cantharella is free software: you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any + * later version. + * + * Cantharella 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 General Public License along with Cantharella. If not, see + * <http://www.gnu.org/licenses/>. + */ +package nc.ird.cantharella.service.utils.normalizers; + +import nc.ird.cantharella.data.model.TypeDocument; +import nc.ird.cantharella.service.utils.normalizers.utils.Normalizer; +import nc.ird.module.utils.AssertTools; + +/** + * Document type normalizer + * @author Adrien Cheype + */ +public final class TypeDocumentNormalizer extends Normalizer<TypeDocument> { + + /** {@inheritDoc} */ + @Override + protected TypeDocument normalize(TypeDocument typeDocument) { + AssertTools.assertNotNull(typeDocument); + // Unique field + typeDocument.setNom(Normalizer.normalize(ConfigNameNormalizer.class, typeDocument.getNom())); + return typeDocument; + } +} Property changes on: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/utils/normalizers/TypeDocumentNormalizer.java ___________________________________________________________________ Added: svn:mime-type + text/plain

1 0