Observe-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
September 2018
- 1 participants
- 147 discussions
[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 23 Sep '18
by Tony CHEMIT 23 Sep '18
23 Sep '18
Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe
Commits:
60949474 by 166231 at 2018-09-23T13:24:35Z
Site checkin for project ObServe :: Pom
- - - - -
4 changed files:
- changelog.html
- changes-report.html
- dev-activity.html
- file-activity.html
Changes:
=====================================
changelog.html
=====================================
@@ -93,16 +93,56 @@
<p>Total number of changed sets: 1</p>
<div class="section">
<h3><a name="Changes_between_2018-08-24_and_2018-09-24"></a>Changes between 2018-08-24 and 2018-09-24</h3>
-<p>Total commits: 80<br />Total number of files changed: 173</p>
+<p>Total commits: 90<br />Total number of files changed: 179</p>
<table border="0" class="table table-striped">
<tr class="a">
<th>Timestamp</th>
<th>Author</th>
<th>Details</th></tr>
<tr class="b">
+<td>2018-09-23 14:17:00</td>
+<td>Tony CHEMIT <dev(a)tchemit.fr></td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml">services/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml?rev=fec04535395b3…">v fec04535395b3afa9a4827c541b5c33eb941617b</a><br /><br />optimize dependencies</td></tr>
+<tr class="a">
+<td>2018-09-23 14:03:19</td>
+<td>Tony CHEMIT <dev(a)tchemit.fr></td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml">client-configuration/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml?rev=1…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml">client/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml?rev=1e8222468a8841a…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">client/src/main/resources/i18n/<b>client_en_GB.properties</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">client/src/main/resources/i18n/<b>client_es_ES.properties</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">client/src/main/resources/i18n/<b>client_fr_FR.properties</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml">dto/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml?rev=1e8222468a8841ad73…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/resources/i18n/dto_en…">dto/src/main/resources/i18n/<b>dto_en_GB.properties</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/resources/i18n/dto_en…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/resources/i18n/dto_es…">dto/src/main/resources/i18n/<b>dto_es_ES.properties</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/resources/i18n/dto_es…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/resources/i18n/dto_fr…">dto/src/main/resources/i18n/<b>dto_fr_FR.properties</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/resources/i18n/dto_fr…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/.mvn/i18n-parse-java">validation/.mvn/<b>i18n-parse-java</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/.mvn/i18n-parse-java?re…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml">validation/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml?rev=1e8222468a8…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/<b>validation_en_GB.properties</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/<b>validation_es_ES.properties</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/<b>validation_fr_FR.properties</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a><br /><br />optimize i18n + detect again all we can</td></tr>
+<tr class="b">
+<td>2018-09-23 13:28:54</td>
+<td>Tony CHEMIT <dev(a)tchemit.fr></td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/.mvn/i18n-parse-validat…">validation/.mvn/<b>i18n-parse-validation</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/.mvn/i18n-parse-validat…">v eed4e25e4f8241e6b14ab1bfbb949213ad476b67</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/.mvn/i18n-parse-validat…">validation/.mvn/<b>i18n-parse-validation-messages</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/.mvn/i18n-parse-validat…">v eed4e25e4f8241e6b14ab1bfbb949213ad476b67</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml">validation/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml?rev=eed4e25e4f8…">v eed4e25e4f8241e6b14ab1bfbb949213ad476b67</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/<b>validation_en_GB.properties</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">v eed4e25e4f8241e6b14ab1bfbb949213ad476b67</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/<b>validation_es_ES.properties</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">v eed4e25e4f8241e6b14ab1bfbb949213ad476b67</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/<b>validation_fr_FR.properties</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">v eed4e25e4f8241e6b14ab1bfbb949213ad476b67</a><br /><br />optimize i18n</td></tr>
+<tr class="a">
+<td>2018-09-23 13:12:55</td>
+<td>Tony CHEMIT <dev(a)tchemit.fr></td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/java/fr/ird/observe/d…">dto/src/main/java/fr/ird/observe/dto/data/longline/<b>TripLonglineDto.java</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/java/fr/ird/observe/d…">v dedbdd76768398422707fa00f1a93381febc45d5</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/models/Observe.model">dto/src/main/models/<b>Observe.model</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/models/Observe.model?…">v dedbdd76768398422707fa00f1a93381febc45d5</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/src/main/java/fr/ird/o…">persistence/src/main/java/fr/ird/observe/binder/data/longline/<b>TripLonglineActivityEntityDtoBinder.java</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/src/main/java/fr/ird/o…">v dedbdd76768398422707fa00f1a93381febc45d5</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/src/main/java/fr/ird/obse…">services/src/main/java/fr/ird/observe/services/validation/validators/<b>TemperatureCompareFieldValidator.java</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/src/main/java/fr/ird/obse…">v dedbdd76768398422707fa00f1a93381febc45d5</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/fr/i…">validation/src/main/resources/fr/ird/observe/dto/data/longline/<b>ActivityLonglineDto-update-error-validation.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/fr/i…">v dedbdd76768398422707fa00f1a93381febc45d5</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/fr/i…">validation/src/main/resources/fr/ird/observe/dto/data/seine/<b>ActivitySeineDto-update-error-validation.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/fr/i…">v dedbdd76768398422707fa00f1a93381febc45d5</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/vali…">validation/src/main/resources/<b>validators.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/vali…">v dedbdd76768398422707fa00f1a93381febc45d5</a><br /><br />Un contrôle insoupçonné vérifie les températures entre activités - Closes #1080</td></tr>
+<tr class="b">
+<td>2018-09-23 13:00:05</td>
+<td>Tony CHEMIT <dev(a)tchemit.fr></td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml">client-configuration/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml?rev=3…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml">client/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml?rev=330cd26380f2571…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml">dto/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml?rev=330cd26380f2571adc…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml">observe/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml?rev=330cd26380f257…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml">persistence/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml?rev=330cd26380…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml"><b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml?rev=330cd26380f2571adcb41f…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml">server-configuration/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml?rev=3…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml">server/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml?rev=330cd26380f2571…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml">services-client/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml?rev=330cd2…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml">services-local/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml?rev=330cd26…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml">services/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml?rev=330cd26380f25…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml">test/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml?rev=330cd26380f2571ad…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml">validation/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml?rev=330cd26380f…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a><br /><br />Revert "[jgitflow-maven-plugin]updating poms for 7.0-<a class="externalLink" href="http://jira.codehaus.org/browse/RC-23">RC-23</a>-SNAPSHOT development[skip ci]"<br /><br />This reverts commit 6a01a724cd1b921bd952795c25d83e0dbe5e0c02.</td></tr>
+<tr class="a">
+<td>2018-09-23 12:40:43</td>
+<td>Tony CHEMIT <dev(a)tchemit.fr></td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml">client-configuration/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml?rev=d…">v d5576682e34670c6162ed912577748a5d5981017</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml">client/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml?rev=d5576682e34670c…">v d5576682e34670c6162ed912577748a5d5981017</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml">dto/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml?rev=d5576682e34670c616…">v d5576682e34670c6162ed912577748a5d5981017</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml">observe/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml?rev=d5576682e34670…">v d5576682e34670c6162ed912577748a5d5981017</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml">persistence/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml?rev=d5576682e3…">v d5576682e34670c6162ed912577748a5d5981017</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml"><b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml?rev=d5576682e34670c6162ed9…">v d5576682e34670c6162ed912577748a5d5981017</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml">server-configuration/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml?rev=d…">v d5576682e34670c6162ed912577748a5d5981017</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml">server/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml?rev=d5576682e34670c…">v d5576682e34670c6162ed912577748a5d5981017</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml">services-client/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml?rev=d55766…">v d5576682e34670c6162ed912577748a5d5981017</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml">services-local/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml?rev=d557668…">v d5576682e34670c6162ed912577748a5d5981017</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml">services/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml?rev=d5576682e3467…">v d5576682e34670c6162ed912577748a5d5981017</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml">test/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml?rev=d5576682e34670c61…">v d5576682e34670c6162ed912577748a5d5981017</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml">validation/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml?rev=d5576682e34…">v d5576682e34670c6162ed912577748a5d5981017</a><br /><br />[jgitflow-maven-plugin]updating poms for branch'release/7.0-<a class="externalLink" href="http://jira.codehaus.org/browse/RC-22">RC-22</a>' with non-snapshot versions[skip ci]</td></tr>
+<tr class="b">
+<td>2018-09-23 12:18:09</td>
+<td>Tony CHEMIT <dev(a)tchemit.fr></td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml">dto/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml?rev=e4977e4973a214c4cd…">v e4977e4973a214c4cdec7fae427da950b21953f0</a><br /><br />[jgitflow-maven-plugin]updating poms for 7.0-<a class="externalLink" href="http://jira.codehaus.org/browse/RC-22">RC-22</a> branch with snapshot versions[skip ci]</td></tr>
+<tr class="a">
+<td>2018-09-23 09:51:33</td>
+<td>Tony CHEMIT <dev(a)tchemit.fr></td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml">client-configuration/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml?rev=1…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml">client/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml?rev=1703fb1fc75e38d…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml">dto/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml?rev=1703fb1fc75e38d99c…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml">observe/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml?rev=1703fb1fc75e38…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml">persistence/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml?rev=1703fb1fc7…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml"><b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml?rev=1703fb1fc75e38d99cde60…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml">server-configuration/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml?rev=1…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml">server/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml?rev=1703fb1fc75e38d…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml">services-client/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml?rev=1703fb…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml">services-local/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml?rev=1703fb1…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml">services/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml?rev=1703fb1fc75e3…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml">test/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml?rev=1703fb1fc75e38d99…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml">validation/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml?rev=1703fb1fc75…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a><br /><br />[jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci]</td></tr>
+<tr class="b">
+<td>2018-09-23 09:51:32</td>
+<td>Tony CHEMIT <dev(a)tchemit.fr></td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml">client-configuration/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml?rev=f…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml">client/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml?rev=f21c25bb91e3ea9…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml">dto/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml?rev=f21c25bb91e3ea9882…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml">observe/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml?rev=f21c25bb91e3ea…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml">persistence/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml?rev=f21c25bb91…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml"><b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml?rev=f21c25bb91e3ea9882b24f…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml">server-configuration/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml?rev=f…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml">server/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml?rev=f21c25bb91e3ea9…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml">services-client/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml?rev=f21c25…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml">services-local/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml?rev=f21c25b…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml">services/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml?rev=f21c25bb91e3e…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml">test/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml?rev=f21c25bb91e3ea988…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml">validation/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml?rev=f21c25bb91e…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a><br /><br />[jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci]</td></tr>
+<tr class="a">
<td>2018-09-23 09:43:38</td>
<td>Tony CHEMIT <dev(a)tchemit.fr></td>
<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml">client-configuration/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml?rev=1…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml">client/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml?rev=1b666e84e4349f0…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml">dto/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml?rev=1b666e84e4349f0d3e…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml">observe/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml?rev=1b666e84e4349f…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml">persistence/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml?rev=1b666e84e4…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml"><b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml?rev=1b666e84e4349f0d3ecb76…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml">server-configuration/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml?rev=1…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml">server/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml?rev=1b666e84e4349f0…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml">services-client/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml?rev=1b666e…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml">services-local/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml?rev=1b666e8…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml">services/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml?rev=1b666e84e4349…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml">test/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml?rev=1b666e84e4349f0d3…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml">validation/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml?rev=1b666e84e43…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a><br /><br />[jgitflow-maven-plugin]updating poms for branch'release/7.0-<a class="externalLink" href="http://jira.codehaus.org/browse/RC-22">RC-22</a>' with non-snapshot versions[skip ci]</td></tr>
+<tr class="b">
+<td>2018-09-23 09:43:15</td>
+<td>Tony CHEMIT <dev(a)tchemit.fr></td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml">client-configuration/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml?rev=6…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml">client/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml?rev=6a01a724cd1b921…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml">dto/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml?rev=6a01a724cd1b921bd9…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml">observe/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml?rev=6a01a724cd1b92…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml">persistence/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml?rev=6a01a724cd…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml"><b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml?rev=6a01a724cd1b921bd95279…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml">server-configuration/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml?rev=6…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml">server/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml?rev=6a01a724cd1b921…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml">services-client/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml?rev=6a01a7…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml">services-local/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml?rev=6a01a72…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml">services/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml?rev=6a01a724cd1b9…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml">test/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml?rev=6a01a724cd1b921bd…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a><br /><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml">validation/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml?rev=6a01a724cd1…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a><br /><br />[jgitflow-maven-plugin]updating poms for 7.0-<a class="externalLink" href="http://jira.codehaus.org/browse/RC-23">RC-23</a>-SNAPSHOT development[skip ci]</td></tr>
<tr class="a">
<td>2018-09-22 20:50:56</td>
<td>Tony CHEMIT <dev(a)tchemit.fr></td>
=====================================
changes-report.html
=====================================
The diff for this file was not included because it is too large.
=====================================
dev-activity.html
=====================================
@@ -92,7 +92,7 @@
<h2><a name="Developer_Activity_Report"></a>Developer Activity Report</h2>
<div class="section">
<h3><a name="Changes_between_2018-08-24_and_2018-09-24"></a>Changes between 2018-08-24 and 2018-09-24</h3>
-<p>Total commits: 80<br />Total number of files changed: 173</p>
+<p>Total commits: 90<br />Total number of files changed: 179</p>
<table border="0" class="table table-striped">
<tr class="a">
<th>Developer</th>
@@ -100,8 +100,8 @@
<th>Total Number of Files Changed</th></tr>
<tr class="b">
<td>Tony CHEMIT <dev(a)tchemit.fr></td>
-<td>80</td>
-<td>173</td></tr></table></div></div>
+<td>90</td>
+<td>179</td></tr></table></div></div>
</div>
</div>
</div>
=====================================
file-activity.html
=====================================
@@ -92,50 +92,50 @@
<h2><a name="File_Activity_Report"></a>File Activity Report</h2>
<div class="section">
<h3><a name="Changes_between_2018-08-24_and_2018-09-24"></a>Changes between 2018-08-24 and 2018-09-24</h3>
-<p>Total commits: 80<br />Total number of files changed: 173</p>
+<p>Total commits: 90<br />Total number of files changed: 179</p>
<table border="0" class="table table-striped">
<tr class="a">
<th>Filename</th>
<th>Number of Times Changed</th></tr>
<tr class="b">
<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml"><b>pom.xml</b></a> </td>
-<td>32</td></tr>
+<td>37</td></tr>
<tr class="a">
<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml">services/<b>pom.xml</b></a> </td>
-<td>21</td></tr>
+<td>27</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml">persistence/<b>pom.xml</b></a> </td>
-<td>20</td></tr>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml">validation/<b>pom.xml</b></a> </td>
+<td>26</td></tr>
<tr class="a">
<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml">client/<b>pom.xml</b></a> </td>
-<td>19</td></tr>
+<td>25</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml">server/<b>pom.xml</b></a> </td>
-<td>19</td></tr>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml">dto/<b>pom.xml</b></a> </td>
+<td>25</td></tr>
<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml">services-client/<b>pom.xml</b></a> </td>
-<td>19</td></tr>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml">persistence/<b>pom.xml</b></a> </td>
+<td>25</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml">services-local/<b>pom.xml</b></a> </td>
-<td>19</td></tr>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml">client-configuration/<b>pom.xml</b></a> </td>
+<td>24</td></tr>
<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml">validation/<b>pom.xml</b></a> </td>
-<td>19</td></tr>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml">server/<b>pom.xml</b></a> </td>
+<td>24</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml">client-configuration/<b>pom.xml</b></a> </td>
-<td>18</td></tr>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml">services-client/<b>pom.xml</b></a> </td>
+<td>24</td></tr>
<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml">dto/<b>pom.xml</b></a> </td>
-<td>18</td></tr>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml">services-local/<b>pom.xml</b></a> </td>
+<td>24</td></tr>
<tr class="b">
<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml">server-configuration/<b>pom.xml</b></a> </td>
-<td>18</td></tr>
+<td>23</td></tr>
<tr class="a">
<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml">test/<b>pom.xml</b></a> </td>
-<td>18</td></tr>
+<td>23</td></tr>
<tr class="b">
<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml">observe/<b>pom.xml</b></a> </td>
-<td>17</td></tr>
+<td>22</td></tr>
<tr class="a">
<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/referential/<b>ReferentialServiceLocal.java</b></a> </td>
<td>6</td></tr>
@@ -143,25 +143,37 @@
<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/<b>UpdateSqlStatementGenerator.java</b></a> </td>
<td>4</td></tr>
<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/ref/<b>ContentReferenceUIHandler.java</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/<b>validation_en_GB.properties</b></a> </td>
<td>4</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/src/main/java/fr/ird/obse…">services/src/main/java/fr/ird/observe/services/service/referential/<b>ReferentialService.java</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/<b>validation_es_ES.properties</b></a> </td>
<td>4</td></tr>
<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/CHANGELOG.md"><b>CHANGELOG.md</b></a> </td>
-<td>3</td></tr>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/<b>validation_fr_FR.properties</b></a> </td>
+<td>4</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/<b>ReferentialSynchronizeSqlsRequestBuilder.java</b></a> </td>
-<td>3</td></tr>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/ref/<b>ContentReferenceUIHandler.java</b></a> </td>
+<td>4</td></tr>
<tr class="a">
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/src/main/java/fr/ird/obse…">services/src/main/java/fr/ird/observe/services/service/referential/<b>ReferentialService.java</b></a> </td>
+<td>4</td></tr>
+<tr class="b">
<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">client/src/main/resources/i18n/<b>client_en_GB.properties</b></a> </td>
+<td>4</td></tr>
+<tr class="a">
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">client/src/main/resources/i18n/<b>client_es_ES.properties</b></a> </td>
+<td>4</td></tr>
+<tr class="b">
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">client/src/main/resources/i18n/<b>client_fr_FR.properties</b></a> </td>
+<td>4</td></tr>
+<tr class="a">
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/CHANGELOG.md"><b>CHANGELOG.md</b></a> </td>
<td>3</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">client/src/main/resources/i18n/<b>client_es_ES.properties</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/<b>ReferentialSynchronizeSqlsRequestBuilder.java</b></a> </td>
<td>3</td></tr>
<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">client/src/main/resources/i18n/<b>client_fr_FR.properties</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/fr/i…">validation/src/main/resources/fr/ird/observe/dto/data/seine/<b>ActivitySeineDto-update-error-validation.xml</b></a> </td>
<td>3</td></tr>
<tr class="b">
<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/src/main/java/fr/ird/obse…">services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/<b>ReferentialSynchronizeSqlsRequest.java</b></a> </td>
@@ -182,94 +194,100 @@
<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/src/main/java/fr/ird/o…">persistence/src/main/java/fr/ird/observe/persistence/migration/<b>DataSourceMigrationForVersion_6_0.java</b></a> </td>
<td>2</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/<b>validation_en_GB.properties</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/<b>ReplaceSqlStatementGenerator.java</b></a> </td>
<td>2</td></tr>
<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/<b>validation_es_ES.properties</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/src/main/java/fr/i…">services-client/src/main/java/fr/ird/observe/services/client/<b>ObserveRequestBuilder.java</b></a> </td>
<td>2</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/<b>validation_fr_FR.properties</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/src/main/filtered-resources…">server/src/main/filtered-resources/<b>mapping</b></a> </td>
<td>2</td></tr>
<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/<b>ReplaceSqlStatementGenerator.java</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/<b>UsageForDeleteUI.jaxx</b></a> </td>
<td>2</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/src/main/java/fr/i…">services-client/src/main/java/fr/ird/observe/services/client/<b>ObserveRequestBuilder.java</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/<b>UsageForDesactivateUI.jaxx</b></a> </td>
<td>2</td></tr>
<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/src/main/filtered-resources…">server/src/main/filtered-resources/<b>mapping</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/<b>UsageForDisplayUI.jaxx</b></a> </td>
<td>2</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/<b>UsageForDeleteUI.jaxx</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/java/fr/ird/observe/d…">dto/src/main/java/fr/ird/observe/dto/data/longline/<b>TripLonglineDto.java</b></a> </td>
<td>2</td></tr>
<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/<b>UsageForDesactivateUI.jaxx</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/models/Observe.model">dto/src/main/models/<b>Observe.model</b></a> </td>
<td>2</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/<b>UsageForDisplayUI.jaxx</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/src/main/java/fr/ird/o…">persistence/src/main/java/fr/ird/observe/binder/data/longline/<b>TripLonglineActivityEntityDtoBinder.java</b></a> </td>
<td>2</td></tr>
<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/legacy/<b>UnidirectionalReferentialSynchronizeLocalServiceLocal.java</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/src/main/java/fr/ird/obse…">services/src/main/java/fr/ird/observe/services/validation/validators/<b>TemperatureCompareFieldValidator.java</b></a> </td>
<td>2</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/<b>DeleteSqlStatementGenerator.java</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/fr/i…">validation/src/main/resources/fr/ird/observe/dto/data/longline/<b>ActivityLonglineDto-update-error-validation.xml</b></a> </td>
<td>2</td></tr>
<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/admin/export/<b>ExportUIHandler.java</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/vali…">validation/src/main/resources/<b>validators.xml</b></a> </td>
<td>2</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/<b>DataSynchroModel.java</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/legacy/<b>UnidirectionalReferentialSynchronizeLocalServiceLocal.java</b></a> </td>
<td>2</td></tr>
<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/<b>DataSynchroUI.jaxx</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/<b>DeleteSqlStatementGenerator.java</b></a> </td>
<td>2</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/<b>DataSynchroUI.jcss</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/admin/export/<b>ExportUIHandler.java</b></a> </td>
<td>2</td></tr>
<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/<b>DataSynchroUIHandler.java</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/<b>DataSynchroModel.java</b></a> </td>
<td>2</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/src/main/java/fr/ird/obse…">services/src/main/java/fr/ird/observe/services/service/data/<b>TripManagementService.java</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/<b>DataSynchroUI.jaxx</b></a> </td>
<td>2</td></tr>
<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/data/longline/<b>ActivityLonglineUIHandler.java</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/<b>DataSynchroUI.jcss</b></a> </td>
<td>2</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/data/seine/<b>ActivitySeineUIHandler.java</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/<b>DataSynchroUIHandler.java</b></a> </td>
<td>2</td></tr>
<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/storage/<b>StorageUIModel.java</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/src/main/java/fr/ird/obse…">services/src/main/java/fr/ird/observe/services/service/data/<b>TripManagementService.java</b></a> </td>
<td>2</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/actions/content/<b>ShowTechnicalInformationsAction.java</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/data/longline/<b>ActivityLonglineUIHandler.java</b></a> </td>
<td>2</td></tr>
<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/<b>ContentUIHandler.java</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/data/seine/<b>ActivitySeineUIHandler.java</b></a> </td>
<td>2</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/<b>TripLonglineServiceLocal.java</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/storage/<b>StorageUIModel.java</b></a> </td>
<td>2</td></tr>
<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/<b>TripSeineServiceLocal.java</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/actions/content/<b>ShowTechnicalInformationsAction.java</b></a> </td>
<td>2</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/src/main/reso…">client-configuration/src/main/resources/<b>log4j2.xml</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/<b>ContentUIHandler.java</b></a> </td>
<td>2</td></tr>
<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/src/main/reso…">client-configuration/src/main/resources/<b>observe-log4j2.xml</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/<b>TripLonglineServiceLocal.java</b></a> </td>
<td>2</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/src/main/reso…">server-configuration/src/main/resources/<b>log4j2.xml</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/<b>TripSeineServiceLocal.java</b></a> </td>
<td>2</td></tr>
<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/src/main/reso…">server-configuration/src/main/resources/<b>observeweb-log4j2.xml</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/src/main/reso…">client-configuration/src/main/resources/<b>log4j2.xml</b></a> </td>
<td>2</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/fr/i…">validation/src/main/resources/fr/ird/observe/dto/data/seine/<b>ActivitySeineDto-create-error-validation.xml</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/src/main/reso…">client-configuration/src/main/resources/<b>observe-log4j2.xml</b></a> </td>
<td>2</td></tr>
<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/fr/i…">validation/src/main/resources/fr/ird/observe/dto/data/seine/<b>ActivitySeineDto-update-error-validation.xml</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/src/main/reso…">server-configuration/src/main/resources/<b>log4j2.xml</b></a> </td>
+<td>2</td></tr>
+<tr class="b">
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/src/main/reso…">server-configuration/src/main/resources/<b>observeweb-log4j2.xml</b></a> </td>
+<td>2</td></tr>
+<tr class="a">
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/fr/i…">validation/src/main/resources/fr/ird/observe/dto/data/seine/<b>ActivitySeineDto-create-error-validation.xml</b></a> </td>
<td>2</td></tr>
<tr class="b">
<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/<b>ReferentialSynchronizeServiceLocal.java</b></a> </td>
@@ -296,6 +314,18 @@
<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/src/main/java/fr/ird/o…">persistence/src/main/java/fr/ird/observe/persistence/<b>ObserveTopiaApplicationContext.java</b></a> </td>
<td>1</td></tr>
<tr class="b">
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/resources/i18n/dto_en…">dto/src/main/resources/i18n/<b>dto_en_GB.properties</b></a> </td>
+<td>1</td></tr>
+<tr class="a">
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/resources/i18n/dto_es…">dto/src/main/resources/i18n/<b>dto_es_ES.properties</b></a> </td>
+<td>1</td></tr>
+<tr class="b">
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/resources/i18n/dto_fr…">dto/src/main/resources/i18n/<b>dto_fr_FR.properties</b></a> </td>
+<td>1</td></tr>
+<tr class="a">
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/.mvn/i18n-parse-java">validation/.mvn/<b>i18n-parse-java</b></a> </td>
+<td>1</td></tr>
+<tr class="b">
<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/<b>ReferentialSynchroUIHandler.java</b></a> </td>
<td>1</td></tr>
<tr class="a">
@@ -341,33 +371,15 @@
<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/validation/<b>ClientValidationContext.java</b></a> </td>
<td>1</td></tr>
<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/java/fr/ird/observe/d…">dto/src/main/java/fr/ird/observe/dto/data/longline/<b>TripLonglineDto.java</b></a> </td>
-<td>1</td></tr>
-<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/models/Observe.model">dto/src/main/models/<b>Observe.model</b></a> </td>
-<td>1</td></tr>
-<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/src/main/java/fr/ird/o…">persistence/src/main/java/fr/ird/observe/binder/data/longline/<b>TripLonglineActivityEntityDtoBinder.java</b></a> </td>
-<td>1</td></tr>
-<tr class="b">
<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/src/main/java/fr/ird/o…">persistence/src/main/java/fr/ird/observe/binder/data/seine/<b>ActivitySeineStubEntityDtoBinder.java</b></a> </td>
<td>1</td></tr>
-<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/src/main/java/fr/ird/obse…">services/src/main/java/fr/ird/observe/services/validation/validators/<b>TemperatureBoundFieldValidator.java</b></a> </td>
-<td>1</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/src/main/java/fr/ird/obse…">services/src/main/java/fr/ird/observe/services/validation/validators/<b>TemperatureCompareFieldValidator.java</b></a> </td>
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/src/main/java/fr/ird/obse…">services/src/main/java/fr/ird/observe/services/validation/validators/<b>TemperatureBoundFieldValidator.java</b></a> </td>
<td>1</td></tr>
<tr class="a">
<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/fr/i…">validation/src/main/resources/fr/ird/observe/dto/data/longline/<b>ActivityLonglineDto-create-error-validation.xml</b></a> </td>
<td>1</td></tr>
<tr class="b">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/fr/i…">validation/src/main/resources/fr/ird/observe/dto/data/longline/<b>ActivityLonglineDto-update-error-validation.xml</b></a> </td>
-<td>1</td></tr>
-<tr class="a">
-<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/vali…">validation/src/main/resources/<b>validators.xml</b></a> </td>
-<td>1</td></tr>
-<tr class="b">
<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/src/main/java/fr/ird/observ…">server/src/main/java/fr/ird/observe/server/injector/<b>ObserveDtoInjector.java</b></a> </td>
<td>1</td></tr>
<tr class="a">
@@ -602,6 +614,12 @@
<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/src/main/java/fr/ird/o…">persistence/src/main/java/fr/ird/observe/persistence/migration/<b>DataSourceMigrationForVersion_7_0.java</b></a> </td>
<td>1</td></tr>
<tr class="b">
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/.mvn/i18n-parse-validat…">validation/.mvn/<b>i18n-parse-validation</b></a> </td>
+<td>1</td></tr>
+<tr class="a">
+<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/.mvn/i18n-parse-validat…">validation/.mvn/<b>i18n-parse-validation-messages</b></a> </td>
+<td>1</td></tr>
+<tr class="b">
<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/<b>DesactivateSqlStatementGenerator.java</b></a> </td>
<td>1</td></tr>
<tr class="a">
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/60949474d09e212314ce29c282f…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/60949474d09e212314ce29c282f…
You're receiving this email because of your account on gitlab.com.
1
0
Tony CHEMIT deleted branch release/7.0-RC-22 at ultreiaio / ird-observe
--
You're receiving this email because of your account on gitlab.com.
1
0
Tony CHEMIT pushed new tag v7.0-RC-22 at ultreiaio / ird-observe
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/v7.0-RC-22
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][master-7.x] 12 commits: [jgitflow-maven-plugin]updating poms for 7.0-RC-23-SNAPSHOT development[skip ci]
by Tony CHEMIT 23 Sep '18
by Tony CHEMIT 23 Sep '18
23 Sep '18
Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe
Commits:
6a01a724 by Tony CHEMIT at 2018-09-23T09:43:15Z
[jgitflow-maven-plugin]updating poms for 7.0-RC-23-SNAPSHOT development[skip ci]
- - - - -
f21c25bb by Tony CHEMIT at 2018-09-23T09:51:32Z
[jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci]
- - - - -
298dd394 by Tony CHEMIT at 2018-09-23T09:51:33Z
[jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x'
- - - - -
1703fb1f by Tony CHEMIT at 2018-09-23T09:51:33Z
[jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci]
- - - - -
330cd263 by Tony CHEMIT at 2018-09-23T11:00:05Z
Revert "[jgitflow-maven-plugin]updating poms for 7.0-RC-23-SNAPSHOT development[skip ci]"
This reverts commit 6a01a724cd1b921bd952795c25d83e0dbe5e0c02.
- - - - -
dedbdd76 by Tony CHEMIT at 2018-09-23T11:12:55Z
Un contrôle insoupçonné vérifie les températures entre activités - Closes #1080
- - - - -
eed4e25e by Tony CHEMIT at 2018-09-23T11:28:54Z
optimize i18n
- - - - -
1e822246 by Tony CHEMIT at 2018-09-23T12:03:19Z
optimize i18n + detect again all we can
- - - - -
fec04535 by Tony CHEMIT at 2018-09-23T12:17:00Z
optimize dependencies
- - - - -
e4977e49 by Tony CHEMIT at 2018-09-23T12:18:09Z
[jgitflow-maven-plugin]updating poms for 7.0-RC-22 branch with snapshot versions[skip ci]
- - - - -
d5576682 by Tony CHEMIT at 2018-09-23T12:40:43Z
[jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-22' with non-snapshot versions[skip ci]
- - - - -
5051afba by Tony CHEMIT at 2018-09-23T12:48:45Z
[jgitflow-maven-plugin]merging 'release/7.0-RC-22' into 'master-7.x'
- - - - -
23 changed files:
- client-configuration/pom.xml
- client/pom.xml
- client/src/main/resources/i18n/client_en_GB.properties
- client/src/main/resources/i18n/client_es_ES.properties
- client/src/main/resources/i18n/client_fr_FR.properties
- dto/pom.xml
- − dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineDto.java
- dto/src/main/models/Observe.model
- dto/src/main/resources/i18n/dto_en_GB.properties
- dto/src/main/resources/i18n/dto_es_ES.properties
- dto/src/main/resources/i18n/dto_fr_FR.properties
- persistence/src/main/java/fr/ird/observe/binder/data/longline/TripLonglineActivityEntityDtoBinder.java
- services/pom.xml
- − services/src/main/java/fr/ird/observe/services/validation/validators/TemperatureCompareFieldValidator.java
- − validation/.mvn/i18n-parse-validation
- validation/.mvn/i18n-parse-java → validation/.mvn/i18n-parse-validation-messages
- validation/pom.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineDto-update-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml
- validation/src/main/resources/i18n/validation_en_GB.properties
- validation/src/main/resources/i18n/validation_es_ES.properties
- validation/src/main/resources/i18n/validation_fr_FR.properties
- validation/src/main/resources/validators.xml
Changes:
=====================================
client-configuration/pom.xml
=====================================
@@ -195,6 +195,13 @@
</configuration>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>services</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
=====================================
client/pom.xml
=====================================
@@ -62,25 +62,6 @@
</properties>
- <!--<repositories>-->
- <!--<repository>-->
- <!--<id>central</id>-->
- <!--<url>http://repo1.maven.org/maven2/</url>-->
- <!--<releases>-->
- <!--<enabled>true</enabled>-->
- <!--<checksumPolicy>fail</checksumPolicy>-->
- <!--</releases>-->
- <!--</repository>-->
- <!--<repository>-->
- <!--<id>geotools-repository</id>-->
- <!--<url>http://download.osgeo.org/webdav/geotools</url>-->
- <!--<releases>-->
- <!--<enabled>true</enabled>-->
- <!--<checksumPolicy>fail</checksumPolicy>-->
- <!--</releases>-->
- <!--</repository>-->
- <!--</repositories>-->
-
<dependencyManagement>
<dependencies>
<!-- Map -->
@@ -621,11 +602,6 @@
<artifactId>jts-core</artifactId>
</dependency>
- <!--<dependency>-->
- <!--<groupId>com.vividsolutions</groupId>-->
- <!--<artifactId>jts</artifactId>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.apache.struts.xwork</groupId>
<artifactId>xwork-core</artifactId>
@@ -680,19 +656,6 @@
<plugins>
- <!--<plugin>-->
- <!--<artifactId>maven-jar-plugin</artifactId>-->
- <!--<configuration>-->
- <!--<archive>-->
- <!--<manifest>-->
- <!--<useUniqueVersions>false</useUniqueVersions>-->
- <!--<addClasspath>true</addClasspath>-->
- <!--<classpathPrefix>./lib/</classpathPrefix>-->
- <!--<mainClass>${maven.jar.main.class}</mainClass>-->
- <!--</manifest>-->
- <!--</archive>-->
- <!--</configuration>-->
- <!--</plugin>-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
@@ -738,27 +701,6 @@
</enumerationSets>
</configuration>
</execution>
- <!--<execution>-->
- <!--<id>check-convergence</id>-->
- <!--<goals>-->
- <!--<goal>check-i18n-artifacts</goal>-->
- <!--</goals>-->
- <!--</execution>-->
- <!--<execution>-->
- <!--<id>scan-sources</id>-->
- <!--<goals>-->
- <!--<goal>parserJava</goal>-->
- <!--<goal>gen</goal>-->
- <!--</goals>-->
- <!--<configuration>-->
- <!--<entries>-->
- <!--<entry>-->
- <!--<specificGoal>parserJava</specificGoal>-->
- <!--<basedir>${project.build.directory}/generated-sources/java/</basedir>-->
- <!--</entry>-->
- <!--</entries>-->
- <!--</configuration>-->
- <!--</execution>-->
<execution>
<id>default-bundle</id>
<goals>
@@ -798,18 +740,6 @@
</pluginManagement>
<plugins>
- <!--<plugin>-->
- <!--<groupId>io.ultreia.java4all.jaxx</groupId>-->
- <!--<artifactId>jaxx-maven-plugin</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<goals>-->
- <!--<goal>generate</goal>-->
- <!--</goals>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
@@ -832,27 +762,6 @@
</executions>
</plugin>
- <!--<plugin>-->
- <!--<artifactId>maven-dependency-plugin</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<id>copy-dependencies</id>-->
- <!--<goals>-->
- <!--<goal>copy-dependencies</goal>-->
- <!--</goals>-->
- <!--<phase>prepare-package</phase>-->
- <!--<configuration>-->
- <!--<!–suppress MavenModelInspection –>-->
- <!--<skip>${performRelease}</skip>-->
- <!--<overWriteReleases>false</overWriteReleases>-->
- <!--<overWriteSnapshots>true</overWriteSnapshots>-->
- <!--<overWriteIfNewer>true</overWriteIfNewer>-->
- <!--<outputDirectory>${project.build.directory}/lib</outputDirectory>-->
- <!--<silent>true</silent>-->
- <!--</configuration>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
@@ -928,278 +837,6 @@
</properties>
</profile>
- <!--<profile>-->
- <!--<id>release-quality-profile</id>-->
- <!--<activation>-->
- <!--<property>-->
- <!--<name>performRelease</name>-->
- <!--<value>true</value>-->
- <!--</property>-->
- <!--</activation>-->
- <!--<build>-->
- <!--<defaultGoal>package</defaultGoal>-->
- <!--<plugins>-->
- <!--<plugin>-->
- <!--<artifactId>maven-enforcer-plugin</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<goals>-->
- <!--<goal>enforce</goal>-->
- <!--</goals>-->
- <!--<phase>validate</phase>-->
- <!--<id>ensure-no-duplicated-classes</id>-->
- <!--<configuration>-->
- <!--<rules>-->
- <!--<banDuplicateClasses>-->
- <!--<findAllDuplicates>true</findAllDuplicates>-->
- <!--</banDuplicateClasses>-->
- <!--</rules>-->
- <!--<fail>true</fail>-->
- <!--</configuration>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--<dependencies>-->
- <!--<dependency>-->
- <!--<groupId>org.codehaus.mojo</groupId>-->
- <!--<artifactId>extra-enforcer-rules</artifactId>-->
- <!--<version>1.0-beta-4</version>-->
- <!--</dependency>-->
- <!--</dependencies>-->
- <!--</plugin>-->
-
- <!--</plugins>-->
- <!--</build>-->
- <!--</profile>-->
-
- <!--<profile>-->
- <!--<id>assembly-profile</id>-->
- <!--<activation>-->
- <!--<property>-->
- <!--<name>performRelease</name>-->
- <!--<value>true</value>-->
- <!--</property>-->
- <!--</activation>-->
- <!--<build>-->
- <!--<defaultGoal>package</defaultGoal>-->
-
- <!--<pluginManagement>-->
-
- <!--<plugins>-->
-
- <!--<plugin>-->
- <!--<artifactId>maven-jar-plugin</artifactId>-->
- <!--<configuration>-->
- <!--<archive>-->
- <!--<manifest>-->
- <!--<useUniqueVersions>false</useUniqueVersions>-->
- <!--<addClasspath>false</addClasspath>-->
- <!--<classpathPrefix />-->
- <!--<mainClass>${maven.jar.main.class}</mainClass>-->
- <!--</manifest>-->
- <!--</archive>-->
- <!--</configuration>-->
- <!--</plugin>-->
-
- <!--</plugins>-->
- <!--</pluginManagement>-->
- <!--<plugins>-->
-
- <!--<plugin>-->
- <!--<artifactId>maven-shade-plugin</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<phase>package</phase>-->
- <!--<goals>-->
- <!--<goal>shade</goal>-->
- <!--</goals>-->
- <!--<configuration>-->
- <!--<createDependencyReducedPom>false</createDependencyReducedPom>-->
- <!--<transformers>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">-->
- <!--<manifestEntries>-->
- <!--<Main-Class>${maven.jar.main.class}</Main-Class>-->
- <!--<X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>-->
- <!--<X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>-->
- <!--<Build-Date>${buildDate}</Build-Date>-->
- <!--<Build-Number>${buildNumber}</Build-Number>-->
- <!--<Implementation-Model-Version>${observe.model.version}</Implementation-Model-Version>-->
- <!--</manifestEntries>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">-->
- <!--<resource>xwork.xml</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>CHANGELOG.txt</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>LICENSE.txt</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>LICENSE</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>hsqldb_lic.txt</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>hypersonic_lic.txt</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>info.xml</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>jdom-info.xml</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>README.txt</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>README.md</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>THIRD-PARTY.txt</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>HTTPS___.DSA</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>DEPENDENCIES</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>HTTPS___.SF</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>README</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>NOTICE</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>NOTICE.txt</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />-->
-
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">-->
- <!--<file>README.md</file>-->
- <!--<resource>README.md</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">-->
- <!--<file>${project.build.outputDirectory}/THIRD-PARTY.txt</file>-->
- <!--<resource>THIRD-PARTY.txt</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">-->
- <!--<file>${project.build.outputDirectory}/META-INF/${applicationName}-THIRD-PARTY.txt</file>-->
- <!--<resource>META-INF/${applicationName}-THIRD-PARTY.txt</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">-->
- <!--<file>${project.build.outputDirectory}/META-INF/${applicationName}-LICENSE.txt</file>-->
- <!--<resource>META-INF/${applicationName}-LICENSE.txt</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">-->
- <!--<file>${project.build.directory}/generated-sources/license/CHANGELOG.txt</file>-->
- <!--<resource>CHANGELOG.txt</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">-->
- <!--<file>${project.build.directory}/generated-sources/license/META-INF/${applicationName}-CHANGELOG.txt</file>-->
- <!--<resource>META-INF/${applicationName}-CHANGELOG.txt</resource>-->
- <!--</transformer>-->
-
- <!--</transformers>-->
- <!--<!–minimizeJar>true</minimizeJar>-->
- <!--<filters>-->
- <!--<filter>-->
- <!--<artifact>log4j:log4j</artifact>-->
- <!--<includes>-->
- <!--<include>**</include>-->
- <!--</includes>-->
- <!--</filter>-->
- <!--<filter>-->
- <!--<artifact>commons-logging:commons-logging</artifact>-->
- <!--<includes>-->
- <!--<include>**</include>-->
- <!--</includes>-->
- <!--</filter>-->
- <!--</filters–>-->
- <!--</configuration>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
-
- <!--<plugin>-->
- <!--<groupId>org.codehaus.mojo</groupId>-->
- <!--<artifactId>build-helper-maven-plugin</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<id>parse-version</id>-->
- <!--<goals>-->
- <!--<goal>parse-version</goal>-->
- <!--</goals>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
- <!--<plugin>-->
- <!--<groupId>com.akathist.maven.plugins.launch4j</groupId>-->
- <!--<artifactId>launch4j-maven-plugin</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<id>launch4j</id>-->
- <!--<phase>package</phase>-->
- <!--<goals>-->
- <!--<goal>launch4j</goal>-->
- <!--</goals>-->
- <!--<configuration>-->
- <!--<dontWrapJar>true</dontWrapJar>-->
- <!--<headerType>gui</headerType>-->
- <!--<outfile>${project.build.directory}/${project.build.finalName}.exe</outfile>-->
- <!--<jar>${project.build.finalName}.jar</jar>-->
- <!--<errTitle>${project.parent.name}</errTitle>-->
- <!--<jre>-->
- <!--<minVersion>1.8.0</minVersion>-->
- <!--</jre>-->
- <!--<versionInfo>-->
- <!--<!–suppress MavenModelInspection –>-->
- <!--<fileVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</fileVersion>-->
- <!--<txtFileVersion>${project.version}</txtFileVersion>-->
- <!--<fileDescription>${project.parent.description}</fileDescription>-->
- <!--<productName>${project.parent.name}</productName>-->
- <!--<!–suppress MavenModelInspection –>-->
- <!--<productVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</productVersion>-->
- <!--<txtProductVersion>${project.version}</txtProductVersion>-->
- <!--<companyName>${project.organization.name}</companyName>-->
- <!--<copyright>${project.inceptionYear} 2009 - 2016 ${project.organization.name}</copyright>-->
- <!--<internalName>observe</internalName>-->
- <!--<originalFilename>${project.build.finalName}.exe</originalFilename>-->
- <!--</versionInfo>-->
- <!--</configuration>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
-
- <!--<plugin>-->
- <!--<artifactId>maven-assembly-plugin</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<id>create-application-assembly</id>-->
- <!--<phase>package</phase>-->
- <!--<goals>-->
- <!--<goal>single</goal>-->
- <!--</goals>-->
- <!--<configuration>-->
- <!--<descriptors>-->
- <!--<descriptor>src/main/assembly/bin.xml</descriptor>-->
- <!--</descriptors>-->
- <!--<attach>true</attach>-->
- <!--<finalName>${project.build.finalName}</finalName>-->
- <!--<appendAssemblyId>false</appendAssemblyId>-->
- <!--<outputDirectory>${project.build.directory}</outputDirectory>-->
- <!--</configuration>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
-
- <!--</plugins>-->
- <!--</build>-->
- <!--</profile>-->
-
<!-- This profile update license stuff with new goal update-file-header -->
<profile>
<id>update-file-header</id>
=====================================
client/src/main/resources/i18n/client_en_GB.properties
=====================================
@@ -60,7 +60,6 @@ observe.action.do.backup=Backup local database
observe.action.do.backup.tip=Make a backup of local database before applying modifications.
observe.action.exit=Quit
observe.action.exit.tip=quit Observe
-observe.action.export.requiredInsertMissingReferentials=Insert into central source missing referentials
observe.action.floatingObjectPresets=Floating Object references
observe.action.floatingObjectPresets.tip=Manage floating Object references
observe.action.goDown=Down...
@@ -150,18 +149,11 @@ observe.actions.consolidate.title=Consolidate data
observe.actions.consolidate.title.tip=Consolidate observed data
observe.actions.exportData=Export data
observe.actions.exportData.description=Export data
-observe.actions.exportData.error.missingReferentialsId=Can't export data, there is some missing referentials in central source and you did not select insert option.
-observe.actions.exportData.error.missingReferentialsId.left=Can't export data, there is some missing referentials in left source and you did not select insert option.
-observe.actions.exportData.error.missingReferentialsId.right=Can't export data, there is some missing referentials in right source and you did not select insert option.
observe.actions.exportData.message.add.missing.referential=\t%s
-observe.actions.exportData.message.add.missing.referentials=Insert %s missing referentials of type «%s»
observe.actions.exportData.message.add.missing.referentials2=Database «%s» - Insert %s missing referentials of type «%s»
observe.actions.exportData.message.not.possible=Export is not possible (see above messages)
observe.actions.exportData.message.operation.needFix=Select data to export.
observe.actions.exportData.message.prepare.data=Prepare data to export...
-observe.actions.exportData.message.result.delete.trip=Trip %s - %s was deleted from central database
-observe.actions.exportData.message.result.export.trip=Trip %s - %s was deleted from central database
-observe.actions.exportData.message.result.import.trip=Trip %s - %s was deleted in central database
observe.actions.exportData.table.exist.label=E
observe.actions.exportData.table.exist.label.tip=Trip alreay in remote database
observe.actions.exportData.table.program.label=Program
@@ -503,9 +495,6 @@ observe.common.Dto.label.usage.data.title=Data '%1$s' (%2$d occurrences)
observe.common.Dto.label.usage.referential.title=Referentiel '%1$s' (%2$d occurrences)
observe.common.Dto.lastUpdateDate=Last update date
observe.common.Dto.message.cantWriteData=You are not allow to write data on this data source.
-observe.common.Dto.mode.create.tip=Object is in create mode
-observe.common.Dto.mode.read.tip=Object is not editable
-observe.common.Dto.mode.update.tip=Object is in editing mode
observe.common.Dto.technicalInformations=Technical information of %1$s
observe.common.Dto.topiaCreateDate=Create date
observe.common.Dto.topiaId=Technical id
@@ -855,11 +844,7 @@ observe.common.RouteDto.noneForTrip=< No route fo current trip >
observe.common.RouteDto.title=Route
observe.common.RouteDto.titles=Routes
observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Use default size measure type
-observe.common.Sample.length.computed.tip=Length was computed
-observe.common.Sample.length.observed.tip=Length was observed
observe.common.Sample.weight=Individual weight (kg)
-observe.common.Sample.weight.computed.tip=Weight was computed (%s)
-observe.common.Sample.weight.observed.tip=Weight was observed
observe.common.SchoolEstimateDto.action.create=Insert this estimate
observe.common.SchoolEstimateDto.action.create.tip=Insert this estimate
observe.common.SchoolEstimateDto.table.meanWeight=Mean weight (in Kg)
@@ -1149,7 +1134,6 @@ observe.common.directory=Directory
observe.common.exist.on.remote=%1$s (already exist)
observe.common.file=File
observe.common.global.progression.description=Global progression
-observe.common.label=Label
observe.common.ocean=Ocean
observe.common.operation.resume=Summary of operations
observe.common.resume=Summary
@@ -1295,7 +1279,6 @@ observe.message.help.usage=ObServe Help v %1$s
observe.message.loaded.tip=%1$s is loading,\nYou can change data source by clicking here
observe.message.no.local.db.found=Local data source does not exist (location %1$s).\n\nYou can create it or connect to a remote data source.
observe.message.no.report.selected=< No report selected >
-observe.message.no.species.selected=No species selected
observe.message.no.usage.for.entity=No usage found.
observe.message.quit.invalid.edit=Data are not valid and can't be saved\!\n\nNote\: If you continue, any modification will be lost.
observe.message.quit.valid.edit=Data are modified and valid\!
@@ -1309,7 +1292,6 @@ observe.message.show.usage.for.delete3=Choose a replacement reference to be able
observe.message.show.usage.for.desactivated=Referential %1$s "%2$s" will be disabled.
observe.message.show.usage.for.desactivated2=Some data are using this referential, see following reference
observe.message.show.usage.for.desactivated3=Those data need to use another enabled referential to be saved.
-observe.message.show.usage.for.missingReferentials=There is some referentials present in local source but not in centrale one.
observe.message.show.usage.for.missingReferentials2=There is some referentials present in «%s» source but not in the «%s» one.
observe.message.show.usages=List of usage of referential %1$s\: '%2$s'
observe.message.table.editBean.modified=Current entry is modifed and valid.
@@ -1319,7 +1301,6 @@ observe.message.updating.referentiel=Referential is in edition mode
observe.message.warning.will.be.delete=%1$s\n\nBe ware, export will replace existing data.
observe.runner.config.loaded=Configuration d'ObServe v. %1$s chargée.
observe.runner.context.loaded=Initialisation du contexte terminée en %1$s.
-observe.runner.copy.default.logConfigurationFile.file=Création du fichier de configuration des logs %1$s.
observe.runner.copy.default.map.file=Création des cartes %1$s.
observe.runner.copy.default.report.file=Création du fichier de reports %1$s.
observe.runner.copy.default.ui.file=Création du fichier de cosmétique %1$s.
@@ -1436,8 +1417,6 @@ observe.storage.remote.useSll=Use ssl?
observe.storage.remoteConfiguration.presets=Remote configuration presets
observe.storage.remoteConfiguration.presets.save=Save current configuration
observe.storage.report.action.migrate=Update policy
-observe.storage.report.can.migrate=Update if necessary (current version\: %1$s)
-observe.storage.report.can.not.migrate=No update possible
observe.storage.report.no.create.mode=Create mode not needed
observe.storage.required.rw.on.data=You don't have sufficient credentials to perform this operation.\n\nTo perform this operation, you need Read/Write permissions on data.
observe.storage.security.administrateur=Owner of database
@@ -1465,7 +1444,6 @@ observe.storage.useServerStorage.config=Configure remote server to use
observe.storage.useServerStorage.description=Please configure connexion to remote server\nYou must validate your connexion to continue.
observe.title.about=About
observe.title.can.not.delete.referentiel=Impossible to delete a referentiel data...
-observe.title.can.not.export.data=Could not export data
observe.title.can.not.export.data2=Could not export data to «%s» source
observe.title.can.not.export.obstuna=Could not export obstuna data...
observe.title.choose.db.dump=Choose a database backup
=====================================
client/src/main/resources/i18n/client_es_ES.properties
=====================================
@@ -60,7 +60,6 @@ observe.action.do.backup=Guardar la base local
observe.action.do.backup.tip=Hacer copia de seguridad de la base local antes de aplicar los cambios
observe.action.exit=Salir
observe.action.exit.tip=Salir de ObServe
-observe.action.export.requiredInsertMissingReferentials=Insérer les référentiels manquant dans la source centrale. \#TODO
observe.action.floatingObjectPresets=Floating Object references \#TODO
observe.action.floatingObjectPresets.tip=Manage floating Object references \#TODO
observe.action.goDown=Descender hacia ...
@@ -150,18 +149,11 @@ observe.actions.consolidate.title=Consolidar los datos observados
observe.actions.consolidate.title.tip=Consolidar los datos observados
observe.actions.exportData=Exportar los datos observados
observe.actions.exportData.description=Exportar los datos observados en la base central
-observe.actions.exportData.error.missingReferentialsId=Il existe des référentiels dans la base locale non présente en base centrale, mais vous n'avez pas activé l'option d'insertion automatique. \#TODO
-observe.actions.exportData.error.missingReferentialsId.left=Il existe des référentiels dans la base de gauche non présente en base centrale, mais vous n'avez pas activé l'option d'insertion automatique. \#TODO
-observe.actions.exportData.error.missingReferentialsId.right=Il existe des référentiels dans la base de droite non présente en base centrale, mais vous n'avez pas activé l'option d'insertion automatique. \#TODO
observe.actions.exportData.message.add.missing.referential=\t%s
-observe.actions.exportData.message.add.missing.referentials=Insertion de %s référentiels de type «%s» \#TODO
observe.actions.exportData.message.add.missing.referentials2=Base «%s» - Insertion de %s référentiels de type «%s»\#TODO
observe.actions.exportData.message.not.possible=La exportación no es posible (vea el mensaje anterior).
observe.actions.exportData.message.operation.needFix=Seleccione las mareas a exportar.
observe.actions.exportData.message.prepare.data=Preparación de los datos a exportar...
-observe.actions.exportData.message.result.delete.trip=Base «%s» - La marea %s - %s fue eliminada.
-observe.actions.exportData.message.result.export.trip=Base «%s» - La marea %s - %s fue exportada.
-observe.actions.exportData.message.result.import.trip=Base «%s» - La marea %s - %s fue importada.
observe.actions.exportData.table.exist.label=E
observe.actions.exportData.table.exist.label.tip=Marea ya está presente en la base de datos remota
observe.actions.exportData.table.program.label=Programa
@@ -503,9 +495,6 @@ observe.common.Dto.label.usage.data.title=Datos '%1$s' (%2$d ocurrencias)
observe.common.Dto.label.usage.referential.title=Referencial '%1$s' (%2$d ocurrencias)
observe.common.Dto.lastUpdateDate=Last update date
observe.common.Dto.message.cantWriteData=No tiene autorización para escribir los datos de observadores en esta fuente de datos.
-observe.common.Dto.mode.create.tip=Objeto en proceso de creación
-observe.common.Dto.mode.read.tip=Objeto no se puede editar
-observe.common.Dto.mode.update.tip=Objeto en proceso de edición
observe.common.Dto.technicalInformations=Informaciones técnicas del referencial %1$s
observe.common.Dto.topiaCreateDate=Fecha de creación
observe.common.Dto.topiaId=Técnicas de identificación
@@ -855,11 +844,7 @@ observe.common.RouteDto.noneForTrip=Ninguna ruta en la marea actual
observe.common.RouteDto.title=Ruta
observe.common.RouteDto.titles=Rutas
observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Utiliser le type de mensuration par défaut \#TODO
-observe.common.Sample.length.computed.tip=Longitud calculada
-observe.common.Sample.length.observed.tip=Longitud observada
observe.common.Sample.weight=Peso del ejemplar (en Kg)
-observe.common.Sample.weight.computed.tip=Peso calculado
-observe.common.Sample.weight.observed.tip=Peso observado
observe.common.SchoolEstimateDto.action.create=Insertar estimación
observe.common.SchoolEstimateDto.action.create.tip=Insertar la nueva estimación en la tabla
observe.common.SchoolEstimateDto.table.meanWeight=Peso medio (en Kg)
@@ -1149,7 +1134,6 @@ observe.common.directory=Carpeta
observe.common.exist.on.remote=%1$s (ya existe)
observe.common.file=Archivo
observe.common.global.progression.description=Progresión global
-observe.common.label=Texto
observe.common.ocean=Océano
observe.common.operation.resume=Resumen de operaciones
observe.common.resume=Resumen de la configuración
@@ -1295,7 +1279,6 @@ observe.message.help.usage=Ayuda de Observe v %1$s
observe.message.loaded.tip=La %1$s cargada,\n\nPuede cargar la base haciendo clic aquí.
observe.message.no.local.db.found=No existe la base local (ruta %1$s).\n\nPuede crear la base local o conectarse a una base remota.
observe.message.no.report.selected=Ningún informe seleccionado
-observe.message.no.species.selected=Ninguna especie seleccionada
observe.message.no.usage.for.entity=Ningún usuario encontrado.
observe.message.quit.invalid.edit=¡Datos no validos, no se pueden guardar\!\n\nNota\: Si continúa se cancelarán todas las modificaciones.
observe.message.quit.valid.edit=¡Los datos han sido modificados y son válidos\!
@@ -1309,7 +1292,6 @@ observe.message.show.usage.for.delete3=Elija una referencia de reemplazo para po
observe.message.show.usage.for.desactivated=El referencial %1$s "%2$s" se desactivará.
observe.message.show.usage.for.desactivated2=Los objetos están usando actualmente las referencias que se enumeran a continuación..
observe.message.show.usage.for.desactivated3=Estos objetos deben usar otro referencial (no desactivado) para poder actualizarse.
-observe.message.show.usage.for.missingReferentials=Il existe des référentiels présents dans la base locale mais non présents dans la base centrale. \#TODO
observe.message.show.usage.for.missingReferentials2=There is some referentials present in «%s» source but not in the «%s» one.
observe.message.show.usages=Listas de usos de referenciales %1$s \: '%2$s'
observe.message.table.editBean.modified=El registro actual se ha modificado y es válido.
@@ -1319,7 +1301,6 @@ observe.message.updating.referentiel=Se está actualizando el objeto.
observe.message.warning.will.be.delete=%1$s\n\nAtención, la exportación reemplazará la marea existente.
observe.runner.config.loaded=Configuración de Observe v. %1$s cargada.
observe.runner.context.loaded=Finlazada la inicialización del contexto en %1$s.
-observe.runner.copy.default.logConfigurationFile.file=Creación del archivo de configuración de los logs %1$s.
observe.runner.copy.default.map.file=Creación de los mapas %1$s.
observe.runner.copy.default.report.file=Creación del archivo de informes %1$s.
observe.runner.copy.default.ui.file=Creación del archivo de cosmético %1$s.
@@ -1436,8 +1417,6 @@ observe.storage.remote.useSll=¿modo ssl?
observe.storage.remoteConfiguration.presets=Configuration enregistrées \#TODO
observe.storage.remoteConfiguration.presets.save=Enregister cette configuration \#TODO
observe.storage.report.action.migrate=Politica de actualización
-observe.storage.report.can.migrate=Actualizar si es necesario (version actual \: %1$s)
-observe.storage.report.can.not.migrate=No es posible actualizar
observe.storage.report.no.create.mode=No se necesita seleccionar un modo de creación de la base
observe.storage.required.rw.on.data=No tiene los permisos necesarios para realizar esta operación.\n\nDebe tener permios de lectura y escritura de los datos del obaservador.
observe.storage.security.administrateur=Propietario de la base
@@ -1465,7 +1444,6 @@ observe.storage.useServerStorage.config=Configurar el servidor remoto a utilizar
observe.storage.useServerStorage.description=Configure su conexión al servidor remoto\nAntes de que pueda continuar, tiene que validar la conexión.
observe.title.about=A proposito de ObServe...
observe.title.can.not.delete.referentiel=Impossible eliminar un referencial en proceso de utilización...
-observe.title.can.not.export.data=Impossible d'exporter les données vers la base centrale... \#TODO
observe.title.can.not.export.data2=Impossible d'exporter les données vers la base «%s»... \#TODO
observe.title.can.not.export.obstuna=Impossible exportar los datos de obstuna...
observe.title.choose.db.dump=Seleccionar una copia de seguridad de base local
=====================================
client/src/main/resources/i18n/client_fr_FR.properties
=====================================
@@ -60,7 +60,6 @@ observe.action.do.backup=Sauver la base locale
observe.action.do.backup.tip=Effectuer une sauvegarde de la base locale avant d'appliquer les changements
observe.action.exit=Quitter
observe.action.exit.tip=Quitter ObServe
-observe.action.export.requiredInsertMissingReferentials=Insérer les référentiels manquant dans la source centrale.
observe.action.floatingObjectPresets=Objets flottants de références
observe.action.floatingObjectPresets.tip=Gérer les objets flottants de référence
observe.action.goDown=Descendre vers ...
@@ -150,18 +149,11 @@ observe.actions.consolidate.title=Consolider les données observateur
observe.actions.consolidate.title.tip=Consolider les données observateur
observe.actions.exportData=Exporter les données observateurs
observe.actions.exportData.description=Exporter les données observateurs vers la base centrale
-observe.actions.exportData.error.missingReferentialsId=Il existe des référentiels dans la base locale non présente en base centrale, mais vous n'avez pas activé l'option d'insertion automatique.
-observe.actions.exportData.error.missingReferentialsId.left=Il existe des référentiels dans la base de gauche non présente en base centrale, mais vous n'avez pas activé l'option d'insertion automatique.
-observe.actions.exportData.error.missingReferentialsId.right=Il existe des référentiels dans la base de droite non présente en base centrale, mais vous n'avez pas activé l'option d'insertion automatique.
observe.actions.exportData.message.add.missing.referential=\t%s
-observe.actions.exportData.message.add.missing.referentials=Insertion de %s référentiels de type «%s»
observe.actions.exportData.message.add.missing.referentials2=Source «%s» - Insertion de %s référentiels de type «%s»
observe.actions.exportData.message.not.possible=L'opération d'export n'est pas possible (voir les messages précédents).
observe.actions.exportData.message.operation.needFix=Veuillez sélectionner les marées à exporter.
observe.actions.exportData.message.prepare.data=Préparation des données à exporter...
-observe.actions.exportData.message.result.delete.trip=Source «%s» - La marée %s - %s a été supprimée de la base centrale
-observe.actions.exportData.message.result.export.trip=Source «%s» - La marée %s - %s a été exportée depuis la base locale
-observe.actions.exportData.message.result.import.trip=Source «%s» - La marée %s - %s a été importée dans la base centrale
observe.actions.exportData.table.exist.label=E
observe.actions.exportData.table.exist.label.tip=Marée déjà présente sur la base distante
observe.actions.exportData.table.program.label=Programme
@@ -503,9 +495,6 @@ observe.common.Dto.label.usage.data.title=Donnée '%1$s' (%2$d occurrences)
observe.common.Dto.label.usage.referential.title=Référentiel '%1$s' (%2$d occurrences)
observe.common.Dto.lastUpdateDate=Date de dernière mise à jour
observe.common.Dto.message.cantWriteData=Vous n'êtes pas autorisé à écrire des données observateurs sur cette source de données.
-observe.common.Dto.mode.create.tip=L'objet est en cours de création
-observe.common.Dto.mode.read.tip=L'objet n'est pas éditable
-observe.common.Dto.mode.update.tip=L'objet est en cours d'édition
observe.common.Dto.technicalInformations=Informations techniques de l'objet de type '%1$s'
observe.common.Dto.topiaCreateDate=Date de création
observe.common.Dto.topiaId=Identifiant technique
@@ -855,11 +844,7 @@ observe.common.RouteDto.noneForTrip=< Aucune route pour la marée courante >
observe.common.RouteDto.title=Route
observe.common.RouteDto.titles=Routes
observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Utiliser le type de mensuration par défaut
-observe.common.Sample.length.computed.tip=La longueur a été calculée
-observe.common.Sample.length.observed.tip=La longueur a été observée
observe.common.Sample.weight=Poids ind. (en Kg)
-observe.common.Sample.weight.computed.tip=Le poids a été calculé
-observe.common.Sample.weight.observed.tip=Le poids a été observé
observe.common.SchoolEstimateDto.action.create=Insérer cette estimation
observe.common.SchoolEstimateDto.action.create.tip=Insérer la nouvelle estimation dans la table
observe.common.SchoolEstimateDto.table.meanWeight=Poids moyen (en Kg)
@@ -1149,7 +1134,6 @@ observe.common.directory=Répertoire
observe.common.exist.on.remote=%1$s (déjà existante)
observe.common.file=Fichier
observe.common.global.progression.description=Progression globale
-observe.common.label=Libellé
observe.common.ocean=Océan
observe.common.operation.resume=Résumé des opérations
observe.common.resume=Résumé de la configuration
@@ -1295,7 +1279,6 @@ observe.message.help.usage=Aide d'ObServe v %1$s
observe.message.loaded.tip=La %1$s est chargée,\n\nVous pouvez changer de base en cliquant ici.
observe.message.no.local.db.found=La base locale n'existe pas (emplacement %1$s).\n\nVous pouvez à ce stade créer la base locale ou vous connecter à une base distante.
observe.message.no.report.selected=< Aucun report sélectionné >
-observe.message.no.species.selected=Pas d'espèce sélectionnée
observe.message.no.usage.for.entity=Aucune utilisation trouvée.
observe.message.quit.invalid.edit=Les données ne sont pas valides et ne peuvent pas être sauvées\!\n\nNote\: le fait de continuer annulera toutes les modifications.
observe.message.quit.valid.edit=Les données ont été modifiées et sont valides\!
@@ -1309,7 +1292,6 @@ observe.message.show.usage.for.delete3=Pour pouvoir supprimer l'objet, vous deve
observe.message.show.usage.for.desactivated=Le référentiel %1$s "%2$s" va être désactivé.
observe.message.show.usage.for.desactivated2=Des objets utilisent actuellement cet entité dont les références sont citées plus bas.
observe.message.show.usage.for.desactivated3=Ces objets devront utiliser un autre référentiel (non désactivé) pour pouvoir être mis à jour.
-observe.message.show.usage.for.missingReferentials=Il existe des référentiels présents dans la base locale mais non présents dans la base centrale.
observe.message.show.usage.for.missingReferentials2=Il existe des référentiels présents dans la base «%s» mais non présents dans la base «%s».
observe.message.show.usages=Listes des utilisations du référentiel %1$s \: '%2$s'
observe.message.table.editBean.modified=L'entrée en cours d'édition a été modifiée et est valide.
@@ -1319,7 +1301,6 @@ observe.message.updating.referentiel=L'objet est en cours de mise à jour.
observe.message.warning.will.be.delete=%1$s\n\nAttention, l'export remplacera la marée existante.
observe.runner.config.loaded=Configuration d'ObServe v. %1$s chargée.
observe.runner.context.loaded=Initialisation du contexte terminée en %1$s.
-observe.runner.copy.default.logConfigurationFile.file=Création du fichier de configuration des logs %1$s.
observe.runner.copy.default.map.file=Création des cartes %1$s.
observe.runner.copy.default.report.file=Création du fichier de reports %1$s.
observe.runner.copy.default.ui.file=Création du fichier de cosmétique %1$s.
@@ -1436,8 +1417,6 @@ observe.storage.remote.useSll=mode ssl ?
observe.storage.remoteConfiguration.presets=Configurations enregistrées
observe.storage.remoteConfiguration.presets.save=Enregister cette configuration
observe.storage.report.action.migrate=Politique de mise à jour
-observe.storage.report.can.migrate=Mise à jour si nécessaire (version actuelle \: %1$s)
-observe.storage.report.can.not.migrate=Pas de mise à jour possible
observe.storage.report.no.create.mode=Mode de création de base non requis
observe.storage.required.rw.on.data=Vous n'avez pas les droits suffisants pour effectuer cette opération.\n\nPour effectuer cette opération vous devez avoir les droits de lecture et d'écriture sur les données observateur.
observe.storage.security.administrateur=Propriétaire de la base
@@ -1465,7 +1444,6 @@ observe.storage.useServerStorage.config=Configurer le serveur distant à utilise
observe.storage.useServerStorage.description=Veuillez configurer votre connexion au serveur distant\nAvant de pouvoir poursuivre, vous devez valider la connexion.
observe.title.about=A propos d'ObServe...
observe.title.can.not.delete.referentiel=Impossible de supprimer un référentiel en cours d'utilisation...
-observe.title.can.not.export.data=Impossible d'exporter les données vers la base centrale...
observe.title.can.not.export.data2=Impossible d'exporter les données vers la base «%s»...
observe.title.can.not.export.obstuna=Impossible d'exporter des données d'obstuna...
observe.title.choose.db.dump=Choisir une sauvegarder de base locale
=====================================
dto/pom.xml
=====================================
@@ -203,6 +203,23 @@
</enumerationSets>
</configuration>
</execution>
+ <execution>
+ <id>default-parse-java</id>
+ <goals>
+ <goal>parse-java</goal>
+ </goals>
+ <configuration>
+ <treatDefaultEntry>true</treatDefaultEntry>
+ <entries>
+ <entry>
+ <!--<specificGoal>parse-java</specificGoal>-->
+ <basedir>${project.build.directory}/generated-sources/java/</basedir>
+ </entry>
+ </entries>
+
+ </configuration>
+ </execution>
+
</executions>
</plugin>
</plugins>
=====================================
dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineDto.java deleted
=====================================
@@ -1,56 +0,0 @@
-package fr.ird.observe.dto.data.longline;
-
-/*-
- * #%L
- * ObServe :: Dto
- * %%
- * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-import com.google.common.collect.Iterables;
-import fr.ird.observe.dto.IdHelper;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-public class TripLonglineDto extends GeneratedTripLonglineDto {
-
- private static final Logger log = LogManager.getLogger(TripLonglineDto.class);
- private static final long serialVersionUID = 3977866185675257699L;
-
- public TripLonglineActivityDto getPreviousActivity(String activitySeineId) {
-
- TripLonglineActivityDto previous = null;
-
- if (activitySeineId != null) {
-
- int currentPosition = Iterables.indexOf(getActivityLongline(), IdHelper.newIdPredicate(activitySeineId)::test);
- if (currentPosition >= 1) {
- previous = Iterables.get(getActivityLongline(), currentPosition - 1);
- }
- }
-
- if (previous != null) {
- log.debug("previous activity " + previous.getTimeStamp());
-
- } else {
- log.debug("no previous activity for " + activityLongline);
- }
-
- return previous;
- }
-}
=====================================
dto/src/main/models/Observe.model
=====================================
@@ -348,7 +348,6 @@ activityLongline + {*} data.longline.TripLonglineActivity | ordered unique
data.longline.TripLonglineActivity > data.Data
timeStamp + {*:1} Date
-seaSurfaceTemperature + {*:1} Float
data.longline.TripLonglineGearUse > data.Data | form=data.longline.GearUseFeaturesLongline
gearUseFeaturesLongline + {*} data.longline.GearUseFeaturesLongline | ordered
=====================================
dto/src/main/resources/i18n/dto_en_GB.properties
=====================================
@@ -80,7 +80,6 @@ observe.common.ItemHorizontalPositionDto.type=Item horizontal position
observe.common.ItemHorizontalPositionDto.types=Item horizontal positions
observe.common.ItemVerticalPositionDto.type=Item vertical position
observe.common.ItemVerticalPositionDto.types=Item vertical positions
-observe.common.LengthLengthParameterDto.inputOutputFormula=Input to Output formula
observe.common.LengthLengthParameterDto.type=Length length parameter
observe.common.LengthLengthParameterDto.types=Length length parameters
observe.common.LengthWeightParameterDto.type=Length weight parameter
@@ -98,18 +97,13 @@ observe.common.MitigationTypeDto.types=Mitigation types
observe.common.NonTargetCatchDto.title=Non target catch
observe.common.NonTargetCatchDto.type=Non target catch
observe.common.NonTargetCatchDto.types=Non target catch
-observe.common.NonTargetCatchReleaseConformityDto.title=Release conformity
observe.common.NonTargetCatchReleaseConformityDto.type=Release conformity
observe.common.NonTargetCatchReleaseConformityDto.types=Release conformity
-observe.common.NonTargetCatchReleaseDto.conformity=Conformity
-observe.common.NonTargetCatchReleaseDto.releasingTime=Releasing time
observe.common.NonTargetCatchReleaseDto.title=Non target catches released
observe.common.NonTargetCatchReleaseDto.type=Non target catch released
observe.common.NonTargetCatchReleaseDto.types=Non target catches released
-observe.common.NonTargetCatchReleaseStatusDto.title=Non target catch release status
observe.common.NonTargetCatchReleaseStatusDto.type=Non target catch release status
observe.common.NonTargetCatchReleaseStatusDto.types=Non target catch release status
-observe.common.NonTargetCatchReleasingTimeDto.title=Releasing time
observe.common.NonTargetCatchReleasingTimeDto.type=Releasing time
observe.common.NonTargetCatchReleasingTimeDto.types=Releasing time
observe.common.NonTargetLengthDto.title=Non target lengths
@@ -244,7 +238,6 @@ observe.common.gps.gpsPoint=Gps point
observe.common.haulingIdentifier=Hauling identifier
observe.common.homeId=Home id
observe.common.inconnu=Unknown
-observe.common.lengthWeightFormula=Length weight formula
observe.common.no.unit=No unit
observe.common.nocode=Nocode
observe.common.none=None
=====================================
dto/src/main/resources/i18n/dto_es_ES.properties
=====================================
@@ -80,7 +80,6 @@ observe.common.ItemHorizontalPositionDto.type=Localización del elemento sobre l
observe.common.ItemHorizontalPositionDto.types=Localizaciones del elemento sobre la línea principal
observe.common.ItemVerticalPositionDto.type=Localización del elemento sobre el arponcillo
observe.common.ItemVerticalPositionDto.types=Localizaciones del elemento sobre el arponcillo
-observe.common.LengthLengthParameterDto.inputOutputFormula=Formule Entrée vers Sortie \#TODO
observe.common.LengthLengthParameterDto.type=Relación Tamaño-Tamaño
observe.common.LengthLengthParameterDto.types=Relaciones Tamaño-Tamaño
observe.common.LengthWeightParameterDto.type=Relación Tamaño-Peso
@@ -98,16 +97,13 @@ observe.common.MitigationTypeDto.types=Tipos de medida de atenuación
observe.common.NonTargetCatchDto.title=Fauna accesoria conservada o descartada
observe.common.NonTargetCatchDto.type=Fauna accesoria conservada o descartada
observe.common.NonTargetCatchDto.types=Fauna accesoria conservada o descartada
-observe.common.NonTargetCatchReleaseConformityDto.title=Conformidad en la liberacion de especies no objetivo
observe.common.NonTargetCatchReleaseConformityDto.type=Conformidad en la liberacion de especies no objetivo
observe.common.NonTargetCatchReleaseConformityDto.types=Conformidad en la liberacion de especies no objetivo
observe.common.NonTargetCatchReleaseDto.title=Espèces accessoires sensibles libérées \#TODO
observe.common.NonTargetCatchReleaseDto.type=Espèce accessoire sensible libérée \#TODO
observe.common.NonTargetCatchReleaseDto.types=Espèces accessoires sensibles libérées \#TODO
-observe.common.NonTargetCatchReleaseStatusDto.title=États à la libération \#TODO
observe.common.NonTargetCatchReleaseStatusDto.type=État à la libération \#TODO
observe.common.NonTargetCatchReleaseStatusDto.types=États à la libération \#TODO
-observe.common.NonTargetCatchReleasingTimeDto.title=Tiempo de liberacion de especies no objetivo
observe.common.NonTargetCatchReleasingTimeDto.type=Tiempo de liberacion de especies no objetivo
observe.common.NonTargetCatchReleasingTimeDto.types=Tiempo de liberacion de especies no objetivo
observe.common.NonTargetLengthDto.title=Longitudes (cm inf.)
@@ -242,7 +238,6 @@ observe.common.gps.gpsPoint=Punto GPS
observe.common.haulingIdentifier=Arrastre
observe.common.homeId=Identificador
observe.common.inconnu=desconocido
-observe.common.lengthWeightFormula=Relación de peso
observe.common.no.unit=No unit \#TODO
observe.common.nocode=codigo ausente
observe.common.none=Ninguno
=====================================
dto/src/main/resources/i18n/dto_fr_FR.properties
=====================================
@@ -80,7 +80,6 @@ observe.common.ItemHorizontalPositionDto.type=Localisation de l'élément sur la
observe.common.ItemHorizontalPositionDto.types=Localisations de l'élément sur la ligne mère
observe.common.ItemVerticalPositionDto.type=Localisation de l'élément sur l'avançon
observe.common.ItemVerticalPositionDto.types=Localisations de l'élément sur l'avançon
-observe.common.LengthLengthParameterDto.inputOutputFormula=Formule entrée -> sortie
observe.common.LengthLengthParameterDto.type=Relation Taille-Taille
observe.common.LengthLengthParameterDto.types=Relations Taille-Taille
observe.common.LengthWeightParameterDto.type=Relation Taille-Poids
@@ -98,18 +97,13 @@ observe.common.MitigationTypeDto.types=Types de mesure d'atténuation
observe.common.NonTargetCatchDto.title=Espèces accessoires conservées ou rejetées
observe.common.NonTargetCatchDto.type=Espèce accessoire conservée ou rejetée
observe.common.NonTargetCatchDto.types=Espèces accessoires conservées ou rejetées
-observe.common.NonTargetCatchReleaseConformityDto.title=Conformités à la libération
observe.common.NonTargetCatchReleaseConformityDto.type=Conformité à la libération
observe.common.NonTargetCatchReleaseConformityDto.types=Conformités à la libération
-observe.common.NonTargetCatchReleaseDto.conformity=Conformité
-observe.common.NonTargetCatchReleaseDto.releasingTime=Moment de la libération
observe.common.NonTargetCatchReleaseDto.title=Espèces accessoires sensibles libérées
observe.common.NonTargetCatchReleaseDto.type=Espèce accessoire sensible libérée
observe.common.NonTargetCatchReleaseDto.types=Espèces accessoires libérées
-observe.common.NonTargetCatchReleaseStatusDto.title=États à la libération
observe.common.NonTargetCatchReleaseStatusDto.type=État à la libération
observe.common.NonTargetCatchReleaseStatusDto.types=États à la libération
-observe.common.NonTargetCatchReleasingTimeDto.title=Moments de la libération
observe.common.NonTargetCatchReleasingTimeDto.type=Moment de la libération
observe.common.NonTargetCatchReleasingTimeDto.types=Moments de la libération
observe.common.NonTargetLengthDto.title=Longueurs (cm inf.)
@@ -244,7 +238,6 @@ observe.common.gps.gpsPoint=Point GPS
observe.common.haulingIdentifier=Virage
observe.common.homeId=Identifiant
observe.common.inconnu=inconnu
-observe.common.lengthWeightFormula=Relation Poids
observe.common.no.unit=Pas d'unité
observe.common.nocode=code absent
observe.common.none=Aucun
=====================================
persistence/src/main/java/fr/ird/observe/binder/data/longline/TripLonglineActivityEntityDtoBinder.java
=====================================
@@ -53,6 +53,5 @@ public class TripLonglineActivityEntityDtoBinder extends DataEntityDtoBinderSupp
copyEntityDataFieldsToDto(entity, dto);
dto.setTimeStamp(entity.getTimeStamp());
- dto.setSeaSurfaceTemperature(entity.getSeaSurfaceTemperature());
}
}
=====================================
services/pom.xml
=====================================
@@ -88,10 +88,6 @@
<groupId>io.ultreia.java4all.http</groupId>
<artifactId>http-api</artifactId>
</dependency>
- <dependency>
- <groupId>io.ultreia.java4all</groupId>
- <artifactId>java-lang</artifactId>
- </dependency>
<dependency>
<groupId>io.ultreia.java4all.jaxx</groupId>
=====================================
services/src/main/java/fr/ird/observe/services/validation/validators/TemperatureCompareFieldValidator.java deleted
=====================================
@@ -1,196 +0,0 @@
-package fr.ird.observe.services.validation.validators;
-
-/*-
- * #%L
- * ObServe :: Services API
- * %%
- * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-import com.opensymphony.xwork2.validator.ValidationException;
-import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport;
-import io.ultreia.java4all.lang.Numbers;
-import org.nuiton.jaxx.widgets.temperature.I18nEnumHelper;
-import org.nuiton.jaxx.widgets.temperature.TemperatureEditorModel;
-import org.nuiton.jaxx.widgets.temperature.TemperatureFormat;
-
-import java.util.Map;
-
-/**
- * To validate that the temperature is in correct bound.
- * <p>
- * Created by tchemit on 22/09/2018.
- *
- * @author Tony Chemit - dev(a)tchemit.fr
- */
-public class TemperatureCompareFieldValidator extends FieldValidatorSupport {
-
- /**
- * Name of the field to compare against.
- */
- private String compareFieldName;
-
- /**
- * Default temperature format (bottom are based on this format).
- */
- private TemperatureFormat defaultTemperatureFormat;
- /**
- * Compare temperature format (compare temperature is base on this format).
- */
- private TemperatureFormat compareTemperatureFormat;
- /**
- * Delta authorized.
- */
- private Float delta;
-
- /**
- * Min temperature.
- */
- private Float min;
- /**
- * Max temperature.
- */
- private Float max;
-
- public void setDefaultTemperatureFormat(String defaultTemperatureFormat) {
- this.defaultTemperatureFormat = TemperatureFormat.valueOf(defaultTemperatureFormat);
- }
-
- public void setCompareTemperatureFormat(String compareTemperatureFormat) {
- this.compareTemperatureFormat = TemperatureFormat.valueOf(compareTemperatureFormat);
- }
-
- public void setMin(String min) {
- this.min = Float.valueOf(min);
- }
-
- public void setMax(String max) {
- this.max = Float.valueOf(max);
- }
-
- public void setDelta(String delta) {
- this.delta = Float.valueOf(delta);
- }
-
- public void setCompareFieldName(String compareFieldName) {
- this.compareFieldName = compareFieldName;
- }
-
- @Override
- public void validate(Object object) throws ValidationException {
- if (min == null) {
- throw new ValidationException("No parameter 'min' filled");
- }
- if (max == null) {
- throw new ValidationException("No parameter 'max' filled");
- }
- if (min >= max) {
- throw new ValidationException(String.format("No parameter 'min' (%s) is greater than 'max' (%s)", min, max));
- }
- String fieldName = getFieldName();
- if (fieldName == null) {
- throw new ValidationException("No parameter 'fieldName' filled");
- }
- if (compareFieldName == null) {
- throw new ValidationException("No parameter 'compareFieldName' filled");
- }
- if (delta == null) {
- throw new ValidationException("No parameter 'bottom' filled");
- }
- Float temperature = (Float) getFieldValue(fieldName, object);
- if (temperature == null) {
- return;
- }
- Float againstTemperature = (Float) getFieldValue(compareFieldName, object);
- if (againstTemperature == null) {
- return;
- }
- @SuppressWarnings("unchecked") Map<String, TemperatureEditorModel> map = (Map<String, TemperatureEditorModel>) getFieldValue("temperatureEditorModels", object);
- TemperatureFormat temperatureFormat = defaultTemperatureFormat;
- if (map != null) {
-
- TemperatureEditorModel temperatureEditorModel = map.get(fieldName);
- //FIXME une validation est lancé dans l'ui alors que l'on ne devrait pas et on a pas ce composant alors
- if (temperatureEditorModel != null) {
- temperatureFormat = temperatureEditorModel.getFormat();
- }
- }
-
- float bottom = againstTemperature - delta;
- if (bottom < min) {
- bottom = min;
- }
- float top = againstTemperature + delta;
- if (top > max) {
- top = max;
- }
- if (temperature < bottom || temperature > top) {
- if (!temperatureFormat.equals(defaultTemperatureFormat)) {
- bottom = Numbers.roundOneDigit(defaultTemperatureFormat.convert(bottom, temperatureFormat));
- top = Numbers.roundOneDigit(defaultTemperatureFormat.convert(top, temperatureFormat));
- }
- if (!temperatureFormat.equals(compareTemperatureFormat)) {
- againstTemperature = compareTemperatureFormat.convert(againstTemperature, temperatureFormat);
- }
- stack.set(fieldName + "Compare", new TemperatureResult(bottom, top, againstTemperature, I18nEnumHelper.getLabel(temperatureFormat)));
- try {
- addFieldError(fieldName, object);
- } finally {
- stack.pop();
- }
- }
-
- }
-
- @Override
- public String getValidatorType() {
- return "temperatureCompare";
- }
-
- static class TemperatureResult {
- private final float bottom;
- private final float top;
- private final Float againstTemperature;
- private final String format;
-
- TemperatureResult(float bottom, float top, Float againstTemperature, String format) {
- this.bottom = bottom;
- this.top = top;
- this.againstTemperature = againstTemperature;
- this.format = format;
- }
-
- public Float getAgainstTemperature() {
- return againstTemperature;
- }
-
- public float getBottom() {
- return bottom;
- }
-
- public float getTop() {
- return top;
- }
-
- public String getFormat() {
- return format;
- }
- }
-
-}
-
=====================================
validation/.mvn/i18n-parse-validation deleted
=====================================
=====================================
validation/.mvn/i18n-parse-java → validation/.mvn/i18n-parse-validation-messages
=====================================
=====================================
validation/pom.xml
=====================================
@@ -115,26 +115,9 @@
<id>default-parse-java</id>
<goals>
<goal>parse-java</goal>
- <!--<goal>parserValidation</goal>-->
- <!--<goal>gen</goal>-->
</goals>
<configuration>
<defaultBasedir>${project.build.directory}/generated-sources/java</defaultBasedir>
- <!--<treateDefaultEntry>false</treateDefaultEntry>-->
- <!--<entries>-->
- <!--<entry>-->
- <!--<specificGoal>parserValidation</specificGoal>-->
- <!--<basedir>${project.basedir}/src/main/resources/</basedir>-->
- <!--<includes>-->
- <!--<param>**/**-validation.xml</param>-->
- <!--</includes>-->
- <!--</entry>-->
- <!--<entry>-->
- <!--<specificGoal>parserJava</specificGoal>-->
- <!--<basedir>${project.build.directory}/generated-sources/java/</basedir>-->
- <!--</entry>-->
- <!--</entries>-->
-
</configuration>
</execution>
</executions>
@@ -170,6 +153,9 @@
<fr.ird.observe.dto.referential.ReferentialDto>
code,status,uri,needComment
</fr.ird.observe.dto.referential.ReferentialDto>
+ <fr.ird.observe.dto.data.DataDto>
+ lengthMeasureMethod,weightMeasureMethod
+ </fr.ird.observe.dto.data.DataDto>
</inheritanceMapping>
</configuration>
</execution>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineDto-update-error-validation.xml
=====================================
@@ -70,18 +70,6 @@
observe.validation.activity.bound.seaSurfaceTemperature##${seaSurfaceTemperatureBound.min}##${seaSurfaceTemperatureBound.max}##${seaSurfaceTemperatureBound.format}
</message>
</field-validator>
- <!-- coherence temperature surface (delta de 12° par rapport a celle de l'activity precedente) -->
- <field-validator type="temperatureCompare" short-circuit="true">
- <param name="min">12.0</param>
- <param name="max">35.0</param>
- <param name="delta">12.0</param>
- <param name="defaultTemperatureFormat">C</param>
- <param name="compareTemperatureFormat">C</param>
- <param name="compareFieldName">currentTrip.getPreviousActivity(id).seaSurfaceTemperature</param>
- <message>
- observe.validation.activity.invalid.seaSurfaceTemperature##${currentTrip.getPreviousActivity(id).timeStamp}##${seaSurfaceTemperatureCompare.againstTemperature}##${seaSurfaceTemperatureCompare.bottom}##${seaSurfaceTemperatureCompare.top}##${seaSurfaceTemperatureCompare.format}
- </message>
- </field-validator>
</field>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml
=====================================
@@ -188,18 +188,6 @@
observe.validation.activity.bound.seaSurfaceTemperature##${seaSurfaceTemperatureBound.min}##${seaSurfaceTemperatureBound.max}##${seaSurfaceTemperatureBound.format}
</message>
</field-validator>
- <!-- coherence temperature surface (delta de 12° par rapport a celle de l'activity precedente) -->
- <field-validator type="temperatureCompare" short-circuit="true">
- <param name="min">12.0</param>
- <param name="max">35.0</param>
- <param name="delta">12.0</param>
- <param name="defaultTemperatureFormat">C</param>
- <param name="compareTemperatureFormat">C</param>
- <param name="compareFieldName">currentRoute.getPreviousActivity(id).seaSurfaceTemperature</param>
- <message>
- observe.validation.activity.invalid.seaSurfaceTemperature##${currentRoute.getPreviousActivity(id).time}##${seaSurfaceTemperatureCompare.againstTemperature}##${seaSurfaceTemperatureCompare.bottom}##${seaSurfaceTemperatureCompare.top}##${seaSurfaceTemperatureCompare.format}
- </message>
- </field-validator>
</field>
=====================================
validation/src/main/resources/i18n/validation_en_GB.properties
=====================================
@@ -103,6 +103,7 @@ observe.common.I18nReferentialDto.label2=French label
observe.common.I18nReferentialDto.label3=Spanish label
observe.common.LengthLengthParameterDto.coefficients=Coefficients
observe.common.LengthLengthParameterDto.endDate=End date
+observe.common.LengthLengthParameterDto.inputOutputFormula=Input to Output formula
observe.common.LengthLengthParameterDto.inputSizeMeasureType=Input size measure type
observe.common.LengthLengthParameterDto.ocean=Ocean
observe.common.LengthLengthParameterDto.outputInputFormula=Output formula
@@ -128,8 +129,10 @@ observe.common.NonTargetCatchDto.species=Species
observe.common.NonTargetCatchDto.speciesFate=Species fate
observe.common.NonTargetCatchDto.totalCount=Count
observe.common.NonTargetCatchReleaseDto.comment=Non target catch released comment
+observe.common.NonTargetCatchReleaseDto.conformity=Conformity
observe.common.NonTargetCatchReleaseDto.count=Count
observe.common.NonTargetCatchReleaseDto.length=Length (cm)
+observe.common.NonTargetCatchReleaseDto.releasingTime=Releasing time
observe.common.NonTargetCatchReleaseDto.sex=Sex
observe.common.NonTargetCatchReleaseDto.species=Species
observe.common.NonTargetCatchReleaseDto.speciesGroupReleaseMode=Release mode
@@ -340,7 +343,6 @@ observe.validation.activity.desactivated.vesselActivity=Selected vessel activity
observe.validation.activity.desactivated.wind=Selected wind is disabled.
observe.validation.activity.duplicated.time=There is already another activity at this time.
observe.validation.activity.invalid.quadrant=Quadrant is not coherent with ocean (%1$s) of trip (indian\: 1,2, atlantic 1,2,3,4).
-observe.validation.activity.invalid.seaSurfaceTemperature=Previous activity (%1$s) sea temperature was %2$s%5$s, current temperature must be between %3$s%5$s and %4$s%5$s.
observe.validation.activity.invalid.speed=Activity speed is %s nb, which is more than the maximum authorized which is %s nd.
observe.validation.activity.null.dcp=No floating object selected.
observe.validation.activity.null.fpaZone=Fpa zone is not filled.
@@ -463,16 +465,15 @@ observe.validation.lengthLengthParameter.null.ocean=Ocean is not filled.
observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Output size measure type is not filled.
observe.validation.lengthLengthParameter.null.sex=Sex must be filled.
observe.validation.lengthLengthParameter.required.coefficients=Coefficients are required.
-observe.validation.lengthLengthParameter.required.endDate=End date must be filled.
observe.validation.lengthLengthParameter.required.inputOutputFormula=Formula is required.
observe.validation.lengthLengthParameter.required.outputInputFormula=Formula is required.
observe.validation.lengthLengthParameter.required.species=Species must be filled.
-observe.validation.lengthLengthParameter.required.startDate=Start date must be filled.
observe.validation.lengthWeightParameter.disabled.sizeMeasureType=Selected size measure type is disabled.
observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=Formula is not valid.
observe.validation.lengthWeightParameter.invalid.uniqueKey=Tuple (species/ocean/gender/sizeMeasureType/startDate) must be unique.
observe.validation.lengthWeightParameter.invalid.weightLengthFormula=Formula is not valid.
observe.validation.lengthWeightParameter.null.ocean=Ocean is not filled.
+observe.validation.lengthWeightParameter.null.sex=Sex must be filled.
observe.validation.lengthWeightParameter.null.sizeMeasureType=Size measure type is not filled.
observe.validation.lengthWeightParameter.required.coefficients=Coefficients must be filled.
observe.validation.lengthWeightParameter.required.endDate=End date must be filled.
@@ -501,7 +502,6 @@ observe.validation.nonTargetCatch.uniqueKey=Tuple (species - objectFate) must be
observe.validation.nonTargetCatchRelease.bound.count=Count must be between %1$s and %2$s.
observe.validation.nonTargetCatchRelease.comment.tobig=Comment size can not exceed 1024 characters.
observe.validation.nonTargetCatchRelease.desactivated.conformity=Selected conformity is disabled.
-observe.validation.nonTargetCatchRelease.desactivated.releasingTime=Selected releasing time is disabled.
observe.validation.nonTargetCatchRelease.desactivated.sex=Selected sex fate is disabled.
observe.validation.nonTargetCatchRelease.desactivated.species=Selected species is disabled.
observe.validation.nonTargetCatchRelease.desactivated.speciesGroupReleaseMode=Selected release mode is disabled.
=====================================
validation/src/main/resources/i18n/validation_es_ES.properties
=====================================
@@ -103,6 +103,7 @@ observe.common.I18nReferentialDto.label2=Texto en francés
observe.common.I18nReferentialDto.label3=Nombre
observe.common.LengthLengthParameterDto.coefficients=Coeficientes
observe.common.LengthLengthParameterDto.endDate=Fecha de fin
+observe.common.LengthLengthParameterDto.inputOutputFormula=Formule Entrée vers Sortie \#TODO
observe.common.LengthLengthParameterDto.inputSizeMeasureType=Type de mensuration d'entrée \#TODO
observe.common.LengthLengthParameterDto.ocean=Océano
observe.common.LengthLengthParameterDto.outputInputFormula=Output formula \#TODO
@@ -342,7 +343,6 @@ observe.validation.activity.desactivated.vesselActivity=Actividad del barco sele
observe.validation.activity.desactivated.wind=La fuerza del viento seleccionada está desactivada.
observe.validation.activity.duplicated.time=Ya existe una actividad a esa hora.
observe.validation.activity.invalid.quadrant=El cuadrante no es coherente con el informe del oceano (%1$s) de la marea (indico \: 1,2, atlantico \: 1, 2, 3, 4)
-observe.validation.activity.invalid.seaSurfaceTemperature=Previous activity (%1$s) sea temperature was %2$s%5$s, current temperature must be between %3$s%5$s and %4$s%5$s. \#TODO
observe.validation.activity.invalid.speed=La velocidad de la actividad actual es %s nudos, mientras que la velocidad máxima es %s nudos.
observe.validation.activity.null.dcp=No se ha introducido objeto flotante.
observe.validation.activity.null.fpaZone=La selección de una zona FPA es obligatoria.
@@ -465,16 +465,15 @@ observe.validation.lengthLengthParameter.null.ocean=No se ha seleccionado oceano
observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Le type de mensuration de sortie n'est pas renseigné. \#TODO
observe.validation.lengthLengthParameter.null.sex=Le sexe doit être renseigné. \#TODO
observe.validation.lengthLengthParameter.required.coefficients=Les coefficients sont obligatoires. \#TODO
-observe.validation.lengthLengthParameter.required.endDate=Fecha de fin de validez debe ser especificada.
observe.validation.lengthLengthParameter.required.inputOutputFormula=La formule est obligatoire. \#TODO
observe.validation.lengthLengthParameter.required.outputInputFormula=La formule est obligatoire. \#TODO
observe.validation.lengthLengthParameter.required.species=Especie no especificada.
-observe.validation.lengthLengthParameter.required.startDate=fecha de comienzo de validez no especificada.
observe.validation.lengthWeightParameter.disabled.sizeMeasureType=Le type de mensuration sélectionné est désactivé. \#TODO
observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=Relación de peso introducida no es coherente.
observe.validation.lengthWeightParameter.invalid.uniqueKey=Tupla (especie/sexo/océano/sizeMeasureType/startDate) debe ser única, la tupla ya se ha usado. \#TODO
observe.validation.lengthWeightParameter.invalid.weightLengthFormula=Relación de talla introducida no es coherente.
observe.validation.lengthWeightParameter.null.ocean=No se ha seleccionado oceano.
+observe.validation.lengthWeightParameter.null.sex=Sex must be filled.
observe.validation.lengthWeightParameter.null.sizeMeasureType=Type de mensuration non renseigné. \#TODO
observe.validation.lengthWeightParameter.required.coefficients=Coeficientes deben ser especificados.
observe.validation.lengthWeightParameter.required.endDate=Fecha de fin de validez debe ser especificada.
@@ -503,7 +502,6 @@ observe.validation.nonTargetCatch.uniqueKey=El par (especie - objectFate) debe s
observe.validation.nonTargetCatchRelease.bound.count=Le nombre doit être compris entre %1$s et %2$s. \#TODO
observe.validation.nonTargetCatchRelease.comment.tobig=La taille du commentaire est limitée à 1024 caractères. \#TODO
observe.validation.nonTargetCatchRelease.desactivated.conformity=Selected conformity is disabled. \#TODO
-observe.validation.nonTargetCatchRelease.desactivated.releasingTime=Selected releasing time is disabled. \#TODO
observe.validation.nonTargetCatchRelease.desactivated.sex=Le sexe sélectionné est désactivé. \#TODO
observe.validation.nonTargetCatchRelease.desactivated.species=L'espèce sélectionnée est désactivée. \#TODO
observe.validation.nonTargetCatchRelease.desactivated.speciesGroupReleaseMode=Le mode de libération sélectionné est désactivé. \#TODO
=====================================
validation/src/main/resources/i18n/validation_fr_FR.properties
=====================================
@@ -103,6 +103,7 @@ observe.common.I18nReferentialDto.label2=Libellé français
observe.common.I18nReferentialDto.label3=Libellé espagnol
observe.common.LengthLengthParameterDto.coefficients=Coefficients
observe.common.LengthLengthParameterDto.endDate=Fin de validité
+observe.common.LengthLengthParameterDto.inputOutputFormula=Formule entrée -> sortie
observe.common.LengthLengthParameterDto.inputSizeMeasureType=Type de mensuration d'entrée
observe.common.LengthLengthParameterDto.ocean=Océan
observe.common.LengthLengthParameterDto.outputInputFormula=Formule sortie -> entrée
@@ -128,8 +129,10 @@ observe.common.NonTargetCatchDto.species=Espèce
observe.common.NonTargetCatchDto.speciesFate=Devenir espèce
observe.common.NonTargetCatchDto.totalCount=Nombre estimé
observe.common.NonTargetCatchReleaseDto.comment=Commentaire de la libération
+observe.common.NonTargetCatchReleaseDto.conformity=Conformité
observe.common.NonTargetCatchReleaseDto.count=Nombre
observe.common.NonTargetCatchReleaseDto.length=Longueur (cm)
+observe.common.NonTargetCatchReleaseDto.releasingTime=Moment de la libération
observe.common.NonTargetCatchReleaseDto.sex=Sexe
observe.common.NonTargetCatchReleaseDto.species=Espèce
observe.common.NonTargetCatchReleaseDto.speciesGroupReleaseMode=Mode de libération
@@ -340,7 +343,6 @@ observe.validation.activity.desactivated.vesselActivity=L'activité bateau séle
observe.validation.activity.desactivated.wind=Le vent Beaufort sélectionné est désactivé.
observe.validation.activity.duplicated.time=Il existe déjà une autre activité à cette heure.
observe.validation.activity.invalid.quadrant=Le quadrant n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1
-observe.validation.activity.invalid.seaSurfaceTemperature=La température surface de l'activité précédente (%1$s) est de %2$s%5$s, la température doit être comprise entre %3$s%5$s et %4$s%5$s.
observe.validation.activity.invalid.speed=La vitesse de l'activité courante est de %s nd, alors que la vitesse maximale autorisée est %s nd
observe.validation.activity.null.dcp=Aucun objet flottant saisi.
observe.validation.activity.null.fpaZone=La sélection d'une zone FPA est obligatoire.
@@ -463,16 +465,15 @@ observe.validation.lengthLengthParameter.null.ocean=Aucun océan sélectionné.
observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Le type de mensuration de sortie n'est pas renseigné.
observe.validation.lengthLengthParameter.null.sex=Le sexe doit être renseigné.
observe.validation.lengthLengthParameter.required.coefficients=Les coefficients sont obligatoires.
-observe.validation.lengthLengthParameter.required.endDate=Date de fin de validité non renseignée.
observe.validation.lengthLengthParameter.required.inputOutputFormula=La formule est obligatoire.
observe.validation.lengthLengthParameter.required.outputInputFormula=La formule est obligatoire.
observe.validation.lengthLengthParameter.required.species=L'espèce n'est pas renseignée.
-observe.validation.lengthLengthParameter.required.startDate=date de début de validité non renseignée.
observe.validation.lengthWeightParameter.disabled.sizeMeasureType=Le type de mensuration sélectionné est désactivé.
observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=La relation poids saisie n'est pas cohérente.
observe.validation.lengthWeightParameter.invalid.uniqueKey=Le tuple (espèce/sexe/océan/type de measure/date de début) doit être unique
observe.validation.lengthWeightParameter.invalid.weightLengthFormula=La relation taille saisie n'est pas cohérente.
observe.validation.lengthWeightParameter.null.ocean=Aucun océan sélectionné.
+observe.validation.lengthWeightParameter.null.sex=Le sexe doit être renseigné.
observe.validation.lengthWeightParameter.null.sizeMeasureType=Type de mensuration non renseigné.
observe.validation.lengthWeightParameter.required.coefficients=Les coefficients ne sont pas renseignés.
observe.validation.lengthWeightParameter.required.endDate=Date de fin de validité non renseignée.
@@ -501,7 +502,6 @@ observe.validation.nonTargetCatch.uniqueKey=Le couple (espèce - devenir objet)
observe.validation.nonTargetCatchRelease.bound.count=Le nombre doit être compris entre %1$s et %2$s.
observe.validation.nonTargetCatchRelease.comment.tobig=La taille du commentaire est limitée à 1024 caractères.
observe.validation.nonTargetCatchRelease.desactivated.conformity=La conformité sélectionnée est désactivée.
-observe.validation.nonTargetCatchRelease.desactivated.releasingTime=Le moment de libération sélectionné est désactivé.
observe.validation.nonTargetCatchRelease.desactivated.sex=Le sexe sélectionné est désactivé.
observe.validation.nonTargetCatchRelease.desactivated.species=L'espèce sélectionnée est désactivée.
observe.validation.nonTargetCatchRelease.desactivated.speciesGroupReleaseMode=Le mode de libération sélectionné est désactivé.
=====================================
validation/src/main/resources/validators.xml
=====================================
@@ -70,6 +70,5 @@
<validator name="nonTargetCatchObservedSystem" class="fr.ird.observe.services.validation.validators.NonTargetCatchObservedSystemValidator"/>
<validator name="activitySeine_observedSystem" class="fr.ird.observe.services.validation.validators.ActivitySeineObservedSystemValidator"/>
<validator name="temperatureBound" class="fr.ird.observe.services.validation.validators.TemperatureBoundFieldValidator"/>
- <validator name="temperatureCompare" class="fr.ird.observe.services.validation.validators.TemperatureCompareFieldValidator"/>
</validators>
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c511c82666c35e32da7420b260…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c511c82666c35e32da7420b260…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][release/7.0-RC-22] [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-22' with…
by Tony CHEMIT 23 Sep '18
by Tony CHEMIT 23 Sep '18
23 Sep '18
Tony CHEMIT pushed to branch release/7.0-RC-22 at ultreiaio / ird-observe
Commits:
d5576682 by Tony CHEMIT at 2018-09-23T12:40:43Z
[jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-22' with non-snapshot versions[skip ci]
- - - - -
13 changed files:
- client-configuration/pom.xml
- client/pom.xml
- dto/pom.xml
- observe/pom.xml
- persistence/pom.xml
- pom.xml
- server-configuration/pom.xml
- server/pom.xml
- services-client/pom.xml
- services-local/pom.xml
- services/pom.xml
- test/pom.xml
- validation/pom.xml
Changes:
=====================================
client-configuration/pom.xml
=====================================
@@ -26,7 +26,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-22</version>
</parent>
<artifactId>client-configuration</artifactId>
=====================================
client/pom.xml
=====================================
@@ -26,7 +26,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-22</version>
</parent>
<artifactId>client</artifactId>
=====================================
dto/pom.xml
=====================================
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-22</version>
</parent>
<artifactId>dto</artifactId>
=====================================
observe/pom.xml
=====================================
@@ -26,7 +26,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-22</version>
</parent>
<artifactId>observe</artifactId>
=====================================
persistence/pom.xml
=====================================
@@ -26,7 +26,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-22</version>
</parent>
<artifactId>persistence</artifactId>
=====================================
pom.xml
=====================================
@@ -31,7 +31,7 @@
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-22</version>
<packaging>pom</packaging>
<name>ObServe :: Pom</name>
=====================================
server-configuration/pom.xml
=====================================
@@ -26,7 +26,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-22</version>
</parent>
<artifactId>server-configuration</artifactId>
=====================================
server/pom.xml
=====================================
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-22</version>
</parent>
<artifactId>server</artifactId>
=====================================
services-client/pom.xml
=====================================
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-22</version>
</parent>
<artifactId>services-client</artifactId>
=====================================
services-local/pom.xml
=====================================
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-22</version>
</parent>
<artifactId>services-local</artifactId>
=====================================
services/pom.xml
=====================================
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-22</version>
</parent>
<artifactId>services</artifactId>
=====================================
test/pom.xml
=====================================
@@ -26,7 +26,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-22</version>
</parent>
<artifactId>test</artifactId>
=====================================
validation/pom.xml
=====================================
@@ -26,7 +26,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-22</version>
</parent>
<artifactId>validation</artifactId>
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d5576682e34670c6162ed912577…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d5576682e34670c6162ed912577…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop-7.x] 6 commits: [jgitflow-maven-plugin]updating poms for 7.0-RC-22 branch with snapshot versions[skip ci]
by Tony CHEMIT 23 Sep '18
by Tony CHEMIT 23 Sep '18
23 Sep '18
Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
e4977e49 by Tony CHEMIT at 2018-09-23T12:18:09Z
[jgitflow-maven-plugin]updating poms for 7.0-RC-22 branch with snapshot versions[skip ci]
- - - - -
d5576682 by Tony CHEMIT at 2018-09-23T12:40:43Z
[jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-22' with non-snapshot versions[skip ci]
- - - - -
5051afba by Tony CHEMIT at 2018-09-23T12:48:45Z
[jgitflow-maven-plugin]merging 'release/7.0-RC-22' into 'master-7.x'
- - - - -
591b0d39 by Tony CHEMIT at 2018-09-23T12:48:52Z
[jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci]
- - - - -
613dd467 by Tony CHEMIT at 2018-09-23T12:48:52Z
[jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x'
- - - - -
7f762026 by Tony CHEMIT at 2018-09-23T12:48:53Z
[jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci]
- - - - -
0 changed files:
Changes:
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/dfc33b0bb145ab6d14eae83257…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/dfc33b0bb145ab6d14eae83257…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop-7.x] [jgitflow-maven-plugin]updating poms for 7.0-RC-23-SNAPSHOT development[skip ci]
by Tony CHEMIT 23 Sep '18
by Tony CHEMIT 23 Sep '18
23 Sep '18
Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
dfc33b0b by Tony CHEMIT at 2018-09-23T12:18:10Z
[jgitflow-maven-plugin]updating poms for 7.0-RC-23-SNAPSHOT development[skip ci]
- - - - -
13 changed files:
- client-configuration/pom.xml
- client/pom.xml
- dto/pom.xml
- observe/pom.xml
- persistence/pom.xml
- pom.xml
- server-configuration/pom.xml
- server/pom.xml
- services-client/pom.xml
- services-local/pom.xml
- services/pom.xml
- test/pom.xml
- validation/pom.xml
Changes:
=====================================
client-configuration/pom.xml
=====================================
@@ -26,7 +26,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-23-SNAPSHOT</version>
</parent>
<artifactId>client-configuration</artifactId>
=====================================
client/pom.xml
=====================================
@@ -26,7 +26,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-23-SNAPSHOT</version>
</parent>
<artifactId>client</artifactId>
=====================================
dto/pom.xml
=====================================
@@ -21,14 +21,13 @@
#L%
-->
-<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-23-SNAPSHOT</version>
</parent>
<artifactId>dto</artifactId>
@@ -241,10 +240,10 @@
<target>
<copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.directory}/models">
<filterset>
- <filter value="${observe.model.version}" token="observe.model.version"/>
+ <filter value="${observe.model.version}" token="observe.model.version" />
</filterset>
<fileset dir="${basedir}/src/main/models">
- <include name="*.model"/>
+ <include name="*.model" />
</fileset>
</copy>
</target>
=====================================
observe/pom.xml
=====================================
@@ -26,7 +26,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-23-SNAPSHOT</version>
</parent>
<artifactId>observe</artifactId>
=====================================
persistence/pom.xml
=====================================
@@ -26,7 +26,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-23-SNAPSHOT</version>
</parent>
<artifactId>persistence</artifactId>
=====================================
pom.xml
=====================================
@@ -31,7 +31,7 @@
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-23-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ObServe :: Pom</name>
=====================================
server-configuration/pom.xml
=====================================
@@ -26,7 +26,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-23-SNAPSHOT</version>
</parent>
<artifactId>server-configuration</artifactId>
=====================================
server/pom.xml
=====================================
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-23-SNAPSHOT</version>
</parent>
<artifactId>server</artifactId>
=====================================
services-client/pom.xml
=====================================
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-23-SNAPSHOT</version>
</parent>
<artifactId>services-client</artifactId>
=====================================
services-local/pom.xml
=====================================
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-23-SNAPSHOT</version>
</parent>
<artifactId>services-local</artifactId>
=====================================
services/pom.xml
=====================================
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-23-SNAPSHOT</version>
</parent>
<artifactId>services</artifactId>
=====================================
test/pom.xml
=====================================
@@ -26,7 +26,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-23-SNAPSHOT</version>
</parent>
<artifactId>test</artifactId>
=====================================
validation/pom.xml
=====================================
@@ -26,7 +26,7 @@
<parent>
<groupId>fr.ird.observe</groupId>
<artifactId>ird-observe</artifactId>
- <version>7.0-RC-22-SNAPSHOT</version>
+ <version>7.0-RC-23-SNAPSHOT</version>
</parent>
<artifactId>validation</artifactId>
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/dfc33b0bb145ab6d14eae832579…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/dfc33b0bb145ab6d14eae832579…
You're receiving this email because of your account on gitlab.com.
1
0
23 Sep '18
Tony CHEMIT pushed new branch release/7.0-RC-22 at ultreiaio / ird-observe
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/release/7.0-RC-22
You're receiving this email because of your account on gitlab.com.
1
0
23 Sep '18
Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
eed4e25e by Tony CHEMIT at 2018-09-23T11:28:54Z
optimize i18n
- - - - -
1e822246 by Tony CHEMIT at 2018-09-23T12:03:19Z
optimize i18n + detect again all we can
- - - - -
fec04535 by Tony CHEMIT at 2018-09-23T12:17:00Z
optimize dependencies
- - - - -
16 changed files:
- client-configuration/pom.xml
- client/pom.xml
- client/src/main/resources/i18n/client_en_GB.properties
- client/src/main/resources/i18n/client_es_ES.properties
- client/src/main/resources/i18n/client_fr_FR.properties
- dto/pom.xml
- dto/src/main/resources/i18n/dto_en_GB.properties
- dto/src/main/resources/i18n/dto_es_ES.properties
- dto/src/main/resources/i18n/dto_fr_FR.properties
- services/pom.xml
- − validation/.mvn/i18n-parse-validation
- validation/.mvn/i18n-parse-java → validation/.mvn/i18n-parse-validation-messages
- validation/pom.xml
- validation/src/main/resources/i18n/validation_en_GB.properties
- validation/src/main/resources/i18n/validation_es_ES.properties
- validation/src/main/resources/i18n/validation_fr_FR.properties
Changes:
=====================================
client-configuration/pom.xml
=====================================
@@ -195,6 +195,13 @@
</configuration>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>services</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
=====================================
client/pom.xml
=====================================
@@ -62,25 +62,6 @@
</properties>
- <!--<repositories>-->
- <!--<repository>-->
- <!--<id>central</id>-->
- <!--<url>http://repo1.maven.org/maven2/</url>-->
- <!--<releases>-->
- <!--<enabled>true</enabled>-->
- <!--<checksumPolicy>fail</checksumPolicy>-->
- <!--</releases>-->
- <!--</repository>-->
- <!--<repository>-->
- <!--<id>geotools-repository</id>-->
- <!--<url>http://download.osgeo.org/webdav/geotools</url>-->
- <!--<releases>-->
- <!--<enabled>true</enabled>-->
- <!--<checksumPolicy>fail</checksumPolicy>-->
- <!--</releases>-->
- <!--</repository>-->
- <!--</repositories>-->
-
<dependencyManagement>
<dependencies>
<!-- Map -->
@@ -621,11 +602,6 @@
<artifactId>jts-core</artifactId>
</dependency>
- <!--<dependency>-->
- <!--<groupId>com.vividsolutions</groupId>-->
- <!--<artifactId>jts</artifactId>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.apache.struts.xwork</groupId>
<artifactId>xwork-core</artifactId>
@@ -680,19 +656,6 @@
<plugins>
- <!--<plugin>-->
- <!--<artifactId>maven-jar-plugin</artifactId>-->
- <!--<configuration>-->
- <!--<archive>-->
- <!--<manifest>-->
- <!--<useUniqueVersions>false</useUniqueVersions>-->
- <!--<addClasspath>true</addClasspath>-->
- <!--<classpathPrefix>./lib/</classpathPrefix>-->
- <!--<mainClass>${maven.jar.main.class}</mainClass>-->
- <!--</manifest>-->
- <!--</archive>-->
- <!--</configuration>-->
- <!--</plugin>-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
@@ -738,27 +701,6 @@
</enumerationSets>
</configuration>
</execution>
- <!--<execution>-->
- <!--<id>check-convergence</id>-->
- <!--<goals>-->
- <!--<goal>check-i18n-artifacts</goal>-->
- <!--</goals>-->
- <!--</execution>-->
- <!--<execution>-->
- <!--<id>scan-sources</id>-->
- <!--<goals>-->
- <!--<goal>parserJava</goal>-->
- <!--<goal>gen</goal>-->
- <!--</goals>-->
- <!--<configuration>-->
- <!--<entries>-->
- <!--<entry>-->
- <!--<specificGoal>parserJava</specificGoal>-->
- <!--<basedir>${project.build.directory}/generated-sources/java/</basedir>-->
- <!--</entry>-->
- <!--</entries>-->
- <!--</configuration>-->
- <!--</execution>-->
<execution>
<id>default-bundle</id>
<goals>
@@ -798,18 +740,6 @@
</pluginManagement>
<plugins>
- <!--<plugin>-->
- <!--<groupId>io.ultreia.java4all.jaxx</groupId>-->
- <!--<artifactId>jaxx-maven-plugin</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<goals>-->
- <!--<goal>generate</goal>-->
- <!--</goals>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
@@ -832,27 +762,6 @@
</executions>
</plugin>
- <!--<plugin>-->
- <!--<artifactId>maven-dependency-plugin</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<id>copy-dependencies</id>-->
- <!--<goals>-->
- <!--<goal>copy-dependencies</goal>-->
- <!--</goals>-->
- <!--<phase>prepare-package</phase>-->
- <!--<configuration>-->
- <!--<!–suppress MavenModelInspection –>-->
- <!--<skip>${performRelease}</skip>-->
- <!--<overWriteReleases>false</overWriteReleases>-->
- <!--<overWriteSnapshots>true</overWriteSnapshots>-->
- <!--<overWriteIfNewer>true</overWriteIfNewer>-->
- <!--<outputDirectory>${project.build.directory}/lib</outputDirectory>-->
- <!--<silent>true</silent>-->
- <!--</configuration>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
@@ -928,278 +837,6 @@
</properties>
</profile>
- <!--<profile>-->
- <!--<id>release-quality-profile</id>-->
- <!--<activation>-->
- <!--<property>-->
- <!--<name>performRelease</name>-->
- <!--<value>true</value>-->
- <!--</property>-->
- <!--</activation>-->
- <!--<build>-->
- <!--<defaultGoal>package</defaultGoal>-->
- <!--<plugins>-->
- <!--<plugin>-->
- <!--<artifactId>maven-enforcer-plugin</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<goals>-->
- <!--<goal>enforce</goal>-->
- <!--</goals>-->
- <!--<phase>validate</phase>-->
- <!--<id>ensure-no-duplicated-classes</id>-->
- <!--<configuration>-->
- <!--<rules>-->
- <!--<banDuplicateClasses>-->
- <!--<findAllDuplicates>true</findAllDuplicates>-->
- <!--</banDuplicateClasses>-->
- <!--</rules>-->
- <!--<fail>true</fail>-->
- <!--</configuration>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--<dependencies>-->
- <!--<dependency>-->
- <!--<groupId>org.codehaus.mojo</groupId>-->
- <!--<artifactId>extra-enforcer-rules</artifactId>-->
- <!--<version>1.0-beta-4</version>-->
- <!--</dependency>-->
- <!--</dependencies>-->
- <!--</plugin>-->
-
- <!--</plugins>-->
- <!--</build>-->
- <!--</profile>-->
-
- <!--<profile>-->
- <!--<id>assembly-profile</id>-->
- <!--<activation>-->
- <!--<property>-->
- <!--<name>performRelease</name>-->
- <!--<value>true</value>-->
- <!--</property>-->
- <!--</activation>-->
- <!--<build>-->
- <!--<defaultGoal>package</defaultGoal>-->
-
- <!--<pluginManagement>-->
-
- <!--<plugins>-->
-
- <!--<plugin>-->
- <!--<artifactId>maven-jar-plugin</artifactId>-->
- <!--<configuration>-->
- <!--<archive>-->
- <!--<manifest>-->
- <!--<useUniqueVersions>false</useUniqueVersions>-->
- <!--<addClasspath>false</addClasspath>-->
- <!--<classpathPrefix />-->
- <!--<mainClass>${maven.jar.main.class}</mainClass>-->
- <!--</manifest>-->
- <!--</archive>-->
- <!--</configuration>-->
- <!--</plugin>-->
-
- <!--</plugins>-->
- <!--</pluginManagement>-->
- <!--<plugins>-->
-
- <!--<plugin>-->
- <!--<artifactId>maven-shade-plugin</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<phase>package</phase>-->
- <!--<goals>-->
- <!--<goal>shade</goal>-->
- <!--</goals>-->
- <!--<configuration>-->
- <!--<createDependencyReducedPom>false</createDependencyReducedPom>-->
- <!--<transformers>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">-->
- <!--<manifestEntries>-->
- <!--<Main-Class>${maven.jar.main.class}</Main-Class>-->
- <!--<X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>-->
- <!--<X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>-->
- <!--<Build-Date>${buildDate}</Build-Date>-->
- <!--<Build-Number>${buildNumber}</Build-Number>-->
- <!--<Implementation-Model-Version>${observe.model.version}</Implementation-Model-Version>-->
- <!--</manifestEntries>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">-->
- <!--<resource>xwork.xml</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>CHANGELOG.txt</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>LICENSE.txt</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>LICENSE</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>hsqldb_lic.txt</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>hypersonic_lic.txt</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>info.xml</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>jdom-info.xml</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>README.txt</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>README.md</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>THIRD-PARTY.txt</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>HTTPS___.DSA</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>DEPENDENCIES</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>HTTPS___.SF</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>README</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>NOTICE</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">-->
- <!--<resource>NOTICE.txt</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />-->
-
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">-->
- <!--<file>README.md</file>-->
- <!--<resource>README.md</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">-->
- <!--<file>${project.build.outputDirectory}/THIRD-PARTY.txt</file>-->
- <!--<resource>THIRD-PARTY.txt</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">-->
- <!--<file>${project.build.outputDirectory}/META-INF/${applicationName}-THIRD-PARTY.txt</file>-->
- <!--<resource>META-INF/${applicationName}-THIRD-PARTY.txt</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">-->
- <!--<file>${project.build.outputDirectory}/META-INF/${applicationName}-LICENSE.txt</file>-->
- <!--<resource>META-INF/${applicationName}-LICENSE.txt</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">-->
- <!--<file>${project.build.directory}/generated-sources/license/CHANGELOG.txt</file>-->
- <!--<resource>CHANGELOG.txt</resource>-->
- <!--</transformer>-->
- <!--<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">-->
- <!--<file>${project.build.directory}/generated-sources/license/META-INF/${applicationName}-CHANGELOG.txt</file>-->
- <!--<resource>META-INF/${applicationName}-CHANGELOG.txt</resource>-->
- <!--</transformer>-->
-
- <!--</transformers>-->
- <!--<!–minimizeJar>true</minimizeJar>-->
- <!--<filters>-->
- <!--<filter>-->
- <!--<artifact>log4j:log4j</artifact>-->
- <!--<includes>-->
- <!--<include>**</include>-->
- <!--</includes>-->
- <!--</filter>-->
- <!--<filter>-->
- <!--<artifact>commons-logging:commons-logging</artifact>-->
- <!--<includes>-->
- <!--<include>**</include>-->
- <!--</includes>-->
- <!--</filter>-->
- <!--</filters–>-->
- <!--</configuration>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
-
- <!--<plugin>-->
- <!--<groupId>org.codehaus.mojo</groupId>-->
- <!--<artifactId>build-helper-maven-plugin</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<id>parse-version</id>-->
- <!--<goals>-->
- <!--<goal>parse-version</goal>-->
- <!--</goals>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
- <!--<plugin>-->
- <!--<groupId>com.akathist.maven.plugins.launch4j</groupId>-->
- <!--<artifactId>launch4j-maven-plugin</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<id>launch4j</id>-->
- <!--<phase>package</phase>-->
- <!--<goals>-->
- <!--<goal>launch4j</goal>-->
- <!--</goals>-->
- <!--<configuration>-->
- <!--<dontWrapJar>true</dontWrapJar>-->
- <!--<headerType>gui</headerType>-->
- <!--<outfile>${project.build.directory}/${project.build.finalName}.exe</outfile>-->
- <!--<jar>${project.build.finalName}.jar</jar>-->
- <!--<errTitle>${project.parent.name}</errTitle>-->
- <!--<jre>-->
- <!--<minVersion>1.8.0</minVersion>-->
- <!--</jre>-->
- <!--<versionInfo>-->
- <!--<!–suppress MavenModelInspection –>-->
- <!--<fileVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</fileVersion>-->
- <!--<txtFileVersion>${project.version}</txtFileVersion>-->
- <!--<fileDescription>${project.parent.description}</fileDescription>-->
- <!--<productName>${project.parent.name}</productName>-->
- <!--<!–suppress MavenModelInspection –>-->
- <!--<productVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</productVersion>-->
- <!--<txtProductVersion>${project.version}</txtProductVersion>-->
- <!--<companyName>${project.organization.name}</companyName>-->
- <!--<copyright>${project.inceptionYear} 2009 - 2016 ${project.organization.name}</copyright>-->
- <!--<internalName>observe</internalName>-->
- <!--<originalFilename>${project.build.finalName}.exe</originalFilename>-->
- <!--</versionInfo>-->
- <!--</configuration>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
-
- <!--<plugin>-->
- <!--<artifactId>maven-assembly-plugin</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<id>create-application-assembly</id>-->
- <!--<phase>package</phase>-->
- <!--<goals>-->
- <!--<goal>single</goal>-->
- <!--</goals>-->
- <!--<configuration>-->
- <!--<descriptors>-->
- <!--<descriptor>src/main/assembly/bin.xml</descriptor>-->
- <!--</descriptors>-->
- <!--<attach>true</attach>-->
- <!--<finalName>${project.build.finalName}</finalName>-->
- <!--<appendAssemblyId>false</appendAssemblyId>-->
- <!--<outputDirectory>${project.build.directory}</outputDirectory>-->
- <!--</configuration>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
-
- <!--</plugins>-->
- <!--</build>-->
- <!--</profile>-->
-
<!-- This profile update license stuff with new goal update-file-header -->
<profile>
<id>update-file-header</id>
=====================================
client/src/main/resources/i18n/client_en_GB.properties
=====================================
@@ -60,7 +60,6 @@ observe.action.do.backup=Backup local database
observe.action.do.backup.tip=Make a backup of local database before applying modifications.
observe.action.exit=Quit
observe.action.exit.tip=quit Observe
-observe.action.export.requiredInsertMissingReferentials=Insert into central source missing referentials
observe.action.floatingObjectPresets=Floating Object references
observe.action.floatingObjectPresets.tip=Manage floating Object references
observe.action.goDown=Down...
@@ -150,18 +149,11 @@ observe.actions.consolidate.title=Consolidate data
observe.actions.consolidate.title.tip=Consolidate observed data
observe.actions.exportData=Export data
observe.actions.exportData.description=Export data
-observe.actions.exportData.error.missingReferentialsId=Can't export data, there is some missing referentials in central source and you did not select insert option.
-observe.actions.exportData.error.missingReferentialsId.left=Can't export data, there is some missing referentials in left source and you did not select insert option.
-observe.actions.exportData.error.missingReferentialsId.right=Can't export data, there is some missing referentials in right source and you did not select insert option.
observe.actions.exportData.message.add.missing.referential=\t%s
-observe.actions.exportData.message.add.missing.referentials=Insert %s missing referentials of type «%s»
observe.actions.exportData.message.add.missing.referentials2=Database «%s» - Insert %s missing referentials of type «%s»
observe.actions.exportData.message.not.possible=Export is not possible (see above messages)
observe.actions.exportData.message.operation.needFix=Select data to export.
observe.actions.exportData.message.prepare.data=Prepare data to export...
-observe.actions.exportData.message.result.delete.trip=Trip %s - %s was deleted from central database
-observe.actions.exportData.message.result.export.trip=Trip %s - %s was deleted from central database
-observe.actions.exportData.message.result.import.trip=Trip %s - %s was deleted in central database
observe.actions.exportData.table.exist.label=E
observe.actions.exportData.table.exist.label.tip=Trip alreay in remote database
observe.actions.exportData.table.program.label=Program
@@ -503,9 +495,6 @@ observe.common.Dto.label.usage.data.title=Data '%1$s' (%2$d occurrences)
observe.common.Dto.label.usage.referential.title=Referentiel '%1$s' (%2$d occurrences)
observe.common.Dto.lastUpdateDate=Last update date
observe.common.Dto.message.cantWriteData=You are not allow to write data on this data source.
-observe.common.Dto.mode.create.tip=Object is in create mode
-observe.common.Dto.mode.read.tip=Object is not editable
-observe.common.Dto.mode.update.tip=Object is in editing mode
observe.common.Dto.technicalInformations=Technical information of %1$s
observe.common.Dto.topiaCreateDate=Create date
observe.common.Dto.topiaId=Technical id
@@ -855,11 +844,7 @@ observe.common.RouteDto.noneForTrip=< No route fo current trip >
observe.common.RouteDto.title=Route
observe.common.RouteDto.titles=Routes
observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Use default size measure type
-observe.common.Sample.length.computed.tip=Length was computed
-observe.common.Sample.length.observed.tip=Length was observed
observe.common.Sample.weight=Individual weight (kg)
-observe.common.Sample.weight.computed.tip=Weight was computed (%s)
-observe.common.Sample.weight.observed.tip=Weight was observed
observe.common.SchoolEstimateDto.action.create=Insert this estimate
observe.common.SchoolEstimateDto.action.create.tip=Insert this estimate
observe.common.SchoolEstimateDto.table.meanWeight=Mean weight (in Kg)
@@ -1149,7 +1134,6 @@ observe.common.directory=Directory
observe.common.exist.on.remote=%1$s (already exist)
observe.common.file=File
observe.common.global.progression.description=Global progression
-observe.common.label=Label
observe.common.ocean=Ocean
observe.common.operation.resume=Summary of operations
observe.common.resume=Summary
@@ -1295,7 +1279,6 @@ observe.message.help.usage=ObServe Help v %1$s
observe.message.loaded.tip=%1$s is loading,\nYou can change data source by clicking here
observe.message.no.local.db.found=Local data source does not exist (location %1$s).\n\nYou can create it or connect to a remote data source.
observe.message.no.report.selected=< No report selected >
-observe.message.no.species.selected=No species selected
observe.message.no.usage.for.entity=No usage found.
observe.message.quit.invalid.edit=Data are not valid and can't be saved\!\n\nNote\: If you continue, any modification will be lost.
observe.message.quit.valid.edit=Data are modified and valid\!
@@ -1309,7 +1292,6 @@ observe.message.show.usage.for.delete3=Choose a replacement reference to be able
observe.message.show.usage.for.desactivated=Referential %1$s "%2$s" will be disabled.
observe.message.show.usage.for.desactivated2=Some data are using this referential, see following reference
observe.message.show.usage.for.desactivated3=Those data need to use another enabled referential to be saved.
-observe.message.show.usage.for.missingReferentials=There is some referentials present in local source but not in centrale one.
observe.message.show.usage.for.missingReferentials2=There is some referentials present in «%s» source but not in the «%s» one.
observe.message.show.usages=List of usage of referential %1$s\: '%2$s'
observe.message.table.editBean.modified=Current entry is modifed and valid.
@@ -1319,7 +1301,6 @@ observe.message.updating.referentiel=Referential is in edition mode
observe.message.warning.will.be.delete=%1$s\n\nBe ware, export will replace existing data.
observe.runner.config.loaded=Configuration d'ObServe v. %1$s chargée.
observe.runner.context.loaded=Initialisation du contexte terminée en %1$s.
-observe.runner.copy.default.logConfigurationFile.file=Création du fichier de configuration des logs %1$s.
observe.runner.copy.default.map.file=Création des cartes %1$s.
observe.runner.copy.default.report.file=Création du fichier de reports %1$s.
observe.runner.copy.default.ui.file=Création du fichier de cosmétique %1$s.
@@ -1436,8 +1417,6 @@ observe.storage.remote.useSll=Use ssl?
observe.storage.remoteConfiguration.presets=Remote configuration presets
observe.storage.remoteConfiguration.presets.save=Save current configuration
observe.storage.report.action.migrate=Update policy
-observe.storage.report.can.migrate=Update if necessary (current version\: %1$s)
-observe.storage.report.can.not.migrate=No update possible
observe.storage.report.no.create.mode=Create mode not needed
observe.storage.required.rw.on.data=You don't have sufficient credentials to perform this operation.\n\nTo perform this operation, you need Read/Write permissions on data.
observe.storage.security.administrateur=Owner of database
@@ -1465,7 +1444,6 @@ observe.storage.useServerStorage.config=Configure remote server to use
observe.storage.useServerStorage.description=Please configure connexion to remote server\nYou must validate your connexion to continue.
observe.title.about=About
observe.title.can.not.delete.referentiel=Impossible to delete a referentiel data...
-observe.title.can.not.export.data=Could not export data
observe.title.can.not.export.data2=Could not export data to «%s» source
observe.title.can.not.export.obstuna=Could not export obstuna data...
observe.title.choose.db.dump=Choose a database backup
=====================================
client/src/main/resources/i18n/client_es_ES.properties
=====================================
@@ -60,7 +60,6 @@ observe.action.do.backup=Guardar la base local
observe.action.do.backup.tip=Hacer copia de seguridad de la base local antes de aplicar los cambios
observe.action.exit=Salir
observe.action.exit.tip=Salir de ObServe
-observe.action.export.requiredInsertMissingReferentials=Insérer les référentiels manquant dans la source centrale. \#TODO
observe.action.floatingObjectPresets=Floating Object references \#TODO
observe.action.floatingObjectPresets.tip=Manage floating Object references \#TODO
observe.action.goDown=Descender hacia ...
@@ -150,18 +149,11 @@ observe.actions.consolidate.title=Consolidar los datos observados
observe.actions.consolidate.title.tip=Consolidar los datos observados
observe.actions.exportData=Exportar los datos observados
observe.actions.exportData.description=Exportar los datos observados en la base central
-observe.actions.exportData.error.missingReferentialsId=Il existe des référentiels dans la base locale non présente en base centrale, mais vous n'avez pas activé l'option d'insertion automatique. \#TODO
-observe.actions.exportData.error.missingReferentialsId.left=Il existe des référentiels dans la base de gauche non présente en base centrale, mais vous n'avez pas activé l'option d'insertion automatique. \#TODO
-observe.actions.exportData.error.missingReferentialsId.right=Il existe des référentiels dans la base de droite non présente en base centrale, mais vous n'avez pas activé l'option d'insertion automatique. \#TODO
observe.actions.exportData.message.add.missing.referential=\t%s
-observe.actions.exportData.message.add.missing.referentials=Insertion de %s référentiels de type «%s» \#TODO
observe.actions.exportData.message.add.missing.referentials2=Base «%s» - Insertion de %s référentiels de type «%s»\#TODO
observe.actions.exportData.message.not.possible=La exportación no es posible (vea el mensaje anterior).
observe.actions.exportData.message.operation.needFix=Seleccione las mareas a exportar.
observe.actions.exportData.message.prepare.data=Preparación de los datos a exportar...
-observe.actions.exportData.message.result.delete.trip=Base «%s» - La marea %s - %s fue eliminada.
-observe.actions.exportData.message.result.export.trip=Base «%s» - La marea %s - %s fue exportada.
-observe.actions.exportData.message.result.import.trip=Base «%s» - La marea %s - %s fue importada.
observe.actions.exportData.table.exist.label=E
observe.actions.exportData.table.exist.label.tip=Marea ya está presente en la base de datos remota
observe.actions.exportData.table.program.label=Programa
@@ -503,9 +495,6 @@ observe.common.Dto.label.usage.data.title=Datos '%1$s' (%2$d ocurrencias)
observe.common.Dto.label.usage.referential.title=Referencial '%1$s' (%2$d ocurrencias)
observe.common.Dto.lastUpdateDate=Last update date
observe.common.Dto.message.cantWriteData=No tiene autorización para escribir los datos de observadores en esta fuente de datos.
-observe.common.Dto.mode.create.tip=Objeto en proceso de creación
-observe.common.Dto.mode.read.tip=Objeto no se puede editar
-observe.common.Dto.mode.update.tip=Objeto en proceso de edición
observe.common.Dto.technicalInformations=Informaciones técnicas del referencial %1$s
observe.common.Dto.topiaCreateDate=Fecha de creación
observe.common.Dto.topiaId=Técnicas de identificación
@@ -855,11 +844,7 @@ observe.common.RouteDto.noneForTrip=Ninguna ruta en la marea actual
observe.common.RouteDto.title=Ruta
observe.common.RouteDto.titles=Rutas
observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Utiliser le type de mensuration par défaut \#TODO
-observe.common.Sample.length.computed.tip=Longitud calculada
-observe.common.Sample.length.observed.tip=Longitud observada
observe.common.Sample.weight=Peso del ejemplar (en Kg)
-observe.common.Sample.weight.computed.tip=Peso calculado
-observe.common.Sample.weight.observed.tip=Peso observado
observe.common.SchoolEstimateDto.action.create=Insertar estimación
observe.common.SchoolEstimateDto.action.create.tip=Insertar la nueva estimación en la tabla
observe.common.SchoolEstimateDto.table.meanWeight=Peso medio (en Kg)
@@ -1149,7 +1134,6 @@ observe.common.directory=Carpeta
observe.common.exist.on.remote=%1$s (ya existe)
observe.common.file=Archivo
observe.common.global.progression.description=Progresión global
-observe.common.label=Texto
observe.common.ocean=Océano
observe.common.operation.resume=Resumen de operaciones
observe.common.resume=Resumen de la configuración
@@ -1295,7 +1279,6 @@ observe.message.help.usage=Ayuda de Observe v %1$s
observe.message.loaded.tip=La %1$s cargada,\n\nPuede cargar la base haciendo clic aquí.
observe.message.no.local.db.found=No existe la base local (ruta %1$s).\n\nPuede crear la base local o conectarse a una base remota.
observe.message.no.report.selected=Ningún informe seleccionado
-observe.message.no.species.selected=Ninguna especie seleccionada
observe.message.no.usage.for.entity=Ningún usuario encontrado.
observe.message.quit.invalid.edit=¡Datos no validos, no se pueden guardar\!\n\nNota\: Si continúa se cancelarán todas las modificaciones.
observe.message.quit.valid.edit=¡Los datos han sido modificados y son válidos\!
@@ -1309,7 +1292,6 @@ observe.message.show.usage.for.delete3=Elija una referencia de reemplazo para po
observe.message.show.usage.for.desactivated=El referencial %1$s "%2$s" se desactivará.
observe.message.show.usage.for.desactivated2=Los objetos están usando actualmente las referencias que se enumeran a continuación..
observe.message.show.usage.for.desactivated3=Estos objetos deben usar otro referencial (no desactivado) para poder actualizarse.
-observe.message.show.usage.for.missingReferentials=Il existe des référentiels présents dans la base locale mais non présents dans la base centrale. \#TODO
observe.message.show.usage.for.missingReferentials2=There is some referentials present in «%s» source but not in the «%s» one.
observe.message.show.usages=Listas de usos de referenciales %1$s \: '%2$s'
observe.message.table.editBean.modified=El registro actual se ha modificado y es válido.
@@ -1319,7 +1301,6 @@ observe.message.updating.referentiel=Se está actualizando el objeto.
observe.message.warning.will.be.delete=%1$s\n\nAtención, la exportación reemplazará la marea existente.
observe.runner.config.loaded=Configuración de Observe v. %1$s cargada.
observe.runner.context.loaded=Finlazada la inicialización del contexto en %1$s.
-observe.runner.copy.default.logConfigurationFile.file=Creación del archivo de configuración de los logs %1$s.
observe.runner.copy.default.map.file=Creación de los mapas %1$s.
observe.runner.copy.default.report.file=Creación del archivo de informes %1$s.
observe.runner.copy.default.ui.file=Creación del archivo de cosmético %1$s.
@@ -1436,8 +1417,6 @@ observe.storage.remote.useSll=¿modo ssl?
observe.storage.remoteConfiguration.presets=Configuration enregistrées \#TODO
observe.storage.remoteConfiguration.presets.save=Enregister cette configuration \#TODO
observe.storage.report.action.migrate=Politica de actualización
-observe.storage.report.can.migrate=Actualizar si es necesario (version actual \: %1$s)
-observe.storage.report.can.not.migrate=No es posible actualizar
observe.storage.report.no.create.mode=No se necesita seleccionar un modo de creación de la base
observe.storage.required.rw.on.data=No tiene los permisos necesarios para realizar esta operación.\n\nDebe tener permios de lectura y escritura de los datos del obaservador.
observe.storage.security.administrateur=Propietario de la base
@@ -1465,7 +1444,6 @@ observe.storage.useServerStorage.config=Configurar el servidor remoto a utilizar
observe.storage.useServerStorage.description=Configure su conexión al servidor remoto\nAntes de que pueda continuar, tiene que validar la conexión.
observe.title.about=A proposito de ObServe...
observe.title.can.not.delete.referentiel=Impossible eliminar un referencial en proceso de utilización...
-observe.title.can.not.export.data=Impossible d'exporter les données vers la base centrale... \#TODO
observe.title.can.not.export.data2=Impossible d'exporter les données vers la base «%s»... \#TODO
observe.title.can.not.export.obstuna=Impossible exportar los datos de obstuna...
observe.title.choose.db.dump=Seleccionar una copia de seguridad de base local
=====================================
client/src/main/resources/i18n/client_fr_FR.properties
=====================================
@@ -60,7 +60,6 @@ observe.action.do.backup=Sauver la base locale
observe.action.do.backup.tip=Effectuer une sauvegarde de la base locale avant d'appliquer les changements
observe.action.exit=Quitter
observe.action.exit.tip=Quitter ObServe
-observe.action.export.requiredInsertMissingReferentials=Insérer les référentiels manquant dans la source centrale.
observe.action.floatingObjectPresets=Objets flottants de références
observe.action.floatingObjectPresets.tip=Gérer les objets flottants de référence
observe.action.goDown=Descendre vers ...
@@ -150,18 +149,11 @@ observe.actions.consolidate.title=Consolider les données observateur
observe.actions.consolidate.title.tip=Consolider les données observateur
observe.actions.exportData=Exporter les données observateurs
observe.actions.exportData.description=Exporter les données observateurs vers la base centrale
-observe.actions.exportData.error.missingReferentialsId=Il existe des référentiels dans la base locale non présente en base centrale, mais vous n'avez pas activé l'option d'insertion automatique.
-observe.actions.exportData.error.missingReferentialsId.left=Il existe des référentiels dans la base de gauche non présente en base centrale, mais vous n'avez pas activé l'option d'insertion automatique.
-observe.actions.exportData.error.missingReferentialsId.right=Il existe des référentiels dans la base de droite non présente en base centrale, mais vous n'avez pas activé l'option d'insertion automatique.
observe.actions.exportData.message.add.missing.referential=\t%s
-observe.actions.exportData.message.add.missing.referentials=Insertion de %s référentiels de type «%s»
observe.actions.exportData.message.add.missing.referentials2=Source «%s» - Insertion de %s référentiels de type «%s»
observe.actions.exportData.message.not.possible=L'opération d'export n'est pas possible (voir les messages précédents).
observe.actions.exportData.message.operation.needFix=Veuillez sélectionner les marées à exporter.
observe.actions.exportData.message.prepare.data=Préparation des données à exporter...
-observe.actions.exportData.message.result.delete.trip=Source «%s» - La marée %s - %s a été supprimée de la base centrale
-observe.actions.exportData.message.result.export.trip=Source «%s» - La marée %s - %s a été exportée depuis la base locale
-observe.actions.exportData.message.result.import.trip=Source «%s» - La marée %s - %s a été importée dans la base centrale
observe.actions.exportData.table.exist.label=E
observe.actions.exportData.table.exist.label.tip=Marée déjà présente sur la base distante
observe.actions.exportData.table.program.label=Programme
@@ -503,9 +495,6 @@ observe.common.Dto.label.usage.data.title=Donnée '%1$s' (%2$d occurrences)
observe.common.Dto.label.usage.referential.title=Référentiel '%1$s' (%2$d occurrences)
observe.common.Dto.lastUpdateDate=Date de dernière mise à jour
observe.common.Dto.message.cantWriteData=Vous n'êtes pas autorisé à écrire des données observateurs sur cette source de données.
-observe.common.Dto.mode.create.tip=L'objet est en cours de création
-observe.common.Dto.mode.read.tip=L'objet n'est pas éditable
-observe.common.Dto.mode.update.tip=L'objet est en cours d'édition
observe.common.Dto.technicalInformations=Informations techniques de l'objet de type '%1$s'
observe.common.Dto.topiaCreateDate=Date de création
observe.common.Dto.topiaId=Identifiant technique
@@ -855,11 +844,7 @@ observe.common.RouteDto.noneForTrip=< Aucune route pour la marée courante >
observe.common.RouteDto.title=Route
observe.common.RouteDto.titles=Routes
observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Utiliser le type de mensuration par défaut
-observe.common.Sample.length.computed.tip=La longueur a été calculée
-observe.common.Sample.length.observed.tip=La longueur a été observée
observe.common.Sample.weight=Poids ind. (en Kg)
-observe.common.Sample.weight.computed.tip=Le poids a été calculé
-observe.common.Sample.weight.observed.tip=Le poids a été observé
observe.common.SchoolEstimateDto.action.create=Insérer cette estimation
observe.common.SchoolEstimateDto.action.create.tip=Insérer la nouvelle estimation dans la table
observe.common.SchoolEstimateDto.table.meanWeight=Poids moyen (en Kg)
@@ -1149,7 +1134,6 @@ observe.common.directory=Répertoire
observe.common.exist.on.remote=%1$s (déjà existante)
observe.common.file=Fichier
observe.common.global.progression.description=Progression globale
-observe.common.label=Libellé
observe.common.ocean=Océan
observe.common.operation.resume=Résumé des opérations
observe.common.resume=Résumé de la configuration
@@ -1295,7 +1279,6 @@ observe.message.help.usage=Aide d'ObServe v %1$s
observe.message.loaded.tip=La %1$s est chargée,\n\nVous pouvez changer de base en cliquant ici.
observe.message.no.local.db.found=La base locale n'existe pas (emplacement %1$s).\n\nVous pouvez à ce stade créer la base locale ou vous connecter à une base distante.
observe.message.no.report.selected=< Aucun report sélectionné >
-observe.message.no.species.selected=Pas d'espèce sélectionnée
observe.message.no.usage.for.entity=Aucune utilisation trouvée.
observe.message.quit.invalid.edit=Les données ne sont pas valides et ne peuvent pas être sauvées\!\n\nNote\: le fait de continuer annulera toutes les modifications.
observe.message.quit.valid.edit=Les données ont été modifiées et sont valides\!
@@ -1309,7 +1292,6 @@ observe.message.show.usage.for.delete3=Pour pouvoir supprimer l'objet, vous deve
observe.message.show.usage.for.desactivated=Le référentiel %1$s "%2$s" va être désactivé.
observe.message.show.usage.for.desactivated2=Des objets utilisent actuellement cet entité dont les références sont citées plus bas.
observe.message.show.usage.for.desactivated3=Ces objets devront utiliser un autre référentiel (non désactivé) pour pouvoir être mis à jour.
-observe.message.show.usage.for.missingReferentials=Il existe des référentiels présents dans la base locale mais non présents dans la base centrale.
observe.message.show.usage.for.missingReferentials2=Il existe des référentiels présents dans la base «%s» mais non présents dans la base «%s».
observe.message.show.usages=Listes des utilisations du référentiel %1$s \: '%2$s'
observe.message.table.editBean.modified=L'entrée en cours d'édition a été modifiée et est valide.
@@ -1319,7 +1301,6 @@ observe.message.updating.referentiel=L'objet est en cours de mise à jour.
observe.message.warning.will.be.delete=%1$s\n\nAttention, l'export remplacera la marée existante.
observe.runner.config.loaded=Configuration d'ObServe v. %1$s chargée.
observe.runner.context.loaded=Initialisation du contexte terminée en %1$s.
-observe.runner.copy.default.logConfigurationFile.file=Création du fichier de configuration des logs %1$s.
observe.runner.copy.default.map.file=Création des cartes %1$s.
observe.runner.copy.default.report.file=Création du fichier de reports %1$s.
observe.runner.copy.default.ui.file=Création du fichier de cosmétique %1$s.
@@ -1436,8 +1417,6 @@ observe.storage.remote.useSll=mode ssl ?
observe.storage.remoteConfiguration.presets=Configurations enregistrées
observe.storage.remoteConfiguration.presets.save=Enregister cette configuration
observe.storage.report.action.migrate=Politique de mise à jour
-observe.storage.report.can.migrate=Mise à jour si nécessaire (version actuelle \: %1$s)
-observe.storage.report.can.not.migrate=Pas de mise à jour possible
observe.storage.report.no.create.mode=Mode de création de base non requis
observe.storage.required.rw.on.data=Vous n'avez pas les droits suffisants pour effectuer cette opération.\n\nPour effectuer cette opération vous devez avoir les droits de lecture et d'écriture sur les données observateur.
observe.storage.security.administrateur=Propriétaire de la base
@@ -1465,7 +1444,6 @@ observe.storage.useServerStorage.config=Configurer le serveur distant à utilise
observe.storage.useServerStorage.description=Veuillez configurer votre connexion au serveur distant\nAvant de pouvoir poursuivre, vous devez valider la connexion.
observe.title.about=A propos d'ObServe...
observe.title.can.not.delete.referentiel=Impossible de supprimer un référentiel en cours d'utilisation...
-observe.title.can.not.export.data=Impossible d'exporter les données vers la base centrale...
observe.title.can.not.export.data2=Impossible d'exporter les données vers la base «%s»...
observe.title.can.not.export.obstuna=Impossible d'exporter des données d'obstuna...
observe.title.choose.db.dump=Choisir une sauvegarder de base locale
=====================================
dto/pom.xml
=====================================
@@ -21,7 +21,8 @@
#L%
-->
-<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -203,6 +204,23 @@
</enumerationSets>
</configuration>
</execution>
+ <execution>
+ <id>default-parse-java</id>
+ <goals>
+ <goal>parse-java</goal>
+ </goals>
+ <configuration>
+ <treatDefaultEntry>true</treatDefaultEntry>
+ <entries>
+ <entry>
+ <!--<specificGoal>parse-java</specificGoal>-->
+ <basedir>${project.build.directory}/generated-sources/java/</basedir>
+ </entry>
+ </entries>
+
+ </configuration>
+ </execution>
+
</executions>
</plugin>
</plugins>
@@ -223,10 +241,10 @@
<target>
<copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.directory}/models">
<filterset>
- <filter value="${observe.model.version}" token="observe.model.version" />
+ <filter value="${observe.model.version}" token="observe.model.version"/>
</filterset>
<fileset dir="${basedir}/src/main/models">
- <include name="*.model" />
+ <include name="*.model"/>
</fileset>
</copy>
</target>
=====================================
dto/src/main/resources/i18n/dto_en_GB.properties
=====================================
@@ -80,7 +80,6 @@ observe.common.ItemHorizontalPositionDto.type=Item horizontal position
observe.common.ItemHorizontalPositionDto.types=Item horizontal positions
observe.common.ItemVerticalPositionDto.type=Item vertical position
observe.common.ItemVerticalPositionDto.types=Item vertical positions
-observe.common.LengthLengthParameterDto.inputOutputFormula=Input to Output formula
observe.common.LengthLengthParameterDto.type=Length length parameter
observe.common.LengthLengthParameterDto.types=Length length parameters
observe.common.LengthWeightParameterDto.type=Length weight parameter
@@ -98,18 +97,13 @@ observe.common.MitigationTypeDto.types=Mitigation types
observe.common.NonTargetCatchDto.title=Non target catch
observe.common.NonTargetCatchDto.type=Non target catch
observe.common.NonTargetCatchDto.types=Non target catch
-observe.common.NonTargetCatchReleaseConformityDto.title=Release conformity
observe.common.NonTargetCatchReleaseConformityDto.type=Release conformity
observe.common.NonTargetCatchReleaseConformityDto.types=Release conformity
-observe.common.NonTargetCatchReleaseDto.conformity=Conformity
-observe.common.NonTargetCatchReleaseDto.releasingTime=Releasing time
observe.common.NonTargetCatchReleaseDto.title=Non target catches released
observe.common.NonTargetCatchReleaseDto.type=Non target catch released
observe.common.NonTargetCatchReleaseDto.types=Non target catches released
-observe.common.NonTargetCatchReleaseStatusDto.title=Non target catch release status
observe.common.NonTargetCatchReleaseStatusDto.type=Non target catch release status
observe.common.NonTargetCatchReleaseStatusDto.types=Non target catch release status
-observe.common.NonTargetCatchReleasingTimeDto.title=Releasing time
observe.common.NonTargetCatchReleasingTimeDto.type=Releasing time
observe.common.NonTargetCatchReleasingTimeDto.types=Releasing time
observe.common.NonTargetLengthDto.title=Non target lengths
@@ -244,7 +238,6 @@ observe.common.gps.gpsPoint=Gps point
observe.common.haulingIdentifier=Hauling identifier
observe.common.homeId=Home id
observe.common.inconnu=Unknown
-observe.common.lengthWeightFormula=Length weight formula
observe.common.no.unit=No unit
observe.common.nocode=Nocode
observe.common.none=None
=====================================
dto/src/main/resources/i18n/dto_es_ES.properties
=====================================
@@ -80,7 +80,6 @@ observe.common.ItemHorizontalPositionDto.type=Localización del elemento sobre l
observe.common.ItemHorizontalPositionDto.types=Localizaciones del elemento sobre la línea principal
observe.common.ItemVerticalPositionDto.type=Localización del elemento sobre el arponcillo
observe.common.ItemVerticalPositionDto.types=Localizaciones del elemento sobre el arponcillo
-observe.common.LengthLengthParameterDto.inputOutputFormula=Formule Entrée vers Sortie \#TODO
observe.common.LengthLengthParameterDto.type=Relación Tamaño-Tamaño
observe.common.LengthLengthParameterDto.types=Relaciones Tamaño-Tamaño
observe.common.LengthWeightParameterDto.type=Relación Tamaño-Peso
@@ -98,16 +97,13 @@ observe.common.MitigationTypeDto.types=Tipos de medida de atenuación
observe.common.NonTargetCatchDto.title=Fauna accesoria conservada o descartada
observe.common.NonTargetCatchDto.type=Fauna accesoria conservada o descartada
observe.common.NonTargetCatchDto.types=Fauna accesoria conservada o descartada
-observe.common.NonTargetCatchReleaseConformityDto.title=Conformidad en la liberacion de especies no objetivo
observe.common.NonTargetCatchReleaseConformityDto.type=Conformidad en la liberacion de especies no objetivo
observe.common.NonTargetCatchReleaseConformityDto.types=Conformidad en la liberacion de especies no objetivo
observe.common.NonTargetCatchReleaseDto.title=Espèces accessoires sensibles libérées \#TODO
observe.common.NonTargetCatchReleaseDto.type=Espèce accessoire sensible libérée \#TODO
observe.common.NonTargetCatchReleaseDto.types=Espèces accessoires sensibles libérées \#TODO
-observe.common.NonTargetCatchReleaseStatusDto.title=États à la libération \#TODO
observe.common.NonTargetCatchReleaseStatusDto.type=État à la libération \#TODO
observe.common.NonTargetCatchReleaseStatusDto.types=États à la libération \#TODO
-observe.common.NonTargetCatchReleasingTimeDto.title=Tiempo de liberacion de especies no objetivo
observe.common.NonTargetCatchReleasingTimeDto.type=Tiempo de liberacion de especies no objetivo
observe.common.NonTargetCatchReleasingTimeDto.types=Tiempo de liberacion de especies no objetivo
observe.common.NonTargetLengthDto.title=Longitudes (cm inf.)
@@ -242,7 +238,6 @@ observe.common.gps.gpsPoint=Punto GPS
observe.common.haulingIdentifier=Arrastre
observe.common.homeId=Identificador
observe.common.inconnu=desconocido
-observe.common.lengthWeightFormula=Relación de peso
observe.common.no.unit=No unit \#TODO
observe.common.nocode=codigo ausente
observe.common.none=Ninguno
=====================================
dto/src/main/resources/i18n/dto_fr_FR.properties
=====================================
@@ -80,7 +80,6 @@ observe.common.ItemHorizontalPositionDto.type=Localisation de l'élément sur la
observe.common.ItemHorizontalPositionDto.types=Localisations de l'élément sur la ligne mère
observe.common.ItemVerticalPositionDto.type=Localisation de l'élément sur l'avançon
observe.common.ItemVerticalPositionDto.types=Localisations de l'élément sur l'avançon
-observe.common.LengthLengthParameterDto.inputOutputFormula=Formule entrée -> sortie
observe.common.LengthLengthParameterDto.type=Relation Taille-Taille
observe.common.LengthLengthParameterDto.types=Relations Taille-Taille
observe.common.LengthWeightParameterDto.type=Relation Taille-Poids
@@ -98,18 +97,13 @@ observe.common.MitigationTypeDto.types=Types de mesure d'atténuation
observe.common.NonTargetCatchDto.title=Espèces accessoires conservées ou rejetées
observe.common.NonTargetCatchDto.type=Espèce accessoire conservée ou rejetée
observe.common.NonTargetCatchDto.types=Espèces accessoires conservées ou rejetées
-observe.common.NonTargetCatchReleaseConformityDto.title=Conformités à la libération
observe.common.NonTargetCatchReleaseConformityDto.type=Conformité à la libération
observe.common.NonTargetCatchReleaseConformityDto.types=Conformités à la libération
-observe.common.NonTargetCatchReleaseDto.conformity=Conformité
-observe.common.NonTargetCatchReleaseDto.releasingTime=Moment de la libération
observe.common.NonTargetCatchReleaseDto.title=Espèces accessoires sensibles libérées
observe.common.NonTargetCatchReleaseDto.type=Espèce accessoire sensible libérée
observe.common.NonTargetCatchReleaseDto.types=Espèces accessoires libérées
-observe.common.NonTargetCatchReleaseStatusDto.title=États à la libération
observe.common.NonTargetCatchReleaseStatusDto.type=État à la libération
observe.common.NonTargetCatchReleaseStatusDto.types=États à la libération
-observe.common.NonTargetCatchReleasingTimeDto.title=Moments de la libération
observe.common.NonTargetCatchReleasingTimeDto.type=Moment de la libération
observe.common.NonTargetCatchReleasingTimeDto.types=Moments de la libération
observe.common.NonTargetLengthDto.title=Longueurs (cm inf.)
@@ -244,7 +238,6 @@ observe.common.gps.gpsPoint=Point GPS
observe.common.haulingIdentifier=Virage
observe.common.homeId=Identifiant
observe.common.inconnu=inconnu
-observe.common.lengthWeightFormula=Relation Poids
observe.common.no.unit=Pas d'unité
observe.common.nocode=code absent
observe.common.none=Aucun
=====================================
services/pom.xml
=====================================
@@ -88,10 +88,6 @@
<groupId>io.ultreia.java4all.http</groupId>
<artifactId>http-api</artifactId>
</dependency>
- <dependency>
- <groupId>io.ultreia.java4all</groupId>
- <artifactId>java-lang</artifactId>
- </dependency>
<dependency>
<groupId>io.ultreia.java4all.jaxx</groupId>
=====================================
validation/.mvn/i18n-parse-validation deleted
=====================================
=====================================
validation/.mvn/i18n-parse-java → validation/.mvn/i18n-parse-validation-messages
=====================================
=====================================
validation/pom.xml
=====================================
@@ -115,26 +115,9 @@
<id>default-parse-java</id>
<goals>
<goal>parse-java</goal>
- <!--<goal>parserValidation</goal>-->
- <!--<goal>gen</goal>-->
</goals>
<configuration>
<defaultBasedir>${project.build.directory}/generated-sources/java</defaultBasedir>
- <!--<treateDefaultEntry>false</treateDefaultEntry>-->
- <!--<entries>-->
- <!--<entry>-->
- <!--<specificGoal>parserValidation</specificGoal>-->
- <!--<basedir>${project.basedir}/src/main/resources/</basedir>-->
- <!--<includes>-->
- <!--<param>**/**-validation.xml</param>-->
- <!--</includes>-->
- <!--</entry>-->
- <!--<entry>-->
- <!--<specificGoal>parserJava</specificGoal>-->
- <!--<basedir>${project.build.directory}/generated-sources/java/</basedir>-->
- <!--</entry>-->
- <!--</entries>-->
-
</configuration>
</execution>
</executions>
@@ -170,6 +153,9 @@
<fr.ird.observe.dto.referential.ReferentialDto>
code,status,uri,needComment
</fr.ird.observe.dto.referential.ReferentialDto>
+ <fr.ird.observe.dto.data.DataDto>
+ lengthMeasureMethod,weightMeasureMethod
+ </fr.ird.observe.dto.data.DataDto>
</inheritanceMapping>
</configuration>
</execution>
=====================================
validation/src/main/resources/i18n/validation_en_GB.properties
=====================================
@@ -103,6 +103,7 @@ observe.common.I18nReferentialDto.label2=French label
observe.common.I18nReferentialDto.label3=Spanish label
observe.common.LengthLengthParameterDto.coefficients=Coefficients
observe.common.LengthLengthParameterDto.endDate=End date
+observe.common.LengthLengthParameterDto.inputOutputFormula=Input to Output formula
observe.common.LengthLengthParameterDto.inputSizeMeasureType=Input size measure type
observe.common.LengthLengthParameterDto.ocean=Ocean
observe.common.LengthLengthParameterDto.outputInputFormula=Output formula
@@ -128,8 +129,10 @@ observe.common.NonTargetCatchDto.species=Species
observe.common.NonTargetCatchDto.speciesFate=Species fate
observe.common.NonTargetCatchDto.totalCount=Count
observe.common.NonTargetCatchReleaseDto.comment=Non target catch released comment
+observe.common.NonTargetCatchReleaseDto.conformity=Conformity
observe.common.NonTargetCatchReleaseDto.count=Count
observe.common.NonTargetCatchReleaseDto.length=Length (cm)
+observe.common.NonTargetCatchReleaseDto.releasingTime=Releasing time
observe.common.NonTargetCatchReleaseDto.sex=Sex
observe.common.NonTargetCatchReleaseDto.species=Species
observe.common.NonTargetCatchReleaseDto.speciesGroupReleaseMode=Release mode
@@ -340,7 +343,6 @@ observe.validation.activity.desactivated.vesselActivity=Selected vessel activity
observe.validation.activity.desactivated.wind=Selected wind is disabled.
observe.validation.activity.duplicated.time=There is already another activity at this time.
observe.validation.activity.invalid.quadrant=Quadrant is not coherent with ocean (%1$s) of trip (indian\: 1,2, atlantic 1,2,3,4).
-observe.validation.activity.invalid.seaSurfaceTemperature=Previous activity (%1$s) sea temperature was %2$s%5$s, current temperature must be between %3$s%5$s and %4$s%5$s.
observe.validation.activity.invalid.speed=Activity speed is %s nb, which is more than the maximum authorized which is %s nd.
observe.validation.activity.null.dcp=No floating object selected.
observe.validation.activity.null.fpaZone=Fpa zone is not filled.
@@ -463,16 +465,15 @@ observe.validation.lengthLengthParameter.null.ocean=Ocean is not filled.
observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Output size measure type is not filled.
observe.validation.lengthLengthParameter.null.sex=Sex must be filled.
observe.validation.lengthLengthParameter.required.coefficients=Coefficients are required.
-observe.validation.lengthLengthParameter.required.endDate=End date must be filled.
observe.validation.lengthLengthParameter.required.inputOutputFormula=Formula is required.
observe.validation.lengthLengthParameter.required.outputInputFormula=Formula is required.
observe.validation.lengthLengthParameter.required.species=Species must be filled.
-observe.validation.lengthLengthParameter.required.startDate=Start date must be filled.
observe.validation.lengthWeightParameter.disabled.sizeMeasureType=Selected size measure type is disabled.
observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=Formula is not valid.
observe.validation.lengthWeightParameter.invalid.uniqueKey=Tuple (species/ocean/gender/sizeMeasureType/startDate) must be unique.
observe.validation.lengthWeightParameter.invalid.weightLengthFormula=Formula is not valid.
observe.validation.lengthWeightParameter.null.ocean=Ocean is not filled.
+observe.validation.lengthWeightParameter.null.sex=Sex must be filled.
observe.validation.lengthWeightParameter.null.sizeMeasureType=Size measure type is not filled.
observe.validation.lengthWeightParameter.required.coefficients=Coefficients must be filled.
observe.validation.lengthWeightParameter.required.endDate=End date must be filled.
@@ -501,7 +502,6 @@ observe.validation.nonTargetCatch.uniqueKey=Tuple (species - objectFate) must be
observe.validation.nonTargetCatchRelease.bound.count=Count must be between %1$s and %2$s.
observe.validation.nonTargetCatchRelease.comment.tobig=Comment size can not exceed 1024 characters.
observe.validation.nonTargetCatchRelease.desactivated.conformity=Selected conformity is disabled.
-observe.validation.nonTargetCatchRelease.desactivated.releasingTime=Selected releasing time is disabled.
observe.validation.nonTargetCatchRelease.desactivated.sex=Selected sex fate is disabled.
observe.validation.nonTargetCatchRelease.desactivated.species=Selected species is disabled.
observe.validation.nonTargetCatchRelease.desactivated.speciesGroupReleaseMode=Selected release mode is disabled.
=====================================
validation/src/main/resources/i18n/validation_es_ES.properties
=====================================
@@ -103,6 +103,7 @@ observe.common.I18nReferentialDto.label2=Texto en francés
observe.common.I18nReferentialDto.label3=Nombre
observe.common.LengthLengthParameterDto.coefficients=Coeficientes
observe.common.LengthLengthParameterDto.endDate=Fecha de fin
+observe.common.LengthLengthParameterDto.inputOutputFormula=Formule Entrée vers Sortie \#TODO
observe.common.LengthLengthParameterDto.inputSizeMeasureType=Type de mensuration d'entrée \#TODO
observe.common.LengthLengthParameterDto.ocean=Océano
observe.common.LengthLengthParameterDto.outputInputFormula=Output formula \#TODO
@@ -342,7 +343,6 @@ observe.validation.activity.desactivated.vesselActivity=Actividad del barco sele
observe.validation.activity.desactivated.wind=La fuerza del viento seleccionada está desactivada.
observe.validation.activity.duplicated.time=Ya existe una actividad a esa hora.
observe.validation.activity.invalid.quadrant=El cuadrante no es coherente con el informe del oceano (%1$s) de la marea (indico \: 1,2, atlantico \: 1, 2, 3, 4)
-observe.validation.activity.invalid.seaSurfaceTemperature=Previous activity (%1$s) sea temperature was %2$s%5$s, current temperature must be between %3$s%5$s and %4$s%5$s. \#TODO
observe.validation.activity.invalid.speed=La velocidad de la actividad actual es %s nudos, mientras que la velocidad máxima es %s nudos.
observe.validation.activity.null.dcp=No se ha introducido objeto flotante.
observe.validation.activity.null.fpaZone=La selección de una zona FPA es obligatoria.
@@ -465,16 +465,15 @@ observe.validation.lengthLengthParameter.null.ocean=No se ha seleccionado oceano
observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Le type de mensuration de sortie n'est pas renseigné. \#TODO
observe.validation.lengthLengthParameter.null.sex=Le sexe doit être renseigné. \#TODO
observe.validation.lengthLengthParameter.required.coefficients=Les coefficients sont obligatoires. \#TODO
-observe.validation.lengthLengthParameter.required.endDate=Fecha de fin de validez debe ser especificada.
observe.validation.lengthLengthParameter.required.inputOutputFormula=La formule est obligatoire. \#TODO
observe.validation.lengthLengthParameter.required.outputInputFormula=La formule est obligatoire. \#TODO
observe.validation.lengthLengthParameter.required.species=Especie no especificada.
-observe.validation.lengthLengthParameter.required.startDate=fecha de comienzo de validez no especificada.
observe.validation.lengthWeightParameter.disabled.sizeMeasureType=Le type de mensuration sélectionné est désactivé. \#TODO
observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=Relación de peso introducida no es coherente.
observe.validation.lengthWeightParameter.invalid.uniqueKey=Tupla (especie/sexo/océano/sizeMeasureType/startDate) debe ser única, la tupla ya se ha usado. \#TODO
observe.validation.lengthWeightParameter.invalid.weightLengthFormula=Relación de talla introducida no es coherente.
observe.validation.lengthWeightParameter.null.ocean=No se ha seleccionado oceano.
+observe.validation.lengthWeightParameter.null.sex=Sex must be filled.
observe.validation.lengthWeightParameter.null.sizeMeasureType=Type de mensuration non renseigné. \#TODO
observe.validation.lengthWeightParameter.required.coefficients=Coeficientes deben ser especificados.
observe.validation.lengthWeightParameter.required.endDate=Fecha de fin de validez debe ser especificada.
@@ -503,7 +502,6 @@ observe.validation.nonTargetCatch.uniqueKey=El par (especie - objectFate) debe s
observe.validation.nonTargetCatchRelease.bound.count=Le nombre doit être compris entre %1$s et %2$s. \#TODO
observe.validation.nonTargetCatchRelease.comment.tobig=La taille du commentaire est limitée à 1024 caractères. \#TODO
observe.validation.nonTargetCatchRelease.desactivated.conformity=Selected conformity is disabled. \#TODO
-observe.validation.nonTargetCatchRelease.desactivated.releasingTime=Selected releasing time is disabled. \#TODO
observe.validation.nonTargetCatchRelease.desactivated.sex=Le sexe sélectionné est désactivé. \#TODO
observe.validation.nonTargetCatchRelease.desactivated.species=L'espèce sélectionnée est désactivée. \#TODO
observe.validation.nonTargetCatchRelease.desactivated.speciesGroupReleaseMode=Le mode de libération sélectionné est désactivé. \#TODO
=====================================
validation/src/main/resources/i18n/validation_fr_FR.properties
=====================================
@@ -103,6 +103,7 @@ observe.common.I18nReferentialDto.label2=Libellé français
observe.common.I18nReferentialDto.label3=Libellé espagnol
observe.common.LengthLengthParameterDto.coefficients=Coefficients
observe.common.LengthLengthParameterDto.endDate=Fin de validité
+observe.common.LengthLengthParameterDto.inputOutputFormula=Formule entrée -> sortie
observe.common.LengthLengthParameterDto.inputSizeMeasureType=Type de mensuration d'entrée
observe.common.LengthLengthParameterDto.ocean=Océan
observe.common.LengthLengthParameterDto.outputInputFormula=Formule sortie -> entrée
@@ -128,8 +129,10 @@ observe.common.NonTargetCatchDto.species=Espèce
observe.common.NonTargetCatchDto.speciesFate=Devenir espèce
observe.common.NonTargetCatchDto.totalCount=Nombre estimé
observe.common.NonTargetCatchReleaseDto.comment=Commentaire de la libération
+observe.common.NonTargetCatchReleaseDto.conformity=Conformité
observe.common.NonTargetCatchReleaseDto.count=Nombre
observe.common.NonTargetCatchReleaseDto.length=Longueur (cm)
+observe.common.NonTargetCatchReleaseDto.releasingTime=Moment de la libération
observe.common.NonTargetCatchReleaseDto.sex=Sexe
observe.common.NonTargetCatchReleaseDto.species=Espèce
observe.common.NonTargetCatchReleaseDto.speciesGroupReleaseMode=Mode de libération
@@ -340,7 +343,6 @@ observe.validation.activity.desactivated.vesselActivity=L'activité bateau séle
observe.validation.activity.desactivated.wind=Le vent Beaufort sélectionné est désactivé.
observe.validation.activity.duplicated.time=Il existe déjà une autre activité à cette heure.
observe.validation.activity.invalid.quadrant=Le quadrant n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1
-observe.validation.activity.invalid.seaSurfaceTemperature=La température surface de l'activité précédente (%1$s) est de %2$s%5$s, la température doit être comprise entre %3$s%5$s et %4$s%5$s.
observe.validation.activity.invalid.speed=La vitesse de l'activité courante est de %s nd, alors que la vitesse maximale autorisée est %s nd
observe.validation.activity.null.dcp=Aucun objet flottant saisi.
observe.validation.activity.null.fpaZone=La sélection d'une zone FPA est obligatoire.
@@ -463,16 +465,15 @@ observe.validation.lengthLengthParameter.null.ocean=Aucun océan sélectionné.
observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Le type de mensuration de sortie n'est pas renseigné.
observe.validation.lengthLengthParameter.null.sex=Le sexe doit être renseigné.
observe.validation.lengthLengthParameter.required.coefficients=Les coefficients sont obligatoires.
-observe.validation.lengthLengthParameter.required.endDate=Date de fin de validité non renseignée.
observe.validation.lengthLengthParameter.required.inputOutputFormula=La formule est obligatoire.
observe.validation.lengthLengthParameter.required.outputInputFormula=La formule est obligatoire.
observe.validation.lengthLengthParameter.required.species=L'espèce n'est pas renseignée.
-observe.validation.lengthLengthParameter.required.startDate=date de début de validité non renseignée.
observe.validation.lengthWeightParameter.disabled.sizeMeasureType=Le type de mensuration sélectionné est désactivé.
observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=La relation poids saisie n'est pas cohérente.
observe.validation.lengthWeightParameter.invalid.uniqueKey=Le tuple (espèce/sexe/océan/type de measure/date de début) doit être unique
observe.validation.lengthWeightParameter.invalid.weightLengthFormula=La relation taille saisie n'est pas cohérente.
observe.validation.lengthWeightParameter.null.ocean=Aucun océan sélectionné.
+observe.validation.lengthWeightParameter.null.sex=Le sexe doit être renseigné.
observe.validation.lengthWeightParameter.null.sizeMeasureType=Type de mensuration non renseigné.
observe.validation.lengthWeightParameter.required.coefficients=Les coefficients ne sont pas renseignés.
observe.validation.lengthWeightParameter.required.endDate=Date de fin de validité non renseignée.
@@ -501,7 +502,6 @@ observe.validation.nonTargetCatch.uniqueKey=Le couple (espèce - devenir objet)
observe.validation.nonTargetCatchRelease.bound.count=Le nombre doit être compris entre %1$s et %2$s.
observe.validation.nonTargetCatchRelease.comment.tobig=La taille du commentaire est limitée à 1024 caractères.
observe.validation.nonTargetCatchRelease.desactivated.conformity=La conformité sélectionnée est désactivée.
-observe.validation.nonTargetCatchRelease.desactivated.releasingTime=Le moment de libération sélectionné est désactivé.
observe.validation.nonTargetCatchRelease.desactivated.sex=Le sexe sélectionné est désactivé.
observe.validation.nonTargetCatchRelease.desactivated.species=L'espèce sélectionnée est désactivée.
observe.validation.nonTargetCatchRelease.desactivated.speciesGroupReleaseMode=Le mode de libération sélectionné est désactivé.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/dedbdd76768398422707fa00f1…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/dedbdd76768398422707fa00f1…
You're receiving this email because of your account on gitlab.com.
1
0
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
bb44df2a by Tony CHEMIT at 2018-09-23T11:14:50Z
update changelog
- - - - -
6 changed files:
- + .mvn/gitlab-cache/milestones/654414-artifacts.json
- + .mvn/gitlab-cache/milestones/654414-issues.json
- + .mvn/gitlab-cache/milestones/654414.json
- + .mvn/gitlab-cache/milestones/655988-issues.json
- + .mvn/gitlab-cache/milestones/655988.json
- CHANGELOG.md
Changes:
=====================================
.mvn/gitlab-cache/milestones/654414-artifacts.json
=====================================
@@ -0,0 +1,12 @@
+[
+ {
+ "name": "Application",
+ "filename": "observe-7.0-RC-22.zip",
+ "url": "https://ultreia.io/release/observe-7.0-RC-22.zip"
+ },
+ {
+ "name": "Serveur",
+ "filename": "observe-7.0-RC-22.war",
+ "url": "https://ultreia.io/release/observe-7.0-RC-22.war"
+ }
+]
\ No newline at end of file
=====================================
.mvn/gitlab-cache/milestones/654414-issues.json
=====================================
@@ -0,0 +1,339 @@
+[
+ {
+ "id": 14374376,
+ "iid": 1075,
+ "projectId": 2722779,
+ "title": "[PS] La création automatique d\u0027une calée ne fonctionne plus",
+ "description": "",
+ "labels": [
+ "Anomalie",
+ "Contrat Code Lutin-2016",
+ "Immédiat"
+ ],
+ "milestone": {
+ "id": 654414,
+ "iid": 125,
+ "projectId": 2722779,
+ "groupId": 0,
+ "title": "7.0-RC-22",
+ "description": "",
+ "dueDate": "Sep 22, 2018 2:00:00 AM",
+ "startDate": "Sep 20, 2018 2:00:00 AM",
+ "state": "closed"
+ },
+ "assignee": {
+ "_id": 166231,
+ "_username": "tchemit",
+ "_name": "Tony CHEMIT",
+ "_state": "active",
+ "_darkScheme": false,
+ "_isAdmin": false,
+ "_canCreateGroup": false,
+ "_canCreateProject": false,
+ "_canCreateTeam": false,
+ "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…"
+ },
+ "author": {
+ "_id": 166231,
+ "_username": "tchemit",
+ "_name": "Tony CHEMIT",
+ "_state": "active",
+ "_darkScheme": false,
+ "_isAdmin": false,
+ "_canCreateGroup": false,
+ "_canCreateProject": false,
+ "_canCreateTeam": false,
+ "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…"
+ },
+ "state": "closed",
+ "updatedAt": "Sep 23, 2018 1:28:23 AM",
+ "createdAt": "Sep 21, 2018 5:37:17 PM"
+ },
+ {
+ "id": 14373359,
+ "iid": 1074,
+ "projectId": 2722779,
+ "title": "Après avoir réussit à effectuer les remplacements de référentiels obsolètes, la base source est toujours sauvegardé!",
+ "description": "Ça veut dire que si on es sur la base centrale, il tente de faire une backup de celle-ci dans un fichier de backup...\nCette opération ne doit être exécutée uniquement si la base source est la base locale.",
+ "labels": [
+ "Anomalie",
+ "Contrat Code Lutin-2016",
+ "Immédiat"
+ ],
+ "milestone": {
+ "id": 654414,
+ "iid": 125,
+ "projectId": 2722779,
+ "groupId": 0,
+ "title": "7.0-RC-22",
+ "description": "",
+ "dueDate": "Sep 22, 2018 2:00:00 AM",
+ "startDate": "Sep 20, 2018 2:00:00 AM",
+ "state": "closed"
+ },
+ "assignee": {
+ "_id": 166231,
+ "_username": "tchemit",
+ "_name": "Tony CHEMIT",
+ "_state": "active",
+ "_darkScheme": false,
+ "_isAdmin": false,
+ "_canCreateGroup": false,
+ "_canCreateProject": false,
+ "_canCreateTeam": false,
+ "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…"
+ },
+ "author": {
+ "_id": 166231,
+ "_username": "tchemit",
+ "_name": "Tony CHEMIT",
+ "_state": "active",
+ "_darkScheme": false,
+ "_isAdmin": false,
+ "_canCreateGroup": false,
+ "_canCreateProject": false,
+ "_canCreateTeam": false,
+ "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…"
+ },
+ "state": "closed",
+ "updatedAt": "Sep 21, 2018 5:49:06 PM",
+ "createdAt": "Sep 21, 2018 5:19:00 PM"
+ },
+ {
+ "id": 14406051,
+ "iid": 1080,
+ "projectId": 2722779,
+ "title": "Un contrôle insoupçonné vérifie les températures entre activités",
+ "description": "Un contrôle insoupçonné vérifie les températures entre activités. Le supprimer",
+ "labels": [
+ "Bas",
+ "Contrat AZTI-2017",
+ "Contrat Code Lutin-2016",
+ "Evolution"
+ ],
+ "milestone": {
+ "id": 654414,
+ "iid": 125,
+ "projectId": 2722779,
+ "groupId": 0,
+ "title": "7.0-RC-22",
+ "description": "",
+ "dueDate": "Sep 22, 2018 2:00:00 AM",
+ "startDate": "Sep 20, 2018 2:00:00 AM",
+ "state": "closed"
+ },
+ "assignee": {
+ "_id": 166231,
+ "_username": "tchemit",
+ "_name": "Tony CHEMIT",
+ "_state": "active",
+ "_darkScheme": false,
+ "_isAdmin": false,
+ "_canCreateGroup": false,
+ "_canCreateProject": false,
+ "_canCreateTeam": false,
+ "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…"
+ },
+ "author": {
+ "_id": 1111318,
+ "_username": "pcauquil",
+ "_name": "Pascal Cauquil",
+ "_state": "active",
+ "_darkScheme": false,
+ "_isAdmin": false,
+ "_canCreateGroup": false,
+ "_canCreateProject": false,
+ "_canCreateTeam": false,
+ "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…"
+ },
+ "state": "closed",
+ "updatedAt": "Sep 23, 2018 1:13:03 PM",
+ "createdAt": "Sep 23, 2018 12:04:07 PM"
+ },
+ {
+ "id": 11288891,
+ "iid": 960,
+ "projectId": 2722779,
+ "title": "Widget température °C/°F : message de validation perfectible",
+ "description": "Testé sur PS, sûrement identique sur LL.\n\nLa validation sur le widget température °C/°F est perfectible.\n\n* Mode °C : messages OK\n* On garde 30°C (température valide)\n* On passe en °F : conversion 86°F, pas de message, OK\n* On tape 30°F (\u003d-1°C) : valeur refusée OK, mais avec le même message qu\u0027en °C (les bornes en °C sont inappropriées)\n\nIl faudrait soit différencier le message selon le mode du widget, soit plus simplement avoir un message tout terrain qui indique à la fois les bornes en °C et les bornes en °F. Qu\u0027on adopte l\u0027une ou l\u0027autre des solutions, il faudrait faire en sorte que les bornes du message destiné aux °F soient déduites dynamiquement des valeurs °C par la relation ad-hoc.",
+ "labels": [
+ "Bas",
+ "Contrat AZTI-2017",
+ "Evolution"
+ ],
+ "milestone": {
+ "id": 654414,
+ "iid": 125,
+ "projectId": 2722779,
+ "groupId": 0,
+ "title": "7.0-RC-22",
+ "description": "",
+ "dueDate": "Sep 22, 2018 2:00:00 AM",
+ "startDate": "Sep 20, 2018 2:00:00 AM",
+ "state": "closed"
+ },
+ "assignee": {
+ "_id": 166231,
+ "_username": "tchemit",
+ "_name": "Tony CHEMIT",
+ "_state": "active",
+ "_darkScheme": false,
+ "_isAdmin": false,
+ "_canCreateGroup": false,
+ "_canCreateProject": false,
+ "_canCreateTeam": false,
+ "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…"
+ },
+ "author": {
+ "_id": 1111318,
+ "_username": "pcauquil",
+ "_name": "Pascal Cauquil",
+ "_state": "active",
+ "_darkScheme": false,
+ "_isAdmin": false,
+ "_canCreateGroup": false,
+ "_canCreateProject": false,
+ "_canCreateTeam": false,
+ "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…"
+ },
+ "state": "closed",
+ "updatedAt": "Sep 23, 2018 12:01:59 PM",
+ "createdAt": "Jun 4, 2018 3:14:48 PM"
+ },
+ {
+ "id": 14373303,
+ "iid": 1073,
+ "projectId": 2722779,
+ "title": "La mise à jour des référentiels ne fonctionne pas si il y a des référentiels obsolètes!",
+ "description": "Il y a deux problèmes :\n\n* quand on choisit un référentiel obsolète à remplacer, on ne voit pas la liste déroulante de remplacement",
+ "labels": [
+ "Anomalie",
+ "Contrat Code Lutin-2016",
+ "IRD-2018-01-V8"
+ ],
+ "milestone": {
+ "id": 654414,
+ "iid": 125,
+ "projectId": 2722779,
+ "groupId": 0,
+ "title": "7.0-RC-22",
+ "description": "",
+ "dueDate": "Sep 22, 2018 2:00:00 AM",
+ "startDate": "Sep 20, 2018 2:00:00 AM",
+ "state": "closed"
+ },
+ "author": {
+ "_id": 166231,
+ "_username": "tchemit",
+ "_name": "Tony CHEMIT",
+ "_state": "active",
+ "_darkScheme": false,
+ "_isAdmin": false,
+ "_canCreateGroup": false,
+ "_canCreateProject": false,
+ "_canCreateTeam": false,
+ "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…"
+ },
+ "state": "closed",
+ "updatedAt": "Sep 22, 2018 11:28:15 AM",
+ "createdAt": "Sep 21, 2018 5:16:12 PM"
+ },
+ {
+ "id": 14365677,
+ "iid": 1072,
+ "projectId": 2722779,
+ "title": "L\u0027action de sauvegarde de la base locale est lancée automatiquement si on sélectionne une source connue",
+ "description": "Par exemple en création de base à partir d\u0027une source distante, quand on sélectionne via le raccourci clavier une source, l\u0027étape suivante de sauvegarde est automatiquement lancée, et si par malheur on ne peut pas sauver la base,... c\u0027est perdu.\nIl ne faut jamais exécuter l\u0027action suivante, juste s\u0027y rendre.",
+ "labels": [
+ "Anomalie",
+ "Contrat Code Lutin-2016"
+ ],
+ "milestone": {
+ "id": 654414,
+ "iid": 125,
+ "projectId": 2722779,
+ "groupId": 0,
+ "title": "7.0-RC-22",
+ "description": "",
+ "dueDate": "Sep 22, 2018 2:00:00 AM",
+ "startDate": "Sep 20, 2018 2:00:00 AM",
+ "state": "closed"
+ },
+ "assignee": {
+ "_id": 166231,
+ "_username": "tchemit",
+ "_name": "Tony CHEMIT",
+ "_state": "active",
+ "_darkScheme": false,
+ "_isAdmin": false,
+ "_canCreateGroup": false,
+ "_canCreateProject": false,
+ "_canCreateTeam": false,
+ "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…"
+ },
+ "author": {
+ "_id": 166231,
+ "_username": "tchemit",
+ "_name": "Tony CHEMIT",
+ "_state": "active",
+ "_darkScheme": false,
+ "_isAdmin": false,
+ "_canCreateGroup": false,
+ "_canCreateProject": false,
+ "_canCreateTeam": false,
+ "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…"
+ },
+ "state": "closed",
+ "updatedAt": "Sep 21, 2018 5:20:35 PM",
+ "createdAt": "Sep 21, 2018 12:17:49 PM"
+ },
+ {
+ "id": 11290896,
+ "iid": 961,
+ "projectId": 2722779,
+ "title": "L\u0027assistant calcul de donnés demande abusivement (ou pas) de configurer une connexion",
+ "description": "Je crée une nouvelle marée, directement dans une base centrale.\n\nJe crée une calée, des captures, des échantillons.\n\nJe veux calculer les données avec Action/calculer les données.\n\nL\u0027assistant me demande de configurer à nouveau une connexion :\n\n\nIl me semble que l\u0027assistant calcul devrait simplement s\u0027appliquer à la base à laquelle on est déjà connecté, non ?",
+ "labels": [
+ "Anomalie",
+ "Contrat Code Lutin-2016"
+ ],
+ "milestone": {
+ "id": 654414,
+ "iid": 125,
+ "projectId": 2722779,
+ "groupId": 0,
+ "title": "7.0-RC-22",
+ "description": "",
+ "dueDate": "Sep 22, 2018 2:00:00 AM",
+ "startDate": "Sep 20, 2018 2:00:00 AM",
+ "state": "closed"
+ },
+ "assignee": {
+ "_id": 166231,
+ "_username": "tchemit",
+ "_name": "Tony CHEMIT",
+ "_state": "active",
+ "_darkScheme": false,
+ "_isAdmin": false,
+ "_canCreateGroup": false,
+ "_canCreateProject": false,
+ "_canCreateTeam": false,
+ "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…"
+ },
+ "author": {
+ "_id": 1111318,
+ "_username": "pcauquil",
+ "_name": "Pascal Cauquil",
+ "_state": "active",
+ "_darkScheme": false,
+ "_isAdmin": false,
+ "_canCreateGroup": false,
+ "_canCreateProject": false,
+ "_canCreateTeam": false,
+ "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…"
+ },
+ "state": "closed",
+ "updatedAt": "Sep 21, 2018 5:20:35 PM",
+ "createdAt": "Jun 4, 2018 4:03:56 PM"
+ }
+]
\ No newline at end of file
=====================================
.mvn/gitlab-cache/milestones/654414.json
=====================================
@@ -0,0 +1,11 @@
+{
+ "id": 654414,
+ "iid": 125,
+ "projectId": 2722779,
+ "groupId": 0,
+ "title": "7.0-RC-22",
+ "description": "",
+ "dueDate": "Sep 22, 2018 2:00:00 AM",
+ "startDate": "Sep 20, 2018 2:00:00 AM",
+ "state": "closed"
+}
\ No newline at end of file
=====================================
.mvn/gitlab-cache/milestones/655988-issues.json
=====================================
@@ -0,0 +1 @@
+[]
\ No newline at end of file
=====================================
.mvn/gitlab-cache/milestones/655988.json
=====================================
@@ -0,0 +1,8 @@
+{
+ "id": 655988,
+ "iid": 126,
+ "projectId": 2722779,
+ "groupId": 0,
+ "title": "7.0-RC-23",
+ "state": "active"
+}
\ No newline at end of file
=====================================
CHANGELOG.md
=====================================
@@ -1,7 +1,7 @@
# ObServe changelog
* Author [Tony Chemit](mailto:dev@tchemit.fr)
- * Last generated at 2018-09-21 00:54.
+ * Last generated at 2018-09-23 13:14.
## Version [8.0-alpha-3](https://gitlab.com/ultreiaio/ird-observe/milestones/114)
Première partie du troisième lot du contrat IRD-2018-01-V8. contient les nouveaux écrans, mais aucune des fonctionnalités avancées.
@@ -9,8 +9,8 @@ Première partie du troisième lot du contrat IRD-2018-01-V8. contient
**Closed at 2018-09-15.**
### Download
-* [Application (observe-8.0-alpha-3-SNAPSHOT.zip)](https://ultreia.io/release/observe-8.0-alpha-3-SNAPSHOT.zip)
-* [Serveur (observe-8.0-alpha-3-SNAPSHOT.war)](https://ultreia.io/release/observe-8.0-alpha-3-SNAPSHOT.war)
+* [Application (observe-8.0-alpha-3.zip)](https://ultreia.io/release/observe-8.0-alpha-3.zip)
+* [Serveur (observe-8.0-alpha-3.war)](https://ultreia.io/release/observe-8.0-alpha-3.war)
### Issues
* [[Evolution 578]](https://gitlab.com/ultreiaio/ird-observe/issues/578) **[LL] Implanter le formulaire logbook** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
@@ -68,6 +68,23 @@ Premier lot du contrat IRD-2018-01-V8
* [[Evolution 922]](https://gitlab.com/ultreiaio/ird-observe/issues/922) **Ajoute le référentiel observe_common.DataQuality sur les données existantes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
* [[Evolution 950]](https://gitlab.com/ultreiaio/ird-observe/issues/950) **Renommage de la classe seine.WeightCategory en seine.WeightCategorySeine** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
+## Version [7.0-RC-22](https://gitlab.com/ultreiaio/ird-observe/milestones/125)
+
+**Closed at 2018-09-22.**
+
+### Download
+* [Application (observe-7.0-RC-22.zip)](https://ultreia.io/release/observe-7.0-RC-22.zip)
+* [Serveur (observe-7.0-RC-22.war)](https://ultreia.io/release/observe-7.0-RC-22.war)
+
+### Issues
+ * [[Anomalie 961]](https://gitlab.com/ultreiaio/ird-observe/issues/961) **L'assistant calcul de donnés demande abusivement (ou pas) de configurer une connexion** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+ * [[Anomalie 1072]](https://gitlab.com/ultreiaio/ird-observe/issues/1072) **L'action de sauvegarde de la base locale est lancée automatiquement si on sélectionne une source connue** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
+ * [[Anomalie 1073]](https://gitlab.com/ultreiaio/ird-observe/issues/1073) **La mise à jour des référentiels ne fonctionne pas si il y a des référentiels obsolètes!** (Thanks to ) (Reported by Tony CHEMIT)
+ * [[Anomalie 1074]](https://gitlab.com/ultreiaio/ird-observe/issues/1074) **Après avoir réussit à effectuer les remplacements de référentiels obsolètes, la base source est toujours sauvegardé!** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
+ * [[Anomalie 1075]](https://gitlab.com/ultreiaio/ird-observe/issues/1075) **[PS] La création automatique d'une calée ne fonctionne plus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
+ * [[Evolution 960]](https://gitlab.com/ultreiaio/ird-observe/issues/960) **Widget température °C/°F : message de validation perfectible** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+ * [[Evolution 1080]](https://gitlab.com/ultreiaio/ird-observe/issues/1080) **Un contrôle insoupçonné vérifie les températures entre activités** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+
## Version [7.0-RC-21](https://gitlab.com/ultreiaio/ird-observe/milestones/124)
**Closed at 2018-09-21.**
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bb44df2ac6e1dac7b7559ca02b6…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bb44df2ac6e1dac7b7559ca02b6…
You're receiving this email because of your account on gitlab.com.
1
0