branch feature/majDependances-correctionAuDemarrage created (now 6c4c0f1)
This is an automated email from the git hooks/post-receive script. New change to branch feature/majDependances-correctionAuDemarrage in repository tutti. See http://git.codelutin.com/tutti.git at 6c4c0f1 dans la référence d'activityLongline il manquait la référence vers le setLongline. This branch includes the following new commits: new aa451cf Mise a jour des dépendances new 661bee7 correction des migration de base : - utiliser les script postgresql pour une base postgresql, - pour la tables de mise a jour, correction des types suite à leur changement de noms. new 68f7200 application de la sécurité (droit utilisateur) doit être fait base fermer new 6c4c0f1 dans la référence d'activityLongline il manquait la référence vers le setLongline. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 6c4c0f1960d4203d5ccb2289503fa4ca89d81a78 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Feb 29 16:29:50 2016 +0100 dans la référence d'activityLongline il manquait la référence vers le setLongline. commit 68f72002b76344aaeebd1c3828c1c5040bbda3d9 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Feb 29 16:28:15 2016 +0100 application de la sécurité (droit utilisateur) doit être fait base fermer commit 661bee7109a956e774c1d51ebf369db424933ba8 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Feb 29 16:26:49 2016 +0100 correction des migration de base : - utiliser les script postgresql pour une base postgresql, - pour la tables de mise a jour, correction des types suite à leur changement de noms. commit aa451cfe7f77fce310e0e16f1c36b2da4acd1031 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Feb 29 16:19:13 2016 +0100 Mise a jour des dépendances -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/majDependances-correctionAuDemarrage in repository tutti. See http://git.codelutin.com/tutti.git commit aa451cfe7f77fce310e0e16f1c36b2da4acd1031 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Feb 29 16:19:13 2016 +0100 Mise a jour des dépendances --- pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 79360d4..3ded9cd 100644 --- a/pom.xml +++ b/pom.xml @@ -121,19 +121,19 @@ <eugenePluginVersion>3.0-SNAPSHOT</eugenePluginVersion> <topiaVersion>3.1-SNAPSHOT</topiaVersion> - <jaxxVersion>2.28-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.28.2</jaxxVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0</nuitonValidatorVersion> <xworkVersion>2.3.24.1</xworkVersion> <hibernateVersion>4.3.11.Final</hibernateVersion> - <sl4jVersion>1.7.13</sl4jVersion> - <swingXVersion>1.6.4</swingXVersion> + <sl4jVersion>1.7.18</sl4jVersion> + <swingXVersion>1.6.5-1</swingXVersion> - <geoToolsVersion>14.1</geoToolsVersion> + <geoToolsVersion>14.2</geoToolsVersion> <webmotionVersion>2.5</webmotionVersion> <paranamerVersion>2.8</paranamerVersion> - <httpComponentsVersion>4.5.1</httpComponentsVersion> + <httpComponentsVersion>4.5.2</httpComponentsVersion> <!-- license header configuration --> <license.licenseName>gpl_v3</license.licenseName> @@ -238,7 +238,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.5</version> + <version>2.6.2</version> </dependency> <dependency> @@ -615,7 +615,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.0.1</version> + <version>3.1.0</version> <scope>provided</scope> </dependency> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/majDependances-correctionAuDemarrage in repository tutti. See http://git.codelutin.com/tutti.git commit 661bee7109a956e774c1d51ebf369db424933ba8 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Feb 29 16:26:49 2016 +0100 correction des migration de base : - utiliser les script postgresql pour une base postgresql, - pour la tables de mise a jour, correction des types suite à leur changement de noms. --- .../ird/observe/ObserveTopiaConfigurationFactory.java | 3 ++- .../V4_902_01_add_lastUpdateDate_table-H2.sql | 18 +++++++++--------- .../V4_902_01_add_lastUpdateDate_table-PG.sql | 18 +++++++++--------- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaConfigurationFactory.java b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaConfigurationFactory.java index 33f8796..ca7b1cb 100644 --- a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaConfigurationFactory.java +++ b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaConfigurationFactory.java @@ -25,6 +25,7 @@ package fr.ird.observe; import com.google.common.collect.ImmutableMap; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.ObserveMigrationEngine; +import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.jdbc.JdbcConfiguration; @@ -146,7 +147,7 @@ public class ObserveTopiaConfigurationFactory { } ImmutableMap<String, String> migrationServiceConfiguration = ImmutableMap.of( - ObserveMigrationEngine.MIGRATION_CALLBACK, H2DataSourceMigration.class.getName(), + ObserveMigrationEngine.MIGRATION_CALLBACK, h2Configuration ? H2DataSourceMigration.class.getName() : PGDataSourceMigration.class.getName(), ObserveMigrationEngine.MIGRATION_SHOW_PROGRESSION, String.valueOf(showMigrationProgression), ObserveMigrationEngine.MIGRATION_SHOW_SQL, String.valueOf(showMigrationSql) ); diff --git a/observe-entities/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-H2.sql b/observe-entities/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-H2.sql index 68ce124..3bac74a 100644 --- a/observe-entities/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-H2.sql +++ b/observe-entities/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-H2.sql @@ -37,14 +37,14 @@ INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastU INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.29', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.SurroundingActivity', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.30', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.31', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.TransmittingBuoyType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.32', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.VesselActivity', CURRENT_TIMESTAMP); +INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.32', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.33', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.WeightCategory', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.34', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.Wind', CURRENT_TIMESTAMP); -- Référentiel Palangre INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.35', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.BaitHaulingStatus', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.36', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.BaitSettingStatus', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.37', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.BaitType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.38', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.CatchFate', CURRENT_TIMESTAMP); +INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.38', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.CatchFateLongline', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.39', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.EncounterType', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.40', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.Healthness', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.41', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.HookPosition', CURRENT_TIMESTAMP); @@ -53,7 +53,7 @@ INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastU INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.44', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.ItemHorizontalPosition', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.45', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.ItemVerticalPosition', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.46', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.LightsticksColor', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.47', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.LightstickstTpe', CURRENT_TIMESTAMP); +INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.47', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.LightsticksType', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.48', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.LineType', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.49', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.MaturityStatus', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.50', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.MitigationType', CURRENT_TIMESTAMP); @@ -64,13 +64,13 @@ INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastU INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.55', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.SizeMeasureType', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.56', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.StomacFullness', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.57', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.TripType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.58', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.VesselActivity', CURRENT_TIMESTAMP); +INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.58', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.VesselActivityLongline', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.59', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.WeightMeasureType', CURRENT_TIMESTAMP); -- Data Senne INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.60', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.ActivitySeine', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.61', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.FloatingObject', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.62', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.GearUsefeaturesMeasurement', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.63', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.GearUsefeatures', CURRENT_TIMESTAMP); +INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.62', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.GearUsefeaturesMeasurementSeine', CURRENT_TIMESTAMP); +INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.63', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.GearUsefeaturesSeine', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.64', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.NonTargetCatch', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.65', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.NonTargetLength', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.66', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.NonTargetSample', CURRENT_TIMESTAMP); @@ -90,11 +90,11 @@ INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastU INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.79', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.Basket', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.80', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.Branchline', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.81', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.BranchlinesComposition', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.82', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.Catch', CURRENT_TIMESTAMP); +INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.82', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.CatchLongline', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.83', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.Encounter', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.84', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.FloatlinesComposition', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.85', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.GearUsefeatures', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.86', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.GearUsefeaturesMeasurement', CURRENT_TIMESTAMP); +INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.85', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.GearUsefeaturesLongline', CURRENT_TIMESTAMP); +INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.86', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.GearUsefeaturesMeasurementLongline', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.87', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.HooksComposition', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.88', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.Section', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.89', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.SensorUsed', CURRENT_TIMESTAMP); diff --git a/observe-entities/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-PG.sql b/observe-entities/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-PG.sql index a9e8aab..4975d0e 100644 --- a/observe-entities/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-PG.sql +++ b/observe-entities/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-PG.sql @@ -37,14 +37,14 @@ INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastU INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.29', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.SurroundingActivity', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.30', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.31', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.TransmittingBuoyType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.32', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.VesselActivity', CURRENT_TIMESTAMP); +INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.32', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.33', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.WeightCategory', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.34', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.seine.Wind', CURRENT_TIMESTAMP); -- Référentiel Palangre INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.35', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.BaitHaulingStatus', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.36', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.BaitSettingStatus', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.37', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.BaitType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.38', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.CatchFate', CURRENT_TIMESTAMP); +INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.38', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.CatchFateLongline', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.39', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.EncounterType', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.40', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.Healthness', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.41', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.HookPosition', CURRENT_TIMESTAMP); @@ -53,7 +53,7 @@ INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastU INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.44', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.ItemHorizontalPosition', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.45', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.ItemVerticalPosition', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.46', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.LightsticksColor', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.47', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.LightstickstTpe', CURRENT_TIMESTAMP); +INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.47', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.LightsticksType', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.48', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.LineType', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.49', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.MaturityStatus', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.50', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.MitigationType', CURRENT_TIMESTAMP); @@ -64,13 +64,13 @@ INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastU INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.55', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.SizeMeasureType', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.56', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.StomacFullness', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.57', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.TripType', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.58', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.VesselActivity', CURRENT_TIMESTAMP); +INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.58', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.VesselActivityLongline', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.59', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.referentiel.longline.WeightMeasureType', CURRENT_TIMESTAMP); -- Data Senne INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.60', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.ActivitySeine', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.61', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.FloatingObject', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.62', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.GearUsefeaturesMeasurement', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.63', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.GearUsefeatures', CURRENT_TIMESTAMP); +INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.62', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.GearUsefeaturesMeasurementSeine', CURRENT_TIMESTAMP); +INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.63', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.GearUsefeaturesSeine', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.64', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.NonTargetCatch', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.65', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.NonTargetLength', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.66', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.seine.NonTargetSample', CURRENT_TIMESTAMP); @@ -90,11 +90,11 @@ INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastU INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.79', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.Basket', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.80', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.Branchline', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.81', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.BranchlinesComposition', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.82', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.Catch', CURRENT_TIMESTAMP); +INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.82', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.CatchLongline', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.83', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.Encounter', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.84', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.FloatlinesComposition', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.85', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.GearUsefeatures', CURRENT_TIMESTAMP); -INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.86', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.GearUsefeaturesMeasurement', CURRENT_TIMESTAMP); +INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.85', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.GearUsefeaturesLongline', CURRENT_TIMESTAMP); +INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.86', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.GearUsefeaturesMeasurementLongline', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.87', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.HooksComposition', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.88', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.Section', CURRENT_TIMESTAMP); INSERT INTO OBSERVE_COMMON.LASTUPDATEDATE VALUES ('fr.ird.observe.entities.LastUpdateDate#1236861982132#0.89', 0, CURRENT_TIMESTAMP, 'fr.ird.observe.entities.longline.SensorUsed', CURRENT_TIMESTAMP); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/majDependances-correctionAuDemarrage in repository tutti. See http://git.codelutin.com/tutti.git commit 68f72002b76344aaeebd1c3828c1c5040bbda3d9 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Feb 29 16:28:15 2016 +0100 application de la sécurité (droit utilisateur) doit être fait base fermer --- .../fr/ird/observe/ui/storage/ObstunaAdminAction.java | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java index 6cf05e4..704f54f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java @@ -260,14 +260,7 @@ public enum ObstunaAdminAction { if (log.isInfoEnabled()) { log.info("Apply security..."); } - try { - dataSource.open(); - dataSource.applySecurity(users); - } finally { - if (dataSource.isOpen()) { - dataSource.close(); - } - } + dataSource.applySecurity(users); } }; } @@ -317,14 +310,7 @@ public enum ObstunaAdminAction { if (log.isInfoEnabled()) { log.info("Apply security..."); } - try { - dataSource.open(); - dataSource.applySecurity(users); - } finally { - if (dataSource.isOpen()) { - dataSource.close(); - } - } + dataSource.applySecurity(users); } }; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/majDependances-correctionAuDemarrage in repository tutti. See http://git.codelutin.com/tutti.git commit 6c4c0f1960d4203d5ccb2289503fa4ca89d81a78 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Feb 29 16:29:50 2016 +0100 dans la référence d'activityLongline il manquait la référence vers le setLongline. --- .../ird/observe/services/binder/data/ActivityLonglineBinder.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java index b9beb1a..443832c 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java @@ -6,6 +6,7 @@ import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.referential.FpaZoneDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; @@ -53,7 +54,8 @@ public class ActivityLonglineBinder extends DataBinderSupport<ActivityLongline, return toDataReference(entity, entity.getTimeStamp(), - getLabel(referentialLocale, entity.getVesselActivityLongline())); + getLabel(referentialLocale, entity.getVesselActivityLongline()), + toDataReference(referentialLocale, entity.getSetLongline(), SetLonglineDto.class)); } @@ -62,6 +64,7 @@ public class ActivityLonglineBinder extends DataBinderSupport<ActivityLongline, return toDataReference(dto, dto.getTimeStamp(), - getLabel(referentialLocale, dto.getVesselActivityLongline())); + getLabel(referentialLocale, dto.getVesselActivityLongline()), + dto.getSetLongline()); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm