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

08/35: refs #6922 topia 2.9.5 corrige le problème
by codelutin.com scm 10 Apr '15

10 Apr '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 57e9f55315a1eef08789bcfad4107fcaaa83ba84 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 12:05:23 2015 +0200 refs #6922 topia 2.9.5 corrige le problème --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eb6a90f..00f97cd 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ <eugenePluginVersion>2.14</eugenePluginVersion> - <topiaVersion>2.9.4</topiaVersion> + <topiaVersion>2.9.5</topiaVersion> <jaxxVersion>2.23</jaxxVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0</nuitonValidatorVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

07/35: fixes #6920: Problème de création d'une nouvelle base (suppression schéma public) Merge branch 'feature/6920' into develop
by codelutin.com scm 10 Apr '15

10 Apr '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 900b71842561f9e5f08deb4f2578dcb9613b7dae Merge: bc47e51 5c79e02 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 10:36:35 2015 +0200 fixes #6920: Problème de création d'une nouvelle base (suppression schéma public) Merge branch 'feature/6920' into develop .../src/main/java/fr/ird/observe/db/util/PGInstall.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

06/35: refs #6920: Ne pas supprimer le schméma public
by codelutin.com scm 10 Apr '15

10 Apr '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 5c79e025955e73e30ae746360725f20d6feba59e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 10:36:25 2015 +0200 refs #6920: Ne pas supprimer le schméma public --- .../src/main/java/fr/ird/observe/db/util/PGInstall.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java b/observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java index 2a39632..d57a514 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java +++ b/observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java @@ -81,7 +81,9 @@ public abstract class PGInstall { protected static final Set<String> EXTRA_TABLES = Sets.newHashSet(TMSVersionDAO.TABLE_NAME, TMSVersionDAO.LEGACY_TABLE_NAME); - public static final Set<String> SCHEMAS = Sets.newHashSet("public", + protected static final String SCHEMA_PUBLIC = "public"; + + protected static final Set<String> SCHEMAS = Sets.newHashSet(SCHEMA_PUBLIC, "OBSERVE_COMMON", "OBSERVE_SEINE", "OBSERVE_LONGLINE"); @@ -223,7 +225,9 @@ public abstract class PGInstall { for (String schema : SCHEMAS) { - builder.append(String.format(DROP_SCHEMA_PATTERN, schema)); + if (!SCHEMA_PUBLIC.equals(schema)) { + builder.append(String.format(DROP_SCHEMA_PATTERN, schema)); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

05/35: fixes #6919: Problème de création de base distante (avec recopie de données) Merge branch 'feature/6919' into develop
by codelutin.com scm 10 Apr '15

10 Apr '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit bc47e5137ffd11a93439991291f8a11907f9697e Merge: 9c79c44 54c2925 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 10:25:04 2015 +0200 fixes #6919: Problème de création de base distante (avec recopie de données) Merge branch 'feature/6919' into develop .../main/java/fr/ird/observe/db/ReplicationService.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

04/35: refs #6919 (possibilité d'avoir la source en cours de création)
by codelutin.com scm 10 Apr '15

10 Apr '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 54c2925b2805ddb2ca1823bf28d3bc4419d622b6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 10:24:31 2015 +0200 refs #6919 (possibilité d'avoir la source en cours de création) --- .../main/java/fr/ird/observe/db/ReplicationService.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/db/ReplicationService.java b/observe-business/src/main/java/fr/ird/observe/db/ReplicationService.java index 0468030..da02d00 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/ReplicationService.java +++ b/observe-business/src/main/java/fr/ird/observe/db/ReplicationService.java @@ -29,7 +29,6 @@ import fr.ird.observe.entities.Entities; import fr.ird.observe.entities.Trip; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglines; -import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.entities.seine.TripSeineDAO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.tuple.Pair; @@ -40,7 +39,6 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaSQLQuery; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.TopiaEntityHelper; import org.nuiton.topia.replication.TopiaReplicationService; import org.nuiton.topia.replication.model.ReplicationModel; import org.nuiton.util.StringUtil; @@ -141,6 +139,8 @@ public class ReplicationService { throw new NullPointerException("dstService can not be null"); } srcService.checkState(DataSourceState.OPEN); + // le service peut-être en cours d'ouverture + dstService.checkState(DataSourceState.INIT, DataSourceState.OPEN); // recuperation des marees a repliquer @@ -151,15 +151,18 @@ public class ReplicationService { srcCtxt = srcService.beginTransaction("replicateData"); TripSeineDAO srcTripDAO = ObserveDAOHelper.getTripSeineDAO(srcCtxt); - List<TripSeine> srcTripSeines = srcTripDAO.findAll(); + List<String> allIds = srcTripDAO.findAllIds(); + +// List<TripSeine> srcTripSeines = srcTripDAO.findAll(); - if (CollectionUtils.isEmpty(srcTripSeines)) { + if (CollectionUtils.isEmpty(allIds)) { // aucune donnee a repliquer srcService.fireNewMessage( t("observe.storage.message.replicate.data.no.data")); return; } - topiaIds = TopiaEntityHelper.getTopiaIdArray(srcTripSeines); +// topiaIds = TopiaEntityHelper.getTopiaIdArray(srcTripSeines); + topiaIds= allIds.toArray(new String[allIds.size()]); } catch (TopiaException e) { throw new DataSourceException(e, "replicateData"); @@ -199,7 +202,9 @@ public class ReplicationService { } srcService.checkState(DataSourceState.OPEN); - dstService.checkState(DataSourceState.OPEN); + // le service peut-être en cours d'ouverture + dstService.checkState(DataSourceState.INIT, DataSourceState.OPEN); + if (srcService.equals(dstService)) { throw new IllegalArgumentException( "can not replcate to the same service..."); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

