This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tiles-autotag.
commit 5c3063ac3f85be2c79886d8579384e7d48d932ff Merge: e1c152b c3f7692 Author: Emmanuel Bourg <[email protected]> Date: Mon Jul 18 16:09:47 2016 +0200 Merge tag 'upstream/1.2' Upstream version 1.2 assembly/pom.xml | 4 +- maven-autotag-plugin/pom.xml | 100 +++++++++++-- .../tiles/autotag/plugin/AbstractGenerateMojo.java | 159 ++++++++++++++------- .../tiles/autotag/plugin/CreateDescriptorMojo.java | 151 ++++++++++--------- .../autotag/plugin/GenerateFreemarkerMojo.java | 20 +-- .../tiles/autotag/plugin/GenerateJspMojo.java | 25 ++-- .../tiles/autotag/plugin/GenerateVelocityMojo.java | 22 +-- .../META-INF/m2e/lifecycle-mapping-metadata.xml | 78 ++++++++++ .../autotag/plugin/AbstractGenerateMojoTest.java | 16 ++- .../autotag/plugin/CreateDescriptorMojoTest.java | 53 ++++++- pom.xml | 21 +-- src/site/apt/dev/release.apt | 113 +++++++-------- src/site/site.xml | 3 + src/site/xdoc/dev/building.xml | 6 +- tiles-autotag-core-runtime/pom.xml | 4 +- .../autotag/core/runtime/AbstractModelBody.java | 10 +- tiles-autotag-core/pom.xml | 4 +- .../autotag/core/AutotagRuntimeException.java | 8 +- .../tiles/autotag/core/ClassParseException.java | 8 +- .../tiles/autotag/core/DirectoryOutputLocator.java | 59 ++++++++ .../OutputLocator.java} | 39 +++-- .../generate/AbstractTemplateClassGenerator.java | 95 ++++++------ .../generate/AbstractTemplateSuiteGenerator.java | 82 +++++------ .../autotag/generate/BasicTemplateGenerator.java | 34 ++--- .../autotag/generate/TemplateClassGenerator.java | 8 +- .../autotag/generate/TemplateGeneratorBuilder.java | 42 +++--- .../autotag/generate/TemplateSuiteGenerator.java | 10 +- .../AbstractTemplateClassGeneratorTest.java | 82 ++++++----- .../AbstractTemplateSuiteGeneratorTest.java | 82 ++++++----- .../generate/BasicTemplateGeneratorTest.java | 25 ++-- .../generate/TemplateGeneratorBuilderTest.java | 46 +++--- tiles-autotag-freemarker/pom.xml | 4 +- .../tiles/autotag/freemarker/FMModelGenerator.java | 11 +- .../freemarker/FMModelRepositoryGenerator.java | 11 +- .../freemarker/FMTemplateGeneratorFactory.java | 18 +-- .../autotag/freemarker/FMModelGeneratorTest.java | 23 +-- .../freemarker/FMModelRepositoryGeneratorTest.java | 19 +-- .../freemarker/FMTemplateGeneratorFactoryTest.java | 25 ++-- tiles-autotag-jsp/pom.xml | 4 +- .../autotag/jsp/JspTemplateGeneratorFactory.java | 27 ++-- .../org/apache/tiles/autotag/jsp/TLDGenerator.java | 11 +- .../tiles/autotag/jsp/TagClassGenerator.java | 11 +- .../jsp/JspTemplateGeneratorFactoryTest.java | 29 ++-- .../apache/tiles/autotag/jsp/TLDGeneratorTest.java | 19 +-- .../tiles/autotag/jsp/TagClassGeneratorTest.java | 23 +-- tiles-autotag-velocity/pom.xml | 4 +- .../velocity/VelocityDirectiveGenerator.java | 11 +- .../velocity/VelocityPropertiesGenerator.java | 11 +- .../velocity/VelocityTemplateGeneratorFactory.java | 27 ++-- .../velocity/VelocityDirectiveGeneratorTest.java | 23 +-- .../velocity/VelocityPropertiesGeneratorTest.java | 19 +-- .../VelocityTemplateGeneratorFactoryTest.java | 29 ++-- 52 files changed, 1064 insertions(+), 704 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tiles-autotag.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
