This is an automated email from the git hooks/post-receive script. grinorcole-guest pushed a commit to branch master in repository doxia-sitetools.
commit 65efbe95e9f710d8607b74b8c0012ca89b9c1055 Merge: b5826e0 9462c4f Author: Christopher Hoskin <[email protected]> Date: Fri Nov 18 22:11:22 2016 +0000 Merge tag 'upstream/1.1.4' Upstream version 1.1.4 doxia-decoration-model/pom.xml | 90 + .../DecorationModelInheritanceAssembler.java | 54 + ...DefaultDecorationModelInheritanceAssembler.java | 404 +++ .../decoration/inheritance/PathDescriptor.java | 250 ++ .../site/decoration/inheritance/PathUtils.java | 145 + doxia-decoration-model/src/main/mdo/decoration.mdo | 606 ++++ .../src/site/apt/using-decoration-xsd.apt | 41 + doxia-decoration-model/src/site/site.xml | 41 + .../DecorationModelInheritenceAssemblerTest.java | 540 ++++ .../site/decoration/inheritance/Doxia91Test.java | 69 + .../decoration/inheritance/PathDescriptorTest.java | 607 ++++ .../site/decoration/inheritance/PathUtilsTest.java | 63 + .../src/test/resources/child.xml | 37 + .../src/test/resources/empty.xml | 26 + .../src/test/resources/external-urls.xml | 54 + .../src/test/resources/fully-populated-child.xml | 67 + .../src/test/resources/fully-populated-merged.xml | 62 + .../src/test/resources/merged.xml | 68 + .../src/test/resources/parent.xml | 63 + .../src/test/resources/relative-urls-resolved.xml | 53 + .../src/test/resources/relative-urls.xml | 53 + .../subsite-relative-urls-multiple-resolved.xml | 53 + .../resources/subsite-relative-urls-resolved.xml | 53 + .../src/test/resources/subsite-urls-file.xml | 53 + .../src/test/resources/subsite-urls.xml | 53 + doxia-doc-renderer/pom.xml | 167 ++ .../docrenderer/AbstractDocumentRenderer.java | 692 +++++ .../maven/doxia/docrenderer/DocRenderer.java | 66 + .../maven/doxia/docrenderer/DocumentRenderer.java | 109 + .../doxia/docrenderer/DocumentRendererContext.java | 141 + .../docrenderer/DocumentRendererException.java | 55 + .../docrenderer/itext/AbstractITextRender.java | 506 ++++ .../docrenderer/itext/DefaultPdfRenderer.java | 65 + .../docrenderer/itext/DefaultRtfRenderer.java | 65 + .../maven/doxia/docrenderer/itext/PdfRenderer.java | 35 + .../maven/doxia/docrenderer/itext/RtfRenderer.java | 35 + .../doxia/docrenderer/pdf/AbstractPdfRenderer.java | 53 + .../maven/doxia/docrenderer/pdf/PdfRenderer.java | 48 + .../doxia/docrenderer/pdf/fo/FoPdfRenderer.java | 352 +++ .../docrenderer/pdf/itext/ITextPdfRenderer.java | 675 +++++ .../maven/doxia/docrenderer/itext/package.html | 27 + .../maven/doxia/docrenderer/pdf/itext/TOC.xslt | 243 ++ doxia-doc-renderer/src/site/site.xml | 34 + .../doxia/docrenderer/DocumentRendererTest.java | 146 + .../src/test/resources/site/apt/index.apt | 66 + .../src/test/resources/site/apt/overview.apt | 104 + .../src/test/resources/site/apt/resources.apt | 49 + .../src/test/resources/site/fml/faq.fml | 67 + doxia-doc-renderer/src/test/resources/site/pdf.xml | 57 + .../src/test/resources/site/resources/css/site.css | 38 + .../site/resources/images/architecture.odg | Bin 0 -> 12767 bytes .../site/resources/images/architecture.png | Bin 0 -> 19581 bytes .../resources/site/resources/images/doxia-logo.png | Bin 0 -> 16375 bytes .../src/test/resources/site/site.xml | 82 + .../resources/site/xdoc/references/fml-format.xml | 101 + .../resources/site/xdoc/references/xdoc-format.xml | 279 ++ doxia-site-renderer/pom.xml | 186 ++ .../doxia/siterenderer/DefaultSiteRenderer.java | 889 ++++++ .../maven/doxia/siterenderer/DocumentRenderer.java | 69 + .../doxia/siterenderer/DoxiaDocumentRenderer.java | 74 + .../maven/doxia/siterenderer/ModuleReference.java | 60 + .../apache/maven/doxia/siterenderer/Renderer.java | 138 + .../doxia/siterenderer/RendererException.java | 54 + .../doxia/siterenderer/SiteRenderingContext.java | 352 +++ .../doxia/siterenderer/sink/SiteRendererSink.java | 297 ++ .../main/resources/META-INF/plexus/components.xml | 89 + .../siterenderer/resources/css/maven-base.css | 151 + .../doxia/siterenderer/resources/css/print.css | 7 + .../doxia/siterenderer/resources/default-site.vm | 504 ++++ .../siterenderer/resources/images/collapsed.gif | Bin 0 -> 53 bytes .../siterenderer/resources/images/expanded.gif | Bin 0 -> 52 bytes .../images/logos/build-by-maven-black.png | Bin 0 -> 2294 bytes .../images/logos/build-by-maven-white.png | Bin 0 -> 2260 bytes .../resources/images/logos/maven-feather.png | Bin 0 -> 3330 bytes .../doxia/siterenderer/resources/resources.txt | 7 + .../src/main/resources/site-renderer.properties | 20 + .../src/main/resources/site-renderer_de.properties | 19 + .../src/main/resources/site-renderer_en.properties | 23 + .../src/main/resources/site-renderer_es.properties | 20 + .../src/main/resources/site-renderer_fr.properties | 19 + .../src/main/resources/site-renderer_it.properties | 20 + .../src/main/resources/site-renderer_ja.properties | 20 + .../src/main/resources/site-renderer_nl.properties | 19 + .../src/main/resources/site-renderer_pl.properties | 19 + .../main/resources/site-renderer_pt_BR.properties | 20 + .../main/resources/site-renderer_zh_CN.properties | 20 + doxia-site-renderer/src/site/site.xml | 34 + .../maven/doxia/siterenderer/AbstractVerifier.java | 69 + .../maven/doxia/siterenderer/AptVerifier.java | 165 ++ .../doxia/siterenderer/AttributesVerifier.java | 208 ++ .../siterenderer/DefaultSiteRendererTest.java | 383 +++ .../maven/doxia/siterenderer/EntitiesVerifier.java | 192 ++ .../maven/doxia/siterenderer/FaqVerifier.java | 199 ++ .../maven/doxia/siterenderer/HeadVerifier.java | 101 + .../doxia/siterenderer/JavascriptVerifier.java | 105 + .../maven/doxia/siterenderer/MiscVerifier.java | 66 + .../doxia/siterenderer/MultipleBlockVerifier.java | 135 + .../doxia/siterenderer/NestedItemsVerifier.java | 324 +++ .../src/test/resources/log4j.properties | 24 + .../src/test/resources/site-plugin.properties | 19 + .../resources/site-validate/xdoc/entityTest.xml | 71 + .../test/resources/site-validate/xdoc/xdoc-2.0.xsd | 2963 ++++++++++++++++++++ .../src/test/resources/site/apt/apt.apt | 57 + .../src/test/resources/site/apt/cdc.apt | 107 + .../src/test/resources/site/apt/interpolation.apt | 33 + .../site/confluence/confluence/anchor.confluence | 7 + .../site/confluence/confluence/code.confluence | 21 + .../site/confluence/confluence/escapes.confluence | 6 + .../site/confluence/confluence/figure.confluence | 22 + .../confluence/confluence/linebreak.confluence | 5 + .../site/confluence/confluence/link.confluence | 5 + .../confluence/confluence/nested-format.confluence | 6 + .../confluence/nested-list-heterogenous.confluence | 4 + .../confluence/confluence/nested-list.confluence | 8 + .../confluence/confluence/note-tip-info.confluence | 27 + .../confluence/paragraph-figure.confluence | 6 + .../confluence/paragraph-header.confluence | 6 + .../confluence/paragraph-list.confluence | 8 + .../site/confluence/confluence/section.confluence | 9 + .../confluence/confluence/simple-list.confluence | 14 + .../confluence/simple-paragraph.confluence | 8 + .../confluence/confluence/table-link.confluence | 4 + .../site/confluence/confluence/table.confluence | 13 + .../site/confluence/confluence/test.confluence | 98 + .../confluence/confluence/unknown-macro.confluence | 5 + .../src/test/resources/site/docbook/docbook.xml | 31 + .../test/resources/site/docbook/sdocbook_full.xml | 546 ++++ .../src/test/resources/site/fml/faq.fml | 60 + .../confluence/images/build-by-maven-white.png | Bin 0 -> 2260 bytes .../src/test/resources/site/site.xml | 50 + .../src/test/resources/site/xdoc/attributes.xml | 82 + .../src/test/resources/site/xdoc/head.xml | 38 + .../src/test/resources/site/xdoc/javascript.xml | 45 + .../src/test/resources/site/xdoc/macro.xml | 75 + .../src/test/resources/site/xdoc/misc.xml | 31 + .../src/test/resources/site/xdoc/multipleblock.xml | 44 + .../src/test/resources/site/xdoc/nestedItems.xml | 195 ++ .../src/test/resources/xhtml-lat1.ent | 196 ++ pom.xml | 424 +++ src/site/resources/images/doxia-sitetools-deps.png | Bin 0 -> 11396 bytes src/site/site.xml | 51 + src/site/xdoc/doxia-sitetools-deps.odg | Bin 0 -> 11330 bytes src/site/xdoc/index.xml | 59 + 143 files changed, 18522 insertions(+) -- 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
