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

r737 - branches/sammoa-1.0.4.x
by sbavencoff＠users.forge.codelutin.com 02 Jun '15

02 Jun '15

Author: sbavencoff Date: 2015-06-02 12:43:44 +0000 (Tue, 02 Jun 2015) New Revision: 737 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/737 Log: update parent pom Modified: branches/sammoa-1.0.4.x/pom.xml Modified: branches/sammoa-1.0.4.x/pom.xml =================================================================== --- branches/sammoa-1.0.4.x/pom.xml 2014-10-20 09:57:56 UTC (rev 736) +++ branches/sammoa-1.0.4.x/pom.xml 2015-06-02 12:43:44 UTC (rev 737) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.7</version> + <version>6.1</version> </parent> <groupId>fr.ulr</groupId> @@ -74,8 +74,8 @@ </scm> <distributionManagement> <site> - <id>doc.${platform}</id> - <url>${our.site.repository}/${projectId}</url> + <id>${siteDeployId}</id> + <url>${siteDeployUrl}</url> </site> </distributionManagement> @@ -112,6 +112,13 @@ <i18n.bundles>en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> + <guavaVersion>17.0</guavaVersion> + <commonsLang3Version>3.3.2</commonsLang3Version> + <commonsCollectionsVersion>3.2.1</commonsCollectionsVersion> + <junitVersion>4.11</junitVersion> + <commonsIoVersion>2.4</commonsIoVersion> + <commonsLoggingVersion>1.1.3</commonsLoggingVersion> +  <relativizeDecorationLinks>false</relativizeDecorationLinks> @@ -156,6 +163,43 @@ <dependencies> <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commonsLoggingVersion}</version> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>${commonsCollectionsVersion}</version> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${commonsLang3Version}</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junitVersion}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commonsIoVersion}</version> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commonsLoggingVersion}</version> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> <version>${nuitonUtilsVersion}</version>

1 0

[ANN] - SAMMOA 1.0.4.1 released
by codelutin.com Release Notification 20 Oct '14

20 Oct '14

The SAMMOA team is pleased to announce the sammoa-1.0.4.1 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 Erreur à l'ouverture d'un vole Issue: 5986. 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.1-bin.zip - http://forge.codelutin.com/attachments/download/2396 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -SAMMOA team

1 0

r736 - in branches/sammoa-1.0.4.x: . sammoa-application sammoa-persistence sammoa-ui-swing
by maven-release＠users.forge.codelutin.com 20 Oct '14

20 Oct '14

Author: maven-release Date: 2014-10-20 11:57:56 +0200 (Mon, 20 Oct 2014) New Revision: 736 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/736 Log: [maven-release-plugin] prepare for next development iteration Modified: branches/sammoa-1.0.4.x/pom.xml branches/sammoa-1.0.4.x/sammoa-application/pom.xml branches/sammoa-1.0.4.x/sammoa-persistence/pom.xml branches/sammoa-1.0.4.x/sammoa-ui-swing/pom.xml Modified: branches/sammoa-1.0.4.x/pom.xml =================================================================== --- branches/sammoa-1.0.4.x/pom.xml 2014-10-20 09:57:49 UTC (rev 735) +++ branches/sammoa-1.0.4.x/pom.xml 2014-10-20 09:57:56 UTC (rev 736) @@ -10,7 +10,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4.1</version> + <version>1.0.4.2-SNAPSHOT</version> <packaging>pom</packaging> @@ -64,12 +64,12 @@ </modules> <scm> - <url>http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4.1</url> + <url>http://svn.codelutin.com/sammoa/branches/sammoa-1.0.4.x</url> <connection> - scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4.1 + scm:svn:http://svn.codelutin.com/sammoa/branches/sammoa-1.0.4.x </connection> <developerConnection> - scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4.1 + scm:svn:http://svn.codelutin.com/sammoa/branches/sammoa-1.0.4.x </developerConnection> </scm> <distributionManagement> Modified: branches/sammoa-1.0.4.x/sammoa-application/pom.xml =================================================================== --- branches/sammoa-1.0.4.x/sammoa-application/pom.xml 2014-10-20 09:57:49 UTC (rev 735) +++ branches/sammoa-1.0.4.x/sammoa-application/pom.xml 2014-10-20 09:57:56 UTC (rev 736) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4.1</version> + <version>1.0.4.2-SNAPSHOT</version> </parent> <artifactId>sammoa-application</artifactId> Modified: branches/sammoa-1.0.4.x/sammoa-persistence/pom.xml =================================================================== --- branches/sammoa-1.0.4.x/sammoa-persistence/pom.xml 2014-10-20 09:57:49 UTC (rev 735) +++ branches/sammoa-1.0.4.x/sammoa-persistence/pom.xml 2014-10-20 09:57:56 UTC (rev 736) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4.1</version> + <version>1.0.4.2-SNAPSHOT</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: branches/sammoa-1.0.4.x/sammoa-ui-swing/pom.xml =================================================================== --- branches/sammoa-1.0.4.x/sammoa-ui-swing/pom.xml 2014-10-20 09:57:49 UTC (rev 735) +++ branches/sammoa-1.0.4.x/sammoa-ui-swing/pom.xml 2014-10-20 09:57:56 UTC (rev 736) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4.1</version> + <version>1.0.4.2-SNAPSHOT</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0

