This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See http://git.nuiton.org/topia.git commit 504ac56027b351284e78cb1fe8b60cf41dc2f8b4 Merge: 95f5804 15ceae1 Author: Arnaud Thimel <thimel@codelutin.com> Date: Fri Mar 13 14:54:56 2015 +0100 Merge branch 'feature/2892' into develop pom.xml | 7 + .../nuiton/topia/it/TopiaConfigurationHelper.java | 126 ------- .../org/nuiton/topia/it/TopiaSchemaHelper.java | 109 ------ .../AbstractTopiaItLegacyApplicationContext.java | 5 + .../TopiaItMappingTopiaApplicationContext.java | 34 ++ .../src/main/resources/TopiaContextImpl.properties | 39 --- .../nuiton/topia/it/legacy/AbstractLegacyTest.java | 2 - .../org/nuiton/topia/it/legacy/TestHelper.java | 173 ---------- .../legacy/TopiaApplicationContextCacheTest.java | 206 ------------ .../topia/it/legacy/TopiaItLegacyDatabase.java | 23 +- .../topia/it/legacy/TopiaJpaSupportTest.java | 11 +- .../it/legacy/evo3396/FetchPropertiesTest.java | 17 +- .../TopiaConnectionProviderHardCoded.java | 30 +- .../framework/TopiaConnectionProviderTest.java | 99 +++--- .../framework/TopiaContextReplicateTest.java | 30 +- .../topia/it/legacy/framework/TopiaUtilTest.java | 27 +- .../topia/it/legacy/generator/TopiaTestCase.java | 4 +- .../persistence/EntityVisitorExportXmlTest.java | 4 +- .../topia/it/legacy/persistence/NaturalIdTest.java | 10 +- .../persistence/util/TopiaEntityHelperTest.java | 4 +- .../test/ano1882/DAOAbstractTransformerTest.java | 2 +- .../topia/it/legacy/topiatest/CascadeSaveTest.java | 2 +- .../nuiton/topia/it/legacy/topiatest/EnumTest.java | 4 +- .../topiatest/deletetest/DeleteEntityTest.java | 6 +- .../topia/it/mapping/AbstractMappingTest.java | 13 +- .../topia/it/mapping/TopiaItMappingDatabase.java | 101 ------ .../test1/BiDirectionalOneToManyRelationTest.java | 2 +- ...ectionalOneToManyRelationWithRoleNamedTest.java | 2 +- .../mapping/test1/SimpleOneToManyRelationTest.java | 2 +- .../SimpleOneToManyRelationWithRoleNamedTest.java | 2 +- .../test11/EntityWithBasicUniqueFieldsTest.java | 2 +- .../mapping/test11/SimpleManyToManyUniqueTest.java | 2 +- .../SimpleManyToManyWithRoleNamedUniqueTest.java | 2 +- .../mapping/test11/SimpleOneToManyUniqueTest.java | 2 +- .../SimpleOneToManyWithRoleNamedUniqueTest.java | 2 +- .../test12/EntityWithBasicNotNullFieldsTest.java | 2 +- .../it/mapping/test13/EntityWithNaturalIdTest.java | 2 +- .../mapping/test14/BidiAssociationClassTest.java | 2 +- .../test14/ManyToManyAssociationClassTest.java | 2 +- .../test14/OneToManyAssociationClassTest.java | 2 +- .../topia/it/mapping/test17/FixAno2342Test.java | 2 +- .../topia/it/mapping/test17/FixAno3280Test.java | 18 +- .../test2/BiDirectionalManyToOneRelationTest.java | 2 +- ...ectionalManyToOneRelationWithRoleNamedTest.java | 2 +- .../mapping/test2/SimpleManyToOneRelationTest.java | 2 +- .../SimpleManyToOneRelationWithRoleNamedTest.java | 2 +- .../test3/BiDirectionalManyToManyRelationTest.java | 2 +- ...ctionalManyToManyRelationWithRoleNamedTest.java | 2 +- .../test3/SimpleManyToManyRelationTest.java | 2 +- .../SimpleManyToManyRelationWithRoleNamedTest.java | 2 +- .../it/mapping/test4/ElementCollectionTest.java | 2 +- .../BiDirectionalOneToManyCompositionTest.java | 2 +- .../it/mapping/test5/OneToManyCompositionTest.java | 2 +- .../mapping/test6/SimpleOneToManyIndexedTest.java | 2 +- .../SimpleOneToManyWithRoleNamedIndexedTest.java | 2 +- .../mapping/test7/SimpleOneToManyOrderByTest.java | 2 +- .../mapping/test7/SimpleOneToManyOrderedTest.java | 2 +- .../persistence/internal/EntityListenerTest.java | 14 +- .../topia/persistence/internal/TopiaDaoTest.java | 2 +- .../persistence/internal/TopiaIdFactoryTest.java | 2 +- .../internal/TopiaSchemaCreationTest.java | 251 -------------- .../TopiaConnectionProviderHardcoded.properties | 34 -- .../topia/junit/AbstractDatabaseResource.java | 119 +------ .../nuiton/topia/junit/ConfigurationHelper.java | 93 ------ topia-persistence/pom.xml | 5 + .../topia/persistence/BeanTopiaConfiguration.java | 129 ++++++++ .../persistence/HibernateAvailableSettings.java | 20 ++ .../HibernateTopiaMigrationService.java | 34 ++ .../topia/persistence/TopiaApplicationContext.java | 5 +- .../persistence/TopiaApplicationContextCache.java | 15 +- .../topia/persistence/TopiaConfiguration.java | 57 ++++ .../persistence/TopiaConfigurationBuilder.java | 365 +++++++++++++++++++++ .../persistence/TopiaConfigurationConstants.java | 114 +++++-- .../nuiton/topia/persistence/TopiaIdFactory.java | 11 +- .../TopiaMisconfigurationException.java | 25 ++ .../org/nuiton/topia/persistence/TopiaService.java | 7 - .../internal/AbstractTopiaApplicationContext.java | 153 +++------ .../internal/DefaultTopiaIdFactory.java | 104 +----- ... FullyQualifiedNamePlusUuidTopiaIdFactory.java} | 9 +- .../persistence/internal/HibernateProvider.java | 246 +++++++------- .../persistence/internal/LegacyTopiaIdFactory.java | 2 + .../persistence/internal/ShortTopiaIdFactory.java | 23 +- .../internal/TopiaConnectionProvider.java | 15 +- .../internal/support/TopiaServiceSupportImpl.java | 99 ++---- .../persistence/jdbc/BeanJdbcConfiguration.java | 51 +++ .../topia/persistence/jdbc/JdbcConfiguration.java | 26 ++ .../persistence/jdbc/JdbcConfigurationBuilder.java | 239 ++++++++++++++ .../topia/persistence/jdbc/JdbcH2Helper.java | 97 ++++++ .../nuiton/topia/persistence/jdbc/JdbcHelper.java | 119 +++++++ .../nuiton/topia/persistence/util/TopiaH2Util.java | 10 +- .../nuiton/topia/persistence/util/TopiaUtil.java | 43 ++- ...lyQualifiedNamePlusUuidTopiaIdFactoryTest.java} | 10 +- .../persistence/TopiaConfigurationBuilderTest.java | 85 +++++ .../internal/support/MyFirstTopiaServiceImpl.java | 5 - .../internal/support/MySecondTopiaServiceImpl.java | 5 - .../support/TopiaServiceSupportImplTest.java | 91 ----- .../topia/flyway/TopiaFlywayServiceImpl.java | 17 +- .../TopiaServiceFlywayInitOnCreateSchemaTest.java | 171 +++------- .../src/test/resources/log4j.properties | 2 +- .../topia/liquibase/TopiaLiquibaseServiceImpl.java | 15 +- .../topia/migration/TopiaMigrationEngine.java | 35 +- .../topia/migration/TopiaMigrationService.java | 2 +- .../topia/migration/TopiaMigrationEngineTest.java | 230 +++---------- .../replication/TopiaReplicationServiceImpl.java | 6 - .../AbstractTopiaReplicationServiceTest.java | 16 +- .../replication/TopiaReplicationOperationTest.java | 52 +-- .../TopiaReplicationServiceImplAllTest.java | 57 +--- .../TopiaReplicationServiceImplTest.java | 59 +--- .../templates/ApplicationContextTransformer.java | 15 +- .../topia/templates/EntityEnumTransformer.java | 32 +- 110 files changed, 2045 insertions(+), 2564 deletions(-) diff --cc topia-service-liquibase/src/main/java/org/nuiton/topia/liquibase/TopiaLiquibaseServiceImpl.java index 203fe67,973bea5..dc12623 --- a/topia-service-liquibase/src/main/java/org/nuiton/topia/liquibase/TopiaLiquibaseServiceImpl.java +++ b/topia-service-liquibase/src/main/java/org/nuiton/topia/liquibase/TopiaLiquibaseServiceImpl.java @@@ -156,12 -151,12 +151,12 @@@ public class TopiaLiquibaseServiceImpl } protected Database openDatabase(TopiaApplicationContext topiaApplicationContext, ResourceAccessor resourceAccessor) { - Map<String, String> configuration = topiaApplicationContext.getConfiguration(); - String url = configuration.get(TopiaConfigurationConstants.CONFIG_URL); - String user = configuration.get(TopiaConfigurationConstants.CONFIG_USER); - String password = configuration.get(TopiaConfigurationConstants.CONFIG_PASS); + JdbcConfiguration configuration = topiaApplicationContext.getConfiguration(); + String url = configuration.getJdbcConnectionUrl(); + String user = configuration.getJdbcConnectionUser(); + String password = configuration.getJdbcConnectionPassword(); try { - Database database = DatabaseFactory.getInstance().openDatabase(url, user, password, resourceAccessor); + Database database = DatabaseFactory.getInstance().openDatabase(url, user, password, null, resourceAccessor); return database; } catch (DatabaseException e) { throw new TopiaMigrationServiceException("cannot get database for migration connection", e); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.