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 8ad09f9ee56855cf4104db2f269af057aaf41544 Merge: 6a302f4 93587f6 Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 28 01:19:10 2017 +0200 Updated version 1.3 from 'upstream/1.3' with Debian dir e5b751c555c1cd5faa2407bc52d3bb24ada8dc39 doxia-decoration-model/pom.xml | 8 +- ...DefaultDecorationModelInheritanceAssembler.java | 23 +- .../decoration/inheritance/URIPathDescriptor.java | 1 + doxia-decoration-model/src/main/mdo/decoration.mdo | 58 ++++- doxia-decoration-model/src/site/apt/index.apt | 21 ++ .../src/site/apt/using-decoration-xsd.apt | 41 ---- doxia-decoration-model/src/site/site.xml | 9 +- .../DecorationModelInheritenceAssemblerTest.java | 204 +++++++++++++--- doxia-doc-renderer/pom.xml | 4 +- .../docrenderer/AbstractDocumentRenderer.java | 7 +- .../doxia/docrenderer/DocumentRendererContext.java | 10 +- .../docrenderer/itext/AbstractITextRender.java | 16 +- .../doxia/docrenderer/pdf/fo/FoPdfRenderer.java | 12 +- .../docrenderer/pdf/itext/ITextPdfRenderer.java | 14 +- doxia-doc-renderer/src/site/site.xml | 7 + .../doxia/docrenderer/DocumentRendererTest.java | 6 +- doxia-site-renderer/pom.xml | 22 +- .../doxia/siterenderer/DefaultSiteRenderer.java | 114 +++++++-- .../apache/maven/doxia/siterenderer/Renderer.java | 6 +- .../doxia/siterenderer/SiteRenderingContext.java | 26 +- .../doxia/siterenderer/sink/SiteRendererSink.java | 35 ++- .../siterenderer/resources/css/maven-base.css | 4 + .../doxia/siterenderer/resources/default-site.vm | 87 ++++--- .../src/main/resources/site-renderer_nl.properties | 1 + doxia-site-renderer/src/site/apt/index.apt | 123 ++++++++++ doxia-site-renderer/src/site/site.xml | 7 + .../maven/doxia/siterenderer/AptVerifier.java | 124 +++++----- .../doxia/siterenderer/AttributesVerifier.java | 177 ++++++++------ .../siterenderer/DefaultSiteRendererTest.java | 94 +++++++- .../maven/doxia/siterenderer/EntitiesVerifier.java | 56 ++--- .../maven/doxia/siterenderer/FaqVerifier.java | 75 +++--- .../maven/doxia/siterenderer/HeadVerifier.java | 36 +-- .../doxia/siterenderer/JavascriptVerifier.java | 18 +- .../maven/doxia/siterenderer/MiscVerifier.java | 13 +- .../doxia/siterenderer/MultipleBlockVerifier.java | 19 +- .../doxia/siterenderer/NestedItemsVerifier.java | 95 ++++---- .../doxia/siterenderer/XhtmlEntityResolver.java | 77 +++--- .../siterenderer/velocity-toolmanager.expected.txt | 2 + .../doxia/siterenderer/velocity-toolmanager.vm | 2 + .../src/test/resources/site/xdoc/attributes.xml | 11 + pom.xml | 263 +++++++++------------ src/site/resources/images/doxia-sitetools-deps.png | Bin 11396 -> 6713 bytes src/site/site.xml | 4 - src/site/xdoc/doxia-sitetools-deps.odg | Bin 11330 -> 11574 bytes src/site/xdoc/index.xml | 35 ++- 45 files changed, 1272 insertions(+), 695 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
