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

[Git][ultreiaio/ird-observe][develop] Souci d'affichage (probablement d'index) dans les échantillons PS après migration V9 - Closes #2436
by Tony CHEMIT (＠tchemit) 30 Sep '22

30 Sep '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a7e0a558 by Tony Chemit at 2022-09-30T17:56:36+02:00 Souci d'affichage (probablement d'index) dans les échantillons PS après migration V9 - Closes #2436 - - - - - 2 changed files: - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_0.java - core/persistence/resources/src/main/resources/db/migration/v9/9.0/03_fill-table-ps_observation_sample-common.sql Changes: ===================================== core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_0.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.spi.migration.v9; */ import com.google.auto.service.AutoService; +import fr.ird.observe.spi.context.DataDtoEntityContext; import fr.ird.observe.spi.migration.ByMajorMigrationVersionResource; import io.ultreia.java4all.util.Version; import io.ultreia.java4all.util.sql.SqlQuery; @@ -32,9 +33,13 @@ import org.apache.logging.log4j.Logger; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Timestamp; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.TreeMap; /** * Created on 19/01/2021. @@ -124,6 +129,11 @@ public class DataSourceMigrationForVersion_9_0 extends ByMajorMigrationVersionRe addNewTable(executor, withIds, "03", "table-ps_observation_catch", "table-ps_observation_sample"); + if (withIds) { + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2436 + migrateSample(executor); + } + executor.addScript("04_0", "adapt_table-ps_observation_activity"); executor.addScript("04_1", "adapt_table-ps_observation_set"); @@ -189,6 +199,310 @@ public class DataSourceMigrationForVersion_9_0 extends ByMajorMigrationVersionRe } } + static class Sample { + String topiaId; + long topiaVersion; + Timestamp topiaCreateDate; + Timestamp lastUpdateDate; + String homeId; + String comment; + String set; + + public Sample(ResultSet resultSet) throws SQLException { + this.topiaId = resultSet.getString(1); + this.topiaVersion = resultSet.getLong(2); + this.topiaCreateDate = resultSet.getTimestamp(3); + this.homeId = resultSet.getString(4); + this.comment = resultSet.getString(5); + this.set = resultSet.getString(6); + this.lastUpdateDate = resultSet.getTimestamp(7); + } + + public void addHomeId(String homeId) { + if (homeId == null) { + return; + } + if (this.homeId == null) { + this.homeId = homeId; + return; + } + this.homeId += " - " + homeId; + } + + public void addComment(String comment) { + if (comment == null) { + return; + } + if (this.comment == null) { + this.comment = comment; + return; + } + this.comment += " - " + comment; + } + + } + + + static class SampleMeasure { + String topiaId; + long topiaVersion; + Timestamp topiaCreateDate; + Timestamp lastUpdateDate; + String homeId; + Float length; + Boolean isLengthComputed; + String picturesReferences; + Float weight; + Boolean isWeightComputed; + int count; + int acquisitionMode; + String species; + String sample; + String sex; + String sizeMeasureType; + String weightMeasureType; + String tagNumber; + String speciesFate; + int sample_idx; + String lengthMeasureMethod; + String weightMeasureMethod; + + public SampleMeasure(ResultSet resultSet) throws SQLException { + this.topiaId = resultSet.getString(1); + this.topiaVersion = resultSet.getLong(2); + this.topiaCreateDate = resultSet.getTimestamp(3); + this.homeId = resultSet.getString(4); + this.length = resultSet.getFloat(5); + this.isLengthComputed = resultSet.getBoolean(6); + this.picturesReferences = resultSet.getString(7); + this.weight = resultSet.getFloat(8); + this.isWeightComputed = resultSet.getBoolean(9); + this.count = resultSet.getInt(10); + this.acquisitionMode = resultSet.getInt(11); + this.species = resultSet.getString(12); + this.sample = resultSet.getString(13); + this.sex = resultSet.getString(14); + this.lastUpdateDate = resultSet.getTimestamp(15); + this.sizeMeasureType = resultSet.getString(16); + this.weightMeasureType = resultSet.getString(17); + this.tagNumber = resultSet.getString(18); + this.speciesFate = resultSet.getString(19); + this.sample_idx = resultSet.getInt(20); + this.lengthMeasureMethod = resultSet.getString(21); + this.weightMeasureMethod = resultSet.getString(22); + } + + } + + private void migrateSample(MigrationVersionResourceExecutor executor) { + + Map<String, Sample> setToSampleMap = new TreeMap<>(); + Map<String, String> sampleMapping = new TreeMap<>(); + + addSample(executor, setToSampleMap, sampleMapping, "SELECT REPLACE(topiaId, '.NonTargetSample', '.Sample'), topiaVersion, topiaCreateDate, homeId, substr(trim(comment), 0, 1024), set, lastUpdateDate FROM ps_observation.nontargetsample order by set, topiaId"); + + addSample(executor, setToSampleMap, sampleMapping, "SELECT REPLACE(topiaId, '.TargetSample', '.Sample'), topiaVersion, topiaCreateDate, homeId, substr(trim(comment), 0, 1024), set, lastUpdateDate FROM ps_observation.targetsample order by set, topiaId"); + + //fr.ird.data.ps.observation.Set#1307366814753#0.10928986819912401 + //fr.ird.data.ps.observation.Sample#1307366814761#0.8029664353471644 + for (Sample sample : setToSampleMap.values()) { + executor.writeSql(String.format("INSERT INTO ps_observation.Sample(topiaId, topiaVersion, topiaCreateDate, homeId, comment, set, lastUpdateDate) VALUES('%s', %s, '%s'::timestamp, %s, %s, '%s', '%s'::timestamp);", + sample.topiaId, + sample.topiaVersion, + sample.topiaCreateDate, + DataDtoEntityContext.escapeString(sample.homeId), + DataDtoEntityContext.escapeComment(sample.comment), + sample.set, + sample.lastUpdateDate + )); + } + + migrateSampleMeasure(executor, sampleMapping); + } + + private void migrateSampleMeasure(MigrationVersionResourceExecutor executor, Map<String, String> sampleMapping) { + // nonTargetSampleMeasure + addSampleMeasure(executor, sampleMapping, "SELECT " + + "REPLACE(topiaId, '.NonTargetLength', '.SampleMeasure'), " + + "topiaVersion + 1, " + + "topiaCreateDate, " + + "homeId, " + + "length, " + + "isLengthComputed, " + + "picturesReferences, " + + "weight, " + + "isWeightComputed, " + + "count, " + + "acquisitionMode, " + + "species, " + + "REPLACE(nonTargetSample, '.NonTargetSample', '.Sample'), " + + "sex, " + + "lastUpdateDate, " + + "sizeMeasureType, " + + "weightMeasureType, " + + "tagNumber, " + + "speciesFate, " + + "nonTargetSample_idx, " + + "lengthMeasureMethod, " + + "weightMeasureMethod " + + "FROM ps_observation.NonTargetLength"); + + // discardedTargetSampleMeasure + addSampleMeasure(executor, sampleMapping, "SELECT " + + "REPLACE(tl.topiaId, '.TargetLength', '.SampleMeasure'), " + + "tl.topiaVersion + 1, " + + "tl.topiaCreateDate, " + + "tl.homeId, " + + "tl.length, " + + "tl.isLengthComputed, " + + "NULL, " + + "tl.weight, " + + "tl.isWeightComputed, " + + "tl.count, " + + "tl.acquisitionMode, " + + "tl.species, " + + "REPLACE(tl.targetSample, '.TargetSample', '.Sample'), " + + "'fr.ird.referential.common.Sex#1239832686121#0.0', " + + "tl.lastUpdateDate, " + + "tl.sizeMeasureType, " + + "tl.weightMeasureType, " + + "tl.tagNumber, " + + "'fr.ird.referential.ps.common.SpeciesFate#1239832683619#0.6250731662108877', " + + "-tl.targetsample_idx, " + + "tl.lengthMeasureMethod, " + + "tl.weightMeasureMethod " + + "FROM ps_observation.TargetSample ts " + + "INNER JOIN ps_observation.TargetLength tl ON (tl.targetSample=ts.topiaId) " + + "WHERE ts.discarded"); + + // notDiscardedTargetSampleMeasure + addSampleMeasure(executor, sampleMapping, "SELECT " + + "REPLACE(tl.topiaId, '.TargetLength', '.SampleMeasure'), " + + "tl.topiaVersion + 1, " + + "tl.topiaCreateDate, " + + "tl.homeId, " + + "tl.length, " + + "tl.isLengthComputed, " + + "NULL, " + + "tl.weight, " + + "tl.isWeightComputed, " + + "tl.count, " + + "tl.acquisitionMode, " + + "tl.species, " + + "REPLACE(tl.targetSample, '.TargetSample', '.Sample'), " + + "'fr.ird.referential.common.Sex#1239832686121#0.0', " + + "tl.lastUpdateDate, " + + "tl.sizeMeasureType, " + + "tl.weightMeasureType, " + + "tl.tagNumber, " + + "'fr.ird.referential.ps.common.SpeciesFate#1239832683619#0.5722739932065866', " + + "-tl.targetsample_idx, " + + "tl.lengthMeasureMethod, " + + "tl.weightMeasureMethod " + + "FROM ps_observation.TargetSample ts " + + "INNER JOIN ps_observation.TargetLength tl ON (tl.targetSample=ts.topiaId) " + + "WHERE NOT ts.discarded"); + } + + private void addSample(MigrationVersionResourceExecutor executor, Map<String, Sample> setToSampleMap, Map<String, String> sampleMapping, String query) { + List<Sample> targetSample = executor.findMultipleResult(SqlQuery.wrap(query, Sample::new)); + for (Sample sample : targetSample) { + Sample existingSample = setToSampleMap.get(sample.set); + if (existingSample == null) { + // new sample + setToSampleMap.put(sample.set, sample); +// sampleMapping.put(sample.topiaId, sample.topiaId); + } else { + // add to sample mapping + sampleMapping.put(sample.topiaId, existingSample.topiaId); + // update homeId + existingSample.addHomeId(sample.homeId); + // update comment + existingSample.addComment(sample.comment); + } + } + } + + private void addSampleMeasure(MigrationVersionResourceExecutor executor, Map<String, String> sampleMapping, String query) { + List<SampleMeasure> sampleMeasureList = executor.findMultipleResult(SqlQuery.wrap(query, SampleMeasure::new)); + for (SampleMeasure sampleMeasure : sampleMeasureList) { + String sampleId = sampleMapping.get(sampleMeasure.sample); + if (sampleId == null) { + sampleId = sampleMeasure.sample; + } + executor.writeSql(String.format("INSERT INTO ps_observation.SampleMeasure(" + + " topiaId," + + " topiaVersion," + + " topiaCreateDate," + + " homeId," + + " length," + + " isLengthComputed," + + " picturesReferences," + + " weight," + + " isWeightComputed," + + " count," + + " acquisitionMode," + + " species," + + " sample," + + " sex," + + " lastUpdateDate," + + " sizeMeasureType," + + " weightMeasureType," + + " tagNumber," + + " speciesFate," + + " sample_idx," + + " lengthMeasureMethod," + + " weightMeasureMethod)" + + " VALUES(" + + "'%s', " + + "%s, " + + "'%s'::timestamp, " + + "%s, " + + "%s, " + + "%s, " + + "%s, " + + "%s, " + + "%s, " + + "%s, " + + "%s, " + + "%s, " + + "'%s', " + + "%s, " + + "'%s'::timestamp, " + + "%s, " + + "%s, " + + "%s, " + + "%s, " + + "%s, " + + "%s, " + + "%s " + + ");", + sampleMeasure.topiaId, + sampleMeasure.topiaVersion, + sampleMeasure.topiaCreateDate, + DataDtoEntityContext.escapeString(sampleMeasure.homeId == null ? null : sampleMeasure.homeId.replaceAll("'", "")), + sampleMeasure.length, + sampleMeasure.isLengthComputed, + DataDtoEntityContext.escapeString(sampleMeasure.picturesReferences == null ? null : sampleMeasure.picturesReferences.replaceAll("'", "")), + sampleMeasure.weight, + sampleMeasure.isWeightComputed, + sampleMeasure.count, + sampleMeasure.acquisitionMode, + DataDtoEntityContext.escapeString(sampleMeasure.species), + sampleId, + DataDtoEntityContext.escapeString(sampleMeasure.sex), + sampleMeasure.lastUpdateDate, + DataDtoEntityContext.escapeString(sampleMeasure.sizeMeasureType), + DataDtoEntityContext.escapeString(sampleMeasure.weightMeasureType), + DataDtoEntityContext.escapeString(sampleMeasure.tagNumber), + DataDtoEntityContext.escapeString(sampleMeasure.speciesFate), + sampleMeasure.sample_idx, + DataDtoEntityContext.escapeString(sampleMeasure.lengthMeasureMethod), + DataDtoEntityContext.escapeString(sampleMeasure.weightMeasureMethod) + )); + } + } + @Override public void generateFinalizeSqlScript(MigrationVersionResourceExecutor executor) { migrateIdx(executor, "ps_observation", "catch", "set"); ===================================== core/persistence/resources/src/main/resources/db/migration/v9/9.0/03_fill-table-ps_observation_sample-common.sql ===================================== @@ -20,14 +20,6 @@ -- #L% --- -INSERT INTO ps_observation.Sample(topiaId, topiaVersion, topiaCreateDate, homeId, comment, set, lastUpdateDate) SELECT REPLACE(topiaId, '.NonTargetSample', '.Sample'), topiaVersion, topiaCreateDate, homeId, substr(trim(comment), 0, 1024), set, lastUpdateDate FROM ps_observation.nontargetsample; -INSERT INTO ps_observation.Sample(topiaId, topiaVersion, topiaCreateDate, homeId, comment, set, lastUpdateDate) SELECT REPLACE(topiaId, '.TargetSample', '.Sample'), topiaVersion, topiaCreateDate, homeId, substr(trim(comment), 0, 1024), set, lastUpdateDate FROM ps_observation.TargetSample; - - -INSERT INTO ps_observation.SampleMeasure(topiaId, topiaVersion, topiaCreateDate, homeId, length, isLengthComputed, picturesReferences, weight, isWeightComputed, count, acquisitionMode, species, sample, sex, lastUpdateDate, sizeMeasureType,weightMeasureType, tagNumber, speciesFate, sample_idx, lengthMeasureMethod, weightMeasureMethod) SELECT REPLACE(topiaId, '.NonTargetLength', '.SampleMeasure'), topiaVersion + 1, topiaCreateDate, homeId, length, isLengthComputed, picturesReferences, weight, isWeightComputed, count, acquisitionMode, species, REPLACE(nonTargetSample, '.NonTargetSample', '.Sample'), sex, lastUpdateDate, sizeMeasureType, weightMeasureType, tagNumber, speciesFate, nonTargetSample_idx, lengthMeasureMethod, weightMeasureMethod FROM ps_observation.NonTargetLength; -INSERT INTO ps_observation.SampleMeasure(topiaId, topiaVersion, topiaCreateDate, homeId, length, isLengthComputed, weight, isWeightComputed, count, acquisitionMode, species, sample, sex, lastUpdateDate, sizeMeasureType, weightMeasureType,tagNumber, speciesFate, sample_idx, lengthMeasureMethod, weightMeasureMethod) SELECT REPLACE(tl.topiaId, '.TargetLength', '.SampleMeasure'), tl.topiaVersion + 1, tl.topiaCreateDate, tl.homeId, tl.length, tl.isLengthComputed, tl.weight, tl.isWeightComputed, tl.count, tl.acquisitionMode, tl.species, REPLACE(tl.targetSample, '.TargetSample', '.Sample'), 'fr.ird.referential.common.Sex#1239832686121#0.0', tl.lastUpdateDate, tl.sizeMeasureType, tl.weightMeasureType, tl.tagNumber, 'fr.ird.referential.ps.common.SpeciesFate#1239832683619#0.6250731662108877', -tl.targetsample_idx, tl.lengthMeasureMethod, tl.weightMeasureMethod FROM ps_observation.TargetSample ts INNER JOIN ps_observation.TargetLength tl ON (tl.targetSample=ts.topiaId) WHERE ts.discarded; -INSERT INTO ps_observation.SampleMeasure(topiaId, topiaVersion, topiaCreateDate, homeId, length, isLengthComputed, weight, isWeightComputed, count, acquisitionMode, species, sample, sex, lastUpdateDate, sizeMeasureType, weightMeasureType,tagNumber, speciesFate, sample_idx, lengthMeasureMethod, weightMeasureMethod) SELECT REPLACE(tl.topiaId, '.TargetLength', '.SampleMeasure'), tl.topiaVersion + 1, tl.topiaCreateDate, tl.homeId, tl.length, tl.isLengthComputed, tl.weight, tl.isWeightComputed, tl.count, tl.acquisitionMode, tl.species, REPLACE(tl.targetSample, '.TargetSample', '.Sample'), 'fr.ird.referential.common.Sex#1239832686121#0.0', tl.lastUpdateDate, tl.sizeMeasureType, tl.weightMeasureType, tl.tagNumber, 'fr.ird.referential.ps.common.SpeciesFate#1239832683619#0.5722739932065866', -tl.targetsample_idx, tl.lengthMeasureMethod, tl.weightMeasureMethod FROM ps_observation.TargetSample ts INNER JOIN ps_observation.TargetLength tl ON (tl.targetSample=ts.topiaId) WHERE NOT ts.discarded; - UPDATE common.LastUpdateDate SET TYPE = REPLACE(TYPE, '.NonTargetSample', '.Sample') WHERE type = 'fr.ird.observe.entities.data.ps.observation.NonTargetSample'; DELETE from common.LastUpdateDate WHERE TYPE LIKE ('%.TargetSample'); UPDATE common.LastUpdateDate SET TYPE = REPLACE(TYPE, '.NonTargetLength', '.SampleMeasure') WHERE type = 'fr.ird.observe.entities.data.ps.observation.NonTargetLength'; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a7e0a558d25b21fc6daae53cd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a7e0a558d25b21fc6daae53cd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: L'assistant sécurité 9.0.7 ne fonctionne plus - Closes #2431
by Tony CHEMIT (＠tchemit) 30 Sep '22

30 Sep '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3cc0792d by Tony Chemit at 2022-09-30T13:20:55+02:00 L'assistant sécurité 9.0.7 ne fonctionne plus - Closes #2431 - - - - - e5e18144 by Tony Chemit at 2022-09-30T13:20:55+02:00 update hibernate - - - - - b77e0641 by Tony Chemit at 2022-09-30T13:20:55+02:00 update slf4j and pom - - - - - f0b7e8a9 by Tony Chemit at 2022-09-30T13:20:55+02:00 update jts - - - - - c49a8b4f by Tony Chemit at 2022-09-30T13:25:52+02:00 L'assistant sécurité 9.0.7 ne fonctionne plus - See #2431 (add SecurityHelper in log info) - - - - - 23 changed files: - client/configuration/pom.xml - client/configuration/src/main/filtered-resources/observe-log4j2.xml - client/datasource/actions/pom.xml - client/datasource/editor/api/pom.xml - client/runner/pom.xml - core/api/dto/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/test/pom.xml - core/services/client/pom.xml - core/services/local/pom.xml - model/src/main/resources/log4j2.xml - pom.xml - server/configuration-tools/pom.xml - server/configuration/pom.xml - server/core/pom.xml - server/runner/src/main/resources/META-INF/configuration/log.xml - toolkit/api/pom.xml - toolkit/persistence/pom.xml - toolkit/persistence/src/main/java/org/nuiton/topia/persistence/security/SecurityScriptHelper.java - toolkit/plugin/pom.xml - toolkit/templates/pom.xml Changes: ===================================== client/configuration/pom.xml ===================================== @@ -140,7 +140,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>test</scope> </dependency> </dependencies> ===================================== client/configuration/src/main/filtered-resources/observe-log4j2.xml ===================================== @@ -127,6 +127,10 @@ <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> + <Logger name="org.nuiton.topia.persistence.security.SecurityScriptHelper" level="info" additivity="false"> + <AppenderRef ref="console"/> + <AppenderRef ref="File"/> + </Logger> <Logger name="org.nuiton.topia.persistence.TopiaApplicationContextFactory" level="info" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> ===================================== client/datasource/actions/pom.xml ===================================== @@ -141,7 +141,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>runtime</scope> </dependency> <dependency> ===================================== client/datasource/editor/api/pom.xml ===================================== @@ -208,7 +208,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>runtime</scope> </dependency> <dependency> ===================================== client/runner/pom.xml ===================================== @@ -116,7 +116,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>runtime</scope> </dependency> <dependency> ===================================== core/api/dto/pom.xml ===================================== @@ -122,7 +122,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>runtime</scope> </dependency> <dependency> ===================================== core/api/tree/pom.xml ===================================== @@ -83,7 +83,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>test</scope> </dependency> <dependency> ===================================== core/api/validation/pom.xml ===================================== @@ -104,7 +104,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>test</scope> </dependency> <dependency> @@ -196,17 +196,17 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>${lib.version.log4j2.eugene}</version> + <version>${lib.version.log4j2}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> - <version>${lib.version.log4j2.eugene}</version> + <version>${lib.version.log4j2}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>${lib.version.log4j2.eugene}</version> + <artifactId>log4j-slf4j2-impl</artifactId> + <version>${lib.version.log4j2}</version> </dependency> </dependencies> </plugin> ===================================== core/persistence/java/pom.xml ===================================== @@ -183,7 +183,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>test</scope> </dependency> </dependencies> ===================================== core/persistence/test/pom.xml ===================================== @@ -84,7 +84,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>runtime</scope> </dependency> <dependency> ===================================== core/services/client/pom.xml ===================================== @@ -238,7 +238,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>test</scope> </dependency> </dependencies> ===================================== core/services/local/pom.xml ===================================== @@ -146,7 +146,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>test</scope> </dependency> </dependencies> ===================================== model/src/main/resources/log4j2.xml ===================================== @@ -51,6 +51,9 @@ <Logger name="org.nuiton.topia.persistence.TopiaApplicationContextFactory" level="info" additivity="false"> <AppenderRef ref="console"/> </Logger> + <Logger name="org.nuiton.topia.persistence.security.SecurityScriptHelper" level="info" additivity="false"> + <AppenderRef ref="console"/> + </Logger> <Root level="warn"> <AppenderRef ref="console"/> </Root> ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2022.85</version> + <version>2022.87</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -119,17 +119,16 @@ <lib.version.h2>1.4.196</lib.version.h2>   - <lib.version.hibernate>5.6.11.Final</lib.version.hibernate> + <lib.version.hibernate>5.6.12.Final</lib.version.hibernate>  <lib.version.jaxb-api>2.4.0-b180830.0359</lib.version.jaxb-api> <lib.version.jaxb-runtime>2.4.0-b180830.0438</lib.version.jaxb-runtime>   - <lib.version.jts>1.16.0</lib.version.jts> + <lib.version.jts>1.16.1</lib.version.jts>   <lib.version.java4all.eugene>3.0-alpha-42</lib.version.java4all.eugene> - <lib.version.log4j2.eugene>2.17.2</lib.version.log4j2.eugene>  <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>IRD, Ultreia.io</license.organizationName> @@ -554,12 +553,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>${lib.version.log4j2}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <version>${lib.version.log4j2}</version> </dependency> <dependency> @@ -1105,22 +1099,22 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <version>${lib.version.log4j2.eugene}</version> + <version>${lib.version.log4j2}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>${lib.version.log4j2.eugene}</version> + <version>${lib.version.log4j2}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> - <version>${lib.version.log4j2.eugene}</version> + <version>${lib.version.log4j2}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>${lib.version.log4j2.eugene}</version> + <artifactId>log4j-slf4j2-impl</artifactId> + <version>${lib.version.log4j2}</version> </dependency> </dependencies> </plugin> ===================================== server/configuration-tools/pom.xml ===================================== @@ -76,7 +76,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>runtime</scope> </dependency> <dependency> ===================================== server/configuration/pom.xml ===================================== @@ -86,7 +86,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>test</scope> </dependency> </dependencies> ===================================== server/core/pom.xml ===================================== @@ -133,7 +133,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>runtime</scope> </dependency> <dependency> ===================================== server/runner/src/main/resources/META-INF/configuration/log.xml ===================================== @@ -98,6 +98,10 @@ <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> + <Logger name="org.nuiton.topia.persistence.security.SecurityScriptHelper" level="info" additivity="false"> + <AppenderRef ref="console"/> + <AppenderRef ref="File"/> + </Logger> <Root level="error"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> ===================================== toolkit/api/pom.xml ===================================== @@ -176,7 +176,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>test</scope> </dependency> </dependencies> ===================================== toolkit/persistence/pom.xml ===================================== @@ -119,7 +119,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>test</scope> </dependency> <dependency> ===================================== toolkit/persistence/src/main/java/org/nuiton/topia/persistence/security/SecurityScriptHelper.java ===================================== @@ -180,7 +180,7 @@ public class SecurityScriptHelper { throw new TopiaException(String.format("Can't generate security script at %s", scriptPath), e); } try { - securityHelper.jdbcHelper().consume(SqlScriptConsumer.of(scriptPath)); + securityHelper.jdbcHelper().consume(SqlScriptConsumer.builder(scriptPath).commit().build()); } catch (SQLException e) { throw new TopiaException(String.format("Can't consume security script at %s", scriptPath), e); } ===================================== toolkit/plugin/pom.xml ===================================== @@ -166,7 +166,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>runtime</scope> </dependency> <dependency> ===================================== toolkit/templates/pom.xml ===================================== @@ -134,7 +134,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j18-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <scope>test</scope> </dependency> </dependencies> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4ce9e6ac52ad147d94a738dc… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4ce9e6ac52ad147d94a738dc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/ps_logbook_well_plan
by Tony CHEMIT (＠tchemit) 28 Sep '22

28 Sep '22

Tony CHEMIT pushed new branch feature/ps_logbook_well_plan at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/feature/ps_logbook_well_plan You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.0.7
by Tony CHEMIT (＠tchemit) 11 Sep '22

11 Sep '22

Tony CHEMIT deleted branch release/9.0.7 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v9.0.7
by Tony CHEMIT (＠tchemit) 11 Sep '22

11 Sep '22

Tony CHEMIT pushed new tag v9.0.7 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/v9.0.7 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/9.0.7] [jgitflow-maven-plugin]updating poms for branch'release/9.0.7' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) 11 Sep '22

