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

[Suiviobsmer-commits] r813 - in trunk: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: bleny Date: 2010-11-26 16:21:42 +0000 (Fri, 26 Nov 2010) New Revision: 813 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-11-26 16:21:40 UTC (rev 812) +++ trunk/pom.xml 2010-11-26 16:21:42 UTC (rev 813) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.6</version> + <version>1.7-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -346,12 +346,12 @@ <scm> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.6 + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </connection> <developerConnection> - scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.6 + scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.6?root=suiviobsm… + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer </url> </scm> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-11-26 16:21:40 UTC (rev 812) +++ trunk/wao-business/pom.xml 2010-11-26 16:21:42 UTC (rev 813) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.6</version> + <version>1.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -229,13 +229,13 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.6/?root=suiviobs… + 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/tags/wao-1.6/wao-business + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business </connection> <developerConnection> - scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.6/wao-business + scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business </developerConnection> </scm> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-11-26 16:21:40 UTC (rev 812) +++ trunk/wao-ui/pom.xml 2010-11-26 16:21:42 UTC (rev 813) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.6</version> + <version>1.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -270,13 +270,13 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.6/?root=suiviobs… + 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/tags/wao-1.6/wao-ui + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui </connection> <developerConnection> - scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.6/wao-ui + scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui </developerConnection> </scm>

1 0

[Suiviobsmer-commits] r812 - in tags: . wao-1.6
by bleny＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: bleny Date: 2010-11-26 16:21:40 +0000 (Fri, 26 Nov 2010) New Revision: 812 Log: [maven-release-plugin] copy for tag wao-1.6 Added: tags/wao-1.6/ Property changes on: tags/wao-1.6 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws *.iml target nbactions.xml Added: svn:mergeinfo + /branches/wao-1.5.x:679-733

1 0

[Suiviobsmer-commits] r811 - in trunk: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: bleny Date: 2010-11-26 16:18:21 +0000 (Fri, 26 Nov 2010) New Revision: 811 Log: [maven-release-plugin] prepare release wao-1.6 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-26 16:14:46 UTC (rev 810) +++ trunk/pom.xml 2010-11-26 16:18:21 UTC (rev 811) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -17,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> <modules> <module>wao-ui</module> @@ -348,12 +346,12 @@ <scm> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.6 </connection> <developerConnection> - scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.6 </developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.6?root=suiviobsm… </url> </scm> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-11-26 16:14:46 UTC (rev 810) +++ trunk/wao-business/pom.xml 2010-11-26 16:18:21 UTC (rev 811) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -231,13 +229,13 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su… + http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.6/?root=suiviobs… </url> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.6/wao-business </connection> <developerConnection> - scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business + scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.6/wao-business </developerConnection> </scm> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-11-26 16:14:46 UTC (rev 810) +++ trunk/wao-ui/pom.xml 2010-11-26 16:18:21 UTC (rev 811) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -272,13 +270,13 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs… + http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.6/?root=suiviobs… </url> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.6/wao-ui </connection> <developerConnection> - scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui + scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.6/wao-ui </developerConnection> </scm>

1 0

[Suiviobsmer-commits] r810 - trunk/wao-ui
by bleny＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: bleny Date: 2010-11-26 16:14:46 +0000 (Fri, 26 Nov 2010) New Revision: 810 Log: use in developerConnection Modified: trunk/wao-ui/pom.xml Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-11-26 16:00:26 UTC (rev 809) +++ trunk/wao-ui/pom.xml 2010-11-26 16:14:46 UTC (rev 810) @@ -278,7 +278,7 @@ scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui </connection> <developerConnection> - scm:svn:svn+ssh://tchemit at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui + scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui </developerConnection> </scm>

1 0

[Suiviobsmer-commits] r809 - in trunk: src/announcement src/license src/site/resources/admin src/site/resources/coordinator src/site/resources/guest src/site/resources/user src/site/rst src/site/rst/admin src/site/rst/coordinator src/site/rst/guest src/site/rst/user wao-business/src/license 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/java/fr/ifremer
by tchemit＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: tchemit Date: 2010-11-26 16:00:26 +0000 (Fri, 26 Nov 2010) New Revision: 809 Log: normalize svn-keywords Modified: trunk/src/announcement/release-email-1.2.txt trunk/src/announcement/release-email-1.3.txt trunk/src/announcement/release-email-1.4.1.txt trunk/src/announcement/release-email-1.4.txt trunk/src/announcement/release-email-1.5.1.txt trunk/src/announcement/release-email-1.5.2.txt trunk/src/announcement/release-email-1.5.3.txt trunk/src/announcement/release-email-1.5.4.txt trunk/src/announcement/release-email-1.5.txt trunk/src/announcement/release-email-1.6.txt trunk/src/license/project.xml trunk/src/site/resources/admin/contacts_comment_actions.png trunk/src/site/resources/admin/contacts_comment_popup.png trunk/src/site/resources/admin/depeche_with_anchor.png trunk/src/site/resources/admin/edit_depeche_with_anchor.png trunk/src/site/resources/admin/icone_quartier.png trunk/src/site/resources/admin/imports.png trunk/src/site/resources/admin/map_quartier.png trunk/src/site/resources/admin/roles.png trunk/src/site/resources/admin/zoom_quartier.png trunk/src/site/resources/coordinator/contacts_comment_actions.png trunk/src/site/resources/coordinator/contacts_comment_popup.png trunk/src/site/resources/coordinator/depeche_with_anchor.png trunk/src/site/resources/coordinator/edit_depeche_with_anchor.png trunk/src/site/resources/coordinator/roles.png trunk/src/site/resources/coordinator/users.png trunk/src/site/resources/guest/autoComplete.png trunk/src/site/resources/guest/sampling_plan.png trunk/src/site/resources/guest/sampling_plan_comment.png trunk/src/site/resources/guest/sampling_plan_history.png trunk/src/site/resources/user/Guide_WAO-creer_modifier_contact_V1.pdf trunk/src/site/resources/user/icone_quartier.png trunk/src/site/resources/user/map_quartier.png trunk/src/site/resources/user/profil.png trunk/src/site/resources/user/zoom_quartier.png trunk/src/site/rst/admin/seeContacts.rst trunk/src/site/rst/coordinator/news.rst trunk/src/site/rst/coordinator/users.rst trunk/src/site/rst/guest.rst trunk/src/site/rst/guest/echantillonage.rst trunk/src/site/rst/obsdeb.rst trunk/src/site/rst/user/seeContacts.rst trunk/wao-business/src/license/THIRD-PARTY.properties trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoServiceFactory.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactPieChartConstant.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/DataReliability.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisParametersImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartDataImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartSeriesImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCF5CodeImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/NewsImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.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/java/fr/ifremer/wao/io/csv/ExportHelper.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/SamplingExport.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderJak.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderXpp3.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictSchemaData.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/ContactKmlWriterJak.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/IconSizeHelper.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlIOFactory.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlReader.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlWriter.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceChartEmpty.java trunk/wao-business/src/test/java/fr/ifremer/wao/WaoMigrationCallBackTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/bean/PieChartDataImplTest.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/ServiceCartographyImplTest.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-business/src/test/resources/import/boat_districts.kml trunk/wao-ui/src/license/THIRD-PARTY.properties trunk/wao-ui/src/main/assembly/Wao.properties trunk/wao-ui/src/main/assembly/bin.xml trunk/wao-ui/src/main/assembly/go.bat trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Footer.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/KmlStreamResponse.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategy.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategyContacts.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ImportFieldSet.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.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/Connexion.properties trunk/wao-ui/src/main/resources/org/apache/tapestry5/corelib/components/Errors_fr.properties trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml trunk/wao-ui/src/main/webapp/css/cartography.css trunk/wao-ui/src/main/webapp/css/synthesis-print.css trunk/wao-ui/src/main/webapp/img/add-16px.png trunk/wao-ui/src/main/webapp/img/cartography.png trunk/wao-ui/src/main/webapp/img/comment-unavailable-22px.png trunk/wao-ui/src/main/webapp/img/invalid-16px.png trunk/wao-ui/src/main/webapp/img/samplingPlan-estimated.png trunk/wao-ui/src/main/webapp/img/samplingPlan-real.png trunk/wao-ui/src/main/webapp/img/source/synthesis-ind-data-reliability.xcf trunk/wao-ui/src/main/webapp/img/synthesis-global-synthesis.png trunk/wao-ui/src/main/webapp/img/synthesis-ind-data-reliability.png trunk/wao-ui/src/main/webapp/img/valid-16px.png trunk/wao-ui/src/main/webapp/js/OpenLayers/OpenLayers.js trunk/wao-ui/src/main/webapp/js/OpenLayers/img/blank.gif trunk/wao-ui/src/main/webapp/js/OpenLayers/img/cloud-popup-relative.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/drag-rectangle-off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/drag-rectangle-on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/east-mini.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/layer-switcher-maximize.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/layer-switcher-minimize.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/marker-blue.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/marker-gold.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/marker-green.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/marker.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/measuring-stick-off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/measuring-stick-on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/north-mini.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/panning-hand-off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/panning-hand-on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/slider.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/south-mini.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/west-mini.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/zoom-minus-mini.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/zoom-plus-mini.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/zoom-world-mini.png trunk/wao-ui/src/main/webapp/js/OpenLayers/img/zoombar.png trunk/wao-ui/src/main/webapp/js/OpenLayers/license.txt trunk/wao-ui/src/main/webapp/js/OpenLayers/news.txt trunk/wao-ui/src/main/webapp/js/OpenLayers/readme.txt trunk/wao-ui/src/main/webapp/js/OpenLayers/release-license.txt trunk/wao-ui/src/main/webapp/js/OpenLayers/repository-license.txt trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/framedCloud.css trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/google.css trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/ie6-style.css trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/add_point_off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/add_point_on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/blank.gif trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/close.gif trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/drag-rectangle-off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/drag-rectangle-on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_line_off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_line_on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_point_off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_point_on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_polygon_off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_polygon_on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/editing_tool_bar.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/move_feature_off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/move_feature_on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/navigation_history.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/overview_replacement.gif trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/pan-panel-NOALPHA.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/pan-panel.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/pan_off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/pan_on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/panning-hand-off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/panning-hand-on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/remove_point_off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/remove_point_on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/ruler.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/save_features_off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/save_features_on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/view_next_off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/view_next_on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/view_previous_off.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/view_previous_on.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/zoom-panel-NOALPHA.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/zoom-panel.png trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/style.css trunk/wao-ui/src/main/webapp/js/administration.js trunk/wao-ui/src/main/webapp/js/cartography.js trunk/wao-ui/src/main/webapp/js/contacts.js trunk/wao-ui/src/main/webapp/js/news.js Property changes on: trunk/src/announcement/release-email-1.2.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Property changes on: trunk/src/announcement/release-email-1.3.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/announcement/release-email-1.4.1.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/announcement/release-email-1.4.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/announcement/release-email-1.5.1.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/announcement/release-email-1.5.2.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/announcement/release-email-1.5.3.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/announcement/release-email-1.5.4.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/announcement/release-email-1.5.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/announcement/release-email-1.6.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/license/project.xml ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/contacts_comment_actions.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/contacts_comment_popup.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/depeche_with_anchor.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/edit_depeche_with_anchor.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/icone_quartier.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/imports.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/map_quartier.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/roles.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/zoom_quartier.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/coordinator/contacts_comment_actions.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/coordinator/contacts_comment_popup.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/coordinator/depeche_with_anchor.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/coordinator/edit_depeche_with_anchor.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/coordinator/roles.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/coordinator/users.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/guest/autoComplete.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/guest/sampling_plan.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/guest/sampling_plan_comment.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/guest/sampling_plan_history.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/Guide_WAO-creer_modifier_contact_V1.pdf ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/icone_quartier.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/map_quartier.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/profil.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/zoom_quartier.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/admin/seeContacts.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/coordinator/news.rst =================================================================== --- trunk/src/site/rst/coordinator/news.rst 2010-11-26 15:59:59 UTC (rev 808) +++ trunk/src/site/rst/coordinator/news.rst 2010-11-26 16:00:26 UTC (rev 809) @@ -5,8 +5,8 @@ .. * #%L .. * Wao .. * -.. * $Id: news.rst 462 2010-04-19 23:41:59Z tchemit $ -.. * $HeadURL: svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/src/site/rst/coordinato… $ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2009 - 2010 Ifremer .. * %% Property changes on: trunk/src/site/rst/coordinator/news.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/coordinator/users.rst =================================================================== --- trunk/src/site/rst/coordinator/users.rst 2010-11-26 15:59:59 UTC (rev 808) +++ trunk/src/site/rst/coordinator/users.rst 2010-11-26 16:00:26 UTC (rev 809) @@ -5,8 +5,8 @@ .. * #%L .. * Wao .. * -.. * $Id: users.rst 523 2010-06-15 09:20:19Z jcouteau $ -.. * $HeadURL: svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/src/site/rst/admin/user… $ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2009 - 2010 Ifremer .. * %% Property changes on: trunk/src/site/rst/coordinator/users.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/guest/echantillonage.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/guest.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/obsdeb.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/user/seeContacts.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoServiceFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactPieChartConstant.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL 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-11-26 15:59:59 UTC (rev 808) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-11-26 16:00:26 UTC (rev 809) @@ -3,7 +3,7 @@ * Wao :: Business * * * $Id$ - * $HeadURL: svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business/src/main/j… $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2010 Ifremer * %% Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/DataReliability.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisParametersImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartDataImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartSeriesImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCF5CodeImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/NewsImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportRefusedException.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ExportHelper.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ExportHelper.java 2010-11-26 15:59:59 UTC (rev 808) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ExportHelper.java 2010-11-26 16:00:26 UTC (rev 809) @@ -2,8 +2,8 @@ * #%L * Wao :: Business * - * $Id: ExportHelper.java 492 2010-06-07 18:36:10Z fdesbois $ - * $HeadURL: svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business/src/main/j… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2009 - 2010 Ifremer * %% Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ExportHelper.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java 2010-11-26 15:59:59 UTC (rev 808) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java 2010-11-26 16:00:26 UTC (rev 809) @@ -2,8 +2,8 @@ * #%L * Wao :: Business * - * $Id: ImportHelper.java 570 2010-06-28 14:29:55Z fdesbois $ - * $HeadURL: svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business/src/main/j… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2009 - 2010 Ifremer * %% Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/SamplingExport.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/SamplingExport.java 2010-11-26 15:59:59 UTC (rev 808) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/SamplingExport.java 2010-11-26 16:00:26 UTC (rev 809) @@ -2,8 +2,8 @@ * #%L * Wao :: Business * - * $Id: SamplingExport.java 507 2010-06-11 14:51:13Z fdesbois $ - * $HeadURL: svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business/src/main/j… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2009 - 2010 Ifremer * %% Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/SamplingExport.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-11-26 15:59:59 UTC (rev 808) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-11-26 16:00:26 UTC (rev 809) @@ -2,8 +2,8 @@ * #%L * Wao :: Business * - * $Id: WaoCsvHeader.java 462 2010-04-19 23:41:59Z tchemit $ - * $HeadURL: svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business/src/main/j… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2009 - 2010 Ifremer * %% Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderJak.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderXpp3.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictSchemaData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/ContactKmlWriterJak.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/IconSizeHelper.java ___________________________________________________________________ Modified: svn:keywords - Id HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlIOFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlReader.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlWriter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceChartEmpty.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/WaoMigrationCallBackTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/bean/PieChartDataImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/bean/UserRoleTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/WaoUserImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/resources/import/boat_districts.kml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/assembly/Wao.properties ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/assembly/bin.xml ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/assembly/go.bat ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Footer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java ___________________________________________________________________ Modified: svn:keywords - Id HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/KmlStreamResponse.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategy.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategyContacts.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ImportFieldSet.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/LogFile.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Connexion.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/resources/org/apache/tapestry5/corelib/components/Errors_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml =================================================================== --- trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml 2010-11-26 15:59:59 UTC (rev 808) +++ trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml 2010-11-26 16:00:26 UTC (rev 809) @@ -3,11 +3,11 @@ #%L Wao :: Web Interface - $Author: bleny $ - $LastChangedDate: 2010-11-02 22:17:33 +0100 (mar. 02 nov. 2010) $ - $LastChangedRevision: 727 $ - $Id: Synthesis.tml 727 2010-11-02 21:17:33Z bleny $ - $HeadURL: svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui/src/main/webapp/… $ + $Author$ + $LastChangedDate$ + $LastChangedRevision$ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer %% Property changes on: trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/css/cartography.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/css/synthesis-print.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/add-16px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/cartography.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/comment-unavailable-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/invalid-16px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/samplingPlan-estimated.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/samplingPlan-real.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/source/synthesis-ind-data-reliability.xcf ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/synthesis-global-synthesis.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/synthesis-ind-data-reliability.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/valid-16px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/js/OpenLayers/OpenLayers.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/OpenLayers/OpenLayers.js 2010-11-26 15:59:59 UTC (rev 808) +++ trunk/wao-ui/src/main/webapp/js/OpenLayers/OpenLayers.js 2010-11-26 16:00:26 UTC (rev 809) @@ -114,7 +114,7 @@ scriptLocation="";var isOL=new RegExp("(^|(.*?\\/))("+OpenLayers._scriptName+")(\\?|$)");var scripts=document.getElementsByTagName('script');for(var i=0,len=scripts.length;i<len;i++){var src=scripts[i].getAttribute('src');if(src){var match=src.match(isOL);if(match){scriptLocation=match[1];break;}}} return scriptLocation;}};if(!singleFile){var jsfiles=new Array("OpenLayers/Util.js","OpenLayers/BaseTypes.js","OpenLayers/BaseTypes/Class.js","OpenLayers/BaseTypes/Bounds.js","OpenLayers/BaseTypes/Element.js","OpenLayers/BaseTypes/LonLat.js","OpenLayers/BaseTypes/Pixel.js","OpenLayers/BaseTypes/Size.js","OpenLayers/Console.js","OpenLayers/Tween.js","Rico/Corner.js","Rico/Color.js","OpenLayers/Ajax.js","OpenLayers/Events.js","OpenLayers/Request.js","OpenLayers/Request/XMLHttpRequest.js","OpenLayers/Projection.js","OpenLayers/Map.js","OpenLayers/Layer.js","OpenLayers/Icon.js","OpenLayers/Marker.js","OpenLayers/Marker/Box.js","OpenLayers/Popup.js","OpenLayers/Tile.js","OpenLayers/Tile/Image.js","OpenLayers/Tile/Image/IFrame.js","OpenLayers/Tile/WFS.js","OpenLayers/Layer/Image.js","OpenLayers/Layer/SphericalMercator.js","OpenLayers/Layer/EventPane.js","OpenLayers/Layer/FixedZoomLevels.js","OpenLayers/Layer/Google.js","OpenLayers/Layer/VirtualEarth.js","OpenLayers/Layer/Yahoo.js","OpenLayers/Layer/HTTPRequest.js","OpenLayers/Layer/Grid.js","OpenLayers/Layer/MapGuide.js","OpenLayers/Layer/MapServer.js","OpenLayers/Layer/MapServer/Untiled.js","OpenLayers/Layer/KaMap.js","OpenLayers/Layer/KaMapCache.js","OpenLayers/Layer/MultiMap.js","OpenLayers/Layer/Markers.js","OpenLayers/Layer/Text.js","OpenLayers/Layer/WorldWind.js","OpenLayers/Layer/ArcGIS93Rest.js","OpenLayers/Layer/WMS.js","OpenLayers/Layer/WMS/Untiled.js","OpenLayers/Layer/WMS/Post.js","OpenLayers/Layer/ArcIMS.js","OpenLayers/Layer/GeoRSS.js","OpenLayers/Layer/Boxes.js","OpenLayers/Layer/XYZ.js","OpenLayers/Layer/TMS.js","OpenLayers/Layer/TileCache.js","OpenLayers/Layer/Zoomify.js","OpenLayers/Popup/Anchored.js","OpenLayers/Popup/AnchoredBubble.js","OpenLayers/Popup/Framed.js","OpenLayers/Popup/FramedCloud.js","OpenLayers/Feature.js","OpenLayers/Feature/Vector.js","OpenLayers/Feature/WFS.js","OpenLayers/Handler.js","OpenLayers/Handler/Click.js","OpenLayers/Handler/Hover.js","OpenLayers/Handler/Point.js","OpenLayers/Handler/Path.js","OpenLayers/Handler/Polygon.js","OpenLayers/Handler/Feature.js","OpenLayers/Handler/Drag.js","OpenLayers/Handler/RegularPolygon.js","OpenLayers/Handler/Box.js","OpenLayers/Handler/MouseWheel.js","OpenLayers/Handler/Keyboard.js","OpenLayers/Control.js","OpenLayers/Control/Attribution.js","OpenLayers/Control/Button.js","OpenLayers/Control/ZoomBox.js","OpenLayers/Control/ZoomToMaxExtent.js","OpenLayers/Control/DragPan.js","OpenLayers/Control/Navigation.js","OpenLayers/Control/MouseDefaults.js","OpenLayers/Control/MousePosition.js","OpenLayers/Control/OverviewMap.js","OpenLayers/Control/KeyboardDefaults.js","OpenLayers/Control/PanZoom.js","OpenLayers/Control/PanZoomBar.js","OpenLayers/Control/ArgParser.js","OpenLayers/Control/Permalink.js","OpenLayers/Control/Scale.js","OpenLayers/Control/ScaleLine.js","OpenLayers/Control/Snapping.js","OpenLayers/Control/Split.js","OpenLayers/Control/LayerSwitcher.js","OpenLayers/Control/DrawFeature.js","OpenLayers/Control/DragFeature.js","OpenLayers/Control/ModifyFeature.js","OpenLayers/Control/Panel.js","OpenLayers/Control/SelectFeature.js","OpenLayers/Control/NavigationHistory.js","OpenLayers/Control/Measure.js","OpenLayers/Control/WMSGetFeatureInfo.js","OpenLayers/Control/Graticule.js","OpenLayers/Control/TransformFeature.js","OpenLayers/Geometry.js","OpenLayers/Geometry/Rectangle.js","OpenLayers/Geometry/Collection.js","OpenLayers/Geometry/Point.js","OpenLayers/Geometry/MultiPoint.js","OpenLayers/Geometry/Curve.js","OpenLayers/Geometry/LineString.js","OpenLayers/Geometry/LinearRing.js","OpenLayers/Geometry/Polygon.js","OpenLayers/Geometry/MultiLineString.js","OpenLayers/Geometry/MultiPolygon.js","OpenLayers/Geometry/Surface.js","OpenLayers/Renderer.js","OpenLayers/Renderer/Elements.js","OpenLayers/Renderer/SVG.js","OpenLayers/Renderer/Canvas.js","OpenLayers/Renderer/VML.js","OpenLayers/Layer/Vector.js","OpenLayers/Layer/Vector/RootContainer.js","OpenLayers/Strategy.js","OpenLayers/Strategy/Fixed.js","OpenLayers/Strategy/Cluster.js","OpenLayers/Strategy/Paging.js","OpenLayers/Strategy/BBOX.js","OpenLayers/Strategy/Save.js","OpenLayers/Strategy/Refresh.js","OpenLayers/Filter.js","OpenLayers/Filter/FeatureId.js","OpenLayers/Filter/Logical.js","OpenLayers/Filter/Comparison.js","OpenLayers/Filter/Spatial.js","OpenLayers/Protocol.js","OpenLayers/Protocol/HTTP.js","OpenLayers/Protocol/SQL.js","OpenLayers/Protocol/SQL/Gears.js","OpenLayers/Protocol/WFS.js","OpenLayers/Protocol/WFS/v1.js","OpenLayers/Protocol/WFS/v1_0_0.js","OpenLayers/Protocol/WFS/v1_1_0.js","OpenLayers/Protocol/SOS.js","OpenLayers/Protocol/SOS/v1_0_0.js","OpenLayers/Layer/PointTrack.js","OpenLayers/Layer/GML.js","OpenLayers/Style.js","OpenLayers/StyleMap.js","OpenLayers/Rule.js","OpenLayers/Format.js","OpenLayers/Format/XML.js","OpenLayers/Format/ArcXML.js","OpenLayers/Format/ArcXML/Features.js","OpenLayers/Format/GML.js","OpenLayers/Format/GML/Base.js","OpenLayers/Format/GML/v2.js","OpenLayers/Format/GML/v3.js","OpenLayers/Format/Atom.js","OpenLayers/Format/KML.js","OpenLayers/Format/GeoRSS.js","OpenLayers/Format/WFS.js","OpenLayers/Format/WFSCapabilities.js","OpenLayers/Format/WFSCapabilities/v1.js","OpenLayers/Format/WFSCapabilities/v1_0_0.js","OpenLayers/Format/WFSCapabilities/v1_1_0.js","OpenLayers/Format/WFSDescribeFeatureType.js","OpenLayers/Format/WMSDescribeLayer.js","OpenLayers/Format/WMSDescribeLayer/v1_1.js","OpenLayers/Format/WKT.js","OpenLayers/Format/OSM.js","OpenLayers/Format/GPX.js","OpenLayers/Format/Filter.js","OpenLayers/Format/Filter/v1.js","OpenLayers/Format/Filter/v1_0_0.js","OpenLayers/Format/Filter/v1_1_0.js","OpenLayers/Format/SLD.js","OpenLayers/Format/SLD/v1.js","OpenLayers/Format/SLD/v1_0_0.js","OpenLayers/Format/CSWGetDomain.js","OpenLayers/Format/CSWGetDomain/v2_0_2.js","OpenLayers/Format/CSWGetRecords.js","OpenLayers/Format/CSWGetRecords/v2_0_2.js","OpenLayers/Format/WFST.js","OpenLayers/Format/WFST/v1.js","OpenLayers/Format/WFST/v1_0_0.js","OpenLayers/Format/WFST/v1_1_0.js","OpenLayers/Format/Text.js","OpenLayers/Format/JSON.js","OpenLayers/Format/GeoJSON.js","OpenLayers/Format/WMC.js","OpenLayers/Format/WMC/v1.js","OpenLayers/Format/WMC/v1_0_0.js","OpenLayers/Format/WMC/v1_1_0.js","OpenLayers/Format/WMSCapabilities.js","OpenLayers/Format/WMSCapabilities/v1.js","OpenLayers/Format/WMSCapabilities/v1_1.js","OpenLayers/Format/WMSCapabilities/v1_1_0.js","OpenLayers/Format/WMSCapabilities/v1_1_1.js","OpenLayers/Format/WMSCapabilities/v1_3.js","OpenLayers/Format/WMSCapabilities/v1_3_0.js","OpenLayers/Format/WMSGetFeatureInfo.js","OpenLayers/Format/OWSCommon/v1_1_0.js","OpenLayers/Format/SOSCapabilities.js","OpenLayers/Format/SOSCapabilities/v1_0_0.js","OpenLayers/Format/SOSGetObservation.js","OpenLayers/Format/SOSGetFeatureOfInterest.js","OpenLayers/Layer/WFS.js","OpenLayers/Control/GetFeature.js","OpenLayers/Control/MouseToolbar.js","OpenLayers/Control/NavToolbar.js","OpenLayers/Control/PanPanel.js","OpenLayers/Control/Pan.js","OpenLayers/Control/ZoomIn.js","OpenLayers/Control/ZoomOut.js","OpenLayers/Control/ZoomPanel.js","OpenLayers/Control/EditingToolbar.js","OpenLayers/Lang.js","OpenLayers/Lang/en.js");var agent=navigator.userAgent;var docWrite=(agent.match("MSIE")||agent.match("Safari"));if(docWrite){var allScriptTags=new Array(jsfiles.length);} var host=OpenLayers._getScriptLocation()+"lib/";for(var i=0,len=jsfiles.length;i<len;i++){if(docWrite){allScriptTags[i]="<script src='"+host+jsfiles[i]+"'></script>";}else{var s=document.createElement("script");s.src=host+jsfiles[i];var h=document.getElementsByTagName("head").length?document.getElementsByTagName("head")[0]:document.body;h.appendChild(s);}} -if(docWrite){document.write(allScriptTags.join(""));}}})();OpenLayers.VERSION_NUMBER="OpenLayers 2.9.1 -- $Revision: 10129 $";OpenLayers.String={startsWith:function(str,sub){return(str.indexOf(sub)==0);},contains:function(str,sub){return(str.indexOf(sub)!=-1);},trim:function(str){return str.replace(/^\s\s*/,'').replace(/\s\s*$/,'');},camelize:function(str){var oStringList=str.split('-');var camelizedString=oStringList[0];for(var i=1,len=oStringList.length;i<len;i++){var s=oStringList[i];camelizedString+=s.charAt(0).toUpperCase()+s.substring(1);} +if(docWrite){document.write(allScriptTags.join(""));}}})();OpenLayers.VERSION_NUMBER="OpenLayers 2.9.1 -- $Revision$";OpenLayers.String={startsWith:function(str,sub){return(str.indexOf(sub)==0);},contains:function(str,sub){return(str.indexOf(sub)!=-1);},trim:function(str){return str.replace(/^\s\s*/,'').replace(/\s\s*$/,'');},camelize:function(str){var oStringList=str.split('-');var camelizedString=oStringList[0];for(var i=1,len=oStringList.length;i<len;i++){var s=oStringList[i];camelizedString+=s.charAt(0).toUpperCase()+s.substring(1);} return camelizedString;},format:function(template,context,args){if(!context){context=window;} var replacer=function(str,match){var replacement;var subs=match.split(/\.+/);for(var i=0;i<subs.length;i++){if(i==0){replacement=context;} replacement=replacement[subs[i]];} Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/OpenLayers.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/blank.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/cloud-popup-relative.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/drag-rectangle-off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/drag-rectangle-on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/east-mini.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/layer-switcher-maximize.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/layer-switcher-minimize.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/marker-blue.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/marker-gold.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/marker-green.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/marker.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/measuring-stick-off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/measuring-stick-on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/north-mini.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/panning-hand-off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/panning-hand-on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/slider.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/south-mini.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/west-mini.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/zoom-minus-mini.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/zoom-plus-mini.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/zoom-world-mini.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/img/zoombar.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/license.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/news.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/readme.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/release-license.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/repository-license.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/framedCloud.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/google.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/ie6-style.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/add_point_off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/add_point_on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/blank.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/close.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/drag-rectangle-off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/drag-rectangle-on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_line_off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_line_on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_point_off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_point_on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_polygon_off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/draw_polygon_on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/editing_tool_bar.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/move_feature_off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/move_feature_on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/navigation_history.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/overview_replacement.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/pan-panel-NOALPHA.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/pan-panel.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/pan_off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/pan_on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/panning-hand-off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/panning-hand-on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/remove_point_off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/remove_point_on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/ruler.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/save_features_off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/save_features_on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/view_next_off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/view_next_on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/view_previous_off.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/view_previous_on.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/zoom-panel-NOALPHA.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/img/zoom-panel.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/style.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/administration.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/cartography.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/contacts.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/js/news.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

