This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository eugene. See https://gitlab.nuiton.org/nuiton/eugene.git commit 819eb0e6bebded83d1b98d6c20cddb64f37f4cff Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 15 19:53:53 2016 +0200 Simplify application configuration generation mojo (See #4036) --- .../eugene/plugin/GenerateApplicationConfigMojo.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateApplicationConfigMojo.java b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateApplicationConfigMojo.java index cc1edf7..31f7116 100644 --- a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateApplicationConfigMojo.java +++ b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateApplicationConfigMojo.java @@ -29,7 +29,6 @@ import org.antlr.v4.runtime.misc.NotNull; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; @@ -39,7 +38,6 @@ import org.nuiton.eugene.DefaultTemplateConfiguration; import org.nuiton.eugene.Template; import org.nuiton.eugene.config.templates.ApplicationConfigTransformer; import org.nuiton.eugene.java.JavaGeneratorUtil; -import org.nuiton.eugene.models.Model; import org.nuiton.eugene.models.object.xml.ObjectModelAttributeImpl; import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl; import org.nuiton.eugene.models.object.xml.ObjectModelImpl; @@ -145,13 +143,9 @@ public class GenerateApplicationConfigMojo extends AbstractPlugin { @Parameter(defaultValue = "${project}", readonly = true) protected MavenProject project; - /** All available templates introspects via plexus. */ - @Component(role = Template.class) - protected Map<String, Template<?>> modelTemplates; + protected ObjectModelImpl model; - private ObjectModelImpl model; - - protected Template<Model> template; + protected ApplicationConfigTransformer template; @Override protected void init() throws Exception { @@ -236,9 +230,9 @@ public class GenerateApplicationConfigMojo extends AbstractPlugin { templateProperties.put(Template.PROP_VERBOSE, verbose); templateProperties.put(Template.PROP_OVERWRITE, true); templateProperties.put(Template.PROP_CLASS_LOADER, loader); - templateProperties.put("optionClassName", inputClassName); + templateProperties.put(ApplicationConfigTransformer.PROP_OPTION_CLASS_NAME, inputClassName); - template = (Template<Model>) modelTemplates.get(ApplicationConfigTransformer.class.getName()); + template = new ApplicationConfigTransformer(); template.setConfiguration(new DefaultTemplateConfiguration(templateProperties)); if (!project.getCompileSourceRoots().contains(outputdirectory.getPath())) { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.