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 8029b8a221fb76a68756a50a17d5e29f6874b7df Author: Arnaud Thimel <thimel@codelutin.com> Date: Tue Aug 26 01:12:40 2014 +0200 fixes #3283 Update TopiaMetaTransformer with most commonly used values --- topia-it/pom.xml | 6 ----- .../topia/templates/BinderHelperTransformer.java | 3 +-- .../topia/templates/TopiaMetaTransformer.java | 27 +++++++++------------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/topia-it/pom.xml b/topia-it/pom.xml index 4f140b9..587e7b4 100644 --- a/topia-it/pom.xml +++ b/topia-it/pom.xml @@ -163,9 +163,6 @@ target/generated-sources/models:topia-it-legacy.objectmodel </inputs> <templates> - org.nuiton.eugene.java.JavaInterfaceTransformer, - org.nuiton.eugene.java.JavaBeanTransformer, - org.nuiton.eugene.java.JavaEnumerationTransformer, org.nuiton.topia.templates.TopiaMetaTransformer, org.nuiton.topia.templates.BinderHelperTransformer </templates> @@ -186,9 +183,6 @@ target/generated-sources/models:topia-it-mapping.objectmodel </inputs> <templates> - org.nuiton.eugene.java.JavaInterfaceTransformer, - org.nuiton.eugene.java.JavaBeanTransformer, - org.nuiton.eugene.java.JavaEnumerationTransformer, org.nuiton.topia.templates.TopiaMetaTransformer, org.nuiton.topia.templates.BinderHelperTransformer </templates> diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/BinderHelperTransformer.java b/topia-templates/src/main/java/org/nuiton/topia/templates/BinderHelperTransformer.java index d3bc733..0a6944a 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/BinderHelperTransformer.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/BinderHelperTransformer.java @@ -80,7 +80,6 @@ public class BinderHelperTransformer extends ObjectModelTransformerToJava { String packageName = getDefaultPackageName(); String modelName = model.getName(); String binderHelperClazzName = modelName + "BinderHelper"; - String daoHelperClazzName = modelName + "DAOHelper"; String entityEnumName = templateHelper.getEntityEnumName(model); String entityEnumPackage = packageName + "." + entityEnumName; @@ -215,7 +214,7 @@ public class BinderHelperTransformer extends ObjectModelTransformerToJava { op = addOperation(resultClass, null, (String) null, ObjectModelJavaModifier.STATIC); setOperationBody(op, "" /*{ - initBinders(); + initBinders(); }*/ ); } diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaMetaTransformer.java b/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaMetaTransformer.java index ef4f839..544aacf 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaMetaTransformer.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaMetaTransformer.java @@ -27,6 +27,9 @@ package org.nuiton.topia.templates; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.AbstractMetaTransformer; +import org.nuiton.eugene.java.JavaBeanTransformer; +import org.nuiton.eugene.java.JavaEnumerationTransformer; +import org.nuiton.eugene.java.JavaInterfaceTransformer; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.validator.AttributeNamesValidator; @@ -49,27 +52,19 @@ public class TopiaMetaTransformer extends AbstractMetaTransformer<ObjectModel> { private static final Log log = LogFactory.getLog(TopiaMetaTransformer.class); public TopiaMetaTransformer() { -// super( -// EntityTransformer.class, -// DAOTransformer.class, -// DAOImplTransformer.class, -// DAOAbstractTransformer.class, -// DAOHelperTransformer.class, -// EntityHibernateMappingGenerator.class -// ); setTemplateTypes( - ApplicationContextTransformer.class, - PersistenceContextTransformer.class, + JavaInterfaceTransformer.class, + JavaBeanTransformer.class, + JavaEnumerationTransformer.class, EntityTransformer.class, - EntityDaoTransformer.class, -// DAOTransformer.class, -// DAOImplTransformer.class, -// DAOAbstractTransformer.class, -// DAOHelperTransformer.class, EntityHibernateMappingGenerator.class, - EntityEnumTransformer.class + EntityDaoTransformer.class, + EntityEnumTransformer.class, + ApplicationContextTransformer.class, + PersistenceContextTransformer.class ); + } protected boolean validateModel(ObjectModel model) { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.