[Suiviobsmer-commits] r808 - in trunk: src/license wao-business/src/license wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/xmi wao-business/src/test/resources wao-business/src/test/resources/import wao-ui/src/license wao-ui/src/main/assembly wao-ui/src/test/resources
by tchemit＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: tchemit Date: 2010-11-26 15:59:59 +0000 (Fri, 26 Nov 2010) New Revision: 808 Log: add headers migrate third-party files Modified: trunk/src/license/project.xml trunk/wao-business/src/license/THIRD-PARTY.properties trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java trunk/wao-business/src/main/xmi/wao.properties trunk/wao-business/src/test/resources/WaoTest.properties trunk/wao-business/src/test/resources/import/boat_districts.kml trunk/wao-business/src/test/resources/log4j.properties trunk/wao-ui/src/license/THIRD-PARTY.properties trunk/wao-ui/src/main/assembly/Wao.properties trunk/wao-ui/src/main/assembly/bin.xml trunk/wao-ui/src/test/resources/log4j.properties Modified: trunk/src/license/project.xml =================================================================== --- trunk/src/license/project.xml 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/src/license/project.xml 2010-11-26 15:59:59 UTC (rev 808) @@ -1,4 +1,28 @@ <?xml version='1.0' encoding='UTF-8'?> + + <project xmlns="http://maven-site.nuiton.org/maven-license-plugin/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven-site.nuiton.org/maven-license-plugin/1.0.0 http://maven-site.nuiton.org/maven-license-plugin/licenseProjectDescriptor-…"> Modified: trunk/wao-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-business/src/license/THIRD-PARTY.properties 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-business/src/license/THIRD-PARTY.properties 2010-11-26 15:59:59 UTC (rev 808) @@ -1,7 +1,6 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - BSD # - BSD License # - BSD license # - BSD style @@ -22,12 +21,12 @@ # Please fill the missing licenses for dependencies : # # -#Sun Jul 11 22:47:24 CEST 2010 -antlr--antlr--2.7.6=BSD -com.sun.xml.bind--jaxb-impl--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 -com.sun.xml.bind--jaxb-xjc--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 -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=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.xml.bind--jaxb-api--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +#Fri Nov 26 17:04:07 CET 2010 +antlr--antlr--2.7.6--jar=BSD +com.sun.xml.bind--jaxb-impl--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +com.sun.xml.bind--jaxb-xjc--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1--jar=BSD +javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javax.xml.bind--jaxb-api--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java 2010-11-26 15:59:59 UTC (rev 808) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.entity; import static org.nuiton.i18n.I18n._; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java 2010-11-26 15:59:59 UTC (rev 808) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.entity; import static org.nuiton.i18n.I18n._; Modified: trunk/wao-business/src/main/xmi/wao.properties =================================================================== --- trunk/wao-business/src/main/xmi/wao.properties 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-business/src/main/xmi/wao.properties 2010-11-26 15:59:59 UTC (rev 808) @@ -1,3 +1,26 @@ +### +# #%L +# Wao :: Business +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### model.tagvalue.copyright=/* *##%\n Copyright (C) 2009 Wao\n *##%*/ model.tagvalue.java.lang.String=text model.tagvalue.exceptionClass=fr.ifremer.wao.WaoException Modified: trunk/wao-business/src/test/resources/WaoTest.properties =================================================================== --- trunk/wao-business/src/test/resources/WaoTest.properties 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-business/src/test/resources/WaoTest.properties 2010-11-26 15:59:59 UTC (rev 808) @@ -1,3 +1,26 @@ +### +# #%L +# Wao :: Business +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### hibernate.hbm2ddl.auto=update hibernate.show_sql=false Modified: trunk/wao-business/src/test/resources/import/boat_districts.kml =================================================================== --- trunk/wao-business/src/test/resources/import/boat_districts.kml 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-business/src/test/resources/import/boat_districts.kml 2010-11-26 15:59:59 UTC (rev 808) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="utf-8" ?> + + <kml xmlns="http://www.opengis.net/kml/2.2"> <Document> <Folder> Modified: trunk/wao-business/src/test/resources/log4j.properties =================================================================== --- trunk/wao-business/src/test/resources/log4j.properties 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-business/src/test/resources/log4j.properties 2010-11-26 15:59:59 UTC (rev 808) @@ -1,3 +1,26 @@ +### +# #%L +# Wao :: Business +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### # Default to info level output; this is very handy if you eventually use Hibernate as well. log4j.rootCategory=warn, A1 Modified: trunk/wao-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-ui/src/license/THIRD-PARTY.properties 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-ui/src/license/THIRD-PARTY.properties 2010-11-26 15:59:59 UTC (rev 808) @@ -17,6 +17,7 @@ # - GNU Lesser General Public License version 2.1 # - GNU Library or Lesser General Public License # - GPL, LGPL, MPL +# - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 # - MIT License # - Public Domain @@ -30,17 +31,17 @@ # Please fill the missing licenses for dependencies : # # -#Mon Oct 11 17:34:56 CEST 2010 -antlr--antlr--2.7.6=BSD -com.formos.tapestry--tapestry-testify--1.0.2=The Apache Software License, Version 2.0 -com.sun.xml.bind--jaxb-impl--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 -com.sun.xml.bind--jaxb-xjc--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 -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.8.0.GA=Lesser General Public License (LGPL) v 2.1 -javassist--javassist--3.9.0.GA=Lesser General Public License (LGPL) v 2.1 -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.xml.bind--jaxb-api--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 -ognl--ognl--2.7.3=The OpenSymphony Software License, Version 1.1 -org.antlr--antlr-runtime--3.1.1=BSD +#Fri Nov 26 17:05:56 CET 2010 +antlr--antlr--2.7.6--jar=BSD +com.formos.tapestry--tapestry-testify--1.0.2--jar=The Apache Software License, Version 2.0 +com.sun.xml.bind--jaxb-impl--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +com.sun.xml.bind--jaxb-xjc--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +commons-beanutils--commons-beanutils-core--1.7.0--jar=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1--jar=BSD +javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +javassist--javassist--3.9.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javax.xml.bind--jaxb-api--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 +ognl--ognl--2.7.3--jar=The OpenSymphony Software License, Version 1.1 +org.antlr--antlr-runtime--3.1.1--jar=BSD Modified: trunk/wao-ui/src/main/assembly/Wao.properties =================================================================== --- trunk/wao-ui/src/main/assembly/Wao.properties 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-ui/src/main/assembly/Wao.properties 2010-11-26 15:59:59 UTC (rev 808) @@ -1,2 +1,25 @@ +### +# #%L +# Wao :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### hibernate.hbm2ddl.auto=update Modified: trunk/wao-ui/src/main/assembly/bin.xml =================================================================== --- trunk/wao-ui/src/main/assembly/bin.xml 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-ui/src/main/assembly/bin.xml 2010-11-26 15:59:59 UTC (rev 808) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.1.xsd"> <id>bin</id> Modified: trunk/wao-ui/src/test/resources/log4j.properties =================================================================== --- trunk/wao-ui/src/test/resources/log4j.properties 2010-11-26 15:53:18 UTC (rev 807) +++ trunk/wao-ui/src/test/resources/log4j.properties 2010-11-26 15:59:59 UTC (rev 808) @@ -1,3 +1,26 @@ +### +# #%L +# Wao :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### # Default to info level output; this is very handy if you eventually use Hibernate as well. log4j.rootCategory=WARN, console

1 0

[Suiviobsmer-commits] r807 - in trunk: . wao-business wao-ui
by tchemit＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: tchemit Date: 2010-11-26 15:53:18 +0000 (Fri, 26 Nov 2010) New Revision: 807 Log: reformat poms optimize dependencies Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-26 14:35:58 UTC (rev 806) +++ trunk/pom.xml 2010-11-26 15:53:18 UTC (rev 807) @@ -1,469 +1,504 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom4labs</artifactId> - <version>2.4.1</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4labs</artifactId> + <version>2.4.1</version> + </parent> - <groupId>fr.ifremer</groupId> - <artifactId>wao</artifactId> - <version>1.6-SNAPSHOT</version> + <groupId>fr.ifremer</groupId> + <artifactId>wao</artifactId> + <version>1.6-SNAPSHOT</version> - <modules> - <module>wao-ui</module> - <module>wao-business</module> - </modules> + <modules> + <module>wao-ui</module> + <module>wao-business</module> + </modules> - <dependencyManagement> - <dependencies> + <dependencyManagement> + <dependencies> -  - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-email</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-tapestry-extra</artifactId> - <version>${nuitonWebVersion}</version> - </dependency> -  - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topiaVersion}</version> - </dependency> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-migration</artifactId> - <version>${topiaVersion}</version> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-core</artifactId> - <version>${tapestryVersion}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>jboss</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-upload</artifactId> - <version>${tapestryVersion}</version> - </dependency> - <dependency> - <groupId>com.orientimport</groupId> - <artifactId>t5-easy-fckeditor</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>org.chenillekit</groupId> - <artifactId>chenillekit-tapestry</artifactId> - <version>1.2.0</version> - <exclusions> - <exclusion> - <groupId>jboss</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> - </dependency> - -  - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.5.10</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.10</version> - <scope>runtime</scope> - </dependency> -  - <dependency> - <groupId>jfree</groupId> - <artifactId>jfreechart</artifactId> - <version>1.0.12</version> - </dependency> -  - <dependency> - <groupId>de.micromata.jak</groupId> - <artifactId>JavaAPIforKml</artifactId> - <version>2.2.0</version> - <exclusions> - <exclusion> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-xjc</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-xjc</artifactId> - <version>2.2</version> - </dependency> -  - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.8.1</version> - </dependency> -  -  -  -  -  -  -  -  -  -  -  - <dependency> - <groupId>net.sourceforge.javacsv</groupId> - <artifactId>javacsv</artifactId> - <version>2.0</version> - </dependency> -  - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.2.137</version> - </dependency> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.4-701.jdbc4</version> - </dependency> - <dependency> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <version>0.9.10-hudson-16</version> - <scope>provided</scope> - </dependency> -  - <dependency> - <groupId>com.formos.tapestry</groupId> - <artifactId>tapestry-testify</artifactId> - <version>1.0.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>1.8.4</version> - <scope>test</scope> - </dependency> - </dependencies> - </dependencyManagement> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-email</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-tapestry-extra</artifactId> + <version>${nuitonWebVersion}</version> + </dependency> +  + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-migration</artifactId> + <version>${topiaVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-core</artifactId> + <version>${tapestryVersion}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>jboss</groupId> + <artifactId>javassist</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-ioc</artifactId> + <version>${tapestryVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry5-annotations</artifactId> + <version>${tapestryVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-upload</artifactId> + <version>${tapestryVersion}</version> + </dependency> + <dependency> + <groupId>com.orientimport</groupId> + <artifactId>t5-easy-fckeditor</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>org.chenillekit</groupId> + <artifactId>chenillekit-tapestry</artifactId> + <version>1.2.0</version> + <exclusions> + <exclusion> + <groupId>jboss</groupId> + <artifactId>javassist</artifactId> + </exclusion> + </exclusions> + </dependency> +  +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.10</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.10</version> + <scope>runtime</scope> + </dependency> +  + <dependency> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + <version>${jfreeVersion}</version> + </dependency> + <dependency> + <groupId>jfree</groupId> + <artifactId>jcommon</artifactId> + <version>${jfreeVersion}</version> + </dependency> -  -  -  +  + <dependency> + <groupId>de.micromata.jak</groupId> + <artifactId>JavaAPIforKml</artifactId> + <version>2.2.0</version> + <exclusions> + <exclusion> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-xjc</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-xjc</artifactId> + <version>2.2</version> + </dependency> +  + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.8.1</version> + </dependency> - <name>Wao</name> - <description>Application pour le suivi d'embarquements sur des bateaux de pêches dans le cadre - d'observations scientifiques.</description> - <inceptionYear>2009</inceptionYear> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.3.03</version> + </dependency> - <organization> - <name>Ifremer</name> - <url>http://www.ifremer.fr/</url> - </organization> +  +  +  +  +  +  +  +  +  +  +  + <dependency> + <groupId>net.sourceforge.javacsv</groupId> + <artifactId>javacsv</artifactId> + <version>2.0</version> + </dependency> - <licenses> - <license> - <name>Affero General Public License (AGPL)</name> - <url>${maven.license.file}</url> - <distribution>local</distribution> - </license> - </licenses> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernateVersion}</version> + </dependency> -  - <developers> - <developer> - <id>fdesbois</id> - <name>Florian Desbois</name> - <email>fdesbois at codelutin.com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://www.codelutin.com</organizationUrl> - <timezone>+1</timezone> - <roles> - <role>Chef de Projet</role> - <role>Analyste</role> - <role>Développeur</role> - </roles> - </developer> - <developer> - <name>Tony Chemit</name> - <id>tchemit</id> - <email>chemit at codelutin.com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://www.codelutin.com</organizationUrl> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - <developer> - <name>Brendan Le Ny</name> - <id>bleny</id> - <email>bleny at codelutin.com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://www.codelutin.com</organizationUrl> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - </developers> - - <url>http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer</url> +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.2.137</version> + </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.4-701.jdbc4</version> + </dependency> + <dependency> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <version>0.9.10-hudson-16</version> + <scope>provided</scope> + </dependency> +  + <dependency> + <groupId>com.formos.tapestry</groupId> + <artifactId>tapestry-testify</artifactId> + <version>1.0.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.8.4</version> + <scope>test</scope> + </dependency> + </dependencies> + </dependencyManagement> - <issueManagement> - <system>gforge</system> - <url>https://${platform}/tracker?group_id=${labs.id}</url> - </issueManagement> - -  -  -  +  +  +  - <packaging>pom</packaging> + <name>Wao</name> + <description>Application pour le suivi d'embarquements sur des bateaux de + pêches dans le cadre + d'observations scientifiques. + </description> + <inceptionYear>2009</inceptionYear> - <properties> + <organization> + <name>Ifremer</name> + <url>http://www.ifremer.fr/</url> + </organization> - <projectId>suiviobsmer</projectId> - <license.licenseName>agpl_v3</license.licenseName> - <labs.id>154</labs.id> - -  - <nuitonI18nVersion>1.2.2</nuitonI18nVersion> - <nuitonUtilsVersion>1.4.2</nuitonUtilsVersion> - <nuitonWebVersion>0.1</nuitonWebVersion> - <topiaVersion>2.4.3</topiaVersion> - <eugeneVersion>2.2</eugeneVersion> - <tapestryVersion>5.1.0.5</tapestryVersion> + <licenses> + <license> + <name>Affero General Public License (AGPL)</name> + <url>${maven.license.file}</url> + <distribution>local</distribution> + </license> + </licenses> - </properties> +  + <developers> + <developer> + <id>fdesbois</id> + <name>Florian Desbois</name> + <email>fdesbois at codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>+1</timezone> + <roles> + <role>Chef de Projet</role> + <role>Analyste</role> + <role>Développeur</role> + </roles> + </developer> + <developer> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit at codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>+2</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + <developer> + <name>Brendan Le Ny</name> + <id>bleny</id> + <email>bleny at codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> -  -  -  + <url>http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer</url> - <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> - </scm> - - <build> - + <issueManagement> + <system>gforge</system> + <url>https://${platform}/tracker?group_id=${labs.id}</url> + </issueManagement> - <pluginManagement> - <plugins> +  +  +  -  - <plugin> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrstPluginVersion}</version> - </dependency> - </dependencies> - </plugin> + <packaging>pom</packaging> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <version>${eugeneVersion}</version> - <configuration> - <inputs>zargo</inputs> - <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> - </configuration> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topiaVersion}</version> - </dependency> - </dependencies> - </plugin> + <properties> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>${nuitonI18nVersion}</version> - </plugin> + <projectId>suiviobsmer</projectId> + <license.licenseName>agpl_v3</license.licenseName> + <labs.id>154</labs.id> - </plugins> - </pluginManagement> +  + <nuitonI18nVersion>1.2.2</nuitonI18nVersion> + <nuitonUtilsVersion>1.4.2</nuitonUtilsVersion> + <nuitonWebVersion>0.1</nuitonWebVersion> + <topiaVersion>2.4.3</topiaVersion> + <eugeneVersion>2.2</eugeneVersion> + <tapestryVersion>5.1.0.5</tapestryVersion> + <hibernateVersion>3.3.2.GA</hibernateVersion> - </build> + <jfreeVersion>1.0.12</jfreeVersion> -  - <reporting> - <excludeDefaults>true</excludeDefaults> - </reporting> + </properties> -  -  -  +  +  +  -  - <mailingLists> + <scm> + <connection> + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + </connection> + <developerConnection> + scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + </developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer + </url> + </scm> - <mailingList> - <name>${projectId}-devel</name> - <subscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-devel</subscribe> - <unsubscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-devel</unsubscribe> - <post>${projectId}-devel(a)${labs.list.host}</post> - <archive>http://${labs.list.host}/pipermail/${projectId}-devel/</archive> - </mailingList> + <build> +  - </mailingLists> + <pluginManagement> + <plugins> -  +  + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrstPluginVersion}</version> + </dependency> + </dependencies> + </plugin> -  + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${eugeneVersion}</version> + <configuration> + <inputs>zargo</inputs> + <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> + </configuration> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + </dependency> + </dependencies> + </plugin> -  -  -  -  -  -  -  -  -  -  -  -  + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${nuitonI18nVersion}</version> + </plugin> -  + </plugins> + </pluginManagement> -  -  -  -  -  -  -  -  -  -  -  -  + </build> -  +  + <reporting> + <excludeDefaults>true</excludeDefaults> + </reporting> -  +  +  +  -  +  + <mailingLists> -  + <mailingList> + <name>${projectId}-devel</name> + <subscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-devel + </subscribe> + <unsubscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-devel + </unsubscribe> + <post>${projectId}-devel(a)${labs.list.host}</post> + <archive>http://${labs.list.host}/pipermail/${projectId}-devel/</archive> + </mailingList> -  -  -  -  -  -  -  -  -  -  -  + </mailingLists> -  +  -  -  -  -  -  -  -  -  -  -  -  -  +  -  +  +  +  +  +  +  +  +  +  +  +  +  +  + +  +  +  +  +  +  +  +  +  +  +  +  + +  + +  + +  + +  + +  +  +  +  +  +  +  +  +  +  +  + +  + +  +  +  +  +  +  +  +  +  +  +  +  + +  + </project> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-11-26 14:35:58 UTC (rev 806) +++ trunk/wao-business/pom.xml 2010-11-26 15:53:18 UTC (rev 807) @@ -1,225 +1,257 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>fr.ifremer</groupId> - <artifactId>wao</artifactId> - <version>1.6-SNAPSHOT</version> - </parent> + <parent> + <groupId>fr.ifremer</groupId> + <artifactId>wao</artifactId> + <version>1.6-SNAPSHOT</version> + </parent> - <groupId>fr.ifremer.wao</groupId> - <artifactId>wao-business</artifactId> + <groupId>fr.ifremer.wao</groupId> + <artifactId>wao-business</artifactId> - <dependencies> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-email</artifactId> - </dependency> -  - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> -  - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> -  - <dependency> - <groupId>net.sourceforge.javacsv</groupId> - <artifactId>javacsv</artifactId> - </dependency> -  - <dependency> - <groupId>de.micromata.jak</groupId> - <artifactId>JavaAPIforKml</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-xjc</artifactId> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </dependency> -  -  -  -  -  -  -  -  -  - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-migration</artifactId> - </dependency> -  - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - </dependency> -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-email</artifactId> + </dependency> + +  + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> +  + <dependency> + <groupId>net.sourceforge.javacsv</groupId> + <artifactId>javacsv</artifactId> + </dependency> +  + <dependency> + <groupId>de.micromata.jak</groupId> + <artifactId>JavaAPIforKml</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-xjc</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </dependency> +  +  +  +  +  +  +  +  +  + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-migration</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>test</scope> + </dependency> +  +  +  +  +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + </dependency> + </dependencies> -  -  -  +  +  +  - <name>Wao :: Business</name> - <description>Métier de l'application Wao</description> + <name>Wao :: Business</name> + <description>Métier de l'application Wao</description> -  -  -  +  +  +  - <packaging>jar</packaging> + <packaging>jar</packaging> -  -  -  +  +  +  - <build> -  - <resources> - <resource> - <directory>src/main/filters</directory> - <filtering>true</filtering> - <includes> - <include>Wao.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <includes> - <include>**/*</include> - </includes> - </resource> + <build> +  + <resources> + <resource> + <directory>src/main/filters</directory> + <filtering>true</filtering> + <includes> + <include>Wao.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <includes> + <include>**/*</include> + </includes> + </resource> - </resources> - <plugins> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <executions> - <execution> - <id>generate-entities</id> - <phase>generate-sources</phase> -  - <configuration> -  - <fullPackagePath>fr.ifremer.wao</fullPackagePath> -  - <defaultPackage>fr.ifremer.wao</defaultPackage> - <templates> - org.nuiton.topia.generator.TopiaMetaTransformer, - org.nuiton.eugene.java.JavaBeanTransformer, - org.nuiton.topia.generator.ServiceTransformer, - org.nuiton.eugene.java.JavaInterfaceTransformer, - org.nuiton.topia.generator.BinderHelperTransformer, - org.nuiton.topia.generator.QueryHelperTransformer - </templates> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <configuration> - <entries> - <entry> - <basedir>${maven.gen.dir}/java</basedir> - </entry> - </entries> - </configuration> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - <execution> - <id>make-bundle</id> - <configuration> - <bundleOutputName>wao-business</bundleOutputName> - </configuration> - <goals> - <goal>bundle</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + </resources> + <plugins> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <executions> + <execution> + <id>generate-entities</id> + <phase>generate-sources</phase> +  + <configuration> +  + <fullPackagePath>fr.ifremer.wao</fullPackagePath> +  + <defaultPackage>fr.ifremer.wao</defaultPackage> + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer, + org.nuiton.eugene.java.JavaBeanTransformer, + org.nuiton.topia.generator.ServiceTransformer, + org.nuiton.eugene.java.JavaInterfaceTransformer, + org.nuiton.topia.generator.BinderHelperTransformer, + org.nuiton.topia.generator.QueryHelperTransformer + </templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <configuration> + <entries> + <entry> + <basedir>${maven.gen.dir}/java</basedir> + </entry> + </entries> + </configuration> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + <execution> + <id>make-bundle</id> + <configuration> + <bundleOutputName>wao-business</bundleOutputName> + </configuration> + <goals> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> - <scm> - <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://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> - </scm> + <scm> + <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://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business + </developerConnection> + </scm> -  -  -  -  -  -  -  -  -  -  -  +  +  +  +  +  +  +  +  +  +  +  </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-11-26 14:35:58 UTC (rev 806) +++ trunk/wao-ui/pom.xml 2010-11-26 15:53:18 UTC (rev 807) @@ -1,235 +1,285 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>fr.ifremer</groupId> - <artifactId>wao</artifactId> - <version>1.6-SNAPSHOT</version> - </parent> + <parent> + <groupId>fr.ifremer</groupId> + <artifactId>wao</artifactId> + <version>1.6-SNAPSHOT</version> + </parent> - <groupId>fr.ifremer.wao</groupId> - <artifactId>wao-ui</artifactId> + <groupId>fr.ifremer.wao</groupId> + <artifactId>wao-ui</artifactId> - <dependencies> -  - <dependency> - <groupId>fr.ifremer.wao</groupId> - <artifactId>wao-business</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> -  - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-tapestry-extra</artifactId> - </dependency> -  - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-upload</artifactId> - </dependency> - <dependency> - <groupId>org.chenillekit</groupId> - <artifactId>chenillekit-tapestry</artifactId> - </dependency> - <dependency> - <groupId>com.orientimport</groupId> - <artifactId>t5-easy-fckeditor</artifactId> - </dependency> -  - <dependency> - <groupId>jfree</groupId> - <artifactId>jfreechart</artifactId> - </dependency> -  - - <dependency> - <groupId>com.formos.tapestry</groupId> - <artifactId>tapestry-testify</artifactId> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.7</version> - </dependency> -  - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> -  - <dependency> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> + <dependencies> +  + <dependency> + <groupId>fr.ifremer.wao</groupId> + <artifactId>wao-business</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> +  + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-tapestry-extra</artifactId> + <scope>runtime</scope> + </dependency> +  + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-ioc</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry5-annotations</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-upload</artifactId> + </dependency> + <dependency> + <groupId>org.chenillekit</groupId> + <artifactId>chenillekit-tapestry</artifactId> + </dependency> + <dependency> + <groupId>com.orientimport</groupId> + <artifactId>t5-easy-fckeditor</artifactId> + <scope>runtime</scope> + </dependency> +  + <dependency> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + </dependency> + <dependency> + <groupId>jfree</groupId> + <artifactId>jcommon</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-xjc</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <scope>runtime</scope> + </dependency> +  +  + <dependency> + <groupId>com.formos.tapestry</groupId> + <artifactId>tapestry-testify</artifactId> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> +  + <dependency> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> -  -  -  - <name>Wao :: Web Interface</name> - <description>Interface utilisateur du Wao</description> +  +  +  -  -  -  + <name>Wao :: Web Interface</name> + <description>Interface utilisateur du Wao</description> - <packaging>war</packaging> +  +  +  -  -  -  - <build> -  -  + <packaging>war</packaging> -  +  +  +  + <build> +  +  + +  + <plugins> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>tapestry-bundle</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>org.nuiton.util.war.WinstoneLauncher</mainClass> + </manifest> + </archive> + <overlays> + <overlay> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <type>jar</type> + <includes> + <include>**/war/Winstone*</include> + </includes> + </overlay> + <overlay> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <type>jar</type> + </overlay> + </overlays> + </configuration> + </plugin> + +  + + </plugins> + </build> + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> <plugins> - - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>tapestry-bundle</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass>org.nuiton.util.war.WinstoneLauncher</mainClass> - </manifest> - </archive> - <overlays> - <overlay> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <type>jar</type> - <includes> - <include>**/war/Winstone*</include> - </includes> - </overlay> - <overlay> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <type>jar</type> - </overlay> - </overlays> - </configuration> - </plugin> - - - + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <finalName>wao-${project.version}</finalName> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> - </build> - <profiles> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <finalName>wao-${project.version}</finalName> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - <attach>false</attach> - </configuration> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - <repositories> + </build> + </profile> + </profiles> -  - <repository> - <id>m2-release-repository.orientimport.kenai.com</id> - <name>Orient Import Oy Maven Release Repository</name> - <url>http://kenai.com/svn/t5-easy-fckeditor~maven-release-repository</url> - <layout>default</layout> - </repository> + <repositories> - <repository> - <id>tapestry</id> - <name>Tapestry Formos</name> - <url>http://tapestry.formos.com/maven-repository</url> - </repository> - - </repositories> - - <scm> - <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://tchemit at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> - </scm> +  + <repository> + <id>m2-release-repository.orientimport.kenai.com</id> + <name>Orient Import Oy Maven Release Repository</name> + <url>http://kenai.com/svn/t5-easy-fckeditor~maven-release-repository</url> + <layout>default</layout> + </repository> + <repository> + <id>tapestry</id> + <name>Tapestry Formos</name> + <url>http://tapestry.formos.com/maven-repository</url> + </repository> + + </repositories> + + <scm> + <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://tchemit at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui + </developerConnection> + </scm> + </project>

1 0

[Suiviobsmer-commits] r806 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base
by bleny＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: bleny Date: 2010-11-26 14:35:58 +0000 (Fri, 26 Nov 2010) New Revision: 806 Log: bug fix Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-26 14:14:35 UTC (rev 805) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-26 14:35:58 UTC (rev 806) @@ -147,20 +147,24 @@ public void onSelectedFromAddSampleRowCode() { + if (sampleRowId != null) { - List<SampleRow> rows = getFilter().getSampleRows(); - if (rows == null) { - rows = new ArrayList<SampleRow>(); - getFilter().setSampleRows(rows); + List<SampleRow> rows = getFilter().getSampleRows(); + if (rows == null) { + rows = new ArrayList<SampleRow>(); + getFilter().setSampleRows(rows); + } + rows.add(getSampleRowSelectModel().findObject(sampleRowId)); + + edited = true; } - rows.add(getSampleRowSelectModel().findObject(sampleRowId)); - - edited = true; } public void onSelectedFromRemoveSampleRowCode() { - getFilter().getSampleRows().remove(getSampleRowSelectModel().findObject(sampleRowId)); - edited = true; + if (sampleRowId != null) { + getFilter().getSampleRows().remove(getSampleRowSelectModel().findObject(sampleRowId)); + edited = true; + } } /**

1 0

26 Nov '10

Author: bleny Date: 2010-11-26 14:14:35 +0000 (Fri, 26 Nov 2010) New Revision: 805 Log: add property prefix in entities ; changelog Modified: trunk/changelog.txt trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.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/ServiceNewsImpl.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-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties trunk/wao-business/src/main/xmi/wao.properties trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/changelog.txt 2010-11-26 14:14:35 UTC (rev 805) @@ -3,6 +3,19 @@ Historique des versions +1.6 +--- + +Evolution ++++++++++ + +- [bleny] Evo #2562 : ajout de la synthèse globale +- [bleny] Evo #2561 : factorisation des filtres de la synthèse +- [bleny] Evo #2556 : ajout du critère qualité de la donnée +- [bleny] Evo #2563 : mise en valeur des lignes modifiées dans le plan d'échantillonage +- [bleny] Evo #2365 : Amélioration cartographie des contacts +- [bleny] Evo #2353 : Décomposition code métier DCF + 1.5.4 ----- Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-26 14:14:35 UTC (rev 805) @@ -570,7 +570,7 @@ filter.setPeriod(period); if (filter.isSortedByBoardingDate()) { - query.addOrder(contactProperty.$property(Contact.TIDE_BEGIN_DATE + " DESC")); + query.addOrder(contactProperty.$property(Contact.PROPERTY_TIDE_BEGIN_DATE + " DESC")); } // ORDER_BY 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-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-11-26 14:14:35 UTC (rev 805) @@ -255,8 +255,8 @@ period.initDayOfMonthExtremities(); // Bind sampleMonth.sampleRow with contact sampleRow - query.addEquals(SampleMonth.SAMPLE_ROW, sampleRow). - addBetween(SampleMonth.PERIOD_DATE, period.getFromDate(), period.getThruDate()); + query.addEquals(SampleMonth.PROPERTY_SAMPLE_ROW, sampleRow). + addBetween(SampleMonth.PROPERTY_PERIOD_DATE, period.getFromDate(), period.getThruDate()); //add(SampleMonth.PERIOD_DATE, period); SampleMonth result = monthDAO.findByQuery(query); if (result == null) { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -72,7 +72,7 @@ dao.createQueryDoneContactsFromDate(getBoat(), fromDate); String companyProperty = - TopiaQuery.getProperty(query.getMainAlias(), Contact.OBSERVER, WaoUser.COMPANY); + TopiaQuery.getProperty(query.getMainAlias(), Contact.PROPERTY_OBSERVER, WaoUser.PROPERTY_COMPANY); query.addEquals(companyProperty, getCompany()); 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-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java 2010-11-26 14:14:35 UTC (rev 805) @@ -98,7 +98,7 @@ throw new ImportRefusedException( "Etat du contact invalide '" + state + "', " + "valeurs possibles : " + - ContactState.availableStates(), rowNumber, STATE); + ContactState.availableStates(), rowNumber, PROPERTY_STATE); } setContactState(contactState); } @@ -117,7 +117,7 @@ WaoUser user = userDAO.findByLogin(observerLogin); if (user == null) { throw new ImportRefusedException("Utilisateur inexistant avec " + - "l'identifiant : " + observerLogin, rowNumber, OBSERVER); + "l'identifiant : " + observerLogin, rowNumber, PROPERTY_OBSERVER); } setObserver(user); } @@ -145,7 +145,7 @@ "L'observateur avec pour login '" + observer.getLogin() + "' n'appartient pas à votre société !", rowNumber, - WaoUser.COMPANY); + WaoUser.PROPERTY_COMPANY); } } } @@ -179,12 +179,12 @@ } SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction); SampleRow rowFound = dao.findByProperties( - SampleRow.CODE, sampleRowCode, - SampleRow.COMPANY, company); + SampleRow.PROPERTY_CODE, sampleRowCode, + SampleRow.PROPERTY_COMPANY, company); if(rowFound == null) { throw new ImportRefusedException("Ligne d'échantillon inexistante" + " ou incompatible avec la société pour le code : " + - sampleRowCode, rowNumber, SAMPLE_ROW); + sampleRowCode, rowNumber, PROPERTY_SAMPLE_ROW); } setSampleRow(rowFound); } @@ -203,7 +203,7 @@ if(boatFound == null) { throw new ImportRefusedException("Navire inexistant avec" + " l'immatriculation : " + boatImmatriculation, - rowNumber, BOAT); + rowNumber, PROPERTY_BOAT); } setBoat(boatFound); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java 2010-11-26 14:14:35 UTC (rev 805) @@ -197,8 +197,8 @@ if (calendar == null) { calendar = calendarDAO.findByProperties( - ActivityCalendar.BOAT, boat, - ActivityCalendar.YEAR, year); + ActivityCalendar.PROPERTY_BOAT, boat, + ActivityCalendar.PROPERTY_YEAR, year); // Create it if not exist in Database if (calendar == null) { @@ -207,9 +207,9 @@ int fiability = ImportHelper.readInt(reader, ACTIVITY_CALENDAR.INDQ_COD); calendar = calendarDAO.create( - ActivityCalendar.BOAT, key.boat(), - ActivityCalendar.YEAR, key.year(), - ActivityCalendar.FIABILITY, fiability); + ActivityCalendar.PROPERTY_BOAT, key.boat(), + ActivityCalendar.PROPERTY_YEAR, key.year(), + ActivityCalendar.PROPERTY_FIABILITY, fiability); calendar.setActivityMonth(new ArrayList<ActivityMonth>()); } @@ -231,8 +231,8 @@ if (month == null) { month = monthDAO.create( - ActivityMonth.ACTIVITY_CALENDAR, calendar, - ActivityMonth.MONTH, monthNum); + ActivityMonth.PROPERTY_ACTIVITY_CALENDAR, calendar, + ActivityMonth.PROPERTY_MONTH, monthNum); month.setActivityProfession(new ArrayList<ActivityProfession>()); @@ -268,8 +268,8 @@ if (profession == null) { profession = professionDAO.create( - ActivityProfession.ACTIVITY_MONTH, month, - ActivityProfession.PROFESSION_ORDER, professionOrder); + ActivityProfession.PROPERTY_ACTIVITY_MONTH, month, + ActivityProfession.PROPERTY_PROFESSION_ORDER, professionOrder); profession.setActivityZone(new ArrayList<ActivityZone>()); @@ -290,8 +290,8 @@ if (zone == null) { zone = zoneDAO.create( - ActivityZone.ZONE_CODE, zoneCode, - ActivityZone.ACTIVITY_PROFESSION, profession); + ActivityZone.PROPERTY_ZONE_CODE, zoneCode, + ActivityZone.PROPERTY_ACTIVITY_PROFESSION, profession); profession.addActivityZone(zone); } 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-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -131,14 +131,14 @@ TopiaQuery query = builder.applyBoatFilter(filter); - query.addLoad(Boat.ACTIVITY_CALENDAR); + query.addLoad(Boat.PROPERTY_ACTIVITY_CALENDAR); if (logger.isDebugEnabled()) { logger.debug("Query : " + query); } Map<Integer, Boat> results = dao.findAllMappedByQuery(query, - Boat.IMMATRICULATION, Integer.class); + Boat.PROPERTY_IMMATRICULATION, Integer.class); return results; } @@ -196,7 +196,7 @@ BoatInfosDAO boatInfosDAO = WaoDAOHelper.getBoatInfosDAO(transaction); BoatInfos boatInfos = boatInfosDAO.findByProperties( - BoatInfos.BOAT, boat, BoatInfos.COMPANY, company); + BoatInfos.PROPERTY_BOAT, boat, BoatInfos.PROPERTY_COMPANY, company); if (boatInfos == null) { boatInfos = new BoatInfosImpl(); boatInfos.setBoat(boat); @@ -229,7 +229,7 @@ // Last contact ContactDAO contactDAO = WaoDAOHelper.getContactDAO(transaction); TopiaQuery query = contactDAO.createQueryLastContactForBoat(boat, company). - addLoad(Contact.SAMPLE_ROW, Contact.OBSERVER); + addLoad(Contact.PROPERTY_SAMPLE_ROW, Contact.PROPERTY_OBSERVER); Contact contact = contactDAO.findByQuery(query); @@ -332,8 +332,8 @@ List<String> boatNames = dao.createQuery(). addDistinct(). - setSelect(Boat.NAME). - addWhere(Boat.NAME, Op.LIKE, input + "%"). + setSelect(Boat.PROPERTY_NAME). + addWhere(Boat.PROPERTY_NAME, Op.LIKE, input + "%"). execute(transaction); return boatNames; @@ -446,7 +446,7 @@ if (boat == null) { boat = boatDAO.create( - Boat.IMMATRICULATION, immatriculation); + Boat.PROPERTY_IMMATRICULATION, immatriculation); result[1]++; } boat.setName(boatName); @@ -464,7 +464,7 @@ if (district == null) { district = districtDAO.findByCode(districtCode); if (district == null) { - district = districtDAO.create(BoatDistrict.CODE, districtCode); + district = districtDAO.create(BoatDistrict.PROPERTY_CODE, districtCode); } availableDistricts.put(districtCode, district); } @@ -481,7 +481,7 @@ // If not exist yet, create it if (shipOwner == null) { shipOwner = shipOwnerDAO.create( - ShipOwner.CODE, shipOwnerCode); + ShipOwner.PROPERTY_CODE, shipOwnerCode); } availableShipOwners.put(shipOwnerCode, shipOwner); 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-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -141,8 +141,8 @@ // addLoad(contactProperty.observerProperty().company(), // contactProperty.sampleRowProperty().sampleMonth()); // TODO-fdesbois-2010-06-18 : manage aliases in addLoad - addLoad(TopiaQuery.getProperty(Contact.OBSERVER, WaoUser.COMPANY), - TopiaQuery.getProperty(Contact.SAMPLE_ROW, SampleRow.SAMPLE_MONTH) + addLoad(TopiaQuery.getProperty(Contact.PROPERTY_OBSERVER, WaoUser.PROPERTY_COMPANY), + TopiaQuery.getProperty(Contact.PROPERTY_SAMPLE_ROW, SampleRow.PROPERTY_SAMPLE_MONTH) // TopiaQuery.getProperty(Contact.SAMPLE_ROW, SampleRow.PROFESSION, Profession.DCF5CODE) ); @@ -282,8 +282,8 @@ } destination = dao.create( - Contact.BOAT, source.getBoat(), - Contact.SAMPLE_ROW, source.getSampleRow(), + Contact.PROPERTY_BOAT, source.getBoat(), + Contact.PROPERTY_SAMPLE_ROW, source.getSampleRow(), // FIXME-FD20100415 : don't use the topiaCreateDate as a business field TopiaEntity.TOPIA_CREATE_DATE, source.getTopiaCreateDate() ); @@ -300,8 +300,8 @@ //BinderProvider.getBinder(Contact.class).copy(source, destination); WaoBinderHelper.getSimpleTopiaBinder(Contact.class). copyExcluding(source, destination, - Contact.BOAT, - Contact.SAMPLE_ROW + Contact.PROPERTY_BOAT, + Contact.PROPERTY_SAMPLE_ROW ); // Update the change @@ -543,15 +543,15 @@ // Retrieve the existing contact String companyProperty = - TopiaQuery.getProperty(Contact.OBSERVER, - WaoUser.COMPANY); + TopiaQuery.getProperty(Contact.PROPERTY_OBSERVER, + WaoUser.PROPERTY_COMPANY); Contact contact = dao.findByProperties( TopiaEntity.TOPIA_CREATE_DATE, contactCsv.getTopiaCreateDate(), companyProperty, contactCsv.getCompany(), - Contact.BOAT, contactCsv.getBoat(), - Contact.SAMPLE_ROW, contactCsv.getSampleRow()); + Contact.PROPERTY_BOAT, contactCsv.getBoat(), + Contact.PROPERTY_SAMPLE_ROW, contactCsv.getSampleRow()); // Seems to have a problem with companyProperty ?!? using // DAOLegacy (criteria) @@ -559,7 +559,7 @@ // addEquals(TopiaEntity.TOPIA_CREATE_DATE, // contactCsv.getTopiaCreateDate()). // addEquals(companyProperty, contactCsv.getCompany()). -// addEquals(Contact.BOAT, contactCsv.getBoat()). +// addEquals(Contact.PROPERTY_BOAT, contactCsv.getBoat()). // addEquals(Contact.SAMPLE_ROW, // contactCsv.getSampleRow()); // Contact contact = dao.findByQuery(query); @@ -570,7 +570,7 @@ throw new ImportRefusedException("Le contact est" + " déjà validé dans l'application" + " et ne peut pas être importé", currRow, - Contact.VALIDATION_COMPANY); + Contact.PROPERTY_VALIDATION_COMPANY); } // Create elligibleBoat if needed before saving the contact @@ -592,7 +592,7 @@ dateFormat.format(contact.getTideBeginDate()) + " pour la ligne du plan " + contactCsv.getSampleRow().getCode(), currRow, - Contact.TIDE_BEGIN_DATE, eee); + Contact.PROPERTY_TIDE_BEGIN_DATE, eee); } result.incNbImported(); @@ -853,14 +853,14 @@ WaoDAOHelper.getElligibleBoatDAO(transaction); ElligibleBoat elligible = elligibleDAO.findByProperties( - ElligibleBoat.BOAT, contact.getBoat(), - ElligibleBoat.SAMPLE_ROW, contact.getSampleRow()); + ElligibleBoat.PROPERTY_BOAT, contact.getBoat(), + ElligibleBoat.PROPERTY_SAMPLE_ROW, contact.getSampleRow()); if (elligible == null) { // Create new elligible boat not active in a global way elligible = elligibleDAO.create( - ElligibleBoat.BOAT, boat, - ElligibleBoat.SAMPLE_ROW, row); + ElligibleBoat.PROPERTY_BOAT, boat, + ElligibleBoat.PROPERTY_SAMPLE_ROW, row); if (log.isTraceEnabled()) { log.trace("Create elligibleBoat for : " + boat.getImmatriculation() + " - " + Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -85,7 +85,7 @@ String newsAlias = "N"; String companyProperty = - TopiaQuery.getProperty(newsAlias, News.COMPANY); + TopiaQuery.getProperty(newsAlias, News.PROPERTY_COMPANY); String createDateProperty = TopiaQuery.getProperty(newsAlias, News.TOPIA_CREATE_DATE); 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-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -42,7 +42,6 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaQuery; -import org.nuiton.topia.framework.TopiaQuery.Op; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -194,7 +193,7 @@ FishingZone zone = dao.findByDistrictCode(districtCode); if (zone == null) { - zone = dao.create(FishingZone.DISTRICT_CODE, districtCode); + zone = dao.create(FishingZone.PROPERTY_DISTRICT_CODE, districtCode); } zone.setFacadeName(facadeName); zone.setSectorName(sectorName); 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-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -180,10 +180,10 @@ // DCF5 code to be considered equals. targetSpecies as to be null // if asked TopiaQuery query = dao.createQuery() - .addEquals(DCF5Code.FISHING_GEAR_DCF, foundGearCode) + .addEquals(DCF5Code.PROPERTY_FISHING_GEAR_DCF, foundGearCode) // next line may result in a "IS NULL", exactly what we want - .addEquals(DCF5Code.TARGET_SPECIES_DCF, foundSpeciesCode); + .addEquals(DCF5Code.PROPERTY_TARGET_SPECIES_DCF, foundSpeciesCode); DCF5Code foundCode = dao.findByQuery(query); @@ -493,10 +493,10 @@ SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction); TopiaQuery query = dao.createQuery(). addDistinct(). - setSelect(SampleRow.PROGRAM_NAME); + setSelect(SampleRow.PROPERTY_PROGRAM_NAME); if (company != null) { - query.addEquals(SampleRow.COMPANY, company); + query.addEquals(SampleRow.PROPERTY_COMPANY, company); } List<String> programs = transaction.findByQuery(query); @@ -569,13 +569,13 @@ SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction); TopiaQuery query = dao.createQuery(). - addEquals(SampleRow.CODE, sampleRowCode); + addEquals(SampleRow.PROPERTY_CODE, sampleRowCode); if (!user.isAdmin() && !user.isGuest()) { - query.addEquals(SampleRow.COMPANY, user.getCompany()); + query.addEquals(SampleRow.PROPERTY_COMPANY, user.getCompany()); } - query.addLoad(SampleRow.SAMPLE_ROW_LOG); + query.addLoad(SampleRow.PROPERTY_SAMPLE_ROW_LOG); SampleRow result = dao.findByQuery(query); if (result == null) { @@ -597,7 +597,7 @@ // Check if contacts exists linked with this sampleRow, no delete permitted in this case. ContactDAO contactDAO = WaoDAOHelper.getContactDAO(transaction); - if (contactDAO.existByProperties(Contact.SAMPLE_ROW, sampleRow)) { + if (contactDAO.existByProperties(Contact.PROPERTY_SAMPLE_ROW, sampleRow)) { throw new WaoBusinessException("Des contacts liés à cette ligne" + " existent, aucune suppression n'est possible."); } @@ -626,8 +626,8 @@ String maxCode = dao.createQuery(). - addWhere(SampleRow.CODE, Op.LIKE, year + "_%"). - executeToString(transaction, "MAX(" + SampleRow.CODE + ")"); + addWhere(SampleRow.PROPERTY_CODE, Op.LIKE, year + "_%"). + executeToString(transaction, "MAX(" + SampleRow.PROPERTY_CODE + ")"); if (log.isDebugEnabled()) { log.debug("Max code found : " + maxCode); @@ -922,7 +922,7 @@ result.addError(currRow, "[CODE = " + code + "] refusé : Zone de pêche non renseigné"); result.incNbRefused(); //nbRefused++; } else { - row = dao.create(SampleRow.CODE, code); + row = dao.create(SampleRow.PROPERTY_CODE, code); String companyName = ImportHelper.read(reader, SAMPLING.SOCIETE_NOM); @@ -1130,8 +1130,8 @@ if (month == null) { month = dao.create( - SampleMonth.SAMPLE_ROW, sampleRow, - SampleMonth.PERIOD_DATE, monthDate); + SampleMonth.PROPERTY_SAMPLE_ROW, sampleRow, + SampleMonth.PROPERTY_PERIOD_DATE, monthDate); sampleRow.addSampleMonth(month); } month.setExpectedTidesValue(monthValue); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -410,19 +410,19 @@ // Prepare properties for query String contactAlias = query.getMainAlias(); String sampleRowProperty = - TopiaQuery.getProperty(contactAlias, Contact.SAMPLE_ROW); + TopiaQuery.getProperty(contactAlias, Contact.PROPERTY_SAMPLE_ROW); String nbObservantsRealProperty = - TopiaQuery.getProperty(contactAlias, Contact.NB_OBSERVANTS); + TopiaQuery.getProperty(contactAlias, Contact.PROPERTY_NB_OBSERVANTS); String sampleRowEndProperty = - TopiaQuery.getProperty(sampleRowProperty, SampleRow.PERIOD_END); + TopiaQuery.getProperty(sampleRowProperty, SampleRow.PROPERTY_PERIOD_END); String companyProperty = - TopiaQuery.getProperty(sampleRowProperty, SampleRow.COMPANY); + TopiaQuery.getProperty(sampleRowProperty, SampleRow.PROPERTY_COMPANY); String nbObservantsExpectedProperty = - TopiaQuery.getProperty(sampleRowProperty, SampleRow.NB_OBSERVANTS); + TopiaQuery.getProperty(sampleRowProperty, SampleRow.PROPERTY_NB_OBSERVANTS); String companyNameProperty = - TopiaQuery.getProperty(companyProperty, Company.NAME); + TopiaQuery.getProperty(companyProperty, Company.PROPERTY_NAME); // Only for unfinished sampleRows query.addWhere(sampleRowEndProperty, Op.GE, context.getCurrentDate()); @@ -600,13 +600,13 @@ String contactAlias = query.getMainAlias(); String companyProperty = - TopiaQuery.getProperty(contactAlias, Contact.OBSERVER, WaoUser.COMPANY); + TopiaQuery.getProperty(contactAlias, Contact.PROPERTY_OBSERVER, WaoUser.PROPERTY_COMPANY); String companyNameProperty = - TopiaQuery.getProperty(companyProperty, Company.NAME); + TopiaQuery.getProperty(companyProperty, Company.PROPERTY_NAME); String tideBeginDateProperty = - TopiaQuery.getProperty(contactAlias, Contact.TIDE_BEGIN_DATE); + TopiaQuery.getProperty(contactAlias, Contact.PROPERTY_TIDE_BEGIN_DATE); String dataInputProperty = - TopiaQuery.getProperty(contactAlias, Contact.DATA_INPUT_DATE); + TopiaQuery.getProperty(contactAlias, Contact.PROPERTY_DATA_INPUT_DATE); Company company = filter.getCompany(); if (company != null) { @@ -970,7 +970,7 @@ protected GlobalSynthesisParameters executeGetGlobalSynthesisParameters(TopiaContext transaction) throws Exception { IndicatorDAO indicatorDAO = WaoDAOHelper.getIndicatorDAO(transaction); - List<Indicator> indicators = indicatorDAO.findAllWithOrder(Indicator.INDICATOR_ID); + List<Indicator> indicators = indicatorDAO.findAllWithOrder(Indicator.PROPERTY_INDICATOR_ID); Indicator globalIndicator = null; // will be found in the list 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-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -95,8 +95,8 @@ String passwordEncoded = context.encodeString(password); WaoUser user = dao.findByProperties( - WaoUser.LOGIN, login, - WaoUser.PASSWORD, passwordEncoded); + WaoUser.PROPERTY_LOGIN, login, + WaoUser.PROPERTY_PASSWORD, passwordEncoded); if (user == null) { throw new WaoBusinessException(Type.BAD_CONNECTION, @@ -344,10 +344,10 @@ CompanyDAO dao = WaoDAOHelper.getCompanyDAO(transaction); - TopiaQuery query = dao.createQuery().addOrder(Company.NAME); + TopiaQuery query = dao.createQuery().addOrder(Company.PROPERTY_NAME); if (activeOnly) { - query.addEquals(Company.ACTIVE, activeOnly); + query.addEquals(Company.PROPERTY_ACTIVE, activeOnly); } results = dao.findAllByQuery(query); @@ -365,8 +365,8 @@ TopiaQuery query = dao.createQuery(). - addEquals(WaoUser.COMPANY, company). - addOrder(WaoUser.FIRST_NAME, WaoUser.LAST_NAME); + addEquals(WaoUser.PROPERTY_COMPANY, company). + addOrder(WaoUser.PROPERTY_FIRST_NAME, WaoUser.PROPERTY_LAST_NAME); return dao.findAllByQuery(query); } @@ -382,15 +382,15 @@ UserRole.getMatchCodes(UserRole.OBSERVER, UserRole.COORDINATOR); TopiaQuery query = dao.createQuery(). - addEquals(WaoUser.ROLE, (Object[])matchCodes). - addOrder(WaoUser.FIRST_NAME, WaoUser.LAST_NAME); + addEquals(WaoUser.PROPERTY_ROLE, (Object[])matchCodes). + addOrder(WaoUser.PROPERTY_FIRST_NAME, WaoUser.PROPERTY_LAST_NAME); if (company != null) { - query.addEquals(WaoUser.COMPANY, company); + query.addEquals(WaoUser.PROPERTY_COMPANY, company); } if (activeOnly) { - query.addEquals(WaoUser.ACTIVE, Boolean.TRUE); + query.addEquals(WaoUser.PROPERTY_ACTIVE, Boolean.TRUE); } return dao.findAllByQuery(query); @@ -429,17 +429,17 @@ } Company company = companyDAO.create( - Company.ACTIVE, false, Company.NAME, "ADMIN"); + Company.PROPERTY_ACTIVE, false, Company.PROPERTY_NAME, "ADMIN"); String password = context.encodeString("password"); WaoUser user = dao.create( - WaoUser.ROLE, UserRole.ADMIN.toInt(), - WaoUser.ACTIVE, true, - WaoUser.LOGIN, "admin", - WaoUser.PASSWORD, password, - WaoUser.FIRST_NAME, "Super", - WaoUser.LAST_NAME, "Admin"); + WaoUser.PROPERTY_ROLE, UserRole.ADMIN.toInt(), + WaoUser.PROPERTY_ACTIVE, true, + WaoUser.PROPERTY_LOGIN, "admin", + WaoUser.PROPERTY_PASSWORD, password, + WaoUser.PROPERTY_FIRST_NAME, "Super", + WaoUser.PROPERTY_LAST_NAME, "Admin"); user.setCompany(company); transaction.commitTransaction(); 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-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-11-26 14:14:35 UTC (rev 805) @@ -1,128 +1,128 @@ -fr.ifremer.wao.entity.FishingGearDCF.=Non sp\u00e9cifi\u00e9 -fr.ifremer.wao.entity.FishingGearDCF.DRB=Dragues remorqu\u00e9es par bateau -fr.ifremer.wao.entity.FishingGearDCF.DRH=Dragues \u00e0 main -fr.ifremer.wao.entity.FishingGearDCF.FAR=Pi\u00e8ges a\u00e9riens -fr.ifremer.wao.entity.FishingGearDCF.FCN=\u00c9perviers -fr.ifremer.wao.entity.FishingGearDCF.FG=Autres engins retombants (non-sp\u00e9cifi\u00e9s) -fr.ifremer.wao.entity.FishingGearDCF.FIX=Pi\u00e8ges (non-sp\u00e9cifi\u00e9s) -fr.ifremer.wao.entity.FishingGearDCF.FPN=Filets-pi\u00e8ges fixes non couverts +fr.ifremer.wao.entity.FishingGearDCF.=Non sp\u00E9cifi\u00E9 +fr.ifremer.wao.entity.FishingGearDCF.DRB=Dragues remorqu\u00E9es par bateau +fr.ifremer.wao.entity.FishingGearDCF.DRH=Dragues \u00E0 main +fr.ifremer.wao.entity.FishingGearDCF.FAR=Pi\u00E8ges a\u00E9riens +fr.ifremer.wao.entity.FishingGearDCF.FCN=\u00C9perviers +fr.ifremer.wao.entity.FishingGearDCF.FG=Autres engins retombants (non-sp\u00E9cifi\u00E9s) +fr.ifremer.wao.entity.FishingGearDCF.FIX=Pi\u00E8ges (non-sp\u00E9cifi\u00E9s) +fr.ifremer.wao.entity.FishingGearDCF.FPN=Filets-pi\u00E8ges fixes non couverts fr.ifremer.wao.entity.FishingGearDCF.FPO=Nasses (casiers) -fr.ifremer.wao.entity.FishingGearDCF.FSN=Filets \u00e0 l'\u00e9talage (diables) +fr.ifremer.wao.entity.FishingGearDCF.FSN=Filets \u00E0 l'\u00E9talage (diables) fr.ifremer.wao.entity.FishingGearDCF.FWR=Barrages, parcs, bordigues, etc. fr.ifremer.wao.entity.FishingGearDCF.FYK=Verveux -fr.ifremer.wao.entity.FishingGearDCF.GEN=Filets maillants et filets emm\u00e9lants (non sp\u00e9cifi\u00e9s) -fr.ifremer.wao.entity.FishingGearDCF.GES=Tamis \u00e0 civelles -fr.ifremer.wao.entity.FishingGearDCF.GN=Filets maillants (non sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.GEN=Filets maillants et filets emm\u00E9lants (non sp\u00E9cifi\u00E9s) +fr.ifremer.wao.entity.FishingGearDCF.GES=Tamis \u00E0 civelles +fr.ifremer.wao.entity.FishingGearDCF.GN=Filets maillants (non sp\u00E9cifi\u00E9s) fr.ifremer.wao.entity.FishingGearDCF.GNC=Filets maillants encerclants -fr.ifremer.wao.entity.FishingGearDCF.GND=Filets maillants d\u00e9rivants (filets d\u00e9rivants) +fr.ifremer.wao.entity.FishingGearDCF.GND=Filets maillants d\u00E9rivants (filets d\u00E9rivants) fr.ifremer.wao.entity.FishingGearDCF.GNF=Filets maillants fixes (sur perches) -fr.ifremer.wao.entity.FishingGearDCF.GNS=Filets maillants cal\u00e9s (ancr\u00e9s) -fr.ifremer.wao.entity.FishingGearDCF.GT=Tr\u00e9mailleurs -fr.ifremer.wao.entity.FishingGearDCF.GTN=Tr\u00e9mails et filets maillants combin\u00e9s -fr.ifremer.wao.entity.FishingGearDCF.GTR=Tr\u00e9mails +fr.ifremer.wao.entity.FishingGearDCF.GNS=Filets maillants cal\u00E9s (ancr\u00E9s) +fr.ifremer.wao.entity.FishingGearDCF.GT=Tr\u00E9mailleurs +fr.ifremer.wao.entity.FishingGearDCF.GTN=Tr\u00E9mails et filets maillants combin\u00E9s +fr.ifremer.wao.entity.FishingGearDCF.GTR=Tr\u00E9mails fr.ifremer.wao.entity.FishingGearDCF.HAR=Harpons -fr.ifremer.wao.entity.FishingGearDCF.HMD=Dragues m\u00e9canis\u00e9es +fr.ifremer.wao.entity.FishingGearDCF.HMD=Dragues m\u00E9canis\u00E9es fr.ifremer.wao.entity.FishingGearDCF.HMP=Pompes -fr.ifremer.wao.entity.FishingGearDCF.HMX=Engins de r\u00e9colte (non sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.HMX=Engins de r\u00E9colte (non sp\u00E9cifi\u00E9s) fr.ifremer.wao.entity.FishingGearDCF.LA=Filets tournants sans coulisse (filet lamparo) -fr.ifremer.wao.entity.FishingGearDCF.LHM=Lignes \u00e0 main et lignes avec cannes -fr.ifremer.wao.entity.FishingGearDCF.LHP=Lignes \u00e0 main et lignes \u00e0 cannes -fr.ifremer.wao.entity.FishingGearDCF.LL=Palangres (non sp\u00e9cifi\u00e9es) -fr.ifremer.wao.entity.FishingGearDCF.LLD=Palangres d\u00e9rivantes -fr.ifremer.wao.entity.FishingGearDCF.LLS=Palangres cal\u00e9es ou semi-flottantes -fr.ifremer.wao.entity.FishingGearDCF.LN=Filets soulev\u00e9s (non sp\u00e9cifi\u00e9s) -fr.ifremer.wao.entity.FishingGearDCF.LNB=Filets soulev\u00e9s man\u0153uvr\u00e9es du bateau -fr.ifremer.wao.entity.FishingGearDCF.LNP=Filets soulev\u00e9s portatifs -fr.ifremer.wao.entity.FishingGearDCF.LNS=Filets soulev\u00e9s fixes man\u0153uvr\u00e9es du rivage -fr.ifremer.wao.entity.FishingGearDCF.LTL=lignes de tra\u00eene -fr.ifremer.wao.entity.FishingGearDCF.LX=Hame\u00e7ons et lignes (non sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.LHM=Lignes \u00E0 main et lignes avec cannes +fr.ifremer.wao.entity.FishingGearDCF.LHP=Lignes \u00E0 main et lignes \u00E0 cannes +fr.ifremer.wao.entity.FishingGearDCF.LL=Palangres (non sp\u00E9cifi\u00E9es) +fr.ifremer.wao.entity.FishingGearDCF.LLD=Palangres d\u00E9rivantes +fr.ifremer.wao.entity.FishingGearDCF.LLS=Palangres cal\u00E9es ou semi-flottantes +fr.ifremer.wao.entity.FishingGearDCF.LN=Filets soulev\u00E9s (non sp\u00E9cifi\u00E9s) +fr.ifremer.wao.entity.FishingGearDCF.LNB=Filets soulev\u00E9s man\u0153uvr\u00E9es du bateau +fr.ifremer.wao.entity.FishingGearDCF.LNP=Filets soulev\u00E9s portatifs +fr.ifremer.wao.entity.FishingGearDCF.LNS=Filets soulev\u00E9s fixes man\u0153uvr\u00E9es du rivage +fr.ifremer.wao.entity.FishingGearDCF.LTL=lignes de tra\u00EEne +fr.ifremer.wao.entity.FishingGearDCF.LX=Hame\u00E7ons et lignes (non sp\u00E9cifi\u00E9s) fr.ifremer.wao.entity.FishingGearDCF.MIS=Divers -fr.ifremer.wao.entity.FishingGearDCF.NK=Engins inconnus ou non sp\u00e9cifi\u00e9s -fr.ifremer.wao.entity.FishingGearDCF.OT=Chaluts \u00e0 panneaux (non sp\u00e9cifi\u00e9) -fr.ifremer.wao.entity.FishingGearDCF.OTB=Chalut de fond \u00e0 panneaux -fr.ifremer.wao.entity.FishingGearDCF.OTM=Chaluts p\u00e9lagiques \u00e0 panneaux -fr.ifremer.wao.entity.FishingGearDCF.OTT=Chaluts jumeaux \u00e0 panneaux +fr.ifremer.wao.entity.FishingGearDCF.NK=Engins inconnus ou non sp\u00E9cifi\u00E9s +fr.ifremer.wao.entity.FishingGearDCF.OT=Chaluts \u00E0 panneaux (non sp\u00E9cifi\u00E9) +fr.ifremer.wao.entity.FishingGearDCF.OTB=Chalut de fond \u00E0 panneaux +fr.ifremer.wao.entity.FishingGearDCF.OTM=Chaluts p\u00E9lagiques \u00E0 panneaux +fr.ifremer.wao.entity.FishingGearDCF.OTT=Chaluts jumeaux \u00E0 panneaux fr.ifremer.wao.entity.FishingGearDCF.PS=Filets tournants avec coulisse (sennes coulissantes) -fr.ifremer.wao.entity.FishingGearDCF.PS1=Filets tournants, sennes coulissantes man\u0153uvr\u00e9es par un bateau -fr.ifremer.wao.entity.FishingGearDCF.PS2=Filets tournants, sennes coulissantes man\u0153uvr\u00e9es par deux bateaux -fr.ifremer.wao.entity.FishingGearDCF.PT=Chalut-b\u0153ufs (non sp\u00e9cifi\u00e9) +fr.ifremer.wao.entity.FishingGearDCF.PS1=Filets tournants, sennes coulissantes man\u0153uvr\u00E9es par un bateau +fr.ifremer.wao.entity.FishingGearDCF.PS2=Filets tournants, sennes coulissantes man\u0153uvr\u00E9es par deux bateaux +fr.ifremer.wao.entity.FishingGearDCF.PT=Chalut-b\u0153ufs (non sp\u00E9cifi\u00E9) fr.ifremer.wao.entity.FishingGearDCF.PTB=Chalut-b\u0153ufs de fond -fr.ifremer.wao.entity.FishingGearDCF.PTM=Chalut-b\u0153ufs p\u00e9lagiques -fr.ifremer.wao.entity.FishingGearDCF.RG=Engins de p\u00eache r\u00e9vr\u00e9ative +fr.ifremer.wao.entity.FishingGearDCF.PTM=Chalut-b\u0153ufs p\u00E9lagiques +fr.ifremer.wao.entity.FishingGearDCF.RG=Engins de p\u00EAche r\u00E9vr\u00E9ative fr.ifremer.wao.entity.FishingGearDCF.SB=Sennes de plages fr.ifremer.wao.entity.FishingGearDCF.SDN=Sennes danoises -fr.ifremer.wao.entity.FishingGearDCF.SPR=Sennes man\u0153uvr\u00e9es par deux bateaux -fr.ifremer.wao.entity.FishingGearDCF.SSC=Sennes \u00e9cossaises -fr.ifremer.wao.entity.FishingGearDCF.SV=Sennes hal\u00e9es \u00e0 bord -fr.ifremer.wao.entity.FishingGearDCF.SW=Sennes (non sp\u00e9cifi\u00e9es) -fr.ifremer.wao.entity.FishingGearDCF.TB=Chalut de fond (non sp\u00e9cifi\u00e9) -fr.ifremer.wao.entity.FishingGearDCF.TBB=Chaluts \u00e0 perche -fr.ifremer.wao.entity.FishingGearDCF.TBN=Chalut \u00e0 langoustines -fr.ifremer.wao.entity.FishingGearDCF.TBS=Chalut \u00e0 crevettes -fr.ifremer.wao.entity.FishingGearDCF.TM=Chalut p\u00e9lagique (non sp\u00e9cifi\u00e9) -fr.ifremer.wao.entity.FishingGearDCF.TMS=Chalut \u00e0 crevettes -fr.ifremer.wao.entity.FishingGearDCF.TX=Autre chalut (non sp\u00e9cifi\u00e9) -fr.ifremer.wao.entity.TargetSpeciesDCF.=Non sp\u00e9cifi\u00e9 +fr.ifremer.wao.entity.FishingGearDCF.SPR=Sennes man\u0153uvr\u00E9es par deux bateaux +fr.ifremer.wao.entity.FishingGearDCF.SSC=Sennes \u00E9cossaises +fr.ifremer.wao.entity.FishingGearDCF.SV=Sennes hal\u00E9es \u00E0 bord +fr.ifremer.wao.entity.FishingGearDCF.SW=Sennes (non sp\u00E9cifi\u00E9es) +fr.ifremer.wao.entity.FishingGearDCF.TB=Chalut de fond (non sp\u00E9cifi\u00E9) +fr.ifremer.wao.entity.FishingGearDCF.TBB=Chaluts \u00E0 perche +fr.ifremer.wao.entity.FishingGearDCF.TBN=Chalut \u00E0 langoustines +fr.ifremer.wao.entity.FishingGearDCF.TBS=Chalut \u00E0 crevettes +fr.ifremer.wao.entity.FishingGearDCF.TM=Chalut p\u00E9lagique (non sp\u00E9cifi\u00E9) +fr.ifremer.wao.entity.FishingGearDCF.TMS=Chalut \u00E0 crevettes +fr.ifremer.wao.entity.FishingGearDCF.TX=Autre chalut (non sp\u00E9cifi\u00E9) +fr.ifremer.wao.entity.TargetSpeciesDCF.=Non sp\u00E9cifi\u00E9 fr.ifremer.wao.entity.TargetSpeciesDCF.ALG=Algues -fr.ifremer.wao.entity.TargetSpeciesDCF.CAT=Esp\u00e8ces catadromes -fr.ifremer.wao.entity.TargetSpeciesDCF.CRU=Crustac\u00e9s +fr.ifremer.wao.entity.TargetSpeciesDCF.CAT=Esp\u00E8ces catadromes +fr.ifremer.wao.entity.TargetSpeciesDCF.CRU=Crustac\u00E9s fr.ifremer.wao.entity.TargetSpeciesDCF.CSJ=Coquilles Saint-Jacques -fr.ifremer.wao.entity.TargetSpeciesDCF.DEF=Esp\u00e8ces d\u00e9mersales -fr.ifremer.wao.entity.TargetSpeciesDCF.DWS=Esp\u00e8ces d'eaux profondes +fr.ifremer.wao.entity.TargetSpeciesDCF.DEF=Esp\u00E8ces d\u00E9mersales +fr.ifremer.wao.entity.TargetSpeciesDCF.DWS=Esp\u00E8ces d'eaux profondes fr.ifremer.wao.entity.TargetSpeciesDCF.FIN=Poisson plats -fr.ifremer.wao.entity.TargetSpeciesDCF.LPF=Grands p\u00e9lagiques +fr.ifremer.wao.entity.TargetSpeciesDCF.LPF=Grands p\u00E9lagiques fr.ifremer.wao.entity.TargetSpeciesDCF.MOL=Mollusques -fr.ifremer.wao.entity.TargetSpeciesDCF.SPF=Petits p\u00e9lagiques +fr.ifremer.wao.entity.TargetSpeciesDCF.SPF=Petits p\u00E9lagiques wao.business.bean.DataReliability.doubtful=douteuse -wao.business.bean.DataReliability.not_provided=non renseign\u00e9e +wao.business.bean.DataReliability.not_provided=non renseign\u00E9e wao.business.bean.DataReliability.not_reliable=non exploitable wao.business.bean.DataReliability.reliable=exploitable wao.business.bean.DataReliability.unknown=inconnue -wao.business.bean.GlobalIndicatorValue.bad=P\u00e9nalit\u00e9 de niveau 1 +wao.business.bean.GlobalIndicatorValue.bad=P\u00E9nalit\u00E9 de niveau 1 wao.business.bean.GlobalIndicatorValue.good=Bonus de niveau 1 wao.business.bean.GlobalIndicatorValue.neutral=Conforme au cahier des charges -wao.business.bean.GlobalIndicatorValue.very_bad=P\u00e9nalit\u00e9 de niveau 2 +wao.business.bean.GlobalIndicatorValue.very_bad=P\u00E9nalit\u00E9 de niveau 2 wao.business.bean.GlobalIndicatorValue.very_good=Bonus de niveau 2 -wao.business.bean.SynthesisId.allegro_reactivity=D\u00e9lais de transmission des donn\u00e9es -wao.business.bean.SynthesisId.compliance_boarding=Respect du nombre d'observateurs embarqu\u00e9s -wao.business.bean.SynthesisId.contact_state=\u00c9tats des contacts -wao.business.bean.SynthesisId.data_reliability=Qualit\u00e9 de la donn\u00e9e -wao.business.bean.SynthesisId.graph_boarding=Taux d'embarquement sur un m\u00eame navire conforme aux exigences -wao.business.bean.SynthesisId.graph_sampling=Taux de r\u00e9alisation du plan d'\u00e9chantillonage -wao.business.bean.SynthesisId.non_compliance_boarding=Non-respect du nombre d'observateurs embarqu\u00e9s -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 +wao.business.bean.SynthesisId.allegro_reactivity=D\u00E9lais de transmission des donn\u00E9es +wao.business.bean.SynthesisId.compliance_boarding=Respect du nombre d'observateurs embarqu\u00E9s +wao.business.bean.SynthesisId.contact_state=\u00C9tats des contacts +wao.business.bean.SynthesisId.data_reliability=Qualit\u00E9 de la donn\u00E9e +wao.business.bean.SynthesisId.graph_boarding=Taux d'embarquement sur un m\u00EAme navire conforme aux exigences +wao.business.bean.SynthesisId.graph_sampling=Taux de r\u00E9alisation du plan d'\u00E9chantillonage +wao.business.bean.SynthesisId.non_compliance_boarding=Non-respect du nombre d'observateurs embarqu\u00E9s +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 wao.error.context.close=Une erreur est survenue pendant la fermeture du contexte principale de ToPIA wao.error.context.encodeString= -wao.error.context.getRootContext=Une erreur est survenue pour la r\u00e9cup\u00e9ration du contexte principale de ToPIA +wao.error.context.getRootContext=Une erreur est survenue pour la r\u00E9cup\u00E9ration du contexte principale de ToPIA wao.error.context.parse=Une erreur est survenue pendant le chargement de la configuration du fichier %1$s wao.error.context.rollback=Une erreur est survenue pendant l'annulation de la transaction courante -wao.error.context.start=Une erreur est survenue pendant le d\u00e9marrage de l'application +wao.error.context.start=Une erreur est survenue pendant le d\u00E9marrage de l'application wao.error.context.stop=Une erreur est survenue pendant la fermeture de l'application -wao.error.sampleMonth.addRealTideTime=Impossible d'enregistrer le nombre de mar\u00e9es r\u00e9els pour le mois de %1$s [ligne \: %2$s] -wao.error.sampleRow.saveSampleRowLog=Impossible d'enregistrer le commentaire \u00e9crit par %1$s -wao.error.serviceBoat.createUpdateCompanyBoatInfos=Impossible de cr\u00e9er ou modifier les informations li\u00e9s au navire %1$d pour la soci\u00e9t\u00e9 %2$s -wao.error.serviceBoat.exportBoatCsv=Impossible d'exporter les navires s\u00e9lectionn\u00e9s +wao.error.sampleMonth.addRealTideTime=Impossible d'enregistrer le nombre de mar\u00E9es r\u00E9els pour le mois de %1$s [ligne \: %2$s] +wao.error.sampleRow.saveSampleRowLog=Impossible d'enregistrer le commentaire \u00E9crit par %1$s +wao.error.serviceBoat.createUpdateCompanyBoatInfos=Impossible de cr\u00E9er ou modifier les informations li\u00E9s au navire %1$d pour la soci\u00E9t\u00E9 %2$s +wao.error.serviceBoat.exportBoatCsv=Impossible d'exporter les navires s\u00E9lectionn\u00E9s wao.error.serviceBoat.getActivityCalendarLogAccessFile= wao.error.serviceBoat.getActivityCalendarLogFile= wao.error.serviceBoat.getBoat=Impossible de charger le navire -wao.error.serviceBoat.getBoatNamesStartWith=Impossible de r\u00e9cup\u00e9rer les navires avec un nom commencant par '%1$s' +wao.error.serviceBoat.getBoatNamesStartWith=Impossible de r\u00E9cup\u00E9rer les navires avec un nom commencant par '%1$s' wao.error.serviceBoat.getBoatsByFilter=Impossible de filtrer la liste des navires -wao.error.serviceBoat.getBoatsByImmatriculations=La cha\u00eene d'immatriculations est incorrect \! Chaque immatriculation doit poss\u00e9der 6 chiffres -wao.error.serviceBoat.getCompanyBoatInfos=Impossible de r\u00e9cup\u00e9rer les informations du navire immatricul\u00e9 %1$d pour la soci\u00e9t\u00e9 %2$s -wao.error.serviceBoat.getLastActivityCalendar=Impossible de charger le dernier calendrier d'activit\u00e9 du navire %1$s (%2$d) +wao.error.serviceBoat.getBoatsByImmatriculations=La cha\u00EEne d'immatriculations est incorrect \! Chaque immatriculation doit poss\u00E9der 6 chiffres +wao.error.serviceBoat.getCompanyBoatInfos=Impossible de r\u00E9cup\u00E9rer les informations du navire immatricul\u00E9 %1$d pour la soci\u00E9t\u00E9 %2$s +wao.error.serviceBoat.getLastActivityCalendar=Impossible de charger le dernier calendrier d'activit\u00E9 du navire %1$s (%2$d) wao.error.serviceBoat.getNbBoatsByFilter=Impossible de filtrer la liste des navires wao.error.serviceBoat.getShipOwnerNamesContains= -wao.error.serviceBoat.importActivityCalendarCsv=Probl\u00e8me d'import du fichier CSV des calendriers d'activit\u00e9 -wao.error.serviceBoat.importBoatCsv=Probl\u00e8me d'import du fichier CSV. V\u00e9rifiez l'en-t\u00eate du fichier \: [ NAVS_COD,CARN_NOM,CARN_LONGUEUR_HT,CARN_ANNEE,QUARTIER_IMMA,PER_COD,PER_NOM,PER_PRENOM,NAVS_ACTIVE ]. Voir documentation pour plus de d\u00e9tails. +wao.error.serviceBoat.importActivityCalendarCsv=Probl\u00E8me d'import du fichier CSV des calendriers d'activit\u00E9 +wao.error.serviceBoat.importBoatCsv=Probl\u00E8me d'import du fichier CSV. V\u00E9rifiez l'en-t\u00EAte du fichier \: [ NAVS_COD,CARN_NOM,CARN_LONGUEUR_HT,CARN_ANNEE,QUARTIER_IMMA,PER_COD,PER_NOM,PER_PRENOM,NAVS_ACTIVE ]. Voir documentation pour plus de d\u00E9tails. wao.error.serviceCartography.exportContactStatisticsKml= -wao.error.serviceCartography.importBoatDistrictKml=Impossible d'importer les coordonn\u00e9es des quartiers des navires. V\u00e9rifiez la documentation pour le bon format du fichier Kml. +wao.error.serviceCartography.importBoatDistrictKml=Impossible d'importer les coordonn\u00E9es des quartiers des navires. V\u00E9rifiez la documentation pour le bon format du fichier Kml. wao.error.serviceChart.getContactPieChartData= wao.error.serviceChart.getContactPieChartUrl= wao.error.serviceContact.exportContactCsv=Impossible d'exporter les contacts wao.error.serviceContact.getContacts=Impossible de filtrer la liste des contacts -wao.error.serviceContact.getNbContacts=Impossible de compter le nombre de contacts filtr\u00e9s +wao.error.serviceContact.getNbContacts=Impossible de compter le nombre de contacts filtr\u00E9s wao.error.serviceContact.getNewContact=Impossible d'instancier un nouveau contact wao.error.serviceContact.importContactCsv=Impossible d'importer les contacts wao.error.serviceContact.saveComment= @@ -130,54 +130,54 @@ wao.error.serviceContact.sendContactDoneEmail= wao.error.serviceContact.updateSampleMonthTidesValue= wao.error.serviceNews.getNewNews= -wao.error.serviceNews.getNews=Impossible de r\u00e9cup\u00e9rer l'ensemble des news +wao.error.serviceNews.getNews=Impossible de r\u00E9cup\u00E9rer l'ensemble des news wao.error.serviceNews.saveNews=Impossible d'enregistrer la news ayant pour titre '%1$s' wao.error.serviceReferential.getCodesDCF5Contains= wao.error.serviceReferential.getFacades=Impossible de charger la liste des facades -wao.error.serviceReferential.getFishingZones=Impossible de charger la liste des secteurs de p\u00eache -wao.error.serviceReferential.getProfessions=Impossible de charger la liste des m\u00e9tiers -wao.error.serviceReferential.getSectors=Impossible de charger la liste des zones de p\u00eache -wao.error.serviceReferential.importFishingZoneCsv=Probl\u00e8me d'import du fichier CSV. V\u00e9rifiez l'en-t\u00eate du fichier \: [ PECHE_DIVISION,PECHE_ZONE,PECHE_FACADE ]. Voir documentation pour plus de d\u00e9tails. +wao.error.serviceReferential.getFishingZones=Impossible de charger la liste des secteurs de p\u00EAche +wao.error.serviceReferential.getProfessions=Impossible de charger la liste des m\u00E9tiers +wao.error.serviceReferential.getSectors=Impossible de charger la liste des zones de p\u00EAche +wao.error.serviceReferential.importFishingZoneCsv=Probl\u00E8me d'import du fichier CSV. V\u00E9rifiez l'en-t\u00EAte du fichier \: [ PECHE_DIVISION,PECHE_ZONE,PECHE_FACADE ]. Voir documentation pour plus de d\u00E9tails. wao.error.serviceSampling.createSampleRowLog= -wao.error.serviceSampling.createUpdateSampleRow=Impossible de sauvegarder la ligne d'\u00e9chantillon -wao.error.serviceSampling.deleteSampleRow=Impossible de supprimer la ligne d'\u00e9chantillon \: %1$s -wao.error.serviceSampling.exportSamplingPlanCsv=Impossible d'exporter le plan d'\u00e9chantillonnage sur la p\u00e9riode du %1$s au %2$s +wao.error.serviceSampling.createUpdateSampleRow=Impossible de sauvegarder la ligne d'\u00E9chantillon +wao.error.serviceSampling.deleteSampleRow=Impossible de supprimer la ligne d'\u00E9chantillon \: %1$s +wao.error.serviceSampling.exportSamplingPlanCsv=Impossible d'exporter le plan d'\u00E9chantillonnage sur la p\u00E9riode du %1$s au %2$s wao.error.serviceSampling.getDCFGears= wao.error.serviceSampling.getDCFSpecies= wao.error.serviceSampling.getNewProfession= wao.error.serviceSampling.getNewSampleMonth= wao.error.serviceSampling.getNewSampleRow= -wao.error.serviceSampling.getNewSampleRowCode=Impossible de r\u00e9cup\u00e9rer un nouveau code pour une ligne d'\u00e9chantillonnage +wao.error.serviceSampling.getNewSampleRowCode=Impossible de r\u00E9cup\u00E9rer un nouveau code pour une ligne d'\u00E9chantillonnage wao.error.serviceSampling.getNewSampleRowLog= wao.error.serviceSampling.getPrograms=Impossible de charger la liste des programmes -wao.error.serviceSampling.getSampleRow=Impossible de charger la ligne d'\u00e9chantillon ayant pour identifiant \: %1$s -wao.error.serviceSampling.getSampleRowByCode=Impossible de charger la ligne d'\u00e9chantillon ayant pour code %1$s -wao.error.serviceSampling.getSampleRowsByFilter=Impossible de r\u00e9cup\u00e9rer la liste des lignes du plan d'\u00e9chantillonnage -wao.error.serviceSampling.getSampleRowsOrderedByFishingZone=Impossible de r\u00e9cup\u00e9rer la liste des lignes du plan d'\u00e9chantillonnage -wao.error.serviceSampling.importSamplingPlanCsv=Erreur \u00e0 la ligne %1$d [CODE \= %2$s] +wao.error.serviceSampling.getSampleRow=Impossible de charger la ligne d'\u00E9chantillon ayant pour identifiant \: %1$s +wao.error.serviceSampling.getSampleRowByCode=Impossible de charger la ligne d'\u00E9chantillon ayant pour code %1$s +wao.error.serviceSampling.getSampleRowsByFilter=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage +wao.error.serviceSampling.getSampleRowsOrderedByFishingZone=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage +wao.error.serviceSampling.importSamplingPlanCsv=Erreur \u00E0 la ligne %1$d [CODE \= %2$s] wao.error.serviceSynthesis.getAllIndicatorLogs= -wao.error.serviceSynthesis.getBoardingBoats=Impossible de r\u00e9cup\u00e9rer les donn\u00e9es du graphique concernant les embarquements sur les navires +wao.error.serviceSynthesis.getBoardingBoats=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es du graphique concernant les embarquements sur les navires wao.error.serviceSynthesis.getComplianceBoardingIndicator= -wao.error.serviceSynthesis.getContactDataInputDateReactivity=Impossible de r\u00e9cup\u00e9rer l'indicateur de r\u00e9activit\u00e9 sur les dates de saisies dans Allegro +wao.error.serviceSynthesis.getContactDataInputDateReactivity=Impossible de r\u00E9cup\u00E9rer l'indicateur de r\u00E9activit\u00E9 sur les dates de saisies dans Allegro wao.error.serviceSynthesis.getContactPieChartData= wao.error.serviceSynthesis.getContactPieChartDataByBoatDistrict= -wao.error.serviceSynthesis.getContactStateStatistics=Impossible de r\u00e9cup\u00e9rer les statistiques sur les \u00e9tats des contacts +wao.error.serviceSynthesis.getContactStateStatistics=Impossible de r\u00E9cup\u00E9rer les statistiques sur les \u00E9tats des contacts wao.error.serviceSynthesis.getDataReliability= -wao.error.serviceSynthesis.getDataSampling=Impossible de r\u00e9cup\u00e9rer les donn\u00e9es pour le graphique dynamique des efforts de mar\u00e9es -wao.error.serviceSynthesis.getGlobalSynthesisParameters=Impossible de r\u00e9cup\u00e9rer les donn\u00e9es concernant les indicateurs pour la synth\u00e8se globale +wao.error.serviceSynthesis.getDataSampling=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es pour le graphique dynamique des efforts de mar\u00E9es +wao.error.serviceSynthesis.getGlobalSynthesisParameters=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es concernant les indicateurs pour la synth\u00E8se globale wao.error.serviceSynthesis.getGlobalSynthesisResult= -wao.error.serviceSynthesis.getNonComplianceBoardingIndicator=Impossible de r\u00e9cup\u00e9rer l'indicateur de non respect du nombre d'observateurs embarqu\u00e9s -wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Impossible de mettre \u00e0 jour les param\u00e8tres de la synth\u00e8se globale +wao.error.serviceSynthesis.getNonComplianceBoardingIndicator=Impossible de r\u00E9cup\u00E9rer l'indicateur de non respect du nombre d'observateurs embarqu\u00E9s +wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Impossible de mettre \u00E0 jour les param\u00E8tres de la synth\u00E8se globale wao.error.serviceUser.connect=Une erreur est survenue lors de la demande de connexion -wao.error.serviceUser.createDefaultAdmin=Impossible de cr\u00e9er l'administrateur par d\u00e9faut -wao.error.serviceUser.createUpdateCompany=Impossible de cr\u00e9er ou de mettre \u00e0 jour la soci\u00e9t\u00e9 -wao.error.serviceUser.createUpdateUser=Impossible de cr\u00e9er ou de mettre \u00e0 jour l'utilisateur +wao.error.serviceUser.createDefaultAdmin=Impossible de cr\u00E9er l'administrateur par d\u00E9faut +wao.error.serviceUser.createUpdateCompany=Impossible de cr\u00E9er ou de mettre \u00E0 jour la soci\u00E9t\u00E9 +wao.error.serviceUser.createUpdateUser=Impossible de cr\u00E9er ou de mettre \u00E0 jour l'utilisateur wao.error.serviceUser.deleteUser=Impossible de supprimer l'utilisateur wao.error.serviceUser.existLogin= wao.error.serviceUser.forgetPassword=Impossible d'envoyer le mail d'oubli de mot de passe -wao.error.serviceUser.getCompanies=Impossible de r\u00e9cup\u00e9rer la liste des soci\u00e9t\u00e9s +wao.error.serviceUser.getCompanies=Impossible de r\u00E9cup\u00E9rer la liste des soci\u00E9t\u00E9s wao.error.serviceUser.getCompany= wao.error.serviceUser.getNewUser=Impossible d'instancier un nouvel utilisateur -wao.error.serviceUser.getObservers=Impossible de r\u00e9cup\u00e9rer la liste des observateurs +wao.error.serviceUser.getObservers=Impossible de r\u00E9cup\u00E9rer la liste des observateurs wao.error.serviceUser.getUserRolesByLogin= -wao.error.serviceUser.getUsersByCompany=Impossible de r\u00e9cup\u00e9rer la liste des utilisateurs de la soci\u00e9t\u00e9 %1$s +wao.error.serviceUser.getUsersByCompany=Impossible de r\u00E9cup\u00E9rer la liste des utilisateurs de la soci\u00E9t\u00E9 %1$s Modified: trunk/wao-business/src/main/xmi/wao.properties =================================================================== --- trunk/wao-business/src/main/xmi/wao.properties 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/xmi/wao.properties 2010-11-26 14:14:35 UTC (rev 805) @@ -2,6 +2,7 @@ model.tagvalue.java.lang.String=text model.tagvalue.exceptionClass=fr.ifremer.wao.WaoException model.tagvalue.notGenerateToString=true +model.tagvalue.constantPrefix=PROPERTY_ #model.tagvalue.useLegacyDAO=true Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 2010-11-26 14:14:35 UTC (rev 805) @@ -137,11 +137,11 @@ try { WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); observer = userDAO.create( - WaoUser.COMPANY, findDefaultCompany(), - WaoUser.LOGIN, OBSERVER_DEFAULT_LOGIN, - WaoUser.FIRST_NAME, OBSERVER_DEFAULT_FIRST_NAME, - WaoUser.LAST_NAME, OBSERVER_DEFAULT_LAST_NAME, - WaoUser.ROLE, UserRole.OBSERVER.ordinal()); + WaoUser.PROPERTY_COMPANY, findDefaultCompany(), + WaoUser.PROPERTY_LOGIN, OBSERVER_DEFAULT_LOGIN, + WaoUser.PROPERTY_FIRST_NAME, OBSERVER_DEFAULT_FIRST_NAME, + WaoUser.PROPERTY_LAST_NAME, OBSERVER_DEFAULT_LAST_NAME, + WaoUser.PROPERTY_ROLE, UserRole.OBSERVER.ordinal()); if (log.isDebugEnabled()) { log.debug("Create default observer : " + observer); } @@ -176,11 +176,11 @@ try { WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); observer = userDAO.create( - WaoUser.COMPANY, company, - WaoUser.LOGIN, login, - WaoUser.FIRST_NAME, null, - WaoUser.LAST_NAME, null, - WaoUser.ROLE, role.ordinal()); + WaoUser.PROPERTY_COMPANY, company, + WaoUser.PROPERTY_LOGIN, login, + WaoUser.PROPERTY_FIRST_NAME, null, + WaoUser.PROPERTY_LAST_NAME, null, + WaoUser.PROPERTY_ROLE, role.ordinal()); if (log.isDebugEnabled()) { log.debug("Create observer : " + observer); @@ -467,7 +467,7 @@ if (row != null) { // Load properties for (String property : properties) { - if (property.equals(SampleRow.ELLIGIBLE_BOAT)) { + if (property.equals(SampleRow.PROPERTY_ELLIGIBLE_BOAT)) { row.sizeElligibleBoat(); } } @@ -545,11 +545,11 @@ TopiaContext transaction = manager.getContext().beginTransaction(); WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); - WaoUser user = userDAO.create(WaoUser.FIRST_NAME,"Jean", WaoUser.LAST_NAME, "Michmuche", - WaoUser.COMPANY, company1); + WaoUser user = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Jean", WaoUser.PROPERTY_LAST_NAME, "Michmuche", + WaoUser.PROPERTY_COMPANY, company1); company1.addWaoUser(user); - WaoUser user2 = userDAO.create(WaoUser.FIRST_NAME,"Bill", WaoUser.LAST_NAME, "Murray", - WaoUser.COMPANY, company2); + WaoUser user2 = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Bill", WaoUser.PROPERTY_LAST_NAME, "Murray", + WaoUser.PROPERTY_COMPANY, company2); company2.addWaoUser(user2); transaction.commitTransaction(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java 2010-11-26 14:14:35 UTC (rev 805) @@ -123,9 +123,9 @@ TopiaQuery query = dao.createQueryDoneContactsFromDate(null, null); String contact = query.getMainAlias(); - String tideBegin = contact + "." + Contact.TIDE_BEGIN_DATE; + String tideBegin = contact + "." + Contact.PROPERTY_TIDE_BEGIN_DATE; - String sampleRow = contact + "." + Contact.SAMPLE_ROW; + String sampleRow = contact + "." + Contact.PROPERTY_SAMPLE_ROW; query.addEquals(sampleRow, curr); query.addGroup(sampleRow); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-11-26 14:14:35 UTC (rev 805) @@ -109,9 +109,9 @@ TopiaContext transaction = manager.getContext().beginTransaction(); FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - FishingZone zoneIId = zoneDAO.create(FishingZone.DISTRICT_CODE, "IId"); - FishingZone zoneIV = zoneDAO.create(FishingZone.DISTRICT_CODE, "IV"); - FishingZone zoneI = zoneDAO.create(FishingZone.DISTRICT_CODE, "I"); + FishingZone zoneIId = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); + FishingZone zoneIV = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); + FishingZone zoneI = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); transaction.commitTransaction(); @@ -188,23 +188,23 @@ TopiaContext transaction = manager.getContext().beginTransaction(); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - Company company = companyDAO.create(Company.NAME, "TARTANPION"); - Company company2 = companyDAO.create(Company.NAME, "BIS"); + Company company = companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + Company company2 = companyDAO.create(Company.PROPERTY_NAME, "BIS"); WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); - WaoUser user = userDAO.create(WaoUser.FIRST_NAME,"Jean", WaoUser.LAST_NAME, "Michmuche", - WaoUser.COMPANY, company); + WaoUser user = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Jean", WaoUser.PROPERTY_LAST_NAME, "Michmuche", + WaoUser.PROPERTY_COMPANY, company); company.addWaoUser(user); - WaoUser user2 = userDAO.create(WaoUser.FIRST_NAME,"Bill", WaoUser.LAST_NAME, "Murray", - WaoUser.COMPANY, company2); + WaoUser user2 = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Bill", WaoUser.PROPERTY_LAST_NAME, "Murray", + WaoUser.PROPERTY_COMPANY, company2); company2.addWaoUser(user2); transaction.commitTransaction(); FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - FishingZone zoneIId = zoneDAO.create(FishingZone.DISTRICT_CODE, "IId"); - FishingZone zoneIV = zoneDAO.create(FishingZone.DISTRICT_CODE, "IV"); - FishingZone zoneI = zoneDAO.create(FishingZone.DISTRICT_CODE, "I"); + FishingZone zoneIId = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); + FishingZone zoneIV = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); + FishingZone zoneI = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); transaction.commitTransaction(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java 2010-11-26 14:14:35 UTC (rev 805) @@ -87,7 +87,7 @@ SampleMonthDAO monthDAO = WaoDAOHelper.getSampleMonthDAO(transaction); - SampleMonth month = monthDAO.create(SampleMonth.SAMPLE_ROW, row); + SampleMonth month = monthDAO.create(SampleMonth.PROPERTY_SAMPLE_ROW, row); Calendar calendar = new GregorianCalendar(2009, 3, 1); month.setPeriodDate(calendar.getTime()); row.addSampleMonth(month); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2010-11-26 14:14:35 UTC (rev 805) @@ -229,7 +229,7 @@ CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); manager.getContext().prepareTopiaId(Company.class, company); companyDAO.update(company); - companyDAO.create(Company.NAME, "BIS"); + companyDAO.create(Company.PROPERTY_NAME, "BIS"); transaction.commitTransaction(); ServiceSampling serviceSampling = manager.getServiceSampling(); @@ -378,22 +378,22 @@ BoatDAO boatDAO = WaoDAOHelper.getBoatDAO(transaction); Boat boat = boatDAO.create( - Boat.NAME, "TESTBOAT", - Boat.IMMATRICULATION, 174592); + Boat.PROPERTY_NAME, "TESTBOAT", + Boat.PROPERTY_IMMATRICULATION, 174592); ActivityCalendarDAO dao = WaoDAOHelper.getActivityCalendarDAO(transaction); ActivityCalendar calendar1 = dao.create( - ActivityCalendar.BOAT, boat, - ActivityCalendar.YEAR, 2008); + ActivityCalendar.PROPERTY_BOAT, boat, + ActivityCalendar.PROPERTY_YEAR, 2008); ActivityCalendar calendar2 = dao.create( - ActivityCalendar.BOAT, boat, - ActivityCalendar.YEAR, 2007); + ActivityCalendar.PROPERTY_BOAT, boat, + ActivityCalendar.PROPERTY_YEAR, 2007); ActivityCalendar calendar3 = dao.create( - ActivityCalendar.BOAT, boat, - ActivityCalendar.YEAR, 2009); + ActivityCalendar.PROPERTY_BOAT, boat, + ActivityCalendar.PROPERTY_YEAR, 2009); transaction.commitTransaction(); transaction.closeContext(); 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-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-11-26 14:14:35 UTC (rev 805) @@ -140,15 +140,15 @@ if (needObserver) { CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - company = companyDAO.create(Company.NAME, "TARTANPION"); + company = companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); observer = userDAO.create( - WaoUser.COMPANY, company, - WaoUser.LOGIN, "jmichmuche", - WaoUser.FIRST_NAME, "Jean", - WaoUser.LAST_NAME, "Michmuche", - WaoUser.ROLE, UserRole.OBSERVER.ordinal()); + WaoUser.PROPERTY_COMPANY, company, + WaoUser.PROPERTY_LOGIN, "jmichmuche", + WaoUser.PROPERTY_FIRST_NAME, "Jean", + WaoUser.PROPERTY_LAST_NAME, "Michmuche", + WaoUser.PROPERTY_ROLE, UserRole.OBSERVER.ordinal()); when(contact.getObserver()).thenReturn(observer); } @@ -156,18 +156,18 @@ SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); log.info("SampleRow : 2010_0001"); - sampleRow = rowDAO.create(SampleRow.CODE, "2010_0001", - SampleRow.COMPANY, company); + sampleRow = rowDAO.create(SampleRow.PROPERTY_CODE, "2010_0001", + SampleRow.PROPERTY_COMPANY, company); SampleMonthDAO monthDAO = WaoDAOHelper.getSampleMonthDAO(transaction); log.info("SampleMonth : 03/2010 _ row 2010_0001"); Date monthDate = DateUtil.createDate(1, 3, 2010); - sampleMonth = monthDAO.create(SampleMonth.SAMPLE_ROW, sampleRow, - SampleMonth.PERIOD_DATE, monthDate); + sampleMonth = monthDAO.create(SampleMonth.PROPERTY_SAMPLE_ROW, sampleRow, + SampleMonth.PROPERTY_PERIOD_DATE, monthDate); monthDate = DateUtil.createDate(1, 4, 2010); - monthDAO.create(SampleMonth.SAMPLE_ROW, sampleRow, - SampleMonth.PERIOD_DATE, monthDate); + monthDAO.create(SampleMonth.PROPERTY_SAMPLE_ROW, sampleRow, + SampleMonth.PROPERTY_PERIOD_DATE, monthDate); Date contactDate = DateUtil.createDate(18, 3, 2010); when(contact.getTideBeginDate()).thenReturn(contactDate); @@ -175,7 +175,7 @@ if (needBoat) { BoatDAO boatDAO = WaoDAOHelper.getBoatDAO(transaction); - boat = boatDAO.create(Boat.IMMATRICULATION, 175846); + boat = boatDAO.create(Boat.PROPERTY_IMMATRICULATION, 175846); when(contact.getBoat()).thenReturn(boat); } @@ -425,7 +425,7 @@ SampleMonthDAO dao = WaoDAOHelper.getSampleMonthDAO(transaction); TopiaQuery query = dao.createQuery(); - query.addEquals(SampleMonth.PERIOD_DATE, DateUtil.createDate(1, 4, 2010)); + query.addEquals(SampleMonth.PROPERTY_PERIOD_DATE, DateUtil.createDate(1, 4, 2010)); SampleMonth month = dao.findByQuery(query); @@ -614,34 +614,34 @@ log.info("test 2 : Error on boat"); when(reader.get(BOAT.NAVS_COD.name())).thenReturn("2222"); - checkImportError(Contact.BOAT); + checkImportError(Contact.PROPERTY_BOAT); // Reinit boat when(reader.get(BOAT.NAVS_COD.name())). thenReturn(String.valueOf(boat.getImmatriculation())); log.info("test 3 : Error on company"); when(creator.getCompany()).thenReturn(null); - checkImportError(WaoUser.COMPANY); + checkImportError(WaoUser.PROPERTY_COMPANY); // Reinit creator company when(creator.getCompany()).thenReturn(company); log.info("test 4 : Error on observer"); when(reader.get(CONTACT.OBSERV_ID.name())).thenReturn("FAKE"); - checkImportError(Contact.OBSERVER); + checkImportError(Contact.PROPERTY_OBSERVER); // Reinit observer when(reader.get(CONTACT.OBSERV_ID.name())). thenReturn(observer.getLogin()); log.info("test 5 : Error on sampleRow"); when(reader.get(SAMPLING.PLAN_CODE.name())).thenReturn("FAKE"); - checkImportError(Contact.SAMPLE_ROW); + checkImportError(Contact.PROPERTY_SAMPLE_ROW); // Reinit sampleRow when(reader.get(SAMPLING.PLAN_CODE.name())). thenReturn(sampleRow.getCode()); log.info("test 6 : Error on state"); when(reader.get(CONTACT.CONT_ETAT.name())).thenReturn("FAKE"); - checkImportError(Contact.STATE); + checkImportError(Contact.PROPERTY_STATE); // Reinit state when(reader.get(CONTACT.CONT_ETAT.name())). thenReturn(ContactState.BOARDING_DONE.libelle()); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-11-26 14:14:35 UTC (rev 805) @@ -169,7 +169,7 @@ assertEquals(3, result.getFishingZone().size()); assertEquals(3, result.getElligibleBoat().size()); - // TEST FOR DELETE ELLIGIBLE BOAT + // TEST FOR DELETE ELLIGIBLE PROPERTY_BOAT boats.remove(2); serviceSampling.createUpdateSampleRow(result, boats, new SampleRowLogImpl()); @@ -220,7 +220,7 @@ // Create an elligibleBoat active for company ElligibleBoat elligible = createElligibleBoat(row, boat, true); // Retrieve the sampleRow (updated with elligible) - row = findDefaultSampleRow(SampleRow.ELLIGIBLE_BOAT); + row = findDefaultSampleRow(SampleRow.PROPERTY_ELLIGIBLE_BOAT); /** EXEC METHOD **/ List<Boat> boats = new ArrayList<Boat>(); @@ -390,21 +390,21 @@ TopiaContext transaction = manager.getContext().beginTransaction(); FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - FishingZone zoneIId = zoneDAO.create(FishingZone.DISTRICT_CODE, "IId"); - FishingZone zoneIV = zoneDAO.create(FishingZone.DISTRICT_CODE, "IV"); - FishingZone zoneI = zoneDAO.create(FishingZone.DISTRICT_CODE, "I"); + FishingZone zoneIId = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); + FishingZone zoneIV = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); + FishingZone zoneI = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - Company company = companyDAO.create(Company.NAME, "TARTANPION"); + Company company = companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); Calendar begin = new GregorianCalendar(2009,8,1); Calendar end = new GregorianCalendar(2010,11,31); SampleRowDAO sampleRowDAO = WaoDAOHelper.getSampleRowDAO(transaction); SampleRow row = sampleRowDAO.create( - SampleRow.CODE,"2010_178", - SampleRow.COMPANY,company, - SampleRow.PROGRAM_NAME, "DPMA-2009", - SampleRow.PERIOD_BEGIN, begin.getTime(), - SampleRow.PERIOD_END, end.getTime()); + SampleRow.PROPERTY_CODE,"2010_178", + SampleRow.PROPERTY_COMPANY,company, + SampleRow.PROPERTY_PROGRAM_NAME, "DPMA-2009", + SampleRow.PROPERTY_PERIOD_BEGIN, begin.getTime(), + SampleRow.PROPERTY_PERIOD_END, end.getTime()); transaction.commitTransaction(); @@ -457,10 +457,10 @@ ProfessionDAO dao = WaoDAOHelper.getProfessionDAO(transaction); Profession profession = dao.create( - Profession.LIBELLE, "Fileyage en barre", - Profession.MESH_SIZE, "< 80", - Profession.OTHER, "90mm", - Profession.SPECIES, "barre, lieu noir, saumon des plages"); + Profession.PROPERTY_LIBELLE, "Fileyage en barre", + Profession.PROPERTY_MESH_SIZE, "< 80", + Profession.PROPERTY_OTHER, "90mm", + Profession.PROPERTY_SPECIES, "barre, lieu noir, saumon des plages"); transaction.commitTransaction(); transaction.closeContext(); @@ -483,13 +483,13 @@ TopiaContext transaction = manager.getContext().beginTransaction(); FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - FishingZone zoneIId = zoneDAO.create(FishingZone.DISTRICT_CODE, "IId"); - FishingZone zoneIV = zoneDAO.create(FishingZone.DISTRICT_CODE, "IV"); - FishingZone zoneI = zoneDAO.create(FishingZone.DISTRICT_CODE, "I"); + FishingZone zoneIId = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); + FishingZone zoneIV = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); + FishingZone zoneI = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - companyDAO.create(Company.NAME, "TARTANPION"); - companyDAO.create(Company.NAME, "BIS"); + companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + companyDAO.create(Company.PROPERTY_NAME, "BIS"); transaction.commitTransaction(); @@ -555,13 +555,13 @@ TopiaContext transaction = manager.getContext().beginTransaction(); FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - FishingZone zoneIId = zoneDAO.create(FishingZone.DISTRICT_CODE, "IId"); - FishingZone zoneIV = zoneDAO.create(FishingZone.DISTRICT_CODE, "IV"); - FishingZone zoneI = zoneDAO.create(FishingZone.DISTRICT_CODE, "I"); + FishingZone zoneIId = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); + FishingZone zoneIV = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); + FishingZone zoneI = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - companyDAO.create(Company.NAME, "TARTANPION"); - companyDAO.create(Company.NAME, "BIS"); + companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + companyDAO.create(Company.PROPERTY_NAME, "BIS"); transaction.commitTransaction(); transaction.closeContext(); @@ -618,13 +618,13 @@ TopiaContext transaction = manager.getContext().beginTransaction(); FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - zoneDAO.create(FishingZone.DISTRICT_CODE, "IId"); - zoneDAO.create(FishingZone.DISTRICT_CODE, "IV"); - zoneDAO.create(FishingZone.DISTRICT_CODE, "I"); + zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); + zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); + zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - companyDAO.create(Company.NAME, "TARTANPION"); - companyDAO.create(Company.NAME, "BIS"); + companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + companyDAO.create(Company.PROPERTY_NAME, "BIS"); transaction.commitTransaction(); transaction.closeContext(); @@ -645,13 +645,13 @@ TopiaContext transaction = manager.getContext().beginTransaction(); FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - FishingZone zoneIId = zoneDAO.create(FishingZone.DISTRICT_CODE, "IId"); - FishingZone zoneIV = zoneDAO.create(FishingZone.DISTRICT_CODE, "IV"); - FishingZone zoneI = zoneDAO.create(FishingZone.DISTRICT_CODE, "I"); + FishingZone zoneIId = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); + FishingZone zoneIV = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); + FishingZone zoneI = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - companyDAO.create(Company.NAME, "TARTANPION"); - companyDAO.create(Company.NAME, "BIS"); + companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + companyDAO.create(Company.PROPERTY_NAME, "BIS"); transaction.commitTransaction(); ServiceSampling serviceSampling = manager.getServiceSampling(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-11-26 14:14:35 UTC (rev 805) @@ -123,15 +123,15 @@ TopiaContext transaction = manager.getContext().beginTransaction(); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - Company company = companyDAO.create(Company.NAME, "TARTANPION"); - Company company2 = companyDAO.create(Company.NAME, "BIS"); + Company company = companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + Company company2 = companyDAO.create(Company.PROPERTY_NAME, "BIS"); WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); - WaoUser user = userDAO.create(WaoUser.FIRST_NAME,"Jean", WaoUser.LAST_NAME, "Michmuche", - WaoUser.COMPANY, company); + WaoUser user = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Jean", WaoUser.PROPERTY_LAST_NAME, "Michmuche", + WaoUser.PROPERTY_COMPANY, company); company.addWaoUser(user); - WaoUser user2 = userDAO.create(WaoUser.FIRST_NAME,"Bill", WaoUser.LAST_NAME, "Murray", - WaoUser.COMPANY, company2); + WaoUser user2 = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Bill", WaoUser.PROPERTY_LAST_NAME, "Murray", + WaoUser.PROPERTY_COMPANY, company2); company2.addWaoUser(user2); transaction.commitTransaction(); @@ -213,15 +213,15 @@ TopiaContext transaction = manager.getContext().beginTransaction(); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - Company company = companyDAO.create(Company.NAME, "TARTANPION"); - Company company2 = companyDAO.create(Company.NAME, "BIS"); + Company company = companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + Company company2 = companyDAO.create(Company.PROPERTY_NAME, "BIS"); WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); - WaoUser user = userDAO.create(WaoUser.FIRST_NAME,"Jean", WaoUser.LAST_NAME, "Michmuche", - WaoUser.COMPANY, company); + WaoUser user = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Jean", WaoUser.PROPERTY_LAST_NAME, "Michmuche", + WaoUser.PROPERTY_COMPANY, company); company.addWaoUser(user); - WaoUser user2 = userDAO.create(WaoUser.FIRST_NAME,"Bill", WaoUser.LAST_NAME, "Murray", - WaoUser.COMPANY, company2); + WaoUser user2 = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Bill", WaoUser.PROPERTY_LAST_NAME, "Murray", + WaoUser.PROPERTY_COMPANY, company2); company2.addWaoUser(user2); transaction.commitTransaction(); @@ -495,15 +495,15 @@ TopiaContext transaction = manager.getContext().beginTransaction(); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - Company company = companyDAO.create(Company.NAME, "TARTANPION"); - Company company2 = companyDAO.create(Company.NAME, "BIS"); + Company company = companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + Company company2 = companyDAO.create(Company.PROPERTY_NAME, "BIS"); WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); - WaoUser user = userDAO.create(WaoUser.FIRST_NAME,"Jean", WaoUser.LAST_NAME, "Michmuche", - WaoUser.COMPANY, company); + WaoUser user = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Jean", WaoUser.PROPERTY_LAST_NAME, "Michmuche", + WaoUser.PROPERTY_COMPANY, company); company.addWaoUser(user); - WaoUser user2 = userDAO.create(WaoUser.FIRST_NAME,"Bill", WaoUser.LAST_NAME, "Murray", - WaoUser.COMPANY, company2); + WaoUser user2 = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Bill", WaoUser.PROPERTY_LAST_NAME, "Murray", + WaoUser.PROPERTY_COMPANY, company2); company2.addWaoUser(user2); transaction.commitTransaction(); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-26 14:14:35 UTC (rev 805) @@ -305,7 +305,7 @@ getFilter().setSampleRows(rowsFiltered); sampleRowSelectModel = new GenericSelectModel<SampleRow>(sampleRows, SampleRow.class, - SampleRow.CODE, SampleRow.TOPIA_ID, propertyAccess); + SampleRow.PROPERTY_CODE, SampleRow.TOPIA_ID, propertyAccess); } return sampleRowSelectModel; } @@ -322,7 +322,7 @@ if (companySelectModel == null) { List<Company> companies = serviceUser.getCompanies(isAvailableDataForFiltersOnly()); companySelectModel = new GenericSelectModel<Company>(companies,Company.class, - Company.NAME, Company.TOPIA_ID, propertyAccess); + Company.PROPERTY_NAME, Company.TOPIA_ID, propertyAccess); } return companySelectModel; } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java 2010-11-26 14:14:35 UTC (rev 805) @@ -122,7 +122,7 @@ companySelectModel = new GenericSelectModel<Company>( companies, Company.class, - Company.NAME, + Company.PROPERTY_NAME, Company.TOPIA_ID, propertyAccess ); @@ -230,7 +230,7 @@ sampleRowSelectModel = new GenericSelectModel<SampleRow>( sampleRows, SampleRow.class, - SampleRow.CODE, + SampleRow.PROPERTY_CODE, SampleRow.TOPIA_ID, propertyAccess ); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-11-26 14:14:35 UTC (rev 805) @@ -304,7 +304,7 @@ public GenericSelectModel<Company> getCompaniesSelectModel() throws WaoException { if (companiesSelectModel == null) { companiesSelectModel = new GenericSelectModel<Company>(getCompanies(), - Company.class, Company.NAME, "id", propertyAccess); + Company.class, Company.PROPERTY_NAME, "id", propertyAccess); } return companiesSelectModel; } @@ -460,13 +460,13 @@ userModel = beanModelSource.createEditModel(WaoUser.class, messages); userModel.add("userRole", null); userModel.include( - WaoUser.FIRST_NAME, - WaoUser.LAST_NAME, - WaoUser.LOGIN, - WaoUser.PASSWORD, - WaoUser.PHONE_NUMBER, + WaoUser.PROPERTY_FIRST_NAME, + WaoUser.PROPERTY_LAST_NAME, + WaoUser.PROPERTY_LOGIN, + WaoUser.PROPERTY_PASSWORD, + WaoUser.PROPERTY_PHONE_NUMBER, "userRole", - WaoUser.ACTIVE + WaoUser.PROPERTY_ACTIVE ); } return userModel; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-11-26 14:14:35 UTC (rev 805) @@ -412,7 +412,7 @@ curr = serviceSampling.getNewSampleMonth(currMonth, getSampleRow()); curr.addPropertyChangeListener( - SampleMonth.EXPECTED_TIDES_VALUE, propertyChange); + SampleMonth.PROPERTY_EXPECTED_TIDES_VALUE, propertyChange); } sampleMonths.add(curr); } @@ -488,7 +488,7 @@ void onSelectedFromDeleteMonth(int index) throws WaoException { SampleMonth month = getSampleMonths().remove(index); month.removePropertyChangeListener( - SampleMonth.EXPECTED_TIDES_VALUE, propertyChange); + SampleMonth.PROPERTY_EXPECTED_TIDES_VALUE, propertyChange); edited = true; } @@ -531,7 +531,7 @@ sampleRow = serviceSampling.getSampleRow(sampleRowId); for (SampleMonth month : sampleRow.getSampleMonth()) { month.addPropertyChangeListener( - SampleMonth.EXPECTED_TIDES_VALUE, propertyChange); + SampleMonth.PROPERTY_EXPECTED_TIDES_VALUE, propertyChange); } } else { sampleRow = serviceSampling.getNewSampleRow(); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-11-26 14:14:35 UTC (rev 805) @@ -57,8 +57,8 @@ contactModel.add("createdBy", null); // contactModel.add(Contact.SAMPLE_ROW, getSampleRowPropertyConduit()); // contactModel.add(Contact.BOAT, getBoatPropertyConduit()); - contactModel.add(Contact.SAMPLE_ROW, null); - contactModel.add(Contact.BOAT, null); + contactModel.add(Contact.PROPERTY_SAMPLE_ROW, null); + contactModel.add(Contact.PROPERTY_BOAT, null); contactModel.add("mammals", null); contactModel.add("validation", null); contactModel.add("actions", null); @@ -66,35 +66,35 @@ contactModel.include( "createdBy", TopiaEntity.TOPIA_CREATE_DATE, - Contact.SAMPLE_ROW, - Contact.BOAT, - Contact.STATE, - Contact.TIDE_BEGIN_DATE, - Contact.TIDE_END_DATE, - Contact.NB_OBSERVANTS, + Contact.PROPERTY_SAMPLE_ROW, + Contact.PROPERTY_BOAT, + Contact.PROPERTY_STATE, + Contact.PROPERTY_TIDE_BEGIN_DATE, + Contact.PROPERTY_TIDE_END_DATE, + Contact.PROPERTY_NB_OBSERVANTS, "mammals", - Contact.COMMENT, - Contact.DATA_INPUT_DATE, + Contact.PROPERTY_COMMENT, + Contact.PROPERTY_DATA_INPUT_DATE, "validation", "actions"); contactModel.get(TopiaEntity.TOPIA_CREATE_DATE).sortable(false); - contactModel.get(Contact.STATE).sortable(false); - contactModel.get(Contact.TIDE_BEGIN_DATE).sortable(false); - contactModel.get(Contact.TIDE_END_DATE).sortable(false); - contactModel.get(Contact.NB_OBSERVANTS).sortable(false); - contactModel.get(Contact.DATA_INPUT_DATE).sortable(false); - contactModel.get(Contact.COMMENT).sortable(false); + contactModel.get(Contact.PROPERTY_STATE).sortable(false); + contactModel.get(Contact.PROPERTY_TIDE_BEGIN_DATE).sortable(false); + contactModel.get(Contact.PROPERTY_TIDE_END_DATE).sortable(false); + contactModel.get(Contact.PROPERTY_NB_OBSERVANTS).sortable(false); + contactModel.get(Contact.PROPERTY_DATA_INPUT_DATE).sortable(false); + contactModel.get(Contact.PROPERTY_COMMENT).sortable(false); return contactModel; } public BeanModel<Contact> buildCoordinatorContactModel(BeanModelSource beanModelSource, ComponentResources resources) { BeanModel<Contact> contactModel = buildContactModel(beanModelSource, resources); - contactModel.add(RelativePosition.AFTER, "validation", Contact.COMMENT_COORDINATOR, getCommentCoordinatorPropertyConduit()); - contactModel.add(RelativePosition.AFTER, Contact.COMMENT_COORDINATOR, Contact.COMMENT_ADMIN, getCommentAdminPropertyConduit()); - contactModel.get(Contact.COMMENT_COORDINATOR).sortable(false); - contactModel.get(Contact.COMMENT_ADMIN).sortable(false); + contactModel.add(RelativePosition.AFTER, "validation", Contact.PROPERTY_COMMENT_COORDINATOR, getCommentCoordinatorPropertyConduit()); + contactModel.add(RelativePosition.AFTER, Contact.PROPERTY_COMMENT_COORDINATOR, Contact.PROPERTY_COMMENT_ADMIN, getCommentAdminPropertyConduit()); + contactModel.get(Contact.PROPERTY_COMMENT_COORDINATOR).sortable(false); + contactModel.get(Contact.PROPERTY_COMMENT_ADMIN).sortable(false); contactModel.add(RelativePosition.BEFORE, "actions", "dataReliability", getDataReliabilityPropertyConduit()); contactModel.get("dataReliability").sortable(false); return contactModel; @@ -104,19 +104,19 @@ BeanModel<Contact> contactModel = buildCoordinatorContactModel(beanModelSource, resources); contactModel.exclude("createdBy"); contactModel.add(RelativePosition.AFTER, TopiaEntity.TOPIA_CREATE_DATE, "observer", getUserPropertyConduit()); - contactModel.add(RelativePosition.AFTER, "observer", WaoUser.COMPANY, getCompanyPropertyConduit()); - contactModel.add(RelativePosition.AFTER, Contact.SAMPLE_ROW, "program", getProgramPropertyConduit()); + contactModel.add(RelativePosition.AFTER, "observer", WaoUser.PROPERTY_COMPANY, getCompanyPropertyConduit()); + contactModel.add(RelativePosition.AFTER, Contact.PROPERTY_SAMPLE_ROW, "program", getProgramPropertyConduit()); contactModel.add(RelativePosition.AFTER, "program", "professionCode", getProfessionCodePropertyConduit()); contactModel.add(RelativePosition.AFTER, "professionCode", "professionLibelle", getProfessionLibellePropertyConduit()); contactModel.add(RelativePosition.AFTER, "professionLibelle", "professionSpecies", getProfessionSpeciesPropertyConduit()); contactModel.add(RelativePosition.AFTER, "professionSpecies", "fishingZoneFacade", getFishingZoneFacadePropertyConduit()); contactModel.add(RelativePosition.AFTER, "fishingZoneFacade", "fishingZoneSector", getFishingZoneSectorPropertyConduit()); contactModel.add(RelativePosition.AFTER, "fishingZoneSector", "fishingZoneDivision", getFishingZoneDivisionPropertyConduit()); - contactModel.add(RelativePosition.AFTER, Contact.BOAT, "boatImmatriculation", getBoatImmatriculationPropertyConduit()); + contactModel.add(RelativePosition.AFTER, Contact.PROPERTY_BOAT, "boatImmatriculation", getBoatImmatriculationPropertyConduit()); contactModel.add(RelativePosition.AFTER, "boatImmatriculation", "boatDistrictCode", getBoatDistrictCodePropertyConduit()); contactModel.get("observer").sortable(false); - contactModel.get(WaoUser.COMPANY).sortable(false); + contactModel.get(WaoUser.PROPERTY_COMPANY).sortable(false); contactModel.get("program").sortable(false); contactModel.get("professionCode").sortable(false); contactModel.get("professionLibelle").sortable(false);

1 0

[Suiviobsmer-commits] r804 - in trunk: wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/resources/i18n wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/base
by bleny＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: bleny Date: 2010-11-26 13:13:45 +0000 (Fri, 26 Nov 2010) New Revision: 804 Log: update sampling plan form to have description in field Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.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/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java 2010-11-26 12:44:45 UTC (rev 803) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java 2010-11-26 13:13:45 UTC (rev 804) @@ -20,4 +20,9 @@ public String getDescription() { return _(FishingGearDCF.class.getName() + "." + getCode()); } + + @Override + public String getFullDescription() { + return String.format("%s (%s)", getCode(), getDescription()); + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java 2010-11-26 12:44:45 UTC (rev 803) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java 2010-11-26 13:13:45 UTC (rev 804) @@ -20,4 +20,9 @@ public String getDescription() { return _(TargetSpeciesDCF.class.getName() + "." + getCode()); } + + @Override + public String getFullDescription() { + return String.format("%s (%s)", getCode(), getDescription()); + } } 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-11-26 12:44:45 UTC (rev 803) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-11-26 13:13:45 UTC (rev 804) @@ -1,66 +1,66 @@ -DCF.gear.=Not specified -DCF.gear.DRB=Boat dredges -DCF.gear.DRH=Hand dredges -DCF.gear.FAR=Aerial traps -DCF.gear.FCN=Cast nets -DCF.gear.FG=Falling gear (not specified) -DCF.gear.FIX=Traps (not specified) -DCF.gear.FPN=Stationary uncovered pound nets -DCF.gear.FPO=Pots -DCF.gear.FSN=Stow nets -DCF.gear.FWR=Barriers, fences, weirs, etc. -DCF.gear.FYK=Fyke nets -DCF.gear.GEN=Gillnets and entangling nets (not specified) -DCF.gear.GN=Gillnets (not specified) -DCF.gear.GNC=Encircling gillnets -DCF.gear.GND=Driftnets -DCF.gear.GNF=Fixed gillnets -DCF.gear.GNS=Set gillnets (anchored) -DCF.gear.GTN=Combined gillnets-trammel nets -DCF.gear.GTR=Trammel nets -DCF.gear.HAR=Harpoons -DCF.gear.HMD=Mechanized dredges -DCF.gear.HMP=Pumps -DCF.gear.HMX=Harvesting machines (not specified) -DCF.gear.LA=Wihtout purse lines (lampara) -DCF.gear.LHM=Handlines and pole-lines (mechanized) -DCF.gear.LHP=Handlines and pole-lines (hand-operated) -DCF.gear.LL=Longlines (not specified) -DCF.gear.LLD=Drifting longlines -DCF.gear.LLS=Set longlines -DCF.gear.LN=Lift nets (not specified) -DCF.gear.LNB=Boat-operated lift nets -DCF.gear.LNP=Portable lift nets -DCF.gear.LNS=Shore-operated stationary lift nets -DCF.gear.LTL=Trolling lines -DCF.gear.LX=Hooks and lines (not specified) -DCF.gear.MIS=Miscellaneous -DCF.gear.NK=Gear not know or not specified -DCF.gear.OT=Otter trawls (not specified) -DCF.gear.OTB=Otter trawls -DCF.gear.OTM=Otter trawls -DCF.gear.OTT=Other twin trawls -DCF.gear.PS=With purse lines (purse seines) -DCF.gear.PS1=One boat operated purse seines -DCF.gear.PS2=Tow boats operated purse seines -DCF.gear.PT=Pair trawls (not specified) -DCF.gear.PTB=Pair trawls -DCF.gear.PTM=Pair trawls -DCF.gear.RG=Recreational fishing gear -DCF.gear.SB=Beach seines -DCF.gear.SDN=Danish seines -DCF.gear.SPR=Pair seines -DCF.gear.SSC=Scottish seines -DCF.gear.SV=Boat or vessel seines -DCF.gear.SW=Seine nets (not specified) -DCF.gear.TB=Bottom trawls (not specified) -DCF.gear.TBB=Beam trawls -DCF.gear.TBN=Nephrops trawls -DCF.gear.TBS=Shrimp trawls -DCF.gear.TM=Midwater trawls (not specified) -DCF.gear.TMS=Shrimp trawls -DCF.gear.TX=Other trawls (not specified) -DCF.species.=Not specified +fr.ifremer.wao.entity.FishingGearDCF.=Not specified +fr.ifremer.wao.entity.FishingGearDCF.DRB=Boat dredges +fr.ifremer.wao.entity.FishingGearDCF.DRH=Hand dredges +fr.ifremer.wao.entity.FishingGearDCF.FAR=Aerial traps +fr.ifremer.wao.entity.FishingGearDCF.FCN=Cast nets +fr.ifremer.wao.entity.FishingGearDCF.FG=Falling gear (not specified) +fr.ifremer.wao.entity.FishingGearDCF.FIX=Traps (not specified) +fr.ifremer.wao.entity.FishingGearDCF.FPN=Stationary uncovered pound nets +fr.ifremer.wao.entity.FishingGearDCF.FPO=Pots +fr.ifremer.wao.entity.FishingGearDCF.FSN=Stow nets +fr.ifremer.wao.entity.FishingGearDCF.FWR=Barriers, fences, weirs, etc. +fr.ifremer.wao.entity.FishingGearDCF.FYK=Fyke nets +fr.ifremer.wao.entity.FishingGearDCF.GEN=Gillnets and entangling nets (not specified) +fr.ifremer.wao.entity.FishingGearDCF.GN=Gillnets (not specified) +fr.ifremer.wao.entity.FishingGearDCF.GNC=Encircling gillnets +fr.ifremer.wao.entity.FishingGearDCF.GND=Driftnets +fr.ifremer.wao.entity.FishingGearDCF.GNF=Fixed gillnets +fr.ifremer.wao.entity.FishingGearDCF.GNS=Set gillnets (anchored) +fr.ifremer.wao.entity.FishingGearDCF.GTN=Combined gillnets-trammel nets +fr.ifremer.wao.entity.FishingGearDCF.GTR=Trammel nets +fr.ifremer.wao.entity.FishingGearDCF.HAR=Harpoons +fr.ifremer.wao.entity.FishingGearDCF.HMD=Mechanized dredges +fr.ifremer.wao.entity.FishingGearDCF.HMP=Pumps +fr.ifremer.wao.entity.FishingGearDCF.HMX=Harvesting machines (not specified) +fr.ifremer.wao.entity.FishingGearDCF.LA=Wihtout purse lines (lampara) +fr.ifremer.wao.entity.FishingGearDCF.LHM=Handlines and pole-lines (mechanized) +fr.ifremer.wao.entity.FishingGearDCF.LHP=Handlines and pole-lines (hand-operated) +fr.ifremer.wao.entity.FishingGearDCF.LL=Longlines (not specified) +fr.ifremer.wao.entity.FishingGearDCF.LLD=Drifting longlines +fr.ifremer.wao.entity.FishingGearDCF.LLS=Set longlines +fr.ifremer.wao.entity.FishingGearDCF.LN=Lift nets (not specified) +fr.ifremer.wao.entity.FishingGearDCF.LNB=Boat-operated lift nets +fr.ifremer.wao.entity.FishingGearDCF.LNP=Portable lift nets +fr.ifremer.wao.entity.FishingGearDCF.LNS=Shore-operated stationary lift nets +fr.ifremer.wao.entity.FishingGearDCF.LTL=Trolling lines +fr.ifremer.wao.entity.FishingGearDCF.LX=Hooks and lines (not specified) +fr.ifremer.wao.entity.FishingGearDCF.MIS=Miscellaneous +fr.ifremer.wao.entity.FishingGearDCF.NK=Gear not know or not specified +fr.ifremer.wao.entity.FishingGearDCF.OT=Otter trawls (not specified) +fr.ifremer.wao.entity.FishingGearDCF.OTB=Otter trawls +fr.ifremer.wao.entity.FishingGearDCF.OTM=Otter trawls +fr.ifremer.wao.entity.FishingGearDCF.OTT=Other twin trawls +fr.ifremer.wao.entity.FishingGearDCF.PS=With purse lines (purse seines) +fr.ifremer.wao.entity.FishingGearDCF.PS1=One boat operated purse seines +fr.ifremer.wao.entity.FishingGearDCF.PS2=Tow boats operated purse seines +fr.ifremer.wao.entity.FishingGearDCF.PT=Pair trawls (not specified) +fr.ifremer.wao.entity.FishingGearDCF.PTB=Pair trawls +fr.ifremer.wao.entity.FishingGearDCF.PTM=Pair trawls +fr.ifremer.wao.entity.FishingGearDCF.RG=Recreational fishing gear +fr.ifremer.wao.entity.FishingGearDCF.SB=Beach seines +fr.ifremer.wao.entity.FishingGearDCF.SDN=Danish seines +fr.ifremer.wao.entity.FishingGearDCF.SPR=Pair seines +fr.ifremer.wao.entity.FishingGearDCF.SSC=Scottish seines +fr.ifremer.wao.entity.FishingGearDCF.SV=Boat or vessel seines +fr.ifremer.wao.entity.FishingGearDCF.SW=Seine nets (not specified) +fr.ifremer.wao.entity.FishingGearDCF.TB=Bottom trawls (not specified) +fr.ifremer.wao.entity.FishingGearDCF.TBB=Beam trawls +fr.ifremer.wao.entity.FishingGearDCF.TBN=Nephrops trawls +fr.ifremer.wao.entity.FishingGearDCF.TBS=Shrimp trawls +fr.ifremer.wao.entity.FishingGearDCF.TM=Midwater trawls (not specified) +fr.ifremer.wao.entity.FishingGearDCF.TMS=Shrimp trawls +fr.ifremer.wao.entity.FishingGearDCF.TX=Other trawls (not specified) +fr.ifremer.wao.entity.TargetSpeciesDCF.=Not specified wao.business.bean.DataReliability.doubtful=doubtful wao.business.bean.DataReliability.not_provided=not provided wao.business.bean.DataReliability.not_reliable=not reliable 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-11-26 12:44:45 UTC (rev 803) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-11-26 13:13:45 UTC (rev 804) @@ -1,128 +1,128 @@ -DCF.gear.=Non sp\u00E9cifi\u00E9 -DCF.gear.DRB=Dragues remorqu\u00E9es par bateau -DCF.gear.DRH=Dragues \u00E0 main -DCF.gear.FAR=Pi\u00E8ges a\u00E9riens -DCF.gear.FCN=\u00C9perviers -DCF.gear.FG=Autres engins retombants (non-sp\u00E9cifi\u00E9s) -DCF.gear.FIX=Pi\u00E8ges (non-sp\u00E9cifi\u00E9s) -DCF.gear.FPN=Filets-pi\u00E8ges fixes non couverts -DCF.gear.FPO=Nasses (casiers) -DCF.gear.FSN=Filets \u00E0 l'\u00E9talage (diables) -DCF.gear.FWR=Barrages, parcs, bordigues, etc. -DCF.gear.FYK=Verveux -DCF.gear.GEN=Filets maillants et filets emm\u00E9lants (non sp\u00E9cifi\u00E9s) -DCF.gear.GES=Tamis \u00E0 civelles -DCF.gear.GN=Filets maillants (non sp\u00E9cifi\u00E9s) -DCF.gear.GNC=Filets maillants encerclants -DCF.gear.GND=Filets maillants d\u00E9rivants (filets d\u00E9rivants) -DCF.gear.GNF=Filets maillants fixes (sur perches) -DCF.gear.GNS=Filets maillants cal\u00E9s (ancr\u00E9s) -DCF.gear.GT=Tr\u00E9mailleurs -DCF.gear.GTN=Tr\u00E9mails et filets maillants combin\u00E9s -DCF.gear.GTR=Tr\u00E9mails -DCF.gear.HAR=Harpons -DCF.gear.HMD=Dragues m\u00E9canis\u00E9es -DCF.gear.HMP=Pompes -DCF.gear.HMX=Engins de r\u00E9colte (non sp\u00E9cifi\u00E9s) -DCF.gear.LA=Filets tournants sans coulisse (filet lamparo) -DCF.gear.LHM=Lignes \u00E0 main et lignes avec cannes -DCF.gear.LHP=Lignes \u00E0 main et lignes \u00E0 cannes -DCF.gear.LL=Palangres (non sp\u00E9cifi\u00E9es) -DCF.gear.LLD=Palangres d\u00E9rivantes -DCF.gear.LLS=Palangres cal\u00E9es ou semi-flottantes -DCF.gear.LN=Filets soulev\u00E9s (non sp\u00E9cifi\u00E9s) -DCF.gear.LNB=Filets soulev\u00E9s man\u0153uvr\u00E9es du bateau -DCF.gear.LNP=Filets soulev\u00E9s portatifs -DCF.gear.LNS=Filets soulev\u00E9s fixes man\u0153uvr\u00E9es du rivage -DCF.gear.LTL=lignes de tra\u00EEne -DCF.gear.LX=Hame\u00E7ons et lignes (non sp\u00E9cifi\u00E9s) -DCF.gear.MIS=Divers -DCF.gear.NK=Engins inconnus ou non sp\u00E9cifi\u00E9s -DCF.gear.OT=Chaluts \u00E0 panneaux (non sp\u00E9cifi\u00E9) -DCF.gear.OTB=Chalut de fond \u00E0 panneaux -DCF.gear.OTM=Chaluts p\u00E9lagiques \u00E0 panneaux -DCF.gear.OTT=Chaluts jumeaux \u00E0 panneaux -DCF.gear.PS=Filets tournants avec coulisse (sennes coulissantes) -DCF.gear.PS1=Filets tournants, sennes coulissantes man\u0153uvr\u00E9es par un bateau -DCF.gear.PS2=Filets tournants, sennes coulissantes man\u0153uvr\u00E9es par deux bateaux -DCF.gear.PT=Chalut-b\u0153ufs (non sp\u00E9cifi\u00E9) -DCF.gear.PTB=Chalut-b\u0153ufs de fond -DCF.gear.PTM=Chalut-b\u0153ufs p\u00E9lagiques -DCF.gear.RG=Engins de p\u00EAche r\u00E9vr\u00E9ative -DCF.gear.SB=Sennes de plages -DCF.gear.SDN=Sennes danoises -DCF.gear.SPR=Sennes man\u0153uvr\u00E9es par deux bateaux -DCF.gear.SSC=Sennes \u00E9cossaises -DCF.gear.SV=Sennes hal\u00E9es \u00E0 bord -DCF.gear.SW=Sennes (non sp\u00E9cifi\u00E9es) -DCF.gear.TB=Chalut de fond (non sp\u00E9cifi\u00E9) -DCF.gear.TBB=Chaluts \u00E0 perche -DCF.gear.TBN=Chalut \u00E0 langoustines -DCF.gear.TBS=Chalut \u00E0 crevettes -DCF.gear.TM=Chalut p\u00E9lagique (non sp\u00E9cifi\u00E9) -DCF.gear.TMS=Chalut \u00E0 crevettes -DCF.gear.TX=Autre chalut (non sp\u00E9cifi\u00E9) -DCF.species.=Non sp\u00E9cifi\u00E9 -DCF.species.ALG=Algues -DCF.species.CAT=Esp\u00E8ces catadromes -DCF.species.CRU=Crustac\u00E9s -DCF.species.CSJ=Coquilles Saint-Jacques -DCF.species.DEF=Esp\u00E8ces d\u00E9mersales -DCF.species.DWS=Esp\u00E8ces d'eaux profondes -DCF.species.FIN=Poisson plats -DCF.species.LPF=Grands p\u00E9lagiques -DCF.species.MOL=Mollusques -DCF.species.SPF=Petits p\u00E9lagiques +fr.ifremer.wao.entity.FishingGearDCF.=Non sp\u00e9cifi\u00e9 +fr.ifremer.wao.entity.FishingGearDCF.DRB=Dragues remorqu\u00e9es par bateau +fr.ifremer.wao.entity.FishingGearDCF.DRH=Dragues \u00e0 main +fr.ifremer.wao.entity.FishingGearDCF.FAR=Pi\u00e8ges a\u00e9riens +fr.ifremer.wao.entity.FishingGearDCF.FCN=\u00c9perviers +fr.ifremer.wao.entity.FishingGearDCF.FG=Autres engins retombants (non-sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.FIX=Pi\u00e8ges (non-sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.FPN=Filets-pi\u00e8ges fixes non couverts +fr.ifremer.wao.entity.FishingGearDCF.FPO=Nasses (casiers) +fr.ifremer.wao.entity.FishingGearDCF.FSN=Filets \u00e0 l'\u00e9talage (diables) +fr.ifremer.wao.entity.FishingGearDCF.FWR=Barrages, parcs, bordigues, etc. +fr.ifremer.wao.entity.FishingGearDCF.FYK=Verveux +fr.ifremer.wao.entity.FishingGearDCF.GEN=Filets maillants et filets emm\u00e9lants (non sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.GES=Tamis \u00e0 civelles +fr.ifremer.wao.entity.FishingGearDCF.GN=Filets maillants (non sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.GNC=Filets maillants encerclants +fr.ifremer.wao.entity.FishingGearDCF.GND=Filets maillants d\u00e9rivants (filets d\u00e9rivants) +fr.ifremer.wao.entity.FishingGearDCF.GNF=Filets maillants fixes (sur perches) +fr.ifremer.wao.entity.FishingGearDCF.GNS=Filets maillants cal\u00e9s (ancr\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.GT=Tr\u00e9mailleurs +fr.ifremer.wao.entity.FishingGearDCF.GTN=Tr\u00e9mails et filets maillants combin\u00e9s +fr.ifremer.wao.entity.FishingGearDCF.GTR=Tr\u00e9mails +fr.ifremer.wao.entity.FishingGearDCF.HAR=Harpons +fr.ifremer.wao.entity.FishingGearDCF.HMD=Dragues m\u00e9canis\u00e9es +fr.ifremer.wao.entity.FishingGearDCF.HMP=Pompes +fr.ifremer.wao.entity.FishingGearDCF.HMX=Engins de r\u00e9colte (non sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.LA=Filets tournants sans coulisse (filet lamparo) +fr.ifremer.wao.entity.FishingGearDCF.LHM=Lignes \u00e0 main et lignes avec cannes +fr.ifremer.wao.entity.FishingGearDCF.LHP=Lignes \u00e0 main et lignes \u00e0 cannes +fr.ifremer.wao.entity.FishingGearDCF.LL=Palangres (non sp\u00e9cifi\u00e9es) +fr.ifremer.wao.entity.FishingGearDCF.LLD=Palangres d\u00e9rivantes +fr.ifremer.wao.entity.FishingGearDCF.LLS=Palangres cal\u00e9es ou semi-flottantes +fr.ifremer.wao.entity.FishingGearDCF.LN=Filets soulev\u00e9s (non sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.LNB=Filets soulev\u00e9s man\u0153uvr\u00e9es du bateau +fr.ifremer.wao.entity.FishingGearDCF.LNP=Filets soulev\u00e9s portatifs +fr.ifremer.wao.entity.FishingGearDCF.LNS=Filets soulev\u00e9s fixes man\u0153uvr\u00e9es du rivage +fr.ifremer.wao.entity.FishingGearDCF.LTL=lignes de tra\u00eene +fr.ifremer.wao.entity.FishingGearDCF.LX=Hame\u00e7ons et lignes (non sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.MIS=Divers +fr.ifremer.wao.entity.FishingGearDCF.NK=Engins inconnus ou non sp\u00e9cifi\u00e9s +fr.ifremer.wao.entity.FishingGearDCF.OT=Chaluts \u00e0 panneaux (non sp\u00e9cifi\u00e9) +fr.ifremer.wao.entity.FishingGearDCF.OTB=Chalut de fond \u00e0 panneaux +fr.ifremer.wao.entity.FishingGearDCF.OTM=Chaluts p\u00e9lagiques \u00e0 panneaux +fr.ifremer.wao.entity.FishingGearDCF.OTT=Chaluts jumeaux \u00e0 panneaux +fr.ifremer.wao.entity.FishingGearDCF.PS=Filets tournants avec coulisse (sennes coulissantes) +fr.ifremer.wao.entity.FishingGearDCF.PS1=Filets tournants, sennes coulissantes man\u0153uvr\u00e9es par un bateau +fr.ifremer.wao.entity.FishingGearDCF.PS2=Filets tournants, sennes coulissantes man\u0153uvr\u00e9es par deux bateaux +fr.ifremer.wao.entity.FishingGearDCF.PT=Chalut-b\u0153ufs (non sp\u00e9cifi\u00e9) +fr.ifremer.wao.entity.FishingGearDCF.PTB=Chalut-b\u0153ufs de fond +fr.ifremer.wao.entity.FishingGearDCF.PTM=Chalut-b\u0153ufs p\u00e9lagiques +fr.ifremer.wao.entity.FishingGearDCF.RG=Engins de p\u00eache r\u00e9vr\u00e9ative +fr.ifremer.wao.entity.FishingGearDCF.SB=Sennes de plages +fr.ifremer.wao.entity.FishingGearDCF.SDN=Sennes danoises +fr.ifremer.wao.entity.FishingGearDCF.SPR=Sennes man\u0153uvr\u00e9es par deux bateaux +fr.ifremer.wao.entity.FishingGearDCF.SSC=Sennes \u00e9cossaises +fr.ifremer.wao.entity.FishingGearDCF.SV=Sennes hal\u00e9es \u00e0 bord +fr.ifremer.wao.entity.FishingGearDCF.SW=Sennes (non sp\u00e9cifi\u00e9es) +fr.ifremer.wao.entity.FishingGearDCF.TB=Chalut de fond (non sp\u00e9cifi\u00e9) +fr.ifremer.wao.entity.FishingGearDCF.TBB=Chaluts \u00e0 perche +fr.ifremer.wao.entity.FishingGearDCF.TBN=Chalut \u00e0 langoustines +fr.ifremer.wao.entity.FishingGearDCF.TBS=Chalut \u00e0 crevettes +fr.ifremer.wao.entity.FishingGearDCF.TM=Chalut p\u00e9lagique (non sp\u00e9cifi\u00e9) +fr.ifremer.wao.entity.FishingGearDCF.TMS=Chalut \u00e0 crevettes +fr.ifremer.wao.entity.FishingGearDCF.TX=Autre chalut (non sp\u00e9cifi\u00e9) +fr.ifremer.wao.entity.TargetSpeciesDCF.=Non sp\u00e9cifi\u00e9 +fr.ifremer.wao.entity.TargetSpeciesDCF.ALG=Algues +fr.ifremer.wao.entity.TargetSpeciesDCF.CAT=Esp\u00e8ces catadromes +fr.ifremer.wao.entity.TargetSpeciesDCF.CRU=Crustac\u00e9s +fr.ifremer.wao.entity.TargetSpeciesDCF.CSJ=Coquilles Saint-Jacques +fr.ifremer.wao.entity.TargetSpeciesDCF.DEF=Esp\u00e8ces d\u00e9mersales +fr.ifremer.wao.entity.TargetSpeciesDCF.DWS=Esp\u00e8ces d'eaux profondes +fr.ifremer.wao.entity.TargetSpeciesDCF.FIN=Poisson plats +fr.ifremer.wao.entity.TargetSpeciesDCF.LPF=Grands p\u00e9lagiques +fr.ifremer.wao.entity.TargetSpeciesDCF.MOL=Mollusques +fr.ifremer.wao.entity.TargetSpeciesDCF.SPF=Petits p\u00e9lagiques wao.business.bean.DataReliability.doubtful=douteuse -wao.business.bean.DataReliability.not_provided=non renseign\u00E9e +wao.business.bean.DataReliability.not_provided=non renseign\u00e9e wao.business.bean.DataReliability.not_reliable=non exploitable wao.business.bean.DataReliability.reliable=exploitable wao.business.bean.DataReliability.unknown=inconnue -wao.business.bean.GlobalIndicatorValue.bad=P\u00E9nalit\u00E9 de niveau 1 +wao.business.bean.GlobalIndicatorValue.bad=P\u00e9nalit\u00e9 de niveau 1 wao.business.bean.GlobalIndicatorValue.good=Bonus de niveau 1 wao.business.bean.GlobalIndicatorValue.neutral=Conforme au cahier des charges -wao.business.bean.GlobalIndicatorValue.very_bad=P\u00E9nalit\u00E9 de niveau 2 +wao.business.bean.GlobalIndicatorValue.very_bad=P\u00e9nalit\u00e9 de niveau 2 wao.business.bean.GlobalIndicatorValue.very_good=Bonus de niveau 2 -wao.business.bean.SynthesisId.allegro_reactivity=D\u00E9lais de transmission des donn\u00E9es -wao.business.bean.SynthesisId.compliance_boarding=Respect du nombre d'observateurs embarqu\u00E9s -wao.business.bean.SynthesisId.contact_state=\u00C9tats des contacts -wao.business.bean.SynthesisId.data_reliability=Qualit\u00E9 de la donn\u00E9e -wao.business.bean.SynthesisId.graph_boarding=Taux d'embarquement sur un m\u00EAme navire conforme aux exigences -wao.business.bean.SynthesisId.graph_sampling=Taux de r\u00E9alisation du plan d'\u00E9chantillonage -wao.business.bean.SynthesisId.non_compliance_boarding=Non-respect du nombre d'observateurs embarqu\u00E9s -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 +wao.business.bean.SynthesisId.allegro_reactivity=D\u00e9lais de transmission des donn\u00e9es +wao.business.bean.SynthesisId.compliance_boarding=Respect du nombre d'observateurs embarqu\u00e9s +wao.business.bean.SynthesisId.contact_state=\u00c9tats des contacts +wao.business.bean.SynthesisId.data_reliability=Qualit\u00e9 de la donn\u00e9e +wao.business.bean.SynthesisId.graph_boarding=Taux d'embarquement sur un m\u00eame navire conforme aux exigences +wao.business.bean.SynthesisId.graph_sampling=Taux de r\u00e9alisation du plan d'\u00e9chantillonage +wao.business.bean.SynthesisId.non_compliance_boarding=Non-respect du nombre d'observateurs embarqu\u00e9s +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 wao.error.context.close=Une erreur est survenue pendant la fermeture du contexte principale de ToPIA wao.error.context.encodeString= -wao.error.context.getRootContext=Une erreur est survenue pour la r\u00E9cup\u00E9ration du contexte principale de ToPIA +wao.error.context.getRootContext=Une erreur est survenue pour la r\u00e9cup\u00e9ration du contexte principale de ToPIA wao.error.context.parse=Une erreur est survenue pendant le chargement de la configuration du fichier %1$s wao.error.context.rollback=Une erreur est survenue pendant l'annulation de la transaction courante -wao.error.context.start=Une erreur est survenue pendant le d\u00E9marrage de l'application +wao.error.context.start=Une erreur est survenue pendant le d\u00e9marrage de l'application wao.error.context.stop=Une erreur est survenue pendant la fermeture de l'application -wao.error.sampleMonth.addRealTideTime=Impossible d'enregistrer le nombre de mar\u00E9es r\u00E9els pour le mois de %1$s [ligne \: %2$s] -wao.error.sampleRow.saveSampleRowLog=Impossible d'enregistrer le commentaire \u00E9crit par %1$s -wao.error.serviceBoat.createUpdateCompanyBoatInfos=Impossible de cr\u00E9er ou modifier les informations li\u00E9s au navire %1$d pour la soci\u00E9t\u00E9 %2$s -wao.error.serviceBoat.exportBoatCsv=Impossible d'exporter les navires s\u00E9lectionn\u00E9s +wao.error.sampleMonth.addRealTideTime=Impossible d'enregistrer le nombre de mar\u00e9es r\u00e9els pour le mois de %1$s [ligne \: %2$s] +wao.error.sampleRow.saveSampleRowLog=Impossible d'enregistrer le commentaire \u00e9crit par %1$s +wao.error.serviceBoat.createUpdateCompanyBoatInfos=Impossible de cr\u00e9er ou modifier les informations li\u00e9s au navire %1$d pour la soci\u00e9t\u00e9 %2$s +wao.error.serviceBoat.exportBoatCsv=Impossible d'exporter les navires s\u00e9lectionn\u00e9s wao.error.serviceBoat.getActivityCalendarLogAccessFile= wao.error.serviceBoat.getActivityCalendarLogFile= wao.error.serviceBoat.getBoat=Impossible de charger le navire -wao.error.serviceBoat.getBoatNamesStartWith=Impossible de r\u00E9cup\u00E9rer les navires avec un nom commencant par '%1$s' +wao.error.serviceBoat.getBoatNamesStartWith=Impossible de r\u00e9cup\u00e9rer les navires avec un nom commencant par '%1$s' wao.error.serviceBoat.getBoatsByFilter=Impossible de filtrer la liste des navires -wao.error.serviceBoat.getBoatsByImmatriculations=La cha\u00EEne d'immatriculations est incorrect \! Chaque immatriculation doit poss\u00E9der 6 chiffres -wao.error.serviceBoat.getCompanyBoatInfos=Impossible de r\u00E9cup\u00E9rer les informations du navire immatricul\u00E9 %1$d pour la soci\u00E9t\u00E9 %2$s -wao.error.serviceBoat.getLastActivityCalendar=Impossible de charger le dernier calendrier d'activit\u00E9 du navire %1$s (%2$d) +wao.error.serviceBoat.getBoatsByImmatriculations=La cha\u00eene d'immatriculations est incorrect \! Chaque immatriculation doit poss\u00e9der 6 chiffres +wao.error.serviceBoat.getCompanyBoatInfos=Impossible de r\u00e9cup\u00e9rer les informations du navire immatricul\u00e9 %1$d pour la soci\u00e9t\u00e9 %2$s +wao.error.serviceBoat.getLastActivityCalendar=Impossible de charger le dernier calendrier d'activit\u00e9 du navire %1$s (%2$d) wao.error.serviceBoat.getNbBoatsByFilter=Impossible de filtrer la liste des navires wao.error.serviceBoat.getShipOwnerNamesContains= -wao.error.serviceBoat.importActivityCalendarCsv=Probl\u00E8me d'import du fichier CSV des calendriers d'activit\u00E9 -wao.error.serviceBoat.importBoatCsv=Probl\u00E8me d'import du fichier CSV. V\u00E9rifiez l'en-t\u00EAte du fichier \: [ NAVS_COD,CARN_NOM,CARN_LONGUEUR_HT,CARN_ANNEE,QUARTIER_IMMA,PER_COD,PER_NOM,PER_PRENOM,NAVS_ACTIVE ]. Voir documentation pour plus de d\u00E9tails. +wao.error.serviceBoat.importActivityCalendarCsv=Probl\u00e8me d'import du fichier CSV des calendriers d'activit\u00e9 +wao.error.serviceBoat.importBoatCsv=Probl\u00e8me d'import du fichier CSV. V\u00e9rifiez l'en-t\u00eate du fichier \: [ NAVS_COD,CARN_NOM,CARN_LONGUEUR_HT,CARN_ANNEE,QUARTIER_IMMA,PER_COD,PER_NOM,PER_PRENOM,NAVS_ACTIVE ]. Voir documentation pour plus de d\u00e9tails. wao.error.serviceCartography.exportContactStatisticsKml= -wao.error.serviceCartography.importBoatDistrictKml=Impossible d'importer les coordonn\u00E9es des quartiers des navires. V\u00E9rifiez la documentation pour le bon format du fichier Kml. +wao.error.serviceCartography.importBoatDistrictKml=Impossible d'importer les coordonn\u00e9es des quartiers des navires. V\u00e9rifiez la documentation pour le bon format du fichier Kml. wao.error.serviceChart.getContactPieChartData= wao.error.serviceChart.getContactPieChartUrl= wao.error.serviceContact.exportContactCsv=Impossible d'exporter les contacts wao.error.serviceContact.getContacts=Impossible de filtrer la liste des contacts -wao.error.serviceContact.getNbContacts=Impossible de compter le nombre de contacts filtr\u00E9s +wao.error.serviceContact.getNbContacts=Impossible de compter le nombre de contacts filtr\u00e9s wao.error.serviceContact.getNewContact=Impossible d'instancier un nouveau contact wao.error.serviceContact.importContactCsv=Impossible d'importer les contacts wao.error.serviceContact.saveComment= @@ -130,54 +130,54 @@ wao.error.serviceContact.sendContactDoneEmail= wao.error.serviceContact.updateSampleMonthTidesValue= wao.error.serviceNews.getNewNews= -wao.error.serviceNews.getNews=Impossible de r\u00E9cup\u00E9rer l'ensemble des news +wao.error.serviceNews.getNews=Impossible de r\u00e9cup\u00e9rer l'ensemble des news wao.error.serviceNews.saveNews=Impossible d'enregistrer la news ayant pour titre '%1$s' wao.error.serviceReferential.getCodesDCF5Contains= wao.error.serviceReferential.getFacades=Impossible de charger la liste des facades -wao.error.serviceReferential.getFishingZones=Impossible de charger la liste des secteurs de p\u00EAche -wao.error.serviceReferential.getProfessions=Impossible de charger la liste des m\u00E9tiers -wao.error.serviceReferential.getSectors=Impossible de charger la liste des zones de p\u00EAche -wao.error.serviceReferential.importFishingZoneCsv=Probl\u00E8me d'import du fichier CSV. V\u00E9rifiez l'en-t\u00EAte du fichier \: [ PECHE_DIVISION,PECHE_ZONE,PECHE_FACADE ]. Voir documentation pour plus de d\u00E9tails. +wao.error.serviceReferential.getFishingZones=Impossible de charger la liste des secteurs de p\u00eache +wao.error.serviceReferential.getProfessions=Impossible de charger la liste des m\u00e9tiers +wao.error.serviceReferential.getSectors=Impossible de charger la liste des zones de p\u00eache +wao.error.serviceReferential.importFishingZoneCsv=Probl\u00e8me d'import du fichier CSV. V\u00e9rifiez l'en-t\u00eate du fichier \: [ PECHE_DIVISION,PECHE_ZONE,PECHE_FACADE ]. Voir documentation pour plus de d\u00e9tails. wao.error.serviceSampling.createSampleRowLog= -wao.error.serviceSampling.createUpdateSampleRow=Impossible de sauvegarder la ligne d'\u00E9chantillon -wao.error.serviceSampling.deleteSampleRow=Impossible de supprimer la ligne d'\u00E9chantillon \: %1$s -wao.error.serviceSampling.exportSamplingPlanCsv=Impossible d'exporter le plan d'\u00E9chantillonnage sur la p\u00E9riode du %1$s au %2$s +wao.error.serviceSampling.createUpdateSampleRow=Impossible de sauvegarder la ligne d'\u00e9chantillon +wao.error.serviceSampling.deleteSampleRow=Impossible de supprimer la ligne d'\u00e9chantillon \: %1$s +wao.error.serviceSampling.exportSamplingPlanCsv=Impossible d'exporter le plan d'\u00e9chantillonnage sur la p\u00e9riode du %1$s au %2$s wao.error.serviceSampling.getDCFGears= wao.error.serviceSampling.getDCFSpecies= wao.error.serviceSampling.getNewProfession= wao.error.serviceSampling.getNewSampleMonth= wao.error.serviceSampling.getNewSampleRow= -wao.error.serviceSampling.getNewSampleRowCode=Impossible de r\u00E9cup\u00E9rer un nouveau code pour une ligne d'\u00E9chantillonnage +wao.error.serviceSampling.getNewSampleRowCode=Impossible de r\u00e9cup\u00e9rer un nouveau code pour une ligne d'\u00e9chantillonnage wao.error.serviceSampling.getNewSampleRowLog= wao.error.serviceSampling.getPrograms=Impossible de charger la liste des programmes -wao.error.serviceSampling.getSampleRow=Impossible de charger la ligne d'\u00E9chantillon ayant pour identifiant \: %1$s -wao.error.serviceSampling.getSampleRowByCode=Impossible de charger la ligne d'\u00E9chantillon ayant pour code %1$s -wao.error.serviceSampling.getSampleRowsByFilter=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage -wao.error.serviceSampling.getSampleRowsOrderedByFishingZone=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage -wao.error.serviceSampling.importSamplingPlanCsv=Erreur \u00E0 la ligne %1$d [CODE \= %2$s] +wao.error.serviceSampling.getSampleRow=Impossible de charger la ligne d'\u00e9chantillon ayant pour identifiant \: %1$s +wao.error.serviceSampling.getSampleRowByCode=Impossible de charger la ligne d'\u00e9chantillon ayant pour code %1$s +wao.error.serviceSampling.getSampleRowsByFilter=Impossible de r\u00e9cup\u00e9rer la liste des lignes du plan d'\u00e9chantillonnage +wao.error.serviceSampling.getSampleRowsOrderedByFishingZone=Impossible de r\u00e9cup\u00e9rer la liste des lignes du plan d'\u00e9chantillonnage +wao.error.serviceSampling.importSamplingPlanCsv=Erreur \u00e0 la ligne %1$d [CODE \= %2$s] wao.error.serviceSynthesis.getAllIndicatorLogs= -wao.error.serviceSynthesis.getBoardingBoats=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es du graphique concernant les embarquements sur les navires +wao.error.serviceSynthesis.getBoardingBoats=Impossible de r\u00e9cup\u00e9rer les donn\u00e9es du graphique concernant les embarquements sur les navires wao.error.serviceSynthesis.getComplianceBoardingIndicator= -wao.error.serviceSynthesis.getContactDataInputDateReactivity=Impossible de r\u00E9cup\u00E9rer l'indicateur de r\u00E9activit\u00E9 sur les dates de saisies dans Allegro +wao.error.serviceSynthesis.getContactDataInputDateReactivity=Impossible de r\u00e9cup\u00e9rer l'indicateur de r\u00e9activit\u00e9 sur les dates de saisies dans Allegro wao.error.serviceSynthesis.getContactPieChartData= wao.error.serviceSynthesis.getContactPieChartDataByBoatDistrict= -wao.error.serviceSynthesis.getContactStateStatistics=Impossible de r\u00E9cup\u00E9rer les statistiques sur les \u00E9tats des contacts +wao.error.serviceSynthesis.getContactStateStatistics=Impossible de r\u00e9cup\u00e9rer les statistiques sur les \u00e9tats des contacts wao.error.serviceSynthesis.getDataReliability= -wao.error.serviceSynthesis.getDataSampling=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es pour le graphique dynamique des efforts de mar\u00E9es -wao.error.serviceSynthesis.getGlobalSynthesisParameters=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es concernant les indicateurs pour la synth\u00E8se globale +wao.error.serviceSynthesis.getDataSampling=Impossible de r\u00e9cup\u00e9rer les donn\u00e9es pour le graphique dynamique des efforts de mar\u00e9es +wao.error.serviceSynthesis.getGlobalSynthesisParameters=Impossible de r\u00e9cup\u00e9rer les donn\u00e9es concernant les indicateurs pour la synth\u00e8se globale wao.error.serviceSynthesis.getGlobalSynthesisResult= -wao.error.serviceSynthesis.getNonComplianceBoardingIndicator=Impossible de r\u00E9cup\u00E9rer l'indicateur de non respect du nombre d'observateurs embarqu\u00E9s -wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Impossible de mettre \u00E0 jour les param\u00E8tres de la synth\u00E8se globale +wao.error.serviceSynthesis.getNonComplianceBoardingIndicator=Impossible de r\u00e9cup\u00e9rer l'indicateur de non respect du nombre d'observateurs embarqu\u00e9s +wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Impossible de mettre \u00e0 jour les param\u00e8tres de la synth\u00e8se globale wao.error.serviceUser.connect=Une erreur est survenue lors de la demande de connexion -wao.error.serviceUser.createDefaultAdmin=Impossible de cr\u00E9er l'administrateur par d\u00E9faut -wao.error.serviceUser.createUpdateCompany=Impossible de cr\u00E9er ou de mettre \u00E0 jour la soci\u00E9t\u00E9 -wao.error.serviceUser.createUpdateUser=Impossible de cr\u00E9er ou de mettre \u00E0 jour l'utilisateur +wao.error.serviceUser.createDefaultAdmin=Impossible de cr\u00e9er l'administrateur par d\u00e9faut +wao.error.serviceUser.createUpdateCompany=Impossible de cr\u00e9er ou de mettre \u00e0 jour la soci\u00e9t\u00e9 +wao.error.serviceUser.createUpdateUser=Impossible de cr\u00e9er ou de mettre \u00e0 jour l'utilisateur wao.error.serviceUser.deleteUser=Impossible de supprimer l'utilisateur wao.error.serviceUser.existLogin= wao.error.serviceUser.forgetPassword=Impossible d'envoyer le mail d'oubli de mot de passe -wao.error.serviceUser.getCompanies=Impossible de r\u00E9cup\u00E9rer la liste des soci\u00E9t\u00E9s +wao.error.serviceUser.getCompanies=Impossible de r\u00e9cup\u00e9rer la liste des soci\u00e9t\u00e9s wao.error.serviceUser.getCompany= wao.error.serviceUser.getNewUser=Impossible d'instancier un nouvel utilisateur -wao.error.serviceUser.getObservers=Impossible de r\u00E9cup\u00E9rer la liste des observateurs +wao.error.serviceUser.getObservers=Impossible de r\u00e9cup\u00e9rer la liste des observateurs wao.error.serviceUser.getUserRolesByLogin= -wao.error.serviceUser.getUsersByCompany=Impossible de r\u00E9cup\u00E9rer la liste des utilisateurs de la soci\u00E9t\u00E9 %1$s +wao.error.serviceUser.getUsersByCompany=Impossible de r\u00e9cup\u00e9rer la liste des utilisateurs de la soci\u00e9t\u00e9 %1$s Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-26 12:44:45 UTC (rev 803) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-26 13:13:45 UTC (rev 804) @@ -299,13 +299,6 @@ if (sampleRowSelectModel == null) { // WARN : no use of sampleRow filter - /* - SampleRow rowFiltered = getFilter().getSampleRow(); - getFilter().setSampleRow(null); - List<SampleRow> sampleRows = serviceSampling.getSampleRowsByFilter(getFilter()); - getFilter().setSampleRow(rowFiltered); - */ - List<SampleRow> rowsFiltered = getFilter().getSampleRows(); getFilter().setSampleRows(null); List<SampleRow> sampleRows = serviceSampling.getSampleRowsByFilter(getFilter()); @@ -386,7 +379,7 @@ getFilter().setFishingGearDCF(keptFishingGearDCF); dcfGearSelectModel = new GenericSelectModel<FishingGearDCF>(fishingGearDCFs, FishingGearDCF.class, - FishingGearDCF.CODE, FishingGearDCF.TOPIA_ID, propertyAccess); + "fullDescription", FishingGearDCF.TOPIA_ID, propertyAccess); } return dcfGearSelectModel; } @@ -406,7 +399,7 @@ getFilter().setTargetSpeciesDCF(keptTargetSpeciesDCF); dcfSpeciesSelectModel = new GenericSelectModel<TargetSpeciesDCF>(targetSpeciesDCFs, TargetSpeciesDCF.class, - TargetSpeciesDCF.CODE, TargetSpeciesDCF.TOPIA_ID, propertyAccess); + "fullDescription", TargetSpeciesDCF.TOPIA_ID, propertyAccess); } return dcfSpeciesSelectModel; }

1 0