branch develop updated (3598cb3 -> 4baf239)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 3598cb3 [jgitflow-maven-plugin]updating poms for 4.0-RC2-SNAPSHOT development new 83abb77 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds fcb6456 [maven-release-plugin] copy for tag observe-3.15.1 adds 2f5abad [jgitflow-maven-plugin]updating poms for branch '4.0-RC1' with snapshot versions new f5a7430 fix tests new b370ff0 add licenses headers new 6e2ec35 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC1' with non-snapshot versions new a723a7c Merge branch 'release/4.0-RC1' new 3d38290 Merge branch 'master' into develop new 4baf239 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 4baf2392b242783e96f8ced2a577641ec6c501b0 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 7 20:45:20 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 3d3829019209ae1b3473d1a0703aef5218963f11 Merge: 83abb77 a723a7c Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 7 20:45:19 2015 +0000 Merge branch 'master' into develop commit 83abb7739e17e797164bb674f03bd1adebb30011 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 7 20:45:18 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit a723a7c3b67f43ce1fc8a7d5166f1e52f18555fe Merge: fcb6456 6e2ec35 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 7 20:45:15 2015 +0000 Merge branch 'release/4.0-RC1' commit 6e2ec35ae990410eee9863b2837b98cc0441bea4 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 7 20:40:20 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC1' with non-snapshot versions commit b370ff07766d7abbc686f67153305f044c8838fe Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 7 20:40:04 2015 +0000 add licenses headers commit f5a7430eea21e62671d9cc7390db4e727214032f Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 7 20:39:54 2015 +0000 fix tests Summary of changes: .../its/replication/AbstractReplicateDataTest.java | 7 ++++++- .../replication/H2LonglineReplicateDataTest.java | 23 ++++++++++++++++++++++ .../its/replication/ReplicationDataModel.java | 22 +++++++++++++++++++++ .../observe/entities/longline/TripLonglines.java | 22 +++++++++++++++++++++ .../DataSourceMigrationForVersion_3_16.java | 22 +++++++++++++++++++++ .../referentiel/GearCaracteristicTypes.java | 22 +++++++++++++++++++++ .../main/resources/db/3.16/add-gear-data-H2.sql | 21 ++++++++++++++++++++ .../main/resources/db/3.16/add-gear-data-PG.sql | 21 ++++++++++++++++++++ .../resources/db/3.16/add-gear-referential-H2.sql | 21 ++++++++++++++++++++ .../resources/db/3.16/add-gear-referential-PG.sql | 21 ++++++++++++++++++++ .../db/3.16/remove-tripSeine-seine-H2.sql | 21 ++++++++++++++++++++ .../db/3.16/remove-tripSeine-seine-PG.sql | 21 ++++++++++++++++++++ .../ref/impl/GearCaracteristicTypeUIModel.java | 22 +++++++++++++++++++++ .../content/ref/impl/GearCaracteristicUIModel.java | 22 +++++++++++++++++++++ .../observe/ui/content/ref/impl/GearUIHandler.java | 22 +++++++++++++++++++++ .../observe/ui/content/ref/impl/GearUIModel.java | 22 +++++++++++++++++++++ .../seine/GearUseFeatureMeasurementCellEditor.java | 22 +++++++++++++++++++++ .../GearUseFeatureMeasurementCellRenderer.java | 22 +++++++++++++++++++++ ...GearUseFeaturesMeasurementSeinesTableModel.java | 22 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineTableModel.java | 22 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineUIHandler.java | 22 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineUIModel.java | 22 +++++++++++++++++++++ 22 files changed, 463 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit f5a7430eea21e62671d9cc7390db4e727214032f Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 7 20:39:54 2015 +0000 fix tests --- .../its/replication/AbstractReplicateDataTest.java | 7 ++++++- .../replication/H2LonglineReplicateDataTest.java | 23 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/observe-business/src/test/java/fr/ird/observe/its/replication/AbstractReplicateDataTest.java b/observe-business/src/test/java/fr/ird/observe/its/replication/AbstractReplicateDataTest.java index 435b2b3..ecc947e 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/replication/AbstractReplicateDataTest.java +++ b/observe-business/src/test/java/fr/ird/observe/its/replication/AbstractReplicateDataTest.java @@ -35,6 +35,7 @@ import fr.ird.observe.entities.seine.TargetLength; import fr.ird.observe.entities.seine.TargetSample; import fr.ird.observe.entities.seine.TripSeine; import org.junit.Assert; +import org.junit.Assume; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -122,7 +123,7 @@ public abstract class AbstractReplicateDataTest extends AbstractReplicateTest { @Test @Override public final void testDetectOperations() throws Exception { - + Assume.assumeTrue(replicationDataModel != null); if (getLog().isDebugEnabled()) { getLog().debug("start test"); } @@ -181,6 +182,7 @@ public abstract class AbstractReplicateDataTest extends AbstractReplicateTest { @Test @Override public final void testDetectTypes() throws Exception { + Assume.assumeTrue(replicationDataModel != null); if (getLog().isDebugEnabled()) { getLog().debug("start test"); } @@ -200,6 +202,7 @@ public abstract class AbstractReplicateDataTest extends AbstractReplicateTest { @Test @Override public final void testDetectAssociations() throws Exception { + Assume.assumeTrue(replicationDataModel != null); if (getLog().isDebugEnabled()) { getLog().debug("start test"); } @@ -229,6 +232,7 @@ public abstract class AbstractReplicateDataTest extends AbstractReplicateTest { @Test @Override public final void testDetectDirectDependencies() throws Exception { + Assume.assumeTrue(replicationDataModel != null); if (getLog().isDebugEnabled()) { getLog().debug("start test"); } @@ -261,6 +265,7 @@ public abstract class AbstractReplicateDataTest extends AbstractReplicateTest { @Test @Override public final void testDetectShell() throws Exception { + Assume.assumeTrue(replicationDataModel != null); if (getLog().isDebugEnabled()) { getLog().debug("start test"); } diff --git a/observe-business/src/test/java/fr/ird/observe/its/replication/H2LonglineReplicateDataTest.java b/observe-business/src/test/java/fr/ird/observe/its/replication/H2LonglineReplicateDataTest.java index 622f12d..3788eae 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/replication/H2LonglineReplicateDataTest.java +++ b/observe-business/src/test/java/fr/ird/observe/its/replication/H2LonglineReplicateDataTest.java @@ -1,5 +1,27 @@ package fr.ird.observe.its.replication; +/* + * #%L + * ObServe :: Business + * %% + * 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 com.google.common.collect.Maps; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.db.DBTestHelper; @@ -36,6 +58,7 @@ public class H2LonglineReplicateDataTest extends AbstractReplicateDataTest { @BeforeClass public static void init() throws Exception { + replicationDataModel = null; DBTestHelper.initDbForTest(H2LonglineReplicateDataTest.class, false, false); } -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit b370ff07766d7abbc686f67153305f044c8838fe Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 7 20:40:04 2015 +0000 add licenses headers --- .../its/replication/ReplicationDataModel.java | 22 ++++++++++++++++++++++ .../observe/entities/longline/TripLonglines.java | 22 ++++++++++++++++++++++ .../DataSourceMigrationForVersion_3_16.java | 22 ++++++++++++++++++++++ .../referentiel/GearCaracteristicTypes.java | 22 ++++++++++++++++++++++ .../main/resources/db/3.16/add-gear-data-H2.sql | 21 +++++++++++++++++++++ .../main/resources/db/3.16/add-gear-data-PG.sql | 21 +++++++++++++++++++++ .../resources/db/3.16/add-gear-referential-H2.sql | 21 +++++++++++++++++++++ .../resources/db/3.16/add-gear-referential-PG.sql | 21 +++++++++++++++++++++ .../db/3.16/remove-tripSeine-seine-H2.sql | 21 +++++++++++++++++++++ .../db/3.16/remove-tripSeine-seine-PG.sql | 21 +++++++++++++++++++++ .../ref/impl/GearCaracteristicTypeUIModel.java | 22 ++++++++++++++++++++++ .../content/ref/impl/GearCaracteristicUIModel.java | 22 ++++++++++++++++++++++ .../observe/ui/content/ref/impl/GearUIHandler.java | 22 ++++++++++++++++++++++ .../observe/ui/content/ref/impl/GearUIModel.java | 22 ++++++++++++++++++++++ .../seine/GearUseFeatureMeasurementCellEditor.java | 22 ++++++++++++++++++++++ .../GearUseFeatureMeasurementCellRenderer.java | 22 ++++++++++++++++++++++ ...GearUseFeaturesMeasurementSeinesTableModel.java | 22 ++++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineTableModel.java | 22 ++++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineUIHandler.java | 22 ++++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineUIModel.java | 22 ++++++++++++++++++++++ 20 files changed, 434 insertions(+) diff --git a/observe-business/src/test/java/fr/ird/observe/its/replication/ReplicationDataModel.java b/observe-business/src/test/java/fr/ird/observe/its/replication/ReplicationDataModel.java index abca4c3..7c241e8 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/replication/ReplicationDataModel.java +++ b/observe-business/src/test/java/fr/ird/observe/its/replication/ReplicationDataModel.java @@ -1,5 +1,27 @@ package fr.ird.observe.its.replication; +/* + * #%L + * ObServe :: Business + * %% + * 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.db.DataSource; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.SetLongline; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java index 6d20eaf..6737a55 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java @@ -1,5 +1,27 @@ package fr.ird.observe.entities.longline; +/* + * #%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 java.util.HashSet; import java.util.Set; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java index 4e679c7..b3bc42c 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.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/java/fr/ird/observe/entities/referentiel/GearCaracteristicTypes.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/GearCaracteristicTypes.java index 409e776..9db7665 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/GearCaracteristicTypes.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/GearCaracteristicTypes.java @@ -1,5 +1,27 @@ package fr.ird.observe.entities.referentiel; +/* + * #%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 com.google.common.collect.Sets; import java.util.Set; diff --git a/observe-entities/src/main/resources/db/3.16/add-gear-data-H2.sql b/observe-entities/src/main/resources/db/3.16/add-gear-data-H2.sql index 389df04..7d23a4c 100644 --- a/observe-entities/src/main/resources/db/3.16/add-gear-data-H2.sql +++ b/observe-entities/src/main/resources/db/3.16/add-gear-data-H2.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% +--- -- -- GearUseFeatures Definition -- diff --git a/observe-entities/src/main/resources/db/3.16/add-gear-data-PG.sql b/observe-entities/src/main/resources/db/3.16/add-gear-data-PG.sql index aa8fd9b..bca6e0b 100644 --- a/observe-entities/src/main/resources/db/3.16/add-gear-data-PG.sql +++ b/observe-entities/src/main/resources/db/3.16/add-gear-data-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% +--- -- -- GearUseFeatures Definition -- diff --git a/observe-entities/src/main/resources/db/3.16/add-gear-referential-H2.sql b/observe-entities/src/main/resources/db/3.16/add-gear-referential-H2.sql index 3712360..5a1910a 100644 --- a/observe-entities/src/main/resources/db/3.16/add-gear-referential-H2.sql +++ b/observe-entities/src/main/resources/db/3.16/add-gear-referential-H2.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% +--- -- -- Gear caracteristic type Definition -- diff --git a/observe-entities/src/main/resources/db/3.16/add-gear-referential-PG.sql b/observe-entities/src/main/resources/db/3.16/add-gear-referential-PG.sql index d861dde..73c9ecc 100644 --- a/observe-entities/src/main/resources/db/3.16/add-gear-referential-PG.sql +++ b/observe-entities/src/main/resources/db/3.16/add-gear-referential-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% +--- -- -- Gear caracteristic type Definition -- diff --git a/observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-H2.sql b/observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-H2.sql index 9c8fdf3..ee931f8 100644 --- a/observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-H2.sql +++ b/observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-H2.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% +--- ALTER TABLE OBSERVE_SEINE.TRIP DROP COLUMN seineCircumference; ALTER TABLE OBSERVE_SEINE.TRIP DROP COLUMN seineDepth; ALTER TABLE OBSERVE_SEINE.TRIP DROP COLUMN seineBallastWeight; \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-PG.sql b/observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-PG.sql index 9c8fdf3..ee931f8 100644 --- a/observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-PG.sql +++ b/observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-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% +--- ALTER TABLE OBSERVE_SEINE.TRIP DROP COLUMN seineCircumference; ALTER TABLE OBSERVE_SEINE.TRIP DROP COLUMN seineDepth; ALTER TABLE OBSERVE_SEINE.TRIP DROP COLUMN seineBallastWeight; \ No newline at end of file diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUIModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUIModel.java index b2c6404..0b2629c 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUIModel.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUIModel.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.content.ref.impl; +/* + * #%L + * ObServe :: Swing + * %% + * 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.referentiel.GearCaracteristicType; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUIModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUIModel.java index 7c02e74..7f16da6 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUIModel.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUIModel.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.content.ref.impl; +/* + * #%L + * ObServe :: Swing + * %% + * 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.referentiel.GearCaracteristic; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java index ba5a33e..017b13d 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.content.ref.impl; +/* + * #%L + * ObServe :: Swing + * %% + * 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.referentiel.Gear; import fr.ird.observe.ui.content.ref.ContentReferenceUI; import fr.ird.observe.ui.content.ref.ContentReferenceUIHandler; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIModel.java index 96682f2..d07a3a0 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIModel.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIModel.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.content.ref.impl; +/* + * #%L + * ObServe :: Swing + * %% + * 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 com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.referentiel.Gear; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java index f749490..6d1cd5c 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.content.table.impl.seine; +/* + * #%L + * ObServe :: Swing + * %% + * 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.referentiel.GearCaracteristic; import fr.ird.observe.entities.referentiel.GearCaracteristicType; import fr.ird.observe.entities.referentiel.GearCaracteristicTypes; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java index 56e130f..5116121 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.content.table.impl.seine; +/* + * #%L + * ObServe :: Swing + * %% + * 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.referentiel.GearCaracteristic; import fr.ird.observe.entities.referentiel.GearCaracteristicType; import fr.ird.observe.entities.referentiel.GearCaracteristicTypes; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java index d459f2f..5fcd3b1 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.content.table.impl.seine; +/* + * #%L + * ObServe :: Swing + * %% + * 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.referentiel.GearCaracteristic; import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeineImpl; 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 51e3d97..5f79632 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 @@ -1,5 +1,27 @@ package fr.ird.observe.ui.content.table.impl.seine; +/* + * #%L + * ObServe :: Swing + * %% + * 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.seine.GearUseFeaturesSeine; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.ui.content.table.ContentTableMeta; 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 cd6f3e8..baa9c9b 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 @@ -1,5 +1,27 @@ package fr.ird.observe.ui.content.table.impl.seine; +/* + * #%L + * ObServe :: Swing + * %% + * 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.DataService; import fr.ird.observe.ObserveContext; import fr.ird.observe.ObserveDAOHelper; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java index bdc833d..5e9cd3a 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.content.table.impl.seine; +/* + * #%L + * ObServe :: Swing + * %% + * 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 com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import fr.ird.observe.BinderService; -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 6e2ec35ae990410eee9863b2837b98cc0441bea4 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 7 20:40:20 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC1' with non-snapshot versions --- observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/observe-business/pom.xml b/observe-business/pom.xml index 258621e..34023c6 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-RC1-SNAPSHOT</version> + <version>4.0-RC1</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 13ee870..278088b 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-RC1-SNAPSHOT</version> + <version>4.0-RC1</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 5aba375..0a0f429 100644 --- a/observe-swing/pom.xml +++ b/observe-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC1-SNAPSHOT</version> + <version>4.0-RC1</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 17c5903..8c4e768 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-RC1-SNAPSHOT</version> + <version>4.0-RC1</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index d43cd5e..6583bb9 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC1-SNAPSHOT</version> + <version>4.0-RC1</version> <packaging>pom</packaging> <name>ObServe</name> <description>Projet ObServe</description> -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit a723a7c3b67f43ce1fc8a7d5166f1e52f18555fe Merge: fcb6456 6e2ec35 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 7 20:45:15 2015 +0000 Merge branch 'release/4.0-RC1' .gitignore | 12 + observe-business/pom.xml | 62 +-- .../fr/ird/observe/ConsolidateDataService.java | 4 +- .../src/main/java/fr/ird/observe/DataService.java | 29 +- .../main/java/fr/ird/observe/DecoratorService.java | 40 +- .../main/java/fr/ird/observe/db/DataContext.java | 106 ++++- .../java/fr/ird/observe/db/ReplicationService.java | 114 ++++- .../ird/observe/db/constants/DataContextType.java | 36 +- .../fr/ird/observe/decorator/TripDecorator.java | 2 +- .../ird/observe/decorator/TripSeineDecorator.java | 2 +- .../i18n/observe-business_en_GB.properties | 4 + .../i18n/observe-business_es_ES.properties | 4 + .../i18n/observe-business_fr_FR.properties | 4 + .../its/replication/AbstractReplicateDataTest.java | 220 ++++------ .../replication/H2LonglineReplicateDataTest.java | 200 +++++++++ .../its/replication/ReplicationDataModel.java | 170 ++++++++ .../src/test/resources/db/3.16/ANO-6611.sql.gz | Bin 0 -> 172354 bytes .../src/test/resources/db/3.16/referentiel.sql.gz | Bin 0 -> 138114 bytes observe-entities/pom.xml | 110 +---- .../java/fr/ird/observe/entities/Entities.java | 90 ++-- .../observe/entities/longline/TripLonglines.java | 37 +- .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_3_16.java | 161 +++++++ .../referentiel/GearCaracteristicTypes.java | 83 ++++ .../main/resources/db/3.16/add-gear-data-H2.sql | 39 ++ .../main/resources/db/3.16/add-gear-data-PG.sql | 39 ++ .../resources/db/3.16/add-gear-referential-H2.sql | 141 ++++++ .../resources/db/3.16/add-gear-referential-PG.sql | 140 ++++++ .../db/3.16/remove-tripSeine-seine-H2.sql | 24 ++ .../db/3.16/remove-tripSeine-seine-PG.sql | 24 ++ .../src/main/xmi/observe-common.properties | 3 +- observe-entities/src/main/xmi/observe-common.zargo | Bin 33078 -> 35711 bytes .../src/main/xmi/observe-longline.properties | 4 +- .../src/main/xmi/observe-seine.properties | 14 +- observe-entities/src/main/xmi/observe-seine.zargo | Bin 82186 -> 85905 bytes observe-swing/pom.xml | 5 +- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 2 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 10 +- .../ObsoleteEntityListCellRenderer.java | 2 +- .../ui/admin/synchronize/SynchronizeUIHandler.java | 8 +- .../validate/ValidateEntityListCellRenderer.java | 2 +- .../ui/admin/validate/ValidateUIHandler.java | 6 +- .../ird/observe/ui/content/ContentUIHandler.java | 4 +- .../ird/observe/ui/content/ContentUIManager.java | 18 +- .../ui/content/impl/longline/BranchlineUI.jaxx | 15 +- .../impl/longline/LonglineDetailCompositionUI.jaxx | 9 +- .../LonglineDetailCompositionUIHandler.java | 2 +- .../LonglineDetailCompositionUIInitializer.java | 6 +- .../LonglineGlobalCompositionUIHandler.java | 2 +- .../impl/longline/SetLonglineUIHandler.java | 2 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 6 +- .../ui/content/open/impl/seine/TripSeineUI.css | 48 +-- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 344 +++++++-------- .../open/impl/seine/TripSeineUIHandler.java | 63 +-- .../content/open/impl/seine/TripSeineUIModel.java | 55 --- .../ui/content/ref/ContentReferenceUIHandler.java | 8 +- .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 162 +++++++ .../ref/impl/GearCaracteristicTypeUIModel.java | 23 +- .../ui/content/ref/impl/GearCaracteristicUI.css | 39 +- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 186 ++++++++ .../content/ref/impl/GearCaracteristicUIModel.java | 28 +- .../fr/ird/observe/ui/content/ref/impl/GearUI.css | 49 +++ .../fr/ird/observe/ui/content/ref/impl/GearUI.jaxx | 196 +++++++++ .../observe/ui/content/ref/impl/GearUIHandler.java | 104 +++++ .../observe/ui/content/ref/impl/GearUIModel.java | 92 ++++ .../ui/content/table/ContentTableUIHandler.java | 8 +- .../seine/GearUseFeatureMeasurementCellEditor.java | 145 +++++++ .../GearUseFeatureMeasurementCellRenderer.java | 113 +++++ ...GearUseFeaturesMeasurementSeinesTableModel.java | 124 ++++++ .../impl/seine/GearUseFeaturesSeineTableModel.java | 116 +++++ .../table/impl/seine/GearUseFeaturesSeineUI.css | 91 ++++ .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 148 +++++++ .../impl/seine/GearUseFeaturesSeineUIHandler.java | 473 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineUIModel.java | 122 ++++++ .../ui/tree/AbstractObserveTreeCellRenderer.java | 2 +- .../ui/tree/NavigationTreeCellRenderer.java | 2 + .../fr/ird/observe/ui/tree/ObserveTreeBridge.java | 2 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 31 +- .../loadors/ActivityLonglineNodeChildLoador.java | 19 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 12 +- .../loadors/FloatingObjectNodeChildLoador.java | 18 +- .../loadors/ProgramLonglineNodeChildLoador.java | 13 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 43 +- .../loadors/ReferenceCommonNodeChildLoador.java | 28 +- .../loadors/ReferenceLonglineNodeChildLoador.java | 36 +- .../loadors/ReferenceSeineNodeChildLoador.java | 28 +- .../ui/tree/loadors/RootNodeChildLoador.java | 6 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 13 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 24 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 22 +- .../fr/ird/observe/ui/usage/UsagesUIHandler.java | 4 +- ...ObserveSimpleValidatorMessageTableRenderer.java | 2 +- .../util/ObserveValidatorMessageTableRenderer.java | 2 +- .../resources/i18n/observe-swing_en_GB.properties | 166 ++++++-- .../resources/i18n/observe-swing_es_ES.properties | 164 +++++-- .../resources/i18n/observe-swing_fr_FR.properties | 174 ++++++-- observe-validation/pom.xml | 6 +- .../Gear-n1-create-error-validation.xml | 75 ++++ .../Gear-n1-create-warning-validation.xml} | 50 ++- .../Gear-n1-update-error-validation.xml | 75 ++++ .../Gear-n1-update-warning-validation.xml} | 50 ++- ...earCaracteristic-n1-create-error-validation.xml | 90 ++++ ...Caracteristic-n1-create-warning-validation.xml} | 50 ++- ...earCaracteristic-n1-update-error-validation.xml | 90 ++++ ...Caracteristic-n1-update-warning-validation.xml} | 50 ++- ...aracteristicType-n1-create-error-validation.xml | 75 ++++ ...cteristicType-n1-create-warning-validation.xml} | 50 ++- ...aracteristicType-n1-update-error-validation.xml | 75 ++++ ...cteristicType-n1-update-warning-validation.xml} | 50 ++- ...seFeaturesSeine-n1-update-error-validation.xml} | 34 +- ...TransmittingBuoy-n1-update-error-validation.xml | 12 + .../TripSeine-n1-create-warning-validation.xml | 39 -- ...1-update-gearUseFeatures-warning-validation.xml | 41 ++ .../TripSeine-n1-update-warning-validation.xml | 40 -- .../i18n/observe-validation_en_GB.properties | 10 +- .../i18n/observe-validation_es_ES.properties | 10 +- .../i18n/observe-validation_fr_FR.properties | 10 +- .../validation/BeanValidatorDetectorTest.java | 16 +- pom.xml | 42 +- src/site/site_fr.xml | 48 +-- 120 files changed, 5268 insertions(+), 1389 deletions(-) -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 83abb7739e17e797164bb674f03bd1adebb30011 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 7 20:45:18 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-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/observe-business/pom.xml b/observe-business/pom.xml index 7d9df05..34023c6 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-RC2-SNAPSHOT</version> + <version>4.0-RC1</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index a1ea3bf..278088b 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-RC2-SNAPSHOT</version> + <version>4.0-RC1</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 7eaccc5..0a0f429 100644 --- a/observe-swing/pom.xml +++ b/observe-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC2-SNAPSHOT</version> + <version>4.0-RC1</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index b5d5c9d..8c4e768 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-RC2-SNAPSHOT</version> + <version>4.0-RC1</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index 3829898..6583bb9 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC2-SNAPSHOT</version> + <version>4.0-RC1</version> <packaging>pom</packaging> <name>ObServe</name> <description>Projet ObServe</description> -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 3d3829019209ae1b3473d1a0703aef5218963f11 Merge: 83abb77 a723a7c Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 7 20:45:19 2015 +0000 Merge branch 'master' into develop .../its/replication/AbstractReplicateDataTest.java | 7 ++++++- .../replication/H2LonglineReplicateDataTest.java | 23 ++++++++++++++++++++++ .../its/replication/ReplicationDataModel.java | 22 +++++++++++++++++++++ .../observe/entities/longline/TripLonglines.java | 22 +++++++++++++++++++++ .../DataSourceMigrationForVersion_3_16.java | 22 +++++++++++++++++++++ .../referentiel/GearCaracteristicTypes.java | 22 +++++++++++++++++++++ .../main/resources/db/3.16/add-gear-data-H2.sql | 21 ++++++++++++++++++++ .../main/resources/db/3.16/add-gear-data-PG.sql | 21 ++++++++++++++++++++ .../resources/db/3.16/add-gear-referential-H2.sql | 21 ++++++++++++++++++++ .../resources/db/3.16/add-gear-referential-PG.sql | 21 ++++++++++++++++++++ .../db/3.16/remove-tripSeine-seine-H2.sql | 21 ++++++++++++++++++++ .../db/3.16/remove-tripSeine-seine-PG.sql | 21 ++++++++++++++++++++ .../ref/impl/GearCaracteristicTypeUIModel.java | 22 +++++++++++++++++++++ .../content/ref/impl/GearCaracteristicUIModel.java | 22 +++++++++++++++++++++ .../observe/ui/content/ref/impl/GearUIHandler.java | 22 +++++++++++++++++++++ .../observe/ui/content/ref/impl/GearUIModel.java | 22 +++++++++++++++++++++ .../seine/GearUseFeatureMeasurementCellEditor.java | 22 +++++++++++++++++++++ .../GearUseFeatureMeasurementCellRenderer.java | 22 +++++++++++++++++++++ ...GearUseFeaturesMeasurementSeinesTableModel.java | 22 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineTableModel.java | 22 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineUIHandler.java | 22 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineUIModel.java | 22 +++++++++++++++++++++ 22 files changed, 463 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 4baf2392b242783e96f8ced2a577641ec6c501b0 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 7 20:45:20 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/observe-business/pom.xml b/observe-business/pom.xml index 34023c6..7d9df05 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-RC1</version> + <version>4.0-RC2-SNAPSHOT</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 278088b..a1ea3bf 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-RC1</version> + <version>4.0-RC2-SNAPSHOT</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 0a0f429..7eaccc5 100644 --- a/observe-swing/pom.xml +++ b/observe-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC1</version> + <version>4.0-RC2-SNAPSHOT</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 8c4e768..b5d5c9d 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-RC1</version> + <version>4.0-RC2-SNAPSHOT</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index 6583bb9..3829898 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC1</version> + <version>4.0-RC2-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> <description>Projet ObServe</description> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm