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 e75fdd0f0f98b98b5aa49374d10278370161d06b Merge: e04b503 347123c Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 28 11:45:18 2017 +0200 Updated version 1.7 from 'upstream/1.7' with Debian dir aebbd36bd4bdd4f5bf343d94e710af40f5eeacb3 doxia-decoration-model/pom.xml | 7 +- .../doxia/site/decoration/DecorationUtils.java | 63 + ...DefaultDecorationModelInheritanceAssembler.java | 48 +- doxia-decoration-model/src/main/mdo/decoration.mdo | 30 +- doxia-decoration-model/src/site/apt/index.apt | 20 + .../doxia/site/decoration/DecorationUtilsTest.java | 45 +- .../DecorationModelInheritenceAssemblerTest.java | 6 +- .../inheritance/URIPathDescriptorTest.java | 54 +- .../src/test/resources/fully-populated-child.xml | 2 + .../src/test/resources/fully-populated-merged.xml | 2 + .../test/resources/fully-populated-unresolved.xml | 2 + .../src/test/resources/merged.xml | 2 +- doxia-doc-renderer/pom.xml | 21 +- .../docrenderer/AbstractDocumentRenderer.java | 110 +- .../maven/doxia/docrenderer/DocumentRenderer.java | 5 +- .../docrenderer/itext/AbstractITextRender.java | 55 +- .../maven/doxia/docrenderer/itext/PdfRenderer.java | 3 +- .../maven/doxia/docrenderer/itext/RtfRenderer.java | 3 +- .../doxia/docrenderer/pdf/AbstractPdfRenderer.java | 6 +- .../maven/doxia/docrenderer/pdf/PdfRenderer.java | 5 +- .../doxia/docrenderer/pdf/fo/FoPdfRenderer.java | 85 +- .../docrenderer/pdf/itext/ITextPdfRenderer.java | 99 +- .../src/test/resources/site/apt/overview.apt | 4 +- .../src/test/resources/site/resources/css/site.css | 19 + .../src/test/resources/site/site.xml | 2 + doxia-integration-tools/pom.xml | 194 +++ .../apache/maven/doxia/tools/DefaultSiteTool.java | 1493 ++++++++++++++++++++ .../apache/maven/doxia/tools/MojoLogWrapper.java | 160 +++ .../apache/maven/doxia/tools/ReportComparator.java | 62 + .../org/apache/maven/doxia/tools/SiteTool.java | 207 +++ .../maven/doxia/tools/SiteToolException.java | 67 + .../src/main/resources/default-site.xml | 33 + .../src/main/resources/site-tool.properties | 22 + .../src/main/resources/site-tool_ca.properties | 22 + .../src/main/resources/site-tool_cs.properties | 22 + .../src/main/resources/site-tool_da.properties | 22 + .../src/main/resources/site-tool_de.properties | 22 + .../src/main/resources/site-tool_en.properties | 23 + .../src/main/resources/site-tool_es.properties | 22 + .../src/main/resources/site-tool_fr.properties | 22 + .../src/main/resources/site-tool_gl.properties | 22 + .../src/main/resources/site-tool_hu.properties | 22 + .../src/main/resources/site-tool_it.properties | 22 + .../src/main/resources/site-tool_ja.properties | 22 + .../src/main/resources/site-tool_ko.properties | 22 + .../src/main/resources/site-tool_lt.properties | 22 + .../src/main/resources/site-tool_nl.properties | 22 + .../src/main/resources/site-tool_no.properties | 22 + .../src/main/resources/site-tool_pl.properties | 22 + .../src/main/resources/site-tool_pt.properties | 22 + .../src/main/resources/site-tool_pt_BR.properties | 22 + .../src/main/resources/site-tool_ru.properties | 22 + .../src/main/resources/site-tool_sk.properties | 22 + .../src/main/resources/site-tool_sv.properties | 22 + .../src/main/resources/site-tool_tr.properties | 22 + .../src/main/resources/site-tool_zh_CN.properties | 22 + .../src/main/resources/site-tool_zh_TW.properties | 22 + doxia-integration-tools/src/site/apt/index.apt | 40 + doxia-integration-tools/src/site/apt/usage.apt | 71 + .../src/site/resources/download.cgi | 22 + doxia-integration-tools/src/site/site.xml | 37 + .../src/site/xdoc/download.xml.vm | 126 ++ .../maven/doxia/tools/DefaultSiteToolTest.java | 56 + .../org/apache/maven/doxia/tools/SiteToolTest.java | 370 +++++ .../tools/stubs/SiteToolMavenProjectStub.java | 118 ++ .../test/resources/unit/interpolated-site/pom.xml | 80 ++ .../unit/interpolated-site/src/site/apt/test.apt | 29 + .../unit/interpolated-site/src/site/site.xml | 43 + .../unit/interpolation-child-test/pom.xml | 29 + .../interpolation-child-test/src/site/site.xml | 24 + .../unit/interpolation-parent-test/pom.xml | 29 + .../interpolation-parent-test/src/site/site.xml | 34 + .../src/test/resources/unit/no-site-test/pom.xml | 40 + .../src/test/resources/unit/site-tool-test/pom.xml | 40 + .../unit/site-tool-test/src/site/site.xml | 43 +- doxia-site-renderer/pom.xml | 20 +- .../doxia/siterenderer/DefaultSiteRenderer.java | 675 +++++---- .../maven/doxia/siterenderer/DocumentRenderer.java | 12 +- .../doxia/siterenderer/DoxiaDocumentRenderer.java | 11 +- ...ference.java => ExtraDoxiaModuleReference.java} | 8 +- .../apache/maven/doxia/siterenderer/Renderer.java | 59 +- .../doxia/siterenderer/RendererException.java | 2 +- .../maven/doxia/siterenderer/RenderingContext.java | 56 +- .../doxia/siterenderer/SiteRenderingContext.java | 69 +- .../doxia/siterenderer/SkinResourceLoader.java | 8 +- .../doxia/siterenderer/sink/SiteRendererSink.java | 10 +- .../siterenderer/resources/css/maven-base.css | 19 + .../doxia/siterenderer/resources/css/print.css | 19 + .../doxia/siterenderer/resources/default-site.vm | 89 +- .../doxia/siterenderer/resources/resources.txt | 17 + .../src/site/apt/doxia-site-renderer.odg | Bin 0 -> 22124 bytes doxia-site-renderer/src/site/apt/index.apt | 123 -- doxia-site-renderer/src/site/apt/index.apt.vm | 186 +++ .../src/site/resources/doxia-site-renderer.png | Bin 0 -> 45345 bytes .../maven/doxia/siterenderer/CommentsVerifier.java | 26 +- .../siterenderer/DefaultSiteRendererTest.java | 91 +- .../maven/doxia/siterenderer/FaqVerifier.java | 6 +- .../doxia/siterenderer/RenderingContextTest.java | 6 +- .../doxia/siterenderer/SkinResourceLoaderTest.java | 2 +- .../siterenderer/velocity-toolmanager.expected.txt | 39 + .../doxia/siterenderer/velocity-toolmanager.vm | 5 + .../src/test/resources/site/apt/apt.apt | 2 + .../apt/{apt.apt => extension.apt.not.at.end.apt} | 39 +- .../src/test/resources/site/fml/faq.fml | 4 +- .../src/test/resources/site/xdoc/misc.xml | 2 + .../pom.xml | 19 +- doxia-skin-model/src/main/mdo/skin.mdo | 101 ++ doxia-skin-model/src/site/apt/index.apt | 54 + .../src/site/site.xml | 37 +- pom.xml | 185 +-- src/site/resources/images/doxia-sitetools-deps.png | Bin 6713 -> 31677 bytes src/site/site.xml | 11 +- src/site/xdoc/doxia-sitetools-deps.odg | Bin 11574 -> 18659 bytes src/site/xdoc/index.xml | 26 +- 114 files changed, 5720 insertions(+), 1014 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
