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

[Git][ultreia.io/ird-observe] Pushed new tag v5.3.3
by Tony CHEMIT 10 Mar '17

10 Mar '17

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

1 0

[Git][ultreia.io/ird-observe][release/5.3.3] [jgitflow-maven-plugin]updating poms for branch'release/5.3.3' with non-snapshot versions
by Tony CHEMIT 10 Mar '17

10 Mar '17

Tony CHEMIT pushed to branch release/5.3.3 at ultreia.io / ird-observe Commits: f3a42991 by Tony CHEMIT at 2017-03-10T16:47:36+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.3' with non-snapshot versions - - - - - 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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>application-swing</artifactId> ===================================== 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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</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.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/f3a42991e6d262a325f70939b3…

1 0

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

10 Mar '17

Tony CHEMIT pushed to branch master-5.x at ultreia.io / ird-observe Commits: 41d3e28f by Tony CHEMIT at 2017-03-10T16:06:44+01:00 [jgitflow-maven-plugin]updating poms for 5.3.4-SNAPSHOT development - - - - - 43a830c6 by Tony CHEMIT at 2017-03-10T16:14:02+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 3bbd1da0 by Tony CHEMIT at 2017-03-10T16:14:03+01:00 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' - - - - - b3a14be8 by Tony CHEMIT at 2017-03-10T16:14:04+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - beff6db1 by Tony CHEMIT at 2017-03-10T16:26:09+01:00 improve scripts - - - - - fb124529 by Tony CHEMIT at 2017-03-10T16:46:07+01:00 will replay version 5.3.3 - - - - - c9db738c by Tony CHEMIT at 2017-03-10T16:46:50+01:00 fix some type (See #744) - - - - - f3a42991 by Tony CHEMIT at 2017-03-10T16:47:36+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.3' with non-snapshot versions - - - - - 1ab6d696 by Tony CHEMIT at 2017-03-10T16:55:02+01:00 [jgitflow-maven-plugin]merging 'release/5.3.3' into 'master-5.x' - - - - - 5 changed files: - bin/release_create.sh - bin/stage_create.sh - bin/stage_drop.sh - bin/stage_release.sh - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java Changes: ===================================== bin/release_create.sh ===================================== --- a/bin/release_create.sh +++ b/bin/release_create.sh @@ -29,7 +29,7 @@ if [ ! "$?" == "0" ]; then exit 1 fi echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') +STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | grep OPEN | cut -d' ' -f2) echo "Closing stage: $STAGE_ID ($LOG_DIR/stage-close.log)" mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log @@ -39,4 +39,4 @@ if [ ! "$?" == "0" ]; then fi echo "Release stage: $STAGE_ID ($LOG_DIR/stage-release.log)" -mvn nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log +mvn nexus-staging:release -N -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log ===================================== bin/stage_create.sh ===================================== --- a/bin/stage_create.sh +++ b/bin/stage_create.sh @@ -29,7 +29,7 @@ if [ ! "$?" == "0" ]; then exit 1 fi echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') +STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | grep OPEN | cut -d' ' -f2) echo "Closing stage: $STAGE_ID ($LOG_DIR/stage-close.log)" mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log ===================================== bin/stage_drop.sh ===================================== --- a/bin/stage_drop.sh +++ b/bin/stage_drop.sh @@ -11,7 +11,7 @@ rm -rf ${LOG_DIR} mkdir -p ${LOG_DIR} echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') +STAGE_ID=$(mvn -N nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2 ) echo "Stage drop: $STAGE_ID ($LOG_DIR/stage-drop.log)" mvn nexus-staging:drop -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log ===================================== bin/stage_release.sh ===================================== --- a/bin/stage_release.sh +++ b/bin/stage_release.sh @@ -1,8 +1,6 @@ #!/usr/bin/env sh PROJECT=ird-observe -MASTER=master-5.x -DEVELOP=develop-5.x STAGE=frirdobserve LOG_DIR=/tmp/${PROJECT}-stage @@ -11,7 +9,7 @@ rm -rf ${LOG_DIR} mkdir -p ${LOG_DIR} echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') +STAGE_ID=$(mvn -N nexus-staging:rc-list | grep ${STAGE} | grep CLOSED | cut -d' ' -f2) echo "Stage release: $STAGE_ID ($LOG_DIR/stage-release.log)" -mvn nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log +mvn nexus-staging:release -N -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java @@ -23,9 +23,9 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.legacy */ import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.entities.referentiel.Gear; -import fr.ird.observe.entities.referentiel.GearCaracteristic; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; +import fr.ird.observe.services.dto.referential.GearCaracteristicDto; +import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -161,12 +161,12 @@ public class UnidirectionalReferentialSynchronizeLocalServiceTopia extends Obser // also remove ocean_species association result.add(sqlStatementGenerator.generateAssociationSql("ocean_species","ocean", id)); } - if (Gear.class.equals(request.getReferentialName())) { + if (GearDto.class.equals(request.getReferentialName())) { // also remove gear_gearcaracteristic association result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gear", id)); } - if (GearCaracteristic.class.equals(request.getReferentialName())) { + if (GearCaracteristicDto.class.equals(request.getReferentialName())) { // also remove gear_gearcaracteristic association result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gearcaracteristic", id)); View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/de3f1f57dcec9f9a32780f32b…

1 0

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

10 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: f3a42991 by Tony CHEMIT at 2017-03-10T16:47:36+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.3' with non-snapshot versions - - - - - 1ab6d696 by Tony CHEMIT at 2017-03-10T16:55:02+01:00 [jgitflow-maven-plugin]merging 'release/5.3.3' into 'master-5.x' - - - - - 130e5b95 by Tony CHEMIT at 2017-03-10T16:55:05+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - e2471f05 by Tony CHEMIT at 2017-03-10T16:55:06+01:00 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' - - - - - ef647c78 by Tony CHEMIT at 2017-03-10T16:55:07+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/7a3b962feade6debcb666c953…

