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

[ANN] - SAMMOA 1.0.4-RC5 released
by codelutin.com Release Notification June 27, 2014

June 27, 2014

The SAMMOA team is pleased to announce the sammoa-1.0.4-RC5 release! SAMMOA est un système permettant l’acquisition des données d’observations de faune marine lors de campagnes d’observations aériennes pour l'UMS 3462 Pélagis, anciennement baptisé CRMM et situé à l'université de La Rochelle. Documentation of the project can be found here: http://forge.codelutin.com/projects/sammoa Changes ------- Changes in this version include: Fixed Bugs: o Enregistrement des positions GPS Issue: 5346. Thanks to Sylvain Bavencoff. Resolved by sbavencoff. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/sammoa/files * sammoa-ui-swing-1.0.4-RC5-bin.zip - http://forge.codelutin.com/attachments/download/1988 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -SAMMOA team

1 0

r723 - in trunk: . sammoa-application sammoa-persistence sammoa-ui-swing
by maven-release＠users.forge.codelutin.com June 27, 2014

June 27, 2014

Author: maven-release Date: 2014-06-27 11:16:00 +0200 (Fri, 27 Jun 2014) New Revision: 723 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/723 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/sammoa-application/pom.xml trunk/sammoa-persistence/pom.xml trunk/sammoa-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-27 09:15:55 UTC (rev 722) +++ trunk/pom.xml 2014-06-27 09:16:00 UTC (rev 723) @@ -10,7 +10,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC5</version> + <version>1.0.4-SNAPSHOT</version> <packaging>pom</packaging> @@ -64,12 +64,12 @@ </modules> <scm> - <url>http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC5</url> + <url>http://svn.codelutin.com/sammoa/trunk</url> <connection> - scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC5 + scm:svn:http://svn.codelutin.com/sammoa/trunk </connection> <developerConnection> - scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC5 + scm:svn:http://svn.codelutin.com/sammoa/trunk </developerConnection> </scm> <distributionManagement> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2014-06-27 09:15:55 UTC (rev 722) +++ trunk/sammoa-application/pom.xml 2014-06-27 09:16:00 UTC (rev 723) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC5</version> + <version>1.0.4-SNAPSHOT</version> </parent> <artifactId>sammoa-application</artifactId> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2014-06-27 09:15:55 UTC (rev 722) +++ trunk/sammoa-persistence/pom.xml 2014-06-27 09:16:00 UTC (rev 723) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC5</version> + <version>1.0.4-SNAPSHOT</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2014-06-27 09:15:55 UTC (rev 722) +++ trunk/sammoa-ui-swing/pom.xml 2014-06-27 09:16:00 UTC (rev 723) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC5</version> + <version>1.0.4-SNAPSHOT</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0

r722 - tags
by maven-release＠users.forge.codelutin.com June 27, 2014

June 27, 2014

Author: maven-release Date: 2014-06-27 11:15:55 +0200 (Fri, 27 Jun 2014) New Revision: 722 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/722 Log: [maven-release-plugin] copy for tag sammoa-1.0.4-RC5 Added: tags/sammoa-1.0.4-RC5/

1 0

r721 - in trunk: . sammoa-application sammoa-persistence sammoa-ui-swing
by maven-release＠users.forge.codelutin.com June 27, 2014

June 27, 2014

