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 bbce2eded12c44c84e6e018dfa0c3c113e59fd8d Merge: f326ae4 3133ba1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 23 21:58:55 2015 +0200 Migration vers ToPIA 3 (termine #7464) Merge branch 'feature/7464' into develop .../src/main/java/fr/ird/observe/DataService.java | 6 +- .../main/java/fr/ird/observe/db/DataSource.java | 2 +- .../java/fr/ird/observe/db/ReplicationService.java | 8 +- .../fr/ird/observe/db/impl/AbstractDataSource.java | 8 +- .../db/impl/AbstractDataSourceProvider.java | 1 - .../java/fr/ird/observe/db/impl/H2DataSource.java | 4 +- .../java/fr/ird/observe/db/impl/PGDataSource.java | 4 +- .../java/fr/ird/observe/db/util/TopiaExecutor.java | 2 +- .../fr/ird/observe/db/util/TopiaExecutor2.java | 2 +- .../fr/ird/observe/report/model/ReportExecute.java | 2 +- .../ird/observe/report/model/ReportOperation.java | 4 +- .../fr/ird/observe/report/model/ReportRequest.java | 6 +- .../report/model/operations/ExecuteRequests.java | 4 +- .../report/model/operations/GroupByLength.java | 4 +- .../observe/report/model/operations/SumColumn.java | 4 +- .../report/model/operations/SumIntColumn.java | 4 +- .../observe/report/model/operations/SumIntRow.java | 4 +- .../observe/report/model/operations/SumRow.java | 4 +- .../src/main/java/fr/ird/observe/util/Scripts.java | 30 +--- .../validation/ValidationMessageDetector.java | 2 +- .../ird/observe/validation/ValidationService.java | 2 +- .../test/java/fr/ird/observe/db/DBTestHelper.java | 31 ++++- .../java/fr/ird/observe/db/DataServiceTest.java | 3 +- .../fr/ird/observe/db/ReplicationServiceTest.java | 2 +- .../observe/db/impl/H2DataSourceConfigTest.java | 3 +- .../observe/db/impl/PGDataSourceConfigTest.java | 4 +- .../fr/ird/observe/its/DataSourceFactoryIT.java | 2 +- .../test/java/fr/ird/observe/its/PGInstallIT.java | 3 +- .../java/fr/ird/observe/its/RestoreEmptyPGIT.java | 3 +- .../its/migration/AbstractMigrationTest.java | 5 +- .../its/migration/PGDataSourceMigrationIT.java | 3 +- .../h2ToLast/AbstractH2MigrationToLastIT.java | 3 +- .../its/replication/AbstractReplicateDataTest.java | 6 +- .../AbstractReplicateReferentielTest.java | 6 +- .../its/replication/H2ReplicateDataTest.java | 8 +- .../its/replication/ReplicationDataModel.java | 8 +- .../ird/observe/its/report/AbstractReportIT.java | 3 +- observe-entities/pom.xml | 31 ++++- .../observe/ObserveTopiaApplicationContext.java | 129 +++++++++++++++++ .../fr/ird/observe/ObserveTopiaConfiguration.java | 25 ++++ .../observe/ObserveTopiaConfigurationFactory.java | 143 +++++++++++++++++++ .../java/fr/ird/observe/ObserveTopiaIdFactory.java | 23 +++ .../observe/ObserveTopiaPersistenceContext.java | 11 ++ .../java/fr/ird/observe/entities/Entities.java | 13 +- .../fr/ird/observe/entities/OpenableEntities.java | 14 +- ...eDAOImpl.java => ActivityLonglineTopiaDao.java} | 35 +++-- .../entities/longline/SectionWithTemplateImpl.java | 6 +- ...glineDAOImpl.java => TripLonglineTopiaDao.java} | 126 +++++++++-------- .../migration/AbstractDataSourceMigration.java | 42 ++---- .../AbstractObserveMigrationCallBack.java | 13 +- .../entities/migration/H2DataSourceMigration.java | 38 ++--- ...ObserveMigrationCallBackForVersionResolver.java | 4 +- .../entities/migration/ObserveMigrationEngine.java | 21 +++ .../entities/migration/PGDataSourceMigration.java | 41 +++--- .../DataSourceMigrationForVersion_3_1.java | 28 ++-- .../DataSourceMigrationForVersion_3_10.java | 7 +- .../DataSourceMigrationForVersion_3_11.java | 7 +- .../DataSourceMigrationForVersion_3_12.java | 7 +- .../DataSourceMigrationForVersion_3_14.java | 7 +- .../DataSourceMigrationForVersion_3_15.java | 7 +- .../DataSourceMigrationForVersion_3_16.java | 41 +++--- .../DataSourceMigrationForVersion_3_5.java | 44 +++--- .../DataSourceMigrationForVersion_3_7.java | 7 +- .../DataSourceMigrationForVersion_3_8.java | 7 +- .../DataSourceMigrationForVersion_3_9.java | 7 +- .../DataSourceMigrationForVersion_4_0.java | 9 +- .../DataSourceMigrationForVersion_4_0_1.java | 33 ++--- .../DataSourceMigrationForVersion_4_0_RC2.java | 11 +- .../DataSourceMigrationForVersion_4_0_RC3.java | 24 ++-- .../DataSourceMigrationForVersion_4_0_RC4.java | 9 +- .../DataSourceMigrationForVersion_4_0_RC6.java | 15 +- .../DataSourceMigrationForVersion_4_0_RC7.java | 7 +- .../referentiel/LengthWeightParemeterHelper.java | 14 +- .../{ProgramDAOImpl.java => ProgramTopiaDao.java} | 36 ++--- ...eineDAOImpl.java => ActivitySeineTopiaDao.java} | 35 +++-- ...ectDAOImpl.java => FloatingObjectTopiaDao.java} | 35 +++-- .../{RouteDAOImpl.java => RouteTopiaDao.java} | 47 +++---- ...ripSeineDAOImpl.java => TripSeineTopiaDao.java} | 69 +++++---- .../main/java/fr/ird/observe/util/DBHelper.java | 75 ---------- .../src/main/xmi/observe-common.properties | 18 ++- .../src/main/xmi/observe-longline.properties | 1 - .../src/main/xmi/observe-seine.properties | 13 +- .../ObserveTopiaApplicationContextTest.java | 69 +++++++++ .../LengthWeightParemeterHelperTest.java | 3 +- .../{DBHelperTest.java => util/NumbersTest.java} | 51 +------ .../operation/ObsoleteReferenceToReplace.java | 2 +- .../services/ObserveServiceApplicationContext.java | 37 +++++ .../observe/services/ObserveServiceContext.java | 18 +++ .../service/DataSourceDumpProducerService.java | 16 +++ .../services/service/DataSourceService.java | 20 ++- .../DatabaseConnexionNotAuthorizedException.java | 29 ++++ .../service/DatabaseNotFoundException.java | 26 ++++ .../services/service/seine/TripSeineService.java | 1 + observe-services-configuration-api/pom.xml | 7 - .../ObserveDataSourceConfiguration.java | 8 +- .../ObserveDataSourceConfigurationTopiaH2.java | 20 +++ .../ObserveDataSourceConfigurationTopiaPG.java | 8 ++ ...ObserveDataSourceConfigurationTopiaSupport.java | 15 ++ observe-services-model/pom.xml | 7 + .../dto/DataSourceCreateConfigurationDto.java | 102 ++++++++++++++ ...urceCreateWithNoReferentialImportException.java | 21 +++ ...ibleDataSourceCreateConfigurationException.java | 22 +++ observe-services-topia/pom.xml | 26 ++-- .../observe/services/AbstractObserveService.java | 4 +- .../observe/services/ReplicationServiceImpl.java | 8 +- .../LonglineDetailCompositionServiceImpl.java | 8 +- .../data/seine/NonTargetCatchServiceImpl.java | 4 +- .../data/seine/TargetCatchServiceImpl.java | 4 +- .../services/operation/SynchronizeServiceImpl.java | 4 +- .../services/ObserveServiceContextTopia.java | 66 ++++++--- .../services/ObserveServiceFactoryTopia.java | 131 +++--------------- .../ird/observe/services/ObserveServiceTopia.java | 45 +++--- .../ObserveTopiaApplicationContextFactory.java | 150 ++++++++++++++++++++ .../DataSourceDumpProducerServiceTopia.java | 21 +++ .../services/service/DataSourceServiceTopia.java | 153 ++++++++++++++++++++ .../service/seine/TripSeineServiceTopia.java | 6 +- .../{service => }/ApplicationContextResource.java | 52 ++++--- .../ird/observe/services/DataSourceResource.java | 147 ++++++++++++++++++++ .../services/ObserveServiceFactoryTopiaTaiste.java | 53 ------- .../services/service/DataSourceResource.java | 154 --------------------- .../service/DataSourceServiceTopiaTest.java | 144 +++++++++++++++++++ .../service/ReferentialServiceTopiaTest.java | 48 +++---- .../service/seine/TripSeineServiceTopiaTest.java | 37 +++-- observe-test-data/pom.xml | 5 + .../main/java/fr/ird/observe/test/TestHelper.java | 77 ++++++----- .../src/main}/resources/db/4.0.1/test.sql.gz | Bin pom.xml | 16 +-- 127 files changed, 2166 insertions(+), 1214 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.