- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreia.io/ird-observe] Pushed new tag ird-observe-5.3.2
by Tony CHEMIT 03 Mar '17

03 Mar '17

Tony CHEMIT pushed new tag ird-observe-5.3.2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][master-5.x] 44 commits: [jgitflow-maven-plugin]updating poms for 5.3.3-SNAPSHOT development
by Tony CHEMIT 03 Mar '17

03 Mar '17

Tony CHEMIT pushed to branch master-5.x at ultreia.io / ird-observe Commits: 18749dca by root at 2017-02-21T10:30:43+00:00 [jgitflow-maven-plugin]updating poms for 5.3.3-SNAPSHOT development - - - - - 311fc09f by Tony CHEMIT at 2017-02-21T11:50:10+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - da2a4bcb by Tony CHEMIT at 2017-02-21T11:50:11+01:00 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' - - - - - 3cb19ebc by Tony CHEMIT at 2017-02-21T11:50:12+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 9ff34303 by Tony CHEMIT at 2017-02-21T12:01:18+01:00 update changelog for staging version 5.3.2 - - - - - 04a29ba2 by Tony CHEMIT at 2017-02-24T11:08:09+01:00 Ajout chemin de backups dans la configuration (See #735) - - - - - db280d6d by Tony CHEMIT at 2017-02-24T11:08:59+01:00 Ajout du gestionnaire de sauvegardes (See #735) - - - - - 3c5c7631 by Tony CHEMIT at 2017-02-24T14:28:51+01:00 Au démarrage possibilité de charger la dernière sauvegarde automatique (See #735) - - - - - 2c9f4439 by Tony CHEMIT at 2017-02-24T18:03:37+01:00 Traduction de la nouvelle template (See #735) - - - - - d0b5631a by Tony CHEMIT at 2017-02-25T14:09:52+01:00 Amélioration de la fermeture de l'application (See #735) - - - - - 845c0fdb by Tony CHEMIT at 2017-03-01T16:01:00+01:00 On ne détruit pas la base à la fermeture - - - - - 1d162b3a by Tony CHEMIT at 2017-03-01T16:01:20+01:00 fix site url - - - - - 02a5c01c by Tony CHEMIT at 2017-03-01T16:21:59+01:00 amélioration ouverture base (See #735) - - - - - 07048a0e by Tony CHEMIT at 2017-03-01T16:24:30+01:00 review builds - - - - - 009a43b9 by Tony CHEMIT at 2017-03-01T16:24:42+01:00 Merge branch 'feature/backupStorage' into develop-5.x - - - - - a3b105b9 by Tony CHEMIT at 2017-03-01T16:38:28+01:00 downgrade version - - - - - 2d6e713d by Tony CHEMIT at 2017-03-01T17:24:52+01:00 amélioration ouverture base (See #735) - - - - - ab2efc88 by Tony CHEMIT at 2017-03-01T17:45:55+01:00 optimize dependencies - - - - - fb17d43d by Tony CHEMIT at 2017-03-01T17:46:17+01:00 add missing headers - - - - - 97eadf31 by Tony CHEMIT at 2017-03-01T17:46:46+01:00 Pouvoir modifier le référentiel d'une base locale (See #724) - - - - - 08f84088 by Tony CHEMIT at 2017-03-01T19:03:43+01:00 use maven search bagde - - - - - 126f6a37 by Tony CHEMIT at 2017-03-01T19:03:58+01:00 Improve changelog in about ui - - - - - ca3181ed by Tony CHEMIT at 2017-03-01T19:10:08+01:00 improve code - - - - - 01930f8f by Tony CHEMIT at 2017-03-02T09:45:55+01:00 improve web deploy - - - - - ef268c46 by Tony CHEMIT at 2017-03-02T09:47:45+01:00 fix build number for web application - - - - - f07d5d9a by Tony CHEMIT at 2017-03-02T10:12:22+01:00 fix build number for web application - - - - - 902c4dd4 by Tony CHEMIT at 2017-03-02T10:30:04+01:00 update demo urls - - - - - f5dc88a1 by Tony CHEMIT at 2017-03-02T10:36:40+01:00 improve demo build - - - - - f9e49b1e by Tony CHEMIT at 2017-03-02T11:04:03+01:00 improve readme [skip ci] - - - - - 82e6592a by Tony CHEMIT at 2017-03-02T11:56:37+01:00 fix release build - - - - - 65e55e77 by Tony CHEMIT at 2017-03-02T12:17:33+01:00 fix release build [skip ci] - - - - - 4c53157a by Tony CHEMIT at 2017-03-02T14:37:20+01:00 fix release build [skip ci] - - - - - 9fd7dd08 by Tony CHEMIT at 2017-03-02T15:05:22+01:00 optimize dependencies [skip ci] - - - - - 777ace02 by Tony CHEMIT at 2017-03-02T15:46:00+01:00 fix builds [skip ci] - - - - - a6591545 by Tony CHEMIT at 2017-03-02T16:02:53+01:00 fix site build [skip ci] - - - - - c1cb277f by Tony CHEMIT at 2017-03-02T18:20:51+01:00 mettre dans le même ordre les binders et les décorateurs (See #737) - - - - - 07ea97e9 by Tony CHEMIT at 2017-03-03T14:06:47+01:00 Correction de la valeur non déclanchée lors du changement de section (See #740) - - - - - 26afb510 by Tony CHEMIT at 2017-03-03T14:07:37+01:00 section mal recopiée par hibernate (See #737) - - - - - ef5095cd by Tony CHEMIT at 2017-03-03T17:49:03+01:00 Meilleure gestion de l'action Consolidation pour tenir quelque soit le nombre de marées à traiter (See #732) - - - - - c992525f by Tony CHEMIT at 2017-03-03T18:08:56+01:00 add nuiton before central repo - - - - - bcd48848 by Tony CHEMIT at 2017-03-03T18:12:09+01:00 add nuiton before central repo - - - - - 0f18a58d by Tony CHEMIT at 2017-03-03T19:55:50+01:00 [jgitflow-maven-plugin]updating poms for 5.3.2 branch with snapshot versions - - - - - 60880d56 by Tony CHEMIT at 2017-03-03T19:56:14+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.2' with non-snapshot versions - - - - - b699eabf by Tony CHEMIT at 2017-03-03T20:02:10+01:00 [jgitflow-maven-plugin]merging 'release/5.3.2' into 'master-5.x' - - - - - 30 changed files: - .gitlab-ci.yml - CHANGELOG.md - README.md - application-swing-configuration/src/main/config/ObserveSwingApplication.ini - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties - application-swing/pom.xml - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveTextGenerator.java - + application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java - application-swing/src/main/java/fr/ird/observe/application/swing/LocalDatabaseBackupTask.java → application-swing/src/main/java/fr/ird/observe/application/swing/backup/AutomaticLocalDatabaseBackupTask.java - + application-swing/src/main/java/fr/ird/observe/application/swing/backup/BackupStorage.java - + application-swing/src/main/java/fr/ird/observe/application/swing/backup/BackupsManager.java - + application-swing/src/main/java/fr/ird/observe/application/swing/backup/LocalDatabaseBackupTaskSupport.java - application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowAboutAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageBackupUILauncher.java - + application-swing/src/main/resources/ftl/initStorage_en.ftl - + application-swing/src/main/resources/ftl/initStorage_es.ftl - + application-swing/src/main/resources/ftl/initStorage_fr.ftl - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - application-web-configuration/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/c0e9ad9b27bb4af19e7b294e3…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] 6 commits: [jgitflow-maven-plugin]updating poms for 5.3.2 branch with snapshot versions
by Tony CHEMIT 03 Mar '17

03 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 0f18a58d by Tony CHEMIT at 2017-03-03T19:55:50+01:00 [jgitflow-maven-plugin]updating poms for 5.3.2 branch with snapshot versions - - - - - 60880d56 by Tony CHEMIT at 2017-03-03T19:56:14+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.2' with non-snapshot versions - - - - - b699eabf by Tony CHEMIT at 2017-03-03T20:02:10+01:00 [jgitflow-maven-plugin]merging 'release/5.3.2' into 'master-5.x' - - - - - 5b6b0c9a by Tony CHEMIT at 2017-03-03T20:02:13+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - e1486af1 by Tony CHEMIT at 2017-03-03T20:02:13+01:00 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' - - - - - ee3efe8c by Tony CHEMIT at 2017-03-03T20:02:14+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/6bfea487507d0c8c69702813d…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] [jgitflow-maven-plugin]updating poms for 5.3.3-SNAPSHOT development
by Tony CHEMIT 03 Mar '17

