This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 2fda67c153b45098db89e57a3f18e5b972b26d5d Merge: 6727083 8083eb1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 7 17:31:07 2016 +0200 on repasse sur develop pour avancer même si le point n'est pas complètement traité :(. Merge branch 'feature/8089' into develop echobase-domain/pom.xml | 1 + .../java/fr/ifremer/echobase/FixedH2Dialect.java | 48 ++++++++++++++++++++++ .../echobase/entities/AbstractEchoBaseDao.java | 5 +-- .../fr/ifremer/echobase/entities/DriverType.java | 14 ++++--- .../EchoBaseUserTopiaApplicationContext.java | 2 +- .../echobase/entities/EchoBaseUserTopiaDao.java | 10 ++--- .../EchoBaseUserTopiaPersistenceContext.java | 9 ++-- .../echobase/entities/data/EchotypeTopiaDao.java | 1 - .../echobase/persistence/EchoBaseEntityHelper.java | 31 +++++++------- .../persistence/EchoBasePersistenceHelper.java | 18 ++------ .../EchobaseTopiaApplicationContexts.java | 8 ++++ .../echobase/persistence/JdbcConfiguration.java | 20 ++++----- .../EchoBaseMigrationCallBackResolver.java | 23 ++++++----- .../internalDb/MigrationCallBackForVersion.java | 3 +- .../internalDb/MigrationCallBackForVersion2_2.java | 29 +++++++------ .../migration/internalDb/MigrationCallback.java | 18 +++----- .../workingDb/MigrationCallBackForVersion.java | 44 +++++++++++++++++--- .../workingDb/MigrationCallBackForVersion2_2.java | 33 +++++++-------- .../MigrationCallBackForVersion2_5_1.java | 11 ++--- .../workingDb/MigrationCallBackForVersion2_6.java | 39 +++++++++--------- .../MigrationCallBackForVersion2_6_1.java | 18 ++++---- .../MigrationCallBackForVersion2_7_2.java | 25 +++++------ .../MigrationCallBackForVersionPostgresql.java} | 30 +++++--------- .../migration/workingDb/MigrationCallback.java | 11 +---- .../main/resources/echobase-internaldb.properties | 5 +-- .../main/resources/echobase-workingdb.properties | 5 +-- .../src/main/xmi/echobase-internal.properties | 10 +++-- echobase-domain/src/main/xmi/echobase.properties | 16 +++++--- .../echobase/services/service/DbEditorService.java | 15 +++++-- .../echobase/services/service/UserService.java | 15 ++++++- .../EmbeddedApplicationService.java | 2 +- .../services/service/exportdb/ExportDbService.java | 41 +++++++++--------- .../services/FakeEchoBaseServiceContext.java | 4 +- .../removedata/AbstractRemoveDataServiceTest.java | 3 +- pom.xml | 12 +++--- 35 files changed, 330 insertions(+), 249 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.