Author: maven-release Date: 2014-06-27 11:15:39 +0200 (Fri, 27 Jun 2014) New Revision: 721 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/721 Log: [maven-release-plugin] prepare release sammoa-1.0.4-RC5 Modified: trunk/pom.xml trunk/sammoa-application/pom.xml trunk/sammoa-persistence/pom.xml trunk/sammoa-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-27 08:24:41 UTC (rev 720) +++ trunk/pom.xml 2014-06-27 09:15:39 UTC (rev 721) @@ -10,7 +10,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4-RC5</version> <packaging>pom</packaging> @@ -64,12 +64,12 @@ </modules> <scm> - <url>http://svn.codelutin.com/sammoa/trunk</url> + <url>http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC5</url> <connection> - scm:svn:http://svn.codelutin.com/sammoa/trunk + scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC5 </connection> <developerConnection> - scm:svn:http://svn.codelutin.com/sammoa/trunk + scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC5 </developerConnection> </scm> <distributionManagement> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2014-06-27 08:24:41 UTC (rev 720) +++ trunk/sammoa-application/pom.xml 2014-06-27 09:15:39 UTC (rev 721) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4-RC5</version> </parent> <artifactId>sammoa-application</artifactId> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2014-06-27 08:24:41 UTC (rev 720) +++ trunk/sammoa-persistence/pom.xml 2014-06-27 09:15:39 UTC (rev 721) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4-RC5</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2014-06-27 08:24:41 UTC (rev 720) +++ trunk/sammoa-ui-swing/pom.xml 2014-06-27 09:15:39 UTC (rev 721) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4-RC5</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0

r720 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence sammoa-ui-swing/src/main/resources/i18n
by sbavencoff＠users.forge.codelutin.com June 27, 2014

June 27, 2014

Author: sbavencoff Date: 2014-06-27 10:24:41 +0200 (Fri, 27 Jun 2014) New Revision: 720 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/720 Log: fixes #5346 : Enregistrement des positions GPS Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/BaseGpsHandler.java trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/GeoPoint-validation-warning-validation.xml trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/BaseGpsHandler.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/BaseGpsHandler.java 2014-06-23 15:35:52 UTC (rev 719) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/BaseGpsHandler.java 2014-06-27 08:24:41 UTC (rev 720) @@ -84,10 +84,10 @@ this.state = DeviceState.UNAVAILABLE; this.deviceStateListeners = Sets.newHashSet(); this.gpsLocationListeners = Sets.newHashSet(); - this.maxLastEventDelays = config.getTimeout() * 1000; + this.maxLastEventDelays = config.getTimeout(); if (logger.isDebugEnabled()) { - logger.debug("GPS maxLastEventDelays = " + maxLastEventDelays); + logger.debug("GPS maxLastEventDelays = " + maxLastEventDelays + " second"); } } @@ -169,9 +169,11 @@ @Override public GeoPoint getCurrentLocation() { + Date currentDate = getDate(); + GeoPoint lastLocation = getLastLocation(); - Date currentDate = getDate(); + long lastEventDelaysMS = System.currentTimeMillis() - lastEventTime; GeoPoint result = new GeoPointImpl(lastLocation.getLatitude(), lastLocation.getLongitude()); result.setAltitude(lastLocation.getAltitude()); @@ -183,8 +185,21 @@ .toInterval(lastLocation.getRecordTime(), currentDate) .toDuration() .getStandardSeconds(); - result.setCaptureDelay((int) captureDelay); + if (captureDelay > maxLastEventDelays || lastEventDelaysMS > maxLastEventDelays * 1000) { + + result.setLatitude(GeoPoints.EMPTY_COORDINATE); + result.setLongitude(GeoPoints.EMPTY_COORDINATE); + result.setAltitude(0); + result.setSpeed(0); + result.setCaptureDelay(0); + + } else { + + result.setCaptureDelay((int) captureDelay); + + } + if (logger.isTraceEnabled()) { logger.trace("CaptureDelay = {} for GeoPoint {}", captureDelay, result); } @@ -255,14 +270,14 @@ boolean sameLocation = GeoPoints.equal(location, lastLocation); - long lastEventDelays = System.currentTimeMillis() - lastEventTime; + long lastEventDelaysMS = System.currentTimeMillis() - lastEventTime; if (logger.isTraceEnabled()) { logger.trace("sameLocation = {} [{} :: {}], lastEventDelays= {} ms", - new Object[]{sameLocation, location, lastLocation, lastEventDelays}); + new Object[]{sameLocation, location, lastLocation, lastEventDelaysMS}); } - boolean offLine = lastEventDelays > maxLastEventDelays; + boolean offLine = lastEventDelaysMS > maxLastEventDelays * 1000; // Data is unavailable if (GeoPoints.isCoordinatesEmpty(location) || offLine) { Modified: trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/GeoPoint-validation-warning-validation.xml =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/GeoPoint-validation-warning-validation.xml 2014-06-23 15:35:52 UTC (rev 719) +++ trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/GeoPoint-validation-warning-validation.xml 2014-06-27 08:24:41 UTC (rev 720) @@ -35,4 +35,17 @@ </field> + <field name="latitude"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ + !(latitude == @fr.ulr.sammoa.persistence.GeoPoints@EMPTY_COORDINATE + && longitude == @fr.ulr.sammoa.persistence.GeoPoints@EMPTY_COORDINATE) + ]]> + </param> + <message>sammoa.validator.observation.position.unknown</message> + </field-validator> + + </field> + </validators> Modified: trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2014-06-23 15:35:52 UTC (rev 719) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2014-06-27 08:24:41 UTC (rev 720) @@ -308,6 +308,7 @@ sammoa.validator.observation.podSize.geoPointOlder=The previous geopoint should not be older than five seconds sammoa.validator.observation.podSize.invalidMin=The pod size must be higher than %1$s sammoa.validator.observation.position.outOfDate=capture delay is out of date +sammoa.validator.observation.position.unknown=Gps position is unknow sammoa.validator.observation.species.required=The species is mandatory sammoa.validator.observation.swimDir.invalidRange=The swim direction must be between %1$s and %2$s degrees sammoa.validator.observation.unknown.species=The species with code %s does not exist in referential

