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 79c895605c92ea5ff3ff0c5e0cf9d6e3ca1220dc Merge: 2ee467e d20bbc0 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 14 11:15:07 2015 +0200 [jgitflow-maven-plugin]merging 'release/4.0.1' into 'master' observe-business/pom.xml | 2 +- .../fr/ird/observe/ConsolidateDataService.java | 238 +++++++++--------- .../src/main/java/fr/ird/observe/DataService.java | 27 +- .../main/java/fr/ird/observe/DecoratorService.java | 1 + .../main/java/fr/ird/observe/IObserveConfig.java | 2 + .../fr/ird/observe/db/impl/H2DataSourceConfig.java | 4 +- .../java/fr/ird/observe/db/util/PGInstall.java | 65 ++++- .../i18n/observe-business_en_GB.properties | 1 + .../i18n/observe-business_es_ES.properties | 1 + .../i18n/observe-business_fr_FR.properties | 1 + .../src/test/resources/db/4.0.1/referentiel.sql.gz | Bin 0 -> 138260 bytes observe-entities/pom.xml | 2 +- .../java/fr/ird/observe/entities/Entities.java | 62 ++++- .../entities/longline/ActivityLonglineImpl.java | 35 ++- .../observe/entities/longline/SetLonglineImpl.java | 93 ++++++- .../migration/AbstractDataSourceMigration.java | 6 +- .../entities/migration/H2DataSourceMigration.java | 39 ++- .../entities/migration/PGDataSourceMigration.java | 39 ++- .../DataSourceMigrationForVersion_4_0_1.java | 215 ++++++++++++++++ .../observe/entities/seine/ActivitySeineImpl.java | 33 ++- .../src/main/java/fr/ird/observe/util/Numbers.java | 17 ++ .../main/resources/db/4.0.1/add-missing-fk-H2.sql | 26 ++ .../main/resources/db/4.0.1/add-missing-fk-PG.sql | 26 ++ .../resources/db/4.0.1/remove-gender-column-H2.sql | 22 ++ .../resources/db/4.0.1/remove-gender-column-PG.sql | 22 ++ .../src/main/xmi/observe-common.properties | 11 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 2 +- observe-swing/pom.xml | 3 +- .../extra/function_enhanced_sets_school_types.sql | 132 ++++++---- .../main/{resources => filters}/log4j.properties | 3 +- .../observe-log4j.properties} | 3 +- .../src/main/filters/observe-ui.properties | 1 - .../main/java/fr/ird/observe/ObserveCLAction.java | 43 ++-- .../main/java/fr/ird/observe/ObserveConfig.java | 83 +++++-- .../java/fr/ird/observe/ObserveConfigOption.java | 33 ++- .../fr/ird/observe/ObserveResourceManager.java | 18 +- .../main/java/fr/ird/observe/ObserveRunner.java | 82 ++++-- .../ird/observe/ui/content/ContentUIHandler.java | 22 ++ .../LonglineCompositionTableModelSupport.java | 21 +- .../impl/longline/SetLonglineUIHandler.java | 25 +- .../impl/longline/ActivityLonglineUIHandler.java | 16 +- .../open/impl/seine/ActivitySeineUIHandler.java | 11 + .../ird/observe/ui/content/ref/impl/PersonUI.css | 2 +- .../table/impl/longline/EncounterUIModel.java | 4 +- ...rUseFeaturesMeasurementLonglinesTableModel.java | 11 + ...GearUseFeaturesMeasurementSeinesTableModel.java | 11 + .../ui/storage/StorageBackupUILauncher.java | 5 +- .../ird/observe/ui/storage/StorageUIHandler.java | 10 +- .../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 +- .../field/ObserveCollectionUniqueKeyValidator.java | 276 +++++++++++++++++++++ ...hWeightParameter-n1-create-error-validation.xml | 34 ++- ...hWeightParameter-n1-update-error-validation.xml | 34 ++- .../i18n/observe-validation_fr_FR.properties | 2 +- .../src/main/resources/validators.xml | 1 + pom.xml | 24 +- 59 files changed, 1551 insertions(+), 363 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.