03/35: fixes #6921: Mauvais libéllé lors de la création d'une base distante Merge branch 'feature/6921' into develop
by codelutin.com scm 10 Apr '15

10 Apr '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 9c79c4407aa9f7fb1eedb01bbd3fc12acb1624da Merge: 92410cf a036248 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 10:22:37 2015 +0200 fixes #6921: Mauvais libéllé lors de la création d'une base distante Merge branch 'feature/6921' into develop .../src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.css | 4 ++-- observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties | 2 ++ observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties | 2 ++ observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

02/35: refs #6921: Mauvais libéllé lors de la création d'une base distante
by codelutin.com scm 10 Apr '15

10 Apr '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit a036248f1ec327b7e12541f737824da847c703a1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 10:22:28 2015 +0200 refs #6921: Mauvais libéllé lors de la création d'une base distante --- .../src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.css | 4 ++-- observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties | 2 ++ observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties | 2 ++ observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.css index 3255b68..cfa946c 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.css +++ b/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.css @@ -42,13 +42,13 @@ #importDataFromBackup { value:{CreationMode.IMPORT_EXTERNAL_DUMP}; - text:{CreationMode.IMPORT_EXTERNAL_DUMP.getLabel()}; + text:"observe.synchro.import.data.fromBackup"; selected:{model.getDataImportMode() == CreationMode.IMPORT_EXTERNAL_DUMP}; } #importDataFromRemote { value:{CreationMode.IMPORT_REMOTE_STORAGE}; - text:{CreationMode.IMPORT_REMOTE_STORAGE.getLabel()}; + text:"observe.synchro.import.data.fromRemoteStorage"; selected:{model.getDataImportMode() == CreationMode.IMPORT_REMOTE_STORAGE}; } diff --git a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties index 9e6ca24..b8481be 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties @@ -1654,6 +1654,8 @@ observe.synchro.config.validate= observe.synchro.config.validation.report= observe.synchro.configuration= observe.synchro.continue.with.no.save.report= +observe.synchro.import.data.fromBackup= +observe.synchro.import.data.fromRemoteStorage= observe.synchro.importGPS.invalidIntervals.list= observe.synchro.message.all.obsolete.entities.fixed= observe.synchro.message.need.save.for.synchro.operation= diff --git a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties index b990dfe..5798666 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties @@ -1654,6 +1654,8 @@ observe.synchro.config.validate=Configuración de la validación observe.synchro.config.validation.report=Informe de validación observe.synchro.configuration=Configuración de las operaciones observe.synchro.continue.with.no.save.report=Continuar sin guardar el informe +observe.synchro.import.data.fromBackup= +observe.synchro.import.data.fromRemoteStorage= observe.synchro.importGPS.invalidIntervals.list=Lista de los intervalos de puntos gps no usables observe.synchro.message.all.obsolete.entities.fixed=No hay mas referencias a los objetos obsoletos. observe.synchro.message.need.save.for.synchro.operation=La operación de sincronización de referenciales ha generado cambios diff --git a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties index 900636e..5f540dc 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties @@ -1652,6 +1652,8 @@ observe.synchro.config.validate=Configuration de la validation observe.synchro.config.validation.report=Rapport de validation observe.synchro.configuration=Configuration des opérations observe.synchro.continue.with.no.save.report=Continuer sans sauver de rapport +observe.synchro.import.data.fromBackup=Importer les données depuis une sauvegarde de base locale (*.sql.gz) +observe.synchro.import.data.fromRemoteStorage=Importer les données depuis une base distante observe.synchro.importGPS.invalidIntervals.list=Liste des intervalles de points gps non utilisables observe.synchro.message.all.obsolete.entities.fixed=Il n'y a plus de références sur des objets obsolètes. observe.synchro.message.need.save.for.synchro.operation=L'opération de synchronisation du référentiel a engendrée des modifications. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch develop updated (3598cb3 -> 4baf239)
by codelutin.com scm 07 Apr '15