r735 - tags
by maven-release＠users.forge.codelutin.com 20 Oct '14

20 Oct '14

Author: maven-release Date: 2014-10-20 11:57:49 +0200 (Mon, 20 Oct 2014) New Revision: 735 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/735 Log: [maven-release-plugin] copy for tag sammoa-1.0.4.1 Added: tags/sammoa-1.0.4.1/

1 0

r734 - in branches/sammoa-1.0.4.x: . sammoa-application sammoa-persistence sammoa-ui-swing
by maven-release＠users.forge.codelutin.com 20 Oct '14

20 Oct '14

Author: maven-release Date: 2014-10-20 11:57:42 +0200 (Mon, 20 Oct 2014) New Revision: 734 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/734 Log: [maven-release-plugin] prepare release sammoa-1.0.4.1 Modified: branches/sammoa-1.0.4.x/pom.xml branches/sammoa-1.0.4.x/sammoa-application/pom.xml branches/sammoa-1.0.4.x/sammoa-persistence/pom.xml branches/sammoa-1.0.4.x/sammoa-ui-swing/pom.xml Modified: branches/sammoa-1.0.4.x/pom.xml =================================================================== --- branches/sammoa-1.0.4.x/pom.xml 2014-10-20 09:42:54 UTC (rev 733) +++ branches/sammoa-1.0.4.x/pom.xml 2014-10-20 09:57:42 UTC (rev 734) @@ -10,7 +10,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4.1-SNAPSHOT</version> + <version>1.0.4.1</version> <packaging>pom</packaging> @@ -64,12 +64,12 @@ </modules> <scm> - <url>http://svn.codelutin.com/sammoa/branches/sammoa-1.0.4.x</url> + <url>http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4.1</url> <connection> - scm:svn:http://svn.codelutin.com/sammoa/branches/sammoa-1.0.4.x + scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4.1 </connection> <developerConnection> - scm:svn:http://svn.codelutin.com/sammoa/branches/sammoa-1.0.4.x + scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4.1 </developerConnection> </scm> <distributionManagement> Modified: branches/sammoa-1.0.4.x/sammoa-application/pom.xml =================================================================== --- branches/sammoa-1.0.4.x/sammoa-application/pom.xml 2014-10-20 09:42:54 UTC (rev 733) +++ branches/sammoa-1.0.4.x/sammoa-application/pom.xml 2014-10-20 09:57:42 UTC (rev 734) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4.1-SNAPSHOT</version> + <version>1.0.4.1</version> </parent> <artifactId>sammoa-application</artifactId> Modified: branches/sammoa-1.0.4.x/sammoa-persistence/pom.xml =================================================================== --- branches/sammoa-1.0.4.x/sammoa-persistence/pom.xml 2014-10-20 09:42:54 UTC (rev 733) +++ branches/sammoa-1.0.4.x/sammoa-persistence/pom.xml 2014-10-20 09:57:42 UTC (rev 734) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4.1-SNAPSHOT</version> + <version>1.0.4.1</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: branches/sammoa-1.0.4.x/sammoa-ui-swing/pom.xml =================================================================== --- branches/sammoa-1.0.4.x/sammoa-ui-swing/pom.xml 2014-10-20 09:42:54 UTC (rev 733) +++ branches/sammoa-1.0.4.x/sammoa-ui-swing/pom.xml 2014-10-20 09:57:42 UTC (rev 734) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4.1-SNAPSHOT</version> + <version>1.0.4.1</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0

r733 - trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController
by sbavencoff＠users.forge.codelutin.com 20 Oct '14

