This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 555e473eac8d51273da536d22843923c444b5e5a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Oct 8 15:07:25 2016 +0200 Use new eugene apis --- pom.xml | 4 ++-- services-dto/pom.xml | 5 ----- .../nuiton/topia/templates/TopiaMetadataModelGenerator.java | 10 ++++------ 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index bfa7ae2..2cfbbd7 100644 --- a/pom.xml +++ b/pom.xml @@ -158,10 +158,10 @@ <signatureArtifactId>java18</signatureArtifactId> <signatureVersion>1.0</signatureVersion> - <eugenePluginVersion>3.0-alpha-7</eugenePluginVersion> + <eugenePluginVersion>3.0-SNAPSHOT</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <topiaVersion>3.1.3</topiaVersion> + <topiaVersion>3.2-SNAPSHOT</topiaVersion> <jaxxVersion>2.33</jaxxVersion> <nuitonI18nVersion>3.6.2</nuitonI18nVersion> <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index 6d81c5e..cb687fa 100644 --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -129,11 +129,6 @@ <inputs> <input>zargo</input> </inputs> - <!--<inputs>--> - <!--<input>zargo:src/main/xmi:observe-services-dto-common.zargo</input>--> - <!--<input>zargo:src/main/xmi:observe-services-dto-seine.zargo</input>--> - <!--<input>zargo:src/main/xmi:observe-services-dto-longline.zargo</input>--> - <!--</inputs>--> <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> <templates>org.nuiton.eugene.java.SimpleJavaBeanWithNoInterfaceTransformer</templates> <failIfUnsafe>true</failIfUnsafe> diff --git a/topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java b/topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java index 6ec37b5..75ef12f 100644 --- a/topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java +++ b/topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java @@ -61,9 +61,7 @@ public class TopiaMetadataModelGenerator extends ObjectModelGenerator { protected TopiaTemplateHelper templateHelper; - protected TopiaTagValues topiaTagValues; - - private String entityEnumName; + protected TopiaHibernateTagValues topiaHibernateTagValues; public TopiaTemplateHelper getTemplateHelper() { if (templateHelper == null) { @@ -75,8 +73,8 @@ public class TopiaMetadataModelGenerator extends ObjectModelGenerator { @Override public void generateFromModel(Writer output, ObjectModel input) throws IOException { - if (topiaTagValues == null) { - topiaTagValues = getTemplateHelper().getTopiaTagValues(); + if (topiaHibernateTagValues == null) { + topiaHibernateTagValues = new TopiaHibernateTagValues(); } List<ObjectModelClass> entityClasses = getTemplateHelper().getEntityClasses(model, true); @@ -165,7 +163,7 @@ public class TopiaMetadataModelGenerator extends ObjectModelGenerator { } ObjectModelPackage aPackage = model.getPackage(entityClass); - String dbSchemaName = topiaTagValues.getDbSchemaNameTagValue(entityClass, aPackage, model); + String dbSchemaName = topiaHibernateTagValues.getDbSchemaNameTagValue(entityClass, aPackage, model); String dbTableName = templateHelper.getDbName(entityClass); boolean haveSuper = entityClass.getSuperclasses().size() > 0; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.