This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository doxia.
commit 3ededfc501589a0bec3ededff5ecb437b82def9f Merge: dc73e62 4ce72cf Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 27 23:45:26 2017 +0200 Updated version 1.7 from 'upstream/1.7' with Debian dir 66218067807d05e7e4ea7fc9a27877f613c85819 doxia-core/pom.xml | 7 +- .../org/apache/maven/doxia/index/IndexingSink.java | 4 +- .../apache/maven/doxia/macro/AbstractMacro.java | 5 +- .../org/apache/maven/doxia/macro/EchoMacro.java | 5 +- .../org/apache/maven/doxia/macro/MacroRequest.java | 34 ++- .../org/apache/maven/doxia/macro/SsiMacro.java | 69 +++++ .../maven/doxia/macro/snippet/SnippetMacro.java | 5 +- .../org/apache/maven/doxia/macro/toc/TocMacro.java | 6 +- .../org/apache/maven/doxia/markup/HtmlMarkup.java | 3 +- .../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 | 81 ------ .../apache/maven/doxia/module/site/SiteModule.java | 58 ----- .../site/manager/DefaultSiteModuleManager.java | 76 ------ .../module/site/manager/SiteModuleManager.java | 58 ----- .../site/manager/SiteModuleNotFoundException.java | 76 ------ .../apache/maven/doxia/parser/AbstractParser.java | 25 +- .../maven/doxia/parser/AbstractXmlParser.java | 12 +- .../java/org/apache/maven/doxia/parser/Parser.java | 27 +- .../apache/maven/doxia/parser/XhtmlBaseParser.java | 13 +- .../doxia/parser/module/AbstractParserModule.java | 29 ++- .../maven/doxia/parser/module/ParserModule.java | 7 +- .../sink/{ => impl}/AbstractBinarySinkFactory.java | 6 +- .../maven/doxia/sink/{ => impl}/AbstractSink.java | 5 +- .../doxia/sink/{ => impl}/AbstractTextSink.java | 4 +- .../sink/{ => impl}/AbstractTextSinkFactory.java | 6 +- .../doxia/sink/{ => impl}/AbstractXmlSink.java | 4 +- .../sink/{ => impl}/AbstractXmlSinkFactory.java | 6 +- .../maven/doxia/sink/{ => impl}/PipelineSink.java | 6 +- .../doxia/sink/{ => impl}/RandomAccessSink.java | 285 ++++++++++++--------- .../maven/doxia/sink/{ => impl}/SinkAdapter.java | 276 +++++++++++--------- .../sink/{ => impl}/SinkEventAttributeSet.java | 6 +- .../maven/doxia/sink/{ => impl}/SinkUtils.java | 5 +- .../maven/doxia/sink/{ => impl}/XhtmlBaseSink.java | 44 ++-- .../maven/doxia/util/ByLineReaderSource.java | 17 +- .../org/apache/maven/doxia/util/DoxiaUtils.java | 4 +- .../org/apache/maven/doxia/util/XmlValidator.java | 2 +- .../src/main/resources/build-info.properties | 17 ++ .../apache/maven/doxia/macro/EchoMacroTest.java | 6 +- .../org/apache/maven/doxia/macro/SsiMacroTest.java | 65 +++++ .../org/apache/maven/doxia/macro/SwfMacroTest.java | 6 +- .../doxia/macro/snippet/SnippetMacroTest.java | 56 ++-- .../apache/maven/doxia/macro/toc/TocMacroTest.java | 10 +- .../maven/doxia/module/AbstractIdentityTest.java | 6 +- .../maven/doxia/parser/AbstractParserTest.java | 13 +- .../maven/doxia/parser/AbstractParserTestCase.java | 4 +- .../maven/doxia/parser/XhtmlBaseParserTest.java | 8 +- .../doxia/sink/{ => impl}/AbstractSinkTest.java | 63 ++++- .../sink/{ => impl}/AbstractSinkTestCase.java | 5 +- .../doxia/sink/{ => impl}/AbstractXmlSinkTest.java | 5 +- .../sink/{ => impl}/RandomAccessSinkTest.java | 7 +- .../doxia/sink/{ => impl}/SinkAdapterTest.java | 5 +- .../sink/{ => impl}/SinkEventAttributeSetTest.java | 5 +- .../doxia/sink/{ => impl}/SinkEventElement.java | 4 +- .../sink/{ => impl}/SinkEventTestingSink.java | 277 +++++++++++--------- .../doxia/sink/{ => impl}/SinkTestDocument.java | 7 +- .../maven/doxia/sink/{ => impl}/SinkUtilsTest.java | 6 +- .../doxia/sink/{ => impl}/TestAbstractSink.java | 4 +- .../maven/doxia/sink/{ => impl}/TextSink.java | 276 +++++++++++--------- .../{ => impl}/WellformednessCheckingSink.java | 278 +++++++++++--------- .../doxia/sink/{ => impl}/XhtmlBaseSinkTest.java | 13 +- .../apache/maven/doxia/util/XmlValidatorTest.java | 35 +-- .../test/resources/macro/snippet/testSnippet.txt | 16 ++ doxia-core/src/test/resources/test.xhtml | 20 ++ doxia-logging-api/pom.xml | 2 +- doxia-modules/doxia-module-apt/pom.xml | 2 +- .../apache/maven/doxia/module/apt/AptMarkup.java | 3 +- .../apache/maven/doxia/module/apt/AptParser.java | 33 +-- .../org/apache/maven/doxia/module/apt/AptSink.java | 7 +- .../maven/doxia/module/apt/AptSinkFactory.java | 4 +- .../maven/doxia/module/apt/AptSiteModule.java | 44 ---- .../maven/doxia/module/apt/AptParserTest.java | 9 +- .../apache/maven/doxia/module/apt/AptSinkTest.java | 4 +- doxia-modules/doxia-module-confluence/pom.xml | 2 +- .../doxia/module/confluence/ConfluenceMarkup.java | 3 +- .../doxia/module/confluence/ConfluenceParser.java | 15 +- .../doxia/module/confluence/ConfluenceSink.java | 4 +- .../module/confluence/ConfluenceSinkFactory.java | 4 +- .../confluence/parser/ChildBlocksBuilder.java | 62 +++-- .../module/confluence/parser/LinethroughBlock.java | 2 +- .../doxia/module/confluence/parser/SubBlock.java | 2 +- .../doxia/module/confluence/parser/SupBlock.java | 2 +- .../module/confluence/parser/UnderlineBlock.java | 2 +- .../module/confluence/parser/VerbatimBlock.java | 4 +- .../confluence/parser/list/ListBlockParser.java | 5 +- .../confluence/parser/table/TableBlockParser.java | 10 +- .../module/confluence/ConfluenceParserTest.java | 42 ++- .../module/confluence/ConfluenceSinkTest.java | 4 +- .../src/test/resources/nested-format.confluence | 2 + .../src/test/resources/table.confluence | 17 +- doxia-modules/doxia-module-docbook-simple/pom.xml | 2 +- .../maven/doxia/module/docbook/DocBookParser.java | 12 +- .../maven/doxia/module/docbook/DocBookSink.java | 38 +-- .../doxia/module/docbook/DocBookSiteModule.java | 44 ---- .../maven/doxia/module/docbook/DocbookMarkup.java | 3 +- .../doxia/module/docbook/DocbookSinkFactory.java | 4 +- .../module/docbook/SimplifiedDocbookMarkup.java | 3 +- .../doxia/module/docbook/DocBookParserTest.java | 7 +- .../doxia/module/docbook/DocBookSinkTest.java | 8 +- doxia-modules/doxia-module-fml/pom.xml | 8 +- .../maven/doxia/module/fml/FmlContentParser.java | 5 +- .../apache/maven/doxia/module/fml/FmlMarkup.java | 3 +- .../apache/maven/doxia/module/fml/FmlParser.java | 23 +- .../maven/doxia/module/fml/FmlParserTest.java | 28 +- doxia-modules/doxia-module-fo/pom.xml | 16 +- .../maven/doxia/module/fo/FoAggregateSink.java | 10 +- .../maven/doxia/module/fo/FoConfiguration.java | 5 +- .../org/apache/maven/doxia/module/fo/FoMarkup.java | 3 +- .../org/apache/maven/doxia/module/fo/FoSink.java | 43 ++-- .../maven/doxia/module/fo/FoSinkFactory.java | 4 +- .../doxia-module-fo/src/site/xdoc/usage.xml | 4 +- .../apache/maven/doxia/module/fo/FoSinkTest.java | 8 +- doxia-modules/doxia-module-itext/pom.xml | 2 +- .../apache/maven/doxia/module/itext/ITextSink.java | 13 +- .../maven/doxia/module/itext/ITextSinkFactory.java | 4 +- .../doxia/module/itext/ITextSinkTestCase.java | 4 +- doxia-modules/doxia-module-latex/pom.xml | 2 +- .../apache/maven/doxia/module/latex/LatexSink.java | 8 +- .../maven/doxia/module/latex/LatexSinkFactory.java | 4 +- .../maven/doxia/module/latex/default_preamble.tex | 17 ++ .../doxia/module/latex/default_sink_commands.tex | 16 ++ .../maven/doxia/module/latex/LatexSinkTest.java | 6 +- doxia-modules/doxia-module-markdown/pom.xml | 2 +- .../doxia/module/markdown/MarkdownParser.java | 245 ++++++++++-------- .../module/markdown/MarkdownParserModule.java | 9 +- .../doxia/module/markdown/MarkdownSiteModule.java | 54 ---- .../markdown/MarkdownToDoxiaHtmlSerializer.java | 4 +- .../module/markdown/MarkdownParserModuleTest.java} | 37 +-- .../doxia/module/markdown/MarkdownParserTest.java | 19 +- .../src/test/resources/macro-toc.md | 6 + .../src/test/resources/test.md | 6 +- doxia-modules/doxia-module-rtf/pom.xml | 2 +- .../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 | 5 +- .../org/apache/maven/doxia/module/rtf/RtfSink.java | 5 +- .../maven/doxia/module/rtf/RtfSinkFactory.java | 4 +- .../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 +- .../apache/maven/doxia/module/rtf/RtfSinkTest.java | 6 +- doxia-modules/doxia-module-twiki/pom.xml | 2 +- .../maven/doxia/module/twiki/TWikiMarkup.java | 3 +- .../maven/doxia/module/twiki/TWikiParser.java | 15 +- .../apache/maven/doxia/module/twiki/TWikiSink.java | 8 +- .../maven/doxia/module/twiki/TWikiSinkFactory.java | 4 +- .../maven/doxia/module/twiki/TWikiSiteModule.java | 44 ---- .../doxia/module/twiki/parser/VerbatimBlock.java | 4 +- .../maven/doxia/module/twiki/TWikiSinkTest.java | 4 +- .../doxia/module/twiki/parser/TwikiParserTest.java | 4 +- doxia-modules/doxia-module-xdoc/pom.xml | 8 +- .../apache/maven/doxia/module/xdoc/XdocMarkup.java | 3 +- .../apache/maven/doxia/module/xdoc/XdocParser.java | 40 +-- .../apache/maven/doxia/module/xdoc/XdocSink.java | 8 +- .../maven/doxia/module/xdoc/XdocSinkFactory.java | 4 +- .../maven/doxia/module/xdoc/XdocSiteModule.java | 44 ---- .../maven/doxia/module/xdoc/XdocParserTest.java | 9 +- .../maven/doxia/module/xdoc/XdocSinkTest.java | 8 +- doxia-modules/doxia-module-xhtml/pom.xml | 2 +- .../doxia/module/xhtml/AbstractXhtmlSink.java | 4 +- .../maven/doxia/module/xhtml/XhtmlMarkup.java | 3 +- .../maven/doxia/module/xhtml/XhtmlParser.java | 152 ++++++++++- .../apache/maven/doxia/module/xhtml/XhtmlSink.java | 6 +- .../maven/doxia/module/xhtml/XhtmlSinkFactory.java | 4 +- .../maven/doxia/module/xhtml/XhtmlSiteModule.java | 44 ---- .../maven/doxia/module/xhtml/XhtmlParserTest.java | 62 ++++- .../maven/doxia/module/xhtml/XhtmlSinkTest.java | 10 +- .../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 | 2 +- doxia-sink-api/pom.xml | 2 +- .../java/org/apache/maven/doxia/sink/Sink.java | 38 ++- .../maven/doxia/sink/SinkEventAttributes.java | 3 +- doxia-test-docs/pom.xml | 2 +- .../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 | 190 +++++--------- src/main/resources/config/doxia_checkstyle.xml | 202 --------------- src/site/site.xml | 9 +- 189 files changed, 2419 insertions(+), 2259 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