11 Sep '22

Tony CHEMIT pushed to branch release/9.0.7 at ultreiaio / ird-observe Commits: 23a31041 by Tony Chemit at 2022-09-12T00:56:41+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.7' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml - core/services/i18n/pom.xml - core/services/local/pom.xml - core/services/pom.xml - core/services/test/pom.xml - model/pom.xml - observe/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/23a31041ad19c29cbeef11371… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/23a31041ad19c29cbeef11371… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 151 commits: [jgitflow-maven-plugin]updating poms for 9.0.7-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 11 Sep '22

11 Sep '22

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 57de7cd5 by Tony Chemit at 2022-06-20T18:08:49+02:00 [jgitflow-maven-plugin]updating poms for 9.0.7-SNAPSHOT development[skip ci] - - - - - 29bbdb18 by Tony Chemit at 2022-06-20T19:25:47+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - d4c2ae80 by Tony Chemit at 2022-06-20T19:25:48+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - d5face62 by Tony Chemit at 2022-06-20T19:25:50+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 3c7eaf81 by Tony Chemit at 2022-06-24T13:12:21+02:00 Convertisseur de longueur m/km/nm/ftm - See ultreiaio/ird-observe#2378 - - - - - 4a673192 by Tony Chemit at 2022-06-27T10:18:51+02:00 update pom - - - - - 5b1e8178 by Tony Chemit at 2022-06-27T13:22:56+02:00 On pourrait avoir un service de génération de topiaid - Closes #2104 - - - - - be82895e by Tony Chemit at 2022-06-27T13:22:56+02:00 Certains services sont encore en GET alors qu'ils devraient être en POST - Closes #2412 - - - - - e6a47230 by Tony Chemit at 2022-07-07T11:59:25+02:00 Improve Statistics API - Closes #2417 - - - - - 187a916e by Tony Chemit at 2022-07-07T16:09:22+02:00 Ordonancement par défaut des 3 combos section, basket, avançon sur les observations - See #2410 - - - - - 02668f54 by Tony Chemit at 2022-07-11T07:05:28+02:00 Erreur de migration de l'espèce AVDTH 8 de CAPT_ELEM vers ps_logbook.catch - Closes #2419 - - - - - 4be6b33f by Tony Chemit at 2022-07-11T07:19:51+02:00 Statut de la doc de mapping des espèces AVDTH/ObServe - Closes #2420 - - - - - ff692d59 by Tony Chemit at 2022-07-11T07:55:27+02:00 HResponseErrorException / InvalidAuthenticationTokenException en 9.0.6 en quittant l'application - Closes #2411 - - - - - c5afc42e by Tony Chemit at 2022-07-22T06:06:31+02:00 Contournements des soucis mémoire de l'importeru AVDTH - Closes #2418 - - - - - 08ae1bf3 by Tony Chemit at 2022-07-22T06:06:31+02:00 Convertisseur de longueur m/km/nm/ftm - Closes #2378 - - - - - 66b555f0 by Tony Chemit at 2022-07-22T06:06:31+02:00 La boîte 'A propos' ne fontionne pas - Closes #2416 - - - - - 36e8022d by Tony Chemit at 2022-07-22T06:06:31+02:00 update hibernate - - - - - b539d5d0 by Tony Chemit at 2022-07-22T06:06:31+02:00 fix generate detail composition (ll-observation) - - - - - a3d9f432 by Tony Chemit at 2022-07-22T06:06:31+02:00 update pom - - - - - 56e24ae9 by Tony Chemit at 2022-07-22T06:06:31+02:00 Traitement de RAV - Closes #2421 - - - - - 18231568 by Tony Chemit at 2022-07-28T07:56:32+02:00 Remove 9.0.0-RC-* milestones (all goes to 9.0.0-RC) Update changelog for v.9.0.7 [skip CI] - - - - - bf1646c8 by Tony Chemit at 2022-07-28T07:56:32+02:00 Downgrade eugene, does not work, a lot of mixup with all existing xml libs... - - - - - 388d4423 by Tony Chemit at 2022-07-28T07:56:32+02:00 Il faudrait mettre à jour le script qui crée les colonnes postgis pour chaque champ lat/lon - Closes #2422 - - - - - e0548f75 by Tony Chemit at 2022-07-28T07:56:32+02:00 Remove old scripts from client archive - - - - - da3307ef by Tony Chemit at 2022-07-28T07:56:32+02:00 Il faudrait un type d'accès en écriture mais qui empêche la modification des références - Closes #2370 - - - - - 68fa7b79 by Tony Chemit at 2022-07-28T07:56:32+02:00 Contournements des soucis mémoire de l'importeru AVDTH - Closes #2418 - - - - - 0361a0a3 by Tony Chemit at 2022-08-22T18:35:46+02:00 Sur les données LL port et associées, rajouter 2 nouveaux champs data entry operators - Closes ultreiaio/ird-observe#2343 - - - - - ee9bc2f0 by Tony Chemit at 2022-08-22T18:35:46+02:00 Ajouter un champ position sur le formulaire Landing LL - See ultreiaio/ird-observe#2345 - - - - - b3e5a3aa by Tony Chemit at 2022-08-22T18:35:46+02:00 update pom update site plugin - - - - - e82a7de1 by Tony Chemit at 2022-08-22T18:35:46+02:00 Fix validation context reset (for not standalone content ui) - - - - - e1f1eccc by Tony Chemit at 2022-08-22T18:35:46+02:00 Erreur calcul des données sur V9 - Closes #2423 - - - - - 91a6d1fa by Tony Chemit at 2022-08-22T18:35:46+02:00 Erreur lors du rechargement de la source si token expiré - Closes #2415 - - - - - 0b1eeba8 by Tony Chemit at 2022-08-22T18:35:46+02:00 Group all api modules in one Maven module - See ultreiaio/topia-extension#145 - - - - - 52772eeb by Tony Chemit at 2022-08-22T18:35:46+02:00 Update changelog for v.7.6.14 [skip CI] - - - - - e18b3a9b by Tony Chemit at 2022-08-22T18:35:46+02:00 use cache of simplifiedObjectTypeSpecializedRules - - - - - 3c4e2ada by Tony Chemit at 2022-08-22T18:35:46+02:00 Il faudrait mettre à jour le script qui crée les colonnes postgis pour chaque champ lat/lon - Closes #2422 - - - - - 114a4e4e by Tony Chemit at 2022-08-22T18:35:46+02:00 Introduce sql package (from topia project) - See ultreiaio/java-util#31 - - - - - 0b95b008 by Tony Chemit at 2022-08-22T18:35:46+02:00 Introduce json package (from http project) - See ultreiaio/java-util#30 - - - - - 14cc8b0c by Tony Chemit at 2022-08-22T18:35:46+02:00 Introduce sql package (from topia project) - See ultreiaio/java-util#31 Introduce json package (from http project) - See ultreiaio/java-util#30 - - - - - 0203a260 by Tony Chemit at 2022-08-22T18:35:46+02:00 tidy pom - - - - - 3b30059a by Tony Chemit at 2022-08-22T18:35:46+02:00 Improve avdth API (move it from api-dto to api-services) - - - - - 52700fb3 by Tony Chemit at 2022-08-22T18:35:46+02:00 update pom - - - - - 17c4bf47 by Tony Chemit at 2022-08-22T18:35:46+02:00 import topia into toolkit - - - - - e2e28393 by Tony Chemit at 2022-08-22T18:35:46+02:00 TimeLog - Fix timeLog init - - - - - 9c6b0e01 by Tony Chemit at 2022-08-22T18:35:46+02:00 Persistence - Improve Migration service code and logs - - - - - b2c2c57d by Tony Chemit at 2022-08-22T18:35:46+02:00 TimeLog - use TimeLog.reset - - - - - 96b0b7fb by Tony Chemit at 2022-08-22T18:35:46+02:00 Persistence - Add SqlQuery and SqlFunction in sql package - See ultreiaio/java-util#33 - - - - - f98284aa by Tony Chemit at 2022-08-22T18:35:46+02:00 Persistence - Improve JdbcHelper (remove a very strange DriverManager.registerDriver code...) - - - - - 42bb7902 by Tony Chemit at 2022-08-22T18:35:46+02:00 Replace MutableInt by AtomicInteger - - - - - ac7f588b by Tony Chemit at 2022-08-22T18:35:46+02:00 Json - Remove guava json adapters from this project (remove then guava dependency :)) - Closes ultreiaio/java-util#35 - - - - - d2797ffe by Tony Chemit at 2022-08-22T18:35:46+02:00 update pom - - - - - 4dc68147 by Tony Chemit at 2022-08-22T18:35:46+02:00 Server - low log level - - - - - 58bd4640 by Tony Chemit at 2022-08-22T18:35:46+02:00 TimeLog - fix some usages (not on correct class) - - - - - f5064861 by Tony Chemit at 2022-08-22T18:35:46+02:00 Service Local - use TimeLog at correct place - - - - - 2cb35e78 by Tony Chemit at 2022-08-22T18:35:46+02:00 Service Client - Improve TimeLog and code flow Improve generated service client to have TimeLog at nice place - See ultreiaio/http#54 Replace url by uri in HResponseNotAvailableException to avoid nasty IOException - See ultreiaio/http#55 - - - - - 3fa2b1c3 by Tony Chemit at 2022-08-22T18:35:46+02:00 Dans l'assistant rapport, ajouter un export CSV - Closes #2259 - - - - - 6ce76e92 by Tony Chemit at 2022-08-22T18:35:46+02:00 Client - Aucune barre de progression Closes #2409 - - - - - b4c49f2c by Tony Chemit at 2022-08-22T18:35:46+02:00 Persistence - clean code - - - - - 5cfc1e3d by Tony Chemit at 2022-08-22T18:35:46+02:00 Persistence - use JsonAware instead of ObserveDto - - - - - bfda48c5 by Tony Chemit at 2022-08-22T18:35:46+02:00 Persistence - schema are now always sorted - - - - - 461ffa4f by Tony Chemit at 2022-08-22T18:35:46+02:00 Persistence - improve JdbcHelper, introduce JdbcSecurityHelper to add support for h2 users management, improve Security script API - - - - - aede1e93 by Tony Chemit at 2022-08-22T18:35:46+02:00 Persistence - merge some toolkit code to topia Persistence - add replicate and delete plan for referential (to be able to remove the nasty topia dao delete method and replace it by generated sql code) Tck - add more tck data to be able to perform all the delete tests - - - - - f10d92cf by Tony Chemit at 2022-08-22T18:35:46+02:00 Persistence - sort blob by id when copy them to h2 database - - - - - fe237b27 by Tony Chemit at 2022-08-22T18:35:46+02:00 Test - Add more tests for ReferentialService - - - - - 726a08a5 by Tony Chemit at 2022-08-22T18:35:46+02:00 Persistence - Add referential new scripts instead of runtime sql generation + improve referential context code - - - - - 7010f384 by Tony Chemit at 2022-08-22T18:35:46+02:00 Persistence - Fix vicious code that could delete all data (if used inside other code...) - - - - - 1453098e by Tony Chemit at 2022-08-22T18:35:46+02:00 Service - fix ReferentialService.delete permission (was ALL but WRITE_REFERENTIAL is enough) - - - - - 8bcb9bc7 by Tony Chemit at 2022-08-22T18:35:46+02:00 Persistence - Improve avdth code - - - - - d3f579b8 by Tony Chemit at 2022-08-22T18:35:46+02:00 Persistence - Review TopiaIdFactory - - - - - adc2f354 by Tony Chemit at 2022-08-22T18:35:46+02:00 Persistence - Review TopiaApplicationContext - - - - - 75628829 by Tony Chemit at 2022-08-22T18:35:46+02:00 Persistence - Review EntityDeserializerContext - - - - - 67244cba by Tony Chemit at 2022-08-22T18:35:46+02:00 Persistence - Remove usage of TopiaEntityEnum and remove naturalIds on referential and continue to refactor persistence API - - - - - 28dc3317 by Tony Chemit at 2022-08-22T18:35:46+02:00 Persistence - Remove usage of ToolkitEntitySqlModelResource, everything goes to TopiaEntitySqlModelResource now. - - - - - 2e038e5e by Tony Chemit at 2022-08-22T18:35:46+02:00 Persistence - Remove TopiaConfigurationExtension and use JdbcConfiguration from java-util library - See ultreiaio/java-util#37 - - - - - bc8730be by Tony Chemit at 2022-08-22T23:20:37+02:00 update pom - - - - - 62581c1b by Tony Chemit at 2022-08-22T23:20:37+02:00 downgrade m-site-p (still some velocity incompatibility) - - - - - 5b66ab55 by Tony Chemit at 2022-08-22T23:20:37+02:00 Persistence - generate application context schema names, instead of computing them. - - - - - 177b65d0 by Tony Chemit at 2022-08-22T23:20:37+02:00 Persistence - remove HibernateTopiaMigrationService - - - - - 1696b931 by Tony Chemit at 2022-08-22T23:20:37+02:00 Persistence - clean TopiaApplicationText - - - - - f2ada326 by Tony Chemit at 2022-08-23T22:54:18+02:00 Update changelog for v.9.0.7 [skip CI] - - - - - 0b928f3f by Tony Chemit at 2022-08-23T22:54:18+02:00 Titre de l'appli - Closes #2395 - - - - - a32703eb by Tony Chemit at 2022-08-24T16:48:34+02:00 Remove unused class - - - - - 5c0f55bf by Tony Chemit at 2022-08-24T17:13:22+02:00 Persistence - remove TopiaMetadataEntity from API (just use it in templates) Persistence - move DifferentialMetaModel to Dto layer (in BusinessProject) Persistence - update license headers - - - - - c9ae667b by Tony Chemit at 2022-08-24T17:13:22+02:00 Dto - remove from ReferentialDto version and create properties (never used) - - - - - 007c9646 by Tony Chemit at 2022-08-24T17:13:22+02:00 Dto - remove from ToolkitId some unused constants - - - - - 31fff682 by Tony Chemit at 2022-08-24T17:13:22+02:00 Replace ObserveDto by IdDto in ContentTableUITableModel - - - - - 78f10ae4 by Tony Chemit at 2022-08-24T17:13:22+02:00 Persistence - move DifferentialMetaModel to Dto layer (in BusinessProject) - - - - - 341cf5a2 by Tony Chemit at 2022-08-24T17:34:46+02:00 Persistence - Improve Migration service (move it to his dedicated package) - - - - - 095a367f by Tony Chemit at 2022-08-25T16:32:57+02:00 Persistence - Make ObserveDataSourceConfigurationTopiaH2.createTemporaryConfiguration method use System.nanoTime instead of UUID (then can understand when db was created) - - - - - e3c8b718 by Tony Chemit at 2022-08-25T16:34:19+02:00 Persistence - Fix migrateOneToOneComposition for ll_logbook sample - - - - - d19b1bf8 by Tony Chemit at 2022-08-25T16:40:54+02:00 Persistence - Remove a lot of code from ToPIA Persistence - Never use hibernate to generate schema at runtime Persistence - Review ToPIA initSchema (in fact do nothing at all now) - - - - - 2e703b25 by Tony Chemit at 2022-08-25T16:40:54+02:00 Tck - Test more stuff (adding persistence layer in services tck) - - - - - b00c282e by Tony Chemit at 2022-08-25T19:10:00+02:00 add a way to inject tck credentials inside tests (for pg new tests) - - - - - 36de6070 by Tony Chemit at 2022-08-25T20:41:36+02:00 update pom - - - - - f3679ae1 by Tony Chemit at 2022-08-26T01:00:53+02:00 Persistence - Improve Create schema consumer to be able to create schema only if not exists (luckily it works on h2 and on pg \o/) - - - - - bdb42995 by Tony Chemit at 2022-08-26T18:04:16+02:00 Persistence - Use SqlSupplier from java-util - - - - - 7eec3f3d by Tony Chemit at 2022-08-26T18:04:16+02:00 Persistence - add TopiaTransaction.flush method to be able to flush from TopiaPersistenceContext - - - - - 5facf930 by Tony Chemit at 2022-08-26T18:04:16+02:00 Persistence - add JdbcHelper.applyDatabaseNameCase to get neutral search algorithm and use it in SecurityScriptBuilderContext Persistence - add JdbcHelper.isTableExist and JdbcHelper.isSchemaExist Persistence - add JdbcHelper tests - - - - - 46d0fee9 by Tony Chemit at 2022-08-26T18:04:16+02:00 Persistence - Deprecates HibernateUtil.isSchemaExist and HibernateUtil.isSchemaEmpty - - - - - f9dc03de by Tony Chemit at 2022-08-26T18:04:16+02:00 Service local - Review AnonymousServiceLocalSupport , now code is pretty clean and easy to understand. Persistence - Review how to create new database. Now code is pretty clean Service local - Improve AnonymousServiceLocalSupport code Persistence - Review JdbcSecurityHelper.getDataSourceInformation - - - - - 5a1538b4 by Tony Chemit at 2022-08-27T04:27:14+02:00 Persistence - Review TopiaApplicationContextFactory, now we are talking of something nice and smooth, no cast, no mystery, no back ended instance in framework. The ObserveTopiaApplicationContextFactory is now pretty easy to use :) Persistence - Clean Sql service init according to topia configuration Persistence - clean ObserveDataSourceConfiguration, ObserveTopiaConfigurationFactory, BeanTopiaConfiguration and TopiaConfiguration - - - - - 91202ee5 by Tony Chemit at 2022-08-27T04:27:14+02:00 Code - Fix typo and import - - - - - 58de8538 by Tony Chemit at 2022-08-27T04:27:14+02:00 Persistence - improve SecurityScriptHelper code - - - - - 5aa320d0 by Tony Chemit at 2022-08-27T04:27:14+02:00 Persistence - tms_version va-t-elle rester dans le schéma public ? - See #2218 - - - - - 3e210f5a by Tony Chemit at 2022-08-27T04:27:14+02:00 RAV*, quelques détails - Closes ultreiaio/ird-observe#2425 - - - - - 80a00fbf by Tony Chemit at 2022-08-27T04:27:14+02:00 Try to fix validation file order (some validation fields changes from time to time...) - - - - - 5b7f7598 by Tony Chemit at 2022-08-27T04:27:14+02:00 Clé de libellé non traduite en anglais sur la page de synchrod e la synchro avancée - Closes #2327 - - - - - 0d0aa3a7 by Tony Chemit at 2022-08-27T04:27:14+02:00 tidy poms and at last update slf4j and try to fix log4j memory leaks in tomcat (can't find how to remove the thread local usage...) - - - - - 7345b7b1 by Tony Chemit at 2022-08-27T04:27:14+02:00 add TopiaApplicationContextFactory in log to see topia application context usages. - - - - - 145dde05 by Tony Chemit at 2022-08-27T04:27:14+02:00 low down log level - - - - - 11268c6a by Tony Chemit at 2022-08-27T04:27:14+02:00 Il serait intéressant de permettre l'absence de base déclarée par défaut - See #2293 - - - - - 4e7c59a1 by Tony Chemit at 2022-08-28T13:46:26+02:00 Avoir des retours d'expérience possibles sur les actions de maintenance de bases distantes - Closes #2426 - - - - - f144e1f1 by Tony Chemit at 2022-08-28T13:46:26+02:00 Add colors in logs :) - - - - - 32b8de06 by Tony Chemit at 2022-08-28T13:46:26+02:00 Clean topia application context factory when a test is done! - - - - - e131d2c0 by Tony Chemit at 2022-08-28T13:46:26+02:00 update pom - - - - - 81b0e126 by Tony Chemit at 2022-08-28T13:46:26+02:00 Persistence - remove some topiaException when not really needed - - - - - 9900905e by Tony Chemit at 2022-08-28T13:46:26+02:00 Persistence - Remove log.error in migration service - - - - - 4e361ec2 by Tony Chemit at 2022-08-28T14:23:32+02:00 Feedback - be able to select text inside error pane :) - - - - - 4e48eb46 by Tony Chemit at 2022-08-28T15:01:12+02:00 Update changelog for v.9.0.7 [skip CI] - - - - - 61bdeb5c by Tony Chemit at 2022-08-28T15:01:12+02:00 Il serait intéressant de permettre l'absence de base déclarée par défaut - See #2293 (update doc) - - - - - 0d5a7baa by Tony Chemit at 2022-09-01T11:55:46+02:00 Erreur de type de mesure sur les échantillons AVDTH migrés - Closes #2427 - - - - - d39cba11 by Tony Chemit at 2022-09-02T19:04:58+02:00 UI de gestion des associations espèce/océan pas disponible sur Océan - Closes #2366 - - - - - 048de6cf by Tony Chemit at 2022-09-02T19:04:58+02:00 Persistence - Close streams that are coming from database to release as soon as possible underlying resources - - - - - 7bdf5cac by Tony Chemit at 2022-09-02T19:07:12+02:00 Merge branch 'feature/features/ocean_and_species' into develop - - - - - 0b1099f7 by Tony Chemit at 2022-09-02T19:18:56+02:00 UI de gestion des associations espèce/océan pas disponible sur Océan - Closes #2366 - - - - - 60fe612d by Tony Chemit at 2022-09-02T19:21:27+02:00 Update changelog for v.9.0.7 [skip CI] - - - - - b73d1ded by Tony Chemit at 2022-09-03T08:02:13+02:00 La taille de la fenêtre de configuration de l'arbre de navigation tronque les boutons du bas si on passe du module PS vers LL - Closes #2340 - - - - - b1956fb5 by Tony Chemit at 2022-09-03T10:55:21+02:00 Connection manager, bases distantes, champs non visibles sous Windows - Closes #2381 - - - - - 6711ea52 by Tony Chemit at 2022-09-07T08:38:46+02:00 Persistence - See logs from TopiSqlService (show us the location of generation script, can help). - - - - - a1f64eb7 by Tony Chemit at 2022-09-07T08:41:24+02:00 Dto - use getId() in equals and hashcode methods (DataGroupDto are based on it, not on this.id) - - - - - 7fd256c4 by Tony Chemit at 2022-09-07T08:43:29+02:00 Dto - introduce BusinessProject.getBusinessModuleByName method - - - - - 60789a1d by Tony Chemit at 2022-09-07T08:43:29+02:00 Dto - introduce ModuleGroupByHelper - - - - - e53e2ef6 by Tony Chemit at 2022-09-07T15:11:13+02:00 Dto decorator - introduce DataGroupByDecoratorDefinitionForSearch (for search purpose) - - - - - 5da26abf by Tony Chemit at 2022-09-07T15:11:13+02:00 Dto decorator - make long property sortable in decorator API - - - - - 8bcffb77 by Tony Chemit at 2022-09-11T14:44:05+02:00 Client - Mise en place de l'action de recherche/création de marée (Closes #2223) - - - - - 53eab20f by Tony Chemit at 2022-09-11T14:44:05+02:00 missing I18n declaration - - - - - 96aca2d4 by Tony Chemit at 2022-09-11T14:45:51+02:00 Merge branch 'feature/features/search_or_create_trip' into develop - - - - - 2a76de06 by Tony Chemit at 2022-09-11T17:53:48+02:00 Client - (on delete - reset) Bien gérer le repositionnement dans l'arbre de navigation d'une marée suite à une sauvegarde si le critère a été modifié (See #2225) - - - - - bd51e3a9 by Tony Chemit at 2022-09-11T18:11:06+02:00 Client - decorate missing groupBy node dto - See #2225 - - - - - e0df1a24 by Tony Chemit at 2022-09-11T18:17:39+02:00 Client - (on update) Bien gérer le repositionnement dans l'arbre de navigation d'une marée suite à une sauvegarde si le critère a été modifié (See #2225) - - - - - d685e4aa by Tony Chemit at 2022-09-11T18:17:48+02:00 Merge branch 'feature/features/navigation_tree_review_limit_cases' into develop Close #2225 - - - - - df376a3f by Tony Chemit at 2022-09-11T20:04:04+02:00 Update changelog for v.9.0.7 [skip CI] - - - - - 553ce875 by Tony Chemit at 2022-09-11T20:23:37+02:00 update hibernate - - - - - 355d696b by Tony Chemit at 2022-09-11T20:34:39+02:00 update pom - - - - - a9be2e1d by Tony Chemit at 2022-09-11T22:35:16+02:00 Problème lors d'un déplacement de toutes les données d'une marée Senne - Close #2428 - - - - - e6cebd5e by Tony Chemit at 2022-09-11T23:24:38+02:00 Persistence - Improve ReplicatePlan (required types should be replace when possible) - See #2428 - - - - - f2f53e78 by Tony Chemit at 2022-09-12T00:38:25+02:00 Merge branch 'feature/features/fix_replication_sql_2428' into develop - - - - - f78c8d38 by Tony Chemit at 2022-09-12T00:53:34+02:00 Update changelog for v.9.0.7 [skip CI] - - - - - d70d1afe by Tony Chemit at 2022-09-12T00:54:43+02:00 [jgitflow-maven-plugin]updating poms for 9.0.7 branch with snapshot versions[skip ci] - - - - - 23a31041 by Tony Chemit at 2022-09-12T00:56:41+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.7' with non-snapshot versions[skip ci] - - - - - 1c0b543a by Tony Chemit at 2022-09-12T01:43:25+02:00 [jgitflow-maven-plugin]merging 'release/9.0.7' into 'master' - - - - - 30 changed files: - CHANGELOG.md - client/configuration/pom.xml - client/configuration/src/main/config/Client.ini - client/configuration/src/main/filtered-resources/log4j2.xml - client/configuration/src/main/filtered-resources/observe-log4j2.xml - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/i18n/getters/java.getter - client/configuration/src/main/java/fr/ird/observe/client/ObServeSwingSessionConfig.java - + client/configuration/src/main/java/fr/ird/observe/client/ObserveSwingSession.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientResources.java - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/ClientUIContextApi.java - client/core/src/main/java/fr/ird/observe/client/ErrorHandler.java - client/core/src/main/java/fr/ird/observe/client/WithClientUIContextApi.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/action/FeedBackBuilder.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/action/FeedBackBuilderModel.java - client/core/src/main/java/fr/ird/observe/client/datasource/h2/backup/BackupsManager.java - client/core/src/main/java/fr/ird/observe/client/datasource/presets/actions/Create.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ClientValidationContext.java - client/core/src/main/java/fr/ird/observe/client/main/MainUIModel.java - client/core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx - client/core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java - client/core/src/main/java/fr/ird/observe/client/main/actions/ReloadApplicationAction.java - client/core/src/main/java/fr/ird/observe/client/main/actions/ShowAboutAction.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/main/callback/ReloadApplicationCallback.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6eba1a3cf450f066c52ecec3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6eba1a3cf450f066c52ecec3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: [jgitflow-maven-plugin]updating poms for 9.0.7 branch with snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) 11 Sep '22