20 Oct '14

Author: sbavencoff Date: 2014-10-20 11:42:54 +0200 (Mon, 20 Oct 2014) New Revision: 733 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/733 Log: ref #5986 : merge branch 1.0.4.x to trunc Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerOnBoard.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerOnBoard.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerOnBoard.java 2014-10-20 09:40:00 UTC (rev 732) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerOnBoard.java 2014-10-20 09:42:54 UTC (rev 733) @@ -33,7 +33,6 @@ import fr.ulr.sammoa.application.device.gps.GpsLocationListener; import fr.ulr.sammoa.persistence.Flight; import fr.ulr.sammoa.persistence.GeoPoint; -import fr.ulr.sammoa.persistence.GeoPoints; import fr.ulr.sammoa.persistence.RouteType; import fr.ulr.sammoa.persistence.SammoaTopiaPersistenceContext; import fr.ulr.sammoa.persistence.TransectFlight; @@ -82,9 +81,15 @@ super.init(flight); - geoPoints = Maps.newHashMap(Maps.uniqueIndex( - service.getFlightGeoPoints(flight), GeoPoints.toDate()) - ); + geoPoints = Maps.newHashMap(); + for (GeoPoint point : service.getFlightGeoPoints(flight)) { + GeoPoint point2 = geoPoints.put(point.getRecordTime(), point); + if (point2 != null) { + if (logger.isDebugEnabled()) { + logger.debug("Duplication point " + point + " , "+ point2); + } + } + } initCurrentRoute(service.getLastUnfinishedRoute(flight)); @@ -118,6 +123,11 @@ getGpsHandler().stop(); } + // TODO Sbavencoff 20/10/2014 : locationChanged et getLocation + // au demarage du vole il est possible d'enregistrer deux fois la même position + // si le threads d'enregistrement de la position toute les deux seconde, enregistre la première position + // après l'enregistrement de la position la position de l'evenement de démmarage du vol + @Override public void locationChanged(GpsLocationEvent event) { GeoPoint newLocation = event.getNewValue();

1 0

r732 - branches/sammoa-1.0.4.x/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController
by sbavencoff＠users.forge.codelutin.com 20 Oct '14

20 Oct '14

Author: sbavencoff Date: 2014-10-20 11:40:00 +0200 (Mon, 20 Oct 2014) New Revision: 732 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/732 Log: fixes #5986 : erreur ?\195?\160 l'ouverture d'un vole : duplication du premier point g?\195?\169ographique. Modified: branches/sammoa-1.0.4.x/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerOnBoard.java Modified: branches/sammoa-1.0.4.x/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerOnBoard.java =================================================================== --- branches/sammoa-1.0.4.x/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerOnBoard.java 2014-10-20 09:11:16 UTC (rev 731) +++ branches/sammoa-1.0.4.x/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerOnBoard.java 2014-10-20 09:40:00 UTC (rev 732) @@ -33,7 +33,6 @@ import fr.ulr.sammoa.application.device.gps.GpsLocationListener; import fr.ulr.sammoa.persistence.Flight; import fr.ulr.sammoa.persistence.GeoPoint; -import fr.ulr.sammoa.persistence.GeoPoints; import fr.ulr.sammoa.persistence.RouteType; import fr.ulr.sammoa.persistence.SammoaTopiaPersistenceContext; import fr.ulr.sammoa.persistence.TransectFlight; @@ -82,9 +81,15 @@ super.init(flight); - geoPoints = Maps.newHashMap(Maps.uniqueIndex( - service.getFlightGeoPoints(flight), GeoPoints.toDate()) - ); + geoPoints = Maps.newHashMap(); + for (GeoPoint point : service.getFlightGeoPoints(flight)) { + GeoPoint point2 = geoPoints.put(point.getRecordTime(), point); + if (point2 != null) { + if (logger.isDebugEnabled()) { + logger.debug("Duplication point " + point + " , "+ point2); + } + } + } initCurrentRoute(service.getLastUnfinishedRoute(flight)); @@ -118,6 +123,11 @@ getGpsHandler().stop(); } + // TODO Sbavencoff 20/10/2014 : locationChanged et getLocation + // au demarage du vole il est possible d'enregistrer deux fois la même position + // si le threads d'enregistrement de la position toute les deux seconde, enregistre la première position + // après l'enregistrement de la position la position de l'evenement de démmarage du vol + @Override public void locationChanged(GpsLocationEvent event) { GeoPoint newLocation = event.getNewValue();