03 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 6bfea487 by Tony CHEMIT at 2017-03-03T19:55:52+01:00 [jgitflow-maven-plugin]updating poms for 5.3.3-SNAPSHOT development - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - entities-migration/pom.xml - entities/pom.xml - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-dto/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia-validation/pom.xml - services-topia-validators/pom.xml - services-topia/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> @@ -921,8 +921,7 @@ <phase>generate-resources</phase> <configuration> <target> - <copy failonerror="true" overwrite="true" file="../CHANGELOG.md" - tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md"/> + <copy failonerror="true" overwrite="true" file="../CHANGELOG.md" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md" /> </target> </configuration> <goals> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== entities-migration/pom.xml ===================================== --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>entities-migration</artifactId> ===================================== entities/pom.xml ===================================== --- a/entities/pom.xml +++ b/entities/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>entities</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-dto/pom.xml ===================================== --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-dto</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia-validation/pom.xml ===================================== --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-topia-validation</artifactId> ===================================== services-topia-validators/pom.xml ===================================== --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-topia-validators</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/6bfea487507d0c8c69702813db…

1 0

[Git][ultreia.io/ird-observe] Pushed new branch release/5.3.2
by Tony CHEMIT 03 Mar '17

03 Mar '17

Tony CHEMIT pushed new branch release/5.3.2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag ird-observe-5.3.2
by Tony CHEMIT 03 Mar '17

