[Topia-commits] branch master updated (ca138cf -> 5040793)

This is an automated email from the git hooks/post-receive script. New change to branch master in repository topia. See http://git.nuiton.org/topia.git from ca138cf Merge branch 'release/3.0-beta-15' adds 02493a4 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 8faa34e Merge branch 'master' into develop adds 95f5804 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds c2fa911 Introduce TopiaConfiguration with two implementation (bean and properties backed), introduce HibernateTopiaMigrationService, remove obsolete method on TopiaService, rewrite HibernateProvider#newConfiguration to remove all unused tricks, change some signatures to use Set instead of arrays adds 50b2e13 Adding some entry method in Builder adds 2bf5628 fix NPE adds 87b6e04 refs #2892 Generate ApplicationContext contructor based on TopiaConfiguration adds f2169a5 fix build except migration engine test adds 858464b Introduce JdbcConfiguration contract, use it when appropriate, make topia-service-flyway build adds 0fe85a4 use JdbcHelper in tests adds 48b0242 Fix build of topia flyway service adds b70dfa1 Fix build of topia migration service adds fc608df Remove TopiaSchemaHelper class which content has been moved into TopiaItMappingTopiaApplicationContext#createSchema() adds a261bc0 Review some builder method names adds cd45d60 Move configuration in properties reading in builder, refactor BeanTopiaConfiguration to extends BeanJdbcConfiguration adds 9134582 Deprecate everything in TopiaConfigurationConstants adds e9195eb Introduce HibernateAvailableSettings adds 2e409ec Implements a method to convert TopiaConfiguration to Map adds 3a3b569 Convention on builders adds 2da54fd Use interface AvailableSettings where possible instead of a Hibernate subclass adds 3e5ee7d Deprecate TopiaH2Util and move API to JdbcH2Helper adds 582cfed refs #2892 Delegate methods from JdbcConfigurationBuilder to TopiaConfigurationBuilder adds 9d93f47 refs #2892 Fix TopiaConnectionProviderTest adds f7ee5db Configuration is now Serializable adds 5c6e6d8 Implements guessHibernateDialect adds d67aa11 Allow user to instantiate TopiaIdFactory adds 098f5b7 Enable connection pooling by default adds 85d6120 Make builders instantiables adds 8837683 fix dialect detection for H2 compatibility mode adds 4fe77ed log properties before starting hibernate provider adds a3a33ad Remove TopiaConfiguration.builder adds 15ceae1 Code review adds 504ac56 Merge branch 'feature/2892' into develop adds 841c333 Set default TopiaIdFactory to 'FullyQualifiedNamePlusUuidTopiaIdFactory' adds f2d8d57 refs #2892 Fix setTopiaIdFactory(...) only if necessary adds d50e212 refs #2892 Fix Ano-1640 IT adds 085a3e6 refs #2892 fix maven dependency issues adds cd25c6a refs #2892 Keep ToPIA Java 1.6 compatible adds c35d450 Fix missing file headers adds 1b14da6 Bullshit adds 61f31da Introduce TopiaConfiguration#isValidateSchema and implement it adds bfff0f4 fix wrong test on configuration properties generation adds 5938b9f Merge branch 'feature/3685' into develop (fixes #3685) adds 371011e Use pom 2.0 adds 92dfd24 Downgrade H2 to 1.3 to make the build stable adds 19a59bb [jgitflow-maven-plugin]updating poms for 3.0-beta-17 branch with snapshot versions adds 89a3c59 Add missing file header adds 6e00dbc [jgitflow-maven-plugin]updating poms for branch'release/3.0-beta-17' with non-snapshot versions adds 5040793 [jgitflow-maven-plugin]merging 'release/3.0-beta-17' into 'master' No new revisions were added by this update. Summary of changes: pom.xml | 16 +- topia-it/pom.xml | 7 +- .../topia/testabstract/TopiaAbstractTest.java | 2 +- ...TopiaDatabase.java => TopiaIt1640Database.java} | 18 +- .../nuiton/topia/it/TopiaConfigurationHelper.java | 126 ------ .../org/nuiton/topia/it/TopiaSchemaHelper.java | 109 ------ .../AbstractTopiaItLegacyApplicationContext.java | 5 + .../TopiaItMappingTopiaApplicationContext.java | 56 +++ .../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/pom.xml | 26 +- .../topia/junit/AbstractDatabaseResource.java | 119 +----- .../nuiton/topia/junit/ConfigurationHelper.java | 93 ----- topia-persistence/pom.xml | 12 +- .../topia/persistence/BeanTopiaConfiguration.java | 162 ++++++++ ...nation.java => HibernateAvailableSettings.java} | 27 +- .../HibernateTopiaMigrationService.java} | 34 +- .../SchemaValidationTopiaException.java | 71 ++++ .../topia/persistence/TopiaApplicationContext.java | 5 +- .../persistence/TopiaApplicationContextCache.java | 15 +- .../topia/persistence/TopiaConfiguration.java | 88 +++++ .../persistence/TopiaConfigurationBuilder.java | 428 +++++++++++++++++++++ .../persistence/TopiaConfigurationConstants.java | 114 ++++-- .../nuiton/topia/persistence/TopiaIdFactory.java | 11 +- ...on.java => TopiaMisconfigurationException.java} | 27 +- .../org/nuiton/topia/persistence/TopiaService.java | 7 - .../internal/AbstractTopiaApplicationContext.java | 153 +++----- .../internal/DefaultTopiaIdFactory.java | 90 +---- ... 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 | 73 ++++ .../JdbcConfiguration.java} | 48 +-- .../persistence/jdbc/JdbcConfigurationBuilder.java | 261 +++++++++++++ .../topia/persistence/jdbc/JdbcH2Helper.java | 119 ++++++ .../nuiton/topia/persistence/jdbc/JdbcHelper.java | 166 ++++++++ .../nuiton/topia/persistence/util/TopiaH2Util.java | 10 +- .../nuiton/topia/persistence/util/TopiaUtil.java | 54 +-- ...lyQualifiedNamePlusUuidTopiaIdFactoryTest.java} | 10 +- .../persistence/TopiaConfigurationBuilderTest.java | 108 ++++++ .../internal/support/MyFirstTopiaServiceImpl.java | 5 - .../internal/support/MySecondTopiaServiceImpl.java | 5 - .../support/TopiaServiceSupportImplTest.java | 91 ----- topia-service-csv/pom.xml | 2 +- topia-service-flyway/pom.xml | 2 +- .../topia/flyway/TopiaFlywayServiceImpl.java | 17 +- .../TopiaServiceFlywayInitOnCreateSchemaTest.java | 171 +++----- .../src/test/resources/log4j.properties | 2 +- topia-service-liquibase/pom.xml | 2 +- .../topia/liquibase/TopiaLiquibaseServiceImpl.java | 15 +- topia-service-migration/pom.xml | 2 +- .../topia/migration/TopiaMigrationEngine.java | 35 +- .../topia/migration/TopiaMigrationService.java | 2 +- .../topia/migration/TopiaMigrationEngineTest.java | 233 +++-------- topia-service-replication/pom.xml | 2 +- .../replication/TopiaReplicationServiceImpl.java | 6 - .../AbstractTopiaReplicationServiceTest.java | 16 +- .../replication/TopiaReplicationOperationTest.java | 52 +-- .../TopiaReplicationServiceImplAllTest.java | 57 +-- .../TopiaReplicationServiceImplTest.java | 59 +-- topia-templates/pom.xml | 2 +- .../templates/ApplicationContextTransformer.java | 15 +- .../topia/templates/EntityEnumTransformer.java | 32 +- 121 files changed, 2402 insertions(+), 2675 deletions(-) rename topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/{TopiaDatabase.java => TopiaIt1640Database.java} (64%) delete mode 100644 topia-it/src/main/java/org/nuiton/topia/it/TopiaConfigurationHelper.java delete mode 100644 topia-it/src/main/java/org/nuiton/topia/it/TopiaSchemaHelper.java create mode 100644 topia-it/src/main/java/org/nuiton/topia/it/mapping/TopiaItMappingTopiaApplicationContext.java delete mode 100644 topia-it/src/main/resources/TopiaContextImpl.properties delete mode 100644 topia-it/src/test/java/org/nuiton/topia/it/legacy/TestHelper.java delete mode 100644 topia-it/src/test/java/org/nuiton/topia/it/legacy/TopiaApplicationContextCacheTest.java delete mode 100644 topia-it/src/test/java/org/nuiton/topia/it/mapping/TopiaItMappingDatabase.java delete mode 100644 topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaSchemaCreationTest.java delete mode 100644 topia-it/src/test/resources/TopiaConnectionProviderHardcoded.properties delete mode 100644 topia-junit/src/main/java/org/nuiton/topia/junit/ConfigurationHelper.java create mode 100644 topia-persistence/src/main/java/org/nuiton/topia/persistence/BeanTopiaConfiguration.java copy topia-persistence/src/main/java/org/nuiton/topia/persistence/{TopiaReplicationDestination.java => HibernateAvailableSettings.java} (58%) copy topia-persistence/src/{test/java/org/nuiton/topia/persistence/internal/support/MySecondTopiaServiceImpl.java => main/java/org/nuiton/topia/persistence/HibernateTopiaMigrationService.java} (60%) create mode 100644 topia-persistence/src/main/java/org/nuiton/topia/persistence/SchemaValidationTopiaException.java create mode 100644 topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfiguration.java create mode 100644 topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java copy topia-persistence/src/main/java/org/nuiton/topia/persistence/{TopiaMigrationServiceException.java => TopiaMisconfigurationException.java} (56%) copy topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/{DefaultTopiaIdFactory.java => FullyQualifiedNamePlusUuidTopiaIdFactory.java} (93%) create mode 100644 topia-persistence/src/main/java/org/nuiton/topia/persistence/jdbc/BeanJdbcConfiguration.java copy topia-persistence/src/main/java/org/nuiton/topia/persistence/{support/TopiaHibernateSupport.java => jdbc/JdbcConfiguration.java} (54%) create mode 100644 topia-persistence/src/main/java/org/nuiton/topia/persistence/jdbc/JdbcConfigurationBuilder.java create mode 100644 topia-persistence/src/main/java/org/nuiton/topia/persistence/jdbc/JdbcH2Helper.java create mode 100644 topia-persistence/src/main/java/org/nuiton/topia/persistence/jdbc/JdbcHelper.java rename topia-persistence/src/test/java/org/nuiton/topia/persistence/{DefaultTopiaIdFactoryTest.java => FullyQualifiedNamePlusUuidTopiaIdFactoryTest.java} (90%) create mode 100644 topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaConfigurationBuilderTest.java delete mode 100644 topia-persistence/src/test/java/org/nuiton/topia/persistence/internal/support/TopiaServiceSupportImplTest.java -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.