June 2014 - Wao-commits - mailman.cloud.codelutin.com

[ANN] - Wao 4.0-RC1 released
by codelutin.com Release Notification 30 Jun '14

30 Jun '14

The Wao team is pleased to announce the wao-4.0-RC1 release! Application pour le suivi contractuels d'observations scientifiques de la pêche Documentation of the project can be found here: http://doc.codelutin.com/wao Changes ------- Changes in this version include: New features: o WAO OBSDEB : fin du portage de ce module dans WAO Issue: 4813. Thanks to Vincent BADTS. Resolved by bleny. o Export contact : ne pas exporter société dans profil invité et masquer le filtre Issue: 5308. Thanks to Vincent BADTS. Resolved by bleny. o Formulaire de contacts : trier la liste des observateurs par ordre alphabétique Issue: 5216. Thanks to Vincent BADTS. Resolved by bleny. o changer la couleur du titre d'un filtre quand il est renseigné Issue: 5215. Thanks to Vincent BADTS. Resolved by bleny. o inverser l'ordre des colonnes dans les contacts Issue: 5096. Thanks to Vincent BADTS. Resolved by bleny. o Expliciter l'option filtre : Filtrer selon la date de début d'observation, lorsqu'on passe avec la souris sur le libellé Issue: 5254. Thanks to Anne-Sophie Cornou. Resolved by bleny. Fixed Bugs: o Plan échantillonnage : problème affichage du nom de la société après validation du filtre Issue: 5090. Thanks to Vincent BADTS. Resolved by bleny. o problème de validation du champ "observateur secondaire" alors que je sélectionne bien des personnes de la liste Issue: 5092. Thanks to Vincent BADTS. Resolved by bleny. o Erreur après changement de date dans le plan d'échantillonnge Issue: 5349. Thanks to Vincent BADTS. Resolved by bleny. o je suis coordinateur, je ne devrais pas pouvoir changer le commentaire observateur Issue: 5095. Thanks to Vincent BADTS. Resolved by bleny. o erreur import fichier contact que je viens d'exporter (donc je n'ai rien modifié) Issue: 5099. Thanks to Vincent BADTS. Resolved by vbadts. o plan d'échantillonnage : modiifer une ligne la durée n'est pas reprise dans le champ Issue: 5100. Thanks to Vincent BADTS. Resolved by bleny. o Mail captures accidentelles Issue: 5104. Thanks to Vincent BADTS. Resolved by bleny. o plan d'échantillonnage erreur si j'essaye de modifier la durée moyenne en jours Issue: 5101. Thanks to Vincent BADTS. Resolved by bleny. o la valeur du champ captures accidentelles doit être visible quand on survole l'icone ameçon Issue: 5094. Thanks to Vincent BADTS. Resolved by bleny. o Navires : plus d'autocomplétion du champ navire dans le filtre Issue: 5102. Thanks to Vincent BADTS. Resolved by bleny. o impossible d'enregistrer une liste de navires éligibles Issue: 5105. Thanks to Vincent BADTS. Resolved by bleny. o Profil Invité : n'afficher que la page d'accueil (et le plan d'échantillonnage en planifié, pas le réalisé mais ça c'est dèjà bon) Issue: 5116. Thanks to Vincent BADTS. Resolved by bleny. o Accepter ou refuser un contact en coordinateur ne modifie pas l'affichage de l'icone dans le tableau Issue: 5098. Thanks to Vincent BADTS. Resolved by bleny. o Page synthèse Obsvente, filtre observations et capture accidentelle à supprimer Issue: 5312. Thanks to Vincent BADTS. Resolved by bleny. o obsvente : j'essaye de supprimer une ligne du plan avec des contacts, il refuse, c'est bien puis après quand je clique sur annuler : Issue: 5316. Thanks to Vincent BADTS. Resolved by bleny. o consulter l'historique de changement d'une ligne du plan puis cliquer sur retour au plan d'échantillonnage Issue: 5317. Thanks to Vincent BADTS. Resolved by bleny. o je ne dois pas pouvoir enregistrer un effort d'observation négatif pour un mois donné Issue: 5318. Thanks to Vincent BADTS. Resolved by bleny. o Pas de message d'allerte quand je clique sur supprimer en mode modification d'une ligne du plan Issue: 5319. Thanks to Vincent BADTS. Resolved by bleny. o Obsvente erreur import contact que je viens d'exporter Issue: 5315. Thanks to Vincent BADTS. Resolved by vbadts. o Améliorer le message si import doublon dans plan Issue: 5320. Thanks to Vincent BADTS. Resolved by bleny. o Anomalie quand j'essaye de modifier un contact Issue: 5210. Thanks to Vincent BADTS. Resolved by bleny. o Profil Professionnel : filtre navires renseigné qui peut être très long donc problème d'affichage Issue: 5211. Thanks to Vincent BADTS. Resolved by bleny. o Pas de warning si on supprime un contact Issue: 5217. Thanks to Vincent BADTS. Resolved by bleny. o si contact avec "corrections demandées" alors on ne doit pas pouvoir le valider Issue: 5218. Thanks to Vincent BADTS. Resolved by bleny. o Impossible de supprimer un lien ligne plan - navire Issue: 5213. Thanks to Vincent BADTS. Resolved by bleny. o Affcihage des info bulles derrière les icones pas stable Issue: 5214. Thanks to Vincent BADTS. Resolved by vbadts. o Plan échantillonnge : création ligne, aide remplissage codes dcf5 Issue: 5224. Thanks to Vincent BADTS. Resolved by bleny. o idem plan de 2010 à 201 : erreur Issue: 5223. Thanks to Vincent BADTS. Resolved by bleny. o Profil Coordinateur Issue: 5249. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Unité longueur navire Issue: 5246. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Profil Professionnel : suppression des colonnes commentaires dans les contacts en affichage et en export Issue: 5247. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Page contact pb export csv Issue: 5250. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Profil Coordinateur, page contact manque l'option import contact Issue: 5251. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Erreur lors de changement de période dans synthèse (Profil professionnel) Issue: 5248. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Profil Observateur page navire, Filtre armateur ne se vide pas Issue: 5252. Thanks to Anne-Sophie Cornou. Resolved by bleny. o je demande le plan depuis 2010...visiblement c'est trop : Issue: 5222. Thanks to Vincent BADTS. Resolved by bleny. o Synthèse : l'ouverture d'un filtre peut prendre plusieurs secondes et il n'y a pas de curseur d'attente qui se déclanche Issue: 5229. Thanks to Vincent BADTS. Resolved by bleny. o Navire : calcul du nombre de sollicitation à contrôler Issue: 5227. Thanks to Vincent BADTS. Resolved by vbadts. o Contact : améliorer le message d'erreur si on ne saisie que la date dans un champ date heure Issue: 5240. Thanks to Vincent BADTS. Resolved by bleny. o Informations personnelles des observateurs manquantes Issue: 5328. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Erreur en sortie de la page "gestion de profil" Issue: 5212. Thanks to Vincent BADTS. Resolved by bleny. o Profil Observateur, page synthèse, incohérence de résultat entre le graphique et les contacts Issue: 5256. Thanks to Anne-Sophie Cornou. Resolved by ascornou. o Profil observateur page contact, le champ commentaire est obligatoire si on coche la case Capture accidentelle, hors ce n'est pas le cas Issue: 5253. Thanks to Anne-Sophie Cornou. Resolved by ascornou. o Filtres non gardés en mémoire lors de changement de page (Plan éch --> Contact --> Plan éch) Issue: 5277. Thanks to Anne-Sophie Cornou. Resolved by bleny. o COMMENTAIRE sur le filtre des dates Issue: 5276. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Améliorer le message de suppression d'un lien "ligne plan" - "navire" Issue: 5278. Thanks to Vincent BADTS. Resolved by bleny. o Etat du contact en anomalie dans le processus de validation Issue: 5279. Thanks to Vincent BADTS. Resolved by bleny. o je supprime le lien navire plan et j'arrive sur une page navire vide Issue: 5283. Thanks to Vincent BADTS. Resolved by bleny. o Errueur en voulant modifier un contact Issue: 5282. Thanks to Vincent BADTS. Resolved by bleny. o Synthèse : deuxième graphique Obsvente, adapter les textes au contexte Issue: 5294. Thanks to Vincent BADTS. Resolved by bleny. o Contact Obsvente : export fichier AUCTION ? Issue: 5295. Thanks to Vincent BADTS. Resolved by bleny. o Profil Observateur Obsvente, page navire, je clique pour créer un contact sur une ancienne ligne du plan, pas de message d'allerte Issue: 5310. Thanks to Vincent BADTS. Resolved by bleny. o Page synthèse Obsvente, filtre "Filtrer selon la date de début d'observation" à supprimer Issue: 5313. Thanks to Vincent BADTS. Resolved by bleny. o Obsvente, Contacts, supprimer filtre "Qualité de la donnée" et champ "Qualité de la donnée"dans formulaire contact Issue: 5314. Thanks to Vincent BADTS. Resolved by bleny. o voir les contacts associés à cette ligne du plan : l'option ne marche pas, le filtre dans contact n'est pas renseigné Issue: 5321. Thanks to Vincent BADTS. Resolved by bleny. o Profil Observateur Obsvente, page navire, les informations saisies dans Coordonnées de l'interlocuteur ne sont pas persistées Issue: 5311. Thanks to Vincent BADTS. Resolved by vbadts. Changes: o Indicateurs : désactiver tout ce qui tourne autours des indicateurs Issue: 4429. Thanks to Vincent BADTS. Resolved by bleny. o Vérifier la gestion des droits Issue: 5068. Thanks to Brendan Le Ny. Resolved by bleny. o Menu navire, sollicitation du navire : le calcul du nombre d'observations sur le navire sélectionné et la valeur pour la société semble ne plus fonctionner : à corriger au cours de la refonte Issue: 4074. Thanks to Vincent BADTS. Resolved by bleny. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/wao/files * wao-4.0-RC1.war - http://forge.codelutin.com/attachments/download/2002 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Wao team

1 0

r2118 - in trunk: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com 30 Jun '14

30 Jun '14

Author: maven-release Date: 2014-06-30 16:55:52 +0200 (Mon, 30 Jun 2014) New Revision: 2118 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2118 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wao-persistence/pom.xml trunk/wao-services/pom.xml trunk/wao-web/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-30 14:55:47 UTC (rev 2117) +++ trunk/pom.xml 2014-06-30 14:55:52 UTC (rev 2118) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0-RC1</version> + <version>4.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> @@ -86,9 +86,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.codelutin.com/wao/tags/wao-4.0-RC1</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.0-RC1</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.0-RC1</url> + <connection>scm:svn:http://svn.codelutin.com/wao/trunk</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/wao/trunk</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/wao/trunk</url> </scm> <properties> Modified: trunk/wao-persistence/pom.xml =================================================================== --- trunk/wao-persistence/pom.xml 2014-06-30 14:55:47 UTC (rev 2117) +++ trunk/wao-persistence/pom.xml 2014-06-30 14:55:52 UTC (rev 2118) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0-RC1</version> + <version>4.0-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> Modified: trunk/wao-services/pom.xml =================================================================== --- trunk/wao-services/pom.xml 2014-06-30 14:55:47 UTC (rev 2117) +++ trunk/wao-services/pom.xml 2014-06-30 14:55:52 UTC (rev 2118) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0-RC1</version> + <version>4.0-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> Modified: trunk/wao-web/pom.xml =================================================================== --- trunk/wao-web/pom.xml 2014-06-30 14:55:47 UTC (rev 2117) +++ trunk/wao-web/pom.xml 2014-06-30 14:55:52 UTC (rev 2118) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0-RC1</version> + <version>4.0-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId>

1 0

r2117 - in tags: . wao-4.0-RC1
by maven-release＠users.forge.codelutin.com 30 Jun '14

30 Jun '14

Author: maven-release Date: 2014-06-30 16:55:47 +0200 (Mon, 30 Jun 2014) New Revision: 2117 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2117 Log: [maven-release-plugin] copy for tag wao-4.0-RC1 Added: tags/wao-4.0-RC1/ Property changes on: tags/wao-4.0-RC1 ___________________________________________________________________ Added: svn:ignore + *.idea *.iml target atlassian-ide-plugin.xml Added: svn:mergeinfo + /branches/wao-4.0-obsvente:2075-2085

1 0

r2116 - in trunk: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com 30 Jun '14

30 Jun '14

Author: maven-release Date: 2014-06-30 16:55:41 +0200 (Mon, 30 Jun 2014) New Revision: 2116 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2116 Log: [maven-release-plugin] prepare release wao-4.0-RC1 Modified: trunk/pom.xml trunk/wao-persistence/pom.xml trunk/wao-services/pom.xml trunk/wao-web/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-30 14:43:01 UTC (rev 2115) +++ trunk/pom.xml 2014-06-30 14:55:41 UTC (rev 2116) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0-RC1</version> <packaging>pom</packaging> <name>Wao</name> @@ -86,9 +86,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.codelutin.com/wao/trunk</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/trunk</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/trunk</url> + <connection>scm:svn:http://svn.codelutin.com/wao/tags/wao-4.0-RC1</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.0-RC1</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.0-RC1</url> </scm> <properties> Modified: trunk/wao-persistence/pom.xml =================================================================== --- trunk/wao-persistence/pom.xml 2014-06-30 14:43:01 UTC (rev 2115) +++ trunk/wao-persistence/pom.xml 2014-06-30 14:55:41 UTC (rev 2116) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0-RC1</version> </parent> <artifactId>wao-persistence</artifactId> Modified: trunk/wao-services/pom.xml =================================================================== --- trunk/wao-services/pom.xml 2014-06-30 14:43:01 UTC (rev 2115) +++ trunk/wao-services/pom.xml 2014-06-30 14:55:41 UTC (rev 2116) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0-RC1</version> </parent> <artifactId>wao-services</artifactId> Modified: trunk/wao-web/pom.xml =================================================================== --- trunk/wao-web/pom.xml 2014-06-30 14:43:01 UTC (rev 2115) +++ trunk/wao-web/pom.xml 2014-06-30 14:55:41 UTC (rev 2116) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0-RC1</version> </parent> <artifactId>wao-web</artifactId>

1 0

r2115 - in trunk: . wao-persistence/src/main/xmi
by bleny＠users.forge.codelutin.com 30 Jun '14

30 Jun '14

Author: bleny Date: 2014-06-30 16:43:01 +0200 (Mon, 30 Jun 2014) New Revision: 2115 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2115 Log: use stable dependencies Modified: trunk/pom.xml trunk/wao-persistence/src/main/xmi/wao-model.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-30 13:01:42 UTC (rev 2114) +++ trunk/pom.xml 2014-06-30 14:43:01 UTC (rev 2115) @@ -121,8 +121,8 @@ <nuitonCsvVersion>3.0-rc-2</nuitonCsvVersion> <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> <nuitonUtilsVersion>3.0-rc-3</nuitonUtilsVersion> - <eugeneVersion>2.11-SNAPSHOT</eugeneVersion> - <topiaVersion>3.0-SNAPSHOT</topiaVersion> + <eugeneVersion>2.11</eugeneVersion> + <topiaVersion>3.0-beta-7</topiaVersion>  <locales>fr</locales> Modified: trunk/wao-persistence/src/main/xmi/wao-model.properties =================================================================== --- trunk/wao-persistence/src/main/xmi/wao-model.properties 2014-06-30 13:01:42 UTC (rev 2114) +++ trunk/wao-persistence/src/main/xmi/wao-model.properties 2014-06-30 14:43:01 UTC (rev 2115) @@ -21,12 +21,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -model.tagValue.hibernateAttributeType.java.lang.String=text -model.tagValue.notGenerateToString=true -model.tagValue.constantPrefix=PROPERTY_ -model.tagValue.useEnumerationName=true -model.tagValue.indexForeignKeys=true - model.tagValue.version=4.0 # orderBy tagValues

1 0

r2114 - trunk/wao-persistence/src/main/resources/db/migration
by bleny＠users.forge.codelutin.com 30 Jun '14

30 Jun '14

Author: bleny Date: 2014-06-30 15:01:42 +0200 (Mon, 30 Jun 2014) New Revision: 2114 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2114 Log: fix doc Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-06-30 10:38:02 UTC (rev 2113) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-06-30 13:01:42 UTC (rev 2114) @@ -43,7 +43,7 @@ update boat set boatlength = boatlength * 100; --- Une ligne sans société : on l'affecte à la société 'ADMIN' +-- Une ligne sans société : on l'affecte à la société 'IFREMER' update sampleRow set company=(select topiaId from company where name='IFREMER') where company is null;

1 0

r2113 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao wao-persistence/src/main/java/fr/ifremer/wao/entity wao-persistence/src/main/resources/db/migration wao-persistence/src/test/java/fr/ifremer/wao wao-persistence/src/test/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/main/java/fr/ifremer/wao/services/service/csv wao-services/src/main/java/fr/ifremer/wao/services/service/csv/op
by bleny＠users.forge.codelutin.com 30 Jun '14

30 Jun '14

Author: bleny Date: 2014-06-30 12:38:02 +0200 (Mon, 30 Jun 2014) New Revision: 2113 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2113 Log: update file headers Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/AbstractWaoFilter.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ElligibleBoatImpl.java trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql trunk/wao-persistence/src/test/java/fr/ifremer/wao/WaoUtilsTest.java trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactImplTest.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoApplicationContext.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/AbstractFilterValues.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatContactsCounts.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheKey.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateAfterTodayException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateBeforeObservationEndDateException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateAfterTodayException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateBeforeBeginDateException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactWithObservedDataControlToCorrectionAskedException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/DuplicatedContactMainObserverInSecondaryObserversException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalAcceptationException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/InvalidContactObservationBeginDateException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactMainObserverCompanyException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactSecondaryObserverCompanyException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactCommentAdminException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactDataReliabilityException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMainObserverException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMammalsInfoException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactObservedDataControlException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactTerrestrialLocationException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingDcf5CodesException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingFishingZonesException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodBeginException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodEndException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProfessionSpeciesException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProgramNameException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleRowLogCommentException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleMonthWithIllegalExpectedTidesValueException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowValidationException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanCacheKey.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/Synthesis.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnknownContactIdException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnwantedContactContactStateMotifException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoValidationException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WrongSampleRowCodeFormatException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerSamplingPlanExportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/I18nAbleParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoServiceContext.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/CancelBoatSelectionAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/CreateContactAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/GetBoatContactsCountJsonAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/UpdateBoatElligibilityJsonAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/UpdateBoatInfosJsonAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsvente/SamplingPlanAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/DateConverter.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/DateTimeConverter.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/JFreeChartToImgTagConverter.java trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/BoatDetails-conversion.properties trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/Synthesis-conversion.properties trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/BoatsAction-conversion.properties trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/ContactsAction-conversion.properties trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/GetBoatContactsCountJsonAction-conversion.properties trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/SynthesisAction-conversion.properties trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction-conversion.properties trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsvente/SamplingPlanAction-conversion.properties Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/AbstractWaoFilter.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/AbstractWaoFilter.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/AbstractWaoFilter.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao; +/* + * #%L + * Wao :: Persistence + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.apache.commons.lang3.builder.ReflectionToStringBuilder; import java.io.Serializable; Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ElligibleBoatImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ElligibleBoatImpl.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ElligibleBoatImpl.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.entity; +/* + * #%L + * Wao :: Persistence + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.apache.commons.lang3.BooleanUtils; public class ElligibleBoatImpl extends ElligibleBoatAbstract { Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,3 +1,23 @@ +--- +-- #%L +-- Wao :: Persistence +-- %% +-- Copyright (C) 2009 - 2014 Ifremer +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU 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% +--- -- Il y a des doublons dans la table qui stocke les informations sur le lien entre ligne du plan et navires éligibles. -- Un même navire peut être associé en tant qu'éligible plusieurs fois. -- On rectifie le tir en supprimant les doublons et en ajoutant une contrainte d'unicité Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,3 +1,23 @@ +--- +-- #%L +-- Wao :: Persistence +-- %% +-- Copyright (C) 2009 - 2014 Ifremer +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU 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% +--- -- we no longer user topia migration service drop table tms_version; Modified: trunk/wao-persistence/src/test/java/fr/ifremer/wao/WaoUtilsTest.java =================================================================== --- trunk/wao-persistence/src/test/java/fr/ifremer/wao/WaoUtilsTest.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-persistence/src/test/java/fr/ifremer/wao/WaoUtilsTest.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao; +/* + * #%L + * Wao :: Persistence + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; Modified: trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactImplTest.java =================================================================== --- trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactImplTest.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactImplTest.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.entity; +/* + * #%L + * Wao :: Persistence + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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; import org.nuiton.util.DateUtil; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoApplicationContext.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoApplicationContext.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoApplicationContext.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.cache.Cache; import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.WaoApplicationConfig; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/AbstractFilterValues.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/AbstractFilterValues.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/AbstractFilterValues.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.apache.commons.beanutils.BeanUtilsBean; import java.io.Serializable; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatContactsCounts.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatContactsCounts.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatContactsCounts.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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% + */ + public class BoatContactsCounts { protected long contactsCount; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheKey.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheKey.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheKey.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.Objects; import com.google.common.base.Optional; import fr.ifremer.wao.entity.ObsProgram; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.ContactState; import java.io.Serializable; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateAfterTodayException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateAfterTodayException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateAfterTodayException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.Contact; import java.util.Date; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateBeforeObservationEndDateException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateBeforeObservationEndDateException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateBeforeObservationEndDateException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.Contact; /** Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateAfterTodayException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateAfterTodayException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateAfterTodayException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.Contact; import java.util.Date; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateBeforeBeginDateException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateBeforeBeginDateException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateBeforeBeginDateException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.Contact; /** Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactWithObservedDataControlToCorrectionAskedException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactWithObservedDataControlToCorrectionAskedException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactWithObservedDataControlToCorrectionAskedException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.Contact; /** Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/DuplicatedContactMainObserverInSecondaryObserversException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/DuplicatedContactMainObserverInSecondaryObserversException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/DuplicatedContactMainObserverInSecondaryObserversException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.Contact; /** Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalAcceptationException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalAcceptationException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalAcceptationException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.Contact; public class IllegalAcceptationException extends ContactValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/InvalidContactObservationBeginDateException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/InvalidContactObservationBeginDateException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/InvalidContactObservationBeginDateException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.Contact; /** Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactMainObserverCompanyException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactMainObserverCompanyException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactMainObserverCompanyException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.Company; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.WaoUser; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactSecondaryObserverCompanyException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactSecondaryObserverCompanyException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactSecondaryObserverCompanyException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.Company; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.WaoUser; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactCommentAdminException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactCommentAdminException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactCommentAdminException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.Contact; /** Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactDataReliabilityException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactDataReliabilityException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactDataReliabilityException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.Contact; /** Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMainObserverException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMainObserverException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMainObserverException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.Contact; /** Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMammalsInfoException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMammalsInfoException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMammalsInfoException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.Contact; public class MissingContactMammalsInfoException extends ContactValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactObservedDataControlException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactObservedDataControlException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactObservedDataControlException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.Contact; /** Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactTerrestrialLocationException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactTerrestrialLocationException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactTerrestrialLocationException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.Contact; public class MissingContactTerrestrialLocationException extends ContactValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingDcf5CodesException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingDcf5CodesException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingDcf5CodesException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.SampleRow; public class MissingDcf5CodesException extends SampleRowValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingFishingZonesException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingFishingZonesException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingFishingZonesException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.SampleRow; public class MissingFishingZonesException extends SampleRowValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodBeginException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodBeginException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodBeginException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.SampleRow; public class MissingPeriodBeginException extends SampleRowValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodEndException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodEndException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodEndException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.SampleRow; public class MissingPeriodEndException extends SampleRowValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProfessionSpeciesException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProfessionSpeciesException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProfessionSpeciesException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.SampleRow; public class MissingProfessionSpeciesException extends SampleRowValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProgramNameException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProgramNameException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProgramNameException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.SampleRow; public class MissingProgramNameException extends SampleRowValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleRowLogCommentException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleRowLogCommentException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleRowLogCommentException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.SampleRow; public class MissingSampleRowLogCommentException extends SampleRowValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanService.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanService.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.Optional; import com.google.common.cache.Cache; import fr.ifremer.wao.SampleRowsFilter; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleMonthWithIllegalExpectedTidesValueException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleMonthWithIllegalExpectedTidesValueException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleMonthWithIllegalExpectedTidesValueException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleRow; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowValidationException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowValidationException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowValidationException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.SampleRow; public abstract class SampleRowValidationException extends WaoValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.WaoUtils; import fr.ifremer.wao.entity.DCF5Code; import fr.ifremer.wao.entity.FishingZone; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanCacheKey.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanCacheKey.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanCacheKey.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.Objects; import com.google.common.base.Optional; import fr.ifremer.wao.SampleRowsFilter; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.Charsets; import com.google.common.base.Optional; import com.google.common.base.Preconditions; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/Synthesis.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/Synthesis.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/Synthesis.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.Boat; import org.jfree.chart.JFreeChart; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.Preconditions; import com.google.common.cache.Cache; import com.google.common.collect.Multimap; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnknownContactIdException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnknownContactIdException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnknownContactIdException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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% + */ + public class UnknownContactIdException extends Throwable { protected String contactId; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnwantedContactContactStateMotifException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnwantedContactContactStateMotifException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnwantedContactContactStateMotifException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.Contact; /** Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoValidationException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoValidationException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoValidationException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.WaoException; public abstract class WaoValidationException extends WaoException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WrongSampleRowCodeFormatException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WrongSampleRowCodeFormatException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WrongSampleRowCodeFormatException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.SampleRow; public class WrongSampleRowCodeFormatException extends SampleRowValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerSamplingPlanExportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerSamplingPlanExportModel.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerSamplingPlanExportModel.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service.csv; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.WaoUtils; import fr.ifremer.wao.services.service.ObsMerSamplingPlan; import org.nuiton.csv.Common; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/I18nAbleParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/I18nAbleParserFormatter.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/I18nAbleParserFormatter.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service.csv.operations; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.collect.Sets; import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.I18nAble; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service.mail; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.Boat; import fr.ifremer.wao.entity.ObsProgram; import fr.ifremer.wao.entity.WaoUser; Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.Preconditions; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoServiceContext.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoServiceContext.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoServiceContext.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.WaoTopiaPersistenceContext; import java.util.Locale; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.web; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.cache.Cache; import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.entity.Boat; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/CancelBoatSelectionAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/CancelBoatSelectionAction.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/CancelBoatSelectionAction.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.web.action; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.web.WaoJspActionSupport; import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/CreateContactAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/CreateContactAction.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/CreateContactAction.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.web.action; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.entity.Contact; import fr.ifremer.wao.services.service.ContactsService; import fr.ifremer.wao.web.WaoJspActionSupport; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/GetBoatContactsCountJsonAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/GetBoatContactsCountJsonAction.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/GetBoatContactsCountJsonAction.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.web.action; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.services.service.BoatContactsCounts; import fr.ifremer.wao.services.service.BoatsService; import fr.ifremer.wao.web.WaoJsonActionSupport; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.web.action; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.Objects; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.ContactsFilter; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/UpdateBoatElligibilityJsonAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/UpdateBoatElligibilityJsonAction.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/UpdateBoatElligibilityJsonAction.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.web.action; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.services.service.BoatsService; import fr.ifremer.wao.web.WaoJsonActionSupport; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/UpdateBoatInfosJsonAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/UpdateBoatInfosJsonAction.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/UpdateBoatInfosJsonAction.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.web.action; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.Preconditions; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.entity.BoatInfos; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.web.action.obsmer; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.services.service.ObsMerSamplingPlanService; import fr.ifremer.wao.services.service.SamplingPlan; import fr.ifremer.wao.web.action.AbstractSamplingPlanAction; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsvente/SamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsvente/SamplingPlanAction.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsvente/SamplingPlanAction.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.web.action.obsvente; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.wao.services.service.ObsVenteSamplingPlanService; import fr.ifremer.wao.services.service.SamplingPlan; import fr.ifremer.wao.web.action.AbstractSamplingPlanAction; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/DateConverter.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/DateConverter.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/DateConverter.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -10,12 +10,12 @@ * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/DateTimeConverter.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/DateTimeConverter.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/DateTimeConverter.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -10,12 +10,12 @@ * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/JFreeChartToImgTagConverter.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/JFreeChartToImgTagConverter.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/JFreeChartToImgTagConverter.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.web.converter; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.io.BaseEncoding; import fr.ifremer.wao.WaoTechnicalException; import org.apache.struts2.util.StrutsTypeConverter; Modified: trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/BoatDetails-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/BoatDetails-conversion.properties 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/BoatDetails-conversion.properties 2014-06-30 10:38:02 UTC (rev 2113) @@ -1 +1,21 @@ +### +# #%L +# Wao :: Web +# %% +# Copyright (C) 2009 - 2014 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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% +### expiredSampleRowIds=org.nuiton.web.struts2.converters.JsonConverter Modified: trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/Synthesis-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/Synthesis-conversion.properties 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/Synthesis-conversion.properties 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,2 +1,22 @@ +### +# #%L +# Wao :: Web +# %% +# Copyright (C) 2009 - 2014 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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% +### expectedVsActualObservationsByMonthsChart=fr.ifremer.wao.web.converter.JFreeChartToImgTagConverter boardingBoatsChart=fr.ifremer.wao.web.converter.JFreeChartToImgTagConverter Modified: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/BoatsAction-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/BoatsAction-conversion.properties 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/BoatsAction-conversion.properties 2014-06-30 10:38:02 UTC (rev 2113) @@ -1 +1,21 @@ +### +# #%L +# Wao :: Web +# %% +# Copyright (C) 2009 - 2014 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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% +### filter=org.nuiton.web.struts2.converters.JsonConverter Modified: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/ContactsAction-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/ContactsAction-conversion.properties 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/ContactsAction-conversion.properties 2014-06-30 10:38:02 UTC (rev 2113) @@ -1 +1,21 @@ +### +# #%L +# Wao :: Web +# %% +# Copyright (C) 2009 - 2014 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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% +### filter=org.nuiton.web.struts2.converters.JsonConverter Modified: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/GetBoatContactsCountJsonAction-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/GetBoatContactsCountJsonAction-conversion.properties 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/GetBoatContactsCountJsonAction-conversion.properties 2014-06-30 10:38:02 UTC (rev 2113) @@ -1 +1,21 @@ +### +# #%L +# Wao :: Web +# %% +# Copyright (C) 2009 - 2014 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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% +### since=fr.ifremer.wao.web.converter.DateConverter Modified: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/SynthesisAction-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/SynthesisAction-conversion.properties 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/SynthesisAction-conversion.properties 2014-06-30 10:38:02 UTC (rev 2113) @@ -1 +1,21 @@ +### +# #%L +# Wao :: Web +# %% +# Copyright (C) 2009 - 2014 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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% +### filter=org.nuiton.web.struts2.converters.JsonConverter Modified: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction-conversion.properties 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction-conversion.properties 2014-06-30 10:38:02 UTC (rev 2113) @@ -1 +1,21 @@ +### +# #%L +# Wao :: Web +# %% +# Copyright (C) 2009 - 2014 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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% +### filter=org.nuiton.web.struts2.converters.JsonConverter Modified: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsvente/SamplingPlanAction-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsvente/SamplingPlanAction-conversion.properties 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsvente/SamplingPlanAction-conversion.properties 2014-06-30 10:38:02 UTC (rev 2113) @@ -1 +1,21 @@ +### +# #%L +# Wao :: Web +# %% +# Copyright (C) 2009 - 2014 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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% +### filter=org.nuiton.web.struts2.converters.JsonConverter

1 0

r2112 - in trunk/wao-web/src/main/webapp: bootstrap-wysihtml5-0.0.2 css wysihtml5-0.3.0
by bleny＠users.forge.codelutin.com 30 Jun '14

30 Jun '14

Author: bleny Date: 2014-06-30 12:30:23 +0200 (Mon, 30 Jun 2014) New Revision: 2112 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2112 Log: add missing ignore license tags Modified: trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.css trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.fr-FR.js trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.js trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.min.js trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/wysiwyg-color.css trunk/wao-web/src/main/webapp/css/font-awesome.min.css trunk/wao-web/src/main/webapp/wysihtml5-0.3.0/wysihtml5.js trunk/wao-web/src/main/webapp/wysihtml5-0.3.0/wysihtml5.min.js Modified: trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.css =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.css 2014-06-30 09:07:09 UTC (rev 2111) +++ trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.css 2014-06-30 10:30:23 UTC (rev 2112) @@ -1,3 +1,4 @@ +/* %%Ignore-License */ ul.wysihtml5-toolbar { margin: 0; padding: 0; Modified: trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.fr-FR.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.fr-FR.js 2014-06-30 09:07:09 UTC (rev 2111) +++ trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.fr-FR.js 2014-06-30 10:30:23 UTC (rev 2112) @@ -1,3 +1,4 @@ +/* %%Ignore-License */ /** * French translation for bootstrap-wysihtml5 */ Modified: trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.js 2014-06-30 09:07:09 UTC (rev 2111) +++ trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.js 2014-06-30 10:30:23 UTC (rev 2112) @@ -1,3 +1,4 @@ +/* %%Ignore-License */ !function($, wysi) { "use strict"; Modified: trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.min.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.min.js 2014-06-30 09:07:09 UTC (rev 2111) +++ trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.min.js 2014-06-30 10:30:23 UTC (rev 2112) @@ -1 +1,2 @@ +/* %%Ignore-License */ !function(a,b){"use strict";var c={"font-styles":"<li class='dropdown'><a class='btn dropdown-toggle' data-toggle='dropdown' href='#'><i class='icon-font'></i> <span class='current-font'>Normal text</span> <b class='caret'></b></a><ul class='dropdown-menu'><li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='div'>Normal text</a></li><li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h1'>Heading 1</a></li><li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h2'>Heading 2</a></li></ul></li>",emphasis:"<li><div class='btn-group'><a class='btn' data-wysihtml5-command='bold' title='CTRL+B'>Bold</a><a class='btn' data-wysihtml5-command='italic' title='CTRL+I'>Italic</a></div></li>",lists:"<li><div class='btn-group'><a class='btn' data-wysihtml5-command='insertUnorderedList' title='Unordered List'><i class='icon-list'></i></a><a class='btn' data-wysihtml5-command='insertOrderedList' title='Ordered List'><i class='icon-th-list'></i></a><a class='btn' data-wysihtml5-command='Outdent' title='Outdent'><i class='icon-indent-right'></i></a><a class='btn' data-wysihtml5-command='Indent' title='Indent'><i class='icon-indent-left'></i></a></div></li>",link:"<li><div class='bootstrap-wysihtml5-insert-link-modal modal hide fade'><div class='modal-header'><a class='close' data-dismiss='modal'>×</a><h3>Insert Link</h3></div><div class='modal-body'><input value='http://' class='bootstrap-wysihtml5-insert-link-url input-xlarge'></div><div class='modal-footer'><a href='#' class='btn' data-dismiss='modal'>Cancel</a><a href='#' class='btn btn-primary' data-dismiss='modal'>Insert link</a></div></div><a class='btn' data-wysihtml5-command='createLink' title='Link'><i class='icon-share'></i></a></li>",image:"<li><div class='bootstrap-wysihtml5-insert-image-modal modal hide fade'><div class='modal-header'><a class='close' data-dismiss='modal'>×</a><h3>Insert Image</h3></div><div class='modal-body'><input value='http://' class='bootstrap-wysihtml5-insert-image-url input-xlarge'></div><div class='modal-footer'><a href='#' class='btn' data-dismiss='modal'>Cancel</a><a href='#' class='btn btn-primary' data-dismiss='modal'>Insert image</a></div></div><a class='btn' data-wysihtml5-command='insertImage' title='Insert image'><i class='icon-picture'></i></a></li>",html:"<li><div class='btn-group'><a class='btn' data-wysihtml5-action='change_view' title='Edit HTML'><i class='icon-pencil'></i></a></div></li>"},d={"font-styles":!0,emphasis:!0,lists:!0,html:!1,link:!0,image:!0,events:{},parserRules:{tags:{b:{},i:{},br:{},ol:{},ul:{},li:{},h1:{},h2:{},u:1,img:{check_attributes:{width:"numbers",alt:"alt",src:"url",height:"numbers"}},a:{set_attributes:{target:"_blank",rel:"nofollow"},check_attributes:{href:"url"}}}}},e=function(b,c){this.el=b,this.toolbar=this.createToolbar(b,c||d),this.editor=this.createEditor(c),window.editor=this.editor,a("iframe.wysihtml5-sandbox").each(function(b,c){a(c.contentWindow).off("focus.wysihtml5").on({"focus.wysihtml5":function(){a("li.dropdown").removeClass("open")}})})};e.prototype={constructor:e,createEditor:function(a){var c=d.parserRules;a&&a.parserRules&&(c=a.parserRules);var e=new b.Editor(this.el.attr("id"),{toolbar:this.toolbar.attr("id"),parserRules:c});if(a&&a.events)for(var f in a.events)e.on(f,a.events[f]);return e},createToolbar:function(b,e){var f=this,g=a("<ul/>",{id:b.attr("id")+"-wysihtml5-toolbar","class":"wysihtml5-toolbar",style:"display:none"});for(var h in d){var i=!1;e[h]!=undefined?e[h]==1&&(i=!0):i=d[h],i==1&&(g.append(c[h]),h=="html"&&this.initHtml(g),h=="link"&&this.initInsertLink(g),h=="image"&&this.initInsertImage(g))}var f=this;return g.find("a[data-wysihtml5-command='formatBlock']").click(function(b){var c=a(b.srcElement);f.toolbar.find(".current-font").text(c.html())}),this.el.before(g),g},initHtml:function(a){var b="a[data-wysihtml5-action='change_view']";a.find(b).click(function(c){a.find("a.btn").not(b).toggleClass("disabled")})},initInsertImage:function(a){var b=this,c=a.find(".bootstrap-wysihtml5-insert-image-modal"),d=c.find(".bootstrap-wysihtml5-insert-image-url"),e=c.find("a.btn-primary"),f=d.val(),g=function(){var a=d.val();d.val(f),b.editor.composer.commands.exec("insertImage",a)};d.keypress(function(a){a.which==13&&(g(),c.modal("hide"))}),e.click(g),c.on("shown",function(){d.focus()}),c.on("hide",function(){b.editor.currentView.element.focus()}),a.find("a[data-wysihtml5-command=insertImage]").click(function(){c.modal("show")})},initInsertLink:function(a){var b=this,c=a.find(".bootstrap-wysihtml5-insert-link-modal"),d=c.find(".bootstrap-wysihtml5-insert-link-url"),e=c.find("a.btn-primary"),f=d.val(),g=function(){var a=d.val();d.val(f),b.editor.composer.commands.exec("createLink",{href:a,target:"_blank",rel:"nofollow"})},h=!1;d.keypress(function(a){a.which==13&&(g(),c.modal("hide"))}),e.click(g),c.on("shown",function(){d.focus()}),c.on("hide",function(){b.editor.currentView.element.focus()}),a.find("a[data-wysihtml5-command=createLink]").click(function(){c.modal("show")})}},a.fn.wysihtml5=function(b){return this.each(function(){var c=a(this);c.data("wysihtml5",new e(c,b))})},a.fn.wysihtml5.Constructor=e}(window.jQuery,window.wysihtml5); \ No newline at end of file Modified: trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/wysiwyg-color.css =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/wysiwyg-color.css 2014-06-30 09:07:09 UTC (rev 2111) +++ trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/wysiwyg-color.css 2014-06-30 10:30:23 UTC (rev 2112) @@ -1,3 +1,7 @@ +/* + * %%Ignore-License + */ + .wysiwyg-color-black { color: black; } Modified: trunk/wao-web/src/main/webapp/css/font-awesome.min.css =================================================================== --- trunk/wao-web/src/main/webapp/css/font-awesome.min.css 2014-06-30 09:07:09 UTC (rev 2111) +++ trunk/wao-web/src/main/webapp/css/font-awesome.min.css 2014-06-30 10:30:23 UTC (rev 2112) @@ -1,4 +1,4 @@ -/*! +/*! %%Ignore-License * Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.0.3');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.3333333333333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.2857142857142858em;text-align:center}.fa-ul{padding-left:0;margin-left:2.142857142857143em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;top:.14285714285714285em;text-align:center}.fa-li.fa-lg{left:-1.8571428571428572em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:spin 2s infinite linear;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}@-moz-keyframes spin{0%{-moz-transform:rotate(0deg)}100%{-moz-transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0deg)}100%{-o-transform:rotate(359deg)}}@-ms-keyframes spin{0%{-ms-transform:rotate(0deg)}100%{-ms-transform:rotate(359deg)}}@keyframes spin{0%{transform:rotate(0deg)}100%{transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0,mirror=1);-webkit-transform:scale(-1,1);-moz-transform:scale(-1,1);-ms-transform:scale(-1,1);-o-transform:scale(-1,1);transform:scale(-1,1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2,mirror=1);-webkit-transform:scale(1,-1);-moz-transform:scale(1,-1);-ms-transform:scale(1,-1);-o-transform:scale(1,-1);transform:scale(1,-1)}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-asc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-desc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-reply-all:before{content:"\f122"}.fa-mail-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"} \ No newline at end of file Modified: trunk/wao-web/src/main/webapp/wysihtml5-0.3.0/wysihtml5.js =================================================================== --- trunk/wao-web/src/main/webapp/wysihtml5-0.3.0/wysihtml5.js 2014-06-30 09:07:09 UTC (rev 2111) +++ trunk/wao-web/src/main/webapp/wysihtml5-0.3.0/wysihtml5.js 2014-06-30 10:30:23 UTC (rev 2112) @@ -1,3 +1,4 @@ +/* %%Ignore-License */ /** * @license wysihtml5 v0.3.0 * https://github.com/xing/wysihtml5 Modified: trunk/wao-web/src/main/webapp/wysihtml5-0.3.0/wysihtml5.min.js =================================================================== --- trunk/wao-web/src/main/webapp/wysihtml5-0.3.0/wysihtml5.min.js 2014-06-30 09:07:09 UTC (rev 2111) +++ trunk/wao-web/src/main/webapp/wysihtml5-0.3.0/wysihtml5.min.js 2014-06-30 10:30:23 UTC (rev 2112) @@ -1,3 +1,4 @@ +/* %%Ignore-License */ /* wysihtml5 v0.3.0 https://github.com/xing/wysihtml5

1 0

r2111 - in trunk/wao-web/src/main: java/fr/ifremer/wao/web/action resources/i18n
by bleny＠users.forge.codelutin.com 30 Jun '14

30 Jun '14

Author: bleny Date: 2014-06-30 11:07:09 +0200 (Mon, 30 Jun 2014) New Revision: 2111 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2111 Log: fixes #5349 add validation on filter#periodTo ?\226?\137?\165 filter#periodFrom Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java 2014-06-26 14:29:44 UTC (rev 2110) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java 2014-06-30 09:07:09 UTC (rev 2111) @@ -29,6 +29,7 @@ import fr.ifremer.wao.services.service.SamplingPlanService; import fr.ifremer.wao.web.WaoJspActionSupport; import org.apache.commons.lang3.time.DateUtils; +import org.nuiton.i18n.I18n; import java.text.SimpleDateFormat; import java.util.Date; @@ -64,6 +65,15 @@ } @Override + public void validate() { + + if (filter.getPeriodTo().before(filter.getPeriodFrom())) { + addFieldError("filter.periodTo", I18n.l(getLocale(), "wao.ui.periodToMustBeAfterPeriodFrom")); + } + + } + + @Override public String execute() { filter = Objects.firstNonNull(session.getSampleRowsFilter(), filter); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-06-26 14:29:44 UTC (rev 2110) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-06-30 09:07:09 UTC (rev 2111) @@ -35,6 +35,7 @@ import fr.ifremer.wao.services.service.ObsMerContactsList; import fr.ifremer.wao.web.WaoJspActionSupport; import org.apache.commons.lang3.time.DateUtils; +import org.nuiton.i18n.I18n; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; @@ -116,6 +117,15 @@ } @Override + public void validate() { + + if (filter.getPeriodTo().before(filter.getPeriodFrom())) { + addFieldError("filter.periodTo", I18n.l(getLocale(), "wao.ui.periodToMustBeAfterPeriodFrom")); + } + + } + + @Override public String execute() { filter = Objects.firstNonNull(session.getContactsFilter(), filter); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java 2014-06-26 14:29:44 UTC (rev 2110) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java 2014-06-30 09:07:09 UTC (rev 2111) @@ -6,6 +6,7 @@ import fr.ifremer.wao.services.service.Synthesis; import fr.ifremer.wao.services.service.SynthesisService; import fr.ifremer.wao.web.WaoJspActionSupport; +import org.nuiton.i18n.I18n; public class SynthesisAction extends WaoJspActionSupport implements Preparable { @@ -36,6 +37,15 @@ } @Override + public void validate() { + + if (filter.getPeriodTo().before(filter.getPeriodFrom())) { + addFieldError("filter.periodTo", I18n.l(getLocale(), "wao.ui.periodToMustBeAfterPeriodFrom")); + } + + } + + @Override public String execute() { filter = Objects.firstNonNull(session.getSynthesisFilter(), filter); Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-26 14:29:44 UTC (rev 2110) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-30 09:07:09 UTC (rev 2111) @@ -492,6 +492,7 @@ wao.ui.page.companies.title=Companies wao.ui.page.waoUsers.title=Users wao.ui.page.waoUsers.titleForCompany=Users for company %s +wao.ui.periodToMustBeAfterPeriodFrom=The end of the period must be after the beginning wao.ui.publishedByProgram=Pusblished by program wao.ui.publishedByYourCompany=Published by company wao.ui.removeBoatEligibility.confirm=Are you sure you want to make this boat ineligible for sample row ? Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-26 14:29:44 UTC (rev 2110) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-30 09:07:09 UTC (rev 2111) @@ -492,6 +492,7 @@ wao.ui.page.companies.title=Sociétés wao.ui.page.waoUsers.title=Utilisateurs wao.ui.page.waoUsers.titleForCompany=Utilisateurs de la société %s +wao.ui.periodToMustBeAfterPeriodFrom=La période de temps doit se terminer après avoir commencé wao.ui.publishedByProgram=Publiée par le programme wao.ui.publishedByYourCompany=Publiée par la société wao.ui.removeBoatEligibility.confirm=Êtes-vous sûr de vouloir rendre le navire inéligible pour cette ligne ?

1 0

r2110 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao wao-persistence/src/main/resources/i18n wao-services/src/main/java/fr/ifremer/wao/services wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/main/java/fr/ifremer/wao/services/service/csv wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer wao-web/src/main/resources/i18n wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 26 Jun '14

26 Jun '14

Author: bleny Date: 2014-06-26 16:29:44 +0200 (Thu, 26 Jun 2014) New Revision: 2110 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2110 Log: fixes #4726 export sampling plan with stats Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerSamplingPlanExportModel.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ExportSamplingPlanWithStatisticsAction.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-06-26 14:29:00 UTC (rev 2109) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-06-26 14:29:44 UTC (rev 2110) @@ -174,4 +174,8 @@ public static int collectionHashcode(Collection<?> a) { return a == null ? 0 : a.size(); } + + public static String getMonthPattern(Locale locale) { + return I18n.l(locale, "wao.month.pattern"); + } } Modified: trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties =================================================================== --- trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties 2014-06-26 14:29:00 UTC (rev 2109) +++ trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties 2014-06-26 14:29:44 UTC (rev 2110) @@ -147,4 +147,5 @@ wao.dateyear.formatter=%1$tY wao.month.formatter=%1$tm-%1$tY wao.month.parser=MM-yyyy +wao.month.pattern= wao.time.formatter=%1$tH\:%1$tM Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-26 14:29:00 UTC (rev 2109) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-26 14:29:44 UTC (rev 2110) @@ -194,6 +194,10 @@ return userProfile.isAdmin() || userProfile.isCoordinatorOrObserver(); } + public boolean isAuthorizedToExportSamplingPlanWithStatistics() { + return userProfile.isAdmin() || userProfile.isCoordinator(); + } + public boolean isAuthorizedToViewContactsComments() { return ! userProfile.isProfessional(); } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-06-26 14:29:00 UTC (rev 2109) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-06-26 14:29:44 UTC (rev 2110) @@ -21,6 +21,7 @@ * #L% */ +import com.google.common.base.Charsets; import com.google.common.base.Optional; import com.google.common.cache.Cache; import com.google.common.collect.ImmutableSet; @@ -28,6 +29,7 @@ import com.google.common.collect.Sets; import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.SampleRowsFilter; +import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.ContactState; @@ -36,13 +38,19 @@ import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowTopiaDao; import fr.ifremer.wao.services.AuthenticatedWaoUser; +import fr.ifremer.wao.services.service.csv.ObsMerSamplingPlanExportModel; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.csv.Export; +import org.nuiton.csv.ExportModel; +import java.io.InputStream; import java.util.Collection; import java.util.Date; +import java.util.LinkedHashSet; import java.util.List; public class ObsMerSamplingPlanService extends SamplingPlanService { @@ -214,4 +222,42 @@ return Pair.of(real, estimated); } + + public InputStream exportSamplingPlanWithStatistics(AuthenticatedWaoUser authenticatedWaoUser, SampleRowsFilter filter) { + + ObsMerSamplingPlan samplingPlan = getSamplingPlan(authenticatedWaoUser, filter); + + Collection<ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart> sampleRows = + new LinkedHashSet<>(); + for (SamplingPlan.SamplingPlanFacadePart facade : samplingPlan) { + for (SamplingPlan.SamplingPlanSectorPart<ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart> sector : facade) { + for (ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart obsMerSampleRowPart : sector) { + sampleRows.add(obsMerSampleRowPart); + } + } + } + + ExportModel<ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart> exportModel = + new ObsMerSamplingPlanExportModel( + getLocale(), + filter.getPeriodFrom(), + filter.getPeriodTo()); + + Export<ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart> export = + Export.newExport(exportModel, sampleRows); + + try { + + String csvContent = export.toString(Charsets.UTF_8); + + InputStream csvInputStream = IOUtils.toInputStream(csvContent, Charsets.UTF_8); + + return csvInputStream; + + } catch (Exception e) { + throw new WaoTechnicalException(e); + } + + } + } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java 2014-06-26 14:29:00 UTC (rev 2109) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java 2014-06-26 14:29:44 UTC (rev 2110) @@ -6,6 +6,7 @@ import fr.ifremer.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowLog; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ToStringBuilder; import org.nuiton.util.DateUtil; @@ -281,6 +282,10 @@ */ protected SamplingPlanStatistics totalTides; + protected String facade; + + protected String sectors; + protected String fishingZones; protected String code; @@ -362,6 +367,8 @@ } } totalTides = new SamplingPlanStatistics(totalTidesExpected, totalTidesReal, totalTidesEstimated); + facade = sampleRow.getFacade(); + sectors = sampleRow.getSectors(); fishingZones = ""; for (FishingZone zone : sampleRow.getFishingZone()) { fishingZones += zone.getDistrictCode() + ", "; @@ -434,6 +441,14 @@ return code; } + public String getFacade() { + return facade; + } + + public String getSectors() { + return sectors; + } + public String getFishingZonesInfos() { return fishingZonesInfos; } @@ -545,6 +560,10 @@ public long getSampleRowContactCounts() { return sampleRowContactCounts; } + + public String getDcf5Codes() { + return StringUtils.join(getDcf5CodesAndDescriptions().keySet(), ", "); + } } } Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerSamplingPlanExportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerSamplingPlanExportModel.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerSamplingPlanExportModel.java 2014-06-26 14:29:44 UTC (rev 2110) @@ -0,0 +1,102 @@ +package fr.ifremer.wao.services.service.csv; + +import fr.ifremer.wao.WaoUtils; +import fr.ifremer.wao.services.service.ObsMerSamplingPlan; +import org.nuiton.csv.Common; +import org.nuiton.csv.ValueGetter; +import org.nuiton.csv.ext.AbstractExportModel; +import org.nuiton.util.PeriodDates; + +import java.util.Collection; +import java.util.Date; +import java.util.Locale; + +public class ObsMerSamplingPlanExportModel extends AbstractExportModel<ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart> { + + public ObsMerSamplingPlanExportModel(Locale locale, Date periodFrom, Date periodTo) { + + super(';'); + + Common.DateValue monthYearFormatter = + new Common.DateValue(WaoUtils.getMonthPattern(locale)); + + modelBuilder.newColumnForExport("PLAN_CODE", "code"); + modelBuilder.newColumnForExport("PROGRAMME_CODE", "programName"); + modelBuilder.newColumnForExport("PROGRAMME_DEBUT", "periodBegin", monthYearFormatter); + modelBuilder.newColumnForExport("PROGRAMME_DEBUT", "periodEnd", monthYearFormatter); + modelBuilder.newColumnForExport("SOCIETE_NOM", "companyName"); + modelBuilder.newColumnForExport("PECHE_FACADE", "facade"); + modelBuilder.newColumnForExport("PECHE_ZONE", "sectors"); + modelBuilder.newColumnForExport("ZONES_PECHE", "fishingZones"); + modelBuilder.newColumnForExport("ZONES_PECHE_INFOS", "fishingZonesInfos"); + modelBuilder.newColumnForExport("ZONES_PECHE_INFOS", "fishingZonesInfos"); + modelBuilder.newColumnForExport("METIER_MAILLAGE", "professionMeshSize"); + modelBuilder.newColumnForExport("METIER_TAILLE", "professionSize"); + modelBuilder.newColumnForExport("METIER_AUTRE", "professionOther"); + modelBuilder.newColumnForExport("METIER_LIBELLE", "professionLibelle"); + modelBuilder.newColumnForExport("METIER_ESPECES", "professionSpecies"); + modelBuilder.newColumnForImportExport("PLAN_DUREE_MOY", "averageTideTime", Common.DOUBLE_PRIMITIVE); + modelBuilder.newColumnForImportExport("PLAN_NB_OBSERV", "nbObservants", Common.PRIMITIVE_INTEGER); + modelBuilder.newColumnForImportExport("TAUX_COUVERTURE_APPLIQUE", "appliedCoverageRate", Common.DOUBLE); + + Collection<Date> months = new PeriodDates(periodFrom, periodTo).getMonths(); + + for (Date month : months) { + String headerName = monthYearFormatter.format(month); + modelBuilder.newColumnForExport(headerName + "_EFFORT", new ExpectedTidesValueGetter(month), Common.INTEGER); + modelBuilder.newColumnForExport(headerName + "_ESTIME", new EstimatedTidesValueGetter(month), Common.INTEGER); + modelBuilder.newColumnForExport(headerName + "_REALISE", new RealTidesValueGetter(month), Common.INTEGER); + } + + modelBuilder.newColumnForExport("TOTAL_EFFORT", "totalTidesExpected", Common.INTEGER); + modelBuilder.newColumnForExport("TOTAL_ESTIME", "totalTidesEstimated", Common.INTEGER); + modelBuilder.newColumnForExport("TOTAL_REALISE", "totalTidesReal", Common.INTEGER); + + modelBuilder.newColumnForExport("TOTAL_EFFORT_JOURS", "observationTimesInDaysExpected", Common.DOUBLE); + modelBuilder.newColumnForExport("TOTAL_ESTIME_JOURS", "observationTimesInDaysEstimated", Common.LONG); + modelBuilder.newColumnForExport("TOTAL_REALISE_JOURS", "observationTimesInDaysReal", Common.LONG); + + } + + protected static class ExpectedTidesValueGetter implements ValueGetter<ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart, Integer> { + + protected Date month; + + public ExpectedTidesValueGetter(Date month) { + this.month = month; + } + + @Override + public Integer get(ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart sampleRowPart) { + return sampleRowPart.getNbTidesExpected(month); + } + } + + protected static class EstimatedTidesValueGetter implements ValueGetter<ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart, Integer> { + + protected Date month; + + public EstimatedTidesValueGetter(Date month) { + this.month = month; + } + + @Override + public Integer get(ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart sampleRowPart) { + return sampleRowPart.getNbTidesExpected(month); + } + } + + protected static class RealTidesValueGetter implements ValueGetter<ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart, Integer> { + + protected Date month; + + public RealTidesValueGetter(Date month) { + this.month = month; + } + + @Override + public Integer get(ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart sampleRowPart) { + return sampleRowPart.getNbTidesReal(month); + } + } +} Copied: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ExportSamplingPlanWithStatisticsAction.java (from rev 2106, trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ExportSamplingPlanAction.java) =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ExportSamplingPlanWithStatisticsAction.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ExportSamplingPlanWithStatisticsAction.java 2014-06-26 14:29:44 UTC (rev 2110) @@ -0,0 +1,72 @@ +package fr.ifremer.wao.web.action.obsmer; + +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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.opensymphony.xwork2.Preparable; +import fr.ifremer.wao.SampleRowsFilter; +import fr.ifremer.wao.services.service.ObsMerSamplingPlanService; +import fr.ifremer.wao.web.action.AbstractDownloadCsvAction; + +import java.io.InputStream; +import java.util.Date; + +public class ExportSamplingPlanWithStatisticsAction extends AbstractDownloadCsvAction implements Preparable { + + private static final long serialVersionUID = 1L; + + protected transient ObsMerSamplingPlanService service; + + protected SampleRowsFilter filter; + + public void setService(ObsMerSamplingPlanService service) { + this.service = service; + } + + public SampleRowsFilter getFilter() { + if (filter == null) { + prepare(); + } + return filter; + } + + @Override + public void prepare() { + + filter = service.newSampleRowsFilter(getAuthenticatedWaoUser()); + + } + + @Override + public String getFileName() { + + return "plan-stats_" + getObsProgram().name() + "_" + dateFormat.format(new Date()) + ".csv"; + + } + + @Override + public InputStream getInputStream() { + + return service.exportSamplingPlanWithStatistics(getAuthenticatedWaoUser(), filter); + + } + +} Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-26 14:29:00 UTC (rev 2109) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-26 14:29:44 UTC (rev 2110) @@ -61,6 +61,7 @@ wao.ui.action.editOrDeleteSampleRow=Edit or delete sample row wao.ui.action.enlargeView=Enlarge view wao.ui.action.exportBoats=Export boats with private infos +wao.ui.action.exportSamplingPlanCsvWithStatistics=Export the plan and the statistics to CSV wao.ui.action.filter=Apply filters wao.ui.action.goBackToSamplingPlan=Back to sampling plan wao.ui.action.hideFilters=Hide filters Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-26 14:29:00 UTC (rev 2109) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-26 14:29:44 UTC (rev 2110) @@ -61,6 +61,7 @@ wao.ui.action.editOrDeleteSampleRow=Modifier ou supprimer la ligne wao.ui.action.enlargeView=Agrandir la vue wao.ui.action.exportBoats=Exporter les $s navires avec leurs informations privées +wao.ui.action.exportSamplingPlanCsvWithStatistics=Exporter au format CSV le plan avec le réalisé wao.ui.action.filter=Appliquer les filtres wao.ui.action.goBackToSamplingPlan=Retourner au plan d'échantillonnage wao.ui.action.hideFilters=Masquer les filtres Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-26 14:29:00 UTC (rev 2109) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-26 14:29:44 UTC (rev 2110) @@ -147,6 +147,12 @@ </s:submit> </s:if> + <s:if test="authenticatedWaoUser.authorizedToExportSamplingPlanWithStatistics"> + <s:submit namespace="/obsmer" action="export-sampling-plan-with-statistics" type="button" cssClass="btn"> + <i class="icon-download"></i> <s:text name="wao.ui.action.exportSamplingPlanCsvWithStatistics" /> + </s:submit> + </s:if> + </div> </s:form>

1 0