[topia] branch develop updated (bcc76c8 -> b56b67d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia. See http://git.nuiton.org/topia.git from bcc76c8 HqlAndParametersBuilder#orderByArguments obviously uses LinkedHashSet new 3e733d9 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 7fd63fd [jgitflow-maven-plugin]updating poms for branch '3.0-beta-13' with snapshot versions new 67a76b7 Fix release build issues new c3e71d1 [jgitflow-maven-plugin]updating poms for branch'release/3.0-beta-13' with non-snapshot versions new e99abdf Merge branch 'release/3.0-beta-13' new 1d059bc Merge branch 'master' into develop new b56b67d [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b56b67d46719d41e591b0644ee78ee4a55016267 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 12 15:53:09 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 1d059bcd20da5f97136898ee71f122ab39f61592 Merge: 3e733d9 e99abdf Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 12 15:53:08 2014 +0200 Merge branch 'master' into develop commit 3e733d98887036f859ba71ad764967286dce4861 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 12 15:53:07 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit e99abdf19ff5a275204c92d618dff37a48c0a39a Merge: 578f58c c3e71d1 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 12 15:53:04 2014 +0200 Merge branch 'release/3.0-beta-13' commit c3e71d111fbba510baf3e00f59249ca0f0b37657 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 12 15:50:18 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.0-beta-13' with non-snapshot versions commit 67a76b7bc1837788269be1024df59450e67df9cc Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 12 15:49:59 2014 +0200 Fix release build issues Summary of changes: .../org/nuiton/topia/it/TopiaSchemaHelper.java | 19 ++++++++++++++++--- .../persistence/internal/TopiaIdFactoryTest.java | 22 ++++++++++++++++++++++ .../topia/persistence/event/ListenableBean.java | 22 ++++++++++++++++++++++ .../persistence/event/ListenableTopiaEntity.java | 22 ++++++++++++++++++++++ .../persistence/internal/ShortTopiaIdFactory.java | 22 ++++++++++++++++++++++ 5 files changed, 104 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 c3e71d111fbba510baf3e00f59249ca0f0b37657 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 12 15:50:18 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.0-beta-13' with non-snapshot versions --- pom.xml | 2 +- topia-it/pom.xml | 2 +- topia-junit/pom.xml | 2 +- topia-persistence/pom.xml | 2 +- topia-service-csv/pom.xml | 2 +- topia-service-flyway/pom.xml | 2 +- topia-service-liquibase/pom.xml | 2 +- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- topia-templates/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index c423573..07fa276 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.0-beta-13-SNAPSHOT</version> + <version>3.0-beta-13</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index 16f14b5..45794d3 100644 --- a/topia-it/pom.xml +++ b/topia-it/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-13-SNAPSHOT</version> + <version>3.0-beta-13</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index 1a0f8bd..c0cdf67 100644 --- a/topia-junit/pom.xml +++ b/topia-junit/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-13-SNAPSHOT</version> + <version>3.0-beta-13</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 2f5bbee..e446896 100644 --- a/topia-persistence/pom.xml +++ b/topia-persistence/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-13-SNAPSHOT</version> + <version>3.0-beta-13</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index 748e7e2..c0b5287 100644 --- a/topia-service-csv/pom.xml +++ b/topia-service-csv/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-13-SNAPSHOT</version> + <version>3.0-beta-13</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index 0b9d81d..9354f92 100644 --- a/topia-service-flyway/pom.xml +++ b/topia-service-flyway/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-13-SNAPSHOT</version> + <version>3.0-beta-13</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index a4404ad..f7a1822 100644 --- a/topia-service-liquibase/pom.xml +++ b/topia-service-liquibase/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-13-SNAPSHOT</version> + <version>3.0-beta-13</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index caed16f..35fc245 100644 --- a/topia-service-migration/pom.xml +++ b/topia-service-migration/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-13-SNAPSHOT</version> + <version>3.0-beta-13</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index d182fd5..cc81038 100644 --- a/topia-service-replication/pom.xml +++ b/topia-service-replication/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-13-SNAPSHOT</version> + <version>3.0-beta-13</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index 90d6fed..5df72a4 100644 --- a/topia-templates/pom.xml +++ b/topia-templates/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-13-SNAPSHOT</version> + <version>3.0-beta-13</version> </parent> <groupId>org.nuiton.topia</groupId> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 e99abdf19ff5a275204c92d618dff37a48c0a39a Merge: 578f58c c3e71d1 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 12 15:53:04 2014 +0200 Merge branch 'release/3.0-beta-13' pom.xml | 11 +- src/site/rst/tutos/migrate_to_3.0.rst | 50 +++++ topia-it/pom.xml | 8 +- .../org/nuiton/topia/it/TopiaSchemaHelper.java | 37 +++- .../persistence/internal/EntityListenerTest.java | 4 +- .../persistence/internal/TopiaIdFactoryTest.java | 86 ++++++++ topia-junit/pom.xml | 2 +- topia-persistence/pom.xml | 2 +- .../topia/persistence/HqlAndParametersBuilder.java | 32 ++- .../nuiton/topia/persistence/TopiaEntities.java | 2 +- .../org/nuiton/topia/persistence/TopiaEntity.java | 154 ------------- .../topia/persistence/TopiaEntityEnumProvider.java | 2 + ...TopiaQueryBuilderAddCriteriaOrRunQueryStep.java | 2 +- .../TopiaQueryBuilderAddCriteriaStep.java | 119 ++++++---- .../persistence/TopiaQueryBuilderRunQueryStep.java | 162 +++++++++++--- ...iaQueryBuilderRunQueryWithUniqueResultStep.java | 27 ++- .../topia/persistence/event/EntityState.java | 19 ++ .../topia/persistence/event/ListenableBean.java | 93 ++++++++ .../persistence/event/ListenableTopiaEntity.java | 191 ++++++++++++++++ .../topia/persistence/event/TopiaEntityEvent.java | 3 +- .../internal/AbstractTopiaApplicationContext.java | 3 +- .../persistence/internal/AbstractTopiaDao.java | 6 +- .../persistence/internal/AbstractTopiaEntity.java | 241 ++++++++++++--------- .../internal/AbstractTopiaPersistenceContext.java | 1 + .../internal/DefaultTopiaIdFactory.java | 13 +- .../persistence/internal/LegacyTopiaIdFactory.java | 9 +- .../persistence/internal/ShortTopiaIdFactory.java | 153 +++++++++++++ .../internal/support/HibernateTopiaJpaSupport.java | 6 + .../nuiton/topia/persistence/legacy/Collector.java | 3 +- .../nuiton/topia/persistence/legacy/DBMapping.java | 2 +- .../topia/persistence/util/TopiaEntityHelper.java | 12 +- .../topia/persistence/util/TopiaEntityRef.java | 35 ++- topia-service-csv/pom.xml | 2 +- topia-service-flyway/pom.xml | 2 +- topia-service-liquibase/pom.xml | 2 +- .../topia/liquibase/TopiaLiquibaseServiceImpl.java | 2 +- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- .../topia/replication/model/ReplicationModel.java | 6 +- topia-templates/pom.xml | 2 +- .../topia/templates/BinderHelperTransformer.java | 3 +- .../org/nuiton/topia/templates/DTOTransformer.java | 16 +- .../topia/templates/EntityDaoTransformer.java | 17 +- .../templates/EntityHibernateMappingGenerator.java | 16 +- .../nuiton/topia/templates/EntityTransformer.java | 9 + .../nuiton/topia/templates/TopiaGeneratorUtil.java | 19 +- .../topia/templates/TopiaMetaTransformer.java | 106 +++++---- .../org/nuiton/topia/templates/TopiaTagValues.java | 9 +- .../topia/templates/TopiaTemplateHelper.java | 19 +- 49 files changed, 1236 insertions(+), 488 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 3e733d98887036f859ba71ad764967286dce4861 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 12 15:53:07 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- topia-it/pom.xml | 2 +- topia-junit/pom.xml | 2 +- topia-persistence/pom.xml | 2 +- topia-service-csv/pom.xml | 2 +- topia-service-flyway/pom.xml | 2 +- topia-service-liquibase/pom.xml | 2 +- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- topia-templates/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index fc60c8e..07fa276 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-13</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index 587e7b4..45794d3 100644 --- a/topia-it/pom.xml +++ b/topia-it/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-13</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index 15b61dd..c0cdf67 100644 --- a/topia-junit/pom.xml +++ b/topia-junit/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-13</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index dd52c6e..e446896 100644 --- a/topia-persistence/pom.xml +++ b/topia-persistence/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-13</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index 86543ac..c0b5287 100644 --- a/topia-service-csv/pom.xml +++ b/topia-service-csv/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-13</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index 630653f..9354f92 100644 --- a/topia-service-flyway/pom.xml +++ b/topia-service-flyway/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-13</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index 4cd26ac..f7a1822 100644 --- a/topia-service-liquibase/pom.xml +++ b/topia-service-liquibase/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-13</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index dea028b..35fc245 100644 --- a/topia-service-migration/pom.xml +++ b/topia-service-migration/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-13</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 70820ca..cc81038 100644 --- a/topia-service-replication/pom.xml +++ b/topia-service-replication/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-13</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index 47294e4..5df72a4 100644 --- a/topia-templates/pom.xml +++ b/topia-templates/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-13</version> </parent> <groupId>org.nuiton.topia</groupId> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 1d059bcd20da5f97136898ee71f122ab39f61592 Merge: 3e733d9 e99abdf Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 12 15:53:08 2014 +0200 Merge branch 'master' into develop .../org/nuiton/topia/it/TopiaSchemaHelper.java | 19 ++++++++++++++++--- .../persistence/internal/TopiaIdFactoryTest.java | 22 ++++++++++++++++++++++ .../topia/persistence/event/ListenableBean.java | 22 ++++++++++++++++++++++ .../persistence/event/ListenableTopiaEntity.java | 22 ++++++++++++++++++++++ .../persistence/internal/ShortTopiaIdFactory.java | 22 ++++++++++++++++++++++ 5 files changed, 104 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 b56b67d46719d41e591b0644ee78ee4a55016267 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 12 15:53:09 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- topia-it/pom.xml | 2 +- topia-junit/pom.xml | 2 +- topia-persistence/pom.xml | 2 +- topia-service-csv/pom.xml | 2 +- topia-service-flyway/pom.xml | 2 +- topia-service-liquibase/pom.xml | 2 +- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- topia-templates/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 07fa276..fc60c8e 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.0-beta-13</version> + <version>3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index 45794d3..587e7b4 100644 --- a/topia-it/pom.xml +++ b/topia-it/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-13</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index c0cdf67..15b61dd 100644 --- a/topia-junit/pom.xml +++ b/topia-junit/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-13</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index e446896..dd52c6e 100644 --- a/topia-persistence/pom.xml +++ b/topia-persistence/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-13</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index c0b5287..86543ac 100644 --- a/topia-service-csv/pom.xml +++ b/topia-service-csv/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-13</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index 9354f92..630653f 100644 --- a/topia-service-flyway/pom.xml +++ b/topia-service-flyway/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-13</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index f7a1822..4cd26ac 100644 --- a/topia-service-liquibase/pom.xml +++ b/topia-service-liquibase/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-13</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 35fc245..dea028b 100644 --- a/topia-service-migration/pom.xml +++ b/topia-service-migration/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-13</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index cc81038..70820ca 100644 --- a/topia-service-replication/pom.xml +++ b/topia-service-replication/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-13</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index 5df72a4..47294e4 100644 --- a/topia-templates/pom.xml +++ b/topia-templates/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-13</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm