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 271d7236ca0a020ee755e0745777beccf86635f6 Merge: ea0d989 838dc6a Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 28 01:07:36 2017 +0200 Updated version 1.2 from 'upstream/1.2' with Debian dir f58e042f7c9ed277c65f394e6ddc6e0b4c8edfcc doxia-decoration-model/pom.xml | 5 +- .../DecorationModelInheritanceAssembler.java | 25 +- ...DefaultDecorationModelInheritanceAssembler.java | 286 ++--- .../decoration/inheritance/PathDescriptor.java | 3 +- .../site/decoration/inheritance/PathUtils.java | 3 +- .../decoration/inheritance/URIPathDescriptor.java | 264 +++++ doxia-decoration-model/src/main/mdo/decoration.mdo | 52 +- doxia-decoration-model/src/site/site.xml | 2 +- .../DecorationModelInheritenceAssemblerTest.java | 221 +++- .../decoration/inheritance/PathDescriptorTest.java | 26 +- .../site/decoration/inheritance/PathUtilsTest.java | 16 +- .../inheritance/URIPathDescriptorTest.java | 283 +++++ .../src/test/resources/fully-populated-merged.xml | 2 +- ...d-merged.xml => fully-populated-unresolved.xml} | 2 +- .../src/test/resources/merged.xml | 2 +- doxia-doc-renderer/pom.xml | 18 +- .../docrenderer/AbstractDocumentRenderer.java | 64 +- .../maven/doxia/docrenderer/DocRenderer.java | 4 +- .../maven/doxia/docrenderer/DocumentRenderer.java | 4 +- .../doxia/docrenderer/DocumentRendererContext.java | 6 +- .../docrenderer/itext/AbstractITextRender.java | 37 +- .../doxia/docrenderer/pdf/AbstractPdfRenderer.java | 5 +- .../doxia/docrenderer/pdf/fo/FoPdfRenderer.java | 54 +- .../docrenderer/pdf/itext/ITextPdfRenderer.java | 50 +- doxia-doc-renderer/src/site/site.xml | 2 +- .../doxia/docrenderer/DocumentRendererTest.java | 8 +- doxia-doc-renderer/src/test/resources/site/pdf.xml | 2 +- .../site/resources/images/asf_logo_wide.png | Bin 0 -> 7090 bytes doxia-site-renderer/pom.xml | 6 +- .../doxia/siterenderer/DefaultSiteRenderer.java | 172 +-- .../maven/doxia/siterenderer/ModuleReference.java | 2 +- .../apache/maven/doxia/siterenderer/Renderer.java | 23 +- .../doxia/siterenderer/SiteRenderingContext.java | 59 +- .../doxia/siterenderer/sink/SiteRendererSink.java | 37 +- .../doxia/siterenderer/resources/default-site.vm | 73 +- .../src/main/resources/site-renderer_sv.properties | 20 + doxia-site-renderer/src/site/site.xml | 2 +- .../maven/doxia/siterenderer/AptVerifier.java | 14 +- .../siterenderer/DefaultSiteRendererTest.java | 38 +- .../doxia/siterenderer/XhtmlEntityResolver.java | 80 ++ .../src/test/resources/dtd/xhtml-lat1.ent | 196 ++++ .../src/test/resources/dtd/xhtml-special.ent | 80 ++ .../src/test/resources/dtd/xhtml-symbol.ent | 237 ++++ .../src/test/resources/dtd/xhtml1-transitional.dtd | 1201 ++++++++++++++++++++ .../src/test/resources/site/apt/apt.apt | 2 + pom.xml | 96 +- src/site/site.xml | 14 +- 47 files changed, 3278 insertions(+), 520 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
