[tiles-autotag] branch master updated (e1c152b -> adde12d)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a change to branch master
in repository tiles-autotag.

      from  e1c152b   Use a sorted map in TemplateSuite to improve the reproducibility
      adds  c3f7692   Imported Upstream version 1.2
       new  5c3063a   Merge tag 'upstream/1.2'
       new  cc57d9a   Refreshed the patches
       new  8d9c8f0   Ignore the maven-scm-publish-plugin
       new  adde12d   Upload to unstable

The 4 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.


Summary of changes:
 assembly/pom.xml                                   |   4 +-
 debian/changelog                                   |   7 +
 debian/maven.ignoreRules                           |   1 +
 debian/patches/01-xmlpull-dependency.patch         |   4 +-
 debian/patches/02-velocity-compatibility.patch     |   8 +-
 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 ++++++++
 .../core/{package-info.java => OutputLocator.java} |  25 +++-
 .../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 ++--
 56 files changed, 1081 insertions(+), 693 deletions(-)
 create mode 100644 maven-autotag-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
 create mode 100644 tiles-autotag-core/src/main/java/org/apache/tiles/autotag/core/DirectoryOutputLocator.java
 copy tiles-autotag-core/src/main/java/org/apache/tiles/autotag/core/{package-info.java => OutputLocator.java} (58%)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tiles-autotag.git