1 0

[ANN] - SAMMOA 1.0.4-RC4 released
by codelutin.com Release Notification June 23, 2014

June 23, 2014

The SAMMOA team is pleased to announce the sammoa-1.0.4-RC4 release! SAMMOA est un système permettant l’acquisition des données d’observations de faune marine lors de campagnes d’observations aériennes pour l'UMS 3462 Pélagis, anciennement baptisé CRMM et situé à l'université de La Rochelle. Documentation of the project can be found here: http://forge.codelutin.com/projects/sammoa Changes ------- Changes in this version include: New features: o connection GPS / Ordinateur de terrain Issue: 4761. Thanks to Ghislain Doremus. Resolved by sbavencoff. Fixed Bugs: o validation des espèces Issue: 5289. Thanks to Sylvain Bavencoff. Resolved by sbavencoff. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/sammoa/files * sammoa-ui-swing-1.0.4-RC4-bin.zip - http://forge.codelutin.com/attachments/download/1965 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -SAMMOA team

1 0

r719 - in trunk: . sammoa-application sammoa-persistence sammoa-ui-swing
by maven-release＠users.forge.codelutin.com June 23, 2014

June 23, 2014

Author: maven-release Date: 2014-06-23 17:35:52 +0200 (Mon, 23 Jun 2014) New Revision: 719 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/719 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/sammoa-application/pom.xml trunk/sammoa-persistence/pom.xml trunk/sammoa-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-23 15:35:47 UTC (rev 718) +++ trunk/pom.xml 2014-06-23 15:35:52 UTC (rev 719) @@ -10,7 +10,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC4</version> + <version>1.0.4-SNAPSHOT</version> <packaging>pom</packaging> @@ -64,12 +64,12 @@ </modules> <scm> - <url>http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC4</url> + <url>http://svn.codelutin.com/sammoa/trunk</url> <connection> - scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC4 + scm:svn:http://svn.codelutin.com/sammoa/trunk </connection> <developerConnection> - scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC4 + scm:svn:http://svn.codelutin.com/sammoa/trunk </developerConnection> </scm> <distributionManagement> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2014-06-23 15:35:47 UTC (rev 718) +++ trunk/sammoa-application/pom.xml 2014-06-23 15:35:52 UTC (rev 719) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC4</version> + <version>1.0.4-SNAPSHOT</version> </parent> <artifactId>sammoa-application</artifactId> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2014-06-23 15:35:47 UTC (rev 718) +++ trunk/sammoa-persistence/pom.xml 2014-06-23 15:35:52 UTC (rev 719) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC4</version> + <version>1.0.4-SNAPSHOT</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2014-06-23 15:35:47 UTC (rev 718) +++ trunk/sammoa-ui-swing/pom.xml 2014-06-23 15:35:52 UTC (rev 719) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC4</version> + <version>1.0.4-SNAPSHOT</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0