07 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 3598cb3 [jgitflow-maven-plugin]updating poms for 4.0-RC2-SNAPSHOT development new 83abb77 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds fcb6456 [maven-release-plugin] copy for tag observe-3.15.1 adds 2f5abad [jgitflow-maven-plugin]updating poms for branch '4.0-RC1' with snapshot versions new f5a7430 fix tests new b370ff0 add licenses headers new 6e2ec35 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC1' with non-snapshot versions new a723a7c Merge branch 'release/4.0-RC1' new 3d38290 Merge branch 'master' into develop new 4baf239 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 4baf2392b242783e96f8ced2a577641ec6c501b0 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:45:20 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 3d3829019209ae1b3473d1a0703aef5218963f11 Merge: 83abb77 a723a7c Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:45:19 2015 +0000 Merge branch 'master' into develop commit 83abb7739e17e797164bb674f03bd1adebb30011 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:45:18 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit a723a7c3b67f43ce1fc8a7d5166f1e52f18555fe Merge: fcb6456 6e2ec35 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:45:15 2015 +0000 Merge branch 'release/4.0-RC1' commit 6e2ec35ae990410eee9863b2837b98cc0441bea4 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:40:20 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC1' with non-snapshot versions commit b370ff07766d7abbc686f67153305f044c8838fe Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:40:04 2015 +0000 add licenses headers commit f5a7430eea21e62671d9cc7390db4e727214032f Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:39:54 2015 +0000 fix tests Summary of changes: .../its/replication/AbstractReplicateDataTest.java | 7 ++++++- .../replication/H2LonglineReplicateDataTest.java | 23 ++++++++++++++++++++++ .../its/replication/ReplicationDataModel.java | 22 +++++++++++++++++++++ .../observe/entities/longline/TripLonglines.java | 22 +++++++++++++++++++++ .../DataSourceMigrationForVersion_3_16.java | 22 +++++++++++++++++++++ .../referentiel/GearCaracteristicTypes.java | 22 +++++++++++++++++++++ .../main/resources/db/3.16/add-gear-data-H2.sql | 21 ++++++++++++++++++++ .../main/resources/db/3.16/add-gear-data-PG.sql | 21 ++++++++++++++++++++ .../resources/db/3.16/add-gear-referential-H2.sql | 21 ++++++++++++++++++++ .../resources/db/3.16/add-gear-referential-PG.sql | 21 ++++++++++++++++++++ .../db/3.16/remove-tripSeine-seine-H2.sql | 21 ++++++++++++++++++++ .../db/3.16/remove-tripSeine-seine-PG.sql | 21 ++++++++++++++++++++ .../ref/impl/GearCaracteristicTypeUIModel.java | 22 +++++++++++++++++++++ .../content/ref/impl/GearCaracteristicUIModel.java | 22 +++++++++++++++++++++ .../observe/ui/content/ref/impl/GearUIHandler.java | 22 +++++++++++++++++++++ .../observe/ui/content/ref/impl/GearUIModel.java | 22 +++++++++++++++++++++ .../seine/GearUseFeatureMeasurementCellEditor.java | 22 +++++++++++++++++++++ .../GearUseFeatureMeasurementCellRenderer.java | 22 +++++++++++++++++++++ ...GearUseFeaturesMeasurementSeinesTableModel.java | 22 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineTableModel.java | 22 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineUIHandler.java | 22 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineUIModel.java | 22 +++++++++++++++++++++ 22 files changed, 463 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 7

branch release/4.0-RC1 deleted (was 6e2ec35)
by codelutin.com scm 07 Apr '15

07 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-RC1 in repository observe. See http://git.codelutin.com/observe.git was 6e2ec35 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC1' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

annotated tag observe-4.0-RC1 created (now 2bf45b1)
by codelutin.com scm 07 Apr '15

07 Apr '15

This is an automated email from the git hooks/post-receive script. New change to annotated tag observe-4.0-RC1 in repository observe. See http://git.codelutin.com/observe.git at 2bf45b1 (tag) tagging a723a7c3b67f43ce1fc8a7d5166f1e52f18555fe (commit) replaces observe-3.15.1 tagged by Maven Release on Tue Apr 7 20:45:15 2015 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.0-RC1 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0