1 0

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

10 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 7a3b962f by Tony CHEMIT at 2017-03-10T16:47:18+01:00 [jgitflow-maven-plugin]updating poms for 5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== 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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-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.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/7a3b962feade6debcb666c9539…

1 0

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

10 Mar '17

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

1 0

[Git][ultreia.io/ird-observe][develop-5.x] 2 commits: will replay version 5.3.3
by Tony CHEMIT 10 Mar '17

10 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: fb124529 by Tony CHEMIT at 2017-03-10T16:46:07+01:00 will replay version 5.3.3 - - - - - c9db738c by Tony CHEMIT at 2017-03-10T16:46:50+01:00 fix some type (See #744) - - - - - 26 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-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java - 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.4-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.4-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.4-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.4-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.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== 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.4-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.4-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.4-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.4-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.4-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.4-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.4-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.4-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.4-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.4-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.4-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.4-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.4-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.4-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.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java @@ -23,9 +23,9 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.legacy */ import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.entities.referentiel.Gear; -import fr.ird.observe.entities.referentiel.GearCaracteristic; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; +import fr.ird.observe.services.dto.referential.GearCaracteristicDto; +import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -161,12 +161,12 @@ public class UnidirectionalReferentialSynchronizeLocalServiceTopia extends Obser // also remove ocean_species association result.add(sqlStatementGenerator.generateAssociationSql("ocean_species","ocean", id)); } - if (Gear.class.equals(request.getReferentialName())) { + if (GearDto.class.equals(request.getReferentialName())) { // also remove gear_gearcaracteristic association result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gear", id)); } - if (GearCaracteristic.class.equals(request.getReferentialName())) { + if (GearCaracteristicDto.class.equals(request.getReferentialName())) { // also remove gear_gearcaracteristic association result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gearcaracteristic", id)); ===================================== 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.4-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.4-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.4-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.4-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.4-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/compare/beff6db191d295c3d60bb6f35…

1 0

[Git][ultreia.io/ird-observe] Deleted tag v5.3.3
by Tony CHEMIT 10 Mar '17

10 Mar '17

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

1 0

[Git][ultreia.io/ird-observe][develop] report from 5.x (See #744)
by Tony CHEMIT 10 Mar '17

10 Mar '17

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: fb928aa1 by Tony CHEMIT at 2017-03-10T16:44:54+01:00 report from 5.x (See #744) - - - - - 2 changed files: - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java Changes: ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java @@ -28,7 +28,7 @@ import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.services.binder.BinderEngine; import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.reference.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.*; import fr.ird.observe.services.service.LastUpdateDateService; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalService; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeRequest; @@ -145,8 +145,30 @@ public class UnidirectionalReferentialSynchronizeLocalServiceTopia extends Obser DeleteSqlStatementGenerator sqlStatementGenerator = new DeleteSqlStatementGenerator(metadataEntity); for (String id : request.getReferentialToRemove()) { - String sql = sqlStatementGenerator.generateSql(id); - result.add(sql); + if (SpeciesDto.class.equals(request.getReferentialName())) { + + // also remove ocean_species association + result.add(sqlStatementGenerator.generateAssociationSql("ocean_species","species", id)); + + // also remove species_specieslist association + result.add(sqlStatementGenerator.generateAssociationSql("species_specieslist","species", id)); + } + if (OceanDto.class.equals(request.getReferentialName())) { + + // also remove ocean_species association + result.add(sqlStatementGenerator.generateAssociationSql("ocean_species","ocean", id)); + } + if (GearDto.class.equals(request.getReferentialName())) { + + // also remove gear_gearcaracteristic association + result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gear", id)); + } + if (GearCaracteristicDto.class.equals(request.getReferentialName())) { + + // also remove gear_gearcaracteristic association + result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gearcaracteristic", id)); + } + result.add(sqlStatementGenerator.generateSql(id)); } } ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java @@ -40,6 +40,7 @@ public class DeleteSqlStatementGenerator<R extends ReferentialDto> { private static final Log log = LogFactory.getLog(DeleteSqlStatementGenerator.class); private static final String DELETE_STATEMENT = "DELETE FROM %s.%s WHERE topiaId = '%s';\n"; + private static final String DELETE_ASSOCIATION_STATEMENT = "DELETE FROM %s.%s WHERE %s = '%s';\n"; private final String schemaName; private final String tableName; @@ -61,4 +62,16 @@ public class DeleteSqlStatementGenerator<R extends ReferentialDto> { } + public String generateAssociationSql(String tableName, String columnName, String id) { + + String result = String.format(DELETE_ASSOCIATION_STATEMENT, schemaName, tableName, columnName, id); + + if (log.isDebugEnabled()) { + log.debug("sql: " + result); + } + + return result; + + } + } View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/fb928aa16ad9c2b5886cb5b23d…

1 0

[Git][ultreia.io/ird-observe][develop] update changelog
by Tony CHEMIT 10 Mar '17

10 Mar '17

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 0e6a6770 by Tony CHEMIT at 2017-03-10T16:34:31+01:00 update changelog - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -73,7 +73,7 @@ ## Version [5.3.2](https://gitlab.com/ultreia.io/ird-observe/milestones/84) 

*(from redmine: created on 2017-02-04)* -**Closed at *In progress*.** +**Closed at *2017-03-08*.** ### Download * [Application (observe-5.3.2.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/0e6a677005f811630b2e57efb0…

1 0