r718 - tags
by maven-release＠users.forge.codelutin.com June 23, 2014

June 23, 2014

Author: maven-release Date: 2014-06-23 17:35:47 +0200 (Mon, 23 Jun 2014) New Revision: 718 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/718 Log: [maven-release-plugin] copy for tag sammoa-1.0.4-RC4 Added: tags/sammoa-1.0.4-RC4/

1 0

r717 - in trunk: . sammoa-application sammoa-persistence sammoa-ui-swing
by maven-release＠users.forge.codelutin.com June 23, 2014

June 23, 2014

Author: maven-release Date: 2014-06-23 17:35:41 +0200 (Mon, 23 Jun 2014) New Revision: 717 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/717 Log: [maven-release-plugin] prepare release sammoa-1.0.4-RC4 Modified: trunk/pom.xml trunk/sammoa-application/pom.xml trunk/sammoa-persistence/pom.xml trunk/sammoa-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-20 09:25:08 UTC (rev 716) +++ trunk/pom.xml 2014-06-23 15:35:41 UTC (rev 717) @@ -10,7 +10,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4-RC4</version> <packaging>pom</packaging> @@ -64,12 +64,12 @@ </modules> <scm> - <url>http://svn.codelutin.com/sammoa/trunk</url> + <url>http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC4</url> <connection> - scm:svn:http://svn.codelutin.com/sammoa/trunk + scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC4 </connection> <developerConnection> - scm:svn:http://svn.codelutin.com/sammoa/trunk + scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC4 </developerConnection> </scm> <distributionManagement> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2014-06-20 09:25:08 UTC (rev 716) +++ trunk/sammoa-application/pom.xml 2014-06-23 15:35:41 UTC (rev 717) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4-RC4</version> </parent> <artifactId>sammoa-application</artifactId> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2014-06-20 09:25:08 UTC (rev 716) +++ trunk/sammoa-persistence/pom.xml 2014-06-23 15:35:41 UTC (rev 717) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4-RC4</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2014-06-20 09:25:08 UTC (rev 716) +++ trunk/sammoa-ui-swing/pom.xml 2014-06-23 15:35:41 UTC (rev 717) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4-RC4</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0

r716 - trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence
by sbavencoff＠users.forge.codelutin.com June 20, 2014

June 20, 2014

Author: sbavencoff Date: 2014-06-20 11:25:08 +0200 (Fri, 20 Jun 2014) New Revision: 716 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/716 Log: fixes #5289 : validation des esp?\195?\168ces Modified: trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-onBoard-warning-validation.xml Modified: trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-onBoard-warning-validation.xml =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-onBoard-warning-validation.xml 2014-06-20 08:50:13 UTC (rev 715) +++ trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-onBoard-warning-validation.xml 2014-06-20 09:25:08 UTC (rev 716) @@ -44,12 +44,9 @@ <message>sammoa.validator.observation.species.required</message> </field-validator> - <field-validator type="speciesCode" short-circuit="true"> - <param name="keys">code</param> - <param name="mode">AT_LEAST_ONE</param> - <param name="useSensitiveContext">true</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ species.code == current.code ]]></param> + <![CDATA[ ! species.localCreation ]]></param> <message>sammoa.validator.observation.unknown.species##${species.code}</message> </field-validator>

1 0