This is an automated email from the git hooks/post-receive script. grinorcole-guest pushed a commit to branch master in repository doxia.
commit 806afe69c23af160b52342ead7bbfd642feed4bc Merge: ee507ad 1b9256c Author: Christopher Hoskin <[email protected]> Date: Sun Oct 30 20:08:26 2016 +0000 Merge tag 'upstream/1.7' Upstream version 1.7 DEPENDENCIES | 11 + LICENSE | 202 + NOTICE | 8 + doxia-book/pom.xml | 151 - .../org/apache/maven/doxia/book/BookDoxia.java | 79 - .../maven/doxia/book/BookDoxiaException.java | 55 - .../apache/maven/doxia/book/DefaultBookDoxia.java | 155 - .../doxia/book/InvalidBookDescriptorException.java | 61 - .../maven/doxia/book/context/BookContext.java | 258 -- .../apache/maven/doxia/book/context/BookIndex.java | 40 - .../doxia/book/services/indexer/BookIndexer.java | 46 - .../book/services/indexer/DefaultBookIndexer.java | 152 - .../maven/doxia/book/services/io/BookIo.java | 57 - .../doxia/book/services/io/DefaultBookIo.java | 151 - .../renderer/AbstractITextBookRenderer.java | 343 -- .../doxia/book/services/renderer/BookRenderer.java | 44 - .../services/renderer/DocbookBookRenderer.java | 228 - .../book/services/renderer/LatexBookRenderer.java | 255 -- .../book/services/renderer/PdfBookRenderer.java | 52 - .../book/services/renderer/RtfBookRenderer.java | 52 - .../book/services/renderer/XHtmlBookRenderer.java | 213 - .../book/services/renderer/XdocBookRenderer.java | 452 -- .../services/renderer/docbook/DocBookBookSink.java | 270 -- .../services/renderer/latex/LatexBookSink.java | 124 - .../renderer/xdoc/AbstractXdocBookSink.java | 126 - .../renderer/xdoc/ChapterXdocBookSink.java | 151 - .../services/renderer/xdoc/IndexXdocBookSink.java | 84 - .../renderer/xdoc/SectionXdocBookSink.java | 166 - .../services/renderer/xhtml/XhtmlBookSink.java | 248 - .../services/validation/DefaultBookValidator.java | 108 - .../book/services/validation/ValidationResult.java | 81 - doxia-book/src/main/modello/book.mdo | 537 --- .../src/main/resources/book-renderer_en.properties | 23 - doxia-book/src/site/apt/index.apt | 20 - doxia-book/src/site/apt/usage.apt | 31 - doxia-book/src/site/site.xml | 47 - .../apache/maven/doxia/book/BookRendererTest.java | 75 - .../book/services/indexer/BookIndexerTest.java | 118 - .../renderer/docbook/DocBookBookSinkTest.java | 490 -- doxia-book/src/test/resources/book-1.xml | 51 - doxia-book/src/test/resources/book-1/section-1.apt | 61 - doxia-book/src/test/resources/book-1/section-2.apt | 16 - doxia-book/src/test/resources/book-1/section-3.apt | 17 - doxia-book/src/test/resources/book-1/section-4.apt | 16 - .../expected/doc-book/plexus-user-guide.xml | 124 - doxia-core/pom.xml | 25 +- .../java/org/apache/maven/doxia/DefaultDoxia.java | 8 +- .../org/apache/maven/doxia/index/IndexEntry.java | 65 +- .../org/apache/maven/doxia/index/IndexingSink.java | 10 +- .../apache/maven/doxia/macro/AbstractMacro.java | 13 +- .../org/apache/maven/doxia/macro/EchoMacro.java | 13 +- .../org/apache/maven/doxia/macro/MacroRequest.java | 40 +- .../org/apache/maven/doxia/macro/SsiMacro.java | 69 + .../org/apache/maven/doxia/macro/SwfMacro.java | 64 +- .../doxia/macro/manager/DefaultMacroManager.java | 12 +- .../maven/doxia/macro/snippet/SnippetMacro.java | 108 +- .../maven/doxia/macro/snippet/SnippetReader.java | 54 +- .../org/apache/maven/doxia/macro/toc/TocMacro.java | 21 +- .../org/apache/maven/doxia/markup/HtmlMarkup.java | 21 +- .../java/org/apache/maven/doxia/markup/Markup.java | 3 +- .../org/apache/maven/doxia/markup/TextMarkup.java | 3 +- .../org/apache/maven/doxia/markup/XmlMarkup.java | 4 +- .../doxia/module/site/AbstractSiteModule.java | 80 - .../site/manager/DefaultSiteModuleManager.java | 77 - .../module/site/manager/SiteModuleManager.java | 55 - .../apache/maven/doxia/parser/AbstractParser.java | 82 +- .../maven/doxia/parser/AbstractTextParser.java | 3 +- .../maven/doxia/parser/AbstractXmlParser.java | 81 +- .../java/org/apache/maven/doxia/parser/Parser.java | 27 +- .../apache/maven/doxia/parser/XhtmlBaseParser.java | 357 +- .../doxia/parser/manager/DefaultParserManager.java | 14 +- .../doxia/parser/module/AbstractParserModule.java | 109 + .../parser/module/DefaultParserModuleManager.java | 72 + .../module/ParserModule.java} | 21 +- .../doxia/parser/module/ParserModuleManager.java | 30 +- .../module/ParserModuleNotFoundException.java} | 25 +- .../sink/{ => impl}/AbstractBinarySinkFactory.java | 6 +- .../maven/doxia/sink/{ => impl}/AbstractSink.java | 9 +- .../doxia/sink/{ => impl}/AbstractTextSink.java | 4 +- .../sink/{ => impl}/AbstractTextSinkFactory.java | 6 +- .../doxia/sink/{ => impl}/AbstractXmlSink.java | 24 +- .../sink/{ => impl}/AbstractXmlSinkFactory.java | 6 +- .../maven/doxia/sink/{ => impl}/PipelineSink.java | 19 +- .../maven/doxia/sink/impl/RandomAccessSink.java | 929 ++++ .../maven/doxia/sink/{ => impl}/SinkAdapter.java | 276 +- .../sink/{ => impl}/SinkEventAttributeSet.java | 44 +- .../maven/doxia/sink/{ => impl}/SinkUtils.java | 16 +- .../maven/doxia/sink/{ => impl}/XhtmlBaseSink.java | 308 +- .../maven/doxia/sink/render/RenderingContext.java | 194 - .../maven/doxia/util/ByLineReaderSource.java | 17 +- .../org/apache/maven/doxia/util/DoxiaUtils.java | 82 +- .../org/apache/maven/doxia/util/HtmlTools.java | 27 +- .../org/apache/maven/doxia/util/LineBreaker.java | 8 +- .../org/apache/maven/doxia/util/XmlValidator.java | 23 +- .../src/main/resources/build-info.properties | 7 +- doxia-core/src/site/apt/using-randomaccesssink.apt | 70 + doxia-core/src/site/site.xml | 19 +- .../org/apache/maven/doxia/AbstractModuleTest.java | 35 +- .../maven/doxia/document/DocumentModelTest.java | 10 +- .../apache/maven/doxia/index/IndexEntryTest.java | 4 +- .../apache/maven/doxia/macro/EchoMacroTest.java | 18 +- .../org/apache/maven/doxia/macro/SsiMacroTest.java | 65 + .../org/apache/maven/doxia/macro/SwfMacroTest.java | 65 +- .../doxia/macro/snippet/SnippetMacroTest.java | 131 +- .../apache/maven/doxia/macro/toc/TocMacroTest.java | 112 +- .../maven/doxia/module/AbstractIdentityTest.java | 11 +- .../maven/doxia/parser/AbstractParserTest.java | 42 +- .../maven/doxia/parser/AbstractParserTestCase.java | 4 +- .../maven/doxia/parser/XhtmlBaseParserTest.java | 588 ++- .../doxia/sink/{ => impl}/AbstractSinkTest.java | 167 +- .../sink/{ => impl}/AbstractSinkTestCase.java | 5 +- .../doxia/sink/{ => impl}/AbstractXmlSinkTest.java | 11 +- .../doxia/sink/impl/RandomAccessSinkTest.java | 109 + .../doxia/sink/{ => impl}/SinkAdapterTest.java | 5 +- .../sink/{ => impl}/SinkEventAttributeSetTest.java | 8 +- .../doxia/sink/{ => impl}/SinkEventElement.java | 5 +- .../sink/{ => impl}/SinkEventTestingSink.java | 281 +- .../doxia/sink/{ => impl}/SinkTestDocument.java | 7 +- .../maven/doxia/sink/{ => impl}/SinkUtilsTest.java | 6 +- .../maven/doxia/sink/impl/TestAbstractSink.java | 50 + .../maven/doxia/sink/{ => impl}/TextSink.java | 276 +- .../{ => impl}/WellformednessCheckingSink.java | 290 +- .../doxia/sink/{ => impl}/XhtmlBaseSinkTest.java | 137 +- .../doxia/sink/render/RenderingContextTest.java | 63 - .../org/apache/maven/doxia/util/HtmlToolsTest.java | 5 +- .../apache/maven/doxia/util/XmlValidatorTest.java | 42 +- ...alidatorTest.java => AbstractXmlValidator.java} | 318 +- .../maven/doxia/xsd/AbstractXmlValidatorTest.java | 401 +- .../test/resources/macro/snippet/testSnippet.txt | 20 + doxia-core/src/test/resources/test.xhtml | 50 + doxia-logging-api/pom.xml | 2 +- .../java/org/apache/maven/doxia/logging/Log.java | 4 +- doxia-logging-api/src/site/site.xml | 10 +- doxia-maven-plugin/pom.xml | 198 - .../java/org/apache/maven/doxia/plugin/Book.java | 97 - .../maven/doxia/plugin/DoxiaRenderBooksMojo.java | 336 -- doxia-maven-plugin/src/site/apt/index.apt | 66 - doxia-maven-plugin/src/site/apt/usage.apt.vm | 49 - doxia-modules/doxia-module-apt/pom.xml | 29 +- .../apache/maven/doxia/module/apt/AptMarkup.java | 3 +- .../apache/maven/doxia/module/apt/AptParser.java | 107 +- .../{AptSiteModule.java => AptParserModule.java} | 20 +- .../maven/doxia/module/apt/AptReaderSource.java | 23 +- .../org/apache/maven/doxia/module/apt/AptSink.java | 29 +- .../maven/doxia/module/apt/AptSinkFactory.java | 8 +- .../apache/maven/doxia/module/apt/AptUtils.java | 6 +- .../META-INF/plexus}/components.xml | 0 doxia-modules/doxia-module-apt/src/site/site.xml | 11 +- .../maven/doxia/module/apt/AptParserTest.java | 584 ++- .../apache/maven/doxia/module/apt/AptSinkTest.java | 14 +- .../src/test/resources/pom-4.0.0.xml | 158 + .../src/test/resources/test/macro.apt | 2 +- doxia-modules/doxia-module-confluence/pom.xml | 13 +- .../doxia/module/confluence/ConfluenceMarkup.java | 39 +- .../doxia/module/confluence/ConfluenceParser.java | 38 +- ...SiteModule.java => ConfluenceParserModule.java} | 20 +- .../doxia/module/confluence/ConfluenceSink.java | 53 +- .../module/confluence/ConfluenceSinkFactory.java | 8 +- .../confluence/parser/AbstractFatherBlock.java | 15 +- .../doxia/module/confluence/parser/BoldBlock.java | 4 +- .../confluence/parser/ChildBlocksBuilder.java | 207 +- .../confluence/parser/DefinitionListBlock.java | 8 +- .../parser/DefinitionListBlockParser.java | 8 +- .../confluence/parser/FigureBlockParser.java | 8 +- .../module/confluence/parser/ItalicBlock.java | 4 +- .../{VerbatimBlock.java => LinethroughBlock.java} | 93 +- .../module/confluence/parser/MonospaceBlock.java | 4 +- .../module/confluence/parser/ParagraphBlock.java | 6 +- .../confluence/parser/ParagraphBlockParser.java | 8 +- .../parser/{VerbatimBlock.java => SubBlock.java} | 93 +- .../parser/{VerbatimBlock.java => SupBlock.java} | 93 +- .../{VerbatimBlock.java => UnderlineBlock.java} | 93 +- .../module/confluence/parser/VerbatimBlock.java | 4 +- .../confluence/parser/VerbatimBlockParser.java | 4 +- .../confluence/parser/list/BulletedListBlock.java | 5 +- .../module/confluence/parser/list/ListBlock.java | 5 +- .../confluence/parser/list/ListBlockParser.java | 9 +- .../confluence/parser/list/ListItemBlock.java | 13 +- .../confluence/parser/list/NumberedListBlock.java | 5 +- .../confluence/parser/list/TreeComponent.java | 13 +- .../confluence/parser/list/TreeListBuilder.java | 24 +- .../module/confluence/parser/table/TableBlock.java | 5 +- .../confluence/parser/table/TableBlockParser.java | 102 +- .../confluence/parser/table/TableCellBlock.java | 5 +- .../parser/table/TableCellHeaderBlock.java | 5 +- .../confluence/parser/table/TableRowBlock.java | 5 +- .../doxia-module-confluence/src/site/site.xml | 11 +- .../module/confluence/ConfluenceParserTest.java | 219 +- .../module/confluence/ConfluenceSinkTest.java | 35 +- .../src/test/resources/escapes.confluence | 13 +- .../src/test/resources/link.confluence | 14 +- .../src/test/resources/nested-format.confluence | 2 + .../src/test/resources/simple-list.confluence | 27 +- .../src/test/resources/table.confluence | 17 +- doxia-modules/doxia-module-docbook-simple/pom.xml | 29 +- .../maven/doxia/module/docbook/DocBookParser.java | 34 +- ...ookSiteModule.java => DocBookParserModule.java} | 20 +- .../maven/doxia/module/docbook/DocBookSink.java | 59 +- .../maven/doxia/module/docbook/DocbookMarkup.java | 3 +- .../doxia/module/docbook/DocbookSinkFactory.java | 8 +- .../module/docbook/SimplifiedDocbookMarkup.java | 3 +- .../META-INF/plexus}/components.xml | 6 +- .../src/site/apt/index.apt.vm | 53 + .../doxia-module-docbook-simple/src/site/site.xml | 11 +- .../doxia/module/docbook/DocBookParserTest.java | 283 +- .../doxia/module/docbook/DocBookSinkTest.java | 20 +- doxia-modules/doxia-module-fml/pom.xml | 30 +- .../maven/doxia/module/fml/FmlContentParser.java | 5 +- .../apache/maven/doxia/module/fml/FmlMarkup.java | 3 +- .../apache/maven/doxia/module/fml/FmlParser.java | 75 +- .../{FmlSiteModule.java => FmlParserModule.java} | 20 +- .../META-INF/plexus}/components.xml | 0 doxia-modules/doxia-module-fml/src/site/site.xml | 19 +- .../maven/doxia/module/fml/FmlParserTest.java | 252 +- .../maven/doxia/module/fml/FmlValidatorTest.java | 22 +- doxia-modules/doxia-module-fo/pom.xml | 27 +- .../maven/doxia/module/fo/FoAggregateSink.java | 207 +- .../maven/doxia/module/fo/FoConfiguration.java | 15 +- .../org/apache/maven/doxia/module/fo/FoMarkup.java | 3 +- .../org/apache/maven/doxia/module/fo/FoSink.java | 129 +- .../maven/doxia/module/fo/FoSinkFactory.java | 8 +- .../src/main/resources/fo-styles.xslt | 15 +- doxia-modules/doxia-module-fo/src/site/site.xml | 12 +- .../doxia-module-fo/src/site/xdoc/usage.xml | 46 +- .../maven/doxia/module/fo/FoAggregateSinkTest.java | 94 +- .../maven/doxia/module/fo/FoConfigurationTest.java | 13 +- .../apache/maven/doxia/module/fo/FoSinkTest.java | 32 +- doxia-modules/doxia-module-itext/pom.xml | 7 +- .../apache/maven/doxia/module/itext/ITextFont.java | 4 +- .../maven/doxia/module/itext/ITextHeader.java | 6 +- .../apache/maven/doxia/module/itext/ITextSink.java | 37 +- .../maven/doxia/module/itext/ITextSinkFactory.java | 8 +- .../doxia/module/itext/SinkActionContext.java | 8 +- doxia-modules/doxia-module-itext/src/site/site.xml | 11 +- .../doxia/module/itext/ITextSinkTestCase.java | 4 +- doxia-modules/doxia-module-latex/pom.xml | 7 +- .../apache/maven/doxia/module/latex/LatexSink.java | 12 +- .../maven/doxia/module/latex/LatexSinkFactory.java | 8 +- .../maven/doxia/module/latex/default_preamble.tex | 17 + .../doxia/module/latex/default_sink_commands.tex | 16 + doxia-modules/doxia-module-latex/src/site/site.xml | 11 +- .../maven/doxia/module/latex/LatexSinkTest.java | 16 +- .../pom.xml | 33 +- .../doxia/module/markdown/MarkdownParser.java | 300 ++ .../module/markdown/MarkdownParserModule.java | 52 + .../markdown/MarkdownToDoxiaHtmlSerializer.java | 59 + .../doxia-module-markdown/src/site/apt/index.apt | 28 +- .../doxia-module-markdown}/src/site/site.xml | 15 +- .../module/markdown/MarkdownParserModuleTest.java | 36 +- .../doxia/module/markdown/MarkdownParserTest.java | 309 ++ .../src/test/resources/bold.md | 1 + .../src/test/resources/code.md | 3 + .../src/test/resources/comment-before-heading.md | 20 +- .../src/test/resources/first-heading.md | 10 + .../src/test/resources/html-content.md | 18 + .../src/test/resources/image.md | 1 + .../src/test/resources/italic.md | 1 + .../src/test/resources/link.md | 1 + .../src/test/resources/list.md | 2 + .../src/test/resources/macro-toc.md | 6 + .../src/test/resources/metadata.md | 11 + .../src/test/resources/numbered-list.md | 2 + .../src/test/resources/paragraph.md | 1 + .../src/test/resources/test.md | 4739 ++++++++++++++++++++ doxia-modules/doxia-module-rtf/pom.xml | 13 +- .../maven/doxia/module/rtf/AlphaNumerals.java | 4 +- .../apache/maven/doxia/module/rtf/FontMetrics.java | 6 +- .../apache/maven/doxia/module/rtf/Monospace.java | 6 +- .../maven/doxia/module/rtf/MonospaceBold.java | 6 +- .../doxia/module/rtf/MonospaceBoldItalic.java | 6 +- .../maven/doxia/module/rtf/MonospaceItalic.java | 6 +- .../apache/maven/doxia/module/rtf/PBMReader.java | 7 +- .../maven/doxia/module/rtf/RomanNumerals.java | 4 +- .../org/apache/maven/doxia/module/rtf/RtfSink.java | 25 +- .../maven/doxia/module/rtf/RtfSinkFactory.java | 8 +- .../apache/maven/doxia/module/rtf/SansSerif.java | 6 +- .../maven/doxia/module/rtf/SansSerifBold.java | 6 +- .../doxia/module/rtf/SansSerifBoldItalic.java | 6 +- .../maven/doxia/module/rtf/SansSerifItalic.java | 6 +- .../org/apache/maven/doxia/module/rtf/Serif.java | 6 +- .../apache/maven/doxia/module/rtf/SerifBold.java | 6 +- .../maven/doxia/module/rtf/SerifBoldItalic.java | 6 +- .../apache/maven/doxia/module/rtf/SerifItalic.java | 6 +- doxia-modules/doxia-module-rtf/src/site/site.xml | 11 +- .../apache/maven/doxia/module/rtf/RtfSinkTest.java | 6 +- doxia-modules/doxia-module-twiki/pom.xml | 14 +- .../maven/doxia/module/twiki/TWikiMarkup.java | 3 +- .../maven/doxia/module/twiki/TWikiParser.java | 41 +- ...TWikiSiteModule.java => TWikiParserModule.java} | 20 +- .../apache/maven/doxia/module/twiki/TWikiSink.java | 16 +- .../maven/doxia/module/twiki/TWikiSinkFactory.java | 8 +- .../module/twiki/parser/FormatedTextParser.java | 16 +- .../twiki/parser/GenericListBlockParser.java | 20 +- .../module/twiki/parser/ParagraphBlockParser.java | 12 +- .../doxia/module/twiki/parser/SectionBlock.java | 4 +- .../module/twiki/parser/SectionBlockParser.java | 6 +- .../module/twiki/parser/TableBlockParser.java | 8 +- .../doxia/module/twiki/parser/TextParser.java | 23 +- .../doxia/module/twiki/parser/VerbatimBlock.java | 4 +- .../module/twiki/parser/VerbatimBlockParser.java | 6 +- doxia-modules/doxia-module-twiki/src/site/site.xml | 11 +- .../maven/doxia/module/twiki/TWikiSinkTest.java | 12 +- .../doxia/module/twiki/parser/TwikiParserTest.java | 94 + .../doxia/module/twiki/parser/VerbatimTest.java | 11 +- .../maven/doxia/module/twiki/parser/WordsTest.java | 66 +- .../{TWikiParserTest.twiki => test.twiki} | 0 doxia-modules/doxia-module-xdoc/pom.xml | 30 +- .../apache/maven/doxia/module/xdoc/XdocMarkup.java | 3 +- .../apache/maven/doxia/module/xdoc/XdocParser.java | 119 +- .../{XdocSiteModule.java => XdocParserModule.java} | 20 +- .../apache/maven/doxia/module/xdoc/XdocSink.java | 8 +- .../maven/doxia/module/xdoc/XdocSinkFactory.java | 8 +- .../META-INF/plexus}/components.xml | 0 doxia-modules/doxia-module-xdoc/src/site/site.xml | 19 +- .../maven/doxia/module/xdoc/XdocIdentityTest.java | 6 +- .../maven/doxia/module/xdoc/XdocParserTest.java | 306 +- .../maven/doxia/module/xdoc/XdocSinkTest.java | 30 +- .../maven/doxia/module/xdoc/XdocValidatorTest.java | 23 +- .../doxia/module/xdoc/XmlWriterXdocSinkTest.java | 14 +- .../doxia-module-xdoc/src/test/resources/macro.xml | 2 +- .../src/test/resources/pom-4.0.0.xml | 158 + doxia-modules/doxia-module-xhtml/pom.xml | 7 +- .../doxia/module/xhtml/AbstractXhtmlSink.java | 4 +- .../maven/doxia/module/xhtml/XhtmlMarkup.java | 3 +- .../maven/doxia/module/xhtml/XhtmlParser.java | 162 +- ...XhtmlSiteModule.java => XhtmlParserModule.java} | 20 +- .../apache/maven/doxia/module/xhtml/XhtmlSink.java | 6 +- .../maven/doxia/module/xhtml/XhtmlSinkFactory.java | 8 +- doxia-modules/doxia-module-xhtml/src/site/site.xml | 11 +- .../doxia/module/xhtml/XhtmlIdentityTest.java | 6 +- .../maven/doxia/module/xhtml/XhtmlParserTest.java | 112 +- .../maven/doxia/module/xhtml/XhtmlSinkTest.java | 55 +- .../src/test/resources/file.with.dot.in.name.xml | 19 + .../src/test/resources/index.xml.vm | 20 + .../src/test/resources/test.xhtml | 24 +- doxia-modules/pom.xml | 8 +- doxia-modules/src/site/site.xml | 9 +- doxia-sink-api/pom.xml | 2 +- .../java/org/apache/maven/doxia/sink/Sink.java | 38 +- .../maven/doxia/sink/SinkEventAttributes.java | 3 +- doxia-sink-api/src/site/apt/index.apt | 42 +- doxia-sink-api/src/site/site.xml | 10 +- doxia-test-docs/pom.xml | 2 +- .../src/main/resources/doxia-site/fml/faq.fml | 5 +- .../doxia-site/xdoc/references/xdoc-format.xml | 2 +- .../resources/maven-site/xdoc/docs-required.xml | 20 + .../main/resources/maven-site/xdoc/index.xml.vm | 20 + pom.xml | 395 +- src/main/resources/config/doxia_checkstyle.xml | 193 - .../site/resources/download.cgi | 13 +- src/site/resources/images/doxia-deps.png | Bin 26346 -> 31471 bytes src/site/site.xml | 26 +- src/site/xdoc/download.xml.vm | 126 + src/site/xdoc/doxia-deps.odg | Bin 13820 -> 11552 bytes src/site/xdoc/index.xml | 63 +- 355 files changed, 14431 insertions(+), 11839 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/doxia.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
