This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit f2b62a9234287846b0b131b6086d0df01a8607f8 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Jun 11 14:30:21 2015 +0200 refs #6511 : mise à jour de la documentation d'installation de lizmap --- .../config/EchoBaseConfigurationOption.java | 8 +-- src/site/rst/install.rst.vm | 69 ++++++++++++++++++---- 2 files changed, 59 insertions(+), 18 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java index a662ae0..9eb621e 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java @@ -115,13 +115,9 @@ public enum EchoBaseConfigurationOption implements ConfigOptionDef { n("echobase.config.lizmap.projects.directory.description"), "${echobase.gis.directory}/projects", File.class), - LIZMAP_APPLICATION_VERSION("echobase.lizmap.application.version", - n("echobase.config.lizmap.application.version.description"), - "", - Version.class), LIZMAP_APPLICATION_BASEDIR("echobase.lizmap.application.basedir", n("echobase.config.lizmap.application.basedir.description"), - "/var/www/lizmap-web-client-${echobase.lizmap.application.version}", + "/var/www/echobase-map", File.class), LIZMAP_APPLICATION_CONFIG_FILE("echobase.lizmap.application.config.file", n("echobase.config.lizmap.application.config.file.description"), @@ -129,7 +125,7 @@ public enum EchoBaseConfigurationOption implements ConfigOptionDef { File.class), LIZMAP_APPLICATION_MAP_URL("echobase.lizmap.application.map.url", n("echobase.config.lizmap.application.map.url.description"), - "http://localhost/lizmap-web-client-${echobase.lizmap.application.version}/lizmap/www/index.php/view/map", + "http://localhost/echobase-map/lizmap/www/index.php/view/map", String.class), LIZMAP_APPLICATION_JDBC_URL("echobase.lizmap.application.jdbc.url", n("echobase.config.lizmap.application.jdbc.url.description"), diff --git a/src/site/rst/install.rst.vm b/src/site/rst/install.rst.vm index e7bebac..562f3ec 100644 --- a/src/site/rst/install.rst.vm +++ b/src/site/rst/install.rst.vm @@ -152,8 +152,6 @@ Pour utiliser une nouvelle version de l'application, c'est très simple. cp /var/local/echobase/echobase.war /var/lib/tomcat7/webapps Tomcat va redéployer l'application et elle sera disponible d'ici peu à l'adresse -:: - http://localhost:8080/echobase Divers @@ -199,9 +197,29 @@ Pour installer Qgis map server : :: - apt-get install qgis-server libapache2-mod-fcgid - a2enmod cgid - service apache2 restart + sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable + sudo apt-get update + sudo apt-get install qgis-server libapache2-mod-fcgid qgis + sudo apt-get install apache2 + sudo a2enmod cgid + sudo service apache2 restart + + +L'url : http://localhost/cgi-bin/qgis_mapserv.fcgi?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities +doit renvoyer un fichier XML de description des couches disponibles. + +Création du groupe d'utilisateur +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +:: + + addgroup echobase + adduser wwww-data echobase + adduser tomcat7 echobase + cd /var/local/echobase + chown -R tomcat7:echobase . + chmod g+w -R . + Lizmap ~~~~~~ @@ -210,28 +228,55 @@ Nous utilisons pour le moment la version ${lizmapVersion}. Installation Lizmap:: + apt-get install php5 curl php5-curl php5-sqlite php5-gd cd /var/www/ - VERSION=${lizmapVersion} - wget https://github.com/3liz/lizmap-web-client/archive/$VERSION.zip - unzip $VERSION.zip - rm $VERSION.zip + wget https://github.com/3liz/lizmap-web-client/archive/${lizmapVersion}.zip + unzip ${lizmapVersion}.zip + rm ${lizmapVersion}.zip + mv lizmap-web-client-${lizmapVersion} echobase-map + +**Note** + +Dans les nouvelles conventions d'Apache2, le repetoire de partage n'est plus **/var/wwww** mais **/var/www/html** . +Dans ce cas, il faudrat modifier la configuration d'echobase comme suit :: + + echobase.lizmap.application.basedir=/var/www/html/echobase-map -On obtient alors un répertoire **lizmap-web-client-${lizmapVersion}**. Il faut ensuite installer le style adapté pour EchoBase:: - cd /var/www/lizmap-web-client-${lizmapVersion}/lizmap + cd /var/www/echobase-map/lizmap wget http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/echobase/echobase-ui/${project.version}/echobase-ui-${project.version}-lizmap.zip unzip echobase-ui-${project.version}-lizmap.zip rm -rf echobase-ui-${project.version}-lizmap.zip cd .. - chown -R o+wr . + chown -R wwww-data:echobase . + chmod g+w -R . + +Pour tester le server lizmap utilisez l'url : http://localhost/echobase-map/lizmap/www + Configuration des répertoires ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Il est possible de modifier la configuration de ces différents répertoires dans la configuration (voir le `détail des options disponibles`_). +Il peut être necessaire de redefinir l'addresse public du serveur lizmap +:: + + echobase.lizmap.application.map.url=http://<serveur>/echobase-map/lizmap/www/index.php/view/map + + +Finalisation +~~~~~~~~~~~~ + +Il est nécessaire de redemarer les services +:: + + sudo service apache2 restart + sudo service tomvcat7 restart + + .. _créer une base travail: ./db.html#creation-d-une-base-postgresql .. _détail des options disponibles: ./config-report.html .. _Qgis map server: http://hub.qgis.org/projects/quantum-gis/wiki/QGIS_Server_Tutorial -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit 1efe3a6e31ecaa1f57debbe903c7cda96f05735b Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Jun 12 10:10:28 2015 +0200 refs #6511 : correction de la documentation d'installation --- src/site/rst/install.rst.vm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/site/rst/install.rst.vm b/src/site/rst/install.rst.vm index 9f0bb40..7d77ee2 100644 --- a/src/site/rst/install.rst.vm +++ b/src/site/rst/install.rst.vm @@ -238,7 +238,8 @@ Installation Lizmap:: **Note** Dans les nouvelles conventions d'Apache2, le repetoire de partage n'est plus **/var/wwww** mais **/var/www/html** . -Dans ce cas, il faudrat modifier la configuration d'echobase comme suit :: +Dans ce cas, il faudrat modifier la configuration d'Echobase comme suit : +:: echobase.lizmap.application.basedir=/var/www/html/echobase-map @@ -253,23 +254,23 @@ Il faut ensuite installer le style adapté pour EchoBase:: chown -R wwww-data:echobase . chmod g+w -R . -Pour tester le server lizmap utilisez l'url : http://localhost/echobase-map/lizmap/www +Pour tester le server lizmap, utilisez l'url : http://localhost/echobase-map/lizmap/www Configuration des répertoires ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Il est possible de modifier la configuration de ces différents répertoires dans la configuration (voir le `détail des options disponibles`_). +Il est possible de modifier ces différents répertoires dans la configuration (voir le `détail des options disponibles`_). -Il peut être necessaire de redefinir l'addresse public du serveur lizmap +Il peut être nécessaire de redéfinir l'addresse public du serveur lizmap :: echobase.lizmap.application.map.url=http://<serveur>/echobase-map/lizmap/www/index.php/view/map -Configuration l'avant-guichet Apache -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Configuration du serveur Apache +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Activez le connecteur tomcat : dans le fichier **/etc/tomcat7/server.xm** ajoutez ou décommentez la ligne:: +Activez le connecteur tomcat : dans le fichier **/etc/tomcat7/server.xml** ajoutez ou décommentez la ligne:: <Connector port="8009" enableLookups="false" redirectPort="8443" protocol="AJP/1.3"/> @@ -340,10 +341,10 @@ Redémarrez le service Apache service apache2 restart -Le site echobase est accesible à l'adresse http://echobase.nomdedomaine.org +Le site Echobase est accesible à l'adresse http://echobase.nomdedomaine.org Et le site de cartographie à l'adresse http://echobase-map.nomdedomaine.org/echobase-map/lizmap/www/index.php -Vous pouvez donc modifier la configuration de echobase avec +Vous pouvez donc modifier la configuration d'Echobase avec :: echobase.lizmap.application.map.url=http://echobase-map.mondedomaine.org/echobase-map/lizmap/www/index.php/view/... -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit f64c2d66e7708a01ddc8e5a54eccfc0492f74bf4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jun 15 16:38:06 2015 +0200 update docs (refs #6511) --- src/site/rst/configure.rst.vm | 62 +++++++++ src/site/rst/install.rst.vm | 310 +++++++++++++++--------------------------- src/site/rst/update.rst.vm | 59 ++++++++ src/site/site_en.xml | 2 + src/site/site_fr.xml | 2 + 5 files changed, 236 insertions(+), 199 deletions(-) diff --git a/src/site/rst/configure.rst.vm b/src/site/rst/configure.rst.vm new file mode 100644 index 0000000..7538bf1 --- /dev/null +++ b/src/site/rst/configure.rst.vm @@ -0,0 +1,62 @@ +.. - +.. * #%L +.. * EchoBase +.. * %% +.. * Copyright (C) 2011 Ifremer, Codelutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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% +.. - + +======== +Echobase +======== + +Configurer EchoBase sur un serveur +---------------------------------- + +Configuration Coser +~~~~~~~~~~~~~~~~~~~ + +TODO Renseigner l'adresse de l'instance du site des indicateurs à utiliser + +Modifier la configuration par défaut +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Si vous voulez modifier la configuration (voir le `détail des options disponibles`_), +il faut positionner un fichier nommé **echobase.properties** dans +**/etc/echobase.properties** puis redémarrer tomcat. + +Gestion des logs de l'application +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Par défaut, l'application utilise l'emplacement **/var/local/echobase/data/logs** +pour y placer ses logs. + +Vous pouvez changer cela en modifiant le fichier +**/var/local/echobase/data/echobase-log.properties** qui est généré lors de la +première installation de l'application. + +Première utilisation +~~~~~~~~~~~~~~~~~~~~ + +Deux utilisateurs sont créés si la base est vide (première utilisation):: + + login / password : admin / admin + login / password : user / user + +Pour des raisons de sécurité, il est conseillé de modifier le mot de passe via +l'interface de gestion des utilisateurs. + +.. _détail des options disponibles: ./config-report.html diff --git a/src/site/rst/install.rst.vm b/src/site/rst/install.rst.vm index 7d77ee2..dd61181 100644 --- a/src/site/rst/install.rst.vm +++ b/src/site/rst/install.rst.vm @@ -36,11 +36,11 @@ Nous préconisons aussi l'utilisation d'un serveur linux de type debian. L'installation se déroule en 2 étapes : -- création de la base de données -- installation de l'application +- installation de la base de données +- installation de l'application (et des applications dont elle dépend (apache, tomcat, qgis, ...) -Installation de postgresql et postgis -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Installation de la base de données +---------------------------------- Il vous faudra peut-être installer un dépot apt pour postgres (voir https://wiki.postgresql.org/wiki/Apt). @@ -49,204 +49,100 @@ L'application requière l'utilisation de postgresql 9.3 (et postgis 2.1). :: - sudo apt-get install postgresql-9.3 - sudo apt-get install postgresql-9.3-postgis-2.1 - sudo apt-get install postgresql-9.3-postgis-2.1-scripts + apt-get install postgresql-9.3 + apt-get install postgresql-9.3-postgis-2.1 + apt-get install postgresql-9.3-postgis-2.1-scripts Consulter la documentation suivante pour `créer une base travail`_. -Installation tomcat -~~~~~~~~~~~~~~~~~~~ - -:: - - sudo apt-get install tomcat7 +Installation de l'applicatif +---------------------------- -Préparation première installation -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +L'application utilise les applicatifs suivants qu'il faut installer et configurer si nécessaire : -Pré-requis: +- tomcat7 +- apache2 +- qgis-map-server +- lizmap -- Avoir installé tomcat 7 -- Être loggué sur une console avec l'utilisateur root. - -On suppose que tomcat a été installé via le système de paquets, et donc -que le répertoire **/var/lib/tomcat7** existe. - -Toutes les données de l'application seront placées dans le répertoire **/var/local/echobase** +Installation tomcat +~~~~~~~~~~~~~~~~~~~ :: - mkdir /var/local/echobase - mkdir -p /var/local/echobase/war - cd /var/local/echobase/war - wget http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/echobase/echobase-ui/${project.version}/echobase-ui-${project.version}-full.war - ln -s /var/local/echobase/war/echobase-ui-${project.version}-full.war /var/local/echobase/echobase.war - cp /var/local/echobase/echobase.war /var/lib/tomcat7/webapps - chown -R tomcat. . + apt-get install tomcat7 -L'application est bien déployée lorsque vous pouvez accéder à l'application à l'adresse suivante : -:: +Activez le connecteur AJP tomcat : dans le fichier **/etc/tomcat7/server.xml** décommentez la ligne:: - http://localhost:8080/echobase - -Une fois l'application déployée, vous aurez la structure de répertoires suivante : -:: - - /var/local/echobase/ - |-- data - | |-- echobase-log.config - | |-- internaldb - | | |-- echobase-user.h2.db - | |-- lib - | | |-- echobase-embedded-${project.version}.war - | | |-- h2-${h2Version}.jar - | | `-- postgresql-${postgresqlVersion}.jar - | |-- logs - | | `-- echobase.log - | `-- gis - | |-- resources - | | |-- France&Spain.shp - | | |-- pelgas09.shp - | | `-- ... - | |-- projects - | `-- templates - | |-- EchoBaseLizmapTemplate.qgs.cfg - | |-- EchoBaseQGisTemplate.qgs - | `-- ... - |-- echobase.war - `-- war - `-- echobase-ui-${project.version}-full.war - - -Mettre à jour le war de l'application -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Pré-requis : - -- Avoir installé tomcat 7 -- Être loggué sur une console avec l'utilisateur root. + <Connector port="8009" enableLookups="false" redirectPort="8443" protocol="AJP/1.3"/> -On suppose que tomcat a été installé via le système de paquets, et donc -que le répertoire **/var/lib/tomcat7** existe. +Redémarrez le service tomcat:: -Pour utiliser une nouvelle version de l'application, c'est très simple. + service tomcat7 restart -- Supprimer les répertoires suivants : +Installation apache2 +~~~~~~~~~~~~~~~~~~~~ :: - rm -rf /var/lib/tomcat7/webapps/echobase.war - rm -rf /var/lib/tomcat7/Catalina/localhost/echobase + apt-get install apache2 libapache2-mod-fcgid + a2enmod cgid + a2enmod proxy proxy_ajp rewrite + service apache2 restart -- Attendre que le répertoire **/var/lib/tomcat7/webapps/echobase** a bien été supprimé. +Création du groupe utilisateur +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- Mettre l'application dans tomcat : +On crée un group utilisateur nommé *echobase* pour gérer les droits aussi bien au niveau de tomcat que d'apache :: - cd /var/local/echobase/war - wget http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/echobase/echobase-ui/${project.version}/echobase-ui-${project.version}-full.war - unlink /var/local/echobase/echobase.war - ln -s /var/local/echobase/war/echobase-ui-${project.version}-full.war /var/local/echobase/echobase.war - cp /var/local/echobase/echobase.war /var/lib/tomcat7/webapps - -Tomcat va redéployer l'application et elle sera disponible d'ici peu à l'adresse - http://localhost:8080/echobase - -Divers ------- - -Modifier la configuration par défaut -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Si vous voulez modifier la configuration (voir le `détail des options disponibles`_), -il faut positionner un fichier nommé **echobase.properties** dans -**/etc/echobase.properties** puis redémarrer tomcat. - -Gestion des logs de l'application -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Par défaut, l'application utilise l'emplacement **/var/local/echobase/data/logs** -pour y placer ses logs. - -Vous pouvez changer cela en modifiant le fichier -**/var/local/echobase/data/echobase-log.properties** qui est généré lors de la -première installation de l'application. - -Première utilisation -~~~~~~~~~~~~~~~~~~~~ - -Deux utilisateurs sont créés si la base est vide (première utilisation):: - - login / password : admin / admin - login / password : user / user + addgroup echobase + adduser www-data echobase + adduser tomcat7 echobase -Pour des raisons de sécurité, il est conseillé de modifier le mot de passe via -l'interface de gestion des utilisateurs. +Installation Qgis map server +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Visualisation des données spatialisées --------------------------------------- +Nous utilisons la version ${qgisMapServerVersion} de Qgis map server. -EchoBase utilise `Qgis map server`_ et `Lizmap`_ pour la visualisation des données spatialisées (depuis la version 2.7). +Mise à jour des dépôts si nécessaire:: -Qgis map server -~~~~~~~~~~~~~~~ + echo "" >> /etc/apt/sources.list + echo "" >> /etc/apt/sources.list + echo "#Pour installer qgis-mapserver" >> /etc/apt/sources.list + echo "deb http://qgis.org/debian vivid main universe" >> /etc/apt/sources.list -Pour installer Qgis map server : + gpg --keyserver keyserver.ubuntu.com --recv DD45F6C3 + gpg --export --armor DD45F6C3 | sudo apt-key add - -:: - - sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable - sudo apt-get update - sudo apt-get install qgis-server libapache2-mod-fcgid qgis - sudo apt-get install apache2 - sudo a2enmod cgid - sudo service apache2 restart + apt-get update +Installation:: + apt-get install qgis-mapserver qgis L'url : http://localhost/cgi-bin/qgis_mapserv.fcgi?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities doit renvoyer un fichier XML de description des couches disponibles. -Création du groupe d'utilisateur -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -:: - - addgroup echobase - adduser wwww-data echobase - adduser tomcat7 echobase - cd /var/local/echobase - chown -R tomcat7:echobase . - chmod g+w -R . - - -Lizmap -~~~~~~ +Installation Lizmap +~~~~~~~~~~~~~~~~~~~ -Nous utilisons pour le moment la version ${lizmapVersion}. +Nous utilisons la version ${lizmapVersion} de LizMap. -Installation Lizmap:: +Installation:: apt-get install php5 curl php5-curl php5-sqlite php5-gd - cd /var/www/ + mkdir -p /var/www/html + cd /var/www/html wget https://github.com/3liz/lizmap-web-client/archive/${lizmapVersion}.zip unzip ${lizmapVersion}.zip rm ${lizmapVersion}.zip - mv lizmap-web-client-${lizmapVersion} echobase-map - -**Note** - -Dans les nouvelles conventions d'Apache2, le repetoire de partage n'est plus **/var/wwww** mais **/var/www/html** . -Dans ce cas, il faudrat modifier la configuration d'Echobase comme suit : -:: - - echobase.lizmap.application.basedir=/var/www/html/echobase-map + ln -s lizmap-web-client-${lizmapVersion} echobase-map Il faut ensuite installer le style adapté pour EchoBase:: - cd /var/www/echobase-map/lizmap + cd /var/www/html/echobase-map/lizmap wget http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/echobase/echobase-ui/${project.version}/echobase-ui-${project.version}-lizmap.zip unzip echobase-ui-${project.version}-lizmap.zip rm -rf echobase-ui-${project.version}-lizmap.zip @@ -256,46 +152,73 @@ Il faut ensuite installer le style adapté pour EchoBase:: Pour tester le server lizmap, utilisez l'url : http://localhost/echobase-map/lizmap/www +Installation dans tomcat +~~~~~~~~~~~~~~~~~~~~~~~~ -Configuration des répertoires -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +On suppose que tomcat a été installé via le système de paquets, et donc +que le répertoire **/var/lib/tomcat7** existe. -Il est possible de modifier ces différents répertoires dans la configuration (voir le `détail des options disponibles`_). +Toutes les données de l'application seront placées dans le répertoire **/var/local/echobase** -Il peut être nécessaire de redéfinir l'addresse public du serveur lizmap :: - echobase.lizmap.application.map.url=http://<serveur>/echobase-map/lizmap/www/index.php/view/map + mkdir /var/local/echobase + mkdir -p /var/local/echobase/war -Configuration du serveur Apache -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + wget http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/echobase/echobase-ui/${project.version}/echobase-ui-${project.version}-full.war + ln -s /var/local/echobase/war/echobase-ui-${project.version}-full.war /var/local/echobase/echobase.war + cp /var/local/echobase/echobase.war /var/lib/tomcat7/webapps + cd /var/local/echobase + chown -R tomcat7:echobase . + chmod g+w -R . -Activez le connecteur tomcat : dans le fichier **/etc/tomcat7/server.xml** ajoutez ou décommentez la ligne:: +L'application est bien déployée lorsque vous pouvez accéder à l'application à l'adresse suivante : +:: - <Connector port="8009" enableLookups="false" redirectPort="8443" protocol="AJP/1.3"/> + http://localhost:8080/echobase -Redémarrez le service tomcat +Une fois l'application déployée, vous aurez la structure de répertoires suivante : :: - service tomcat7 restart + /var/local/echobase/ + |-- data + | |-- echobase-log.config + | |-- internaldb + | | `-- echobase-user.h2.db + | |-- lib + | | |-- echobase-embedded-${project.version}.war + | | |-- h2-${h2Version}.jar + | | `-- postgresql-${postgresqlVersion}.jar + | |-- logs + | | `-- echobase.log + | `-- gis + | |-- resources + | | |-- France&Spain.shp + | | |-- pelgas09.shp + | | `-- ... + | |-- projects + | `-- templates + | |-- EchoBaseLizmapTemplate.qgs.cfg + | |-- EchoBaseQGisTemplate.qgs + | `-- ... + |-- echobase.war + `-- war + `-- echobase-ui-${project.version}-full.war +Configuration du serveur Apache +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Activez les modules Apache -:: +Pour la suite de l'installation, veuillez exporter le nom de domaine de votre machine:: - a2enmod proxy proxy_ajp rewrite + export DOMAIN=acoustica -Créez le fichier **/etc/apache2/site-available/echobase.conf** -:: +Executez ces commandes (ajout modules apache, création du site echobase):: + cat << EOF > /etc/apache2/sites-available/echobase.conf <VirtualHost *:80> - ServerName echobase.nomdedomaine.org + ServerName echobase.$DOMAIN ProxyRequests Off - - RewriteEngine On - RewriteRule ^/$ http://echobase.nomdedomaine.org/echobase/ [R] - ProxyPass / ajp://localhost:8009/ ProxyPassReverse / ajp://localhost:8009/ @@ -309,45 +232,34 @@ Créez le fichier **/etc/apache2/site-available/echobase.conf** CustomLog /var/log/apache2/echobase-access.log combined </VirtualHost> - -Créez le fichier **/etc/apache2/site-available/echobase.conf** -:: - <VirtualHost *:80> - ServerName echobase-map.nomdedomaine.org + ServerName echobase-map.$DOMAIN ProxyRequests Off RewriteEngine On - RewriteRule ^/$ http://echobase-map.nomdedomaine.org/echobase-map/lizmpa/wwww [R] + RewriteRule ^/$ http://echobase-map.$DOMAIN/echobase-map/lizmap/wwww [R] - DocumentRoot /var/www + DocumentRoot /var/www/html ErrorLog /var/log/apache2/echobase-map-error.log LogLevel warn CustomLog /var/log/apache2/echobase-map-access.log combined </VirtualHost> - - -Activez les sites -:: - + EOF a2ensite echobase.conf - a2ensite echobase-map.conf - -Redémarrez le service Apache -:: - service apache2 restart -Le site Echobase est accesible à l'adresse http://echobase.nomdedomaine.org -Et le site de cartographie à l'adresse http://echobase-map.nomdedomaine.org/echobase-map/lizmap/www/index.php +L'application Echobase est accesible à l'adresse http://echobase.$DOMAIN/echobase +Et le site de cartographie à l'adresse http://echobase-map.$DOMAIN/echobase-map/lizmap/www/index.php Vous pouvez donc modifier la configuration d'Echobase avec :: - echobase.lizmap.application.map.url=http://echobase-map.mondedomaine.org/echobase-map/lizmap/www/index.php/view/... + echo "" >> /etc/echobase.properties + echo "" >> /etc/echobase.properties + echo "echobase.lizmap.application.map.url=http://echobase-map.$DOMAIN/echobase-map/lizmap/www/index.php/view/map" >> /etc/echobase.properties .. _créer une base travail: ./db.html#creation-d-une-base-postgresql diff --git a/src/site/rst/update.rst.vm b/src/site/rst/update.rst.vm new file mode 100644 index 0000000..e6be93d --- /dev/null +++ b/src/site/rst/update.rst.vm @@ -0,0 +1,59 @@ +.. - +.. * #%L +.. * EchoBase +.. * %% +.. * Copyright (C) 2011 Ifremer, Codelutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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% +.. - + +======== +Echobase +======== + +Mise à jour d'une version d'EchoBase sur un serveur +--------------------------------------------------- + +Pré-requis: + +- L'application doit déjà être installé dans le répertoire /var/local/echobase +- Être loggué sur une console avec l'utilisateur root. + +On suppose que tomcat a été installé via le système de paquets, et donc +que le répertoire **/var/lib/tomcat7** existe. + +Pour utiliser une nouvelle version de l'application, c'est très simple. + +- Supprimer les répertoires suivants : + +:: + + rm -rf /var/lib/tomcat7/webapps/echobase.war + rm -rf /var/lib/tomcat7/Catalina/localhost/echobase + +- Attendre que le répertoire **/var/lib/tomcat7/webapps/echobase** a bien été supprimé. + +- Mettre l'application dans tomcat : + +:: + + cd /var/local/echobase/war + wget http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/echobase/echobase-ui/${project.version}/echobase-ui-${project.version}-full.war + unlink /var/local/echobase/echobase.war + ln -s /var/local/echobase/war/echobase-ui-${project.version}-full.war /var/local/echobase/echobase.war + cp /var/local/echobase/echobase.war /var/lib/tomcat7/webapps + +Tomcat va redéployer l'application et elle sera disponible d'ici peu à l'adresse + http://localhost:8080/echobase diff --git a/src/site/site_en.xml b/src/site/site_en.xml index 7540db5..928e142 100644 --- a/src/site/site_en.xml +++ b/src/site/site_en.xml @@ -72,6 +72,8 @@ <menu name="Administration"> <item name="Download" href="https://forge.codelutin.com/projects/echobase/files"/> <item name="Install" href="install.html"/> + <!--<item name="Update" href="update.html"/>--> + <!--<item name="Configure" href="configure.html"/>--> </menu> <menu name="User"> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index 17fc442..e371461 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -73,6 +73,8 @@ <menu name="Administration"> <item name="Téléchargement" href="https://forge.codelutin.com/projects/echobase/files"/> <item name="Installation" href="install.html"/> + <item name="Mise à jour" href="update.html"/> + <item name="Configuration" href="configure.html"/> </menu> <menu name="Utilisateur"> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit 605581a4d23d9ca09574a8fe7c656ca12c0fd023 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jun 15 16:38:50 2015 +0200 change doc url in gis jsp (refs #6511) --- echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/show.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/show.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/show.jsp index 693014e..48f0350 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/show.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/show.jsp @@ -72,7 +72,7 @@ <%-- Application has no gis support --%> <p class="fontsize11"> <s:text name="echobase.message.application.no.gis.support"/> - <s:a href="%{getDocumentation('install.html', 'Visualisation_des_donnes_spatialises')}" + <s:a href="%{getDocumentation('install.html')}" target='#doc'> <s:text name="echobase.message.gis.install"/> </s:a> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit d13b3602e777715331c1c3be70b68c2aee35a84c Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Jun 17 08:43:54 2015 +0200 refs #6511 : correction du dépot pour Qgis server. --- src/site/rst/install.rst.vm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/site/rst/install.rst.vm b/src/site/rst/install.rst.vm index ebe7b96..0f08fbd 100644 --- a/src/site/rst/install.rst.vm +++ b/src/site/rst/install.rst.vm @@ -109,10 +109,10 @@ Nous utilisons la version ${qgisMapServerVersion} de Qgis map server. echo "" >> /etc/apt/sources.list echo "" >> /etc/apt/sources.list echo "#Pour installer qgis-server" >> /etc/apt/sources.list - echo "deb http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu trusty main" >> /etc/apt/sources.list + echo "deb http://qgis.org/debian wheezy main" >> /etc/apt/sources.list - gpg --keyserver keyserver.ubuntu.com --recv DD45F6C3 - gpg --export --armor DD45F6C3 | sudo apt-key add - + gpg --keyserver keyserver.ubuntu.com --recv 314DF160 + gpg --export --armor 314DF160 | apt-key add - apt-get update apt-get install qgis-mapserver qgis -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit 9a15ecca02714dd723b027a2f484603bff8c51ad Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Jun 19 10:10:45 2015 +0200 make some javadoc jdk1.8 aware --- .../fr/ifremer/echobase/EchoBaseDateConverter.java | 2 +- .../echobase/EchoBaseTechnicalException.java | 2 +- .../src/main/java/fr/ifremer/echobase/I18nAble.java | 2 +- .../config/EchoBaseApplicationConfigProvider.java | 2 +- .../echobase/config/EchoBaseConfiguration.java | 2 +- .../config/EchoBaseConfigurationOption.java | 2 +- .../ifremer/echobase/converter/FloatConverter.java | 6 +++--- .../fr/ifremer/echobase/csv/ChainValueParser.java | 2 +- .../fr/ifremer/echobase/csv/EchoBaseCsvUtil.java | 2 +- .../fr/ifremer/echobase/csv/ResultValueParser.java | 2 +- .../echobase/entities/AbstractEchoBaseDao.java | 2 +- .../fr/ifremer/echobase/entities/DriverType.java | 2 +- .../EchoBaseInternalPersistenceContext.java | 2 +- .../entities/EchoBaseUserPersistenceContext.java | 2 +- .../fr/ifremer/echobase/entities/ExportQueries.java | 2 +- .../fr/ifremer/echobase/entities/ImportLogs.java | 21 +++++++++++++++++++++ .../fr/ifremer/echobase/entities/ImportType.java | 2 +- .../fr/ifremer/echobase/entities/data/Cells.java | 21 +++++++++++++++++++++ .../echobase/entities/data/DataProcessings.java | 21 +++++++++++++++++++++ .../echobase/entities/data/EchotypeTopiaDao.java | 2 +- .../ifremer/echobase/entities/data/Echotypes.java | 21 +++++++++++++++++++++ .../ifremer/echobase/entities/data/Operations.java | 21 +++++++++++++++++++++ .../fr/ifremer/echobase/entities/data/Results.java | 21 +++++++++++++++++++++ .../ifremer/echobase/entities/data/Transects.java | 21 +++++++++++++++++++++ .../ifremer/echobase/entities/data/VoyageImpl.java | 2 +- .../fr/ifremer/echobase/entities/data/Voyages.java | 21 +++++++++++++++++++++ .../entities/references/AcousticInstruments.java | 21 +++++++++++++++++++++ .../echobase/entities/references/AgeCategories.java | 21 +++++++++++++++++++++ .../entities/references/AreaOfOperations.java | 21 +++++++++++++++++++++ .../echobase/entities/references/CellMethods.java | 21 +++++++++++++++++++++ .../echobase/entities/references/CellTypes.java | 21 +++++++++++++++++++++ .../echobase/entities/references/DataMetadatas.java | 21 +++++++++++++++++++++ .../echobase/entities/references/DataQualities.java | 21 +++++++++++++++++++++ .../echobase/entities/references/DataTypes.java | 21 +++++++++++++++++++++ .../echobase/entities/references/DepthStratums.java | 21 +++++++++++++++++++++ .../entities/references/EchotypeCategories.java | 21 +++++++++++++++++++++ .../echobase/entities/references/GearMetadatas.java | 21 +++++++++++++++++++++ .../ifremer/echobase/entities/references/Gears.java | 21 +++++++++++++++++++++ .../echobase/entities/references/Missions.java | 21 +++++++++++++++++++++ .../entities/references/OperationEvents.java | 21 +++++++++++++++++++++ .../entities/references/OperationMetadatas.java | 21 +++++++++++++++++++++ .../entities/references/ReferenceDatumTypes.java | 21 +++++++++++++++++++++ .../entities/references/ReferenceDatums.java | 21 +++++++++++++++++++++ .../entities/references/SampleDataTypes.java | 21 +++++++++++++++++++++ .../echobase/entities/references/SexCategories.java | 21 +++++++++++++++++++++ .../entities/references/SizeCategories.java | 21 +++++++++++++++++++++ .../entities/references/SpeciesCategories.java | 21 +++++++++++++++++++++ .../echobase/entities/references/Stratas.java | 21 +++++++++++++++++++++ .../echobase/entities/references/VesselTypes.java | 21 +++++++++++++++++++++ .../echobase/entities/references/Vessels.java | 21 +++++++++++++++++++++ .../entities/spatial/SpatialConfiguration.java | 2 +- .../fr/ifremer/echobase/io/CommandLineUtils.java | 2 +- .../java/fr/ifremer/echobase/io/EchoBaseIOUtil.java | 2 +- .../main/java/fr/ifremer/echobase/io/InputFile.java | 2 +- .../echobase/persistence/EchoBaseDbMeta.java | 2 +- .../echobase/persistence/EchoBaseEntityHelper.java | 6 +++--- .../persistence/EchoBasePersistenceHelper.java | 2 +- .../EchobaseTopiaApplicationContexts.java | 4 ++-- .../EchoBaseMigrationCallBackResolver.java | 2 +- .../internalDb/MigrationCallBackForVersion.java | 2 +- .../internalDb/MigrationCallBackForVersion2_2.java | 2 +- .../migration/internalDb/MigrationCallback.java | 2 +- .../workingDb/MigrationCallBackForVersion.java | 2 +- .../workingDb/MigrationCallBackForVersion2_2.java | 2 +- .../workingDb/MigrationCallBackForVersion2_5_1.java | 2 +- .../workingDb/MigrationCallBackForVersion2_6.java | 2 +- .../workingDb/MigrationCallBackForVersion2_6_1.java | 2 +- .../migration/workingDb/MigrationCallback.java | 2 +- .../ifremer/echobase/EchoBaseDateConverterTest.java | 2 +- .../echobase/persistence/EchoBaseDbMetaTest.java | 2 +- .../AbstractEchobaseActionConfiguration.java | 4 ++-- .../services/DefaultEchoBaseServiceContext.java | 2 +- .../ifremer/echobase/services/EchoBaseService.java | 2 +- .../echobase/services/EchoBaseServiceContext.java | 2 +- .../fr/ifremer/echobase/services/EchobaseAieOC.java | 4 ++-- .../fr/ifremer/echobase/services/ProgressModel.java | 2 +- .../echobase/services/ServiceEchobaseAieOC.java | 2 +- .../echobase/services/service/CoserApiService.java | 4 ++-- .../echobase/services/service/CoserIndicators.java | 21 +++++++++++++++++++++ .../echobase/services/service/DbEditorService.java | 2 +- .../echobase/services/service/DecoratorService.java | 2 +- .../services/service/UserDbPersistenceService.java | 2 +- .../EmbeddedApplicationConfiguration.java | 2 +- .../EmbeddedApplicationService.java | 2 +- .../exportCoser/ExportCoserConfiguration.java | 2 +- .../service/exportCoser/ExportCoserService.java | 2 +- .../service/exportCoser/IndicatorExportModel.java | 2 +- .../service/exportCoser/IndicatorExportRow.java | 2 +- .../exportCoser/RawDataCatchExportModel.java | 2 +- .../service/exportCoser/RawDataCatchExportRow.java | 2 +- .../service/exportCoser/RawDataSizeExportModel.java | 2 +- .../service/exportCoser/RawDataSizeExportRow.java | 2 +- .../exportCoser/RawDataStrataExportModel.java | 2 +- .../service/exportCoser/RawDataStrataExportRow.java | 2 +- .../service/exportCoser/SpeciesExportModel.java | 2 +- .../service/exportCoser/SpeciesExportRow.java | 2 +- .../service/exportdb/ExportDbConfiguration.java | 2 +- .../services/service/exportdb/ExportDbMode.java | 2 +- .../services/service/exportdb/ExportDbService.java | 4 ++-- .../services/service/exportdb/ExportService.java | 2 +- .../service/exportquery/ExportQueryCsvModel.java | 2 +- .../ExportQueryInvalidNameException.java | 2 +- .../ExportQueryNameAlreadyExistException.java | 2 +- .../exportquery/ExportQueryNotFoundException.java | 2 +- .../service/exportquery/ExportQueryService.java | 2 +- .../service/exportquery/GenericSQLQuery.java | 4 ++-- .../importdata/AbstractImportConfiguration.java | 4 ++-- .../importdata/AbstractImportDataService.java | 2 +- .../importdata/AcousticImportConfiguration.java | 2 +- .../service/importdata/AcousticImportResult.java | 2 +- .../service/importdata/AcousticImportService.java | 2 +- .../importdata/CatchesImportConfiguration.java | 2 +- .../service/importdata/CatchesImportService.java | 2 +- .../service/importdata/CellPositionReference.java | 2 +- .../service/importdata/CommonAllImportService.java | 2 +- .../importdata/CommonImportConfiguration.java | 2 +- .../service/importdata/CommonImportService.java | 2 +- .../importdata/CommonTransectImportService.java | 2 +- .../importdata/CommonTransitImportService.java | 2 +- .../importdata/CommonVoyageImportService.java | 2 +- .../importdata/EchoBaseCsvFileImportResult.java | 2 +- .../service/importdata/ImportException.java | 2 +- .../MissionNameAlreadyExistException.java | 2 +- .../importdata/OperationImportConfiguration.java | 2 +- .../service/importdata/OperationImportService.java | 2 +- .../importdata/ResultsEsduCellImportService.java | 2 +- .../importdata/ResultsImportConfiguration.java | 2 +- .../service/importdata/ResultsImportService.java | 2 +- .../importdata/ResultsMapFishCellImportService.java | 2 +- .../ResultsMapOtherCellImportService.java | 2 +- .../importdata/ResultsRegionCellImportService.java | 2 +- .../ResultsVoyageImportAlreadyExistException.java | 21 +++++++++++++++++++++ .../importdata/ResultsVoyageImportService.java | 2 +- .../service/importdata/csv/AcousticImportModel.java | 2 +- .../service/importdata/csv/AcousticImportRow.java | 2 +- .../importdata/csv/BiometrySampleImportModel.java | 2 +- .../importdata/csv/BiometrySampleImportRow.java | 2 +- .../service/importdata/csv/EchotypeImportModel.java | 2 +- .../service/importdata/csv/EchotypeImportRow.java | 2 +- ...sultByEchotypeAndSpeciesCategoryImportModel.java | 2 +- ...ResultByEchotypeAndSpeciesCategoryImportRow.java | 2 +- .../csv/EsduResultByEchotypeImportModel.java | 2 +- .../csv/EsduResultByEchotypeImportRow.java | 2 +- ...sduResultBySpeciesAndAgeCategoryImportModel.java | 2 +- .../EsduResultBySpeciesAndAgeCategoryImportRow.java | 2 +- ...duResultBySpeciesAndSizeCategoryImportModel.java | 2 +- ...EsduResultBySpeciesAndSizeCategoryImportRow.java | 2 +- .../csv/GearMetadataValueImportModel.java | 2 +- .../importdata/csv/GearMetadataValueImportRow.java | 2 +- .../importdata/csv/LengthAgeKeyImportModel.java | 2 +- .../importdata/csv/LengthAgeKeyImportRow.java | 2 +- .../importdata/csv/LengthWeightKeyImportModel.java | 2 +- .../importdata/csv/LengthWeightKeyImportRow.java | 2 +- .../service/importdata/csv/MapCellImportModel.java | 2 +- .../service/importdata/csv/MapCellImportRow.java | 2 +- .../importdata/csv/OperationImportModel.java | 2 +- .../service/importdata/csv/OperationImportRow.java | 2 +- .../csv/OperationMetadataValueImportModel.java | 2 +- .../csv/OperationMetadataValueImportRow.java | 2 +- .../csv/RegionCellAssociationImportModel.java | 2 +- .../csv/RegionCellAssociationImportRow.java | 2 +- .../importdata/csv/RegionCellImportModel.java | 2 +- .../service/importdata/csv/RegionCellImportRow.java | 2 +- .../importdata/csv/RegionCellResultImportModel.java | 2 +- .../importdata/csv/RegionCellResultImportRow.java | 2 +- .../importdata/csv/SubSampleImportModel.java | 2 +- .../service/importdata/csv/SubSampleImportRow.java | 2 +- .../importdata/csv/TotalSampleImportModel.java | 2 +- .../importdata/csv/TotalSampleImportRow.java | 2 +- .../service/importdata/csv/TransectImportModel.java | 2 +- .../service/importdata/csv/TransectImportRow.java | 2 +- .../service/importdata/csv/TransitImportModel.java | 2 +- .../service/importdata/csv/TransitImportRow.java | 2 +- .../service/importdata/csv/VoyageImportModel.java | 2 +- .../importdb/EchoBaseImportModelFactory.java | 2 +- .../service/importdb/ImportDbConfiguration.java | 2 +- .../services/service/importdb/ImportDbMode.java | 2 +- .../services/service/importdb/ImportDbService.java | 2 +- .../services/service/importdb/ImportService.java | 2 +- .../importdb/strategy/AbstractImportDbStrategy.java | 2 +- .../importdb/strategy/EchoBaseImportStrategy.java | 2 +- .../importdb/strategy/FreeImportDbStrategy.java | 2 +- .../strategy/ReferentialImportDbStrategy.java | 2 +- .../service/removedata/RemoveDataConfiguration.java | 2 +- .../service/removedata/RemoveDataService.java | 2 +- .../strategy/AbstractRemoveDataStrategy.java | 2 +- .../strategy/AcousticRemoveDataStrategy.java | 4 ++-- .../strategy/CatchesRemoveDataStrategy.java | 4 ++-- .../strategy/CommonAllRemoveDataStrategy.java | 4 ++-- .../strategy/CommonTransectRemoveDataStrategy.java | 4 ++-- .../strategy/CommonTransitRemoveDataStrategy.java | 4 ++-- .../strategy/CommonVoyageRemoveDataStrategy.java | 4 ++-- .../strategy/LegacyVoyageRemoveDataStrategy.java | 4 ++-- .../strategy/OperationRemoveDataStrategy.java | 4 ++-- .../strategy/ResultEsduRemoveDataStrategy.java | 4 ++-- .../strategy/ResultMapFishRemoveDataStrategy.java | 4 ++-- .../strategy/ResultMapOtherRemoveDataStrategy.java | 4 ++-- .../strategy/ResultRegionRemoveDataStrategy.java | 4 ++-- .../strategy/ResultVoyageRemoveDataStrategy.java | 4 ++-- .../services/service/spatial/PgJdbcUrl.java | 21 +++++++++++++++++++++ .../service/spatial/SpatialDataService.java | 2 +- ...WorkingDbConfigurationAlreadyExistException.java | 2 +- .../WorkingDbConfigurationNotFoundException.java | 2 +- .../workingDb/WorkingDbConfigurationService.java | 4 ++-- .../echobase/services/EchoBaseServiceFixtures.java | 2 +- .../services/EchoBaseTestServiceSupport.java | 2 +- .../services/FakeEchoBaseServiceContext.java | 2 +- .../fr/ifremer/echobase/services/FixCellsIT.java | 4 ++-- .../services/service/CoserApiServiceTest.java | 2 +- .../services/service/DecoratorServiceTest.java | 2 +- .../EmbeddedApplicationServiceIT.java | 2 +- .../service/exportCoser/ExportCoserServiceTest.java | 2 +- .../service/exportdb/ExportDbServiceTest.java | 2 +- .../service/exportquery/ExportQueryServiceTest.java | 2 +- .../importdata/AbstractImportDataServiceIT.java | 2 +- .../service/importdata/AcousticImportServiceIT.java | 2 +- .../service/importdata/CatchesImportServiceIT.java | 2 +- .../importdata/CommonAllImportServiceIT.java | 2 +- .../importdata/CommonTransectImportServiceIT.java | 2 +- .../importdata/CommonTransitImportServiceIT.java | 2 +- .../importdata/CommonVoyageImportServiceIT.java | 2 +- .../importdata/OperationImportServiceIT.java | 2 +- .../importdata/ResultsEsduCellImportServiceIT.java | 2 +- .../ResultsMapFishCellImportServiceIT.java | 2 +- .../ResultsMapOtherCellImportServiceIT.java | 2 +- .../ResultsRegionCellImportServiceIT.java | 2 +- .../importdata/ResultsVoyageImportServiceIT.java | 2 +- .../service/importdb/ImportDbServiceTest.java | 2 +- .../service/spatial/LizmapRepositoryTest.java | 21 +++++++++++++++++++++ .../services/service/spatial/PgJdbcUrlTest.java | 21 +++++++++++++++++++++ .../removedata/AbstractRemoveDataServiceTest.java | 2 +- .../removedata/AcousticRemoveDataServiceTest.java | 2 +- .../removedata/CatchesRemoveDataServiceTest.java | 2 +- .../removedata/CommonAllRemoveDataServiceTest.java | 2 +- .../CommonTransectRemoveDataServiceTest.java | 2 +- .../CommonTransitRemoveDataServiceTest.java | 2 +- .../CommonVoyageRemoveDataServiceTest.java | 2 +- .../removedata/OperationRemoveDataServiceTest.java | 2 +- .../removedata/ResultEsduRemoveDataServiceTest.java | 2 +- .../ResultMapRemoveFishDataServiceTest.java | 2 +- .../ResultMapRemoveOtherDataServiceTest.java | 2 +- .../ResultRegionRemoveDataServiceTest.java | 2 +- .../ResultVoyageRemoveDataServiceTest.java | 2 +- .../echobase/ui/EchoBaseApplicationContext.java | 2 +- .../echobase/ui/EchoBaseApplicationListener.java | 6 +++--- .../ui/EchoBaseInternalDbTransactionFilter.java | 2 +- .../fr/ifremer/echobase/ui/EchoBaseSession.java | 10 +++++----- .../echobase/ui/EchoBaseSessionListener.java | 2 +- .../echobase/ui/EchoBaseStaticContentLoader.java | 4 ++-- .../ui/EchoBaseUserDbTransactionFilter.java | 4 ++-- .../ui/actions/AbstractConfigureAction.java | 2 +- .../ui/actions/AbstractJSONPaginedAction.java | 2 +- .../ui/actions/AbstractWaitAndExecAction.java | 2 +- .../echobase/ui/actions/EchoBaseActionSupport.java | 2 +- .../java/fr/ifremer/echobase/ui/actions/Home.java | 2 +- .../ui/actions/dbeditor/AbstractLoadPage.java | 2 +- .../echobase/ui/actions/dbeditor/GetEntities.java | 2 +- .../ui/actions/dbeditor/GetForeignEntities.java | 2 +- .../echobase/ui/actions/dbeditor/ImportTable.java | 2 +- .../echobase/ui/actions/dbeditor/LoadEntities.java | 2 +- .../echobase/ui/actions/dbeditor/SaveEntity.java | 2 +- .../ui/actions/embeddedApplication/Build.java | 2 +- .../ui/actions/embeddedApplication/Configure.java | 2 +- .../ui/actions/embeddedApplication/Download.java | 2 +- .../echobase/ui/actions/exportCoser/Configure.java | 2 +- .../echobase/ui/actions/exportCoser/Download.java | 2 +- .../echobase/ui/actions/exportCoser/Export.java | 2 +- .../GetAvailableIndicatorsForMission.java | 21 +++++++++++++++++++++ .../echobase/ui/actions/exportCoser/GetZones.java | 2 +- .../echobase/ui/actions/exportDb/Configure.java | 2 +- .../echobase/ui/actions/exportDb/Download.java | 2 +- .../echobase/ui/actions/exportDb/Export.java | 2 +- .../exportQuery/AbstractEditExportQuery.java | 4 ++-- .../ui/actions/exportQuery/CloneExportQuery.java | 4 ++-- .../exportQuery/ConfirmDeleteExportQuery.java | 4 ++-- .../actions/exportQuery/CreateNewExportQuery.java | 2 +- .../ui/actions/exportQuery/DeleteExportQuery.java | 4 ++-- .../exportQuery/DownloadExportQueryResult.java | 2 +- .../ui/actions/exportQuery/EditExportQuery.java | 2 +- .../ui/actions/exportQuery/ExportQueryResult.java | 2 +- .../actions/exportQuery/GetExportQueryResult.java | 2 +- .../ui/actions/exportQuery/NewLibreOfficeQuery.java | 2 +- .../ui/actions/exportQuery/SaveExportQuery.java | 4 ++-- .../ui/actions/exportQuery/ShowExportQuery.java | 2 +- .../actions/importData/AbstractConfigureImport.java | 2 +- .../ui/actions/importData/AbstractLaunchImport.java | 2 +- .../actions/importData/ConfigureAcousticImport.java | 2 +- .../actions/importData/ConfigureCatchesImport.java | 2 +- .../actions/importData/ConfigureCommonImport.java | 2 +- .../importData/ConfigureOperationImport.java | 2 +- .../actions/importData/ConfigureResultsImport.java | 2 +- .../ui/actions/importData/CreateMission.java | 2 +- .../importData/GetDataProcessingsForVoyage.java | 2 +- .../ui/actions/importData/GetVesselsForVoyage.java | 2 +- .../echobase/ui/actions/importData/ImportMode.java | 2 +- .../ui/actions/importData/LaunchAcousticImport.java | 2 +- .../ui/actions/importData/LaunchCatchesImport.java | 2 +- .../ui/actions/importData/LaunchCommonImport.java | 2 +- .../actions/importData/LaunchOperationImport.java | 2 +- .../ui/actions/importData/LaunchResultsImport.java | 2 +- .../ui/actions/importData/SelectImportType.java | 2 +- .../echobase/ui/actions/importDb/Configure.java | 2 +- .../echobase/ui/actions/importDb/Import.java | 2 +- .../ui/actions/removeData/ConfirmDelete.java | 2 +- .../echobase/ui/actions/removeData/Delete.java | 2 +- .../echobase/ui/actions/removeData/ImportLogs.java | 2 +- .../ui/actions/spatial/ComputeSpatialData.java | 2 +- .../ifremer/echobase/ui/actions/spatial/Show.java | 2 +- .../fr/ifremer/echobase/ui/actions/user/Create.java | 2 +- .../fr/ifremer/echobase/ui/actions/user/Delete.java | 2 +- .../fr/ifremer/echobase/ui/actions/user/Login.java | 2 +- .../fr/ifremer/echobase/ui/actions/user/Logout.java | 2 +- .../fr/ifremer/echobase/ui/actions/user/Update.java | 2 +- .../actions/workingDb/AbstractWorkingDbAction.java | 2 +- .../echobase/ui/actions/workingDb/AddSpatial.java | 4 ++-- .../echobase/ui/actions/workingDb/Connect.java | 2 +- .../echobase/ui/actions/workingDb/Create.java | 2 +- .../ui/actions/workingDb/CreatePostgresDb.java | 4 ++-- .../echobase/ui/actions/workingDb/DashBoard.java | 2 +- .../echobase/ui/actions/workingDb/Delete.java | 2 +- .../echobase/ui/actions/workingDb/Disconnect.java | 2 +- .../ui/actions/workingDb/DownloadDriver.java | 2 +- .../ui/actions/workingDb/GetImportLogDetail.java | 2 +- .../echobase/ui/actions/workingDb/GetVoyage.java | 2 +- .../echobase/ui/actions/workingDb/Information.java | 2 +- .../echobase/ui/actions/workingDb/ShowList.java | 2 +- .../ui/interceptors/AbstractCheckInterceptor.java | 2 +- .../ui/interceptors/CheckLogguedInterceptor.java | 2 +- .../echobase/ui/interceptors/CheckUserIsAdmin.java | 2 +- .../ui/interceptors/CheckWorkingDbSelected.java | 2 +- .../validators/EchoBaseFieldValidatorSupport.java | 4 ++-- .../echobase/ui/validators/LoginValidator.java | 2 +- 332 files changed, 1134 insertions(+), 336 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseDateConverter.java b/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseDateConverter.java index 58e799d..316a7cf 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseDateConverter.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseDateConverter.java @@ -33,7 +33,7 @@ import java.util.Date; * A date converter to make possible convert from string using our default * format pattern. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class EchoBaseDateConverter extends DateTimeConverter { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseTechnicalException.java b/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseTechnicalException.java index 1f00ac4..6602706 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseTechnicalException.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseTechnicalException.java @@ -21,7 +21,7 @@ package fr.ifremer.echobase; /** - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class EchoBaseTechnicalException extends RuntimeException { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/I18nAble.java b/echobase-domain/src/main/java/fr/ifremer/echobase/I18nAble.java index 0b8ce73..0ee5f85 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/I18nAble.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/I18nAble.java @@ -23,7 +23,7 @@ package fr.ifremer.echobase; /** * Contract ot place on classes offering a i18n key. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public interface I18nAble { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseApplicationConfigProvider.java b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseApplicationConfigProvider.java index f557a08..2f79aa9 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseApplicationConfigProvider.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseApplicationConfigProvider.java @@ -32,7 +32,7 @@ import static org.nuiton.i18n.I18n.l; /** * To generate configuration report. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class EchoBaseApplicationConfigProvider implements ApplicationConfigProvider { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java index fbb1026..39f7e32 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java @@ -45,7 +45,7 @@ import java.util.Properties; /** * EchoBase configuration. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class EchoBaseConfiguration { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java index 740fa75..90c7a95 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java @@ -31,7 +31,7 @@ import static org.nuiton.i18n.I18n.n; /** * All EchoBase configuration options. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public enum EchoBaseConfigurationOption implements ConfigOptionDef { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/converter/FloatConverter.java b/echobase-domain/src/main/java/fr/ifremer/echobase/converter/FloatConverter.java index 9d8df80..e7365e7 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/converter/FloatConverter.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/converter/FloatConverter.java @@ -28,13 +28,13 @@ import static org.nuiton.i18n.I18n.t; /** * Created on 3/3/14. - * <p/> + * * A float converter which is not dependant on user locale to obtain the locale * {@code dot} representation. - * <p/> + * * It can transform {@code 0.2} and also {@code 0,2}. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6 */ public class FloatConverter implements Converter { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java b/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java index 0ddab72..8f36a97 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java @@ -33,7 +33,7 @@ import java.util.List; /** * To chain some {@link ValueParser} (different format supported). * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.3 */ public class ChainValueParser<E> implements ValueParser<E> { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java b/echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java index 0f73f1f..1976ce7 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java @@ -39,7 +39,7 @@ import java.util.Map; /** * Usefull class to build csv import-export models. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class EchoBaseCsvUtil extends TopiaCsvCommons { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ResultValueParser.java b/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ResultValueParser.java index 20da84d..53e17a9 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ResultValueParser.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ResultValueParser.java @@ -30,7 +30,7 @@ import java.text.ParseException; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class ResultValueParser implements ValueParser<Result> { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/AbstractEchoBaseDao.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/AbstractEchoBaseDao.java index ec14c5d..0c2128d 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/AbstractEchoBaseDao.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/AbstractEchoBaseDao.java @@ -32,7 +32,7 @@ import java.util.Map; /** * Created on 12/19/13. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.6 */ public abstract class AbstractEchoBaseDao<E extends TopiaEntity> extends AbstractTopiaDao<E> { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/DriverType.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/DriverType.java index 2e1dde2..bfb5a1f 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/DriverType.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/DriverType.java @@ -31,7 +31,7 @@ import static org.nuiton.i18n.I18n.n; /** * To define a type of driver (h2 or postgres for the moment). * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public enum DriverType implements I18nAble { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseInternalPersistenceContext.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseInternalPersistenceContext.java index 1126c3f..3be8206 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseInternalPersistenceContext.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseInternalPersistenceContext.java @@ -26,7 +26,7 @@ import org.nuiton.topia.persistence.TopiaPersistenceContext; /** * Created on 12/19/13. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.6 */ public interface EchoBaseInternalPersistenceContext extends TopiaPersistenceContext, EchoBaseInternalTopiaDaoSupplier{ diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserPersistenceContext.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserPersistenceContext.java index bb7d68d..54e7259 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserPersistenceContext.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserPersistenceContext.java @@ -28,7 +28,7 @@ import org.nuiton.topia.persistence.support.TopiaSqlSupport; /** * Created on 12/19/13. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.6 */ public interface EchoBaseUserPersistenceContext extends TopiaPersistenceContext, EchoBaseUserTopiaDaoSupplier { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueries.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueries.java index 83c2a13..6fc2a3e 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueries.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueries.java @@ -26,7 +26,7 @@ import java.util.regex.Pattern; /** * Useful methods aroud {@link ExportQuery}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.2 */ public class ExportQueries { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportLogs.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportLogs.java index 44c32ae..a1515ba 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportLogs.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportLogs.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java index 556866d..c341564 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java @@ -28,7 +28,7 @@ import static org.nuiton.i18n.I18n.n; /** * Define what import has been done. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public enum ImportType implements I18nAble { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Cells.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Cells.java index 2292ad5..fd18932 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Cells.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Cells.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.data; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.base.Predicates; diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/DataProcessings.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/DataProcessings.java index eaeb28f..6bf9582 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/DataProcessings.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/DataProcessings.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.data; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/EchotypeTopiaDao.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/EchotypeTopiaDao.java index b7423a0..88a1c6c 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/EchotypeTopiaDao.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/EchotypeTopiaDao.java @@ -28,7 +28,7 @@ import java.util.List; /** * User {@link EchotypeTopiaDao} implementation. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class EchotypeTopiaDao extends GeneratedEchotypeTopiaDao<Echotype> { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Echotypes.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Echotypes.java index eaaf870..224de77 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Echotypes.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Echotypes.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.data; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; import com.google.common.base.Predicate; diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Operations.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Operations.java index 732266d..151dfa5 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Operations.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Operations.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.data; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.Sets; diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Results.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Results.java index f5d5cc8..767949c 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Results.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Results.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.data; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Transects.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Transects.java index 637c183..ef71a31 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Transects.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Transects.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.data; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; import fr.ifremer.echobase.entities.references.Vessel; diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java index 35caf77..bd82774 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java @@ -33,7 +33,7 @@ import java.util.Set; /** * Default implementation of {@link Voyage}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class VoyageImpl extends VoyageAbstract { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Voyages.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Voyages.java index 4cef79e..026d149 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Voyages.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Voyages.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.data; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/AcousticInstruments.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/AcousticInstruments.java index f5ae207..6894d68 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/AcousticInstruments.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/AcousticInstruments.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; import com.google.common.base.Predicate; diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/AgeCategories.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/AgeCategories.java index e8821c0..aafc645 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/AgeCategories.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/AgeCategories.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/AreaOfOperations.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/AreaOfOperations.java index 4b9c6e5..4d352f6 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/AreaOfOperations.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/AreaOfOperations.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellMethods.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellMethods.java index ffe3166..6610804 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellMethods.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellMethods.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypes.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypes.java index 9f844d4..fce41ba 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypes.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypes.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.Sets; diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataMetadatas.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataMetadatas.java index ff94ca5..87185a2 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataMetadatas.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataMetadatas.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataQualities.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataQualities.java index 9cdbc4e..1a430aa 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataQualities.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataQualities.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataTypes.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataTypes.java index 971ffb3..86fb285 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataTypes.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataTypes.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DepthStratums.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DepthStratums.java index 08056ea..0f2272d 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DepthStratums.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DepthStratums.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/EchotypeCategories.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/EchotypeCategories.java index d90faf0..042e414 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/EchotypeCategories.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/EchotypeCategories.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/GearMetadatas.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/GearMetadatas.java index 424e2e8..9fcb3c5 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/GearMetadatas.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/GearMetadatas.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Gears.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Gears.java index f79c3ad..4865b41 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Gears.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Gears.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Missions.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Missions.java index 81745f7..5bacefa 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Missions.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Missions.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/OperationEvents.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/OperationEvents.java index ce7a168..bd55346 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/OperationEvents.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/OperationEvents.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/OperationMetadatas.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/OperationMetadatas.java index 90c0dc2..009d8f8 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/OperationMetadatas.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/OperationMetadatas.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/ReferenceDatumTypes.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/ReferenceDatumTypes.java index d034340..5826811 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/ReferenceDatumTypes.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/ReferenceDatumTypes.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/ReferenceDatums.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/ReferenceDatums.java index 1e7e089..8cbf317 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/ReferenceDatums.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/ReferenceDatums.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleDataTypes.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleDataTypes.java index 26dbffc..1411967 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleDataTypes.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleDataTypes.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SexCategories.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SexCategories.java index 6663a20..f77fd48 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SexCategories.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SexCategories.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SizeCategories.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SizeCategories.java index 0e6f750..06972f7 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SizeCategories.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SizeCategories.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; import com.google.common.base.Predicate; diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesCategories.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesCategories.java index ad2e0f5..15908d0 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesCategories.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SpeciesCategories.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Stratas.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Stratas.java index d5d0b95..118bcde 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Stratas.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Stratas.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/VesselTypes.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/VesselTypes.java index 416605e..640bdd2 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/VesselTypes.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/VesselTypes.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Vessels.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Vessels.java index 1adbec0..734c18c 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Vessels.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Vessels.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/spatial/SpatialConfiguration.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/spatial/SpatialConfiguration.java index c6cdf74..f6da2ac 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/spatial/SpatialConfiguration.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/spatial/SpatialConfiguration.java @@ -28,7 +28,7 @@ import java.io.Serializable; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.2 */ public class SpatialConfiguration implements Serializable { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/io/CommandLineUtils.java b/echobase-domain/src/main/java/fr/ifremer/echobase/io/CommandLineUtils.java index 0de9782..84987d5 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/io/CommandLineUtils.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/io/CommandLineUtils.java @@ -34,7 +34,7 @@ import java.io.IOException; /** * Utils method around a command line execution. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.8 */ public class CommandLineUtils { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java b/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java index 0202b0a..6040c81 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java @@ -50,7 +50,7 @@ import java.util.zip.ZipFile; /** * Usefull methods on io. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class EchoBaseIOUtil { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/io/InputFile.java b/echobase-domain/src/main/java/fr/ifremer/echobase/io/InputFile.java index 5f9cfb9..4ec8668 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/io/InputFile.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/io/InputFile.java @@ -26,7 +26,7 @@ import java.io.Serializable; /** * Object to receive a uploaded file. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class InputFile implements Serializable { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java index 172a06d..3cc1300 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java @@ -33,7 +33,7 @@ import java.util.List; /** * Metasof the working db. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class EchoBaseDbMeta extends DbMeta<EchoBaseUserEntityEnum> { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java index b57e5c1..d244b57 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java @@ -43,7 +43,7 @@ import java.sql.SQLException; /** * helper about topia context and jdbc connections. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class EchoBaseEntityHelper { @@ -107,9 +107,9 @@ public class EchoBaseEntityHelper { /** * Create a configuration to connect to the {@code postgres} database * from a normal database configuration. - * <p/> + * * This is used to create a new concrete database. - * <p/> + * * <strong>Note: </strong>This only works for postgresql database. * * @param jdbcConfiguration jdbc configuration diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java index 43ebeeb..0b9c227 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java @@ -28,7 +28,7 @@ import org.nuiton.topia.persistence.TopiaPersistenceHelper; /** * Persistence helper for working db. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @see TopiaPersistenceHelper * @since 1.1 */ diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaApplicationContexts.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaApplicationContexts.java index a1a42bb..665fa76 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaApplicationContexts.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaApplicationContexts.java @@ -42,7 +42,7 @@ import java.util.Properties; /** * To deal with topia context for echobase application. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class EchobaseTopiaApplicationContexts { @@ -76,7 +76,7 @@ public class EchobaseTopiaApplicationContexts { /** * Open a new topia root context from the given jdbc configuration and * create schema if asked and schema does not exist. - * <p/> + * * * @param jdbcConfiguration jdbc configuration * @return the new fresh root context diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/EchoBaseMigrationCallBackResolver.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/EchoBaseMigrationCallBackResolver.java index a85157d..47d42c2 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/EchoBaseMigrationCallBackResolver.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/EchoBaseMigrationCallBackResolver.java @@ -36,7 +36,7 @@ import java.util.Set; * Migration callBack resolver using service loader to discover version to * apply and using also a generic migration call back. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class EchoBaseMigrationCallBackResolver<C extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion> implements TopiaMigrationCallbackByClassNG.MigrationCallBackForVersionResolver { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion.java index 7aafd1e..6f776c8 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion.java @@ -30,7 +30,7 @@ import java.util.List; /** * Base migration support for a internal db. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public abstract class MigrationCallBackForVersion extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion<EchoBaseInternalTopiaPersistenceContext> { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java index 3e62fc3..ecdcd13 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java @@ -39,7 +39,7 @@ import java.util.List; /** * Migrate internal db to version {@code 2.2}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.2 */ public class MigrationCallBackForVersion2_2 extends MigrationCallBackForVersion { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallback.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallback.java index d1251ad..8adc25d 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallback.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallback.java @@ -32,7 +32,7 @@ import java.util.List; /** * EchoBase Migration callback for internal db. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class MigrationCallback extends TopiaMigrationCallbackByClassNG<EchoBaseInternalTopiaPersistenceContext> { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion.java index 8e20f24..b29da47 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion.java @@ -30,7 +30,7 @@ import java.util.List; /** * Base migration support for a working db. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public abstract class MigrationCallBackForVersion extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion<EchoBaseUserTopiaPersistenceContext> { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_2.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_2.java index 705a6cc..219e478 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_2.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_2.java @@ -32,7 +32,7 @@ import java.util.List; /** * Migrate workgin db to version {@code 2.2}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.2 */ public class MigrationCallBackForVersion2_2 extends MigrationCallBackForVersion { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5_1.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5_1.java index a858b68..04840aa 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5_1.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5_1.java @@ -30,7 +30,7 @@ import java.util.List; /** * Created on 12/16/13. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.5.1 */ public class MigrationCallBackForVersion2_5_1 extends MigrationCallBackForVersion { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java index 87479cf..ee710f9 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java @@ -35,7 +35,7 @@ import java.util.List; /** * Created on 2/26/14. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6 */ public class MigrationCallBackForVersion2_6 extends MigrationCallBackForVersion { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java index f38c3da..bb93b25 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java @@ -30,7 +30,7 @@ import java.util.List; /** * Created on 4/16/14. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.7 */ public class MigrationCallBackForVersion2_6_1 extends MigrationCallBackForVersion { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallback.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallback.java index ea103fa..d0fc3f8 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallback.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallback.java @@ -32,7 +32,7 @@ import java.util.List; /** * EchoBase Migration callback for working db. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.3 */ public class MigrationCallback extends TopiaMigrationCallbackByClassNG<EchoBaseUserTopiaPersistenceContext> { diff --git a/echobase-domain/src/test/java/fr/ifremer/echobase/EchoBaseDateConverterTest.java b/echobase-domain/src/test/java/fr/ifremer/echobase/EchoBaseDateConverterTest.java index 9507a42..85ae82e 100644 --- a/echobase-domain/src/test/java/fr/ifremer/echobase/EchoBaseDateConverterTest.java +++ b/echobase-domain/src/test/java/fr/ifremer/echobase/EchoBaseDateConverterTest.java @@ -34,7 +34,7 @@ import java.util.Date; /** * Tests the {@link EchoBaseDateConverter}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class EchoBaseDateConverterTest { diff --git a/echobase-domain/src/test/java/fr/ifremer/echobase/persistence/EchoBaseDbMetaTest.java b/echobase-domain/src/test/java/fr/ifremer/echobase/persistence/EchoBaseDbMetaTest.java index 28983a6..65f08d2 100644 --- a/echobase-domain/src/test/java/fr/ifremer/echobase/persistence/EchoBaseDbMetaTest.java +++ b/echobase-domain/src/test/java/fr/ifremer/echobase/persistence/EchoBaseDbMetaTest.java @@ -35,7 +35,7 @@ import java.util.List; /** * To test the class {@link EchoBaseDbMeta}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class EchoBaseDbMetaTest { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java index 3406240..046348c 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java @@ -28,7 +28,7 @@ import java.io.Serializable; /** * Abstract long action configuration. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public abstract class AbstractEchobaseActionConfiguration implements Serializable, ProgressModel { @@ -133,7 +133,7 @@ public abstract class AbstractEchobaseActionConfiguration implements Serializabl /** * Default progression model implementation. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public static class DefaultProgressModel implements ProgressModel { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java index cfaf241..d770b88 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java @@ -36,7 +36,7 @@ import java.util.Locale; /** * Instances of this class will be given to service factory. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class DefaultEchoBaseServiceContext implements EchoBaseServiceContext { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseService.java index 5f1c36c..709a7dd 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseService.java @@ -25,7 +25,7 @@ package fr.ifremer.echobase.services; * Contract to place on each EchoBase service to push the {@code serviceContext} * inside the service. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @see EchoBaseServiceContext * @since 0.1 */ diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContext.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContext.java index 4d69e8b..d281dff 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContext.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContext.java @@ -36,7 +36,7 @@ import java.util.Locale; * Objects provided may be injected in services returned by * {@link #newService(Class)} * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public interface EchoBaseServiceContext { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/EchobaseAieOC.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/EchobaseAieOC.java index f19aee4..fa042e2 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/EchobaseAieOC.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/EchobaseAieOC.java @@ -32,10 +32,10 @@ import java.lang.reflect.Field; /** * To inject some stuff. - * <p/> + * * Created on 12/21/13. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6 */ public abstract class EchobaseAieOC { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/ProgressModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/ProgressModel.java index 6fd633a..d136337 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/ProgressModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/ProgressModel.java @@ -27,7 +27,7 @@ import java.io.Serializable; /** * Contract for a progression model while long service actions. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public interface ProgressModel extends CsvProgressModel, Serializable { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/ServiceEchobaseAieOC.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/ServiceEchobaseAieOC.java index 8e8effe..617a20d 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/ServiceEchobaseAieOC.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/ServiceEchobaseAieOC.java @@ -29,7 +29,7 @@ import java.lang.reflect.Field; /** * Created on 12/21/13. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6 */ public class ServiceEchobaseAieOC extends EchobaseAieOC { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/CoserApiService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/CoserApiService.java index b50ebdf..35f1c41 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/CoserApiService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/CoserApiService.java @@ -47,10 +47,10 @@ import java.util.Set; /** * To request Coser API. - * <p/> + * * Created on 3/23/14. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.5 */ public class CoserApiService extends EchoBaseServiceSupport { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/CoserIndicators.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/CoserIndicators.java index de4edfb..9425668 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/CoserIndicators.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/CoserIndicators.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.services.service; +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.echobase.entities.references.DataMetadata; import java.util.List; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java index 56bd3c3..ba61704 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java @@ -72,7 +72,7 @@ import static org.nuiton.i18n.I18n.l; /** * Service to edit the database. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class DbEditorService extends EchoBaseServiceSupport { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java index a3560d2..04f7d2a 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java @@ -101,7 +101,7 @@ import static org.nuiton.i18n.I18n.l; /** * Service to decorate entities. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class DecoratorService extends EchoBaseServiceSupport { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java index 46c321c..cdba5a5 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java @@ -104,7 +104,7 @@ import java.util.zip.GZIPOutputStream; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.2 */ public class UserDbPersistenceService extends EchoBaseServiceSupport { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationConfiguration.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationConfiguration.java index 90738ef..0d6e8ab 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationConfiguration.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationConfiguration.java @@ -30,7 +30,7 @@ import java.util.Arrays; /** * Configuration of a embedded application creation. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class EmbeddedApplicationConfiguration extends AbstractEchobaseActionConfiguration { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationService.java index 721e42c..2f6e853 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationService.java @@ -66,7 +66,7 @@ import java.util.List; /** * To create embedded application. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @author sletellier <letellier@codelutin.com> * @since 0.1 */ diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserConfiguration.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserConfiguration.java index 13d97e6..cf9d642 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserConfiguration.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserConfiguration.java @@ -33,7 +33,7 @@ import java.util.Set; /** * Created on 3/1/14. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6 */ public class ExportCoserConfiguration extends AbstractEchobaseActionConfiguration { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserService.java index 21b53fc..dd1d72c 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserService.java @@ -62,7 +62,7 @@ import java.util.Set; /** * Created on 3/1/14. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6 */ public class ExportCoserService extends EchoBaseServiceSupport { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/IndicatorExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/IndicatorExportModel.java index ee6b846..949a930 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/IndicatorExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/IndicatorExportModel.java @@ -27,7 +27,7 @@ import org.nuiton.csv.ext.AbstractExportModel; /** * Created on 3/20/14. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6 */ public class IndicatorExportModel extends AbstractExportModel<IndicatorExportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/IndicatorExportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/IndicatorExportRow.java index 24d489d..d959575 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/IndicatorExportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/IndicatorExportRow.java @@ -30,7 +30,7 @@ import java.util.Date; /** * Created on 3/20/14. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6 */ public class IndicatorExportRow { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataCatchExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataCatchExportModel.java index 9617467..21bee94 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataCatchExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataCatchExportModel.java @@ -43,7 +43,7 @@ import java.util.Map; /** * Created on 4/5/14. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6 */ public class RawDataCatchExportModel extends AbstractExportModel<RawDataCatchExportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataCatchExportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataCatchExportRow.java index b987e00..460d593 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataCatchExportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataCatchExportRow.java @@ -28,7 +28,7 @@ import fr.ifremer.echobase.entities.references.Species; /** * Created on 4/5/14. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6 */ public class RawDataCatchExportRow { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportModel.java index 08cd802..9099deb 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportModel.java @@ -45,7 +45,7 @@ import java.util.Map; /** * Created on 4/5/14. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6 */ public class RawDataSizeExportModel extends AbstractExportModel<RawDataSizeExportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportRow.java index ad79c52..baa8fcb 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataSizeExportRow.java @@ -30,7 +30,7 @@ import fr.ifremer.echobase.entities.references.Species; /** * Created on 4/5/14. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6 */ public class RawDataSizeExportRow { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataStrataExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataStrataExportModel.java index 47e4c8f..3997a55 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataStrataExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataStrataExportModel.java @@ -34,7 +34,7 @@ import java.util.List; /** * Created on 4/5/14. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6 */ public class RawDataStrataExportModel extends AbstractExportModel<RawDataStrataExportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataStrataExportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataStrataExportRow.java index 29431cf..796ff5e 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataStrataExportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/RawDataStrataExportRow.java @@ -28,7 +28,7 @@ import fr.ifremer.echobase.entities.data.Voyage; /** * Created on 4/5/14. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6 */ public class RawDataStrataExportRow { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/SpeciesExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/SpeciesExportModel.java index 650c7a0..99152ba 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/SpeciesExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/SpeciesExportModel.java @@ -31,7 +31,7 @@ import java.util.List; /** * Created on 3/5/14. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6 */ public class SpeciesExportModel extends AbstractExportModel<SpeciesExportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/SpeciesExportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/SpeciesExportRow.java index 4f1e7bb..750a641 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/SpeciesExportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/SpeciesExportRow.java @@ -26,7 +26,7 @@ import fr.ifremer.echobase.entities.references.Species; /** * Created on 4/5/14. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6 */ public class SpeciesExportRow { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbConfiguration.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbConfiguration.java index e08792d..f53b97c 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbConfiguration.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbConfiguration.java @@ -30,7 +30,7 @@ import java.io.IOException; /** * Configuration of a complete db export. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class ExportDbConfiguration extends AbstractEchobaseActionConfiguration { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbMode.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbMode.java index 6eeb77e..940aef7 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbMode.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbMode.java @@ -28,7 +28,7 @@ import static org.nuiton.i18n.I18n.n; /** * Db export mode. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public enum ExportDbMode implements I18nAble { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbService.java index 8cf2cb7..dda9eae 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbService.java @@ -53,7 +53,7 @@ import java.util.Set; /** * Service to import / export a complete db. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class ExportDbService extends EchoBaseServiceSupport { @@ -207,7 +207,7 @@ public class ExportDbService extends EchoBaseServiceSupport { /** * entity visitor to export data to csv files. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ static class ReplicateEntityVisitor extends ExportEntityVisitor<EchoBaseUserEntityEnum> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportService.java index 7f6fc76..63a6b93 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportService.java @@ -45,7 +45,7 @@ import java.io.File; /** * To export datas from db to csv files. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class ExportService extends EchoBaseServiceSupport { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryCsvModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryCsvModel.java index 488b673..a6fe12e 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryCsvModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryCsvModel.java @@ -29,7 +29,7 @@ import java.util.Map; /** * Csv model to export sql in {@link ExportQueryService}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class ExportQueryCsvModel extends AbstractExportModel<Map<String, Object>> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryInvalidNameException.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryInvalidNameException.java index d01d921..c8b206e 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryInvalidNameException.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryInvalidNameException.java @@ -24,7 +24,7 @@ package fr.ifremer.echobase.services.service.exportquery; /** * To be thrown if a query has not a valid query name. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ public class ExportQueryInvalidNameException extends Exception { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryNameAlreadyExistException.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryNameAlreadyExistException.java index df16eba..a2b80fe 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryNameAlreadyExistException.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryNameAlreadyExistException.java @@ -23,7 +23,7 @@ package fr.ifremer.echobase.services.service.exportquery; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class ExportQueryNameAlreadyExistException extends Exception { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryNotFoundException.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryNotFoundException.java index 6a2e085..c358173 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryNotFoundException.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryNotFoundException.java @@ -24,7 +24,7 @@ package fr.ifremer.echobase.services.service.exportquery; /** * When a export query is not found. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ public class ExportQueryNotFoundException extends Exception { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java index b4f1353..2d30111 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java @@ -44,7 +44,7 @@ import java.util.Map; /** * Service to deal with sql export. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class ExportQueryService extends EchoBaseServiceSupport { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/GenericSQLQuery.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/GenericSQLQuery.java index ce2ec04..ec10082 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/GenericSQLQuery.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/GenericSQLQuery.java @@ -39,7 +39,7 @@ import java.util.Map; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ public class GenericSQLQuery extends TopiaSqlQuery<Map<String, Object>> { @@ -115,7 +115,7 @@ public class GenericSQLQuery extends TopiaSqlQuery<Map<String, Object>> { /** * From a given result set, let's count his number of row. - * <p/> + * * <strong>Note:</strong> the result set must be scrollable to go back to * before first row. * diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportConfiguration.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportConfiguration.java index cd82dae..7359866 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportConfiguration.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportConfiguration.java @@ -34,7 +34,7 @@ import java.util.Set; /** * Common import data configuration. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public abstract class AbstractImportConfiguration extends AbstractEchobaseActionConfiguration { @@ -52,7 +52,7 @@ public abstract class AbstractImportConfiguration extends AbstractEchobaseAction /** * Import type. - * <p/> + * * This will be saved in the ImportLog table. * * @since 1.2 diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java index f7bd557..d8d0384 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java @@ -70,7 +70,7 @@ import static org.nuiton.i18n.I18n.l; /** * Abstract data import service. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public abstract class AbstractImportDataService<M extends AbstractImportConfiguration> extends EchoBaseServiceSupport { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportConfiguration.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportConfiguration.java index 8f78c61..e1247ed 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportConfiguration.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportConfiguration.java @@ -31,7 +31,7 @@ import static org.nuiton.i18n.I18n.l; /** * Configuration of a "accoustic datas" import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class AcousticImportConfiguration extends AbstractImportConfiguration { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportResult.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportResult.java index 74f291a..fe18cb6 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportResult.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportResult.java @@ -33,7 +33,7 @@ import java.util.Set; * {@link CsvFileImportResult} with support for ids to keep in the * {@link ImportLog#getImportId()}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public class AcousticImportResult extends EchoBaseCsvFileImportResult { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java index 878f9b8..b7d3a0f 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java @@ -64,7 +64,7 @@ import static org.nuiton.i18n.I18n.l; /** * Service to launch a "acoustic data" import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class AcousticImportService extends AbstractImportDataService<AcousticImportConfiguration> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportConfiguration.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportConfiguration.java index 94e5ceb..660ff63 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportConfiguration.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportConfiguration.java @@ -30,7 +30,7 @@ import static org.nuiton.i18n.I18n.l; /** * Configuration of a "catches data import". * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class CatchesImportConfiguration extends AbstractImportConfiguration { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportService.java index 3a97890..fb53f54 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportService.java @@ -64,7 +64,7 @@ import static org.nuiton.i18n.I18n.l; /** * Service to launch a "catches sample data" import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class CatchesImportService extends AbstractImportDataService<CatchesImportConfiguration> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CellPositionReference.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CellPositionReference.java index 82b1770..e6f979e 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CellPositionReference.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CellPositionReference.java @@ -27,7 +27,7 @@ import static org.nuiton.i18n.I18n.n; /** * To define cell position reference in acoustic import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public enum CellPositionReference implements I18nAble { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportService.java index fa45965..7815863 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportService.java @@ -30,7 +30,7 @@ import java.util.Map; /** * Service to launch a "common all data" import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class CommonAllImportService extends AbstractImportDataService<CommonImportConfiguration> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonImportConfiguration.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonImportConfiguration.java index dbc7458..3747ae3 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonImportConfiguration.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonImportConfiguration.java @@ -29,7 +29,7 @@ import static org.nuiton.i18n.I18n.l; /** * Configuration of a "common data complete" import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class CommonImportConfiguration extends AbstractImportConfiguration { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonImportService.java index c9113a2..d9f3ac7 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonImportService.java @@ -32,7 +32,7 @@ import javax.inject.Inject; /** * Service to launch a "common data" import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class CommonImportService extends AbstractImportDataService<CommonImportConfiguration> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportService.java index 58f3800..d6804a4 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportService.java @@ -47,7 +47,7 @@ import static org.nuiton.i18n.I18n.l; /** * Service to launch a "common transect data" import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class CommonTransectImportService extends AbstractImportDataService<CommonImportConfiguration> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportService.java index 7e71d76..155f90d 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportService.java @@ -42,7 +42,7 @@ import java.util.Map; /** * Service to launch a "common transit data" import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.2 */ public class CommonTransitImportService extends AbstractImportDataService<CommonImportConfiguration> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportService.java index 778e60b..345a888 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportService.java @@ -42,7 +42,7 @@ import static org.nuiton.i18n.I18n.l; /** * Service to launch a "common voyage data" import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.2 */ public class CommonVoyageImportService extends AbstractImportDataService<CommonImportConfiguration> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/EchoBaseCsvFileImportResult.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/EchoBaseCsvFileImportResult.java index c847276..a95c6d1 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/EchoBaseCsvFileImportResult.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/EchoBaseCsvFileImportResult.java @@ -33,7 +33,7 @@ import java.util.List; * {@link CsvFileImportResult} with support for ids to keep in the * {@link ImportLog#getImportId()}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public class EchoBaseCsvFileImportResult extends CsvFileImportResult<EchoBaseUserEntityEnum> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportException.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportException.java index c586706..481a5e6 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportException.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportException.java @@ -29,7 +29,7 @@ import static org.nuiton.i18n.I18n.l; /** * Exception when a import new data failed. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class ImportException extends Exception { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MissionNameAlreadyExistException.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MissionNameAlreadyExistException.java index 8089cce..326d9fb 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MissionNameAlreadyExistException.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MissionNameAlreadyExistException.java @@ -23,7 +23,7 @@ package fr.ifremer.echobase.services.service.importdata; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class MissionNameAlreadyExistException extends Exception { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportConfiguration.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportConfiguration.java index 15b2b30..2aff4f0 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportConfiguration.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportConfiguration.java @@ -30,7 +30,7 @@ import static org.nuiton.i18n.I18n.l; /** * Configuration of a "operation" import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class OperationImportConfiguration extends AbstractImportConfiguration { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportService.java index 6941a55..ca66839 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportService.java @@ -60,7 +60,7 @@ import java.util.Map; /** * Service to launch a "operations" import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class OperationImportService extends AbstractImportDataService<OperationImportConfiguration> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportService.java index e0d6212..349e97c 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportService.java @@ -64,7 +64,7 @@ import java.util.Map; /** * To import results attached to a voyage (but not cells). * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class ResultsEsduCellImportService extends AbstractImportDataService<ResultsImportConfiguration> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportConfiguration.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportConfiguration.java index 6e6f750..75cd1f2 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportConfiguration.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportConfiguration.java @@ -29,7 +29,7 @@ import static org.nuiton.i18n.I18n.l; /** * Configuration of a "results" import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class ResultsImportConfiguration extends AbstractImportConfiguration { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportService.java index 27a922b..82be42b 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportService.java @@ -38,7 +38,7 @@ import java.util.Map; /** * Service to launch a "results" import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class ResultsImportService extends AbstractImportDataService<ResultsImportConfiguration> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportService.java index 46961c5..ab15c65 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportService.java @@ -57,7 +57,7 @@ import java.util.Map; /** * To import map fish results attached to a voyage. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class ResultsMapFishCellImportService extends AbstractImportDataService<ResultsImportConfiguration> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportService.java index 0b654c4..8397c33 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportService.java @@ -51,7 +51,7 @@ import java.util.Map; /** * To import map other results attached to a voyage. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.2 */ public class ResultsMapOtherCellImportService extends AbstractImportDataService<ResultsImportConfiguration> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportService.java index 75cd81d..b3e6773 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportService.java @@ -63,7 +63,7 @@ import java.util.Set; /** * To import regions results attached to a voyage. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class ResultsRegionCellImportService extends AbstractImportDataService<ResultsImportConfiguration> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportAlreadyExistException.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportAlreadyExistException.java index ee1230a..016b3af 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportAlreadyExistException.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportAlreadyExistException.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.services.service.importdata; +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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% + */ + /** * Created on 1/21/15. * diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportService.java index 95c90aa..e47112f 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportService.java @@ -62,7 +62,7 @@ import static org.nuiton.i18n.I18n.l; /** * To import results attached to a voyage (but not cells). * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class ResultsVoyageImportService extends AbstractImportDataService<ResultsImportConfiguration> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportModel.java index 320f932..115a10d 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportModel.java @@ -35,7 +35,7 @@ import java.util.Map; * To import acoustic datas (says {@link DataAcquisition}, * {@link DataProcessing}, {@link Cell} and {@link Data}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class AcousticImportModel extends AbstractImportModel<AcousticImportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportRow.java index a3db1d1..7187740 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportRow.java @@ -28,7 +28,7 @@ import java.util.Date; /** * Bean of a row for {@link AcousticImportModel} import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class AcousticImportRow { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportModel.java index 1da73b2..1e0a69a 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportModel.java @@ -33,7 +33,7 @@ import java.util.Map; /** * Model to import {@link Sample} of total biometry. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class BiometrySampleImportModel extends AbstractImportModel<BiometrySampleImportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportRow.java index cc5a9ab..482c7e2 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportRow.java @@ -29,7 +29,7 @@ import fr.ifremer.echobase.entities.references.Species; /** * Bean used as a row for import of {@link BiometrySampleImportModel}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class BiometrySampleImportRow { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchotypeImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchotypeImportModel.java index d7197fb..a82181a 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchotypeImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchotypeImportModel.java @@ -32,7 +32,7 @@ import java.util.Map; /** * Model to import echotypes. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class EchotypeImportModel extends AbstractImportModel<EchotypeImportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchotypeImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchotypeImportRow.java index fd2df38..4b4fe18 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchotypeImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchotypeImportRow.java @@ -31,7 +31,7 @@ import java.io.Serializable; /** * Bean used as a row for import of {@link EchotypeImportModel}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class EchotypeImportRow implements Serializable { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java index 3586220..fd13b51 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java @@ -37,7 +37,7 @@ import java.util.Map; /** * Model to import {@link Result} for esdu cell and echotypes. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class EsduResultByEchotypeAndSpeciesCategoryImportModel extends AbstractImportModel<EsduResultByEchotypeAndSpeciesCategoryImportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportRow.java index ea75948..1f7c0cf 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportRow.java @@ -36,7 +36,7 @@ import java.util.List; * Bean used as a row for import of * {@link EsduResultByEchotypeAndSpeciesCategoryImportModel}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class EsduResultByEchotypeAndSpeciesCategoryImportRow implements EchoBaseCsvUtil.ResultAble { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportModel.java index 8a81674..ef2ad10 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportModel.java @@ -35,7 +35,7 @@ import java.util.Map; /** * Model to import {@link Result} for esdu cell and echotypes. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class EsduResultByEchotypeImportModel extends AbstractImportModel<EsduResultByEchotypeImportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportRow.java index 11396b4..11b8785 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportRow.java @@ -33,7 +33,7 @@ import java.util.List; /** * Bean used as a row for import of {@link EsduResultByEchotypeImportModel}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class EsduResultByEchotypeImportRow implements EchoBaseCsvUtil.ResultAble { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java index dcfee16..65c6be0 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java @@ -35,7 +35,7 @@ import java.util.Map; /** * Model to import {@link Result} for esdu cell and species and size category. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class EsduResultBySpeciesAndAgeCategoryImportModel extends AbstractImportModel<EsduResultBySpeciesAndAgeCategoryImportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportRow.java index 3b2af2f..f4599b5 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportRow.java @@ -34,7 +34,7 @@ import java.util.List; * Bean used as a row for import of * {@link EsduResultBySpeciesAndAgeCategoryImportModel}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class EsduResultBySpeciesAndAgeCategoryImportRow implements EchoBaseCsvUtil.ResultAble { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java index 911433b..90c1e9a 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java @@ -35,7 +35,7 @@ import java.util.Map; /** * Model to import {@link Result} for esdu cell and species and size category. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class EsduResultBySpeciesAndSizeCategoryImportModel extends AbstractImportModel<EsduResultBySpeciesAndSizeCategoryImportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportRow.java index cc8d781..a709de5 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportRow.java @@ -34,7 +34,7 @@ import java.util.List; * Bean used as a row for import of * {@link EsduResultBySpeciesAndSizeCategoryImportModel}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class EsduResultBySpeciesAndSizeCategoryImportRow implements EchoBaseCsvUtil.ResultAble { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/GearMetadataValueImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/GearMetadataValueImportModel.java index a705362..7eea2ef 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/GearMetadataValueImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/GearMetadataValueImportModel.java @@ -33,7 +33,7 @@ import java.util.Map; /** * Model to import {@link GearMetadataValue}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class GearMetadataValueImportModel extends AbstractImportModel<GearMetadataValueImportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/GearMetadataValueImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/GearMetadataValueImportRow.java index 24a3663..0ef4984 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/GearMetadataValueImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/GearMetadataValueImportRow.java @@ -31,7 +31,7 @@ import fr.ifremer.echobase.entities.references.Vessel; /** * Bean used as a row for import of {@link GearMetadataValueImportModel}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class GearMetadataValueImportRow { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthAgeKeyImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthAgeKeyImportModel.java index 55bd4db..1fe4921 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthAgeKeyImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthAgeKeyImportModel.java @@ -32,7 +32,7 @@ import java.util.Map; /** * Model to import {@link LengthAgeKey}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class LengthAgeKeyImportModel extends AbstractImportModel<LengthAgeKeyImportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthAgeKeyImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthAgeKeyImportRow.java index 77d07e8..4beb6ce 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthAgeKeyImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthAgeKeyImportRow.java @@ -31,7 +31,7 @@ import java.io.Serializable; /** * Bean used as a row for import of {@link LengthAgeKeyImportModel}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class LengthAgeKeyImportRow implements Serializable { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthWeightKeyImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthWeightKeyImportModel.java index 65331ae..c256543 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthWeightKeyImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthWeightKeyImportModel.java @@ -33,7 +33,7 @@ import java.util.Map; /** * Model to import {@link LengthWeightKey}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class LengthWeightKeyImportModel extends AbstractImportModel<LengthWeightKeyImportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthWeightKeyImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthWeightKeyImportRow.java index 7ec7c04..f08012c 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthWeightKeyImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthWeightKeyImportRow.java @@ -32,7 +32,7 @@ import java.io.Serializable; /** * Bean used as a row for import of {@link LengthWeightKeyImportModel}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class LengthWeightKeyImportRow implements Serializable { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportModel.java index a9129d2..0f96316 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportModel.java @@ -36,7 +36,7 @@ import java.util.Map; /** * Model to import cells of type 'Map'. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class MapCellImportModel extends AbstractImportModel<MapCellImportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportRow.java index 5d1f060..6169077 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportRow.java @@ -37,7 +37,7 @@ import java.util.List; /** * Bean used as a row for import of {@link MapCellImportModel}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class MapCellImportRow implements EchoBaseCsvUtil.ResultAble { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationImportModel.java index e1bbcb8..430c6d5 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationImportModel.java @@ -32,7 +32,7 @@ import java.util.Map; /** * Model to import {@link Operation}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class OperationImportModel extends AbstractImportModel<OperationImportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationImportRow.java index 5c7aaaf..48496ab 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationImportRow.java @@ -32,7 +32,7 @@ import java.util.Date; /** * Bean used as a row for import of {@link OperationImportModel}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class OperationImportRow { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationMetadataValueImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationMetadataValueImportModel.java index dfd91ab..2b03c00 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationMetadataValueImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationMetadataValueImportModel.java @@ -32,7 +32,7 @@ import java.util.Map; /** * Model to import {@link OperationMetadataValue}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class OperationMetadataValueImportModel extends AbstractImportModel<OperationMetadataValueImportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationMetadataValueImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationMetadataValueImportRow.java index cb6a17d..6a12174 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationMetadataValueImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationMetadataValueImportRow.java @@ -30,7 +30,7 @@ import fr.ifremer.echobase.entities.references.Vessel; /** * Bean used as a row for import of {@link OperationMetadataValueImportModel}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class OperationMetadataValueImportRow { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportModel.java index 4735a99..c7785e1 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportModel.java @@ -30,7 +30,7 @@ import java.util.Map; /** * Model to import cells associations from region cells and esdu cells. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class RegionCellAssociationImportModel extends AbstractImportModel<RegionCellAssociationImportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportRow.java index ca16afd..1a21f2f 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportRow.java @@ -26,7 +26,7 @@ import fr.ifremer.echobase.entities.data.Voyage; /** * Bean used as a row for import of {@link RegionCellAssociationImportModel}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class RegionCellAssociationImportRow { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportModel.java index 7b463cb..487e73c 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportModel.java @@ -31,7 +31,7 @@ import java.util.Map; /** * Model to import cells (with type "region"). * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class RegionCellImportModel extends AbstractImportModel<RegionCellImportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportRow.java index c7c6913..d1a0678 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportRow.java @@ -27,7 +27,7 @@ import fr.ifremer.echobase.entities.references.DataQuality; /** * Bean used as a row for import of {@link RegionCellImportModel}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class RegionCellImportRow { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportModel.java index 91241d1..8e2f5c0 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportModel.java @@ -36,7 +36,7 @@ import java.util.Map; /** * Model to import results of cell of type 'Region'. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class RegionCellResultImportModel extends AbstractImportModel<RegionCellResultImportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportRow.java index 76afafd..da4dbb1 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportRow.java @@ -35,7 +35,7 @@ import java.util.List; /** * Bean used as a row for import of {@link RegionCellResultImportModel}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class RegionCellResultImportRow implements EchoBaseCsvUtil.ResultAble { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportModel.java index 89618fc..2c25e55 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportModel.java @@ -34,7 +34,7 @@ import java.util.Map; /** * Model to import {@link SampleData}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class SubSampleImportModel extends AbstractImportModel<SubSampleImportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportRow.java index 7fce580..31f6ba9 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportRow.java @@ -30,7 +30,7 @@ import fr.ifremer.echobase.entities.references.Species; /** * Bean used as a row for import of {@link SubSampleImportModel}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class SubSampleImportRow { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportModel.java index e0254b1..f2499d1 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportModel.java @@ -32,7 +32,7 @@ import java.util.Map; /** * Model to import {@link Sample} of total type. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class TotalSampleImportModel extends AbstractImportModel<TotalSampleImportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportRow.java index 56dd7b0..f383d99 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportRow.java @@ -29,7 +29,7 @@ import fr.ifremer.echobase.entities.references.Species; /** * Bean used as a row for import of {@link TotalSampleImportModel}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class TotalSampleImportRow { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportModel.java index 8a202ee..31363f7 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportModel.java @@ -31,7 +31,7 @@ import java.util.Map; /** * Model to import transects. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class TransectImportModel extends AbstractImportModel<TransectImportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportRow.java index e5ed98c..67a2a6d 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportRow.java @@ -31,7 +31,7 @@ import java.util.Date; /** * Bean used as a row for import of {@link TransectImportModel}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class TransectImportRow implements Serializable { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransitImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransitImportModel.java index 34ad934..3ea2234 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransitImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransitImportModel.java @@ -30,7 +30,7 @@ import java.util.Map; /** * Model to import Transits. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class TransitImportModel extends AbstractImportModel<TransitImportRow> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransitImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransitImportRow.java index ed73e75..ebc1f7f 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransitImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransitImportRow.java @@ -29,7 +29,7 @@ import java.util.Date; /** * Bean used as a row for import of {@link TransitImportModel}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class TransitImportRow { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageImportModel.java index 5004541..2c399cd 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageImportModel.java @@ -28,7 +28,7 @@ import org.nuiton.topia.service.csv.in.AbstractImportModel; /** * Model to import Voyages. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class VoyageImportModel extends AbstractImportModel<Voyage> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/EchoBaseImportModelFactory.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/EchoBaseImportModelFactory.java index 99fd7ba..311ae55 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/EchoBaseImportModelFactory.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/EchoBaseImportModelFactory.java @@ -39,7 +39,7 @@ import java.util.Map; /** * Import model factory. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public class EchoBaseImportModelFactory implements ImportModelFactory<EchoBaseUserEntityEnum> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbConfiguration.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbConfiguration.java index a4633c2..d7ac294 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbConfiguration.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbConfiguration.java @@ -34,7 +34,7 @@ import static org.nuiton.i18n.I18n.l; /** * Configuration of a import db operation. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class ImportDbConfiguration extends AbstractEchobaseActionConfiguration { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbMode.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbMode.java index abcc17c..f5af842 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbMode.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbMode.java @@ -28,7 +28,7 @@ import static org.nuiton.i18n.I18n.n; /** * Select import db mode. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public enum ImportDbMode implements I18nAble { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java index 2328aed..5c60def 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java @@ -34,7 +34,7 @@ import java.io.IOException; /** * Service to import a complete db. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class ImportDbService extends EchoBaseServiceSupport { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportService.java index 067d793..75fb24d 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportService.java @@ -46,7 +46,7 @@ import java.io.IOException; /** * To import datas from a csv file into the db. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class ImportService extends EchoBaseServiceSupport { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/AbstractImportDbStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/AbstractImportDbStrategy.java index 88bb018..9674839 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/AbstractImportDbStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/AbstractImportDbStrategy.java @@ -59,7 +59,7 @@ import java.util.zip.ZipFile; /** * Abstract import db strategy. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public abstract class AbstractImportDbStrategy extends EchoBaseServiceSupport { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/EchoBaseImportStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/EchoBaseImportStrategy.java index d0a922c..e5895f4 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/EchoBaseImportStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/EchoBaseImportStrategy.java @@ -42,7 +42,7 @@ import java.util.Map; /** * How to import csv files. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class EchoBaseImportStrategy implements ImportStrategy<EchoBaseUserEntityEnum> { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/FreeImportDbStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/FreeImportDbStrategy.java index 59ccd04..3bec81d 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/FreeImportDbStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/FreeImportDbStrategy.java @@ -43,7 +43,7 @@ import java.util.zip.ZipEntry; /** * Free import db strategy (can import either referential or/and data). * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public class FreeImportDbStrategy extends AbstractImportDbStrategy { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/ReferentialImportDbStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/ReferentialImportDbStrategy.java index c800a2f..890f1d2 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/ReferentialImportDbStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/ReferentialImportDbStrategy.java @@ -39,7 +39,7 @@ import java.util.zip.ZipEntry; /** * Referential only import db strategy. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public class ReferentialImportDbStrategy extends AbstractImportDbStrategy { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataConfiguration.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataConfiguration.java index cf23150..21ad2b6 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataConfiguration.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataConfiguration.java @@ -26,7 +26,7 @@ import fr.ifremer.echobase.services.AbstractEchobaseActionConfiguration; /** * Configuration for a remve data action. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public class RemoveDataConfiguration extends AbstractEchobaseActionConfiguration { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java index f9e71e4..105838b 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java @@ -61,7 +61,7 @@ import java.util.Set; /** * Service to remove an import data. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public class RemoveDataService extends EchoBaseServiceSupport { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java index b8f8a59..9a90b82 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java @@ -44,7 +44,7 @@ import java.util.Set; /** * Abstract service to remove import data. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public abstract class AbstractRemoveDataStrategy extends EchoBaseServiceSupport { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AcousticRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AcousticRemoveDataStrategy.java index 8547fea..da58e38 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AcousticRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AcousticRemoveDataStrategy.java @@ -37,10 +37,10 @@ import java.util.Set; /** * Remove a {@link ImportType#ACOUSTIC} import. - * <p/> + * * Can remove only {@link DataAcquisition} or {@link Cell}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public class AcousticRemoveDataStrategy extends AbstractRemoveDataStrategy { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CatchesRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CatchesRemoveDataStrategy.java index 2ddd750..e8c3bf7 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CatchesRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CatchesRemoveDataStrategy.java @@ -35,10 +35,10 @@ import java.util.Set; /** * Remove a {@link ImportType#CATCHES} import. - * <p/> + * * Can remove only {@link Sample}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public class CatchesRemoveDataStrategy extends AbstractRemoveDataStrategy { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonAllRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonAllRemoveDataStrategy.java index b22e040..8f3c9bd 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonAllRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonAllRemoveDataStrategy.java @@ -33,10 +33,10 @@ import java.util.Set; /** * Remove a {@link ImportType#COMMON_ALL} import. - * <p/> + * * Can remove only {@link Voyage}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public class CommonAllRemoveDataStrategy extends AbstractRemoveDataStrategy { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransectRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransectRemoveDataStrategy.java index 84fdca3..deddcb1 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransectRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransectRemoveDataStrategy.java @@ -35,10 +35,10 @@ import java.util.Set; /** * Remove a {@link ImportType#COMMON_TRANSECT} import. - * <p/> + * * Can remove only {@link Transect}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public class CommonTransectRemoveDataStrategy extends AbstractRemoveDataStrategy { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransitRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransitRemoveDataStrategy.java index 7b92b85..4a3a47c 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransitRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransitRemoveDataStrategy.java @@ -34,10 +34,10 @@ import java.util.Set; /** * Remove a {@link ImportType#COMMON_TRANSIT} import. - * <p/> + * * Can remove only {@link Transit}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.2 */ public class CommonTransitRemoveDataStrategy extends AbstractRemoveDataStrategy { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonVoyageRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonVoyageRemoveDataStrategy.java index 95976ab..6979cec 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonVoyageRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonVoyageRemoveDataStrategy.java @@ -34,10 +34,10 @@ import java.util.Set; /** * Remove a {@link ImportType#COMMON_VOYAGE} import. - * <p/> + * * Can remove only {@link Transit}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.2 */ public class CommonVoyageRemoveDataStrategy extends AbstractRemoveDataStrategy { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/LegacyVoyageRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/LegacyVoyageRemoveDataStrategy.java index 6c9bf44..c57fd6a 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/LegacyVoyageRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/LegacyVoyageRemoveDataStrategy.java @@ -33,10 +33,10 @@ import java.util.Set; /** * Remove a {@link ImportType#VOYAGE} import. - * <p/> + * * Can remove only {@link Voyage}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public class LegacyVoyageRemoveDataStrategy extends AbstractRemoveDataStrategy { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/OperationRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/OperationRemoveDataStrategy.java index 887da9b..8c7783a 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/OperationRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/OperationRemoveDataStrategy.java @@ -35,10 +35,10 @@ import java.util.Set; /** * Remove a {@link ImportType#OPERATION} import. - * <p/> + * * Can remove only {@link Operation}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public class OperationRemoveDataStrategy extends AbstractRemoveDataStrategy { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultEsduRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultEsduRemoveDataStrategy.java index d48696c..4ba822d 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultEsduRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultEsduRemoveDataStrategy.java @@ -35,10 +35,10 @@ import java.util.Set; /** * Remove a {@link ImportType#RESULT_ESDU} import. - * <p/> + * * Can remove only {@link Result}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public class ResultEsduRemoveDataStrategy extends AbstractRemoveDataStrategy { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapFishRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapFishRemoveDataStrategy.java index b0a5da1..e248fb7 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapFishRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapFishRemoveDataStrategy.java @@ -34,10 +34,10 @@ import java.util.Set; /** * Remove a {@link ImportType#RESULT_MAP_FISH} import. - * <p/> + * * Can remove only {@link Cell}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public class ResultMapFishRemoveDataStrategy extends AbstractRemoveDataStrategy { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapOtherRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapOtherRemoveDataStrategy.java index 33aa78e..716f9f0 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapOtherRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapOtherRemoveDataStrategy.java @@ -34,10 +34,10 @@ import java.util.Set; /** * Remove a {@link ImportType#RESULT_MAP_OTHER} import. - * <p/> + * * Can remove only {@link Cell}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.2 */ public class ResultMapOtherRemoveDataStrategy extends AbstractRemoveDataStrategy { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultRegionRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultRegionRemoveDataStrategy.java index 7cc6d05..d745229 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultRegionRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultRegionRemoveDataStrategy.java @@ -34,10 +34,10 @@ import java.util.Set; /** * Remove a {@link ImportType#RESULT_REGION} import. - * <p/> + * * Can remove only {@link Cell}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public class ResultRegionRemoveDataStrategy extends AbstractRemoveDataStrategy { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultVoyageRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultVoyageRemoveDataStrategy.java index de9378b..2fbba49 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultVoyageRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultVoyageRemoveDataStrategy.java @@ -38,11 +38,11 @@ import java.util.Set; /** * Remove a {@link ImportType#OPERATION} import. - * <p/> + * * Can remove only {@link Echotype}, {@link LengthAgeKey} or * {@link LengthWeightKey}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public class ResultVoyageRemoveDataStrategy extends AbstractRemoveDataStrategy { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/PgJdbcUrl.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/PgJdbcUrl.java index 09f36af..4573e74 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/PgJdbcUrl.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/PgJdbcUrl.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.services.service.spatial; +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialDataService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialDataService.java index ff555b9..c1b75f2 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialDataService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialDataService.java @@ -35,7 +35,7 @@ import javax.inject.Inject; /** * Spatial data service : to manage spatial data of a user database. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.2 */ public class SpatialDataService extends EchoBaseServiceSupport { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationAlreadyExistException.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationAlreadyExistException.java index 02b422d..505cf72 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationAlreadyExistException.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationAlreadyExistException.java @@ -24,7 +24,7 @@ package fr.ifremer.echobase.services.service.workingDb; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class WorkingDbConfigurationAlreadyExistException extends Exception { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationNotFoundException.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationNotFoundException.java index b80eb45..3107768 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationNotFoundException.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationNotFoundException.java @@ -24,7 +24,7 @@ package fr.ifremer.echobase.services.service.workingDb; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class WorkingDbConfigurationNotFoundException extends Exception { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java index f0f1709..79f5a84 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java @@ -43,7 +43,7 @@ import java.util.List; /** * To manager {@link WorkingDbConfiguration}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class WorkingDbConfigurationService extends EchoBaseServiceSupport { @@ -145,7 +145,7 @@ public class WorkingDbConfigurationService extends EchoBaseServiceSupport { /** * Create the concrete working db from his working configuration. - * <p/> + * * <strong>Note: </strong> Works only for pg db. * * @param jdbcConf id of the configuration to use. diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseServiceFixtures.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseServiceFixtures.java index 5043511..86daaeb 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseServiceFixtures.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseServiceFixtures.java @@ -28,7 +28,7 @@ import java.util.Set; /** * Obtain some fixtures for service tests. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public class EchoBaseServiceFixtures { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java index 3fd2fef..37fdd2b 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java @@ -62,7 +62,7 @@ import java.util.zip.GZIPInputStream; /** * Nice test service support. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public abstract class EchoBaseTestServiceSupport extends EchoBaseServiceSupport { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java index 32c2073..7b8a3e0 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java @@ -54,7 +54,7 @@ import java.util.zip.GZIPInputStream; * Provide an implementation of {@link EchoBaseServiceContext} suitable for repeatable, * isolated tests requiring a database. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class FakeEchoBaseServiceContext extends TestWatcher implements EchoBaseServiceContext { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/FixCellsIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/FixCellsIT.java index f3ba0b6..dc818c3 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/FixCellsIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/FixCellsIT.java @@ -46,11 +46,11 @@ import java.util.Set; /** * To fix cells and datas. - * <p/> + * * see http://forge.codelutin.com/issues/1592 * see http://forge.codelutin.com/issues/1593 * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ public class FixCellsIT extends EchoBaseTestServiceSupport { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/CoserApiServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/CoserApiServiceTest.java index fc2bce6..fc1586e 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/CoserApiServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/CoserApiServiceTest.java @@ -38,7 +38,7 @@ import java.util.Set; /** * Created on 3/23/14. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.5 */ public class CoserApiServiceTest extends EchoBaseTestServiceSupport { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/DecoratorServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/DecoratorServiceTest.java index e87394a..7cbd08a 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/DecoratorServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/DecoratorServiceTest.java @@ -33,7 +33,7 @@ import java.util.List; /** * To test the {@link DecoratorService}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class DecoratorServiceTest extends EchoBaseTestServiceSupport { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationServiceIT.java index 972f85a..e60491f 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationServiceIT.java @@ -32,7 +32,7 @@ import java.io.File; /** * Test {@link EmbeddedApplicationService}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class EmbeddedApplicationServiceIT extends EchoBaseTestServiceSupport { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserServiceTest.java index b10557f..31aaebc 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserServiceTest.java @@ -42,7 +42,7 @@ import java.util.Set; /** * Created on 4/5/14. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6 */ public class ExportCoserServiceTest extends EchoBaseTestServiceSupport { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportdb/ExportDbServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportdb/ExportDbServiceTest.java index 62923f9..85c756e 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportdb/ExportDbServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportdb/ExportDbServiceTest.java @@ -61,7 +61,7 @@ import java.util.zip.ZipFile; /** * Test {@link ExportDbService}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class ExportDbServiceTest extends EchoBaseTestServiceSupport { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryServiceTest.java index da9a5b1..d3e4851 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryServiceTest.java @@ -31,7 +31,7 @@ import javax.inject.Inject; /** * To test {@link ExportQueryService}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class ExportQueryServiceTest extends EchoBaseTestServiceSupport { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java index 0852c93..5018ac1 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java @@ -64,7 +64,7 @@ import java.util.regex.Matcher; /** * Abstrac import data test. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public abstract class AbstractImportDataServiceIT extends EchoBaseTestServiceSupport { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AcousticImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AcousticImportServiceIT.java index f37eb81..5c21fa5 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AcousticImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AcousticImportServiceIT.java @@ -32,7 +32,7 @@ import java.util.List; /** * Tests {@link AcousticImportService}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class AcousticImportServiceIT extends AbstractImportDataServiceIT { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceIT.java index d0ff482..a2b39c7 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceIT.java @@ -32,7 +32,7 @@ import java.util.List; /** * Tests {@link CatchesImportService}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class CatchesImportServiceIT extends AbstractImportDataServiceIT { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportServiceIT.java index 381a43d..e2c1af3 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportServiceIT.java @@ -32,7 +32,7 @@ import java.util.List; /** * Tests {@link CommonImportService} with {@link ImportType#COMMON_ALL} mode. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class CommonAllImportServiceIT extends AbstractImportDataServiceIT { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportServiceIT.java index ea13f1c..eb47256 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportServiceIT.java @@ -31,7 +31,7 @@ import java.util.List; /** * Tests {@link CommonImportService} with {@link ImportType#COMMON_TRANSECT} mode. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class CommonTransectImportServiceIT extends AbstractImportDataServiceIT { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportServiceIT.java index b74581c..f4d8da7 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportServiceIT.java @@ -33,7 +33,7 @@ import java.util.List; /** * Tests {@link CommonImportService} with {@link ImportType#COMMON_TRANSIT} mode. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.2 */ public class CommonTransitImportServiceIT extends AbstractImportDataServiceIT { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportServiceIT.java index 810bfed..bf19b06 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportServiceIT.java @@ -33,7 +33,7 @@ import java.util.List; /** * Tests {@link CommonImportService} with {@link ImportType#COMMON_VOYAGE} mode. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.2 */ public class CommonVoyageImportServiceIT extends AbstractImportDataServiceIT { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/OperationImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/OperationImportServiceIT.java index 1ec984d..a4109a1 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/OperationImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/OperationImportServiceIT.java @@ -31,7 +31,7 @@ import java.util.List; /** * Tests {@link OperationImportService}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class OperationImportServiceIT extends AbstractImportDataServiceIT { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportServiceIT.java index bd0cd03..b50e712 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportServiceIT.java @@ -36,7 +36,7 @@ import java.util.List; /** * Test import of esdu results. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class ResultsEsduCellImportServiceIT extends AbstractImportDataServiceIT { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportServiceIT.java index 4402f36..7b817e4 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportServiceIT.java @@ -33,7 +33,7 @@ import java.util.List; /** * To test the {@link ResultsMapFishCellImportService} service. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class ResultsMapFishCellImportServiceIT extends AbstractImportDataServiceIT { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportServiceIT.java index 5973cb2..cc6e1a6 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportServiceIT.java @@ -33,7 +33,7 @@ import java.util.List; /** * To test the {@link ResultsMapOtherCellImportService} service. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.2 */ public class ResultsMapOtherCellImportServiceIT extends AbstractImportDataServiceIT { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportServiceIT.java index dfed491..68f4ce7 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportServiceIT.java @@ -34,7 +34,7 @@ import java.util.List; /** * To test the {@link ResultsRegionCellImportService} service. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class ResultsRegionCellImportServiceIT extends AbstractImportDataServiceIT { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceIT.java index 74d18f6..e0158e0 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceIT.java @@ -33,7 +33,7 @@ import java.util.List; /** * To test the {@link ResultsVoyageImportService} service. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class ResultsVoyageImportServiceIT extends AbstractImportDataServiceIT { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdb/ImportDbServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdb/ImportDbServiceTest.java index 3d69afb..b3c71ca 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdb/ImportDbServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdb/ImportDbServiceTest.java @@ -36,7 +36,7 @@ import java.io.IOException; /** * Tests the {@link ImportDbService}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class ImportDbServiceTest extends EchoBaseTestServiceSupport { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/spatial/LizmapRepositoryTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/spatial/LizmapRepositoryTest.java index 0c000cc..4e3a5e0 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/spatial/LizmapRepositoryTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/spatial/LizmapRepositoryTest.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.services.service.spatial; +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.echobase.config.EchoBaseConfiguration; import fr.ifremer.echobase.entities.DriverType; import fr.ifremer.echobase.io.EchoBaseIOUtil; diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/spatial/PgJdbcUrlTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/spatial/PgJdbcUrlTest.java index 9959a4f..b9a0699 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/spatial/PgJdbcUrlTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/spatial/PgJdbcUrlTest.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.services.service.spatial; +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.junit.Assert; import org.junit.Test; diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java index 6ad1b53..521a368 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java @@ -109,7 +109,7 @@ import java.util.List; /** * Abstract test for remove data feature. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public abstract class AbstractRemoveDataServiceTest extends EchoBaseTestServiceSupport { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AcousticRemoveDataServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AcousticRemoveDataServiceTest.java index 4db9cd1..4d81151 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AcousticRemoveDataServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AcousticRemoveDataServiceTest.java @@ -28,7 +28,7 @@ import org.junit.Test; /** * Test{@link RemoveDataService} with {@link AcousticRemoveDataStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.3 */ public class AcousticRemoveDataServiceTest extends AbstractRemoveDataServiceTest { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CatchesRemoveDataServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CatchesRemoveDataServiceTest.java index 761f4ca..cbc9d6e 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CatchesRemoveDataServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CatchesRemoveDataServiceTest.java @@ -29,7 +29,7 @@ import org.nuiton.topia.persistence.TopiaException; /** * Test{@link RemoveDataService} with {@link CatchesRemoveDataStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.3 */ public class CatchesRemoveDataServiceTest extends AbstractRemoveDataServiceTest { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonAllRemoveDataServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonAllRemoveDataServiceTest.java index a999642..3252ad9 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonAllRemoveDataServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonAllRemoveDataServiceTest.java @@ -29,7 +29,7 @@ import org.nuiton.topia.persistence.TopiaException; /** * Test{@link RemoveDataService} with {@link CommonAllRemoveDataStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.3 */ public class CommonAllRemoveDataServiceTest extends AbstractRemoveDataServiceTest { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonTransectRemoveDataServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonTransectRemoveDataServiceTest.java index 2e62c08..9d8b749 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonTransectRemoveDataServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonTransectRemoveDataServiceTest.java @@ -29,7 +29,7 @@ import org.nuiton.topia.persistence.TopiaException; /** * Test{@link RemoveDataService} with {@link CommonTransectRemoveDataStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.3 */ public class CommonTransectRemoveDataServiceTest extends AbstractRemoveDataServiceTest { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonTransitRemoveDataServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonTransitRemoveDataServiceTest.java index f93e680..d11ee4d 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonTransitRemoveDataServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonTransitRemoveDataServiceTest.java @@ -29,7 +29,7 @@ import org.nuiton.topia.persistence.TopiaException; /** * Test{@link RemoveDataService} with {@link CommonTransitRemoveDataStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.2 */ public class CommonTransitRemoveDataServiceTest diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonVoyageRemoveDataServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonVoyageRemoveDataServiceTest.java index 9921fdf..5c7292d 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonVoyageRemoveDataServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/CommonVoyageRemoveDataServiceTest.java @@ -29,7 +29,7 @@ import org.nuiton.topia.persistence.TopiaException; /** * Test{@link RemoveDataService} with {@link CommonVoyageRemoveDataStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.2 */ public class CommonVoyageRemoveDataServiceTest extends AbstractRemoveDataServiceTest { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/OperationRemoveDataServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/OperationRemoveDataServiceTest.java index 2e0be31..50dd565 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/OperationRemoveDataServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/OperationRemoveDataServiceTest.java @@ -29,7 +29,7 @@ import org.nuiton.topia.persistence.TopiaException; /** * Test{@link RemoveDataService} with {@link OperationRemoveDataStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.3 */ public class OperationRemoveDataServiceTest extends AbstractRemoveDataServiceTest { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultEsduRemoveDataServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultEsduRemoveDataServiceTest.java index 6a90b10..2addc20 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultEsduRemoveDataServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultEsduRemoveDataServiceTest.java @@ -29,7 +29,7 @@ import org.nuiton.topia.persistence.TopiaException; /** * Test{@link RemoveDataService} with {@link ResultEsduRemoveDataStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.3 */ public class ResultEsduRemoveDataServiceTest extends AbstractRemoveDataServiceTest { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultMapRemoveFishDataServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultMapRemoveFishDataServiceTest.java index 6b41e2f..ecd3dc2 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultMapRemoveFishDataServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultMapRemoveFishDataServiceTest.java @@ -29,7 +29,7 @@ import org.nuiton.topia.persistence.TopiaException; /** * Test {@link RemoveDataService} with {@link ResultMapFishRemoveDataStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.3 */ public class ResultMapRemoveFishDataServiceTest extends AbstractRemoveDataServiceTest { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultMapRemoveOtherDataServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultMapRemoveOtherDataServiceTest.java index 4acc9c2..b57b2a2 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultMapRemoveOtherDataServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultMapRemoveOtherDataServiceTest.java @@ -29,7 +29,7 @@ import org.nuiton.topia.persistence.TopiaException; /** * Test {@link RemoveDataService} with {@link ResultMapOtherRemoveDataStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.2 */ public class ResultMapRemoveOtherDataServiceTest extends AbstractRemoveDataServiceTest { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultRegionRemoveDataServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultRegionRemoveDataServiceTest.java index 3a53821..f9683e9 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultRegionRemoveDataServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultRegionRemoveDataServiceTest.java @@ -29,7 +29,7 @@ import org.nuiton.topia.persistence.TopiaException; /** * Test{@link RemoveDataService} with {@link ResultRegionRemoveDataStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.3 */ public class ResultRegionRemoveDataServiceTest extends AbstractRemoveDataServiceTest { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultVoyageRemoveDataServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultVoyageRemoveDataServiceTest.java index 6f35f58..d357b12 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultVoyageRemoveDataServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/ResultVoyageRemoveDataServiceTest.java @@ -29,7 +29,7 @@ import org.nuiton.topia.persistence.TopiaException; /** * Test{@link RemoveDataService} with {@link ResultVoyageRemoveDataStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.3 */ public class ResultVoyageRemoveDataServiceTest extends AbstractRemoveDataServiceTest { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java index 924a116..10fc11e 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java @@ -75,7 +75,7 @@ import java.util.logging.Level; import java.util.logging.Logger; /** - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class EchoBaseApplicationContext { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java index b522a69..86c3653 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java @@ -30,13 +30,13 @@ import java.util.Date; /** * To listen start or end of the application. - * <p/> + * * On start we will load the configuration and check connection to internal * database, creates schema and create an admin user in none found in database. - * <p/> + * * On stop, just release the application configuration. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class EchoBaseApplicationListener implements ServletContextListener { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java index be943dd..b917c86 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java @@ -38,7 +38,7 @@ import javax.servlet.http.HttpServletRequest; /** * Inject in each request a new transaction from the internal db. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class EchoBaseInternalDbTransactionFilter extends TypedTopiaTransactionFilter<EchoBaseInternalPersistenceContext> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java index 86713af..c25192b 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java @@ -45,7 +45,7 @@ import java.util.TreeMap; /** * The session object of EchoBase to put in servlet session. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class EchoBaseSession implements Closeable, Serializable { @@ -78,10 +78,10 @@ public class EchoBaseSession implements Closeable, Serializable { /** * Obtain the user T3 session. - * <p/> + * * If not found in application session, then will instanciate it and * push it in it. - * <p/> + * * At the creation time the session, it will also set his T3 factory. * * @param actionContext where to find user session @@ -153,7 +153,7 @@ public class EchoBaseSession implements Closeable, Serializable { /** * Initialize the t3 database configuration from the given connection * configuration. - * <p/> + * * The given configuration only give the url, login and pasword to use. * Complete configuration (for ToPIA) will be loaded interanlly and match * only a postgresql db. @@ -350,7 +350,7 @@ public class EchoBaseSession implements Closeable, Serializable { /** * Release any resources contained in the user session. - * <p/> + * * Will also close any service (like the databaseService which contains * connexions to db). * diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSessionListener.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSessionListener.java index b9510eb..4451af2 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSessionListener.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSessionListener.java @@ -30,7 +30,7 @@ import javax.servlet.http.HttpSessionListener; * To listen creation or destroying of user session (this is needed to close * nicely any resources attached to this user session such as db connexions). * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class EchoBaseSessionListener implements HttpSessionListener { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseStaticContentLoader.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseStaticContentLoader.java index e9373ec..9d752d5 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseStaticContentLoader.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseStaticContentLoader.java @@ -37,11 +37,11 @@ import java.util.Calendar; /** * To fix some javascript loading problem. - * <p/> + * * Some javascript files have some strange first caracter (ckeditor for example) + * problem while loading charsets for french translate files. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.0 */ public class EchoBaseStaticContentLoader extends DefaultStaticContentLoader { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseUserDbTransactionFilter.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseUserDbTransactionFilter.java index 4b63da9..a0b84ce 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseUserDbTransactionFilter.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseUserDbTransactionFilter.java @@ -38,10 +38,10 @@ import javax.servlet.http.HttpSession; /** * To inject a transaction coming from the user connected working db. - * <p/> + * * If user has no working db selected, then do nothing. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class EchoBaseUserDbTransactionFilter extends TypedTopiaTransactionFilter<EchoBaseUserPersistenceContext> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractConfigureAction.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractConfigureAction.java index f5af428..caa18c0 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractConfigureAction.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractConfigureAction.java @@ -34,7 +34,7 @@ import java.io.IOException; /** * BAse action for long action configuration. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public abstract class AbstractConfigureAction<M extends AbstractEchobaseActionConfiguration> extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java index f85da91..57edd0a 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java @@ -33,7 +33,7 @@ import java.util.Map; /** * Abstract JSON action with pagination support. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public abstract class AbstractJSONPaginedAction extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java index 5426c89..270406d 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java @@ -34,7 +34,7 @@ import java.io.IOException; /** * Abstract long action using the exec and wait interceptor. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public abstract class AbstractWaitAndExecAction<M extends AbstractEchobaseActionConfiguration, S extends EchoBaseService> extends EchoBaseActionSupport implements Preparable { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java index d8f56a3..4f5ca3f 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java @@ -36,7 +36,7 @@ import java.util.Locale; /** * EchoBase action support. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class EchoBaseActionSupport extends BaseAction { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/Home.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/Home.java index 3cb0831..5ffbae3 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/Home.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/Home.java @@ -24,7 +24,7 @@ package fr.ifremer.echobase.ui.actions; /** * Go to home. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class Home extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java index 5cbfacc..1540803 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java @@ -36,7 +36,7 @@ import java.util.Map; * A abstract action which can load the table names and a selected table * meta datas. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public abstract class AbstractLoadPage extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java index bf3b693..4303948 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java @@ -49,7 +49,7 @@ import java.util.Map; /** * To obtain the data for the given request. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class GetEntities extends AbstractJSONPaginedAction { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetForeignEntities.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetForeignEntities.java index f326ae2..2951804 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetForeignEntities.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetForeignEntities.java @@ -30,7 +30,7 @@ import java.util.Map; /** * Obtains the html select form for the given entity type. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class GetForeignEntities extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java index f08d9fa..e5069bd 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java @@ -33,7 +33,7 @@ import java.io.File; /** * To import datas from import file. - * <p/> + * * FIXME 20111117 sletellier : extends {@link LoadEntities} find a better way to redirect to dbeditor page on validation error * UPDATE 20111118 sletellier : with {@link @InputConfig} probleme is solve ? dbeditor root page is prepared only on validation error... * diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java index f557b11..30752a8 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java @@ -23,7 +23,7 @@ package fr.ifremer.echobase.ui.actions.dbeditor; /** * To load the db editor pages. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class LoadEntities extends AbstractLoadPage { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java index c088021..803b74d 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java @@ -36,7 +36,7 @@ import java.util.Map; /** * Save the edition of a row of a table. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class SaveEntity extends EchoBaseActionSupport implements ParameterAware { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java index f0a7528..5ce6984 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java @@ -29,7 +29,7 @@ import org.apache.commons.logging.LogFactory; /** * Build the embedded application archive. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class Build extends AbstractWaitAndExecAction<EmbeddedApplicationConfiguration, EmbeddedApplicationService> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java index d7d51c1..0be3894 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java @@ -38,7 +38,7 @@ import java.util.Map; /** * Configure the embedded application creation. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class Configure extends AbstractConfigureAction<EmbeddedApplicationConfiguration> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java index 957e5be..2d8090a 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java @@ -31,7 +31,7 @@ import java.io.InputStream; /** * Download the result of sql request in csv format. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class Download extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java index d599329..b526196 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java @@ -42,7 +42,7 @@ import java.util.Map; /** * Created on 3/1/14. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6 */ public class Configure extends AbstractConfigureAction<ExportCoserConfiguration> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Download.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Download.java index d4c4ad7..e1d5170 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Download.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Download.java @@ -32,7 +32,7 @@ import java.io.InputStream; /** * Created on 3/1/14. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6 */ public class Download extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Export.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Export.java index 79e56f8..c3b3516 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Export.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Export.java @@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory; /** * Created on 3/1/14. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6 */ public class Export extends AbstractWaitAndExecAction<ExportCoserConfiguration, ExportCoserService> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/GetAvailableIndicatorsForMission.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/GetAvailableIndicatorsForMission.java index edfac60..9f05a33 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/GetAvailableIndicatorsForMission.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/GetAvailableIndicatorsForMission.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.ui.actions.exportCoser; +/* + * #%L + * EchoBase :: UI + * %% + * Copyright (C) 2011 - 2015 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.echobase.entities.references.DataMetadata; import fr.ifremer.echobase.services.service.CoserApiService; import fr.ifremer.echobase.services.service.CoserIndicators; diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/GetZones.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/GetZones.java index d8b1dba..7ccebac 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/GetZones.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/GetZones.java @@ -30,7 +30,7 @@ import java.util.Map; /** * Created on 3/23/14. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.5 */ public class GetZones extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java index 8edcf9d..71480fa 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java @@ -38,7 +38,7 @@ import java.util.Set; /** * Configure the complete db export. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class Configure extends AbstractConfigureAction<ExportDbConfiguration> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java index 5a7a62a..ccc8082 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java @@ -31,7 +31,7 @@ import java.io.InputStream; /** * Download the result of the complete db export. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class Download extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java index e553dab..f2e8066 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java @@ -31,7 +31,7 @@ import static org.nuiton.i18n.I18n.t; /** * Launch the complete db export. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class Export extends AbstractWaitAndExecAction<ExportDbConfiguration, ExportDbService> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/AbstractEditExportQuery.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/AbstractEditExportQuery.java index 0c6749e..f272bd9 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/AbstractEditExportQuery.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/AbstractEditExportQuery.java @@ -34,10 +34,10 @@ import java.util.Map; /** * To save a export query. - * <p/> + * * Created on 11/9/13. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.5 */ public abstract class AbstractEditExportQuery extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CloneExportQuery.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CloneExportQuery.java index ab39e20..a947f4a 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CloneExportQuery.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CloneExportQuery.java @@ -27,10 +27,10 @@ import org.apache.commons.logging.LogFactory; /** * To clone an export query. - * <p/> + * * Created on 11/9/13. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.5 */ public class CloneExportQuery extends AbstractEditExportQuery { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ConfirmDeleteExportQuery.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ConfirmDeleteExportQuery.java index e468573..127320e 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ConfirmDeleteExportQuery.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ConfirmDeleteExportQuery.java @@ -31,10 +31,10 @@ import javax.inject.Inject; /** * To confirm delete an export query. - * <p/> + * * Created on 11/9/13. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.5 */ public class ConfirmDeleteExportQuery extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CreateNewExportQuery.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CreateNewExportQuery.java index a799d41..e174ddb 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CreateNewExportQuery.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CreateNewExportQuery.java @@ -33,7 +33,7 @@ import java.util.Map; /** * To create a new {@link ExportQuery}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class CreateNewExportQuery extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/DeleteExportQuery.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/DeleteExportQuery.java index f401532..7f9e1f8 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/DeleteExportQuery.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/DeleteExportQuery.java @@ -31,10 +31,10 @@ import javax.inject.Inject; /** * To delete an export query. - * <p/> + * * Created on 11/9/13. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.5 */ public class DeleteExportQuery extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/DownloadExportQueryResult.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/DownloadExportQueryResult.java index 09367ba..82878e4 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/DownloadExportQueryResult.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/DownloadExportQueryResult.java @@ -31,7 +31,7 @@ import java.io.InputStream; /** * Download the result of sql request in csv format. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class DownloadExportQueryResult extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/EditExportQuery.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/EditExportQuery.java index c5ca00f..d4f3012 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/EditExportQuery.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/EditExportQuery.java @@ -35,7 +35,7 @@ import java.util.Map; /** * To edit a {@link ExportQuery}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class EditExportQuery extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ExportQueryResult.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ExportQueryResult.java index 8721fb9..a970b47 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ExportQueryResult.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ExportQueryResult.java @@ -32,7 +32,7 @@ import javax.inject.Inject; /** * Load export sql result fragment page. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class ExportQueryResult extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/GetExportQueryResult.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/GetExportQueryResult.java index 9c0a9a8..1a188f2 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/GetExportQueryResult.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/GetExportQueryResult.java @@ -30,7 +30,7 @@ import java.util.Map; /** * Obtains result of a sql query. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class GetExportQueryResult extends AbstractJSONPaginedAction { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/NewLibreOfficeQuery.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/NewLibreOfficeQuery.java index 0ead766..2e8e70d 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/NewLibreOfficeQuery.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/NewLibreOfficeQuery.java @@ -30,7 +30,7 @@ import javax.inject.Inject; /** * To deal with a new libre office request. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class NewLibreOfficeQuery extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/SaveExportQuery.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/SaveExportQuery.java index 087a51b..8aec5b8 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/SaveExportQuery.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/SaveExportQuery.java @@ -27,10 +27,10 @@ import org.apache.commons.logging.LogFactory; /** * To save a query. - * <p/> + * * Created on 11/9/13. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.5 */ public class SaveExportQuery extends AbstractEditExportQuery { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ShowExportQuery.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ShowExportQuery.java index 5636f13..5ab986c 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ShowExportQuery.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ShowExportQuery.java @@ -34,7 +34,7 @@ import java.util.Map; /** * To show all {@link ExportQuery}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class ShowExportQuery extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java index fd68211..6dbbb03 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java @@ -35,7 +35,7 @@ import java.io.IOException; /** * Configure a accoustic data import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public abstract class AbstractConfigureImport<M extends AbstractImportConfiguration> extends AbstractConfigureAction<M> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java index 6780a08..e41c315 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java @@ -32,7 +32,7 @@ import javax.inject.Inject; /** * Abstract action to launch an data import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class AbstractLaunchImport<M extends AbstractImportConfiguration, S extends AbstractImportDataService<M>> extends AbstractWaitAndExecAction<M, S> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport.java index b666bf6..db8bf5e 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport.java @@ -30,7 +30,7 @@ import java.util.Map; /** * Configure a accoustic data import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class ConfigureAcousticImport extends AbstractConfigureImport<AcousticImportConfiguration> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport.java index cb8e4a4..1602670 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport.java @@ -29,7 +29,7 @@ import java.util.Map; /** * Configure a "catches data" import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class ConfigureCatchesImport extends AbstractConfigureImport<CatchesImportConfiguration> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java index 3fe73f5..e71fb82 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java @@ -33,7 +33,7 @@ import java.util.Map; /** * Configure a common data (voyage / transit / transect) import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class ConfigureCommonImport extends AbstractConfigureImport<CommonImportConfiguration> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureOperationImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureOperationImport.java index eb1a45c..ba22498 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureOperationImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureOperationImport.java @@ -29,7 +29,7 @@ import java.util.Map; /** * Configure a "Operation" import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class ConfigureOperationImport extends AbstractConfigureImport<OperationImportConfiguration> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java index e2956df..a016039 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java @@ -32,7 +32,7 @@ import java.util.Map; /** * Configure a "results" import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class ConfigureResultsImport extends AbstractConfigureImport<ResultsImportConfiguration> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/CreateMission.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/CreateMission.java index 049edaa..13ec6af 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/CreateMission.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/CreateMission.java @@ -34,7 +34,7 @@ import javax.inject.Inject; /** * To create a new mission * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class CreateMission extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetDataProcessingsForVoyage.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetDataProcessingsForVoyage.java index 5fe8ac7..0db9eb7 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetDataProcessingsForVoyage.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetDataProcessingsForVoyage.java @@ -34,7 +34,7 @@ import java.util.Map; /** * Gets all dataProcessings of the selected voyage. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.4 */ public class GetDataProcessingsForVoyage extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetVesselsForVoyage.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetVesselsForVoyage.java index 362ee53..ec8d5e5 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetVesselsForVoyage.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetVesselsForVoyage.java @@ -37,7 +37,7 @@ import java.util.Set; /** * Get all vessels used in a voyage. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class GetVesselsForVoyage extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java index 9f06038..2b7c76f 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java @@ -28,7 +28,7 @@ import static org.nuiton.i18n.I18n.n; /** * To define the mode of import data (says files to be imported). * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public enum ImportMode implements I18nAble { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAcousticImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAcousticImport.java index 470a574..6478873 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAcousticImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAcousticImport.java @@ -26,7 +26,7 @@ import fr.ifremer.echobase.services.service.importdata.AcousticImportService; /** * Configure a accoustic data import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class LaunchAcousticImport extends AbstractLaunchImport<AcousticImportConfiguration, AcousticImportService> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesImport.java index 56b31ed..03b2469 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesImport.java @@ -26,7 +26,7 @@ import fr.ifremer.echobase.services.service.importdata.CatchesImportService; /** * Configure a accoustic data import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class LaunchCatchesImport extends AbstractLaunchImport<CatchesImportConfiguration, CatchesImportService> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonImport.java index 6a8fc71..8bea769 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonImport.java @@ -26,7 +26,7 @@ import fr.ifremer.echobase.services.service.importdata.CommonImportService; /** * Configure a accoustic data import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class LaunchCommonImport extends AbstractLaunchImport<CommonImportConfiguration, CommonImportService> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchOperationImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchOperationImport.java index 14ec7e5..258fb24 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchOperationImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchOperationImport.java @@ -26,7 +26,7 @@ import fr.ifremer.echobase.services.service.importdata.OperationImportService; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class LaunchOperationImport extends AbstractLaunchImport<OperationImportConfiguration, OperationImportService> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchResultsImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchResultsImport.java index 940953c..892f408 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchResultsImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchResultsImport.java @@ -26,7 +26,7 @@ import fr.ifremer.echobase.services.service.importdata.ResultsImportService; /** * Configure a "result" import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class LaunchResultsImport extends AbstractLaunchImport<ResultsImportConfiguration, ResultsImportService> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/SelectImportType.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/SelectImportType.java index e97b20f..49b81fe 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/SelectImportType.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/SelectImportType.java @@ -29,7 +29,7 @@ import java.util.Map; /** * To select the type of import to configure. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ public class SelectImportType extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java index c84be0f..3a644fc 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java @@ -38,7 +38,7 @@ import java.util.Map; /** * Configure a db import. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class Configure extends AbstractConfigureAction<ImportDbConfiguration> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java index b0d4762..2d71144 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java @@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory; /** * Start the import db. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class Import extends AbstractWaitAndExecAction<ImportDbConfiguration, ImportDbService> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java index 7fedc61..5b69a09 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java @@ -38,7 +38,7 @@ import java.util.Map; /** * Confirm to delete a import log. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public class ConfirmDelete extends AbstractConfigureAction<RemoveDataConfiguration> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java index 281ac68..8fb63e7 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java @@ -33,7 +33,7 @@ import javax.inject.Inject; /** * Delete a selected import Log. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public class Delete extends AbstractWaitAndExecAction<RemoveDataConfiguration, RemoveDataService> { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ImportLogs.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ImportLogs.java index 30e969f..d9f8110 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ImportLogs.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ImportLogs.java @@ -31,7 +31,7 @@ import java.util.Map; /** * To display imports logs page. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.3 */ public class ImportLogs extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ComputeSpatialData.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ComputeSpatialData.java index c57d7e1..90fa5c3 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ComputeSpatialData.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ComputeSpatialData.java @@ -29,7 +29,7 @@ import javax.inject.Inject; /** * Created on 2/28/14. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6 */ public class ComputeSpatialData extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/Show.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/Show.java index 2b01163..2a9cb24 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/Show.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/Show.java @@ -37,7 +37,7 @@ import java.util.Map; /** * To configure and show spatial datas. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.2 */ public class Show extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java index 977a3fe..609d840 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java @@ -32,7 +32,7 @@ import javax.inject.Inject; /** * To create a user. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class Create extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java index 64d7fd2..2b89067 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java @@ -35,7 +35,7 @@ import java.util.Map; /** * To delete a user. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class Delete extends EchoBaseActionSupport implements Preparable, ParameterAware { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Login.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Login.java index cea264d..d9e38fa 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Login.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Login.java @@ -37,7 +37,7 @@ import java.util.Map; /** * Login and Logout action. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class Login extends EchoBaseActionSupport implements SessionAware { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Logout.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Logout.java index b40b648..eee2f25 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Logout.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Logout.java @@ -28,7 +28,7 @@ import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; /** * Log out from EchoBase. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class Logout extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java index 4ae7156..123f7d7 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java @@ -35,7 +35,7 @@ import java.util.Map; /** * To update a user. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.2 */ public class Update extends EchoBaseActionSupport implements Preparable, ParameterAware { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AbstractWorkingDbAction.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AbstractWorkingDbAction.java index 3f227a6..2b936ae 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AbstractWorkingDbAction.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AbstractWorkingDbAction.java @@ -39,7 +39,7 @@ import java.util.Map; /** * Connects to an existing working db. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public abstract class AbstractWorkingDbAction extends EchoBaseActionSupport implements Preparable, ParameterAware { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AddSpatial.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AddSpatial.java index 7d4e064..4d95ebb 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AddSpatial.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AddSpatial.java @@ -27,10 +27,10 @@ import javax.inject.Inject; /** * To add echobase spatial sutff to curerent working db. - * <p/> + * * Created on 10/31/13. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.4 */ public class AddSpatial extends AbstractWorkingDbAction { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java index 58ffae3..11e0a5a 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java @@ -32,7 +32,7 @@ import java.sql.SQLException; /** * Connects to an existing working db. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class Connect extends AbstractWorkingDbAction { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Create.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Create.java index 3b5abfd..a87195c 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Create.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Create.java @@ -28,7 +28,7 @@ import org.apache.commons.lang3.StringUtils; /** * To create a new {@link WorkingDbConfiguration}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class Create extends AbstractWorkingDbAction { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java index b75813e..f421209 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java @@ -30,10 +30,10 @@ import java.sql.SQLException; /** * To create a new fresh postgres database. - * <p/> + * * Created on 11/3/13. * - * @author Tony Chemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.4 */ public class CreatePostgresDb extends AbstractWorkingDbAction { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java index ae63678..4b53043 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java @@ -33,7 +33,7 @@ import static org.nuiton.i18n.I18n.t; /** * DashBoard of existing voyages. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.3 */ public class DashBoard extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Delete.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Delete.java index c567778..6a26c8b 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Delete.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Delete.java @@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFactory; /** * To delete a selected {@link WorkingDbConfiguration}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class Delete extends AbstractWorkingDbAction { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Disconnect.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Disconnect.java index 39714ce..9883db2 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Disconnect.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Disconnect.java @@ -27,7 +27,7 @@ import fr.ifremer.echobase.persistence.JdbcConfiguration; /** * Disconnects from a {@link WorkingDbConfiguration}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class Disconnect extends AbstractWorkingDbAction { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadDriver.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadDriver.java index d60ab23..275b1d0 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadDriver.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadDriver.java @@ -33,7 +33,7 @@ import java.io.InputStream; /** * Download jdbc driver. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class DownloadDriver extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java index c1ee7d6..f8d8c11 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java @@ -39,7 +39,7 @@ import java.util.Map; /** * Obtain details of a given {@link ImportLog}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.3 */ public class GetImportLogDetail extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetVoyage.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetVoyage.java index 8f226b0..8ec9d16 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetVoyage.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetVoyage.java @@ -38,7 +38,7 @@ import java.util.Map; /** * Obtain details of a given {@link ImportLog}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.3 */ public class GetVoyage extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Information.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Information.java index a167006..e790a1a 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Information.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Information.java @@ -31,7 +31,7 @@ import javax.inject.Inject; /** * Display a page to show connection details. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class Information extends EchoBaseActionSupport { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/ShowList.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/ShowList.java index 011c94f..7f4567d 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/ShowList.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/ShowList.java @@ -26,7 +26,7 @@ import fr.ifremer.echobase.entities.WorkingDbConfiguration; /** * Display the page to manage and use {@link WorkingDbConfiguration}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class ShowList extends AbstractWorkingDbAction { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java index 37bc7de..0c5e25e 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java @@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletResponse; /** * Abstract check interceptor. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public abstract class AbstractCheckInterceptor extends AbstractInterceptor { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java index 8f260c2..ee8eca1 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java @@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory; /** * To check user is loggued. If not, then redirect to the {@link #loginAction}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class CheckLogguedInterceptor extends AbstractCheckInterceptor { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java index da9bf10..0fe261b 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java @@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFactory; /** * To check if logged user is admin. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class CheckUserIsAdmin extends AbstractCheckInterceptor { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java index d779c96..0ba9636 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java @@ -32,7 +32,7 @@ import static org.nuiton.i18n.I18n.l; /** * Checks that a working db was selected, otherwise redirect to home. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.3 */ public class CheckWorkingDbSelected extends AbstractCheckInterceptor { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/EchoBaseFieldValidatorSupport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/EchoBaseFieldValidatorSupport.java index ad03b8a..512ca43 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/EchoBaseFieldValidatorSupport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/EchoBaseFieldValidatorSupport.java @@ -27,7 +27,7 @@ import java.util.Arrays; /** * Base EchoBase validator. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public abstract class EchoBaseFieldValidatorSupport extends NuitonFieldValidatorSupport { @@ -44,7 +44,7 @@ public abstract class EchoBaseFieldValidatorSupport extends NuitonFieldValidator /** * Translate the given i18n key with his optional arguments. - * <p/> + * * <strong>Note:</strong> This method name is fixed to be detected via the * nuiton i18n system, do NOT change this method name. * diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/LoginValidator.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/LoginValidator.java index 8c151ab..dff8027 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/LoginValidator.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/LoginValidator.java @@ -28,7 +28,7 @@ import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; /** * Check user login. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.1 */ public class LoginValidator extends EchoBaseFieldValidatorSupport { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.