annotated tag v2.9.2 created (now 714ce99)
This is an automated email from the git hooks/post-receive script. New change to annotated tag v2.9.2 in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git at 714ce99 (tag) tagging e5c160b7ae21a245b96b54c453e7186fd9a3100e (commit) replaces topia-2.9.1 tagged by Maven Release on Wed Aug 6 09:01:27 2014 +0200 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 2.9.2 ----------------------------------------------------------------------- This annotated tag includes the following new commits: new 851e827 fixes #3353: Use Eugene 2.9.x new 4952182 fixes #3353 eugene 2.13 new bcb90c7 fix release configuration new 106b922 [jgitflow-maven-plugin]updating poms for branch'release/2.9.2' with non-snapshot versions new e5c160b Merge branch 'release/2.9.2' into master-2.x The 5 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 e5c160b7ae21a245b96b54c453e7186fd9a3100e Merge: 921a1d0 106b922 Author: Maven Release <maven-release@codelutin.com> Date: Wed Aug 6 09:01:27 2014 +0200 Merge branch 'release/2.9.2' into master-2.x commit 106b92262b7998514499136930676f053804ce1f Author: Maven Release <maven-release@codelutin.com> Date: Wed Aug 6 08:59:07 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.9.2' with non-snapshot versions commit bcb90c7c5a5108c2666c603005f9a587d6dffa95 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Aug 6 08:54:15 2014 +0200 fix release configuration commit 4952182e25d1cad346027a1570e5564cf600ad79 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Aug 6 08:42:48 2014 +0200 fixes #3353 eugene 2.13 commit 851e827ab3d08f671d68c2149cdaea4854cf7a10 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 5 20:58:33 2014 +0200 fixes #3353: Use Eugene 2.9.x -- 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 annotated tag v2.9.2 in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit 851e827ab3d08f671d68c2149cdaea4854cf7a10 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 5 20:58:33 2014 +0200 fixes #3353: Use Eugene 2.9.x --- .../org/nuiton/topia/generator/BinderHelperTransformer.java | 2 +- .../org/nuiton/topia/generator/DAOAbstractTransformer.java | 2 +- .../org/nuiton/topia/generator/EntityDAOTransformer.java | 2 +- .../java/org/nuiton/topia/generator/EntityTransformer.java | 6 +++--- .../java/org/nuiton/topia/generator/TopiaGeneratorUtil.java | 13 ++++++++++--- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java index 353bee6..4cb1da0 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java @@ -185,7 +185,7 @@ public class BinderHelperTransformer extends ObjectModelTransformerToJava { for (ObjectModelClass clazz : classes) { - String prefix = getConstantPrefix(clazz, ""); + String prefix = getConstantPrefix(clazz); if (StringUtils.isEmpty(prefix)) { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java index ddf42dc..f1f9d91 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java @@ -203,7 +203,7 @@ public class DAOAbstractTransformer extends ObjectModelTransformerToJava { addInterface(result, TopiaDAO.class.getName() + "<E>"); - String prefix = getConstantPrefix(clazz, ""); + String prefix = getConstantPrefix(clazz); setConstantPrefix(prefix); // imports diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java index 4c60331..3604621 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java @@ -353,7 +353,7 @@ public class EntityDAOTransformer extends ObjectModelTransformerToJava { } setSuperClass(daoAbstractClass, extendClass); - String prefix = getConstantPrefix(clazz, ""); + String prefix = getConstantPrefix(clazz); setConstantPrefix(prefix); // imports diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java index a68cde3..3adfe76 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java @@ -121,7 +121,7 @@ public class EntityTransformer extends ObjectModelTransformerToJava { } // fix once for all the constant prefix to use - String prefix = getConstantPrefix(input, ""); + String prefix = getConstantPrefix(input); if (StringUtils.isEmpty(prefix)) { // no specific prefix, so no prefix @@ -138,7 +138,7 @@ public class EntityTransformer extends ObjectModelTransformerToJava { generateAbstract = isGenerateAbstract(input); generateImpl = isGenerateImpl(input); - generateBooleanGetMethods = !TopiaGeneratorUtil.isDoNotGenerateBooleanGetMethods(model, null, input); + generateBooleanGetMethods = getEugeneTagValues().isGenerateBooleanGetMethods(input, null, model); if (generateInterface) { @@ -153,7 +153,7 @@ public class EntityTransformer extends ObjectModelTransformerToJava { } // Generate i18n block - String i18nPrefix = TopiaGeneratorUtil.getI18nPrefixTagValue(input, null, model); + String i18nPrefix = getEugeneTagValues().getI18nPrefixTagValue(input, null, model); if (!StringUtils.isEmpty(i18nPrefix)) { generateI18nBlock(input, outputAbstract, i18nPrefix); } diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java index 732eaeb..9a27742 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java @@ -31,6 +31,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.AbstractGenerator; +import org.nuiton.eugene.EugeneStereoTypes; import org.nuiton.eugene.EugeneTagValues; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.ModelPropertiesUtil; @@ -760,7 +761,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { ObjectModelAttribute attr) { if (hasUniqueStereotype(attr)) { return Set.class.getName(); - } else if (JavaGeneratorUtil.hasIndexedStereotype(attr) || attr.isOrdered()) { + } else if (EugeneStereoTypes.hasIndexedStereotype(attr) || attr.isOrdered()) { return List.class.getName(); } return Collection.class.getName(); @@ -775,7 +776,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { public static String getNMultiplicityObjectType(ObjectModelAttribute attr) { if (hasUniqueStereotype(attr)) { return HashSet.class.getName(); - } else if (JavaGeneratorUtil.hasIndexedStereotype(attr) || attr.isOrdered()) { + } else if (EugeneStereoTypes.hasIndexedStereotype(attr) || attr.isOrdered()) { //On considère qu'on ne sait pas traiter vraiment l'attribut "ordered" // puisqu'on va conserver l'ordre d'insertion, et non un ordre en // fonction d'un élément donné. Donc on renvoi une ArrayList @@ -785,6 +786,12 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { return ArrayList.class.getName(); } + @Deprecated + public static boolean hasIndexedStereotype(ObjectModelAttribute attr) { + + return EugeneStereoTypes.hasIndexedStereotype(attr); + } + /** * Renvoie le type d'interface à utiliser en fonction de l'attribut * @@ -795,7 +802,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { ObjectModelAttribute attr) { if (hasUniqueStereotype(attr)) { return "set"; - } else if (JavaGeneratorUtil.hasIndexedStereotype(attr)) { + } else if (EugeneStereoTypes.hasIndexedStereotype(attr)) { return "list"; } //attr.isOrdered() - On génère le ordered en bag -- 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 annotated tag v2.9.2 in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit 4952182e25d1cad346027a1570e5564cf600ad79 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Aug 6 08:42:48 2014 +0200 fixes #3353 eugene 2.13 --- pom.xml | 65 ++++++++++++++++++++++++++--------------------------------------- 1 file changed, 26 insertions(+), 39 deletions(-) diff --git a/pom.xml b/pom.xml index cc5a256..771f997 100644 --- a/pom.xml +++ b/pom.xml @@ -49,20 +49,19 @@ <developer> <name>Benjamin Poussin</name> <id>bpoussin</id> - <email>poussin at codelutin dot com</email> + <email>poussin@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://codelutin.com</organizationUrl> <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> - <role>Debian packager</role> </roles> </developer> <developer> <name>Arnaud Thimel</name> <id>athimel</id> - <email>thimel at codelutin dot com</email> + <email>thimel@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://codelutin.com</organizationUrl> <timezone>Europe/Paris</timezone> @@ -74,7 +73,7 @@ <developer> <name>Julien Ruchaud</name> <id>jruchaud</id> - <email>ruchaud at codelutin dot com</email> + <email>ruchaud@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://codelutin.com</organizationUrl> <timezone>Europe/Paris</timezone> @@ -86,7 +85,7 @@ <developer> <name>Eric Chatellier</name> <id>echatellier</id> - <email>chatellier at codelutin dot com</email> + <email>chatellier@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://codelutin.com</organizationUrl> <timezone>Europe/Paris</timezone> @@ -106,35 +105,10 @@ <role>Développeur</role> </roles> </developer> - - <developer> - <name>Sylvain Letellier</name> - <id>sletellier</id> - <email>letellier at codelutin dot com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://codelutin.com</organizationUrl> - <timezone>Europe/Paris</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - - <developer> - <name>Florian Desbois</name> - <id>fdesbois</id> - <email>desbois at codelutin dot com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://codelutin.com</organizationUrl> - <timezone>Europe/Paris</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - <developer> <name>Brendan Le Ny</name> <id>bleny</id> - <email>bleny at codelutin dot com</email> + <email>bleny@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://codelutin.com</organizationUrl> <timezone>Europe/Paris</timezone> @@ -146,7 +120,7 @@ <developer> <name>Jean Couteau</name> <id>jcouteau</id> - <email>couteau at codelutin dot com</email> + <email>couteau@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://codelutin.com</organizationUrl> <timezone>Europe/Paris</timezone> @@ -157,43 +131,56 @@ </developers> <contributors> <contributor> + <name>Florian Desbois</name> + <roles> + <role>Développeur</role> + </roles> + </contributor> + <contributor> + <name>Sylvain Letellier</name> + <timezone>Europe/Paris</timezone> + <roles> + <role>Développeur</role> + </roles> + </contributor> + <contributor> <name>Nicolas Dupont</name> - <email>ndupont at codelutin dot com</email> + <email>ndupont@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://codelutin.com</organizationUrl> <timezone>Europe/Paris</timezone> </contributor> <contributor> <name>Eduardo Ore</name> - <email>eore at codelutin dot com</email> + <email>eore@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://codelutin.com</organizationUrl> <timezone>Europe/Paris</timezone> </contributor> <contributor> <name>Gabriel Landais</name> - <email>glandais at codelutin dot com</email> + <email>glandais@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://codelutin.com</organizationUrl> <timezone>Europe/Paris</timezone> </contributor> <contributor> <name>Stéphane Chorlet</name> - <email>schorlet at codelutin dot com</email> + <email>schorlet@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://codelutin.com</organizationUrl> <timezone>Europe/Paris</timezone> </contributor> <contributor> <name>Jonathan pepin</name> - <email>jpepin at codelutin dot com</email> + <email>jpepin@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://codelutin.com</organizationUrl> <timezone>Europe/Paris</timezone> </contributor> <contributor> <name>Nolwenn Ranou</name> - <email>nrannou at codelutin dot com</email> + <email>nrannou@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://codelutin.com</organizationUrl> <timezone>Europe/Paris</timezone> @@ -227,7 +214,7 @@ <license.addSvnKeyWords>true</license.addSvnKeyWords> <!-- libs version --> - <eugeneVersion>3.0-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.13</eugeneVersion> <nuitonCsvVersion>3.0-alpha-3</nuitonCsvVersion> <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> -- 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 annotated tag v2.9.2 in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit bcb90c7c5a5108c2666c603005f9a587d6dffa95 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Aug 6 08:54:15 2014 +0200 fix release configuration --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 771f997..06f3d90 100644 --- a/pom.xml +++ b/pom.xml @@ -466,6 +466,17 @@ </configuration> </plugin> + <plugin> + <groupId>external.atlassian.jgitflow</groupId> + <artifactId>jgitflow-maven-plugin</artifactId> + <configuration> + <flowInitContext> + <masterBranchName>master-2.x</masterBranchName> + <developBranchName>develop-2.x</developBranchName> + </flowInitContext> + </configuration> + </plugin> + </plugins> </pluginManagement> </build> -- 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 annotated tag v2.9.2 in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit 106b92262b7998514499136930676f053804ce1f Author: Maven Release <maven-release@codelutin.com> Date: Wed Aug 6 08:59:07 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.9.2' with non-snapshot versions --- pom.xml | 2 +- topia-persistence/pom.xml | 2 +- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- topia-service-security/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 06f3d90..d8d75fb 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.9.2-SNAPSHOT</version> + <version>2.9.2</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 006e0a1..d05f27e 100644 --- a/topia-persistence/pom.xml +++ b/topia-persistence/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.9.2-SNAPSHOT</version> + <version>2.9.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 3c24fb1..4d40bc7 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>2.9.2-SNAPSHOT</version> + <version>2.9.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index e3db619..821c500 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>2.9.2-SNAPSHOT</version> + <version>2.9.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-security/pom.xml b/topia-service-security/pom.xml index 8a5aff0..f62ab08 100644 --- a/topia-service-security/pom.xml +++ b/topia-service-security/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.9.2-SNAPSHOT</version> + <version>2.9.2</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 annotated tag v2.9.2 in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit e5c160b7ae21a245b96b54c453e7186fd9a3100e Merge: 921a1d0 106b922 Author: Maven Release <maven-release@codelutin.com> Date: Wed Aug 6 09:01:27 2014 +0200 Merge branch 'release/2.9.2' into master-2.x .gitignore | 12 + pom.xml | 455 +++++++++++---------- topia-persistence/pom.xml | 41 +- .../nuiton/topia/framework/TopiaFiresSupport.java | 290 +++++++------ .../topia/generator/BinderHelperTransformer.java | 4 +- .../topia/generator/DAOAbstractTransformer.java | 2 +- .../topia/generator/DAOHelperTransformer.java | 44 +- .../topia/generator/EntityDAOTransformer.java | 8 +- .../nuiton/topia/generator/EntityTransformer.java | 6 +- .../topia/generator/QueryHelperTransformer.java | 2 +- .../nuiton/topia/generator/TopiaGeneratorUtil.java | 111 +++-- .../nuiton/topia/generator/TopiaStereoTypes.java | 24 +- .../org/nuiton/topia/generator/TopiaTagValues.java | 109 +++-- .../nuiton/topia/persistence/TopiaEntityEnum.java | 12 + ...ene.ModelPropertiesUtil$ModelPropertiesProvider | 1 - ....models.stereotype.StereotypeDefinitionProvider | 1 + ...gene.models.tagvalue.TagValueDefinitionProvider | 1 + .../TopiaModelPropertiesProviderTest.java | 79 ---- topia-service-migration/pom.xml | 28 +- topia-service-replication/pom.xml | 27 +- topia-service-security/pom.xml | 42 +- 21 files changed, 674 insertions(+), 625 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm