Wao-commits

Download

wao-commits@list.forge.codelutin.com

June 2010

3 participants
97 discussions

[Suiviobsmer-commits] r574 - in trunk: wao-business/src/main/resources wao-business/src/main/resources/i18n wao-ui/src/license
by fdesbois＠users.labs.libre-entreprise.org June 28, 2010

June 28, 2010

Author: fdesbois Date: 2010-06-28 15:29:39 +0000 (Mon, 28 Jun 2010) New Revision: 574 Log: clean license + remove oldmappings directory Removed: trunk/wao-business/src/main/resources/oldmappings/ Modified: trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties trunk/wao-ui/src/license/THIRD-PARTY.properties Modified: trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-06-28 15:17:10 UTC (rev 573) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-06-28 15:29:39 UTC (rev 574) @@ -1,24 +1,3 @@ -### -# #%L -# Wao :: Business -# %% -# Copyright (C) 2009 - 2010 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by 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 General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### wao.error.boat.canCreateContact= wao.error.boat.getNbBoarding= wao.error.boatInfos.getNbBoardingForCompany= Modified: trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-06-28 15:17:10 UTC (rev 573) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-06-28 15:29:39 UTC (rev 574) @@ -1,24 +1,3 @@ -### -# #%L -# Wao :: Business -# %% -# Copyright (C) 2009 - 2010 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by 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 General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### wao.error.boat.canCreateContact=Impossible de cr\u00E9er un nouveau contact pour la soci\u00E9t\u00E9 %1$s et le navire %2$s (%3$d) wao.error.boat.getNbBoarding=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s wao.error.boatInfos.getNbBoardingForCompany=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s pour la soci\u00E9t\u00E9 %2$s Modified: trunk/wao-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-ui/src/license/THIRD-PARTY.properties 2010-06-28 15:17:10 UTC (rev 573) +++ trunk/wao-ui/src/license/THIRD-PARTY.properties 2010-06-28 15:29:39 UTC (rev 574) @@ -34,7 +34,7 @@ dom4j--dom4j--1.6.1=BSD javassist--javassist--3.9.0.GA=Lesser General Public License (LGPL) v 2.1 javax.transaction--jta--1.1=Sun ??? -ognl--ognl--2.7.3=http\://www.opensymphony.com/ognl/license.action +ognl--ognl--2.7.3=The OpenSymphony Software License, Version 1.1 org.antlr--antlr-runtime--3.1.1=BSD

1 0

[Suiviobsmer-commits] r573 - trunk/src/announcement
by fdesbois＠users.labs.libre-entreprise.org June 28, 2010

June 28, 2010

