This is an automated email from the git hooks/post-receive script. New change to branch master in repository topia-2.x. See https://gitlab.nuiton.org/nuiton/topia-2.x.git from 85f5dac [jgitflow-maven-plugin]merging 'release/2.11' into 'master' adds adde769 [jgitflow-maven-plugin]updating poms for 2.12-SNAPSHOT development adds 2ea7dcb [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds fda82d2 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 35587b1 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds c63c063 refs #3784: Update to Hibernate 5 adds 102a334 refs #3784: Update to Hibernate 5 adds 1b9ef1b No special reason to fix javassist version adds a34f43f refs #3784: Update to hibernate 5.1 adds 45deac9 refs #3784: readd updateSchema method adds c40d5de Fix build adds 4e1f64f refs #3902: Update h2 adds 83a6dc1 refs #3902: Update guava adds 9f33ee4 FIx javadoc adds d1166fc refs #3902: Update commons-collections4, remove commons-collection3 adds 10b250d refs #3902: Update commons-logging adds 0564f07 refs #3902: Update junit adds 7878c1c refs #3902: Update commons-lang3 adds 90981be refs #3902: Update nuiton-csv adds 369f650 refs #3902: Update nuiton-decorator adds 2e207e7 refs #3902: Update nuiton-utils adds 2f2f530 refs #3902: Update eugene adds b9c2ea2 fixes #3902: Update slf4j adds e412896 fix javadoc 8 adds 2b8fd64 Update parent pom adds 8224189 refs #3902: Update libs adds 4e25168 fixes #4000: Add oldState informations in case of updateEvent for TopiaEntityListener adds fd4ea18 Test to remove FQN adds 8ca0219 refs #3902: Update libs adds db4697d refs #3784: Fix database information usage adds b41308a fixes bug in visitor pattern for attribut not navigable adds 3000ad5 refs #3902: Update guava adds bf2081b refs #3902: Update hibenate adds dc2c3ed refs #3902: Update slf4j adds 427e37e refs #3902: Update libs adds ec02aec Fixes event adds 903d93e refs #3902: Update libs adds 4529974 refs #3902: Fix tests adds 27dca55 fixes #4162: Disable topia-service-security module (not compilable) adds 60540b4 fix scm adds dd11390 [jgitflow-maven-plugin]updating poms for branch'release/2.12' with non-snapshot versions adds 0aba4be [jgitflow-maven-plugin]merging 'release/2.12' into 'master' No new revisions were added by this update. Summary of changes: .gitignore | 5 + README.txt => README.md | 0 pom.xml | 103 ++++------ topia-persistence/{README.txt => README.md} | 0 topia-persistence/pom.xml | 21 +- .../topia/testabstract/TopiaAbstractTest.java | 7 +- .../src/test/resources/TopiaContextImpl.properties | 2 +- .../src/license/THIRD-PARTY.properties | 36 +--- .../main/java/org/nuiton/topia/TopiaContext.java | 12 +- .../java/org/nuiton/topia/TopiaContextFactory.java | 15 +- .../main/java/org/nuiton/topia/TopiaException.java | 2 +- .../org/nuiton/topia/TopiaNotFoundException.java | 2 +- .../org/nuiton/topia/TopiaRuntimeException.java | 2 +- .../java/org/nuiton/topia/TopiaVetoException.java | 2 +- .../nuiton/topia/event/TopiaContextAdapter.java | 4 +- .../org/nuiton/topia/event/TopiaContextEvent.java | 2 +- .../nuiton/topia/event/TopiaContextListener.java | 4 +- .../org/nuiton/topia/event/TopiaEntitiesEvent.java | 2 +- .../nuiton/topia/event/TopiaEntitiesVetoable.java | 2 +- .../org/nuiton/topia/event/TopiaEntityEvent.java | 25 ++- .../nuiton/topia/event/TopiaEntityListener.java | 4 +- .../nuiton/topia/event/TopiaEntityVetoable.java | 4 +- .../nuiton/topia/event/TopiaTransactionEvent.java | 8 +- .../topia/event/TopiaTransactionListener.java | 10 +- .../topia/event/TopiaTransactionVetoable.java | 4 +- .../org/nuiton/topia/framework/EntityFilter.java | 2 +- .../org/nuiton/topia/framework/EntityState.java | 46 ++--- .../topia/framework/TopiaConnectionProvider.java | 22 +- .../nuiton/topia/framework/TopiaContextImpl.java | 183 ++++++++--------- .../topia/framework/TopiaContextImplementor.java | 33 +-- .../org/nuiton/topia/framework/TopiaFilter.java | 2 +- .../nuiton/topia/framework/TopiaFiresSupport.java | 24 +-- .../org/nuiton/topia/framework/TopiaQuery.java | 38 ++-- .../org/nuiton/topia/framework/TopiaSQLQuery.java | 2 +- .../org/nuiton/topia/framework/TopiaService.java | 24 +-- .../topia/framework/TopiaTransactionAware.java | 8 +- .../java/org/nuiton/topia/framework/TopiaUtil.java | 221 ++++++++++----------- .../org/nuiton/topia/framework/package-info.java | 8 +- .../topia/generator/BinderHelperTransformer.java | 4 +- .../topia/generator/DAOAbstractTransformer.java | 31 ++- .../topia/generator/DAOHelperTransformer.java | 2 +- .../nuiton/topia/generator/DAOImplTransformer.java | 8 +- .../org/nuiton/topia/generator/DAOTransformer.java | 2 +- .../org/nuiton/topia/generator/DTOTransformer.java | 2 +- .../topia/generator/EntityDAOTransformer.java | 6 +- .../topia/generator/EntityDTOTransformer.java | 2 +- .../generator/EntityHibernateMappingGenerator.java | 45 ++--- .../nuiton/topia/generator/EntityTransformer.java | 7 +- .../topia/generator/QueryHelperTransformer.java | 2 +- .../nuiton/topia/generator/ServiceTransformer.java | 7 +- .../nuiton/topia/generator/TopiaGeneratorUtil.java | 93 +++++---- .../nuiton/topia/generator/TopiaJavaValidator.java | 2 +- .../topia/generator/TopiaMetaTransformer.java | 2 +- .../topia/generator/TopiaRelationValidator.java | 2 +- .../nuiton/topia/generator/TopiaStereoTypes.java | 2 +- .../org/nuiton/topia/generator/TopiaTagValues.java | 20 +- .../org/nuiton/topia/generator/package-info.java | 2 +- .../topia/persistence/DepthEntityVisitor.java | 4 +- .../nuiton/topia/persistence/EntityVisitor.java | 16 +- .../topia/persistence/HorizontalEntityVisitor.java | 4 +- .../org/nuiton/topia/persistence/SearchFields.java | 2 +- .../org/nuiton/topia/persistence/TopiaDAO.java | 32 +-- .../topia/persistence/TopiaDAODeprecated.java | 4 +- .../org/nuiton/topia/persistence/TopiaDAOImpl.java | 14 +- .../nuiton/topia/persistence/TopiaDAOLegacy.java | 6 +- .../org/nuiton/topia/persistence/TopiaEntity.java | 8 +- .../topia/persistence/TopiaEntityAbstract.java | 2 +- .../nuiton/topia/persistence/TopiaEntityEnum.java | 28 +-- .../java/org/nuiton/topia/persistence/TopiaId.java | 26 +-- .../topia/persistence/TopiaPersistenceHelper.java | 2 +- .../topia/persistence/csv/CsvProgressModel.java | 2 +- .../topia/persistence/csv/EntityCsvModel.java | 2 +- .../topia/persistence/csv/TopiaCsvCommons.java | 14 +- .../persistence/csv/in/AbstractImportModel.java | 2 +- .../persistence/csv/in/CsvFileImportResult.java | 2 +- .../topia/persistence/csv/in/CsvImportResult.java | 2 +- .../csv/in/EntityAssociationImportModel.java | 2 +- .../persistence/csv/in/ImportModelFactory.java | 2 +- .../topia/persistence/csv/in/ImportStrategy.java | 4 +- .../topia/persistence/csv/in/TopiaCsvImports.java | 8 +- .../topia/persistence/csv/in/package-info.java | 2 +- .../csv/out/EntityAssociationExportModel.java | 2 +- .../persistence/csv/out/ExportEntityVisitor.java | 6 +- .../persistence/csv/out/ExportModelFactory.java | 2 +- .../persistence/csv/out/PrepareDataForExport.java | 2 +- .../topia/persistence/csv/out/TopiaCsvExports.java | 6 +- .../topia/persistence/csv/out/package-info.java | 2 +- .../nuiton/topia/persistence/csv/package-info.java | 2 +- .../persistence/metadata/AssociationMeta.java | 2 +- .../topia/persistence/metadata/ColumnMeta.java | 2 +- .../nuiton/topia/persistence/metadata/DbMeta.java | 2 +- .../persistence/metadata/MetaFilenameAware.java | 2 +- .../topia/persistence/metadata/Metadatas.java | 2 +- .../topia/persistence/metadata/TableMeta.java | 2 +- .../topia/persistence/metadata/package-info.java | 6 +- .../org/nuiton/topia/persistence/package-info.java | 6 +- .../nuiton/topia/persistence/pager/FilterRule.java | 2 +- .../persistence/pager/FilterRuleGroupOperator.java | 2 +- .../persistence/pager/FilterRuleOperator.java | 2 +- .../topia/persistence/pager/TopiaPagerBean.java | 4 +- .../persistence/pager/TopiaPagerBeanBuilder.java | 2 +- .../nuiton/topia/persistence/util/Collector.java | 6 +- .../org/nuiton/topia/persistence/util/Creator.java | 8 +- .../nuiton/topia/persistence/util/DBMapping.java | 4 +- .../org/nuiton/topia/persistence/util/Deletor.java | 2 +- .../nuiton/topia/persistence/util/DiffState.java | 8 +- .../topia/persistence/util/EntityListUpdator.java | 4 +- .../topia/persistence/util/EntityOperator.java | 42 ++-- .../persistence/util/EntityOperatorStore.java | 2 +- .../nuiton/topia/persistence/util/ListUpdator.java | 4 +- .../org/nuiton/topia/persistence/util/Loador.java | 6 +- .../topia/persistence/util/TopiaEntityBinder.java | 6 +- .../topia/persistence/util/TopiaEntityHelper.java | 12 +- .../topia/persistence/util/TopiaEntityIdsMap.java | 2 +- .../topia/persistence/util/TopiaEntityMap.java | 4 +- .../topia/persistence/util/TopiaEntityRef.java | 4 +- .../src/site/rst/devel/HibernateMapping.rst | 4 +- .../src/test/java/org/nuiton/topia/TestHelper.java | 2 +- .../org/nuiton/topia/TopiaContextFactoryTest.java | 10 +- .../test/java/org/nuiton/topia/TopiaDatabase.java | 6 +- .../nuiton/topia/framework/EntityStateTest.java | 6 +- .../TopiaConnectionProviderHardCoded.java | 2 +- .../framework/TopiaConnectionProviderTest.java | 2 +- .../topia/framework/TopiaContextImplTest.java | 45 +++-- .../topia/framework/TopiaContextReplicateTest.java | 2 +- .../org/nuiton/topia/framework/TopiaUtilTest.java | 4 +- .../generator/QueryHelperTransformerTest.java | 2 +- .../topia/generator/TopiaGeneratorUtilTest.java | 2 +- .../org/nuiton/topia/generator/TopiaTestCase.java | 2 +- .../persistence/EntityVisitorExportXmlTest.java | 6 +- .../nuiton/topia/persistence/ExportXMLVisitor.java | 2 +- .../nuiton/topia/persistence/NaturalIdTest.java | 4 +- .../topia/persistence/TopiaContextFindTest.java | 2 +- .../org/nuiton/topia/persistence/TopiaDAOTest.java | 2 +- .../topia/persistence/util/CollectorTest.java | 2 +- .../topia/persistence/util/EntityOperatorTest.java | 2 +- .../persistence/util/TopiaEntityHelperTest.java | 2 +- .../persistence/util/TopiaEntityRefTester.java | 16 +- .../persistence/util/TopiaEntityRefTesterTest.java | 4 +- .../nuiton/topia/test/ano1991/TopiaQueryTest.java | 2 +- .../test/evo1912/EntityDTOTransformerTest.java | 4 +- .../test/java/org/nuiton/topiatest/EnumTest.java | 2 +- .../nuiton/topiatest/ExtraDAOEntityDAOImpl.java | 2 +- .../src/test/java/org/nuiton/topiatest/Title.java | 2 +- .../topiatest/deletetest/DeleteEntityTest.java | 2 +- .../org/nuiton/topiatest/persistence/Entity1.java | 2 +- .../topiatest/persistence/Entity1Abstract.java | 2 +- .../topiatest/persistence/Entity1Impl.hbm.xml | 19 +- .../nuiton/topiatest/persistence/Entity1Impl.java | 2 +- .../org/nuiton/topiatest/service/FakeService.java | 4 +- .../org/nuiton/topiatest/service/TestService.java | 4 +- topia-service-migration/{README.txt => README.md} | 0 topia-service-migration/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 34 +--- .../migration/AbstractTopiaMigrationCallback.java | 8 +- .../topia/migration/TMSVersionPersister.java | 28 +-- .../topia/migration/TopiaMigrationCallback.java | 4 +- .../migration/TopiaMigrationCallbackByClass.java | 10 +- .../migration/TopiaMigrationCallbackByClassNG.java | 10 +- .../migration/TopiaMigrationCallbackByMethod.java | 6 +- .../topia/migration/TopiaMigrationEngine.java | 94 +++------ .../topia/migration/TopiaMigrationService.java | 2 +- .../topia/migration/mappings/TMSVersion.java | 4 +- .../topia/migration/mappings/TMSVersionDAO.java | 42 ++-- .../topia/migration/mappings/TMSVersion.hbm.xml | 5 +- ...TMSVersion.hbm.xml => TMSVersionLegacy.hbm.xml} | 14 +- .../{README.txt => README.md} | 0 topia-service-replication/pom.xml | 14 +- .../src/license/THIRD-PARTY.properties | 34 +--- .../topia/replication/TopiaReplicationContext.java | 6 +- .../replication/TopiaReplicationModelBuilder.java | 14 +- .../replication/TopiaReplicationOperation.java | 16 +- .../TopiaReplicationOperationProvider.java | 4 +- .../TopiaReplicationOperationUndoable.java | 6 +- .../topia/replication/TopiaReplicationService.java | 27 +-- .../replication/TopiaReplicationServiceImpl.java | 2 +- .../topia/replication/model/ReplicationLink.java | 8 +- .../topia/replication/model/ReplicationModel.java | 8 +- .../topia/replication/model/ReplicationNode.java | 4 +- .../replication/model/ReplicationOperationDef.java | 10 +- .../model/ReplicationOperationPhase.java | 4 +- .../replication/operation/AttachAssociation.java | 14 +- .../topia/replication/operation/AttachLink.java | 12 +- .../replication/operation/DettachAssociation.java | 4 +- .../topia/replication/operation/Duplicate.java | 8 +- .../topia/replication/operation/LoadLink.java | 4 +- .../AbstractTopiaReplicationServiceTest.java | 4 +- .../replication/TopiaReplicationOperationTest.java | 4 +- .../TopiaReplicationServiceImplAllTest.java | 4 +- .../TopiaReplicationServiceImplTest.java | 14 +- .../topia/replication/operation/FakeOperation.java | 2 +- .../operation/UncreatableOperation.java | 2 +- .../operation/UnregistredOperation.java | 2 +- topia-service-security/{README.txt => README.md} | 0 topia-service-security/pom.xml | 13 +- .../src/license/THIRD-PARTY.properties | 34 +--- .../topia/security/TopiaSecurityServiceImpl.java | 9 +- .../authorization/TopiaAuthorizationImpl.java | 8 +- .../topia/security/jaas/TopiaCallbackHandler.java | 2 +- .../topia/security/jaas/TopiaConfiguration.java | 2 +- .../topia/security/jaas/TopiaLoginModule.java | 2 +- .../topia/security/jaas/TopiaPermission.java | 2 +- .../nuiton/topia/security/jaas/TopiaPolicy.java | 2 +- .../nuiton/topia/security/jaas/TopiaPrincipal.java | 2 +- .../topia/security/listener/EntityVetoable.java | 2 +- .../topia/security/listener/PropertyVetoable.java | 2 +- .../topia/security/util/TopiaSecurityCaching.java | 6 +- .../topia/security/util/TopiaSecurityUtil.java | 2 +- .../java/org/nuiton/topia/taas/TaasService.java | 4 +- .../main/java/org/nuiton/topia/taas/TaasUtil.java | 23 +-- .../topia/taas/jaas/TaasCallbackHandler.java | 2 +- .../nuiton/topia/taas/jaas/TaasConfiguration.java | 2 +- .../nuiton/topia/taas/jaas/TaasLoginModule.java | 2 +- .../org/nuiton/topia/taas/jaas/TaasPermission.java | 18 +- .../org/nuiton/topia/taas/jaas/TaasPolicy.java | 2 +- .../topia/taas/jaas/TaasPrincipalWrapper.java | 2 +- .../nuiton/topia/taas/jaas/TaasSubjectFinder.java | 2 +- .../topia/taas/jaas/TaasSubjectFinderImpl.java | 2 +- .../src/test/java/org/nuiton/topia/TestUtils.java | 2 +- 219 files changed, 1076 insertions(+), 1239 deletions(-) rename README.txt => README.md (100%) rename topia-persistence/{README.txt => README.md} (100%) rename topia-service-migration/{README.txt => README.md} (100%) copy topia-service-migration/src/main/resources/org/nuiton/topia/migration/mappings/{TMSVersion.hbm.xml => TMSVersionLegacy.hbm.xml} (70%) rename topia-service-replication/{README.txt => README.md} (100%) rename topia-service-security/{README.txt => README.md} (100%) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.