1 0

r731 - branches/sammoa-1.0.4.x
by sbavencoff＠users.forge.codelutin.com 20 Oct '14

20 Oct '14

Author: sbavencoff Date: 2014-10-20 11:11:16 +0200 (Mon, 20 Oct 2014) New Revision: 731 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/731 Log: Update project version Modified: branches/sammoa-1.0.4.x/pom.xml Modified: branches/sammoa-1.0.4.x/pom.xml =================================================================== --- branches/sammoa-1.0.4.x/pom.xml 2014-10-20 09:10:54 UTC (rev 730) +++ branches/sammoa-1.0.4.x/pom.xml 2014-10-20 09:11:16 UTC (rev 731) @@ -69,7 +69,7 @@ scm:svn:http://svn.codelutin.com/sammoa/branches/sammoa-1.0.4.x </connection> <developerConnection> - scm:svn:http://svn.codelutin.com/sammoa/tags/branches/sammoa-1.0.4.x + scm:svn:http://svn.codelutin.com/sammoa/branches/sammoa-1.0.4.x </developerConnection> </scm> <distributionManagement>

1 0

r730 - in branches/sammoa-1.0.4.x: . sammoa-application sammoa-persistence sammoa-ui-swing
by sbavencoff＠users.forge.codelutin.com 20 Oct '14

20 Oct '14

Author: sbavencoff Date: 2014-10-20 11:10:54 +0200 (Mon, 20 Oct 2014) New Revision: 730 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/730 Log: Update project version Modified: branches/sammoa-1.0.4.x/pom.xml branches/sammoa-1.0.4.x/sammoa-application/pom.xml branches/sammoa-1.0.4.x/sammoa-persistence/pom.xml branches/sammoa-1.0.4.x/sammoa-ui-swing/pom.xml Modified: branches/sammoa-1.0.4.x/pom.xml =================================================================== --- branches/sammoa-1.0.4.x/pom.xml 2014-10-20 08:52:36 UTC (rev 729) +++ branches/sammoa-1.0.4.x/pom.xml 2014-10-20 09:10:54 UTC (rev 730) @@ -10,7 +10,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC5</version> + <version>1.0.4.1-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/branches/sammoa-1.0.4.x</url> <connection> - scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC5 + scm:svn:http://svn.codelutin.com/sammoa/branches/sammoa-1.0.4.x </connection> <developerConnection> - scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC5 + scm:svn:http://svn.codelutin.com/sammoa/tags/branches/sammoa-1.0.4.x </developerConnection> </scm> <distributionManagement> Modified: branches/sammoa-1.0.4.x/sammoa-application/pom.xml =================================================================== --- branches/sammoa-1.0.4.x/sammoa-application/pom.xml 2014-10-20 08:52:36 UTC (rev 729) +++ branches/sammoa-1.0.4.x/sammoa-application/pom.xml 2014-10-20 09:10:54 UTC (rev 730) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC5</version> + <version>1.0.4.1-SNAPSHOT</version> </parent> <artifactId>sammoa-application</artifactId> Modified: branches/sammoa-1.0.4.x/sammoa-persistence/pom.xml =================================================================== --- branches/sammoa-1.0.4.x/sammoa-persistence/pom.xml 2014-10-20 08:52:36 UTC (rev 729) +++ branches/sammoa-1.0.4.x/sammoa-persistence/pom.xml 2014-10-20 09:10:54 UTC (rev 730) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC5</version> + <version>1.0.4.1-SNAPSHOT</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: branches/sammoa-1.0.4.x/sammoa-ui-swing/pom.xml =================================================================== --- branches/sammoa-1.0.4.x/sammoa-ui-swing/pom.xml 2014-10-20 08:52:36 UTC (rev 729) +++ branches/sammoa-1.0.4.x/sammoa-ui-swing/pom.xml 2014-10-20 09:10:54 UTC (rev 730) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC5</version> + <version>1.0.4.1-SNAPSHOT</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0

r729 - branches
by sbavencoff＠users.forge.codelutin.com 20 Oct '14

20 Oct '14

Author: sbavencoff Date: 2014-10-20 10:52:36 +0200 (Mon, 20 Oct 2014) New Revision: 729 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/729 Log: creation de la branch 1.0.4-x ?\195?\160 partir du tag de la 1.0.4-RC5 Added: branches/sammoa-1.0.4.x/

1 0