Author: fdesbois Date: 2010-06-28 15:17:10 +0000 (Mon, 28 Jun 2010) New Revision: 573 Log: Add announcement email Added: trunk/src/announcement/release-email-1.4.1.txt Added: trunk/src/announcement/release-email-1.4.1.txt =================================================================== --- trunk/src/announcement/release-email-1.4.1.txt (rev 0) +++ trunk/src/announcement/release-email-1.4.1.txt 2010-06-28 15:17:10 UTC (rev 573) @@ -0,0 +1,26 @@ + +La nouvelle version 1.4.1 de l'applicatif Wao est disponible ! Cette version +corrige les anomalies apparues dans la version 1.4. + +Résolution d'anomalies : + +- Le contrôle du format CSV d'import ne fonctionne pas sous Windows. [fdesbois-Ano #2358] +- Les champs login/password a la creation d'un utilisateur ne sont pas vide. [fdesbois-Ano #2357] +- Problème de sauvegarde du contact sur une ligne d'échantillon vide. [fdesbois-Ano #2356] + +Mise à jour librairie : + +- mavenpom4labs 2.2 -> 2.2.1 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs] + +Documentation : + +http://suiviobsmer.labs.libre-entreprise.org/wao/ + +Téléchargement : + +https://labs.libre-entreprise.org/frs/?group_id=154 + +Cordialement, + +L'équipe Wao +

1 0

[Suiviobsmer-commits] r572 - in trunk: src/site src/site/rst src/site/rst/guest src/site/rst/user wao-business wao-business/src wao-business/src/license wao-business/src/main/filters wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/io wao-business/src/main/resources/i18n wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity wao-business/src
by fdesbois＠users.labs.libre-entreprise.org June 28, 2010

June 28, 2010

Author: fdesbois Date: 2010-06-28 15:13:48 +0000 (Mon, 28 Jun 2010) New Revision: 572 Log: - Add THIRD-PARTY properties for missing licenses - Update license header - Delete old mappings Added: trunk/wao-business/src/license/ trunk/wao-business/src/license/THIRD-PARTY.properties trunk/wao-ui/src/license/ trunk/wao-ui/src/license/THIRD-PARTY.properties Removed: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml Modified: trunk/src/site/rst/guest.rst trunk/src/site/rst/guest/echantillonage.rst trunk/src/site/rst/user/echantillonage.rst trunk/src/site/rst/user/syntheses.rst trunk/src/site/site_fr.xml trunk/wao-business/pom.xml trunk/wao-business/src/main/filters/Wao.properties trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryHelper.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/NewsImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportRefusedException.java trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties trunk/wao-business/src/site/site_fr.xml trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/bean/UserRoleTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/WaoUserImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/CsvImport.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/LogFile.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/MinimalWindow.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/AuthenticationUtil.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ErrorReport.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ImportEngine.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/RequiresAuthentication.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Unavailable.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/RequiresAuthenticationFilter.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceAuthentication.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceAuthenticationImpl.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/CsvImport.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/LogFile.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/BoatActivityCalendar.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Connexion.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts1.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Index.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfile.properties trunk/wao-ui/src/main/resources/log4j.properties trunk/wao-ui/src/main/resources/org/apache/tapestry5/corelib/components/Errors_fr.properties trunk/wao-ui/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_fr.properties trunk/wao-ui/src/main/webapp/Connexion.tml trunk/wao-ui/src/main/webapp/WEB-INF/app.properties trunk/wao-ui/src/main/webapp/js/AdminUserSelect.js trunk/wao-ui/src/main/webapp/js/ContactComment.js trunk/wao-ui/src/main/webapp/js/NewsHider.js trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/AdministrationTest.java trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ContactsTest.java Modified: trunk/src/site/rst/guest/echantillonage.rst =================================================================== --- trunk/src/site/rst/guest/echantillonage.rst 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/src/site/rst/guest/echantillonage.rst 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +.. - +.. * #%L +.. * Wao +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU General Public License as +.. * published by 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Le plan d'échantillonage ======================== Modified: trunk/src/site/rst/guest.rst =================================================================== --- trunk/src/site/rst/guest.rst 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/src/site/rst/guest.rst 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +.. - +.. * #%L +.. * Wao +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU General Public License as +.. * published by 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Invités ======= Modified: trunk/src/site/rst/user/echantillonage.rst =================================================================== --- trunk/src/site/rst/user/echantillonage.rst 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/src/site/rst/user/echantillonage.rst 2010-06-28 15:13:48 UTC (rev 572) @@ -4,7 +4,7 @@ .. - .. * #%L .. * Wao -.. * +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/user/syntheses.rst =================================================================== --- trunk/src/site/rst/user/syntheses.rst 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/src/site/rst/user/syntheses.rst 2010-06-28 15:13:48 UTC (rev 572) @@ -4,7 +4,7 @@ .. - .. * #%L .. * Wao -.. * +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/src/site/site_fr.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -3,7 +3,7 @@ #%L Wao -$Id$ + $Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/pom.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -128,7 +128,6 @@ <phase>generate-sources</phase>  <configuration> -   <fullPackagePath>fr.ifremer.wao</fullPackagePath>  @@ -145,20 +144,6 @@ <goal>smart-generate</goal> </goals> </execution> -  -  -  -  -  -  -  -  -  -  -  -  -  -  </executions> </plugin> <plugin> Added: trunk/wao-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-business/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/wao-business/src/license/THIRD-PARTY.properties 2010-06-28 15:13:48 UTC (rev 572) @@ -0,0 +1,24 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - BSD style +# - Common Development and Distribution License (CDDL) v1.0 +# - Common Public License Version 1.0 +# - GNU Lesser General Public License +# - GNU Library or Lesser General Public License +# - Lesser General Public License (LGPL) v 3.0 +# - MIT License +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +# - The MIT License +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Jun 28 17:16:38 CEST 2010 +antlr--antlr--2.7.6=BSD +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD +javassist--javassist--3.8.0.GA=Lesser General Public License (LGPL) v 2.1 +javax.transaction--jta--1.1=Sun ??? Modified: trunk/wao-business/src/main/filters/Wao.properties =================================================================== --- trunk/wao-business/src/main/filters/Wao.properties 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/filters/Wao.properties 2010-06-28 15:13:48 UTC (rev 572) @@ -2,7 +2,7 @@ # #%L # Wao :: Business # -# +# # $Id$ # $HeadURL$ # %% @@ -48,4 +48,4 @@ wao.server.path=localhost:8080/wao ## Version (not necessary to override it) -wao.version=${project.version} \ No newline at end of file +wao.version=${project.version} Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao; import fr.ifremer.wao.bean.*; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryHelper.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryHelper.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryHelper.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao; import fr.ifremer.wao.entity.Boat; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.bean; import fr.ifremer.wao.entity.Company; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,7 +1,7 @@ /* * #%L * Wao :: Business - * + * * * $Id$ * $HeadURL: svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business/src/main/j… $ * %% @@ -9,15 +9,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/NewsImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/NewsImpl.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/NewsImpl.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.entity; /** Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.io; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportRefusedException.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportRefusedException.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportRefusedException.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.io; Modified: trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +### +# #%L +# Wao :: Business +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### wao.error.boat.canCreateContact= wao.error.boat.getNbBoarding= wao.error.boatInfos.getNbBoardingForCompany= Modified: trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +### +# #%L +# Wao :: Business +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### wao.error.boat.canCreateContact=Impossible de cr\u00E9er un nouveau contact pour la soci\u00E9t\u00E9 %1$s et le navire %2$s (%3$d) wao.error.boat.getNbBoarding=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s wao.error.boatInfos.getNbBoardingForCompany=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s pour la soci\u00E9t\u00E9 %2$s Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityCalendarImpl" node="fr.ifremer.wao.entity.ActivityCalendarImpl" proxy="fr.ifremer.wao.entity.ActivityCalendar" table="activityCalendar"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="year" name="year" node="year" type="int"/> - <property access="field" column="fiability" name="fiability" node="fiability" type="int"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityMonth" node="activityMonth" order-by="month"> - <key column="activityCalendar"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityMonthImpl" embed-xml="false" node="topiaId"/> - </bag> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityMonthImpl" node="fr.ifremer.wao.entity.ActivityMonthImpl" proxy="fr.ifremer.wao.entity.ActivityMonth" table="activityMonth"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="harbourLibelle" name="harbourLibelle" node="harbourLibelle" type="text"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <property access="field" column="nbBoardingPersons" name="nbBoardingPersons" node="nbBoardingPersons" type="java.lang.Integer"/> - <property access="field" column="nbSeaDays" name="nbSeaDays" node="nbSeaDays" type="java.lang.Integer"/> - <property access="field" column="nbFishingDays" name="nbFishingDays" node="nbFishingDays" type="java.lang.Integer"/> - <property access="field" column="month" name="month" node="month" type="int"/> - <property access="field" column="harbourCode" name="harbourCode" node="harbourCode" type="text"/> - <property access="field" column="harbourId" name="harbourId" node="harbourId" type="int"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityProfession" node="activityProfession" order-by="professionOrder"> - <key column="activityMonth"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityProfessionImpl" embed-xml="false" node="topiaId"/> - </bag> - <many-to-one class="fr.ifremer.wao.entity.ActivityCalendarImpl" column="activityCalendar" embed-xml="false" name="activityCalendar" node="activityCalendar/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityProfessionImpl" node="fr.ifremer.wao.entity.ActivityProfessionImpl" proxy="fr.ifremer.wao.entity.ActivityProfession" table="activityProfession"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="code" name="code" node="code" type="text"/> - <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> - <property access="field" column="id" name="id" node="id" type="int"/> - <property access="field" column="professionOrder" name="professionOrder" node="professionOrder" type="int"/> - <many-to-one class="fr.ifremer.wao.entity.ActivityMonthImpl" column="activityMonth" embed-xml="false" name="activityMonth" node="activityMonth/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityZone" node="activityZone" order-by="zoneId"> - <key column="activityProfession"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityZoneImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityZoneImpl" node="fr.ifremer.wao.entity.ActivityZoneImpl" proxy="fr.ifremer.wao.entity.ActivityZone" table="activityZone"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="zoneCode" name="zoneCode" node="zoneCode" type="text"/> - <property access="field" column="zoneLibelle" name="zoneLibelle" node="zoneLibelle" type="text"/> - <property access="field" column="zoneId" name="zoneId" node="zoneId" type="int"/> - <property access="field" column="gradiantCode" name="gradiantCode" node="gradiantCode" type="int"/> - <property access="field" column="gradiantLibelle" name="gradiantLibelle" node="gradiantLibelle" type="text"/> - <many-to-one class="fr.ifremer.wao.entity.ActivityProfessionImpl" column="activityProfession" embed-xml="false" name="activityProfession" node="activityProfession/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.BoatImpl" node="fr.ifremer.wao.entity.BoatImpl" proxy="fr.ifremer.wao.entity.Boat" table="boat"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="immatriculation" index="boat_immatriculation_idx" name="immatriculation" node="immatriculation" type="int" unique="true"/> - <property access="field" column="name" name="name" node="name" type="text"/> - <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> - <property access="field" column="boatLength" name="boatLength" node="boatLength" type="int"/> - <property access="field" column="buildYear" name="buildYear" node="buildYear" type="int"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <many-to-one class="fr.ifremer.wao.entity.ShipOwnerImpl" column="shipOwner" embed-xml="false" lazy="false" name="shipOwner" node="shipOwner/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="companyBoatInfos" node="companyBoatInfos"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityCalendar" node="activityCalendar"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityCalendarImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag embed-xml="false" inverse="true" lazy="true" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.BoatInfosImpl" node="fr.ifremer.wao.entity.BoatInfosImpl" proxy="fr.ifremer.wao.entity.BoatInfos" table="boatInfos"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="contactFirstName" name="contactFirstName" node="contactFirstName" type="text"/> - <property access="field" column="contactLastName" name="contactLastName" node="contactLastName" type="text"/> - <property access="field" column="contactEmail" name="contactEmail" node="contactEmail" type="text"/> - <property access="field" column="contactPhoneNumber" name="contactPhoneNumber" node="contactPhoneNumber" type="text"/> - <property access="field" column="dup" name="dup" node="dup" type="java.lang.Integer"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.CompanyImpl" node="fr.ifremer.wao.entity.CompanyImpl" proxy="fr.ifremer.wao.entity.Company" table="company"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="name" name="name" node="name" type="text"/> - <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> - <property access="field" column="address1" name="address1" node="address1" type="text"/> - <property access="field" column="address2" name="address2" node="address2" type="text"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <property access="field" column="email" name="email" node="email" type="text"/> - <property access="field" column="city" name="city" node="city" type="text"/> - <property access="field" column="postalCode" name="postalCode" node="postalCode" type="int"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="waoUser" node="waoUser"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.WaoUserImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="boatBoatInfos" node="boatBoatInfos"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ContactImpl" node="fr.ifremer.wao.entity.ContactImpl" proxy="fr.ifremer.wao.entity.Contact" table="contact"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="tideBeginDate" name="tideBeginDate" node="tideBeginDate" type="java.util.Date"/> - <property access="field" column="tideEndDate" name="tideEndDate" node="tideEndDate" type="java.util.Date"/> - <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> - <property access="field" column="mammalsObservation" name="mammalsObservation" node="mammalsObservation" type="boolean"/> - <property access="field" column="mammalsCapture" name="mammalsCapture" node="mammalsCapture" type="boolean"/> - <property access="field" column="validationProgram" name="validationProgram" node="validationProgram" type="java.lang.Boolean"/> - <property access="field" column="validationCompany" name="validationCompany" node="validationCompany" type="java.lang.Boolean"/> - <property access="field" column="dataInputDate" name="dataInputDate" node="dataInputDate" type="java.util.Date"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <property access="field" column="state" name="state" node="state" type="text"/> - <property access="field" column="tideNbDays" name="tideNbDays" node="tideNbDays" type="int"/> - <many-to-one class="fr.ifremer.wao.entity.WaoUserImpl" column="observer" embed-xml="false" name="observer" node="observer/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" lazy="false" name="sampleRow" node="sampleRow/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ElligibleBoatImpl" node="fr.ifremer.wao.entity.ElligibleBoatImpl" proxy="fr.ifremer.wao.entity.ElligibleBoat" table="elligibleBoat"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="globalActive" name="globalActive" node="globalActive" type="boolean"/> - <property access="field" column="companyActive" name="companyActive" node="companyActive" type="java.lang.Boolean"/> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.FishingZoneImpl" node="fr.ifremer.wao.entity.FishingZoneImpl" proxy="fr.ifremer.wao.entity.FishingZone" table="fishingZone"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="sectorName" name="sectorName" node="sectorName" type="text"/> - <property access="field" column="facadeName" name="facadeName" node="facadeName" type="text"/> - <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> - <bag embed-xml="true" lazy="true" name="sampleRow" node="sampleRow" table="fishingzone_samplerow"> - <key column="fishingZone"/> - <many-to-many class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="topiaId" order-by="code"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.NewsImpl" node="fr.ifremer.wao.entity.NewsImpl" proxy="fr.ifremer.wao.entity.News" table="news"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="title" name="title" node="title" type="text"/> - <property access="field" column="content" name="content" node="content" type="text"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ProfessionImpl" node="fr.ifremer.wao.entity.ProfessionImpl" proxy="fr.ifremer.wao.entity.Profession" table="profession"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="codeDCF5" name="codeDCF5" node="codeDCF5" type="text"/> - <property access="field" column="meshSize" name="meshSize" node="meshSize" type="text"/> - <property access="field" column="size" name="size" node="size" type="text"/> - <property access="field" column="other" name="other" node="other" type="text"/> - <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> - <property access="field" column="species" name="species" node="species" type="text"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.SampleMonthImpl" node="fr.ifremer.wao.entity.SampleMonthImpl" proxy="fr.ifremer.wao.entity.SampleMonth" table="sampleMonth"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="realTidesValue" name="realTidesValue" node="realTidesValue" type="int"/> - <property access="field" column="expectedTidesValue" name="expectedTidesValue" node="expectedTidesValue" type="int"/> - <property access="field" column="periodDate" name="periodDate" node="periodDate" type="java.util.Date"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.SampleRowImpl" node="fr.ifremer.wao.entity.SampleRowImpl" proxy="fr.ifremer.wao.entity.SampleRow" table="sampleRow"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> - <property access="field" column="averageTideTime" name="averageTideTime" node="averageTideTime" type="double"/> - <property access="field" column="code" index="sampleRow_code_idx" name="code" node="code" type="text" unique="true"/> - <property access="field" column="fishingZonesInfos" name="fishingZonesInfos" node="fishingZonesInfos" type="text"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <property access="field" column="programName" name="programName" node="programName" type="text"/> - <property access="field" column="periodBegin" name="periodBegin" node="periodBegin" type="java.util.Date"/> - <property access="field" column="periodEnd" name="periodEnd" node="periodEnd" type="java.util.Date"/> - <many-to-one class="fr.ifremer.wao.entity.ProfessionImpl" column="profession" embed-xml="false" lazy="false" name="profession" node="profession/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="sampleMonth" node="sampleMonth" order-by="periodDate"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleMonthImpl" embed-xml="false" node="topiaId"/> - </bag> - <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" lazy="false" name="company" node="company/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="sampleRowLog" node="sampleRowLog" order-by="topiaCreateDate desc"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleRowLogImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag embed-xml="true" inverse="true" lazy="false" name="fishingZone" node="fishingZone" table="fishingzone_samplerow"> - <key column="sampleRow"/> - <many-to-many class="fr.ifremer.wao.entity.FishingZoneImpl" column="fishingZone" node="topiaId" order-by="facadeName,sectorName,districtCode"/> - </bag> - <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.SampleRowLogImpl" node="fr.ifremer.wao.entity.SampleRowLogImpl" proxy="fr.ifremer.wao.entity.SampleRowLog" table="sampleRowLog"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="logText" name="logText" node="logText" type="text"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.WaoUserImpl" column="admin" embed-xml="false" lazy="false" name="admin" node="admin/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ShipOwnerImpl" node="fr.ifremer.wao.entity.ShipOwnerImpl" proxy="fr.ifremer.wao.entity.ShipOwner" table="shipOwner"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="code" index="shipOwner_code_idx" name="code" node="code" type="text" unique="true"/> - <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> - <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.WaoUserImpl" node="fr.ifremer.wao.entity.WaoUserImpl" proxy="fr.ifremer.wao.entity.WaoUser" table="waoUser"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> - <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> - <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> - <property access="field" column="login" name="login" node="login" type="text"/> - <property access="field" column="password" name="password" node="password" type="text"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <property access="field" column="admin" name="admin" node="admin" type="boolean"/> - <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> - <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> - <key column="observer"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityCalendarImpl" node="fr.ifremer.wao.entity.ActivityCalendarImpl" proxy="fr.ifremer.wao.entity.ActivityCalendar" table="activityCalendar"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="year" name="year" node="year" type="int"/> - <property access="field" column="fiability" name="fiability" node="fiability" type="int"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityMonth" node="activityMonth" order-by="month"> - <key column="activityCalendar"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityMonthImpl" embed-xml="false" node="topiaId"/> - </bag> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityMonthImpl" node="fr.ifremer.wao.entity.ActivityMonthImpl" proxy="fr.ifremer.wao.entity.ActivityMonth" table="activityMonth"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="harbourLibelle" name="harbourLibelle" node="harbourLibelle" type="text"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <property access="field" column="nbBoardingPersons" name="nbBoardingPersons" node="nbBoardingPersons" type="java.lang.Integer"/> - <property access="field" column="nbSeaDays" name="nbSeaDays" node="nbSeaDays" type="java.lang.Integer"/> - <property access="field" column="nbFishingDays" name="nbFishingDays" node="nbFishingDays" type="java.lang.Integer"/> - <property access="field" column="month" name="month" node="month" type="int"/> - <property access="field" column="harbourCode" name="harbourCode" node="harbourCode" type="text"/> - <property access="field" column="harbourId" name="harbourId" node="harbourId" type="int"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityProfession" node="activityProfession" order-by="professionOrder"> - <key column="activityMonth"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityProfessionImpl" embed-xml="false" node="topiaId"/> - </bag> - <many-to-one class="fr.ifremer.wao.entity.ActivityCalendarImpl" column="activityCalendar" embed-xml="false" name="activityCalendar" node="activityCalendar/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityProfessionImpl" node="fr.ifremer.wao.entity.ActivityProfessionImpl" proxy="fr.ifremer.wao.entity.ActivityProfession" table="activityProfession"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="code" name="code" node="code" type="text"/> - <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> - <property access="field" column="id" name="id" node="id" type="int"/> - <property access="field" column="professionOrder" name="professionOrder" node="professionOrder" type="int"/> - <many-to-one class="fr.ifremer.wao.entity.ActivityMonthImpl" column="activityMonth" embed-xml="false" name="activityMonth" node="activityMonth/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityZone" node="activityZone" order-by="zoneId"> - <key column="activityProfession"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityZoneImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityZoneImpl" node="fr.ifremer.wao.entity.ActivityZoneImpl" proxy="fr.ifremer.wao.entity.ActivityZone" table="activityZone"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="zoneCode" name="zoneCode" node="zoneCode" type="text"/> - <property access="field" column="zoneLibelle" name="zoneLibelle" node="zoneLibelle" type="text"/> - <property access="field" column="zoneId" name="zoneId" node="zoneId" type="int"/> - <property access="field" column="gradiantCode" name="gradiantCode" node="gradiantCode" type="int"/> - <property access="field" column="gradiantLibelle" name="gradiantLibelle" node="gradiantLibelle" type="text"/> - <many-to-one class="fr.ifremer.wao.entity.ActivityProfessionImpl" column="activityProfession" embed-xml="false" name="activityProfession" node="activityProfession/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.BoatImpl" node="fr.ifremer.wao.entity.BoatImpl" proxy="fr.ifremer.wao.entity.Boat" table="boat"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="immatriculation" index="boat_immatriculation_idx" name="immatriculation" node="immatriculation" type="int" unique="true"/> - <property access="field" column="name" name="name" node="name" type="text"/> - <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> - <property access="field" column="boatLength" name="boatLength" node="boatLength" type="int"/> - <property access="field" column="buildYear" name="buildYear" node="buildYear" type="int"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <many-to-one class="fr.ifremer.wao.entity.ShipOwnerImpl" column="shipOwner" embed-xml="false" lazy="false" name="shipOwner" node="shipOwner/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="companyBoatInfos" node="companyBoatInfos"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityCalendar" node="activityCalendar"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityCalendarImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag embed-xml="false" inverse="true" lazy="true" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.BoatInfosImpl" node="fr.ifremer.wao.entity.BoatInfosImpl" proxy="fr.ifremer.wao.entity.BoatInfos" table="boatInfos"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="contactFirstName" name="contactFirstName" node="contactFirstName" type="text"/> - <property access="field" column="contactLastName" name="contactLastName" node="contactLastName" type="text"/> - <property access="field" column="contactEmail" name="contactEmail" node="contactEmail" type="text"/> - <property access="field" column="contactPhoneNumber" name="contactPhoneNumber" node="contactPhoneNumber" type="text"/> - <property access="field" column="dup" name="dup" node="dup" type="java.lang.Integer"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.CompanyImpl" node="fr.ifremer.wao.entity.CompanyImpl" proxy="fr.ifremer.wao.entity.Company" table="company"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="name" name="name" node="name" type="text"/> - <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> - <property access="field" column="address1" name="address1" node="address1" type="text"/> - <property access="field" column="address2" name="address2" node="address2" type="text"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <property access="field" column="email" name="email" node="email" type="text"/> - <property access="field" column="city" name="city" node="city" type="text"/> - <property access="field" column="postalCode" name="postalCode" node="postalCode" type="int"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="waoUser" node="waoUser"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.WaoUserImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="boatBoatInfos" node="boatBoatInfos"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ContactImpl" node="fr.ifremer.wao.entity.ContactImpl" proxy="fr.ifremer.wao.entity.Contact" table="contact"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="tideBeginDate" name="tideBeginDate" node="tideBeginDate" type="java.util.Date"/> - <property access="field" column="tideEndDate" name="tideEndDate" node="tideEndDate" type="java.util.Date"/> - <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> - <property access="field" column="mammalsObservation" name="mammalsObservation" node="mammalsObservation" type="boolean"/> - <property access="field" column="mammalsCapture" name="mammalsCapture" node="mammalsCapture" type="boolean"/> - <property access="field" column="validationProgram" name="validationProgram" node="validationProgram" type="java.lang.Boolean"/> - <property access="field" column="validationCompany" name="validationCompany" node="validationCompany" type="java.lang.Boolean"/> - <property access="field" column="dataInputDate" name="dataInputDate" node="dataInputDate" type="java.util.Date"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <property access="field" column="state" name="state" node="state" type="text"/> - <property access="field" column="tideNbDays" name="tideNbDays" node="tideNbDays" type="int"/> - <many-to-one class="fr.ifremer.wao.entity.WaoUserImpl" column="observer" embed-xml="false" name="observer" node="observer/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" lazy="false" name="sampleRow" node="sampleRow/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ElligibleBoatImpl" node="fr.ifremer.wao.entity.ElligibleBoatImpl" proxy="fr.ifremer.wao.entity.ElligibleBoat" table="elligibleBoat"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="globalActive" name="globalActive" node="globalActive" type="boolean"/> - <property access="field" column="companyActive" name="companyActive" node="companyActive" type="java.lang.Boolean"/> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.FishingZoneImpl" node="fr.ifremer.wao.entity.FishingZoneImpl" proxy="fr.ifremer.wao.entity.FishingZone" table="fishingZone"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="sectorName" name="sectorName" node="sectorName" type="text"/> - <property access="field" column="facadeName" name="facadeName" node="facadeName" type="text"/> - <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> - <bag embed-xml="true" lazy="true" name="sampleRow" node="sampleRow" table="fishingzone_samplerow"> - <key column="fishingZone"/> - <many-to-many class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="topiaId" order-by="code"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.NewsImpl" node="fr.ifremer.wao.entity.NewsImpl" proxy="fr.ifremer.wao.entity.News" table="news"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="title" name="title" node="title" type="text"/> - <property access="field" column="content" name="content" node="content" type="text"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ProfessionImpl" node="fr.ifremer.wao.entity.ProfessionImpl" proxy="fr.ifremer.wao.entity.Profession" table="profession"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="codeDCF5" name="codeDCF5" node="codeDCF5" type="text"/> - <property access="field" column="meshSize" name="meshSize" node="meshSize" type="text"/> - <property access="field" column="size" name="size" node="size" type="text"/> - <property access="field" column="other" name="other" node="other" type="text"/> - <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> - <property access="field" column="species" name="species" node="species" type="text"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.SampleMonthImpl" node="fr.ifremer.wao.entity.SampleMonthImpl" proxy="fr.ifremer.wao.entity.SampleMonth" table="sampleMonth"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="realTidesValue" name="realTidesValue" node="realTidesValue" type="int"/> - <property access="field" column="expectedTidesValue" name="expectedTidesValue" node="expectedTidesValue" type="int"/> - <property access="field" column="periodDate" name="periodDate" node="periodDate" type="java.util.Date"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.SampleRowImpl" node="fr.ifremer.wao.entity.SampleRowImpl" proxy="fr.ifremer.wao.entity.SampleRow" table="sampleRow"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> - <property access="field" column="averageTideTime" name="averageTideTime" node="averageTideTime" type="double"/> - <property access="field" column="code" index="sampleRow_code_idx" name="code" node="code" type="text" unique="true"/> - <property access="field" column="fishingZonesInfos" name="fishingZonesInfos" node="fishingZonesInfos" type="text"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <property access="field" column="programName" name="programName" node="programName" type="text"/> - <property access="field" column="periodBegin" name="periodBegin" node="periodBegin" type="java.util.Date"/> - <property access="field" column="periodEnd" name="periodEnd" node="periodEnd" type="java.util.Date"/> - <many-to-one class="fr.ifremer.wao.entity.ProfessionImpl" column="profession" embed-xml="false" lazy="false" name="profession" node="profession/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="sampleMonth" node="sampleMonth" order-by="periodDate"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleMonthImpl" embed-xml="false" node="topiaId"/> - </bag> - <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" lazy="false" name="company" node="company/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="sampleRowLog" node="sampleRowLog" order-by="topiaCreateDate desc"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleRowLogImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag embed-xml="true" inverse="true" lazy="false" name="fishingZone" node="fishingZone" table="fishingzone_samplerow"> - <key column="sampleRow"/> - <many-to-many class="fr.ifremer.wao.entity.FishingZoneImpl" column="fishingZone" node="topiaId" order-by="facadeName,sectorName,districtCode"/> - </bag> - <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.SampleRowLogImpl" node="fr.ifremer.wao.entity.SampleRowLogImpl" proxy="fr.ifremer.wao.entity.SampleRowLog" table="sampleRowLog"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="logText" name="logText" node="logText" type="text"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.WaoUserImpl" column="admin" embed-xml="false" lazy="false" name="admin" node="admin/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ShipOwnerImpl" node="fr.ifremer.wao.entity.ShipOwnerImpl" proxy="fr.ifremer.wao.entity.ShipOwner" table="shipOwner"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="code" index="shipOwner_code_idx" name="code" node="code" type="text" unique="true"/> - <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> - <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.WaoUserImpl" node="fr.ifremer.wao.entity.WaoUserImpl" proxy="fr.ifremer.wao.entity.WaoUser" table="waoUser"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> - <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> - <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> - <property access="field" column="login" name="login" node="login" type="text"/> - <property access="field" column="password" name="password" node="password" type="text"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <property access="field" column="admin" name="admin" node="admin" type="boolean"/> - <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> - <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> - <key column="observer"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityCalendarImpl" node="fr.ifremer.wao.entity.ActivityCalendarImpl" proxy="fr.ifremer.wao.entity.ActivityCalendar" table="activityCalendar"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="year" name="year" node="year" type="int"/> - <property access="field" column="fiability" name="fiability" node="fiability" type="int"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityMonth" node="activityMonth" order-by="month"> - <key column="activityCalendar"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityMonthImpl" embed-xml="false" node="topiaId"/> - </bag> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityMonthImpl" node="fr.ifremer.wao.entity.ActivityMonthImpl" proxy="fr.ifremer.wao.entity.ActivityMonth" table="activityMonth"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="harbourLibelle" name="harbourLibelle" node="harbourLibelle" type="text"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <property access="field" column="nbBoardingPersons" name="nbBoardingPersons" node="nbBoardingPersons" type="java.lang.Integer"/> - <property access="field" column="nbSeaDays" name="nbSeaDays" node="nbSeaDays" type="java.lang.Integer"/> - <property access="field" column="nbFishingDays" name="nbFishingDays" node="nbFishingDays" type="java.lang.Integer"/> - <property access="field" column="month" name="month" node="month" type="int"/> - <property access="field" column="harbourCode" name="harbourCode" node="harbourCode" type="text"/> - <property access="field" column="harbourId" name="harbourId" node="harbourId" type="int"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityProfession" node="activityProfession" order-by="professionOrder"> - <key column="activityMonth"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityProfessionImpl" embed-xml="false" node="topiaId"/> - </bag> - <many-to-one class="fr.ifremer.wao.entity.ActivityCalendarImpl" column="activityCalendar" embed-xml="false" name="activityCalendar" node="activityCalendar/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityProfessionImpl" node="fr.ifremer.wao.entity.ActivityProfessionImpl" proxy="fr.ifremer.wao.entity.ActivityProfession" table="activityProfession"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="code" name="code" node="code" type="text"/> - <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> - <property access="field" column="id" name="id" node="id" type="int"/> - <property access="field" column="professionOrder" name="professionOrder" node="professionOrder" type="int"/> - <many-to-one class="fr.ifremer.wao.entity.ActivityMonthImpl" column="activityMonth" embed-xml="false" name="activityMonth" node="activityMonth/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityZone" node="activityZone" order-by="zoneId"> - <key column="activityProfession"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityZoneImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityZoneImpl" node="fr.ifremer.wao.entity.ActivityZoneImpl" proxy="fr.ifremer.wao.entity.ActivityZone" table="activityZone"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="zoneCode" name="zoneCode" node="zoneCode" type="text"/> - <property access="field" column="zoneLibelle" name="zoneLibelle" node="zoneLibelle" type="text"/> - <property access="field" column="zoneId" name="zoneId" node="zoneId" type="int"/> - <property access="field" column="gradiantCode" name="gradiantCode" node="gradiantCode" type="int"/> - <property access="field" column="gradiantLibelle" name="gradiantLibelle" node="gradiantLibelle" type="text"/> - <many-to-one class="fr.ifremer.wao.entity.ActivityProfessionImpl" column="activityProfession" embed-xml="false" name="activityProfession" node="activityProfession/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.BoatImpl" node="fr.ifremer.wao.entity.BoatImpl" proxy="fr.ifremer.wao.entity.Boat" table="boat"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="immatriculation" index="boat_immatriculation_idx" name="immatriculation" node="immatriculation" type="int" unique="true"/> - <property access="field" column="name" name="name" node="name" type="text"/> - <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> - <property access="field" column="boatLength" name="boatLength" node="boatLength" type="int"/> - <property access="field" column="buildYear" name="buildYear" node="buildYear" type="int"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <many-to-one class="fr.ifremer.wao.entity.ShipOwnerImpl" column="shipOwner" embed-xml="false" lazy="false" name="shipOwner" node="shipOwner/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="companyBoatInfos" node="companyBoatInfos"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityCalendar" node="activityCalendar"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityCalendarImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag embed-xml="false" inverse="true" lazy="true" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.BoatInfosImpl" node="fr.ifremer.wao.entity.BoatInfosImpl" proxy="fr.ifremer.wao.entity.BoatInfos" table="boatInfos"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="contactFirstName" name="contactFirstName" node="contactFirstName" type="text"/> - <property access="field" column="contactLastName" name="contactLastName" node="contactLastName" type="text"/> - <property access="field" column="contactEmail" name="contactEmail" node="contactEmail" type="text"/> - <property access="field" column="contactPhoneNumber" name="contactPhoneNumber" node="contactPhoneNumber" type="text"/> - <property access="field" column="dup" name="dup" node="dup" type="java.lang.Integer"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.CompanyImpl" node="fr.ifremer.wao.entity.CompanyImpl" proxy="fr.ifremer.wao.entity.Company" table="company"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="name" name="name" node="name" type="text"/> - <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> - <property access="field" column="address1" name="address1" node="address1" type="text"/> - <property access="field" column="address2" name="address2" node="address2" type="text"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <property access="field" column="email" name="email" node="email" type="text"/> - <property access="field" column="city" name="city" node="city" type="text"/> - <property access="field" column="postalCode" name="postalCode" node="postalCode" type="int"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="waoUser" node="waoUser"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.WaoUserImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="boatBoatInfos" node="boatBoatInfos"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ContactImpl" node="fr.ifremer.wao.entity.ContactImpl" proxy="fr.ifremer.wao.entity.Contact" table="contact"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="tideBeginDate" name="tideBeginDate" node="tideBeginDate" type="java.util.Date"/> - <property access="field" column="tideEndDate" name="tideEndDate" node="tideEndDate" type="java.util.Date"/> - <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> - <property access="field" column="mammalsObservation" name="mammalsObservation" node="mammalsObservation" type="boolean"/> - <property access="field" column="mammalsCapture" name="mammalsCapture" node="mammalsCapture" type="boolean"/> - <property access="field" column="validationProgram" name="validationProgram" node="validationProgram" type="java.lang.Boolean"/> - <property access="field" column="validationCompany" name="validationCompany" node="validationCompany" type="java.lang.Boolean"/> - <property access="field" column="dataInputDate" name="dataInputDate" node="dataInputDate" type="java.util.Date"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <property access="field" column="state" name="state" node="state" type="int"/> - <property access="field" column="tideNbDays" name="tideNbDays" node="tideNbDays" type="int"/> - <many-to-one class="fr.ifremer.wao.entity.WaoUserImpl" column="observer" embed-xml="false" name="observer" node="observer/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" lazy="false" name="sampleRow" node="sampleRow/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ElligibleBoatImpl" node="fr.ifremer.wao.entity.ElligibleBoatImpl" proxy="fr.ifremer.wao.entity.ElligibleBoat" table="elligibleBoat"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="globalActive" name="globalActive" node="globalActive" type="boolean"/> - <property access="field" column="companyActive" name="companyActive" node="companyActive" type="java.lang.Boolean"/> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.FishingZoneImpl" node="fr.ifremer.wao.entity.FishingZoneImpl" proxy="fr.ifremer.wao.entity.FishingZone" table="fishingZone"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="sectorName" name="sectorName" node="sectorName" type="text"/> - <property access="field" column="facadeName" name="facadeName" node="facadeName" type="text"/> - <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> - <bag embed-xml="true" inverse="true" lazy="true" name="sampleRow" node="sampleRow" table="fishingzone_samplerow"> - <key column="fishingZone"/> - <many-to-many class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="topiaId" order-by="code"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.NewsImpl" node="fr.ifremer.wao.entity.NewsImpl" proxy="fr.ifremer.wao.entity.News" table="news"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="title" name="title" node="title" type="text"/> - <property access="field" column="content" name="content" node="content" type="text"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ProfessionImpl" node="fr.ifremer.wao.entity.ProfessionImpl" proxy="fr.ifremer.wao.entity.Profession" table="profession"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="codeDCF5" name="codeDCF5" node="codeDCF5" type="text"/> - <property access="field" column="meshSize" name="meshSize" node="meshSize" type="text"/> - <property access="field" column="size" name="size" node="size" type="text"/> - <property access="field" column="other" name="other" node="other" type="text"/> - <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> - <property access="field" column="species" name="species" node="species" type="text"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.SampleMonthImpl" node="fr.ifremer.wao.entity.SampleMonthImpl" proxy="fr.ifremer.wao.entity.SampleMonth" table="sampleMonth"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="realTidesValue" name="realTidesValue" node="realTidesValue" type="int"/> - <property access="field" column="expectedTidesValue" name="expectedTidesValue" node="expectedTidesValue" type="int"/> - <property access="field" column="periodDate" name="periodDate" node="periodDate" type="java.util.Date"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.SampleRowImpl" node="fr.ifremer.wao.entity.SampleRowImpl" proxy="fr.ifremer.wao.entity.SampleRow" table="sampleRow"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> - <property access="field" column="averageTideTime" name="averageTideTime" node="averageTideTime" type="double"/> - <property access="field" column="code" index="sampleRow_code_idx" name="code" node="code" type="text" unique="true"/> - <property access="field" column="fishingZonesInfos" name="fishingZonesInfos" node="fishingZonesInfos" type="text"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <property access="field" column="programName" name="programName" node="programName" type="text"/> - <property access="field" column="periodBegin" name="periodBegin" node="periodBegin" type="java.util.Date"/> - <property access="field" column="periodEnd" name="periodEnd" node="periodEnd" type="java.util.Date"/> - <many-to-one class="fr.ifremer.wao.entity.ProfessionImpl" column="profession" embed-xml="false" lazy="false" name="profession" node="profession/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="sampleMonth" node="sampleMonth" order-by="periodDate"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleMonthImpl" embed-xml="false" node="topiaId"/> - </bag> - <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" lazy="false" name="company" node="company/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="sampleRowLog" node="sampleRowLog" order-by="topiaCreateDate desc"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleRowLogImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag embed-xml="true" lazy="false" name="fishingZone" node="fishingZone" table="fishingzone_samplerow"> - <key column="sampleRow"/> - <many-to-many class="fr.ifremer.wao.entity.FishingZoneImpl" column="fishingZone" node="topiaId" order-by="facadeName,sectorName,districtCode"/> - </bag> - <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.SampleRowLogImpl" node="fr.ifremer.wao.entity.SampleRowLogImpl" proxy="fr.ifremer.wao.entity.SampleRowLog" table="sampleRowLog"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="logText" name="logText" node="logText" type="text"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.WaoUserImpl" column="author" embed-xml="false" lazy="false" name="author" node="author/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ShipOwnerImpl" node="fr.ifremer.wao.entity.ShipOwnerImpl" proxy="fr.ifremer.wao.entity.ShipOwner" table="shipOwner"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="code" index="shipOwner_code_idx" name="code" node="code" type="text" unique="true"/> - <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> - <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.WaoUserImpl" node="fr.ifremer.wao.entity.WaoUserImpl" proxy="fr.ifremer.wao.entity.WaoUser" table="waoUser"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> - <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> - <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> - <property access="field" column="login" name="login" node="login" type="text"/> - <property access="field" column="password" name="password" node="password" type="text"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <property access="field" column="role" name="role" node="role" type="int"/> - <property access="field" column="readOnly" name="readOnly" node="readOnly" type="boolean"/> - <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> - <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> - <key column="observer"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityCalendarImpl" table="activityCalendar" node="fr.ifremer.wao.entity.ActivityCalendarImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityCalendar" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="year" type="int" access="field" column="year" node="year"/> - <property name="fiability" type="int" access="field" column="fiability" node="fiability"/> - <bag name="activityMonth" inverse="true" order-by="month" lazy="true" cascade="all,delete-orphan" node="activityMonth" embed-xml="false"> - <key column="activityCalendar"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityMonthImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityMonthImpl" table="activityMonth" node="fr.ifremer.wao.entity.ActivityMonthImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityMonth" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="harbourLibelle" type="text" access="field" column="harbourLibelle" node="harbourLibelle"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="nbBoardingPersons" type="java.lang.Integer" access="field" column="nbBoardingPersons" node="nbBoardingPersons"/> - <property name="nbSeaDays" type="java.lang.Integer" access="field" column="nbSeaDays" node="nbSeaDays"/> - <property name="nbFishingDays" type="java.lang.Integer" access="field" column="nbFishingDays" node="nbFishingDays"/> - <property name="month" type="int" access="field" column="month" node="month"/> - <property name="harbourCode" type="text" access="field" column="harbourCode" node="harbourCode"/> - <property name="harbourId" type="int" access="field" column="harbourId" node="harbourId"/> - <bag name="activityProfession" inverse="true" order-by="professionOrder" lazy="true" cascade="all,delete-orphan" node="activityProfession" embed-xml="false"> - <key column="activityMonth"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityProfessionImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="activityCalendar" class="fr.ifremer.wao.entity.ActivityCalendarImpl" column="activityCalendar" node="activityCalendar/@topiaId" embed-xml="false"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityProfessionImpl" table="activityProfession" node="fr.ifremer.wao.entity.ActivityProfessionImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityProfession" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="code" type="text" access="field" column="code" node="code"/> - <property name="libelle" type="text" access="field" column="libelle" node="libelle"/> - <property name="id" type="int" access="field" column="id" node="id"/> - <property name="professionOrder" type="int" access="field" column="professionOrder" node="professionOrder"/> - <many-to-one name="activityMonth" class="fr.ifremer.wao.entity.ActivityMonthImpl" column="activityMonth" node="activityMonth/@topiaId" embed-xml="false"/> - <bag name="activityZone" inverse="true" order-by="zoneId" lazy="true" cascade="all,delete-orphan" node="activityZone" embed-xml="false"> - <key column="activityProfession"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityZoneImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityZoneImpl" table="activityZone" node="fr.ifremer.wao.entity.ActivityZoneImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityZone" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="zoneCode" type="text" access="field" column="zoneCode" node="zoneCode"/> - <property name="zoneLibelle" type="text" access="field" column="zoneLibelle" node="zoneLibelle"/> - <property name="zoneId" type="int" access="field" column="zoneId" node="zoneId"/> - <property name="gradiantCode" type="int" access="field" column="gradiantCode" node="gradiantCode"/> - <property name="gradiantLibelle" type="text" access="field" column="gradiantLibelle" node="gradiantLibelle"/> - <many-to-one name="activityProfession" class="fr.ifremer.wao.entity.ActivityProfessionImpl" column="activityProfession" node="activityProfession/@topiaId" embed-xml="false"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.BoatImpl" table="boat" node="fr.ifremer.wao.entity.BoatImpl" abstract="false" proxy="fr.ifremer.wao.entity.Boat" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="immatriculation" type="int" access="field" column="immatriculation" node="immatriculation" index="boat_immatriculation_idx" unique="true"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/> - <property name="boatLength" type="int" access="field" column="boatLength" node="boatLength"/> - <property name="buildYear" type="int" access="field" column="buildYear" node="buildYear"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <many-to-one name="shipOwner" class="fr.ifremer.wao.entity.ShipOwnerImpl" column="shipOwner" lazy="false" node="shipOwner/@topiaId" embed-xml="false"/> - <bag name="companyBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="companyBoatInfos" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="activityCalendar" inverse="true" lazy="true" cascade="all,delete-orphan" node="activityCalendar" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityCalendarImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="true" node="elligibleBoat" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.BoatInfosImpl" table="boatInfos" node="fr.ifremer.wao.entity.BoatInfosImpl" abstract="false" proxy="fr.ifremer.wao.entity.BoatInfos" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="contactFirstName" type="text" access="field" column="contactFirstName" node="contactFirstName"/> - <property name="contactLastName" type="text" access="field" column="contactLastName" node="contactLastName"/> - <property name="contactEmail" type="text" access="field" column="contactEmail" node="contactEmail"/> - <property name="contactPhoneNumber" type="text" access="field" column="contactPhoneNumber" node="contactPhoneNumber"/> - <property name="dup" type="java.lang.Integer" access="field" column="dup" node="dup"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="contactAddress1" type="text" access="field" column="contactAddress1" node="contactAddress1"/> - <property name="contactAddress2" type="text" access="field" column="contactAddress2" node="contactAddress2"/> - <property name="contactCity" type="text" access="field" column="contactCity" node="contactCity"/> - <property name="contactPostalCode" type="java.lang.Integer" access="field" column="contactPostalCode" node="contactPostalCode"/> - <property name="contactSiret" type="text" access="field" column="contactSiret" node="contactSiret"/> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false" /> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false" /> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.CompanyImpl" table="company" node="fr.ifremer.wao.entity.CompanyImpl" abstract="false" proxy="fr.ifremer.wao.entity.Company" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/> - <property name="address1" type="text" access="field" column="address1" node="address1"/> - <property name="address2" type="text" access="field" column="address2" node="address2"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="email" type="text" access="field" column="email" node="email"/> - <property name="city" type="text" access="field" column="city" node="city"/> - <property name="postalCode" type="int" access="field" column="postalCode" node="postalCode"/> - <bag name="waoUser" inverse="true" lazy="true" cascade="all,delete-orphan" node="waoUser" embed-xml="false"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.WaoUserImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="boatBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="boatBoatInfos" embed-xml="false"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ContactImpl" table="contact" node="fr.ifremer.wao.entity.ContactImpl" abstract="false" proxy="fr.ifremer.wao.entity.Contact" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="tideBeginDate" type="java.util.Date" access="field" column="tideBeginDate" node="tideBeginDate"/> - <property name="tideEndDate" type="java.util.Date" access="field" column="tideEndDate" node="tideEndDate"/> - <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/> - <property name="mammalsObservation" type="boolean" access="field" column="mammalsObservation" node="mammalsObservation"/> - <property name="mammalsCapture" type="boolean" access="field" column="mammalsCapture" node="mammalsCapture"/> - <property name="validationProgram" type="java.lang.Boolean" access="field" column="validationProgram" node="validationProgram"/> - <property name="validationCompany" type="java.lang.Boolean" access="field" column="validationCompany" node="validationCompany"/> - <property name="dataInputDate" type="java.util.Date" access="field" column="dataInputDate" node="dataInputDate"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="state" type="int" access="field" column="state" node="state"/> - <property name="tideNbDays" type="int" access="field" column="tideNbDays" node="tideNbDays"/> - <many-to-one name="observer" class="fr.ifremer.wao.entity.WaoUserImpl" column="observer" node="observer/@topiaId" embed-xml="false"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" lazy="false" node="sampleRow/@topiaId" embed-xml="false"/> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ElligibleBoatImpl" table="elligibleBoat" node="fr.ifremer.wao.entity.ElligibleBoatImpl" abstract="false" proxy="fr.ifremer.wao.entity.ElligibleBoat" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="globalActive" type="boolean" access="field" column="globalActive" node="globalActive"/> - <property name="companyActive" type="java.lang.Boolean" access="field" column="companyActive" node="companyActive"/> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.FishingZoneImpl" table="fishingZone" node="fr.ifremer.wao.entity.FishingZoneImpl" abstract="false" proxy="fr.ifremer.wao.entity.FishingZone" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="sectorName" type="text" access="field" column="sectorName" node="sectorName"/> - <property name="facadeName" type="text" access="field" column="facadeName" node="facadeName"/> - <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/> - <bag name="sampleRow" table="fishingzone_samplerow" inverse="true" lazy="true" node="sampleRow" embed-xml="true"> - <key column="fishingZone"/> - <many-to-many class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" order-by="code" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.NewsImpl" table="news" node="fr.ifremer.wao.entity.NewsImpl" abstract="false" proxy="fr.ifremer.wao.entity.News" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="title" type="text" access="field" column="title" node="title"/> - <property name="content" type="text" access="field" column="content" node="content"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ProfessionImpl" table="profession" node="fr.ifremer.wao.entity.ProfessionImpl" abstract="false" proxy="fr.ifremer.wao.entity.Profession" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="codeDCF5" type="text" access="field" column="codeDCF5" node="codeDCF5"/> - <property name="meshSize" type="text" access="field" column="meshSize" node="meshSize"/> - <property name="size" type="text" access="field" column="size" node="size"/> - <property name="other" type="text" access="field" column="other" node="other"/> - <property name="libelle" type="text" access="field" column="libelle" node="libelle"/> - <property name="species" type="text" access="field" column="species" node="species"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleMonthImpl" table="sampleMonth" node="fr.ifremer.wao.entity.SampleMonthImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleMonth" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="realTidesValue" type="int" access="field" column="realTidesValue" node="realTidesValue"/> - <property name="expectedTidesValue" type="int" access="field" column="expectedTidesValue" node="expectedTidesValue"/> - <property name="periodDate" type="java.util.Date" access="field" column="periodDate" node="periodDate"/> - <property name="estimatedTidesValue" type="int" access="field" column="estimatedTidesValue" node="estimatedTidesValue"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleRowImpl" table="sampleRow" node="fr.ifremer.wao.entity.SampleRowImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleRow" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/> - <property name="averageTideTime" type="double" access="field" column="averageTideTime" node="averageTideTime"/> - <property name="code" type="text" access="field" column="code" node="code" index="sampleRow_code_idx" unique="true"/> - <property name="fishingZonesInfos" type="text" access="field" column="fishingZonesInfos" node="fishingZonesInfos"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="programName" type="text" access="field" column="programName" node="programName"/> - <property name="periodBegin" type="java.util.Date" access="field" column="periodBegin" node="periodBegin"/> - <property name="periodEnd" type="java.util.Date" access="field" column="periodEnd" node="periodEnd"/> - <many-to-one name="profession" class="fr.ifremer.wao.entity.ProfessionImpl" column="profession" lazy="false" node="profession/@topiaId" embed-xml="false"/> - <bag name="sampleMonth" inverse="true" order-by="periodDate" lazy="true" cascade="all,delete-orphan" node="sampleMonth" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleMonthImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" lazy="false" node="company/@topiaId" embed-xml="false"/> - <bag name="sampleRowLog" inverse="true" order-by="topiaCreateDate desc" lazy="true" cascade="all,delete-orphan" node="sampleRowLog" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleRowLogImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="true" cascade="all,delete-orphan" node="elligibleBoat" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="fishingZone" table="fishingzone_samplerow" lazy="false" node="fishingZone" embed-xml="true"> - <key column="sampleRow"/> - <many-to-many class="fr.ifremer.wao.entity.FishingZoneImpl" column="fishingZone" order-by="facadeName,sectorName,districtCode" node="topiaId"/> - </bag> - <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleRowLogImpl" table="sampleRowLog" node="fr.ifremer.wao.entity.SampleRowLogImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleRowLog" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="logText" type="text" access="field" column="logText" node="logText"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - <many-to-one name="author" class="fr.ifremer.wao.entity.WaoUserImpl" column="author" lazy="false" node="author/@topiaId" embed-xml="false"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ShipOwnerImpl" table="shipOwner" node="fr.ifremer.wao.entity.ShipOwnerImpl" abstract="false" proxy="fr.ifremer.wao.entity.ShipOwner" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="code" type="text" access="field" column="code" node="code" index="shipOwner_code_idx" unique="true"/> - <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> - <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.WaoUserImpl" table="waoUser" node="fr.ifremer.wao.entity.WaoUserImpl" abstract="false" proxy="fr.ifremer.wao.entity.WaoUser" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> - <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> - <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/> - <property name="login" type="text" access="field" column="login" node="login"/> - <property name="password" type="text" access="field" column="password" node="password"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="role" type="int" access="field" column="role" node="role"/> - <property name="readOnly" type="boolean" access="field" column="readOnly" node="readOnly"/> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false"/> - <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false"> - <key column="observer"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityCalendarImpl" table="activityCalendar" node="fr.ifremer.wao.entity.ActivityCalendarImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityCalendar" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="year" type="int" access="field" column="year" node="year"/> - <property name="fiability" type="int" access="field" column="fiability" node="fiability"/> - <bag name="activityMonth" inverse="true" order-by="month" lazy="true" cascade="all,delete-orphan" node="activityMonth" embed-xml="false"> - <key column="activityCalendar"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityMonthImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityMonthImpl" table="activityMonth" node="fr.ifremer.wao.entity.ActivityMonthImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityMonth" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="harbourLibelle" type="text" access="field" column="harbourLibelle" node="harbourLibelle"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="nbBoardingPersons" type="java.lang.Integer" access="field" column="nbBoardingPersons" node="nbBoardingPersons"/> - <property name="nbSeaDays" type="java.lang.Integer" access="field" column="nbSeaDays" node="nbSeaDays"/> - <property name="nbFishingDays" type="java.lang.Integer" access="field" column="nbFishingDays" node="nbFishingDays"/> - <property name="month" type="int" access="field" column="month" node="month"/> - <property name="harbourCode" type="text" access="field" column="harbourCode" node="harbourCode"/> - <property name="harbourId" type="int" access="field" column="harbourId" node="harbourId"/> - <bag name="activityProfession" inverse="true" order-by="professionOrder" lazy="true" cascade="all,delete-orphan" node="activityProfession" embed-xml="false"> - <key column="activityMonth"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityProfessionImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="activityCalendar" class="fr.ifremer.wao.entity.ActivityCalendarImpl" column="activityCalendar" node="activityCalendar/@topiaId" embed-xml="false"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityProfessionImpl" table="activityProfession" node="fr.ifremer.wao.entity.ActivityProfessionImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityProfession" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="code" type="text" access="field" column="code" node="code"/> - <property name="libelle" type="text" access="field" column="libelle" node="libelle"/> - <property name="id" type="int" access="field" column="id" node="id"/> - <property name="professionOrder" type="int" access="field" column="professionOrder" node="professionOrder"/> - <many-to-one name="activityMonth" class="fr.ifremer.wao.entity.ActivityMonthImpl" column="activityMonth" node="activityMonth/@topiaId" embed-xml="false"/> - <bag name="activityZone" inverse="true" order-by="zoneId" lazy="true" cascade="all,delete-orphan" node="activityZone" embed-xml="false"> - <key column="activityProfession"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityZoneImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityZoneImpl" table="activityZone" node="fr.ifremer.wao.entity.ActivityZoneImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityZone" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="zoneCode" type="text" access="field" column="zoneCode" node="zoneCode"/> - <property name="zoneLibelle" type="text" access="field" column="zoneLibelle" node="zoneLibelle"/> - <property name="zoneId" type="int" access="field" column="zoneId" node="zoneId"/> - <property name="gradiantCode" type="int" access="field" column="gradiantCode" node="gradiantCode"/> - <property name="gradiantLibelle" type="text" access="field" column="gradiantLibelle" node="gradiantLibelle"/> - <many-to-one name="activityProfession" class="fr.ifremer.wao.entity.ActivityProfessionImpl" column="activityProfession" node="activityProfession/@topiaId" embed-xml="false"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.BoatImpl" table="boat" node="fr.ifremer.wao.entity.BoatImpl" abstract="false" proxy="fr.ifremer.wao.entity.Boat" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="immatriculation" type="int" access="field" column="immatriculation" node="immatriculation" index="boat_immatriculation_idx" unique="true"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/> - <property name="boatLength" type="int" access="field" column="boatLength" node="boatLength"/> - <property name="buildYear" type="int" access="field" column="buildYear" node="buildYear"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <many-to-one name="shipOwner" class="fr.ifremer.wao.entity.ShipOwnerImpl" column="shipOwner" lazy="false" node="shipOwner/@topiaId" embed-xml="false"/> - <bag name="companyBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="companyBoatInfos" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="activityCalendar" inverse="true" lazy="true" cascade="all,delete-orphan" node="activityCalendar" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityCalendarImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="true" node="elligibleBoat" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.BoatInfosImpl" table="boatInfos" node="fr.ifremer.wao.entity.BoatInfosImpl" abstract="false" proxy="fr.ifremer.wao.entity.BoatInfos" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="contactFirstName" type="text" access="field" column="contactFirstName" node="contactFirstName"/> - <property name="contactLastName" type="text" access="field" column="contactLastName" node="contactLastName"/> - <property name="contactEmail" type="text" access="field" column="contactEmail" node="contactEmail"/> - <property name="contactPhoneNumber" type="text" access="field" column="contactPhoneNumber" node="contactPhoneNumber"/> - <property name="dup" type="java.lang.Integer" access="field" column="dup" node="dup"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="contactAddress1" type="text" access="field" column="contactAddress1" node="contactAddress1"/> - <property name="contactAddress2" type="text" access="field" column="contactAddress2" node="contactAddress2"/> - <property name="contactCity" type="text" access="field" column="contactCity" node="contactCity"/> - <property name="contactPostalCode" type="java.lang.Integer" access="field" column="contactPostalCode" node="contactPostalCode"/> - <property name="contactSiret" type="text" access="field" column="contactSiret" node="contactSiret"/> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false" /> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false" /> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.CompanyImpl" table="company" node="fr.ifremer.wao.entity.CompanyImpl" abstract="false" proxy="fr.ifremer.wao.entity.Company" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/> - <property name="address1" type="text" access="field" column="address1" node="address1"/> - <property name="address2" type="text" access="field" column="address2" node="address2"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="email" type="text" access="field" column="email" node="email"/> - <property name="city" type="text" access="field" column="city" node="city"/> - <property name="postalCode" type="int" access="field" column="postalCode" node="postalCode"/> - <bag name="waoUser" inverse="true" lazy="true" cascade="all,delete-orphan" node="waoUser" embed-xml="false"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.WaoUserImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="boatBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="boatBoatInfos" embed-xml="false"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ContactImpl" table="contact" node="fr.ifremer.wao.entity.ContactImpl" abstract="false" proxy="fr.ifremer.wao.entity.Contact" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="tideBeginDate" type="java.util.Date" access="field" column="tideBeginDate" node="tideBeginDate"/> - <property name="tideEndDate" type="java.util.Date" access="field" column="tideEndDate" node="tideEndDate"/> - <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/> - <property name="mammalsObservation" type="boolean" access="field" column="mammalsObservation" node="mammalsObservation"/> - <property name="mammalsCapture" type="boolean" access="field" column="mammalsCapture" node="mammalsCapture"/> - <property name="validationProgram" type="java.lang.Boolean" access="field" column="validationProgram" node="validationProgram"/> - <property name="validationCompany" type="java.lang.Boolean" access="field" column="validationCompany" node="validationCompany"/> - <property name="dataInputDate" type="java.util.Date" access="field" column="dataInputDate" node="dataInputDate"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="state" type="int" access="field" column="state" node="state"/> - <property name="tideNbDays" type="int" access="field" column="tideNbDays" node="tideNbDays"/> - <many-to-one name="observer" class="fr.ifremer.wao.entity.WaoUserImpl" column="observer" node="observer/@topiaId" embed-xml="false"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" lazy="false" node="sampleRow/@topiaId" embed-xml="false"/> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ElligibleBoatImpl" table="elligibleBoat" node="fr.ifremer.wao.entity.ElligibleBoatImpl" abstract="false" proxy="fr.ifremer.wao.entity.ElligibleBoat" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="globalActive" type="boolean" access="field" column="globalActive" node="globalActive"/> - <property name="companyActive" type="java.lang.Boolean" access="field" column="companyActive" node="companyActive"/> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.FishingZoneImpl" table="fishingZone" node="fr.ifremer.wao.entity.FishingZoneImpl" abstract="false" proxy="fr.ifremer.wao.entity.FishingZone" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="sectorName" type="text" access="field" column="sectorName" node="sectorName"/> - <property name="facadeName" type="text" access="field" column="facadeName" node="facadeName"/> - <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/> - <bag name="sampleRow" table="fishingzone_samplerow" inverse="true" lazy="true" node="sampleRow" embed-xml="true"> - <key column="fishingZone"/> - <many-to-many class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" order-by="code" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.NewsImpl" table="news" node="fr.ifremer.wao.entity.NewsImpl" abstract="false" proxy="fr.ifremer.wao.entity.News" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="title" type="text" access="field" column="title" node="title"/> - <property name="content" type="text" access="field" column="content" node="content"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ProfessionImpl" table="profession" node="fr.ifremer.wao.entity.ProfessionImpl" abstract="false" proxy="fr.ifremer.wao.entity.Profession" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="codeDCF5" type="text" access="field" column="codeDCF5" node="codeDCF5"/> - <property name="meshSize" type="text" access="field" column="meshSize" node="meshSize"/> - <property name="size" type="text" access="field" column="size" node="size"/> - <property name="other" type="text" access="field" column="other" node="other"/> - <property name="libelle" type="text" access="field" column="libelle" node="libelle"/> - <property name="species" type="text" access="field" column="species" node="species"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleMonthImpl" table="sampleMonth" node="fr.ifremer.wao.entity.SampleMonthImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleMonth" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="realTidesValue" type="int" access="field" column="realTidesValue" node="realTidesValue"/> - <property name="expectedTidesValue" type="int" access="field" column="expectedTidesValue" node="expectedTidesValue"/> - <property name="periodDate" type="java.util.Date" access="field" column="periodDate" node="periodDate"/> - <property name="estimatedTidesValue" type="int" access="field" column="estimatedTidesValue" node="estimatedTidesValue"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleRowImpl" table="sampleRow" node="fr.ifremer.wao.entity.SampleRowImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleRow" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/> - <property name="averageTideTime" type="double" access="field" column="averageTideTime" node="averageTideTime"/> - <property name="code" type="text" access="field" column="code" node="code" index="sampleRow_code_idx" unique="true"/> - <property name="fishingZonesInfos" type="text" access="field" column="fishingZonesInfos" node="fishingZonesInfos"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="programName" type="text" access="field" column="programName" node="programName"/> - <property name="periodBegin" type="java.util.Date" access="field" column="periodBegin" node="periodBegin"/> - <property name="periodEnd" type="java.util.Date" access="field" column="periodEnd" node="periodEnd"/> - <many-to-one name="profession" class="fr.ifremer.wao.entity.ProfessionImpl" column="profession" lazy="false" node="profession/@topiaId" embed-xml="false"/> - <bag name="sampleMonth" inverse="true" order-by="periodDate" lazy="true" cascade="all,delete-orphan" node="sampleMonth" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleMonthImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" lazy="false" node="company/@topiaId" embed-xml="false"/> - <bag name="sampleRowLog" inverse="true" order-by="topiaCreateDate desc" lazy="true" cascade="all,delete-orphan" node="sampleRowLog" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleRowLogImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="true" cascade="all,delete-orphan" node="elligibleBoat" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="fishingZone" table="fishingzone_samplerow" lazy="false" node="fishingZone" embed-xml="true"> - <key column="sampleRow"/> - <many-to-many class="fr.ifremer.wao.entity.FishingZoneImpl" column="fishingZone" order-by="facadeName,sectorName,districtCode" node="topiaId"/> - </bag> - <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleRowLogImpl" table="sampleRowLog" node="fr.ifremer.wao.entity.SampleRowLogImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleRowLog" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="logText" type="text" access="field" column="logText" node="logText"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="fromAdmin" type="boolean" access="field" column="fromAdmin" node="fromAdmin"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - <many-to-one name="author" class="fr.ifremer.wao.entity.WaoUserImpl" column="author" lazy="false" node="author/@topiaId" embed-xml="false"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ShipOwnerImpl" table="shipOwner" node="fr.ifremer.wao.entity.ShipOwnerImpl" abstract="false" proxy="fr.ifremer.wao.entity.ShipOwner" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="code" type="text" access="field" column="code" node="code" index="shipOwner_code_idx" unique="true"/> - <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> - <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.3/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.WaoUserImpl" table="waoUser" node="fr.ifremer.wao.entity.WaoUserImpl" abstract="false" proxy="fr.ifremer.wao.entity.WaoUser" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> - <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> - <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/> - <property name="login" type="text" access="field" column="login" node="login"/> - <property name="password" type="text" access="field" column="password" node="password"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="role" type="int" access="field" column="role" node="role"/> - <property name="roleReadOnly" type="int" access="field" column="roleReadOnly" node="roleReadOnly"/> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false"/> - <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false"> - <key column="observer"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityCalendarImpl" table="activityCalendar" node="fr.ifremer.wao.entity.ActivityCalendarImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityCalendar" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="year" type="int" access="field" column="year" node="year"/> - <property name="fiability" type="int" access="field" column="fiability" node="fiability"/> - <bag name="activityMonth" inverse="true" order-by="month" lazy="true" cascade="all,delete-orphan" node="activityMonth" embed-xml="false"> - <key column="activityCalendar"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityMonthImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityMonthImpl" table="activityMonth" node="fr.ifremer.wao.entity.ActivityMonthImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityMonth" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="harbourLibelle" type="text" access="field" column="harbourLibelle" node="harbourLibelle"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="nbBoardingPersons" type="java.lang.Integer" access="field" column="nbBoardingPersons" node="nbBoardingPersons"/> - <property name="nbSeaDays" type="java.lang.Integer" access="field" column="nbSeaDays" node="nbSeaDays"/> - <property name="nbFishingDays" type="java.lang.Integer" access="field" column="nbFishingDays" node="nbFishingDays"/> - <property name="month" type="int" access="field" column="month" node="month"/> - <property name="harbourCode" type="text" access="field" column="harbourCode" node="harbourCode"/> - <property name="harbourId" type="int" access="field" column="harbourId" node="harbourId"/> - <bag name="activityProfession" inverse="true" order-by="professionOrder" lazy="true" cascade="all,delete-orphan" node="activityProfession" embed-xml="false"> - <key column="activityMonth"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityProfessionImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="activityCalendar" class="fr.ifremer.wao.entity.ActivityCalendarImpl" column="activityCalendar" node="activityCalendar/@topiaId" embed-xml="false"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityProfessionImpl" table="activityProfession" node="fr.ifremer.wao.entity.ActivityProfessionImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityProfession" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="code" type="text" access="field" column="code" node="code"/> - <property name="libelle" type="text" access="field" column="libelle" node="libelle"/> - <property name="id" type="int" access="field" column="id" node="id"/> - <property name="professionOrder" type="int" access="field" column="professionOrder" node="professionOrder"/> - <many-to-one name="activityMonth" class="fr.ifremer.wao.entity.ActivityMonthImpl" column="activityMonth" node="activityMonth/@topiaId" embed-xml="false"/> - <bag name="activityZone" inverse="true" order-by="zoneId" lazy="true" cascade="all,delete-orphan" node="activityZone" embed-xml="false"> - <key column="activityProfession"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityZoneImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityZoneImpl" table="activityZone" node="fr.ifremer.wao.entity.ActivityZoneImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityZone" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="zoneCode" type="text" access="field" column="zoneCode" node="zoneCode"/> - <property name="zoneLibelle" type="text" access="field" column="zoneLibelle" node="zoneLibelle"/> - <property name="zoneId" type="int" access="field" column="zoneId" node="zoneId"/> - <property name="gradiantCode" type="int" access="field" column="gradiantCode" node="gradiantCode"/> - <property name="gradiantLibelle" type="text" access="field" column="gradiantLibelle" node="gradiantLibelle"/> - <many-to-one name="activityProfession" class="fr.ifremer.wao.entity.ActivityProfessionImpl" column="activityProfession" node="activityProfession/@topiaId" embed-xml="false"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.BoatImpl" table="boat" node="fr.ifremer.wao.entity.BoatImpl" abstract="false" proxy="fr.ifremer.wao.entity.Boat" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="immatriculation" type="int" access="field" column="immatriculation" node="immatriculation" index="boat_immatriculation_idx" unique="true"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/> - <property name="boatLength" type="int" access="field" column="boatLength" node="boatLength"/> - <property name="buildYear" type="int" access="field" column="buildYear" node="buildYear"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <many-to-one name="shipOwner" class="fr.ifremer.wao.entity.ShipOwnerImpl" column="shipOwner" lazy="false" node="shipOwner/@topiaId" embed-xml="false"/> - <bag name="companyBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="companyBoatInfos" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="activityCalendar" inverse="true" lazy="true" cascade="all,delete-orphan" node="activityCalendar" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityCalendarImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="true" node="elligibleBoat" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.BoatInfosImpl" table="boatInfos" node="fr.ifremer.wao.entity.BoatInfosImpl" abstract="false" proxy="fr.ifremer.wao.entity.BoatInfos" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="contactFirstName" type="text" access="field" column="contactFirstName" node="contactFirstName"/> - <property name="contactLastName" type="text" access="field" column="contactLastName" node="contactLastName"/> - <property name="contactEmail" type="text" access="field" column="contactEmail" node="contactEmail"/> - <property name="contactPhoneNumber" type="text" access="field" column="contactPhoneNumber" node="contactPhoneNumber"/> - <property name="dup" type="java.lang.Integer" access="field" column="dup" node="dup"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="contactAddress1" type="text" access="field" column="contactAddress1" node="contactAddress1"/> - <property name="contactAddress2" type="text" access="field" column="contactAddress2" node="contactAddress2"/> - <property name="contactCity" type="text" access="field" column="contactCity" node="contactCity"/> - <property name="contactPostalCode" type="java.lang.Integer" access="field" column="contactPostalCode" node="contactPostalCode"/> - <property name="contactSiret" type="text" access="field" column="contactSiret" node="contactSiret"/> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false" /> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false" /> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.CompanyImpl" table="company" node="fr.ifremer.wao.entity.CompanyImpl" abstract="false" proxy="fr.ifremer.wao.entity.Company" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/> - <property name="address1" type="text" access="field" column="address1" node="address1"/> - <property name="address2" type="text" access="field" column="address2" node="address2"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="email" type="text" access="field" column="email" node="email"/> - <property name="city" type="text" access="field" column="city" node="city"/> - <property name="postalCode" type="int" access="field" column="postalCode" node="postalCode"/> - <bag name="waoUser" inverse="true" lazy="true" cascade="all,delete-orphan" node="waoUser" embed-xml="false"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.WaoUserImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="boatBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="boatBoatInfos" embed-xml="false"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ContactImpl" table="contact" node="fr.ifremer.wao.entity.ContactImpl" abstract="false" proxy="fr.ifremer.wao.entity.Contact" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="tideBeginDate" type="java.util.Date" access="field" column="tideBeginDate" node="tideBeginDate"/> - <property name="tideEndDate" type="java.util.Date" access="field" column="tideEndDate" node="tideEndDate"/> - <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/> - <property name="mammalsObservation" type="boolean" access="field" column="mammalsObservation" node="mammalsObservation"/> - <property name="mammalsCapture" type="boolean" access="field" column="mammalsCapture" node="mammalsCapture"/> - <property name="validationProgram" type="java.lang.Boolean" access="field" column="validationProgram" node="validationProgram"/> - <property name="validationCompany" type="java.lang.Boolean" access="field" column="validationCompany" node="validationCompany"/> - <property name="dataInputDate" type="java.util.Date" access="field" column="dataInputDate" node="dataInputDate"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="state" type="int" access="field" column="state" node="state"/> - <property name="tideNbDays" type="int" access="field" column="tideNbDays" node="tideNbDays"/> - <many-to-one name="observer" class="fr.ifremer.wao.entity.WaoUserImpl" column="observer" node="observer/@topiaId" embed-xml="false"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" lazy="false" node="sampleRow/@topiaId" embed-xml="false"/> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ElligibleBoatImpl" table="elligibleBoat" node="fr.ifremer.wao.entity.ElligibleBoatImpl" abstract="false" proxy="fr.ifremer.wao.entity.ElligibleBoat" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="globalActive" type="boolean" access="field" column="globalActive" node="globalActive"/> - <property name="companyActive" type="java.lang.Boolean" access="field" column="companyActive" node="companyActive"/> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.FishingZoneImpl" table="fishingZone" node="fr.ifremer.wao.entity.FishingZoneImpl" abstract="false" proxy="fr.ifremer.wao.entity.FishingZone" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="sectorName" type="text" access="field" column="sectorName" node="sectorName"/> - <property name="facadeName" type="text" access="field" column="facadeName" node="facadeName"/> - <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/> - <bag name="sampleRow" table="fishingzone_samplerow" inverse="true" lazy="true" node="sampleRow" embed-xml="true"> - <key column="fishingZone"/> - <many-to-many class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" order-by="code" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.NewsImpl" table="news" node="fr.ifremer.wao.entity.NewsImpl" abstract="false" proxy="fr.ifremer.wao.entity.News" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="title" type="text" access="field" column="title" node="title"/> - <property name="content" type="text" access="field" column="content" node="content"/> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ProfessionImpl" table="profession" node="fr.ifremer.wao.entity.ProfessionImpl" abstract="false" proxy="fr.ifremer.wao.entity.Profession" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="codeDCF5" type="text" access="field" column="codeDCF5" node="codeDCF5"/> - <property name="meshSize" type="text" access="field" column="meshSize" node="meshSize"/> - <property name="size" type="text" access="field" column="size" node="size"/> - <property name="other" type="text" access="field" column="other" node="other"/> - <property name="libelle" type="text" access="field" column="libelle" node="libelle"/> - <property name="species" type="text" access="field" column="species" node="species"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleMonthImpl" table="sampleMonth" node="fr.ifremer.wao.entity.SampleMonthImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleMonth" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="realTidesValue" type="int" access="field" column="realTidesValue" node="realTidesValue"/> - <property name="expectedTidesValue" type="int" access="field" column="expectedTidesValue" node="expectedTidesValue"/> - <property name="periodDate" type="java.util.Date" access="field" column="periodDate" node="periodDate"/> - <property name="estimatedTidesValue" type="int" access="field" column="estimatedTidesValue" node="estimatedTidesValue"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleRowImpl" table="sampleRow" node="fr.ifremer.wao.entity.SampleRowImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleRow" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/> - <property name="averageTideTime" type="double" access="field" column="averageTideTime" node="averageTideTime"/> - <property name="code" type="text" access="field" column="code" node="code" index="sampleRow_code_idx" unique="true"/> - <property name="fishingZonesInfos" type="text" access="field" column="fishingZonesInfos" node="fishingZonesInfos"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="programName" type="text" access="field" column="programName" node="programName"/> - <property name="periodBegin" type="java.util.Date" access="field" column="periodBegin" node="periodBegin"/> - <property name="periodEnd" type="java.util.Date" access="field" column="periodEnd" node="periodEnd"/> - <many-to-one name="profession" class="fr.ifremer.wao.entity.ProfessionImpl" column="profession" lazy="false" node="profession/@topiaId" embed-xml="false"/> - <bag name="sampleMonth" inverse="true" order-by="periodDate" lazy="true" cascade="all,delete-orphan" node="sampleMonth" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleMonthImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" lazy="false" node="company/@topiaId" embed-xml="false"/> - <bag name="sampleRowLog" inverse="true" order-by="topiaCreateDate desc" lazy="true" cascade="all,delete-orphan" node="sampleRowLog" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleRowLogImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="true" cascade="all,delete-orphan" node="elligibleBoat" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="fishingZone" table="fishingzone_samplerow" lazy="false" node="fishingZone" embed-xml="true"> - <key column="sampleRow"/> - <many-to-many class="fr.ifremer.wao.entity.FishingZoneImpl" column="fishingZone" order-by="facadeName,sectorName,districtCode" node="topiaId"/> - </bag> - <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleRowLogImpl" table="sampleRowLog" node="fr.ifremer.wao.entity.SampleRowLogImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleRowLog" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="logText" type="text" access="field" column="logText" node="logText"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="fromAdmin" type="boolean" access="field" column="fromAdmin" node="fromAdmin"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - <many-to-one name="author" class="fr.ifremer.wao.entity.WaoUserImpl" column="author" lazy="false" node="author/@topiaId" embed-xml="false"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ShipOwnerImpl" table="shipOwner" node="fr.ifremer.wao.entity.ShipOwnerImpl" abstract="false" proxy="fr.ifremer.wao.entity.ShipOwner" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="code" type="text" access="field" column="code" node="code" index="shipOwner_code_idx" unique="true"/> - <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> - <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.WaoUserImpl" table="waoUser" node="fr.ifremer.wao.entity.WaoUserImpl" abstract="false" proxy="fr.ifremer.wao.entity.WaoUser" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> - <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> - <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/> - <property name="login" type="text" access="field" column="login" node="login"/> - <property name="password" type="text" access="field" column="password" node="password"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="role" type="int" access="field" column="role" node="role"/> - <property name="roleReadOnly" type="int" access="field" column="roleReadOnly" node="roleReadOnly"/> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false"/> - <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false"> - <key column="observer"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityCalendarImpl" node="fr.ifremer.wao.entity.ActivityCalendarImpl" proxy="fr.ifremer.wao.entity.ActivityCalendar" table="activityCalendar"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="year" name="year" node="year" type="int"/> - <property access="field" column="fiability" name="fiability" node="fiability" type="int"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityMonth" node="activityMonth" order-by="month"> - <key column="activityCalendar"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityMonthImpl" embed-xml="false" node="topiaId"/> - </bag> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityMonthImpl" node="fr.ifremer.wao.entity.ActivityMonthImpl" proxy="fr.ifremer.wao.entity.ActivityMonth" table="activityMonth"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="harbourLibelle" name="harbourLibelle" node="harbourLibelle" type="text"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <property access="field" column="nbBoardingPersons" name="nbBoardingPersons" node="nbBoardingPersons" type="java.lang.Integer"/> - <property access="field" column="nbSeaDays" name="nbSeaDays" node="nbSeaDays" type="java.lang.Integer"/> - <property access="field" column="nbFishingDays" name="nbFishingDays" node="nbFishingDays" type="java.lang.Integer"/> - <property access="field" column="month" name="month" node="month" type="int"/> - <property access="field" column="harbourCode" name="harbourCode" node="harbourCode" type="text"/> - <property access="field" column="harbourId" name="harbourId" node="harbourId" type="int"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityProfession" node="activityProfession" order-by="professionOrder"> - <key column="activityMonth"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityProfessionImpl" embed-xml="false" node="topiaId"/> - </bag> - <many-to-one class="fr.ifremer.wao.entity.ActivityCalendarImpl" column="activityCalendar" embed-xml="false" name="activityCalendar" node="activityCalendar/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityProfessionImpl" node="fr.ifremer.wao.entity.ActivityProfessionImpl" proxy="fr.ifremer.wao.entity.ActivityProfession" table="activityProfession"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="code" name="code" node="code" type="text"/> - <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> - <property access="field" column="id" name="id" node="id" type="int"/> - <property access="field" column="professionOrder" name="professionOrder" node="professionOrder" type="int"/> - <many-to-one class="fr.ifremer.wao.entity.ActivityMonthImpl" column="activityMonth" embed-xml="false" name="activityMonth" node="activityMonth/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityZone" node="activityZone" order-by="zoneId"> - <key column="activityProfession"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityZoneImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityZoneImpl" node="fr.ifremer.wao.entity.ActivityZoneImpl" proxy="fr.ifremer.wao.entity.ActivityZone" table="activityZone"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="zoneCode" name="zoneCode" node="zoneCode" type="text"/> - <property access="field" column="zoneLibelle" name="zoneLibelle" node="zoneLibelle" type="text"/> - <property access="field" column="zoneId" name="zoneId" node="zoneId" type="int"/> - <property access="field" column="gradiantCode" name="gradiantCode" node="gradiantCode" type="int"/> - <property access="field" column="gradiantLibelle" name="gradiantLibelle" node="gradiantLibelle" type="text"/> - <many-to-one class="fr.ifremer.wao.entity.ActivityProfessionImpl" column="activityProfession" embed-xml="false" name="activityProfession" node="activityProfession/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.BoatImpl" node="fr.ifremer.wao.entity.BoatImpl" proxy="fr.ifremer.wao.entity.Boat" table="boat"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="immatriculation" index="boat_immatriculation_idx" name="immatriculation" node="immatriculation" type="int" unique="true"/> - <property access="field" column="name" name="name" node="name" type="text"/> - <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> - <property access="field" column="boatLength" name="boatLength" node="boatLength" type="int"/> - <property access="field" column="buildYear" name="buildYear" node="buildYear" type="int"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <many-to-one class="fr.ifremer.wao.entity.ShipOwnerImpl" column="shipOwner" embed-xml="false" lazy="false" name="shipOwner" node="shipOwner/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="companyBoatInfos" node="companyBoatInfos"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityCalendar" node="activityCalendar"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityCalendarImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag embed-xml="false" inverse="true" lazy="true" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.BoatInfosImpl" node="fr.ifremer.wao.entity.BoatInfosImpl" proxy="fr.ifremer.wao.entity.BoatInfos" table="boatInfos"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="contactFirstName" name="contactFirstName" node="contactFirstName" type="text"/> - <property access="field" column="contactLastName" name="contactLastName" node="contactLastName" type="text"/> - <property access="field" column="contactEmail" name="contactEmail" node="contactEmail" type="text"/> - <property access="field" column="contactPhoneNumber" name="contactPhoneNumber" node="contactPhoneNumber" type="text"/> - <property access="field" column="dup" name="dup" node="dup" type="java.lang.Integer"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.CompanyImpl" node="fr.ifremer.wao.entity.CompanyImpl" proxy="fr.ifremer.wao.entity.Company" table="company"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="name" name="name" node="name" type="text"/> - <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> - <property access="field" column="address1" name="address1" node="address1" type="text"/> - <property access="field" column="address2" name="address2" node="address2" type="text"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <property access="field" column="email" name="email" node="email" type="text"/> - <property access="field" column="city" name="city" node="city" type="text"/> - <property access="field" column="postalCode" name="postalCode" node="postalCode" type="int"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="waoUser" node="waoUser"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.WaoUserImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="boatBoatInfos" node="boatBoatInfos"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ContactImpl" node="fr.ifremer.wao.entity.ContactImpl" proxy="fr.ifremer.wao.entity.Contact" table="contact"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="tideBeginDate" name="tideBeginDate" node="tideBeginDate" type="java.util.Date"/> - <property access="field" column="tideEndDate" name="tideEndDate" node="tideEndDate" type="java.util.Date"/> - <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> - <property access="field" column="mammalsObservation" name="mammalsObservation" node="mammalsObservation" type="boolean"/> - <property access="field" column="mammalsCapture" name="mammalsCapture" node="mammalsCapture" type="boolean"/> - <property access="field" column="validationProgram" name="validationProgram" node="validationProgram" type="java.lang.Boolean"/> - <property access="field" column="validationCompany" name="validationCompany" node="validationCompany" type="java.lang.Boolean"/> - <property access="field" column="dataInputDate" name="dataInputDate" node="dataInputDate" type="java.util.Date"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <property access="field" column="state" name="state" node="state" type="text"/> - <property access="field" column="tideNbDays" name="tideNbDays" node="tideNbDays" type="int"/> - <many-to-one class="fr.ifremer.wao.entity.WaoUserImpl" column="observer" embed-xml="false" name="observer" node="observer/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" lazy="false" name="sampleRow" node="sampleRow/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ElligibleBoatImpl" node="fr.ifremer.wao.entity.ElligibleBoatImpl" proxy="fr.ifremer.wao.entity.ElligibleBoat" table="elligibleBoat"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="globalActive" name="globalActive" node="globalActive" type="boolean"/> - <property access="field" column="companyActive" name="companyActive" node="companyActive" type="java.lang.Boolean"/> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.FishingZoneImpl" node="fr.ifremer.wao.entity.FishingZoneImpl" proxy="fr.ifremer.wao.entity.FishingZone" table="fishingZone"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="sectorName" name="sectorName" node="sectorName" type="text"/> - <property access="field" column="facadeName" name="facadeName" node="facadeName" type="text"/> - <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> - <bag embed-xml="true" lazy="true" name="sampleRow" node="sampleRow" table="fishingzone_samplerow"> - <key column="fishingZone"/> - <many-to-many class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="topiaId" order-by="code"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.NewsImpl" node="fr.ifremer.wao.entity.NewsImpl" proxy="fr.ifremer.wao.entity.News" table="news"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="title" name="title" node="title" type="text"/> - <property access="field" column="content" name="content" node="content" type="text"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ProfessionImpl" node="fr.ifremer.wao.entity.ProfessionImpl" proxy="fr.ifremer.wao.entity.Profession" table="profession"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="codeDCF5" name="codeDCF5" node="codeDCF5" type="text"/> - <property access="field" column="meshSize" name="meshSize" node="meshSize" type="text"/> - <property access="field" column="size" name="size" node="size" type="text"/> - <property access="field" column="other" name="other" node="other" type="text"/> - <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> - <property access="field" column="species" name="species" node="species" type="text"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.SampleMonthImpl" node="fr.ifremer.wao.entity.SampleMonthImpl" proxy="fr.ifremer.wao.entity.SampleMonth" table="sampleMonth"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="realTidesValue" name="realTidesValue" node="realTidesValue" type="int"/> - <property access="field" column="expectedTidesValue" name="expectedTidesValue" node="expectedTidesValue" type="int"/> - <property access="field" column="periodDate" name="periodDate" node="periodDate" type="java.util.Date"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.SampleRowImpl" node="fr.ifremer.wao.entity.SampleRowImpl" proxy="fr.ifremer.wao.entity.SampleRow" table="sampleRow"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> - <property access="field" column="averageTideTime" name="averageTideTime" node="averageTideTime" type="double"/> - <property access="field" column="code" index="sampleRow_code_idx" name="code" node="code" type="text" unique="true"/> - <property access="field" column="fishingZonesInfos" name="fishingZonesInfos" node="fishingZonesInfos" type="text"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <property access="field" column="programName" name="programName" node="programName" type="text"/> - <property access="field" column="periodBegin" name="periodBegin" node="periodBegin" type="java.util.Date"/> - <property access="field" column="periodEnd" name="periodEnd" node="periodEnd" type="java.util.Date"/> - <many-to-one class="fr.ifremer.wao.entity.ProfessionImpl" column="profession" embed-xml="false" lazy="false" name="profession" node="profession/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="sampleMonth" node="sampleMonth" order-by="periodDate"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleMonthImpl" embed-xml="false" node="topiaId"/> - </bag> - <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" lazy="false" name="company" node="company/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="sampleRowLog" node="sampleRowLog" order-by="topiaCreateDate desc"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleRowLogImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag embed-xml="true" inverse="true" lazy="false" name="fishingZone" node="fishingZone" table="fishingzone_samplerow"> - <key column="sampleRow"/> - <many-to-many class="fr.ifremer.wao.entity.FishingZoneImpl" column="fishingZone" node="topiaId" order-by="facadeName,sectorName,districtCode"/> - </bag> - <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.SampleRowLogImpl" node="fr.ifremer.wao.entity.SampleRowLogImpl" proxy="fr.ifremer.wao.entity.SampleRowLog" table="sampleRowLog"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="logText" name="logText" node="logText" type="text"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.WaoUserImpl" column="admin" embed-xml="false" lazy="false" name="admin" node="admin/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ShipOwnerImpl" node="fr.ifremer.wao.entity.ShipOwnerImpl" proxy="fr.ifremer.wao.entity.ShipOwner" table="shipOwner"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="code" index="shipOwner_code_idx" name="code" node="code" type="text" unique="true"/> - <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> - <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.WaoUserImpl" node="fr.ifremer.wao.entity.WaoUserImpl" proxy="fr.ifremer.wao.entity.WaoUser" table="waoUser"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> - <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> - <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> - <property access="field" column="login" name="login" node="login" type="text"/> - <property access="field" column="password" name="password" node="password" type="text"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <property access="field" column="admin" name="admin" node="admin" type="boolean"/> - <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> - <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> - <key column="observer"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityCalendarImpl" node="fr.ifremer.wao.entity.ActivityCalendarImpl" proxy="fr.ifremer.wao.entity.ActivityCalendar" table="activityCalendar"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="year" name="year" node="year" type="int"/> - <property access="field" column="fiability" name="fiability" node="fiability" type="int"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityMonth" node="activityMonth" order-by="month"> - <key column="activityCalendar"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityMonthImpl" embed-xml="false" node="topiaId"/> - </bag> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityMonthImpl" node="fr.ifremer.wao.entity.ActivityMonthImpl" proxy="fr.ifremer.wao.entity.ActivityMonth" table="activityMonth"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="harbourLibelle" name="harbourLibelle" node="harbourLibelle" type="text"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <property access="field" column="nbBoardingPersons" name="nbBoardingPersons" node="nbBoardingPersons" type="java.lang.Integer"/> - <property access="field" column="nbSeaDays" name="nbSeaDays" node="nbSeaDays" type="java.lang.Integer"/> - <property access="field" column="nbFishingDays" name="nbFishingDays" node="nbFishingDays" type="java.lang.Integer"/> - <property access="field" column="month" name="month" node="month" type="int"/> - <property access="field" column="harbourCode" name="harbourCode" node="harbourCode" type="text"/> - <property access="field" column="harbourId" name="harbourId" node="harbourId" type="int"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityProfession" node="activityProfession" order-by="professionOrder"> - <key column="activityMonth"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityProfessionImpl" embed-xml="false" node="topiaId"/> - </bag> - <many-to-one class="fr.ifremer.wao.entity.ActivityCalendarImpl" column="activityCalendar" embed-xml="false" name="activityCalendar" node="activityCalendar/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityProfessionImpl" node="fr.ifremer.wao.entity.ActivityProfessionImpl" proxy="fr.ifremer.wao.entity.ActivityProfession" table="activityProfession"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="code" name="code" node="code" type="text"/> - <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> - <property access="field" column="id" name="id" node="id" type="int"/> - <property access="field" column="professionOrder" name="professionOrder" node="professionOrder" type="int"/> - <many-to-one class="fr.ifremer.wao.entity.ActivityMonthImpl" column="activityMonth" embed-xml="false" name="activityMonth" node="activityMonth/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityZone" node="activityZone" order-by="zoneId"> - <key column="activityProfession"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityZoneImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityZoneImpl" node="fr.ifremer.wao.entity.ActivityZoneImpl" proxy="fr.ifremer.wao.entity.ActivityZone" table="activityZone"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="zoneCode" name="zoneCode" node="zoneCode" type="text"/> - <property access="field" column="zoneLibelle" name="zoneLibelle" node="zoneLibelle" type="text"/> - <property access="field" column="zoneId" name="zoneId" node="zoneId" type="int"/> - <property access="field" column="gradiantCode" name="gradiantCode" node="gradiantCode" type="int"/> - <property access="field" column="gradiantLibelle" name="gradiantLibelle" node="gradiantLibelle" type="text"/> - <many-to-one class="fr.ifremer.wao.entity.ActivityProfessionImpl" column="activityProfession" embed-xml="false" name="activityProfession" node="activityProfession/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.BoatImpl" node="fr.ifremer.wao.entity.BoatImpl" proxy="fr.ifremer.wao.entity.Boat" table="boat"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="immatriculation" index="boat_immatriculation_idx" name="immatriculation" node="immatriculation" type="int" unique="true"/> - <property access="field" column="name" name="name" node="name" type="text"/> - <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> - <property access="field" column="boatLength" name="boatLength" node="boatLength" type="int"/> - <property access="field" column="buildYear" name="buildYear" node="buildYear" type="int"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <many-to-one class="fr.ifremer.wao.entity.ShipOwnerImpl" column="shipOwner" embed-xml="false" lazy="false" name="shipOwner" node="shipOwner/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="companyBoatInfos" node="companyBoatInfos"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityCalendar" node="activityCalendar"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityCalendarImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag embed-xml="false" inverse="true" lazy="true" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.BoatInfosImpl" node="fr.ifremer.wao.entity.BoatInfosImpl" proxy="fr.ifremer.wao.entity.BoatInfos" table="boatInfos"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="contactFirstName" name="contactFirstName" node="contactFirstName" type="text"/> - <property access="field" column="contactLastName" name="contactLastName" node="contactLastName" type="text"/> - <property access="field" column="contactEmail" name="contactEmail" node="contactEmail" type="text"/> - <property access="field" column="contactPhoneNumber" name="contactPhoneNumber" node="contactPhoneNumber" type="text"/> - <property access="field" column="dup" name="dup" node="dup" type="java.lang.Integer"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.CompanyImpl" node="fr.ifremer.wao.entity.CompanyImpl" proxy="fr.ifremer.wao.entity.Company" table="company"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="name" name="name" node="name" type="text"/> - <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> - <property access="field" column="address1" name="address1" node="address1" type="text"/> - <property access="field" column="address2" name="address2" node="address2" type="text"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <property access="field" column="email" name="email" node="email" type="text"/> - <property access="field" column="city" name="city" node="city" type="text"/> - <property access="field" column="postalCode" name="postalCode" node="postalCode" type="int"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="waoUser" node="waoUser"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.WaoUserImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="boatBoatInfos" node="boatBoatInfos"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ContactImpl" node="fr.ifremer.wao.entity.ContactImpl" proxy="fr.ifremer.wao.entity.Contact" table="contact"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="tideBeginDate" name="tideBeginDate" node="tideBeginDate" type="java.util.Date"/> - <property access="field" column="tideEndDate" name="tideEndDate" node="tideEndDate" type="java.util.Date"/> - <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> - <property access="field" column="mammalsObservation" name="mammalsObservation" node="mammalsObservation" type="boolean"/> - <property access="field" column="mammalsCapture" name="mammalsCapture" node="mammalsCapture" type="boolean"/> - <property access="field" column="validationProgram" name="validationProgram" node="validationProgram" type="java.lang.Boolean"/> - <property access="field" column="validationCompany" name="validationCompany" node="validationCompany" type="java.lang.Boolean"/> - <property access="field" column="dataInputDate" name="dataInputDate" node="dataInputDate" type="java.util.Date"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <property access="field" column="state" name="state" node="state" type="text"/> - <property access="field" column="tideNbDays" name="tideNbDays" node="tideNbDays" type="int"/> - <many-to-one class="fr.ifremer.wao.entity.WaoUserImpl" column="observer" embed-xml="false" name="observer" node="observer/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" lazy="false" name="sampleRow" node="sampleRow/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ElligibleBoatImpl" node="fr.ifremer.wao.entity.ElligibleBoatImpl" proxy="fr.ifremer.wao.entity.ElligibleBoat" table="elligibleBoat"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="globalActive" name="globalActive" node="globalActive" type="boolean"/> - <property access="field" column="companyActive" name="companyActive" node="companyActive" type="java.lang.Boolean"/> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.FishingZoneImpl" node="fr.ifremer.wao.entity.FishingZoneImpl" proxy="fr.ifremer.wao.entity.FishingZone" table="fishingZone"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="sectorName" name="sectorName" node="sectorName" type="text"/> - <property access="field" column="facadeName" name="facadeName" node="facadeName" type="text"/> - <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> - <bag embed-xml="true" lazy="true" name="sampleRow" node="sampleRow" table="fishingzone_samplerow"> - <key column="fishingZone"/> - <many-to-many class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="topiaId" order-by="code"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.NewsImpl" node="fr.ifremer.wao.entity.NewsImpl" proxy="fr.ifremer.wao.entity.News" table="news"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="title" name="title" node="title" type="text"/> - <property access="field" column="content" name="content" node="content" type="text"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ProfessionImpl" node="fr.ifremer.wao.entity.ProfessionImpl" proxy="fr.ifremer.wao.entity.Profession" table="profession"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="codeDCF5" name="codeDCF5" node="codeDCF5" type="text"/> - <property access="field" column="meshSize" name="meshSize" node="meshSize" type="text"/> - <property access="field" column="size" name="size" node="size" type="text"/> - <property access="field" column="other" name="other" node="other" type="text"/> - <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> - <property access="field" column="species" name="species" node="species" type="text"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.SampleMonthImpl" node="fr.ifremer.wao.entity.SampleMonthImpl" proxy="fr.ifremer.wao.entity.SampleMonth" table="sampleMonth"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="realTidesValue" name="realTidesValue" node="realTidesValue" type="int"/> - <property access="field" column="expectedTidesValue" name="expectedTidesValue" node="expectedTidesValue" type="int"/> - <property access="field" column="periodDate" name="periodDate" node="periodDate" type="java.util.Date"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.SampleRowImpl" node="fr.ifremer.wao.entity.SampleRowImpl" proxy="fr.ifremer.wao.entity.SampleRow" table="sampleRow"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> - <property access="field" column="averageTideTime" name="averageTideTime" node="averageTideTime" type="double"/> - <property access="field" column="code" index="sampleRow_code_idx" name="code" node="code" type="text" unique="true"/> - <property access="field" column="fishingZonesInfos" name="fishingZonesInfos" node="fishingZonesInfos" type="text"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <property access="field" column="programName" name="programName" node="programName" type="text"/> - <property access="field" column="periodBegin" name="periodBegin" node="periodBegin" type="java.util.Date"/> - <property access="field" column="periodEnd" name="periodEnd" node="periodEnd" type="java.util.Date"/> - <many-to-one class="fr.ifremer.wao.entity.ProfessionImpl" column="profession" embed-xml="false" lazy="false" name="profession" node="profession/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="sampleMonth" node="sampleMonth" order-by="periodDate"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleMonthImpl" embed-xml="false" node="topiaId"/> - </bag> - <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" lazy="false" name="company" node="company/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="sampleRowLog" node="sampleRowLog" order-by="topiaCreateDate desc"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleRowLogImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag embed-xml="true" inverse="true" lazy="false" name="fishingZone" node="fishingZone" table="fishingzone_samplerow"> - <key column="sampleRow"/> - <many-to-many class="fr.ifremer.wao.entity.FishingZoneImpl" column="fishingZone" node="topiaId" order-by="facadeName,sectorName,districtCode"/> - </bag> - <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.SampleRowLogImpl" node="fr.ifremer.wao.entity.SampleRowLogImpl" proxy="fr.ifremer.wao.entity.SampleRowLog" table="sampleRowLog"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="logText" name="logText" node="logText" type="text"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.WaoUserImpl" column="admin" embed-xml="false" lazy="false" name="admin" node="admin/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ShipOwnerImpl" node="fr.ifremer.wao.entity.ShipOwnerImpl" proxy="fr.ifremer.wao.entity.ShipOwner" table="shipOwner"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="code" index="shipOwner_code_idx" name="code" node="code" type="text" unique="true"/> - <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> - <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.WaoUserImpl" node="fr.ifremer.wao.entity.WaoUserImpl" proxy="fr.ifremer.wao.entity.WaoUser" table="waoUser"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> - <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> - <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> - <property access="field" column="login" name="login" node="login" type="text"/> - <property access="field" column="password" name="password" node="password" type="text"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <property access="field" column="admin" name="admin" node="admin" type="boolean"/> - <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> - <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> - <key column="observer"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityCalendarImpl" node="fr.ifremer.wao.entity.ActivityCalendarImpl" proxy="fr.ifremer.wao.entity.ActivityCalendar" table="activityCalendar"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="year" name="year" node="year" type="int"/> - <property access="field" column="fiability" name="fiability" node="fiability" type="int"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityMonth" node="activityMonth" order-by="month"> - <key column="activityCalendar"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityMonthImpl" embed-xml="false" node="topiaId"/> - </bag> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityMonthImpl" node="fr.ifremer.wao.entity.ActivityMonthImpl" proxy="fr.ifremer.wao.entity.ActivityMonth" table="activityMonth"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="harbourLibelle" name="harbourLibelle" node="harbourLibelle" type="text"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <property access="field" column="nbBoardingPersons" name="nbBoardingPersons" node="nbBoardingPersons" type="java.lang.Integer"/> - <property access="field" column="nbSeaDays" name="nbSeaDays" node="nbSeaDays" type="java.lang.Integer"/> - <property access="field" column="nbFishingDays" name="nbFishingDays" node="nbFishingDays" type="java.lang.Integer"/> - <property access="field" column="month" name="month" node="month" type="int"/> - <property access="field" column="harbourCode" name="harbourCode" node="harbourCode" type="text"/> - <property access="field" column="harbourId" name="harbourId" node="harbourId" type="int"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityProfession" node="activityProfession" order-by="professionOrder"> - <key column="activityMonth"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityProfessionImpl" embed-xml="false" node="topiaId"/> - </bag> - <many-to-one class="fr.ifremer.wao.entity.ActivityCalendarImpl" column="activityCalendar" embed-xml="false" name="activityCalendar" node="activityCalendar/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityProfessionImpl" node="fr.ifremer.wao.entity.ActivityProfessionImpl" proxy="fr.ifremer.wao.entity.ActivityProfession" table="activityProfession"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="code" name="code" node="code" type="text"/> - <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> - <property access="field" column="id" name="id" node="id" type="int"/> - <property access="field" column="professionOrder" name="professionOrder" node="professionOrder" type="int"/> - <many-to-one class="fr.ifremer.wao.entity.ActivityMonthImpl" column="activityMonth" embed-xml="false" name="activityMonth" node="activityMonth/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityZone" node="activityZone" order-by="zoneId"> - <key column="activityProfession"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityZoneImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ActivityZoneImpl" node="fr.ifremer.wao.entity.ActivityZoneImpl" proxy="fr.ifremer.wao.entity.ActivityZone" table="activityZone"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="zoneCode" name="zoneCode" node="zoneCode" type="text"/> - <property access="field" column="zoneLibelle" name="zoneLibelle" node="zoneLibelle" type="text"/> - <property access="field" column="zoneId" name="zoneId" node="zoneId" type="int"/> - <property access="field" column="gradiantCode" name="gradiantCode" node="gradiantCode" type="int"/> - <property access="field" column="gradiantLibelle" name="gradiantLibelle" node="gradiantLibelle" type="text"/> - <many-to-one class="fr.ifremer.wao.entity.ActivityProfessionImpl" column="activityProfession" embed-xml="false" name="activityProfession" node="activityProfession/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.BoatImpl" node="fr.ifremer.wao.entity.BoatImpl" proxy="fr.ifremer.wao.entity.Boat" table="boat"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="immatriculation" index="boat_immatriculation_idx" name="immatriculation" node="immatriculation" type="int" unique="true"/> - <property access="field" column="name" name="name" node="name" type="text"/> - <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> - <property access="field" column="boatLength" name="boatLength" node="boatLength" type="int"/> - <property access="field" column="buildYear" name="buildYear" node="buildYear" type="int"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <many-to-one class="fr.ifremer.wao.entity.ShipOwnerImpl" column="shipOwner" embed-xml="false" lazy="false" name="shipOwner" node="shipOwner/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="companyBoatInfos" node="companyBoatInfos"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityCalendar" node="activityCalendar"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityCalendarImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag embed-xml="false" inverse="true" lazy="true" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.BoatInfosImpl" node="fr.ifremer.wao.entity.BoatInfosImpl" proxy="fr.ifremer.wao.entity.BoatInfos" table="boatInfos"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="contactFirstName" name="contactFirstName" node="contactFirstName" type="text"/> - <property access="field" column="contactLastName" name="contactLastName" node="contactLastName" type="text"/> - <property access="field" column="contactEmail" name="contactEmail" node="contactEmail" type="text"/> - <property access="field" column="contactPhoneNumber" name="contactPhoneNumber" node="contactPhoneNumber" type="text"/> - <property access="field" column="dup" name="dup" node="dup" type="java.lang.Integer"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.CompanyImpl" node="fr.ifremer.wao.entity.CompanyImpl" proxy="fr.ifremer.wao.entity.Company" table="company"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="name" name="name" node="name" type="text"/> - <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> - <property access="field" column="address1" name="address1" node="address1" type="text"/> - <property access="field" column="address2" name="address2" node="address2" type="text"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <property access="field" column="email" name="email" node="email" type="text"/> - <property access="field" column="city" name="city" node="city" type="text"/> - <property access="field" column="postalCode" name="postalCode" node="postalCode" type="int"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="waoUser" node="waoUser"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.WaoUserImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="boatBoatInfos" node="boatBoatInfos"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ContactImpl" node="fr.ifremer.wao.entity.ContactImpl" proxy="fr.ifremer.wao.entity.Contact" table="contact"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="tideBeginDate" name="tideBeginDate" node="tideBeginDate" type="java.util.Date"/> - <property access="field" column="tideEndDate" name="tideEndDate" node="tideEndDate" type="java.util.Date"/> - <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> - <property access="field" column="mammalsObservation" name="mammalsObservation" node="mammalsObservation" type="boolean"/> - <property access="field" column="mammalsCapture" name="mammalsCapture" node="mammalsCapture" type="boolean"/> - <property access="field" column="validationProgram" name="validationProgram" node="validationProgram" type="java.lang.Boolean"/> - <property access="field" column="validationCompany" name="validationCompany" node="validationCompany" type="java.lang.Boolean"/> - <property access="field" column="dataInputDate" name="dataInputDate" node="dataInputDate" type="java.util.Date"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <property access="field" column="state" name="state" node="state" type="text"/> - <property access="field" column="tideNbDays" name="tideNbDays" node="tideNbDays" type="int"/> - <many-to-one class="fr.ifremer.wao.entity.WaoUserImpl" column="observer" embed-xml="false" name="observer" node="observer/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" lazy="false" name="sampleRow" node="sampleRow/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ElligibleBoatImpl" node="fr.ifremer.wao.entity.ElligibleBoatImpl" proxy="fr.ifremer.wao.entity.ElligibleBoat" table="elligibleBoat"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="globalActive" name="globalActive" node="globalActive" type="boolean"/> - <property access="field" column="companyActive" name="companyActive" node="companyActive" type="java.lang.Boolean"/> - <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.FishingZoneImpl" node="fr.ifremer.wao.entity.FishingZoneImpl" proxy="fr.ifremer.wao.entity.FishingZone" table="fishingZone"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="sectorName" name="sectorName" node="sectorName" type="text"/> - <property access="field" column="facadeName" name="facadeName" node="facadeName" type="text"/> - <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> - <bag embed-xml="true" lazy="true" name="sampleRow" node="sampleRow" table="fishingzone_samplerow"> - <key column="fishingZone"/> - <many-to-many class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="topiaId" order-by="code"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.NewsImpl" node="fr.ifremer.wao.entity.NewsImpl" proxy="fr.ifremer.wao.entity.News" table="news"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="title" name="title" node="title" type="text"/> - <property access="field" column="content" name="content" node="content" type="text"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ProfessionImpl" node="fr.ifremer.wao.entity.ProfessionImpl" proxy="fr.ifremer.wao.entity.Profession" table="profession"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="codeDCF5" name="codeDCF5" node="codeDCF5" type="text"/> - <property access="field" column="meshSize" name="meshSize" node="meshSize" type="text"/> - <property access="field" column="size" name="size" node="size" type="text"/> - <property access="field" column="other" name="other" node="other" type="text"/> - <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> - <property access="field" column="species" name="species" node="species" type="text"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.SampleMonthImpl" node="fr.ifremer.wao.entity.SampleMonthImpl" proxy="fr.ifremer.wao.entity.SampleMonth" table="sampleMonth"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="realTidesValue" name="realTidesValue" node="realTidesValue" type="int"/> - <property access="field" column="expectedTidesValue" name="expectedTidesValue" node="expectedTidesValue" type="int"/> - <property access="field" column="periodDate" name="periodDate" node="periodDate" type="java.util.Date"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.SampleRowImpl" node="fr.ifremer.wao.entity.SampleRowImpl" proxy="fr.ifremer.wao.entity.SampleRow" table="sampleRow"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> - <property access="field" column="averageTideTime" name="averageTideTime" node="averageTideTime" type="double"/> - <property access="field" column="code" index="sampleRow_code_idx" name="code" node="code" type="text" unique="true"/> - <property access="field" column="fishingZonesInfos" name="fishingZonesInfos" node="fishingZonesInfos" type="text"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <property access="field" column="programName" name="programName" node="programName" type="text"/> - <property access="field" column="periodBegin" name="periodBegin" node="periodBegin" type="java.util.Date"/> - <property access="field" column="periodEnd" name="periodEnd" node="periodEnd" type="java.util.Date"/> - <many-to-one class="fr.ifremer.wao.entity.ProfessionImpl" column="profession" embed-xml="false" lazy="false" name="profession" node="profession/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="sampleMonth" node="sampleMonth" order-by="periodDate"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleMonthImpl" embed-xml="false" node="topiaId"/> - </bag> - <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" lazy="false" name="company" node="company/@topiaId"/> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="sampleRowLog" node="sampleRowLog" order-by="topiaCreateDate desc"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleRowLogImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> - </bag> - <bag embed-xml="true" inverse="true" lazy="false" name="fishingZone" node="fishingZone" table="fishingzone_samplerow"> - <key column="sampleRow"/> - <many-to-many class="fr.ifremer.wao.entity.FishingZoneImpl" column="fishingZone" node="topiaId" order-by="facadeName,sectorName,districtCode"/> - </bag> - <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.SampleRowLogImpl" node="fr.ifremer.wao.entity.SampleRowLogImpl" proxy="fr.ifremer.wao.entity.SampleRowLog" table="sampleRowLog"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="logText" name="logText" node="logText" type="text"/> - <property access="field" column="comment" name="comment" node="comment" type="text"/> - <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> - <many-to-one class="fr.ifremer.wao.entity.WaoUserImpl" column="admin" embed-xml="false" lazy="false" name="admin" node="admin/@topiaId"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.ShipOwnerImpl" node="fr.ifremer.wao.entity.ShipOwnerImpl" proxy="fr.ifremer.wao.entity.ShipOwner" table="shipOwner"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="code" index="shipOwner_code_idx" name="code" node="code" type="text" unique="true"/> - <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> - <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> - </class> -</hibernate-mapping> Deleted: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> - <class abstract="false" name="fr.ifremer.wao.entity.WaoUserImpl" node="fr.ifremer.wao.entity.WaoUserImpl" proxy="fr.ifremer.wao.entity.WaoUser" table="waoUser"> - <id length="255" name="topiaId" node="@topiaId" type="string"/> - <version name="topiaVersion" node="@topiaVersion" type="long"/> - <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> - <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> - <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> - <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> - <property access="field" column="login" name="login" node="login" type="text"/> - <property access="field" column="password" name="password" node="password" type="text"/> - <property access="field" column="active" name="active" node="active" type="boolean"/> - <property access="field" column="admin" name="admin" node="admin" type="boolean"/> - <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> - <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> - <key column="observer"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" embed-xml="false" node="topiaId"/> - </bag> - </class> -</hibernate-mapping> Modified: trunk/wao-business/src/site/site_fr.xml =================================================================== --- trunk/wao-business/src/site/site_fr.xml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/site/site_fr.xml 2010-06-28 15:13:48 UTC (rev 572) @@ -3,7 +3,7 @@ #%L Wao :: Business -$Id$ + $Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao; Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/bean/UserRoleTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/bean/UserRoleTest.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/bean/UserRoleTest.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.bean; import org.junit.Assert; Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/WaoUserImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/WaoUserImplTest.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/WaoUserImplTest.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.entity; import fr.ifremer.wao.bean.UserRole; Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.service; Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.service; Added: trunk/wao-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-ui/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/wao-ui/src/license/THIRD-PARTY.properties 2010-06-28 15:13:48 UTC (rev 572) @@ -0,0 +1,43 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache Software License 2.0 +# - BSD License +# - BSD style +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License (CDDL) v1.0 +# - Common Public License Version 1.0 +# - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 +# - GNU Lesser General Public Licence +# - GNU Lesser General Public License +# - GNU Lesser General Public License version 2.1 +# - GNU Library or Lesser General Public License +# - GPL, LGPL, MPL +# - General Public License (GPL) v 3.0 +# - Lesser General Public License (LGPL) v 3.0 +# - MIT License +# - Public Domain +# - The Apache Software License, Version 2.0 +# - The BSD License +# - The GNU General Public License (GPL) +# - The H2 License, Version 1.0 +# - The MIT License +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Jun 28 17:22:09 CEST 2010 +antlr--antlr--2.7.6=BSD +com.formos.tapestry--tapestry-testify--1.0.2=The Apache Software License, Version 2.0 +commons-beanutils--commons-beanutils-core--1.7.0=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD +javassist--javassist--3.9.0.GA=Lesser General Public License (LGPL) v 2.1 +javax.transaction--jta--1.1=Sun ??? +ognl--ognl--2.7.3=http\://www.opensymphony.com/ognl/license.action +org.antlr--antlr-runtime--3.1.1=BSD + + + + + Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/CsvImport.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/CsvImport.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/CsvImport.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.ui.components; import fr.ifremer.wao.WaoBusinessException; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/LogFile.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/LogFile.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/LogFile.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.ui.components; import org.apache.tapestry5.Asset; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/MinimalWindow.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/MinimalWindow.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/MinimalWindow.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.ui.components; import org.apache.tapestry5.MarkupWriter; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/AuthenticationUtil.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/AuthenticationUtil.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/AuthenticationUtil.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.ui.data; import java.util.Arrays; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ErrorReport.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ErrorReport.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ErrorReport.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.ui.data; import java.util.ArrayList; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ImportEngine.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ImportEngine.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ImportEngine.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.ui.data; import fr.ifremer.wao.WaoBusinessException; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/RequiresAuthentication.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/RequiresAuthentication.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/RequiresAuthentication.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.ui.data; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.ui.pages; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Unavailable.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Unavailable.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Unavailable.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.ui.pages; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/RequiresAuthenticationFilter.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/RequiresAuthenticationFilter.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/RequiresAuthenticationFilter.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.ui.services; import fr.ifremer.wao.bean.ConnectedUser; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceAuthentication.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceAuthentication.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceAuthentication.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.ui.services; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceAuthenticationImpl.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceAuthenticationImpl.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceAuthenticationImpl.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.ui.services; Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/CsvImport.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/CsvImport.tml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/CsvImport.tml 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.properties 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.properties 2010-06-28 15:13:48 UTC (rev 572) @@ -2,7 +2,7 @@ # #%L # Wao :: Web Interface # -# +# # $Id$ # $HeadURL$ # %% Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2010-06-28 15:13:48 UTC (rev 572) @@ -2,7 +2,6 @@  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties 2010-06-28 15:13:48 UTC (rev 572) @@ -2,7 +2,7 @@ # #%L # Wao :: Web Interface # -# +# # $Id$ # $HeadURL$ # %% Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/BoatActivityCalendar.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/BoatActivityCalendar.properties 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/BoatActivityCalendar.properties 2010-06-28 15:13:48 UTC (rev 572) @@ -2,7 +2,7 @@ # #%L # Wao :: Web Interface # -# +# # $Id$ # $HeadURL$ # %% Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats.properties 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats.properties 2010-06-28 15:13:48 UTC (rev 572) @@ -2,7 +2,7 @@ # #%L # Wao :: Web Interface # -# +# # $Id$ # $HeadURL$ # %% Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Connexion.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Connexion.properties 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Connexion.properties 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +### +# #%L +# Wao :: Web Interface +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### login-label: Identifiant (email) password-label: Mot de passe userRole-label: R\u00f4le \ No newline at end of file Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-06-28 15:13:48 UTC (rev 572) @@ -2,7 +2,7 @@ # #%L # Wao :: Web Interface # -# +# # $Id$ # $HeadURL$ # %% Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts1.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts1.properties 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts1.properties 2010-06-28 15:13:48 UTC (rev 572) @@ -2,7 +2,7 @@ # #%L # Wao :: Web Interface # -# +# # $Id$ # $HeadURL$ # %% Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Index.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Index.properties 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Index.properties 2010-06-28 15:13:48 UTC (rev 572) @@ -2,7 +2,7 @@ # #%L # Wao :: Web Interface # -# +# # $Id$ # $HeadURL$ # %% Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties 2010-06-28 15:13:48 UTC (rev 572) @@ -2,7 +2,7 @@ # #%L # Wao :: Web Interface # -# +# # $Id$ # $HeadURL$ # %% Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties 2010-06-28 15:13:48 UTC (rev 572) @@ -2,7 +2,7 @@ # #%L # Wao :: Web Interface # -# +# # $Id$ # $HeadURL$ # %% Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties 2010-06-28 15:13:48 UTC (rev 572) @@ -2,7 +2,7 @@ # #%L # Wao :: Web Interface # -# +# # $Id$ # $HeadURL$ # %% Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfile.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfile.properties 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfile.properties 2010-06-28 15:13:48 UTC (rev 572) @@ -2,7 +2,7 @@ # #%L # Wao :: Web Interface # -# +# # $Id$ # $HeadURL$ # %% Modified: trunk/wao-ui/src/main/resources/log4j.properties =================================================================== --- trunk/wao-ui/src/main/resources/log4j.properties 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/resources/log4j.properties 2010-06-28 15:13:48 UTC (rev 572) @@ -2,7 +2,7 @@ # #%L # Wao :: Web Interface # -# +# # $Id$ # $HeadURL$ # %% @@ -43,4 +43,4 @@ log4j.logger.fr.ifremer.wao=INFO #log4j.logger.org.nuiton.utils=INFO -#log4j.logger.org.nuiton.topia=INFO \ No newline at end of file +#log4j.logger.org.nuiton.topia=INFO Modified: trunk/wao-ui/src/main/resources/org/apache/tapestry5/corelib/components/Errors_fr.properties =================================================================== --- trunk/wao-ui/src/main/resources/org/apache/tapestry5/corelib/components/Errors_fr.properties 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/resources/org/apache/tapestry5/corelib/components/Errors_fr.properties 2010-06-28 15:13:48 UTC (rev 572) @@ -1 +1,22 @@ +### +# #%L +# Wao :: Web Interface +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### default-banner: Vous devez corriger les erreurs suivantes pour pouvoir continuer : \ No newline at end of file Modified: trunk/wao-ui/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_fr.properties =================================================================== --- trunk/wao-ui/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_fr.properties 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_fr.properties 2010-06-28 15:13:48 UTC (rev 572) @@ -2,7 +2,7 @@ # #%L # Wao :: Web Interface # -# +# # $Id$ # $HeadURL$ # %% Modified: trunk/wao-ui/src/main/webapp/Connexion.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Connexion.tml 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/webapp/Connexion.tml 2010-06-28 15:13:48 UTC (rev 572) @@ -2,7 +2,6 @@ <!-- #%L Wao :: Web Interface - $Author$ $LastChangedDate$ $LastChangedRevision$ @@ -15,12 +14,12 @@ it under the terms of the GNU 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 General Public License along with this program. If not, see <http://www.gnu.org/licenses/gpl-3.0.html>. Modified: trunk/wao-ui/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/wao-ui/src/main/webapp/WEB-INF/app.properties 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/webapp/WEB-INF/app.properties 2010-06-28 15:13:48 UTC (rev 572) @@ -2,7 +2,7 @@ # #%L # Wao :: Web Interface # -# +# # $Id$ # $HeadURL$ # %% Modified: trunk/wao-ui/src/main/webapp/js/AdminUserSelect.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/AdminUserSelect.js 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/webapp/js/AdminUserSelect.js 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * This class is used to manage manually user select on Administration page. * Options need style depends on inactivity of users. So we use javascript to Modified: trunk/wao-ui/src/main/webapp/js/ContactComment.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/ContactComment.js 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/webapp/js/ContactComment.js 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * This class is used to manage comment window for contacts. Two possible cases : * - comment from current edition Modified: trunk/wao-ui/src/main/webapp/js/NewsHider.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/NewsHider.js 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/main/webapp/js/NewsHider.js 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * This class is used to hide news details depends on an anchor. This anchor * must be called 'details' and be surrounded by a paragraph block (<p>) in Modified: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/AdministrationTest.java =================================================================== --- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/AdministrationTest.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/AdministrationTest.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package test.fr.ifremer.wao.ui.pages; Modified: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ContactsTest.java =================================================================== --- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ContactsTest.java 2010-06-28 14:37:18 UTC (rev 571) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ContactsTest.java 2010-06-28 15:13:48 UTC (rev 572) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package test.fr.ifremer.wao.ui.pages;

1 0

[Suiviobsmer-commits] r571 - trunk
by fdesbois＠users.labs.libre-entreprise.org June 28, 2010

June 28, 2010

Author: fdesbois Date: 2010-06-28 14:37:18 +0000 (Mon, 28 Jun 2010) New Revision: 571 Log: Update changelog Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-06-28 14:29:55 UTC (rev 570) +++ trunk/changelog.txt 2010-06-28 14:37:18 UTC (rev 571) @@ -9,6 +9,8 @@ Anomalies +++++++++ +- [fdesbois] Ano #2358 : Le contrôle du format CSV d'import ne fonctionne pas + sous Windows. - [fdesbois] Ano #2357 : Les champs login/password a la creation d'un utilisateur ne sont pas vide. - [fdesbois] Ano #2356 : Problème de sauvegarde du contact sur une ligne

1 0

[Suiviobsmer-commits] r570 - in trunk: wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/io wao-business/src/main/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/components
by fdesbois＠users.labs.libre-entreprise.org June 28, 2010

June 28, 2010

Author: fdesbois Date: 2010-06-28 14:29:55 +0000 (Mon, 28 Jun 2010) New Revision: 570 Log: Ano #2358 : don't check csv mime type, check headers (one key header for each import case) Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoException.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryHelper.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportHelper.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/CsvImport.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-06-28 09:45:23 UTC (rev 569) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-06-28 14:29:55 UTC (rev 570) @@ -356,7 +356,7 @@ log.error("SQL executed with error : " + ((SQLGrammarException)eee).getSQL()); } - throw new WaoException(eee, message, args); + throw new WaoException(message, eee, args); } else { throw (WaoException)eee; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoException.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoException.java 2010-06-28 09:45:23 UTC (rev 569) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoException.java 2010-06-28 14:29:55 UTC (rev 570) @@ -41,7 +41,7 @@ * @param args */ - public WaoException(Throwable eee, String message, Object... args) { + public WaoException(String message, Throwable eee, Object... args) { super(message, eee); this.args = args; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryHelper.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryHelper.java 2010-06-28 09:45:23 UTC (rev 569) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryHelper.java 2010-06-28 14:29:55 UTC (rev 570) @@ -71,7 +71,7 @@ property.setAlias(alias); return property; } catch (Exception eee) { - throw new WaoException(eee, "Error instantiate " + propertyClass.getName()); + throw new WaoException("Error instantiate " + propertyClass.getName(), eee); } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportHelper.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportHelper.java 2010-06-28 09:45:23 UTC (rev 569) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportHelper.java 2010-06-28 14:29:55 UTC (rev 570) @@ -36,9 +36,11 @@ import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; +import java.util.List; import java.util.Locale; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.time.DurationFormatUtils; @@ -182,7 +184,7 @@ * @throws IOException * @throws ParseException * @throws IllegalArgumentException - * @see ImportHelper#readDate(CsvReader, IOHeader) + * @see #readDate(CsvReader, DatedHeader) */ public static PeriodDates readPeriod(CsvReader reader, DatedHeader headerBegin, DatedHeader headerEnd) throws IOException, ParseException { @@ -288,4 +290,31 @@ return System.currentTimeMillis(); } + /** + * This method is used to check if {@code reader} contains at least the + * {@code keyHeader} in headers. Otherwise an exception will be thrown. + * + * @param reader CsvReader to check (headers need to be read before) + * @param keyHeader Header to check + * @throws WaoBusinessException if keyHeader is not found + */ + public static void checkKeyHeader(CsvReader reader, IOHeader keyHeader) + throws WaoBusinessException { + + try { + List<String> headers = Arrays.asList(reader.getHeaders()); + + if (!headers.contains(keyHeader.name())) { + throw new WaoBusinessException( + WaoBusinessException.Type.IMPORT_ERROR, null, + "Fichier non reconnu, aucune colonne ne correspond à '" + + keyHeader.name() + "'."); + } + + } catch (IOException eee) { + throw new WaoException("Une erreur est survenue à la lecture de" + + " l'en-tête du fichier CSV. Veuillez vérifier votre fichier.", eee); + } + } + } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-06-28 09:45:23 UTC (rev 569) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-06-28 14:29:55 UTC (rev 570) @@ -363,6 +363,9 @@ CsvReader reader = new CsvReader(input, context.getCsvCharset()); reader.readHeaders(); + + ImportHelper.checkKeyHeader(reader, BOAT.NAVS_COD); + long tic; BoatDAO boatDAO = WaoDAOHelper.getBoatDAO(transaction); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-06-28 09:45:23 UTC (rev 569) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-06-28 14:29:55 UTC (rev 570) @@ -226,9 +226,9 @@ log.warn("observer null when saving contact", exception); } // This message will be displayed to Client - throw new WaoException(exception, + throw new WaoException( "L'observateur n'a pas été renseigné correctement pour " + - "la sauvegarde du contact"); + "la sauvegarde du contact", exception); } } @@ -244,9 +244,9 @@ log.warn("sampleRow null when saving contact", exception); } // This message will be displayed to Client - throw new WaoException(exception, + throw new WaoException( "La ligne du plan d'échantillonnage n'a pas été renseigné" + - " correctement pour la sauvegarde du contact"); + " correctement pour la sauvegarde du contact", exception); } } @@ -504,6 +504,8 @@ try { reader.readHeaders(); + ImportHelper.checkKeyHeader(reader, CONTACT.CONT_CREATION); + ContactDAO dao = WaoDAOHelper.getContactDAO(transaction); long tic; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-06-28 09:45:23 UTC (rev 569) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-06-28 14:29:55 UTC (rev 570) @@ -26,6 +26,7 @@ package fr.ifremer.wao.service; import com.csvreader.CsvReader; +import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoContext; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.WaoException; @@ -37,6 +38,7 @@ import fr.ifremer.wao.entity.Profession; import fr.ifremer.wao.entity.ProfessionDAO; import fr.ifremer.wao.io.ImportHelper; +import fr.ifremer.wao.io.WaoCsvHeader; import fr.ifremer.wao.io.WaoCsvHeader.FISHING_ZONE; import java.io.IOException; import java.io.InputStream; @@ -168,12 +170,14 @@ @Override public int executeImportFishingZoneCsv(TopiaContext transaction, - InputStream input) throws TopiaException, IOException { + InputStream input) throws TopiaException, IOException, WaoBusinessException { int result = 0; CsvReader reader = new CsvReader(input, context.getCsvCharset()); reader.readHeaders(); + ImportHelper.checkKeyHeader(reader, FISHING_ZONE.PECHE_DIVISION); + FishingZoneDAO dao = WaoDAOHelper.getFishingZoneDAO(transaction); while(reader.readRecord()) { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-06-28 09:45:23 UTC (rev 569) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-06-28 14:29:55 UTC (rev 570) @@ -800,6 +800,8 @@ CsvReader reader = new CsvReader(input, context.getCsvCharset()); reader.readHeaders(); + ImportHelper.checkKeyHeader(reader, SAMPLING.PLAN_CODE); + SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction); //int nbImported = 0; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/CsvImport.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/CsvImport.java 2010-06-28 09:45:23 UTC (rev 569) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/CsvImport.java 2010-06-28 14:29:55 UTC (rev 570) @@ -126,9 +126,10 @@ } input = new GZIPInputStream(input); - } else if (!contentType.equals(MIMETYPE_CSV)) { - throw new IOException("unsupported format : " + contentType); } +// else if (!contentType.equals(MIMETYPE_CSV)) { +// throw new IOException("unsupported format : " + contentType); +// } return input; } }

1 0

[Suiviobsmer-commits] r569 - in trunk: . wao-business/src/main/java/fr/ifremer/wao/service wao-ui/src/main/resources/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by fdesbois＠users.labs.libre-entreprise.org June 28, 2010

June 28, 2010

Author: fdesbois Date: 2010-06-28 09:45:23 +0000 (Mon, 28 Jun 2010) New Revision: 569 Log: Ano #2357 : Rename fields for password and login on Administration page Modified: trunk/changelog.txt trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties trunk/wao-ui/src/main/webapp/Administration.tml Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-06-28 09:16:51 UTC (rev 568) +++ trunk/changelog.txt 2010-06-28 09:45:23 UTC (rev 569) @@ -9,6 +9,8 @@ Anomalies +++++++++ +- [fdesbois] Ano #2357 : Les champs login/password a la creation d'un utilisateur + ne sont pas vide. - [fdesbois] Ano #2356 : Problème de sauvegarde du contact sur une ligne d'échantillon vide. Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-06-28 09:16:51 UTC (rev 568) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-06-28 09:45:23 UTC (rev 569) @@ -221,8 +221,7 @@ transaction.commitTransaction(); try { - // FIXME-JC20100122 Use REGEX instead of @ to test if the login is - // a valid email + // FIXME-JC20100122 Use REGEX instead of @ to test if the login is a valid email if (user.getLogin().contains("@") && user.isPasswordChanged()) { String subject = "[WAO] "; String msg = "Bonjour,\n\n"; Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties 2010-06-28 09:16:51 UTC (rev 568) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties 2010-06-28 09:45:23 UTC (rev 569) @@ -35,10 +35,9 @@ users-label: Liste des utilisateurs firstName-label: Pr\u00e9nom* lastName-label: Nom* -login-label: Identifiant de connexion (email)* +loginAdministration-label: Identifiant de connexion (email)* active-label: Actif generatePassword-label: G\u00e9n\u00e9rer le password -password-label: ou d\u00e9finir manuellement userRole-label: R\u00f4les readOnly-label: Lecture seule # follow statement doesn't work with BeanEditForm Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-06-28 09:16:51 UTC (rev 568) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-06-28 09:45:23 UTC (rev 569) @@ -124,14 +124,14 @@ <input t:type="textfield" t:id="lastName" value="userEdited.lastName" t:validate="required" /> </p:lastName> <p:login> - <label t:type="label" for="login" /> - <input t:type="textfield" t:id="login" value="userEdited.login" t:validate="required" /> + <label t:type="label" for="loginAdministration" /> + <input t:type="textfield" t:id="loginAdministration" value="userEdited.login" t:validate="required" /> </p:login> <p:password> <label t:type="label" for="generatePassword" /> <input t:type="checkbox" t:id="generatePassword" value="generatePassword" /> <span> ou définir manuellement : </span> - <input t:type="passwordfield" t:id="password2" class="width100" value="password" /> + <input t:type="passwordfield" t:id="passwordAdministration" class="width100" value="password" /> </p:password> <p:userRole> <t:zone id="so-admin-userRoleZone" t:id="userRoleZone" t:update="show">

1 0

[Suiviobsmer-commits] r568 - in trunk: . wao-business wao-ui
by fdesbois＠users.labs.libre-entreprise.org June 28, 2010

June 28, 2010

Author: fdesbois Date: 2010-06-28 09:16:51 +0000 (Mon, 28 Jun 2010) New Revision: 568 Log: Update changelog + change to version 1.4.1 Modified: trunk/changelog.txt trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-06-28 09:10:30 UTC (rev 567) +++ trunk/changelog.txt 2010-06-28 09:16:51 UTC (rev 568) @@ -3,6 +3,20 @@ Historique des versions +1.4.1 +----- + +Anomalies ++++++++++ + +- [fdesbois] Ano #2356 : Problème de sauvegarde du contact sur une ligne + d'échantillon vide. + +Mise à jour librairies +++++++++++++++++++++++ + +- **mavenpom4labs** 2.2 -> 2.2.1 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs] + 1.4 --- Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-28 09:10:30 UTC (rev 567) +++ trunk/pom.xml 2010-06-28 09:16:51 UTC (rev 568) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <modules> <module>wao-ui</module> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-06-28 09:10:30 UTC (rev 567) +++ trunk/wao-business/pom.xml 2010-06-28 09:16:51 UTC (rev 568) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-06-28 09:10:30 UTC (rev 567) +++ trunk/wao-ui/pom.xml 2010-06-28 09:16:51 UTC (rev 568) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

[Suiviobsmer-commits] r567 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by fdesbois＠users.labs.libre-entreprise.org June 28, 2010

June 28, 2010

Author: fdesbois Date: 2010-06-28 09:10:30 +0000 (Mon, 28 Jun 2010) New Revision: 567 Log: Ano #2356 : Add fix to avoid saving contact with null sampleRow Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-06-27 06:12:23 UTC (rev 566) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-06-28 09:10:30 UTC (rev 567) @@ -189,21 +189,8 @@ Contact contact, boolean delete) throws TopiaException, NullSampleMonthException { - // Ano #2287 Temporary fix to avoid saving a null observer - if (contact.getObserver() == null) { - // Throw a NullPointerException to avoid saving null observer - Throwable exception = - new NullPointerException("observer can't be null to save" + - " the contact"); - - if (log.isWarnEnabled()) { - log.warn("observer null when saving contact", exception); - } - // This message will be displayed to Client - throw new WaoException(exception, - "L'observateur n'a pas été renseigné correctement pour " + - "la sauvegarde du contact"); - } + checkObserver(contact); + checkSampleRow(contact); ContactDAO dao = WaoDAOHelper.getContactDAO(transaction); @@ -227,6 +214,42 @@ transaction.commitTransaction(); } + protected void checkObserver(Contact contact) throws WaoException { + // Ano #2287 Temporary fix to avoid saving a null observer + if (contact.getObserver() == null) { + // Throw a NullPointerException to avoid saving null observer + Throwable exception = + new NullPointerException("observer can't be null to save" + + " the contact"); + + if (log.isWarnEnabled()) { + log.warn("observer null when saving contact", exception); + } + // This message will be displayed to Client + throw new WaoException(exception, + "L'observateur n'a pas été renseigné correctement pour " + + "la sauvegarde du contact"); + } + } + + protected void checkSampleRow(Contact contact) throws WaoException { + // Ano #2356 Temporary fix to avoid saving a null sampleRow + if (contact.getSampleRow() == null) { + // Throw a NullPointerException to avoid saving null sampleRow + Throwable exception = + new NullPointerException("sampleRow can't be null to save" + + " the contact"); + + if (log.isWarnEnabled()) { + log.warn("sampleRow null when saving contact", exception); + } + // This message will be displayed to Client + throw new WaoException(exception, + "La ligne du plan d'échantillonnage n'a pas été renseigné" + + " correctement pour la sauvegarde du contact"); + } + } + /** * Create or Update a Contact from {@code source} to {@code destination}. * The sampleMonth referenced to this contact will be automatically updated

1 0

[Suiviobsmer-commits] r566 - trunk
by tchemit＠users.labs.libre-entreprise.org June 27, 2010

June 27, 2010

Author: tchemit Date: 2010-06-27 06:12:23 +0000 (Sun, 27 Jun 2010) New Revision: 566 Log: Utilisation de mavenpom4labs 2.2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-23 08:58:17 UTC (rev 565) +++ trunk/pom.xml 2010-06-27 06:12:23 UTC (rev 566) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.2</version> + <version>2.2.1</version> </parent> <groupId>fr.ifremer</groupId>

1 0

[Suiviobsmer-commits] r565 - in trunk: . wao-business wao-ui
by fdesbois＠users.labs.libre-entreprise.org June 23, 2010

June 23, 2010

Author: fdesbois Date: 2010-06-23 08:58:17 +0000 (Wed, 23 Jun 2010) New Revision: 565 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-23 08:58:04 UTC (rev 564) +++ trunk/pom.xml 2010-06-23 08:58:17 UTC (rev 565) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -252,9 +252,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.4</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.4</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.4?root=suiviobsm…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-06-23 08:58:04 UTC (rev 564) +++ trunk/wao-business/pom.xml 2010-06-23 08:58:17 UTC (rev 565) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -193,9 +193,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.4/?root=suiviobs…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.4/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.4/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> </scm> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-06-23 08:58:04 UTC (rev 564) +++ trunk/wao-ui/pom.xml 2010-06-23 08:58:17 UTC (rev 565) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -227,9 +227,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.4/?root=suiviobs…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.4/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.4/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> </scm> </project>

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →