branch develop updated (0f672e6 -> 68bcb13)
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 0f672e6 [jgitflow-maven-plugin]updating poms for 4.0-RC3-SNAPSHOT development new 866219a [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 41c4614 prepare release (add license headers) new fc9b92b [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC2' with non-snapshot versions new 9796dcf Merge branch 'release/4.0-RC2' new ed99710 prepare release (add license headers) new 40f1c32 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC2' with non-snapshot versions new 2b2c42d Merge branch 'release/4.0-RC2' new 72573b7 Merge branch 'master' into develop new 68bcb13 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 9 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 68bcb1325d74d994e589906437cc21b808d82320 Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 09:07:22 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 72573b7431eb0ddd5882b0b4ff194132cb553e1c Merge: 866219a 2b2c42d Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 09:07:21 2015 +0000 Merge branch 'master' into develop commit 866219a8144de891bc586c83ac217fc4b3a1a43a Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 09:07:20 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 2b2c42dab27a4bb29ccf06947ea6e67a8b4a57c3 Merge: 9796dcf 40f1c32 Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 09:07:17 2015 +0000 Merge branch 'release/4.0-RC2' commit 40f1c32cdebb2fcf0ba0c883ac45b653cf9308f3 Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 09:02:08 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC2' with non-snapshot versions commit ed9971037a12e3439381ff007aec469c79dfc142 Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 09:01:46 2015 +0000 prepare release (add license headers) commit 9796dcfaa24bbab11ff957ba6b9ba66b8a52d9e1 Merge: a723a7c fc9b92b Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 08:26:33 2015 +0000 Merge branch 'release/4.0-RC2' commit fc9b92bc8510603c572966c0809425bbef8b3d0b Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 08:22:15 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC2' with non-snapshot versions commit 41c4614232fec595a74260f1f477f45a8db255cf Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 08:22:00 2015 +0000 prepare release (add license headers) Summary of changes: .../entities/longline/ActivityLonglineDAOImpl.java | 22 +++++++++++++++++++++ .../DataSourceMigrationForVersion_4_0_RC2.java | 22 +++++++++++++++++++++ .../entities/referentiel/ProgramDAOImpl.java | 22 +++++++++++++++++++++ .../entities/seine/ActivitySeineDAOImpl.java | 22 +++++++++++++++++++++ .../entities/seine/FloatingObjectDAOImpl.java | 22 +++++++++++++++++++++ .../ird/observe/entities/seine/RouteDAOImpl.java | 22 +++++++++++++++++++++ .../db/4.0-RC2/clean-program-gear-type-H2.sql | 21 ++++++++++++++++++++ .../db/4.0-RC2/clean-program-gear-type-PG.sql | 23 +++++++++++++++++++++- .../ird/observe/ui/tree/ActivityLonglineNode.java | 22 +++++++++++++++++++++ .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 22 +++++++++++++++++++++ .../fr/ird/observe/ui/tree/EntityNodeSupport.java | 22 +++++++++++++++++++++ .../observe/ui/tree/FloatingObjectSeineNode.java | 22 +++++++++++++++++++++ .../ird/observe/ui/tree/ProgramLonglineNode.java | 22 +++++++++++++++++++++ .../fr/ird/observe/ui/tree/ProgramSeineNode.java | 22 +++++++++++++++++++++ .../fr/ird/observe/ui/tree/RouteSeineNode.java | 22 +++++++++++++++++++++ .../fr/ird/observe/ui/tree/SetLonglineNode.java | 22 +++++++++++++++++++++ .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 22 +++++++++++++++++++++ .../fr/ird/observe/ui/tree/TripLonglineNode.java | 22 +++++++++++++++++++++ .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 22 +++++++++++++++++++++ 19 files changed, 417 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 41c4614232fec595a74260f1f477f45a8db255cf Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 08:22:00 2015 +0000 prepare release (add license headers) --- .../entities/longline/ActivityLonglineDAOImpl.java | 22 ++++++++++++++++++++++ .../DataSourceMigrationForVersion_4_0_RC2.java | 22 ++++++++++++++++++++++ .../entities/referentiel/ProgramDAOImpl.java | 22 ++++++++++++++++++++++ .../entities/seine/ActivitySeineDAOImpl.java | 22 ++++++++++++++++++++++ .../entities/seine/FloatingObjectDAOImpl.java | 22 ++++++++++++++++++++++ .../ird/observe/entities/seine/RouteDAOImpl.java | 22 ++++++++++++++++++++++ .../db/4.0-RC2/clean-program-gear-type-H2.sql | 21 +++++++++++++++++++++ .../db/4.0-RC2/clean-program-gear-type-PG.sql | 21 +++++++++++++++++++++ .../ird/observe/ui/tree/ActivityLonglineNode.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/ui/tree/EntityNodeSupport.java | 22 ++++++++++++++++++++++ .../observe/ui/tree/FloatingObjectSeineNode.java | 22 ++++++++++++++++++++++ .../ird/observe/ui/tree/ProgramLonglineNode.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/ui/tree/ProgramSeineNode.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/ui/tree/RouteSeineNode.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/ui/tree/SetLonglineNode.java | 22 ++++++++++++++++++++++ .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/ui/tree/TripLonglineNode.java | 22 ++++++++++++++++++++++ .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 22 ++++++++++++++++++++++ 19 files changed, 416 insertions(+) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineDAOImpl.java index af76d68..b3877f7 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineDAOImpl.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 fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; import fr.ird.observe.entities.referentiel.longline.VesselActivityLonglineImpl; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java index a782edc..f3c6437 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.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/ProgramDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramDAOImpl.java index 7638768..ace56aa 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramDAOImpl.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 fr.ird.observe.entities.constants.GearType; import fr.ird.observe.entities.constants.ReferenceLocale; import org.nuiton.topia.TopiaException; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineDAOImpl.java index b82bfe7..0d81ecf 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineDAOImpl.java @@ -1,5 +1,27 @@ package fr.ird.observe.entities.seine; +/* + * #%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.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeineImpl; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectDAOImpl.java index 07a1c20..2b19ca0 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectDAOImpl.java @@ -1,5 +1,27 @@ package fr.ird.observe.entities.seine; +/* + * #%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.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.seine.ObjectType; import fr.ird.observe.entities.referentiel.seine.ObjectTypeImpl; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteDAOImpl.java index acbcf9d..0858904 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteDAOImpl.java @@ -1,5 +1,27 @@ package fr.ird.observe.entities.seine; +/* + * #%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 org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaSQLQuery; diff --git a/observe-entities/src/main/resources/db/4.0-RC2/clean-program-gear-type-H2.sql b/observe-entities/src/main/resources/db/4.0-RC2/clean-program-gear-type-H2.sql index 42561b2..33d4f63 100644 --- a/observe-entities/src/main/resources/db/4.0-RC2/clean-program-gear-type-H2.sql +++ b/observe-entities/src/main/resources/db/4.0-RC2/clean-program-gear-type-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_common.program ADD COLUMN geartype2 int; UPDATE observe_common.program set geartype2 = 0 WHERE geartype='seine'; UPDATE observe_common.program set geartype2 = 1 WHERE geartype='longline'; diff --git a/observe-entities/src/main/resources/db/4.0-RC2/clean-program-gear-type-PG.sql b/observe-entities/src/main/resources/db/4.0-RC2/clean-program-gear-type-PG.sql index 564f7dc..8116935 100644 --- a/observe-entities/src/main/resources/db/4.0-RC2/clean-program-gear-type-PG.sql +++ b/observe-entities/src/main/resources/db/4.0-RC2/clean-program-gear-type-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_common.program ADD COLUMN geartype2 int; UPDATE observe_common.program set geartype2 = 0 WHERE geartype='seine'; UPDATE observe_common.program set geartype2 = 1 WHERE geartype='longline'; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java index 29f8e47..e5aa254 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.tree; +/* + * #%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.db.DataSource; import fr.ird.observe.db.DataSourceException; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java index e95efe2..bf12f1a 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.tree; +/* + * #%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.db.DataSource; import fr.ird.observe.db.DataSourceException; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/EntityNodeSupport.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/EntityNodeSupport.java index c3e9453..123e944 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/EntityNodeSupport.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/EntityNodeSupport.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.tree; +/* + * #%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.db.DataSource; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java index 9279992..bd90005 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.tree; +/* + * #%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.db.DataSource; import fr.ird.observe.db.DataSourceException; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java index b403e3d..813e1b8 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.tree; +/* + * #%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.db.DataSource; import fr.ird.observe.db.DataSourceException; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java index 845f017..5954d1b 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.tree; +/* + * #%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.db.DataSource; import fr.ird.observe.db.DataSourceException; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java index f528307..ab5d772 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.tree; +/* + * #%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.db.DataSource; import fr.ird.observe.db.DataSourceException; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java index af917d4..871c539 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.tree; +/* + * #%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.db.DataSource; import fr.ird.observe.db.DataSourceException; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java index 2b97b33..52fcd2f 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.tree; +/* + * #%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.db.DataSource; import fr.ird.observe.db.DataSourceException; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java index c6ca912..d68a8c6 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.tree; +/* + * #%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.db.DataSource; import fr.ird.observe.db.DataSourceException; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java index ce415f9..0d62950 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.tree; +/* + * #%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.db.DataSource; import fr.ird.observe.db.DataSourceException; -- 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 fc9b92bc8510603c572966c0809425bbef8b3d0b Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 08:22:15 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC2' 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 7d9df05..49b79c0 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-RC2</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index a1ea3bf..a6207a5 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-RC2</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 7eaccc5..1f6b7f3 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-RC2</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index b5d5c9d..d7a061d 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-RC2</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index 48586fb..98d5f67 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-RC2</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 9796dcfaa24bbab11ff957ba6b9ba66b8a52d9e1 Merge: a723a7c fc9b92b Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 08:26:33 2015 +0000 Merge branch 'release/4.0-RC2' observe-business/pom.xml | 2 +- .../src/main/filters/observe-reports.properties | 20 +- .../src/main/java/fr/ird/observe/DataService.java | 441 +++++++++++++++++---- .../main/java/fr/ird/observe/DecoratorService.java | 6 +- .../java/fr/ird/observe/db/ReplicationService.java | 17 +- .../ird/observe/db/model/DataSelectionModel.java | 32 +- .../java/fr/ird/observe/db/util/PGInstall.java | 8 +- ...ipDecorator.java => TripLonglineDecorator.java} | 21 +- .../replication/H2LonglineReplicateDataTest.java | 2 +- .../test/resources/db/4.0-RC2/referentiel.sql.gz | Bin 0 -> 138115 bytes observe-entities/pom.xml | 2 +- .../main/java/fr/ird/observe/entities/Trip.java | 3 + .../ird/observe/entities/constants/GearType.java | 11 + .../entities/constants/ReferenceLocale.java | 34 ++ .../entities/longline/ActivityLonglineDAOImpl.java | 140 +++++++ .../entities/longline/TripLonglineDAOImpl.java | 137 ++++++- .../migration/AbstractDataSourceMigration.java | 3 +- .../DataSourceMigrationForVersion_4_0_RC2.java | 111 ++++++ .../entities/referentiel/ProgramDAOImpl.java | 123 ++++++ .../entities/referentiel/ReferenceEntities.java | 1 + .../entities/seine/ActivitySeineDAOImpl.java | 141 +++++++ .../entities/seine/FloatingObjectDAOImpl.java | 124 ++++++ .../ird/observe/entities/seine/RouteDAOImpl.java | 115 ++++++ .../observe/entities/seine/TripSeineDAOImpl.java | 135 ++++++- .../db/4.0-RC2/clean-program-gear-type-H2.sql | 27 ++ .../db/4.0-RC2/clean-program-gear-type-PG.sql | 26 ++ .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-longline.zargo | Bin 93859 -> 93860 bytes .../src/main/xmi/observe-seine.properties | 2 +- observe-swing/pom.xml | 2 +- .../assembly/dist/obstuna-admin/apply-extra.sh | 14 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 6 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 127 +++--- .../fr/ird/observe/ui/admin/config/ConfigUI.jaxx | 6 - .../ui/admin/consolidate/ConsolidateUIHandler.java | 26 +- .../ird/observe/ui/admin/export/ExportModel.java | 86 +++- .../observe/ui/admin/export/ExportUIHandler.java | 158 ++------ .../fr/ird/observe/ui/admin/export/TripEntry.java | 53 +-- .../ui/admin/export/TripToExportTableModel.java | 29 +- .../ird/observe/ui/content/ContentUIHandler.java | 5 +- .../impl/longline/SetLonglineUIHandler.java | 3 +- .../impl/seine/FloatingObjectUIHandler.java | 3 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 3 +- .../impl/longline/ActivityLonglinesUIHandler.java | 16 +- .../list/impl/longline/TripLonglinesUIHandler.java | 10 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 16 +- .../content/list/impl/seine/RoutesUIHandler.java | 12 +- .../list/impl/seine/TripSeinesUIHandler.java | 10 +- .../ui/content/open/ContentOpenableUIHandler.java | 28 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 3 +- .../ird/observe/ui/storage/tabs/ConfigDataUI.css | 4 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 41 +- .../ird/observe/ui/tree/ActivityLonglineNode.java | 50 +++ .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 29 +- .../fr/ird/observe/ui/tree/EntityNodeSupport.java | 168 ++++++++ .../observe/ui/tree/FloatingObjectSeineNode.java | 50 +++ .../ird/observe/ui/tree/ObserveDataProvider.java | 11 + .../java/fr/ird/observe/ui/tree/ObserveNode.java | 66 +-- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 75 +++- .../ird/observe/ui/tree/ProgramLonglineNode.java | 51 +++ .../fr/ird/observe/ui/tree/ProgramSeineNode.java | 29 +- .../fr/ird/observe/ui/tree/RouteSeineNode.java | 28 +- .../fr/ird/observe/ui/tree/SetLonglineNode.java | 29 +- .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 29 +- .../fr/ird/observe/ui/tree/TripLonglineNode.java | 28 +- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 28 +- .../actions/ChangeTripProgramActionListener.java | 6 +- .../AbstractAssociationNodeChildLoador.java | 68 ---- .../loadors/ActivityLonglineNodeChildLoador.java | 22 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 26 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 49 ++- .../loadors/ActivitySeinesNodeChildLoador.java | 27 +- .../loadors/FloatingObjectNodeChildLoador.java | 4 +- .../loadors/ProgramLonglineNodeChildLoador.java | 12 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 14 +- .../ui/tree/loadors/RootNodeChildLoador.java | 25 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 24 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 4 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 1 + .../resources/i18n/observe-swing_en_GB.properties | 2 + .../resources/i18n/observe-swing_es_ES.properties | 2 + .../resources/i18n/observe-swing_fr_FR.properties | 4 +- observe-validation/pom.xml | 2 +- pom.xml | 41 +- src/site/site_fr.xml | 6 +- 86 files changed, 2471 insertions(+), 888 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 ed9971037a12e3439381ff007aec469c79dfc142 Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 09:01:46 2015 +0000 prepare release (add license headers) --- .../entities/longline/ActivityLonglineDAOImpl.java | 22 ++++++++++++++++++++++ .../DataSourceMigrationForVersion_4_0_RC2.java | 22 ++++++++++++++++++++++ .../entities/referentiel/ProgramDAOImpl.java | 22 ++++++++++++++++++++++ .../entities/seine/ActivitySeineDAOImpl.java | 22 ++++++++++++++++++++++ .../entities/seine/FloatingObjectDAOImpl.java | 22 ++++++++++++++++++++++ .../ird/observe/entities/seine/RouteDAOImpl.java | 22 ++++++++++++++++++++++ .../db/4.0-RC2/clean-program-gear-type-H2.sql | 21 +++++++++++++++++++++ .../db/4.0-RC2/clean-program-gear-type-PG.sql | 21 +++++++++++++++++++++ .../ird/observe/ui/tree/ActivityLonglineNode.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/ui/tree/EntityNodeSupport.java | 22 ++++++++++++++++++++++ .../observe/ui/tree/FloatingObjectSeineNode.java | 22 ++++++++++++++++++++++ .../ird/observe/ui/tree/ProgramLonglineNode.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/ui/tree/ProgramSeineNode.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/ui/tree/RouteSeineNode.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/ui/tree/SetLonglineNode.java | 22 ++++++++++++++++++++++ .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/ui/tree/TripLonglineNode.java | 22 ++++++++++++++++++++++ .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 22 ++++++++++++++++++++++ 19 files changed, 416 insertions(+) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineDAOImpl.java index af76d68..b3877f7 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineDAOImpl.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 fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; import fr.ird.observe.entities.referentiel.longline.VesselActivityLonglineImpl; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java index a782edc..f3c6437 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.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/ProgramDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramDAOImpl.java index 7638768..ace56aa 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramDAOImpl.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 fr.ird.observe.entities.constants.GearType; import fr.ird.observe.entities.constants.ReferenceLocale; import org.nuiton.topia.TopiaException; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineDAOImpl.java index b82bfe7..0d81ecf 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineDAOImpl.java @@ -1,5 +1,27 @@ package fr.ird.observe.entities.seine; +/* + * #%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.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeineImpl; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectDAOImpl.java index 07a1c20..2b19ca0 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectDAOImpl.java @@ -1,5 +1,27 @@ package fr.ird.observe.entities.seine; +/* + * #%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.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.seine.ObjectType; import fr.ird.observe.entities.referentiel.seine.ObjectTypeImpl; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteDAOImpl.java index acbcf9d..0858904 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteDAOImpl.java @@ -1,5 +1,27 @@ package fr.ird.observe.entities.seine; +/* + * #%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 org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaSQLQuery; diff --git a/observe-entities/src/main/resources/db/4.0-RC2/clean-program-gear-type-H2.sql b/observe-entities/src/main/resources/db/4.0-RC2/clean-program-gear-type-H2.sql index 51e7b20..818c372 100644 --- a/observe-entities/src/main/resources/db/4.0-RC2/clean-program-gear-type-H2.sql +++ b/observe-entities/src/main/resources/db/4.0-RC2/clean-program-gear-type-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_common.program ADD COLUMN geartype2 int; UPDATE observe_common.program set geartype2 = 0 WHERE geartype='seine'; UPDATE observe_common.program set geartype2 = 1 WHERE geartype='longline'; diff --git a/observe-entities/src/main/resources/db/4.0-RC2/clean-program-gear-type-PG.sql b/observe-entities/src/main/resources/db/4.0-RC2/clean-program-gear-type-PG.sql index eaa05c6..40a51c2 100644 --- a/observe-entities/src/main/resources/db/4.0-RC2/clean-program-gear-type-PG.sql +++ b/observe-entities/src/main/resources/db/4.0-RC2/clean-program-gear-type-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_common.program ADD COLUMN geartype2 int; UPDATE observe_common.program set geartype2 = 0 WHERE geartype='seine'; UPDATE observe_common.program set geartype2 = 1 WHERE geartype='longline'; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java index 29f8e47..e5aa254 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.tree; +/* + * #%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.db.DataSource; import fr.ird.observe.db.DataSourceException; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java index e95efe2..bf12f1a 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.tree; +/* + * #%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.db.DataSource; import fr.ird.observe.db.DataSourceException; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/EntityNodeSupport.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/EntityNodeSupport.java index c3e9453..123e944 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/EntityNodeSupport.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/EntityNodeSupport.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.tree; +/* + * #%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.db.DataSource; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java index 9279992..bd90005 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.tree; +/* + * #%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.db.DataSource; import fr.ird.observe.db.DataSourceException; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java index b403e3d..813e1b8 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.tree; +/* + * #%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.db.DataSource; import fr.ird.observe.db.DataSourceException; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java index 845f017..5954d1b 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.tree; +/* + * #%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.db.DataSource; import fr.ird.observe.db.DataSourceException; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java index f528307..ab5d772 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.tree; +/* + * #%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.db.DataSource; import fr.ird.observe.db.DataSourceException; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java index af917d4..871c539 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.tree; +/* + * #%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.db.DataSource; import fr.ird.observe.db.DataSourceException; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java index 2b97b33..52fcd2f 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.tree; +/* + * #%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.db.DataSource; import fr.ird.observe.db.DataSourceException; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java index c6ca912..d68a8c6 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.tree; +/* + * #%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.db.DataSource; import fr.ird.observe.db.DataSourceException; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java index ce415f9..0d62950 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java @@ -1,5 +1,27 @@ package fr.ird.observe.ui.tree; +/* + * #%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.db.DataSource; import fr.ird.observe.db.DataSourceException; -- 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 40f1c32cdebb2fcf0ba0c883ac45b653cf9308f3 Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 09:02:08 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC2' 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 7d9df05..49b79c0 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-RC2</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index a1ea3bf..a6207a5 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-RC2</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 7eaccc5..1f6b7f3 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-RC2</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index b5d5c9d..d7a061d 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-RC2</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index 48586fb..98d5f67 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-RC2</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 2b2c42dab27a4bb29ccf06947ea6e67a8b4a57c3 Merge: 9796dcf 40f1c32 Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 09:07:17 2015 +0000 Merge branch 'release/4.0-RC2' .../src/main/resources/db/4.0-RC2/clean-program-gear-type-H2.sql | 1 + .../src/main/resources/db/4.0-RC2/clean-program-gear-type-PG.sql | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --cc observe-entities/src/main/resources/db/4.0-RC2/clean-program-gear-type-PG.sql index 8116935,40a51c2..f816e95 --- a/observe-entities/src/main/resources/db/4.0-RC2/clean-program-gear-type-PG.sql +++ b/observe-entities/src/main/resources/db/4.0-RC2/clean-program-gear-type-PG.sql @@@ -23,4 -23,5 +23,5 @@@ ALTER TABLE observe_common.program ADD UPDATE observe_common.program set geartype2 = 0 WHERE geartype='seine'; UPDATE observe_common.program set geartype2 = 1 WHERE geartype='longline'; ALTER TABLE observe_common.program DROP COLUMN geartype; - ALTER TABLE observe_common.program RENAME geartype2 TO geartype; + ALTER TABLE observe_common.program RENAME geartype2 TO geartype; -UPDATE observe_common.program SET TOPIAVERSION = TOPIAVERSION + 1; ++UPDATE observe_common.program SET TOPIAVERSION = TOPIAVERSION + 1; -- 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 866219a8144de891bc586c83ac217fc4b3a1a43a Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 09:07:20 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 0b55a2f..49b79c0 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-RC3-SNAPSHOT</version> + <version>4.0-RC2</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 3b67f1b..a6207a5 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-RC3-SNAPSHOT</version> + <version>4.0-RC2</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index ab87ab1..1f6b7f3 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-RC3-SNAPSHOT</version> + <version>4.0-RC2</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 2f595ee..d7a061d 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-RC3-SNAPSHOT</version> + <version>4.0-RC2</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index c00c21f..98d5f67 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC3-SNAPSHOT</version> + <version>4.0-RC2</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 72573b7431eb0ddd5882b0b4ff194132cb553e1c Merge: 866219a 2b2c42d Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 09:07:21 2015 +0000 Merge branch 'master' into develop .../entities/longline/ActivityLonglineDAOImpl.java | 22 +++++++++++++++++++++ .../DataSourceMigrationForVersion_4_0_RC2.java | 22 +++++++++++++++++++++ .../entities/referentiel/ProgramDAOImpl.java | 22 +++++++++++++++++++++ .../entities/seine/ActivitySeineDAOImpl.java | 22 +++++++++++++++++++++ .../entities/seine/FloatingObjectDAOImpl.java | 22 +++++++++++++++++++++ .../ird/observe/entities/seine/RouteDAOImpl.java | 22 +++++++++++++++++++++ .../db/4.0-RC2/clean-program-gear-type-H2.sql | 21 ++++++++++++++++++++ .../db/4.0-RC2/clean-program-gear-type-PG.sql | 23 +++++++++++++++++++++- .../ird/observe/ui/tree/ActivityLonglineNode.java | 22 +++++++++++++++++++++ .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 22 +++++++++++++++++++++ .../fr/ird/observe/ui/tree/EntityNodeSupport.java | 22 +++++++++++++++++++++ .../observe/ui/tree/FloatingObjectSeineNode.java | 22 +++++++++++++++++++++ .../ird/observe/ui/tree/ProgramLonglineNode.java | 22 +++++++++++++++++++++ .../fr/ird/observe/ui/tree/ProgramSeineNode.java | 22 +++++++++++++++++++++ .../fr/ird/observe/ui/tree/RouteSeineNode.java | 22 +++++++++++++++++++++ .../fr/ird/observe/ui/tree/SetLonglineNode.java | 22 +++++++++++++++++++++ .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 22 +++++++++++++++++++++ .../fr/ird/observe/ui/tree/TripLonglineNode.java | 22 +++++++++++++++++++++ .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 22 +++++++++++++++++++++ 19 files changed, 417 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 68bcb1325d74d994e589906437cc21b808d82320 Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 09:07:22 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 49b79c0..0b55a2f 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</version> + <version>4.0-RC3-SNAPSHOT</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index a6207a5..3b67f1b 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</version> + <version>4.0-RC3-SNAPSHOT</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 1f6b7f3..ab87ab1 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</version> + <version>4.0-RC3-SNAPSHOT</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index d7a061d..2f595ee 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</version> + <version>4.0-RC3-SNAPSHOT</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index 98d5f67..c00c21f 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC2</version> + <version>4.0-RC3-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