03 Mar '17

Tony CHEMIT deleted tag ird-observe-5.3.2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop-5.x] add nuiton before central repo
by Tony CHEMIT 03 Mar '17

03 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: bcd48848 by Tony CHEMIT at 2017-03-03T18:12:09+01:00 add nuiton before central repo - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -238,6 +238,16 @@ </releases> </repository> </repositories> + <pluginRepositories> + <pluginRepository> + <id>before-central</id> + <url>https://nexus.nuiton.org/nexus/content/repositories/central-releases</url> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </pluginRepository> + </pluginRepositories> <dependencyManagement> <dependencies> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/bcd4884838f9d8f345243ea108…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] add nuiton before central repo
by Tony CHEMIT 03 Mar '17

03 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: c992525f by Tony CHEMIT at 2017-03-03T18:08:56+01:00 add nuiton before central repo - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -228,6 +228,16 @@ </properties> + <repositories> + <repository> + <id>before-central</id> + <url>https://nexus.nuiton.org/nexus/content/repositories/central-releases</url> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </repository> + </repositories> <dependencyManagement> <dependencies> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/c992525f3c8e5aa6a372a23167…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] Meilleure gestion de l'action Consolidation pour tenir quelque soit le nombre de…
by Tony CHEMIT 03 Mar '17

03 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: ef5095cd by Tony CHEMIT at 2017-03-03T17:49:03+01:00 Meilleure gestion de l'action Consolidation pour tenir quelque soit le nombre de marées à traiter (See #732) - - - - - 4 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java @@ -22,12 +22,9 @@ package fr.ird.observe.application.swing.ui.admin.consolidate; import com.google.common.collect.ImmutableSet; +import fr.ird.observe.application.swing.ObserveRunner; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.application.swing.ui.admin.AdminStep; -import fr.ird.observe.application.swing.ui.admin.AdminTabUI; -import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; -import fr.ird.observe.application.swing.ui.admin.AdminUI; -import fr.ird.observe.application.swing.ui.admin.AdminUIModel; +import fr.ird.observe.application.swing.ui.admin.*; import fr.ird.observe.application.swing.ui.admin.config.SelectDataUI; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.application.swing.ui.tree.DataSelectionTreeSelectionModel; @@ -41,7 +38,7 @@ import jaxx.runtime.swing.wizard.ext.WizardState; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.JTree; +import javax.swing.*; import java.beans.PropertyChangeListener; import java.util.Date; import java.util.Set; @@ -131,35 +128,50 @@ public class ConsolidateUIHandler extends AdminTabUIHandler { ConsolidateDataService consolidateDataService = dataSource.newConsolidateDataService(); - ConsolidateTripSeineDataRequest request = new ConsolidateTripSeineDataRequest(); - request.setTripSeineIds(tripIds); - request.setFailIfLenghtWeightParameterNotFound(false); + int nbResults = 0; + int index=0; + int nbTrips = tripIds.size(); - ImmutableSet<ConsolidateTripSeineDataResult> results = consolidateDataService.consolidateTripSeines(request); + for (String tripId : tripIds) { - if (results.isEmpty()) { + ConsolidateTripSeineDataRequest request = new ConsolidateTripSeineDataRequest(); + request.setTripSeineIds(ImmutableSet.of(tripId)); + request.setFailIfLenghtWeightParameterNotFound(false); - sendMessage(t("observe.actions.consolidate.message.noChanges")); + sendMessage(t("observe.actions.consolidate.start.trip", ++index, nbTrips, tripId)); - } else { + ImmutableSet<ConsolidateTripSeineDataResult> results = consolidateDataService.consolidateTripSeines(request); - for (ConsolidateTripSeineDataResult tripSeineDataResult : results) { + ObserveRunner.cleanMemory(); - String tripSeineLabel = tripSeineDataResult.getTripSeineLabel(); + nbResults+=results.size(); - sendMessage(t("observe.actions.consolidate.message.trip", tripSeineLabel)); + if (results.isEmpty()) { - for (ConsolidateActivitySeineDataResult activitySeineDataResult : tripSeineDataResult.getConsolidateActivitySeineDataResults()) { + sendMessage(t("observe.actions.consolidate.message.noChanges")); - sendMessage(t("observe.actions.consolidate.message.activity", activitySeineDataResult.getActivitySeineLabel())); + } + else { + for (ConsolidateTripSeineDataResult tripSeineDataResult : results) { - } + String tripSeineLabel = tripSeineDataResult.getTripSeineLabel(); + + sendMessage(t("observe.actions.consolidate.message.trip", tripSeineLabel)); + + for (ConsolidateActivitySeineDataResult activitySeineDataResult : tripSeineDataResult.getConsolidateActivitySeineDataResults()) { + + sendMessage(t("observe.actions.consolidate.message.activity", activitySeineDataResult.getActivitySeineLabel())); + } + + } } - sendMessage(t("observe.actions.consolidate.message.save.changes", results.size())); } + sendMessage(t("observe.actions.consolidate.message.save.changes", nbResults)); + + sendMessage(t("observe.actions.consolidate.message.operation.done", new Date())); } ===================================== application-swing/src/main/resources/i18n/application-swing_en_GB.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -143,6 +143,7 @@ observe.actions.consolidate.message.noChanges=No data modified. observe.actions.consolidate.message.operation.done=Consolidate operation done in %1$s. observe.actions.consolidate.message.save.changes=Save modified %1$s trip(s). observe.actions.consolidate.message.trip=Data consolidate for trip %1$s +observe.actions.consolidate.start.trip=Start consolidate data on trip %s / %s (%s) observe.actions.consolidate.title=Consolidate data observe.actions.consolidate.title.tip=Consolidate observed data observe.actions.exportData=Export data ===================================== application-swing/src/main/resources/i18n/application-swing_es_ES.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -143,6 +143,7 @@ observe.actions.consolidate.message.noChanges=No modificación de datos. observe.actions.consolidate.message.operation.done=Operación de calculo de datos terminada en %1$s. observe.actions.consolidate.message.save.changes=Guardar las modificaciones de la(s) %1$s marea(s) modificada(s). observe.actions.consolidate.message.trip=Datos calculados para la marea %1$s +observe.actions.consolidate.start.trip=Démarrage de la consolidation pour la marée %s / %s (%s) \#TODO observe.actions.consolidate.title=Consolidar los datos observados observe.actions.consolidate.title.tip=Consolidar los datos observados observe.actions.exportData=Exportar los datos observados ===================================== application-swing/src/main/resources/i18n/application-swing_fr_FR.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -143,6 +143,7 @@ observe.actions.consolidate.message.noChanges=Aucune donnée modifiée. observe.actions.consolidate.message.operation.done=Opération de calcul des données terminée à %1$s. observe.actions.consolidate.message.save.changes=Sauvegarde des modifications sur la(es) %1$s marée(s) modifiée(s). observe.actions.consolidate.message.trip=Données calculées pour la marée %1$s +observe.actions.consolidate.start.trip=Démarrage de la consolidation pour la marée %s / %s (%s) 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 View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/ef5095cd0319556b9ef97361b5…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] 3 commits: mettre dans le même ordre les binders et les décorateurs (See #737)
by Tony CHEMIT 03 Mar '17

03 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: c1cb277f by Tony CHEMIT at 2017-03-02T18:20:51+01:00 mettre dans le même ordre les binders et les décorateurs (See #737) - - - - - 07ea97e9 by Tony CHEMIT at 2017-03-03T14:06:47+01:00 Correction de la valeur non déclanchée lors du changement de section (See #740) - - - - - 26afb510 by Tony CHEMIT at 2017-03-03T14:07:37+01:00 section mal recopiée par hibernate (See #737) - - - - - 7 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss - pom.xml - + services-dto/src/main/java/fr/ird/observe/services/dto/longline/CatchLonglineDto.java - services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java - services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java - services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java - services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss @@ -73,6 +73,7 @@ #section { property:{CatchLonglineDto.PROPERTY_SECTION}; selectedItem:{tableEditBean.getSection()}; + force:true; _listNoLoad:{true}; } ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <jaxxVersion>2.40</jaxxVersion> + <jaxxVersion>2.41</jaxxVersion> <nuitonI18nVersion>3.6.3</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> ===================================== services-dto/src/main/java/fr/ird/observe/services/dto/longline/CatchLonglineDto.java ===================================== --- /dev/null +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/CatchLonglineDto.java @@ -0,0 +1,39 @@ +package fr.ird.observe.services.dto.longline; + +/*- + * #%L + * ObServe :: Services DTO + * %% + * Copyright (C) 2008 - 2017 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 fr.ird.observe.services.dto.DataReference; + +import javax.annotation.Generated; + +@Generated(value = "org.nuiton.eugene.java.BeanTransformer", date = "Wed Mar 01 18:04:05 CET 2017") +public class CatchLonglineDto extends GeneratedCatchLonglineDto { + + + public void setSection(DataReference<SectionDto> section) { + super.setSection(section); + System.out.println("WTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTF ???? to section: "+section); + } + + private static final long serialVersionUID = 3846975004402399536L; +} //CatchLonglineDto ===================================== services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java ===================================== --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java @@ -200,25 +200,25 @@ public enum DataReferenceSetDefinitions { .addProperty(String.class, SetLonglineDto.PROPERTY_HOME_ID)), SECTION(newDefinitionBuilder(SectionDto.class) - .addProperty(Integer.class, SectionDto.PROPERTY_HAULING_IDENTIFIER) - .addProperty(Integer.class, SectionDto.PROPERTY_SETTING_IDENTIFIER)), + .addProperty(Integer.class, SectionDto.PROPERTY_SETTING_IDENTIFIER) + .addProperty(Integer.class, SectionDto.PROPERTY_HAULING_IDENTIFIER)), BASKET(newDefinitionBuilder(BasketDto.class) - .addProperty(Integer.class, BasketDto.PROPERTY_HAULING_IDENTIFIER) - .addProperty(Integer.class, BasketDto.PROPERTY_SETTING_IDENTIFIER)), + .addProperty(Integer.class, BasketDto.PROPERTY_SETTING_IDENTIFIER) + .addProperty(Integer.class, BasketDto.PROPERTY_HAULING_IDENTIFIER)), BRANCHLINE(newDefinitionBuilder(BranchlineDto.class) - .addProperty(Integer.class, BranchlineDto.PROPERTY_HAULING_IDENTIFIER) - .addProperty(Integer.class, BranchlineDto.PROPERTY_SETTING_IDENTIFIER)), + .addProperty(Integer.class, BranchlineDto.PROPERTY_SETTING_IDENTIFIER) + .addProperty(Integer.class, BranchlineDto.PROPERTY_HAULING_IDENTIFIER)), BASKET_WITH_SECTION(newDefinitionBuilder(BasketWithSectionIdDto.class) - .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_HAULING_IDENTIFIER) .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_SETTING_IDENTIFIER) + .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_HAULING_IDENTIFIER) .addProperty(String.class, BasketWithSectionIdDto.PROPERTY_SECTION_ID)), BRANCHLINE_WITH_BASKET(newDefinitionBuilder(BranchlineWithBasketIdDto.class) - .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_HAULING_IDENTIFIER) .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_SETTING_IDENTIFIER) + .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_HAULING_IDENTIFIER) .addProperty(String.class, BranchlineWithBasketIdDto.PROPERTY_BASKET_ID)), FLOATLINES_COMPOSITION(newDefinitionBuilder(FloatlinesCompositionDto.class) ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java @@ -69,14 +69,14 @@ public class BasketBinder extends DataBinderSupport<Basket, BasketDto> { @Override public DataReference<BasketDto> toDataReference(ReferentialLocale referentialLocale, Basket entity) { - return toDataReference(entity, entity.getHaulingIdentifier(), entity.getSettingIdentifier()); + return toDataReference(entity, entity.getSettingIdentifier(), entity.getHaulingIdentifier()); } @Override public DataReference<BasketDto> toDataReference(ReferentialLocale referentialLocale, BasketDto dto) { - return toDataReference(dto, dto.getHaulingIdentifier(), dto.getSettingIdentifier()); + return toDataReference(dto, dto.getSettingIdentifier(), dto.getHaulingIdentifier()); } } ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java @@ -115,14 +115,14 @@ public class BranchlineBinder extends DataBinderSupport<Branchline, BranchlineDt @Override public DataReference<BranchlineDto> toDataReference(ReferentialLocale referentialLocale, Branchline entity) { - return toDataReference(entity, entity.getHaulingIdentifier(), entity.getSettingIdentifier()); + return toDataReference(entity, entity.getSettingIdentifier(), entity.getHaulingIdentifier()); } @Override public DataReference<BranchlineDto> toDataReference(ReferentialLocale referentialLocale, BranchlineDto dto) { - return toDataReference(dto, dto.getHaulingIdentifier(), dto.getSettingIdentifier()); + return toDataReference(dto, dto.getSettingIdentifier(), dto.getHaulingIdentifier()); } } ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java @@ -65,14 +65,18 @@ public class SectionBinder extends DataBinderSupport<Section, SectionDto> { @Override public DataReference<SectionDto> toDataReference(ReferentialLocale referentialLocale, Section entity) { - return toDataReference(entity, entity.getHaulingIdentifier(), entity.getSettingIdentifier()); + //FIXME-tchemit Je ne sais pas pourquoi mais si on utilise ces deux variables inline + //FIXME-tchemit alors les valeurs sont inversées!!! pb proxy hibernate + Integer settingIdentifier = entity.getSettingIdentifier(); + Integer haulingIdentifier = entity.getHaulingIdentifier(); + return toDataReference(entity, settingIdentifier, haulingIdentifier); } @Override public DataReference<SectionDto> toDataReference(ReferentialLocale referentialLocale, SectionDto dto) { - return toDataReference(dto, dto.getHaulingIdentifier(), dto.getSettingIdentifier()); + return toDataReference(dto, dto.getSettingIdentifier(), dto.getHaulingIdentifier()); } } View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/a6591545b50f649be57d9775a…

1 0