This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository doxia-sitetools.
commit d9e1cfe13bd2c04637be9dc4568103ab9176e01a Merge: 24b0246 f46359e Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 28 09:02:22 2017 +0200 Updated version 1.6 from 'upstream/1.6' with Debian dir e4f40a0fe67bba0126ff17124a5ec4b8c81f9552 doxia-decoration-model/pom.xml | 15 +- ...DefaultDecorationModelInheritanceAssembler.java | 34 +++- .../decoration/inheritance/PathDescriptor.java | 21 ++- doxia-decoration-model/src/main/mdo/decoration.mdo | 21 ++- doxia-decoration-model/src/site/apt/index.apt | 7 +- .../DecorationModelInheritenceAssemblerTest.java | 28 ++- .../site/decoration/inheritance/PathUtilsTest.java | 10 +- .../inheritance/URIPathDescriptorTest.java | 12 +- .../src/test/resources/child-no-inheritance.xml | 38 ++++ doxia-doc-renderer/pom.xml | 2 +- doxia-site-renderer/pom.xml | 2 +- .../doxia/siterenderer/DefaultSiteRenderer.java | 75 ++++---- .../maven/doxia/siterenderer/DocumentRenderer.java | 6 +- .../doxia/siterenderer/DoxiaDocumentRenderer.java | 6 +- .../maven/doxia/siterenderer/ModuleReference.java | 4 +- .../apache/maven/doxia/siterenderer/Renderer.java | 3 +- .../maven/doxia/siterenderer/RenderingContext.java | 194 +++++++++++++++++++++ .../doxia/siterenderer/SiteRenderingContext.java | 4 +- .../doxia/siterenderer/SkinResourceLoader.java | 123 +++++++++++++ .../doxia/siterenderer/sink/SiteRendererSink.java | 74 +++++--- .../main/resources/META-INF/plexus/components.xml | 35 +--- .../doxia/siterenderer/resources/default-site.vm | 4 +- .../src/main/resources/site-renderer_de.properties | 2 +- .../maven/doxia/siterenderer/AptVerifier.java | 14 +- .../siterenderer/DefaultSiteRendererTest.java | 71 ++++++-- .../maven/doxia/siterenderer/FaqVerifier.java | 6 +- .../doxia/siterenderer/RenderingContextTest.java | 64 +++++++ .../doxia/siterenderer/SkinResourceLoaderTest.java | 62 +++++++ .../siterenderer/velocity-toolmanager.expected.txt | 4 +- .../doxia/siterenderer/velocity-toolmanager.vm | 4 +- pom.xml | 62 ++++--- .../site/resources/download.cgi | 11 +- src/site/resources/download.xml.vm | 126 +++++++++++++ src/site/site.xml | 3 + 34 files changed, 950 insertions(+), 197 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/doxia-sitetools.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