11 Sep '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d70d1afe by Tony Chemit at 2022-09-12T00:54:43+02:00 [jgitflow-maven-plugin]updating poms for 9.0.7 branch with snapshot versions[skip ci] - - - - - 23a31041 by Tony Chemit at 2022-09-12T00:56:41+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.7' with non-snapshot versions[skip ci] - - - - - 1c0b543a by Tony Chemit at 2022-09-12T01:43:25+02:00 [jgitflow-maven-plugin]merging 'release/9.0.7' into 'master' - - - - - b2395ff0 by Tony Chemit at 2022-09-12T01:43:31+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 2a4d94be by Tony Chemit at 2022-09-12T01:43:32+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 4ce9e6ac by Tony Chemit at 2022-09-12T01:43:34+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/47d6ea6a1e0f4c20dd663aeb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/47d6ea6a1e0f4c20dd663aeb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.0.7)
by Tony CHEMIT (＠tchemit) 11 Sep '22

11 Sep '22

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 43ad45ec by Tony Chemit at 2022-09-12T01:43:21+02:00 Site checkin for project ObServe (version 9.0.7) - - - - - 2 changed files: - − 9.0.7-SNAPSHOT/changelog.html - − 9.0.7-SNAPSHOT/file-activity.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/43ad45eccb3d31539f0a6dfe1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/43ad45eccb3d31539f0a6dfe1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 9.0.8-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 11 Sep '22

11 Sep '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 47d6ea6a by Tony Chemit at 2022-09-12T00:54:46+02:00 [jgitflow-maven-plugin]updating poms for 9.0.8-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml - core/services/i18n/pom.xml - core/services/local/pom.xml - core/services/pom.xml - core/services/test/pom.xml - model/pom.xml - observe/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/47d6ea6a1e0f4c20dd663aeba… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/47d6ea6a1e0f4c20dd663aeba… You're receiving this email because of your account on gitlab.com.

1 0