This is an automated email from the git hooks/post-receive script. New commit to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git commit c4dcfe0a04fefb68752677012a4c8f3c4fdbeb41 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:05:00 2015 +0200 refs #6964 migration 4.0-RC3 pour ajouter les index sur fk manquants + regeneration de ces index via hibernate --- .../migration/AbstractDataSourceMigration.java | 5 +- .../DataSourceMigrationForVersion_4_0_RC3.java | 254 +++++++++++++++++++++ .../db/4.0-RC3/add-foreign-key-indexes-PG.sql | 44 ++++ .../src/main/xmi/observe-common.properties | 3 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 2 +- 6 files changed, 306 insertions(+), 4 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java index 19d34b2..4cfa18c 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java @@ -74,11 +74,14 @@ public abstract class AbstractDataSourceMigration extends TopiaMigrationCallback public static final Version V_3_15 = Versions.valueOf("3.15"); public static final Version V_3_16 = Versions.valueOf("3.16"); + public static final Version V_4_0_RC2 = Versions.valueOf("4.0-RC2"); + public static final Version V_4_0_RC3 = Versions.valueOf("4.0-RC3"); + /** Les versions de mise à jour disponibles. */ public static final Version[] availableVersions = new Version[]{ - V_3_1, V_3_5, V_3_7, V_3_8, V_3_9, V_3_10, V_3_11, V_3_12, V_3_14, V_3_15, V_3_16,V_4_0_RC2 + V_3_1, V_3_5, V_3_7, V_3_8, V_3_9, V_3_10, V_3_11, V_3_12, V_3_14, V_3_15, V_3_16, V_4_0_RC2, V_4_0_RC3 }; private static Supplier<ApplicationConfig> applicationConfigSupplier; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java new file mode 100644 index 0000000..e34b5b6 --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java @@ -0,0 +1,254 @@ +package fr.ird.observe.entities.migration.versions; + +import fr.ird.observe.entities.migration.AbstractDataSourceMigration; +import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.entities.migration.H2DataSourceMigration; +import fr.ird.observe.entities.migration.PGDataSourceMigration; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.jdbc.Work; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +/** + * Created on 4/16/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 4.0-RC3 + */ +public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObserveMigrationCallBack { + + /** Logger. */ + private static final Log log = LogFactory.getLog(DataSourceMigrationForVersion_4_0_RC3.class); + + protected abstract void addMissingForeignKeys(TopiaContextImplementor tx, List<String> queries) throws TopiaException; + + public DataSourceMigrationForVersion_4_0_RC3(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(AbstractDataSourceMigration.V_4_0_RC3, callBack, scriptSuffix); + } + + @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, + List<String> queries, + boolean showSql, + boolean showProgression) throws TopiaException { + + + addMissingForeignKeys(tx, queries); + + } + + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_0_RC3 { + + public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, H2DataSourceMigration.TYPE); + } + + @Override + protected void addMissingForeignKeys(TopiaContextImplementor tx, List<String> queries) { + // Nothing to do for h2 db + } + + } + + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_0_RC3 { + + public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, PGDataSourceMigration.TYPE); + } + + @Override + protected void addMissingForeignKeys(TopiaContextImplementor tx, List<String> queries) throws TopiaException { + + removeForeignKeyIndex(tx, queries, "OBSERVE_COMMON", "gear_gearcaracteristic", "gear"); + removeForeignKeyIndex(tx, queries, "OBSERVE_COMMON", "ocean_species", "species"); + removeForeignKeyIndex(tx, queries, "OBSERVE_COMMON", "species_specieslist", "speciesList"); + + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "activity", "trip"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "baitsComposition", "set"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "basket", "section"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "branchline", "basket"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "branchlinesComposition", "set"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "catch", "basket"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "catch", "branchline"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "catch_predator", "catch"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "catch", "section"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "catch", "set"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "encounter", "activity"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "floatlinesComposition", "set"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "hooksComposition", "set"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "mitigationtype_set", "set"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "section", "set"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "sensorUsed", "activity"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "sizeMeasure", "catch"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "species_tdr", "tdr"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "tdr", "basket"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "tdr", "branchline"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "tdrRecord", "basket"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "tdrRecord", "tdr"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "tdr", "section"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "tdr", "set"); + removeForeignKeyIndex(tx, queries, "OBSERVE_LONGLINE", "weightMeasure", "catch"); + + removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "activity_observedsystem", "activity"); + removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "activity", "route"); + removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "floatingObject", "activity"); + removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "gearUseFeaturesMeasurement", "gearUseFeatures"); + removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "gearUseFeatures", "trip"); + removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "nonTargetCatch", "set"); + removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "nonTargetLength", "nonTargetSample"); + removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "nonTargetSample", "set"); + removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "objectObservedSpecies", "floatingObject"); + removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "objectSchoolEstimate", "floatingObject"); + removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "route", "trip"); + removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "schoolEstimate", "set"); + removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "targetCatch", "set"); + removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "targetLength", "targetSample"); + removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "targetSample", "set"); + removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "transmittingBuoy", "floatingObject"); + + addScript("add-foreign-key-indexes", queries); + + } + + private void removeForeignKeyIndex(TopiaContextImplementor tx, final List<String> queries, final String schemaName, final String tableName, final String columnName) throws TopiaException { + + tx.getHibernate().doWork(new Work() { + + @Override + public void execute(Connection connection) throws SQLException { + + // get table oid + int oid = getTableOid(connection, schemaName, tableName); + + // get attribute num + int attNum = getAttributeNum(connection, oid, columnName); + + Set<Integer> indexIds = getIndexId(connection, oid, attNum); + + for (Integer indexId : indexIds) { + + String indexName = getIndexName(connection, indexId); + queries.add("DROP INDEX " + schemaName + "." + indexName + ";"); + + } + + } + + }); + + } + + protected Integer getTableOid(Connection connection, String schemaName, String tableName) throws SQLException { + + Integer oid = null; + + String sqlOid = "SELECT '" + schemaName + "." + tableName + "'::regclass::oid;"; + PreparedStatement ps = connection.prepareStatement(sqlOid); + try { + ResultSet set = ps.executeQuery(); + if (set.next()) { + oid = set.getInt(1); + if (log.isDebugEnabled()) + log.debug("found table oid " + schemaName + "." + tableName + ": " + oid); + } + } catch (Exception e) { + throw new SQLException("Could not obtain oid for table" + tableName, e); + } finally { + ps.close(); + } + + return oid; + + } + + protected Integer getAttributeNum(Connection connection, int oid, String columnName) throws SQLException { + + Integer attNum = null; + + String attNumSql = "SELECT attnum FROM pg_attribute WHERE attrelid = ? AND attname = ?"; + PreparedStatement ps = connection.prepareStatement(attNumSql); + ps.setInt(1, oid); + ps.setString(2, columnName.toLowerCase()); + try { + ResultSet set = ps.executeQuery(); + if (set.next()) { + attNum = set.getInt(1); + if (log.isDebugEnabled()) + log.debug("found attribute " + columnName + " attNum : " + attNum); + } + } catch (Exception e) { + throw new SQLException("Could not obtain attNum for column" + columnName, e); + } finally { + ps.close(); + } + + return attNum; + + } + + protected Set<Integer> getIndexId(Connection connection, int oid, int attNum) throws SQLException { + + Set<Integer> indexIds = new HashSet<Integer>(); + + String sql = "SELECT indexrelid FROM pg_index " + + "WHERE indrelid = ? " + + "AND indkey = '" + attNum + "' " + + "AND indisunique = FALSE " + + "AND indisprimary = FALSE;"; + PreparedStatement ps = connection.prepareStatement(sql); + ps.setInt(1, oid); +// ps.setString(2, String.valueOf(attNum)); + + try { + ResultSet set = ps.executeQuery(); + + while (set.next()) { + + indexIds.add(set.getInt(1)); + + } + } catch (Exception e) { + throw new SQLException("Could not obtain index Id unique for table oid " + oid + " and column attNum " + attNum, e); + } finally { + ps.close(); + } + return indexIds; + + } + + protected String getIndexName(Connection connection, int indexId) throws SQLException { + + String indexName = null; + + String sqlIndexName = "SELECT relname FROM pg_class WHERE oid = ?;"; + PreparedStatement ps = connection.prepareStatement(sqlIndexName); + ps.setInt(1, indexId); + try { + ResultSet set = ps.executeQuery(); + if (set.next()) { + indexName = set.getString(1); + } + } catch (Exception e) { + throw new SQLException("Could not obtain index name for indexId " + indexId, e); + } finally { + ps.close(); + } + + return indexName; + + } + + + } + + +} diff --git a/observe-entities/src/main/resources/db/4.0-RC3/add-foreign-key-indexes-PG.sql b/observe-entities/src/main/resources/db/4.0-RC3/add-foreign-key-indexes-PG.sql new file mode 100644 index 0000000..cc832ae --- /dev/null +++ b/observe-entities/src/main/resources/db/4.0-RC3/add-foreign-key-indexes-PG.sql @@ -0,0 +1,44 @@ +CREATE INDEX idx_observe_common_gear_gearcaracteristic_gear ON OBSERVE_COMMON.gear_gearcaracteristic(gear); +CREATE INDEX idx_observe_common_ocean_species_species ON OBSERVE_COMMON.ocean_species(species); +CREATE INDEX idx_observe_common_species_specieslist_specieslist ON OBSERVE_COMMON.species_specieslist(speciesList); +CREATE INDEX idx_observe_longline_activity_trip ON OBSERVE_LONGLINE.Activity(trip); +CREATE INDEX idx_observe_longline_baitscomposition_set ON OBSERVE_LONGLINE.baitsComposition(set); +CREATE INDEX idx_observe_longline_basket_section ON OBSERVE_LONGLINE.basket(section); +CREATE INDEX idx_observe_longline_branchline_basket ON OBSERVE_LONGLINE.branchline(basket); +CREATE INDEX idx_observe_longline_branchlinescomposition_set ON OBSERVE_LONGLINE.branchlinesComposition(set); +CREATE INDEX idx_observe_longline_catch_basket ON OBSERVE_LONGLINE.Catch(basket); +CREATE INDEX idx_observe_longline_catch_branchline ON OBSERVE_LONGLINE.Catch(branchline); +CREATE INDEX idx_observe_longline_catch_predator_catch ON OBSERVE_LONGLINE.catch_predator(catch); +CREATE INDEX idx_observe_longline_catch_section ON OBSERVE_LONGLINE.Catch(section); +CREATE INDEX idx_observe_longline_catch_set ON OBSERVE_LONGLINE.Catch(set); +CREATE INDEX idx_observe_longline_encounter_activity ON OBSERVE_LONGLINE.encounter(activity); +CREATE INDEX idx_observe_longline_floatlinescomposition_set ON OBSERVE_LONGLINE.floatlinesComposition(set); +CREATE INDEX idx_observe_longline_hookscomposition_set ON OBSERVE_LONGLINE.hooksComposition(set); +CREATE INDEX idx_observe_longline_mitigationtype_set_set ON OBSERVE_LONGLINE.mitigationtype_set(set); +CREATE INDEX idx_observe_longline_section_set ON OBSERVE_LONGLINE.section(set); +CREATE INDEX idx_observe_longline_sensorused_activity ON OBSERVE_LONGLINE.sensorUsed(activity); +CREATE INDEX idx_observe_longline_sizemeasure_catch ON OBSERVE_LONGLINE.sizeMeasure(catch); +CREATE INDEX idx_observe_longline_species_tdr_tdr ON OBSERVE_LONGLINE.species_tdr(tdr); +CREATE INDEX idx_observe_longline_tdr_basket ON OBSERVE_LONGLINE.tdr(basket); +CREATE INDEX idx_observe_longline_tdr_branchline ON OBSERVE_LONGLINE.tdr(branchline); +CREATE INDEX idx_observe_longline_tdrrecord_basket ON OBSERVE_LONGLINE.tdrRecord(basket); +CREATE INDEX idx_observe_longline_tdrrecord_tdr ON OBSERVE_LONGLINE.tdrRecord(tdr); +CREATE INDEX idx_observe_longline_tdr_section ON OBSERVE_LONGLINE.tdr(section); +CREATE INDEX idx_observe_longline_tdr_set ON OBSERVE_LONGLINE.tdr(set); +CREATE INDEX idx_observe_longline_weightmeasure_catch ON OBSERVE_LONGLINE.weightMeasure(catch); +CREATE INDEX idx_observe_seine_activity_observedsystem_activity ON OBSERVE_SEINE.activity_observedsystem(activity); +CREATE INDEX idx_observe_seine_activity_route ON OBSERVE_SEINE.Activity(route); +CREATE INDEX idx_observe_seine_floatingobject_activity ON OBSERVE_SEINE.floatingObject(activity); +CREATE INDEX idx_observe_seine_gearusefeaturesmeasurement_gearusefeatures ON OBSERVE_SEINE.GearUseFeaturesMeasurement(gearUseFeatures); +CREATE INDEX idx_observe_seine_gearusefeatures_trip ON OBSERVE_SEINE.GearUseFeatures(trip); +CREATE INDEX idx_observe_seine_nontargetcatch_set ON OBSERVE_SEINE.nonTargetCatch(set); +CREATE INDEX idx_observe_seine_nontargetlength_nontargetsample ON OBSERVE_SEINE.nonTargetLength(nonTargetSample); +CREATE INDEX idx_observe_seine_nontargetsample_set ON OBSERVE_SEINE.nonTargetSample(set); +CREATE INDEX idx_observe_seine_objectobservedspecies_floatingobject ON OBSERVE_SEINE.objectObservedSpecies(floatingObject); +CREATE INDEX idx_observe_seine_objectschoolestimate_floatingobject ON OBSERVE_SEINE.objectSchoolEstimate(floatingObject); +CREATE INDEX idx_observe_seine_route_trip ON OBSERVE_SEINE.route(trip); +CREATE INDEX idx_observe_seine_schoolestimate_set ON OBSERVE_SEINE.schoolEstimate(set); +CREATE INDEX idx_observe_seine_targetcatch_set ON OBSERVE_SEINE.targetCatch(set); +CREATE INDEX idx_observe_seine_targetlength_targetsample ON OBSERVE_SEINE.targetLength(targetSample); +CREATE INDEX idx_observe_seine_targetsample_set ON OBSERVE_SEINE.targetSample(set); +CREATE INDEX idx_observe_seine_transmittingbuoy_floatingobject ON OBSERVE_SEINE.transmittingBuoy(floatingObject); \ No newline at end of file diff --git a/observe-entities/src/main/xmi/observe-common.properties b/observe-entities/src/main/xmi/observe-common.properties index 23d3817..03a55d1 100644 --- a/observe-entities/src/main/xmi/observe-common.properties +++ b/observe-entities/src/main/xmi/observe-common.properties @@ -19,10 +19,11 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -model.tagvalue.version=4.0-RC2 +model.tagvalue.version=4.0-RC3 model.tagvalue.notGenerateToString=true model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.generateStandaloneEnumForDAOHelper=true +model.tagvalue.indexForeignKeys=true model.tagvalue.String=java.lang.String model.tagvalue.Float=java.lang.Float model.tagvalue.Integer=java.lang.Integer diff --git a/observe-entities/src/main/xmi/observe-longline.properties b/observe-entities/src/main/xmi/observe-longline.properties index b13b38b..8f10a54 100644 --- a/observe-entities/src/main/xmi/observe-longline.properties +++ b/observe-entities/src/main/xmi/observe-longline.properties @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -model.tagvalue.version=4.0-RC2 +model.tagvalue.version=4.0-RC3 model.tagvalue.notGenerateToString=true model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.generateStandaloneEnumForDAOHelper=true diff --git a/observe-entities/src/main/xmi/observe-seine.properties b/observe-entities/src/main/xmi/observe-seine.properties index 88335fb..ced24c5 100644 --- a/observe-entities/src/main/xmi/observe-seine.properties +++ b/observe-entities/src/main/xmi/observe-seine.properties @@ -20,7 +20,7 @@ # #L% ### -model.tagvalue.version=4.0-RC2 +model.tagvalue.version=4.0-RC3 model.tagvalue.notGenerateToString=true model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.generateStandaloneEnumForDAOHelper=true -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git commit 1df36b03a392cd49ea0032c46031913805772008 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:13:00 2015 +0200 refs #6978 ajout icone pour l'action de consolidation des données --- observe-swing/src/main/filters/observe-ui.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/observe-swing/src/main/filters/observe-ui.properties b/observe-swing/src/main/filters/observe-ui.properties index 3f20f51..c773355 100644 --- a/observe-swing/src/main/filters/observe-ui.properties +++ b/observe-swing/src/main/filters/observe-ui.properties @@ -92,6 +92,7 @@ icon.action.data-calcule=action-data-calcule.png icon.action.numbereditor-reset=action-numbereditor-reset.png icon.action.numbereditor-calculator=action-numbereditor-calculator.png icon.action.config=action-config.png +icon.action.consolidate=action-data-calcule.png icon.action.connected=action-connected.png icon.action.connect_creating=action-connect_creating.png icon.action.connect_untested=action-connect_untested.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git commit d010e19d6600c1eca3659907b4d201dc351ea996 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:35:58 2015 +0200 refs #6983 Ajout migration de usedInTrip pour l'engin Senne pour toutes les marées de type senne --- .../migration/versions/DataSourceMigrationForVersion_4_0_RC3.java | 5 ++++- .../main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql | 1 + .../main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java index e34b5b6..b8e7dec 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java @@ -42,8 +42,12 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse boolean showProgression) throws TopiaException { + // See https://forge.codelutin.com/issues/6964 addMissingForeignKeys(tx, queries); + // See https://forge.codelutin.com/issues/6983 + loadScript("update-senne-gear-usedInTrip"); + } public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_0_RC3 { @@ -206,7 +210,6 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse "AND indisprimary = FALSE;"; PreparedStatement ps = connection.prepareStatement(sql); ps.setInt(1, oid); -// ps.setString(2, String.valueOf(attNum)); try { ResultSet set = ps.executeQuery(); diff --git a/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql b/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql new file mode 100644 index 0000000..cbf6f71 --- /dev/null +++ b/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql @@ -0,0 +1 @@ +UPDATE observe_seine.gearusefeatures SET usedintrip = true WHERE gear = 'fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20'; \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql b/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql new file mode 100644 index 0000000..cbf6f71 --- /dev/null +++ b/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql @@ -0,0 +1 @@ +UPDATE observe_seine.gearusefeatures SET usedintrip = true WHERE gear = 'fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20'; \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git commit 4dfb4f08ab5bce434dbae1f9c2efef2d14200aa5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 20:41:43 2015 +0200 refs #6976 Add default measurements when creating a new gearusefeature --- .../src/main/java/fr/ird/observe/DataService.java | 28 ++++++++++++++++ .../impl/seine/GearUseFeaturesSeineTableModel.java | 37 ++++++++++++++++++++-- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 20 ++++++++++++ .../EditableTableWithCacheTableModelSupport.java | 4 +-- 4 files changed, 84 insertions(+), 5 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/DataService.java b/observe-business/src/main/java/fr/ird/observe/DataService.java index 41739e6..de1b1f3 100644 --- a/observe-business/src/main/java/fr/ird/observe/DataService.java +++ b/observe-business/src/main/java/fr/ird/observe/DataService.java @@ -53,6 +53,8 @@ import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineDAO; import fr.ird.observe.entities.longline.WeightMeasure; import fr.ird.observe.entities.longline.WeightMeasureImpl; +import fr.ird.observe.entities.referentiel.Gear; +import fr.ird.observe.entities.referentiel.GearCaracteristic; import fr.ird.observe.entities.referentiel.LengthWeightParameter; import fr.ird.observe.entities.referentiel.LengthWeightParemeterHelper; import fr.ird.observe.entities.referentiel.Ocean; @@ -1592,6 +1594,32 @@ public class DataService { } } + public List<GearUseFeaturesMeasurementSeine> getDefaultGearUseFeaturesMeasurementSeine(DataSource source, String gearId) throws DataSourceException { + + String txName = "getDefaultGearUseFeaturesMeasurementSeine : " + gearId; + TopiaContext tx = beginTransaction(source, txName); + try { + + TopiaDAO<Gear> gearDao = source.getDAO(tx, Gear.class); + Gear gear = gearDao.findByTopiaId(gearId); + + Collection<GearCaracteristic> gearCaracteristic = gear.getGearCaracteristic(); + List<GearUseFeaturesMeasurementSeine> result = new ArrayList<GearUseFeaturesMeasurementSeine>(); + for (GearCaracteristic caracteristic : gearCaracteristic) { + GearUseFeaturesMeasurementSeine target = new GearUseFeaturesMeasurementSeineImpl(); + target.setGearCaracteristic(caracteristic); + result.add(target); + } + + return result; + + } catch (TopiaException e) { + throw new DataSourceException(e, txName); + } finally { + closeTransaction(source, tx, txName); + } + } + public List<GearUseFeaturesMeasurementSeine> getGearUseFeaturesMeasurementSeine(DataSource source, GearUseFeaturesSeine bean, final TopiaEntityBinder<GearUseFeaturesMeasurementSeine> binder) throws DataSourceException { String txName = "getGearUseFeaturesMeasurementSeine : " + bean.getTopiaId(); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java index 5f79632..07a7b24 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java @@ -22,11 +22,14 @@ package fr.ird.observe.ui.content.table.impl.seine; * #L% */ +import fr.ird.observe.entities.referentiel.Gear; +import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ObserveContentTableUI; +import org.apache.commons.collections4.CollectionUtils; import java.util.List; @@ -40,11 +43,17 @@ public class GearUseFeaturesSeineTableModel extends ContentTableModel<TripSeine, private static final long serialVersionUID = 1L; + private GearUseFeaturesSeineUIHandler gearUseFeaturesSeineUIHandler; + public GearUseFeaturesSeineTableModel(ObserveContentTableUI<TripSeine, GearUseFeaturesSeine> context, List<ContentTableMeta<GearUseFeaturesSeine>> contentTableMetas) { super(context, contentTableMetas); } + public void setGearUseFeaturesSeineUIHandler(GearUseFeaturesSeineUIHandler gearUseFeaturesSeineUIHandler) { + this.gearUseFeaturesSeineUIHandler = gearUseFeaturesSeineUIHandler; + } + @Override public void addNewEntry() { @@ -67,12 +76,34 @@ public class GearUseFeaturesSeineTableModel extends ContentTableModel<TripSeine, super.updateRowFromEditBean(); - // store sizes and weights for the selected row + GearUseFeaturesSeineUIModel model = getModel(); int editingRow = getSelectedRow(); + GearUseFeaturesSeine rowBean = getRowBean(); + GearUseFeaturesMeasurementSeinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); - GearUseFeaturesSeineUIModel model = getModel(); - model.getMeasurementsTableModel().storeInCacheForRow(editingRow); + if (rowBean.getTopiaId() == null && CollectionUtils.isEmpty(measurementsTableModel.getCacheForRow(editingRow))) { + + // new gear usage, add default measurements + + Gear gear = rowBean.getGear(); + List<GearUseFeaturesMeasurementSeine> measurements = + gearUseFeaturesSeineUIHandler.getDefaultGearUseFeaturesMeasurementSeine(gear.getTopiaId()); + if (log.isInfoEnabled()) { + log.info("Create mode, use default measurements: " + measurements.size()); + } + measurementsTableModel.removeCacheForRow(editingRow); + measurementsTableModel.initCacheForRow(editingRow, measurements); + + measurementsTableModel.setData(measurements); + measurementsTableModel.setModified(false); + + } else { + + // store current measurements for the selected row + measurementsTableModel.storeInCacheForRow(editingRow); + + } } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index baa9c9b..e97d570 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -277,6 +277,8 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei setTableModelEditable(getModel().isEditable()); + getTableModel().setGearUseFeaturesSeineUIHandler(this); + } @Override @@ -330,7 +332,12 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei super.startEditUI(binding); + } + + @Override + protected TripSeine onCreate(TopiaContext tx, Object parentBean, TripSeine editBean) throws TopiaException { + return super.onCreate(tx, parentBean, editBean); } @Override @@ -470,4 +477,17 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } + public List<GearUseFeaturesMeasurementSeine> getDefaultGearUseFeaturesMeasurementSeine(String gearId) { + + try { + List<GearUseFeaturesMeasurementSeine> measurements = getDataService().getDefaultGearUseFeaturesMeasurementSeine(getDataSource(), gearId); + if (log.isInfoEnabled()) { + log.info("Create mode, use default measurements: " + measurements.size()); + } + return measurements; + } catch (DataSourceException e) { + throw new ObserveTechnicalException("Could not create default measurements", e); + } + + } } \ No newline at end of file diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableWithCacheTableModelSupport.java b/observe-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableWithCacheTableModelSupport.java index 7a8a23a..54f2cc1 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableWithCacheTableModelSupport.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableWithCacheTableModelSupport.java @@ -74,7 +74,7 @@ public abstract class EditableTableWithCacheTableModelSupport<E extends TopiaEnt public void initCacheForRow(int editingRow, List<E> data) { EditableList<E> editableList = cacheByRow.get(editingRow); - Preconditions.checkState(editableList == null); + Preconditions.checkState(editableList == null, "Cant have a list for row: " + editingRow); editableList = new EditableList<E>(); // Get a copy of the list (to avoid to edit the content of the list) @@ -89,7 +89,7 @@ public abstract class EditableTableWithCacheTableModelSupport<E extends TopiaEnt List<E> measures = getData(); EditableList<E> editableList = cacheByRow.get(editingRow); - Preconditions.checkState(editableList != null); + Preconditions.checkState(editableList != null, "No list found for row: " + editingRow); editableList.setData(measures); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git commit 6dc7d9af6cb3b4da3de6730d7bdb725a5ad022f8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 23:08:02 2015 +0200 refs #6988 bien réinitilisé le quadrant sur les écrans d'activité --- .../open/impl/longline/ActivityLonglineUIHandler.java | 16 ++++++++++++++++ .../content/open/impl/seine/ActivitySeineUIHandler.java | 15 +++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java index 5e575d1..b5cef09 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -65,6 +65,7 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity n("observe.common.longitude"); } + public ActivityLonglineUIHandler(ActivityLonglineUI ui) { super(ui, DataContextType.TripLongline, @@ -124,6 +125,8 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity public void openUI() throws Exception { super.openUI(); + resetQuadrant(getUi().getCoordinatesEditor()); + String tripId = getSelectedParentId(); String activityId = getSelectedId(); @@ -172,6 +175,19 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity } @Override + protected void onLoad(TopiaContext tx, ActivityLongline bean) throws TopiaException { + + Float latitude = bean.getLatitude(); + Float longitude = bean.getLongitude(); + + super.onLoad(tx, bean); + + getBean().setLatitude(latitude); + getBean().setLongitude(longitude); + + } + + @Override protected ActivityLongline onPreCreate(TopiaContext tx, Object parent, ActivityLongline bean) throws TopiaException { TripLongline parentBean = (TripLongline) parent; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java index 8497a03..19608ea 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -159,6 +159,8 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei public void openUI() throws Exception { super.openUI(); + resetQuadrant(getUi().getCoordinatesEditor()); + String routeId = getSelectedParentId(); String activityId = getSelectedId(); @@ -212,6 +214,19 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei } @Override + protected void onLoad(TopiaContext tx, ActivitySeine bean) throws TopiaException { + + Float latitude = bean.getLatitude(); + Float longitude = bean.getLongitude(); + + super.onLoad(tx, bean); + + getBean().setLatitude(latitude); + getBean().setLongitude(longitude); + + } + + @Override protected ActivitySeine onPreCreate(TopiaContext tx, Object parent, ActivitySeine bean) throws TopiaException { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git commit 9753766c2daa88bfe4af98d92695ff5e1f1e1b05 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 17 11:40:45 2015 +0200 refs #6475 revue de la décoration des calées --- .../src/main/java/fr/ird/observe/DecoratorService.java | 2 ++ .../ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java | 10 ++++++++++ .../ui/tree/loadors/ActivityLonglineNodeChildLoador.java | 1 + .../observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java | 1 + .../src/main/resources/i18n/observe-swing_en_GB.properties | 2 ++ .../src/main/resources/i18n/observe-swing_es_ES.properties | 2 ++ .../src/main/resources/i18n/observe-swing_fr_FR.properties | 8 +++++--- 7 files changed, 23 insertions(+), 3 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/DecoratorService.java b/observe-business/src/main/java/fr/ird/observe/DecoratorService.java index 3d67720..851106b 100644 --- a/observe-business/src/main/java/fr/ird/observe/DecoratorService.java +++ b/observe-business/src/main/java/fr/ird/observe/DecoratorService.java @@ -423,7 +423,9 @@ public class DecoratorService extends DecoratorProvider { registerMultiJXPathDecorator( FloatingObject.class, "DCP ${objectType/" + libelle + "}$s", "##", " - "); + //FIXME Remove this registerJXPathDecorator(SetSeine.class, t("observe.common.setSeine")); + //FIXME Remove this registerJXPathDecorator(SetLongline.class, t("observe.common.setLongline")); registerDefaultReferenceEntityDecorator(ObjectFate.class, libelle); registerDefaultReferenceEntityDecorator(Organism.class, libelle); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java index d7e16d7..0886000 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java @@ -278,6 +278,16 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel return text; } + if (node instanceof SetLonglineNode) { + String text = t("observe.tree.setLongline"); + return text; + } + + if (node instanceof SetSeineNode) { + String text = t("observe.tree.setSeine"); + return text; + } + if (node instanceof EntityNodeSupport) { EntityNodeSupport entityNodeSupport = (EntityNodeSupport) node; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java index c29fd4f..205c074 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java @@ -50,6 +50,7 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Str static { n("observe.tree.encounter"); n("observe.tree.sensorUsed"); + n("observe.tree.setLongline"); } public ActivityLonglineNodeChildLoador() { diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java index 6b69659..2144200 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java @@ -50,6 +50,7 @@ public class ActivitySeineNodeChildLoador extends AbstractNodeChildLoador<Floati static { n("observe.common.observedSystem"); + n("observe.tree.setSeine"); } public ActivitySeineNodeChildLoador() { diff --git a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties index be9bfb3..8d9da57 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties @@ -2035,7 +2035,9 @@ observe.tree.sensorBrand=Sensor brand observe.tree.sensorDataFormat=Sensor data format observe.tree.sensorType=Sensor type observe.tree.sensorUsed=Sensor used +observe.tree.setLongline= observe.tree.setLongline.unsaved=New fishing operation +observe.tree.setSeine= observe.tree.setSeine.unsaved=New set observe.tree.settingShape=Setting shape observe.tree.sex=Sex diff --git a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties index 8a8a625..8650cf9 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties @@ -2035,7 +2035,9 @@ observe.tree.sensorBrand= observe.tree.sensorDataFormat= observe.tree.sensorType= observe.tree.sensorUsed= +observe.tree.setLongline= observe.tree.setLongline.unsaved=Nuevo Lance +observe.tree.setSeine= observe.tree.setSeine.unsaved=Nuevo Lance observe.tree.settingShape= observe.tree.sex=Sexo diff --git a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties index 80767a6..f91c6b9 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties @@ -1101,7 +1101,7 @@ observe.init.local.db.detected=%1$s détectée. observe.init.no.initial.dump.detected=Base embarquée %1$s non détectée. observe.init.no.local.db.detected=Base locale %1$s non détectée. observe.init.storage.done=Initialisation du service de persistance terminé. -observe.label.coefficients.info=Les coefficients des relations sont de la forme nom=valeur et sont séparé par des : (exemple : a=1:b=2:c=3) +observe.label.coefficients.info=Les coefficients des relations sont de la forme nom\=valeur et sont séparé par des \: (exemple \: a\=1\:b\=2\:c\=3) observe.label.lengthWeightFormula.info=La relation poids permet de calculer le poids à partir de la taille, elle doit contenir la variable L observe.label.usage.data.title=Donnée '%1$s' (%2$d occurrences) observe.label.usage.referentiel.title=Référentiel '%1$s' (%2$d occurrences) @@ -2004,7 +2004,7 @@ observe.tree.lengthWeightParameter=Relation Taille-Poids observe.tree.lightsticksColor=Couleur de baton lumineux observe.tree.lightsticksType=Type de baton lumineux observe.tree.lineType=Type de ligne -observe.tree.longlineDetailComposition=Schmé de palangre +observe.tree.longlineDetailComposition=Schéma de palangre observe.tree.longlineGlobalComposition=Composition observe.tree.maturityStatus=Maturité observe.tree.mitigationType=Type de mesure d'atténuation @@ -2033,7 +2033,9 @@ observe.tree.sensorBrand=Marque de capteur observe.tree.sensorDataFormat=Format de données de capteur observe.tree.sensorType=Type de capteur observe.tree.sensorUsed=Capteurs utilisés +observe.tree.setLongline=Détails de l'opération observe.tree.setLongline.unsaved=Nouvelle opération de pêche +observe.tree.setSeine=Calée observe.tree.setSeine.unsaved=Nouvelle calée observe.tree.settingShape=Forme au filage observe.tree.sex=Sexe @@ -2049,7 +2051,7 @@ observe.tree.targetCatch=Capture cible observe.tree.targetDiscarded=Rejet de thon observe.tree.targetSample=Echantillon thon rejeté observe.tree.targetSampleCapture=Echantillon thon capturé -observe.tree.tdr=Enregistreur de profondeur +observe.tree.tdr=Enregistreurs de profondeur observe.tree.transmittingBuoyOperation=Opération balise observe.tree.transmittingBuoyType=Type de balise observe.tree.tripLongline.unsaved=Nouvelle marée -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git commit 42101d5f2b5607c97382389d6d41c249bb6ac16b Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 17 11:47:07 2015 +0200 refs #6991 ajout migration pour renommage du palangrier inconnu --- .../migration/versions/DataSourceMigrationForVersion_4_0_RC3.java | 3 +++ .../src/main/resources/db/4.0-RC3/rename-unknown-longliner-H2.sql | 1 + .../src/main/resources/db/4.0-RC3/rename-unknown-longliner-PG.sql | 1 + 3 files changed, 5 insertions(+) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java index b8e7dec..7aef878 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java @@ -48,6 +48,9 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse // See https://forge.codelutin.com/issues/6983 loadScript("update-senne-gear-usedInTrip"); + // See https://forge.codelutin.com/issues/6991 + loadScript("rename-unknown-longliner"); + } public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_0_RC3 { diff --git a/observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-H2.sql b/observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-H2.sql new file mode 100644 index 0000000..c952588 --- /dev/null +++ b/observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-H2.sql @@ -0,0 +1 @@ +UPDATE OBSERVE_COMMON.VESSEL SET LABEL2= 'Palengrier inconnu', TOPIAVERSION = TOPIAVERSION + 1 WHERE TOPIAID ='fr.ird.observe.entities.referentiel.Vessel#1239832686129#0.1'; \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-PG.sql b/observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-PG.sql new file mode 100644 index 0000000..c952588 --- /dev/null +++ b/observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-PG.sql @@ -0,0 +1 @@ +UPDATE OBSERVE_COMMON.VESSEL SET LABEL2= 'Palengrier inconnu', TOPIAVERSION = TOPIAVERSION + 1 WHERE TOPIAID ='fr.ird.observe.entities.referentiel.Vessel#1239832686129#0.1'; \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git commit 30befff0acb8f567ce04e71aa3a39e711625438a Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 17 12:04:29 2015 +0200 use last release of topia --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e5146cd..ed58d3f 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ <eugenePluginVersion>2.14</eugenePluginVersion> - <topiaVersion>2.10-SNAPSHOT</topiaVersion> + <topiaVersion>2.9.5.2</topiaVersion> <jaxxVersion>2.23</jaxxVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0</nuitonValidatorVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git commit 055b7340e3cb115964f36032eaa328c13dc4f69a Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:36:11 2015 +0000 add missing license headers --- .../DataSourceMigrationForVersion_4_0_RC3.java | 22 ++++++++++++++++++++++ .../db/4.0-RC3/add-foreign-key-indexes-PG.sql | 21 +++++++++++++++++++++ .../db/4.0-RC3/rename-unknown-longliner-H2.sql | 21 +++++++++++++++++++++ .../db/4.0-RC3/rename-unknown-longliner-PG.sql | 21 +++++++++++++++++++++ .../db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql | 21 +++++++++++++++++++++ .../db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql | 21 +++++++++++++++++++++ 6 files changed, 127 insertions(+) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java index 7aef878..80dd421 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java @@ -1,5 +1,27 @@ package fr.ird.observe.entities.migration.versions; +/* + * #%L + * ObServe :: Entities + * %% + * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; diff --git a/observe-entities/src/main/resources/db/4.0-RC3/add-foreign-key-indexes-PG.sql b/observe-entities/src/main/resources/db/4.0-RC3/add-foreign-key-indexes-PG.sql index cc832ae..dfedff2 100644 --- a/observe-entities/src/main/resources/db/4.0-RC3/add-foreign-key-indexes-PG.sql +++ b/observe-entities/src/main/resources/db/4.0-RC3/add-foreign-key-indexes-PG.sql @@ -1,3 +1,24 @@ +--- +-- #%L +-- ObServe :: Entities +-- %% +-- Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- CREATE INDEX idx_observe_common_gear_gearcaracteristic_gear ON OBSERVE_COMMON.gear_gearcaracteristic(gear); CREATE INDEX idx_observe_common_ocean_species_species ON OBSERVE_COMMON.ocean_species(species); CREATE INDEX idx_observe_common_species_specieslist_specieslist ON OBSERVE_COMMON.species_specieslist(speciesList); diff --git a/observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-H2.sql b/observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-H2.sql index c952588..0aaa32f 100644 --- a/observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-H2.sql +++ b/observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-H2.sql @@ -1 +1,22 @@ +--- +-- #%L +-- ObServe :: Entities +-- %% +-- Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- UPDATE OBSERVE_COMMON.VESSEL SET LABEL2= 'Palengrier inconnu', TOPIAVERSION = TOPIAVERSION + 1 WHERE TOPIAID ='fr.ird.observe.entities.referentiel.Vessel#1239832686129#0.1'; \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-PG.sql b/observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-PG.sql index c952588..0aaa32f 100644 --- a/observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-PG.sql +++ b/observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-PG.sql @@ -1 +1,22 @@ +--- +-- #%L +-- ObServe :: Entities +-- %% +-- Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- UPDATE OBSERVE_COMMON.VESSEL SET LABEL2= 'Palengrier inconnu', TOPIAVERSION = TOPIAVERSION + 1 WHERE TOPIAID ='fr.ird.observe.entities.referentiel.Vessel#1239832686129#0.1'; \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql b/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql index ee284e0..f39c6a5 100644 --- a/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql +++ b/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql @@ -1 +1,22 @@ +--- +-- #%L +-- ObServe :: Entities +-- %% +-- Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- UPDATE observe_seine.gearusefeatures SET usedintrip = true, topiaversion = topiaversion + 1 WHERE gear = 'fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20'; \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql b/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql index d8bbf3b..1f3d7eb 100644 --- a/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql +++ b/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql @@ -1 +1,22 @@ +--- +-- #%L +-- ObServe :: Entities +-- %% +-- Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- UPDATE observe_seine.gearusefeatures SET usedintrip = true , topiaversion = topiaversion + 1 WHERE gear = 'fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20'; \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git commit 0618db0735425fda05cde3c194cd147462ffe76e Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:45:10 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/observe-business/pom.xml b/observe-business/pom.xml index 4fa3767..708e48d 100644 --- a/observe-business/pom.xml +++ b/observe-business/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC4-SNAPSHOT</version> + <version>4.0-RC3</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 9f42a77..de2c136 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC4-SNAPSHOT</version> + <version>4.0-RC3</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 538aca6..023d4ef 100644 --- a/observe-validation/pom.xml +++ b/observe-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC4-SNAPSHOT</version> + <version>4.0-RC3</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index 755e0d5..3a324fd 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ </parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> git + <artifactId>observe</artifactId> <version>4.0-RC4-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.