[doxia] branch master updated (d8566a9 -> b850c2d)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue May 30 13:43:10 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a change to branch master
in repository doxia.
discards d8566a9 New upstream release (1.7).
discards 806afe6 Merge tag 'upstream/1.7'
omits 1b9256c New upstream version 1.7
discards ee507ad Fix debian/watch
new b850c2d Added the missing build dependency on libplexus-component-metadata-java (Closes: #830495)
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d8566a9)
\
N -- N -- N refs/heads/master (b850c2d)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omits" are not gone; other references still
refer to them. Any revisions marked "discards" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
DEPENDENCIES | 11 -
LICENSE | 202 -
NOTICE | 8 -
debian/changelog | 14 +-
debian/control | 5 +-
debian/libdoxia-java.poms | 3 +-
debian/maven.ignoreRules | 2 -
debian/maven.properties | 3 +-
debian/maven.rules | 3 +-
debian/patches/0001-modello.patch | 6 +-
.../0003-switch-to-plexus-component-metadata.patch | 151 +
debian/patches/0007-disable-plexus-javadoc.patch | 28 +
debian/patches/series | 2 +
debian/upstream/signing-key.asc | 31 -
debian/watch | 5 +-
{doxia-core => doxia-book}/pom.xml | 129 +-
.../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 | 21 +-
.../doxia/book/services/indexer/BookIndexer.java | 42 +-
.../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 | 32 +-
.../services/renderer/DocbookBookRenderer.java | 228 +
.../book/services/renderer/LatexBookRenderer.java | 255 ++
.../book/services/renderer/PdfBookRenderer.java | 33 +-
.../book/services/renderer/RtfBookRenderer.java | 33 +-
.../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 +
.../book/services/validation/BookValidator.java | 24 +-
.../services/validation/DefaultBookValidator.java | 108 +
.../book/services/validation/ValidationResult.java | 81 +
doxia-book/src/main/modello/book.mdo | 537 +++
.../src/main/resources/book-renderer.properties | 7 +-
.../src/main/resources/book-renderer_en.properties | 2 +-
.../src/main/resources/book-renderer_fr.properties | 13 +-
doxia-book/src/site/apt/index.apt | 20 +
doxia-book/src/site/apt/usage.apt | 31 +
.../src/site/apt/using-book-xsd.apt | 28 +-
.../src/site/site.xml | 21 +-
.../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/SiteModule.java} | 21 +-
.../site/manager/DefaultSiteModuleManager.java | 77 +
.../site/manager/SiteModuleManager.java} | 32 +-
.../site/manager/SiteModuleNotFoundException.java} | 25 +-
.../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 -
.../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 => }/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/impl/RandomAccessSink.java | 929 ----
.../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 +-
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 => }/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 => }/TextSink.java | 276 +-
.../{impl => }/WellformednessCheckingSink.java | 290 +-
.../doxia/sink/{impl => }/XhtmlBaseSinkTest.java | 137 +-
.../doxia/sink/impl/RandomAccessSinkTest.java | 109 -
.../maven/doxia/sink/impl/TestAbstractSink.java | 50 -
.../doxia/sink/render/RenderingContextTest.java | 63 +
.../org/apache/maven/doxia/util/HtmlToolsTest.java | 5 +-
.../apache/maven/doxia/util/XmlValidatorTest.java | 47 -
.../maven/doxia/xsd/AbstractXmlValidator.java | 427 --
.../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 ++
.../java/org/apache/maven/doxia/plugin/Format.java | 28 +-
doxia-maven-plugin/src/site/apt/index.apt | 66 +
doxia-maven-plugin/src/site/apt/usage.apt.vm | 49 +
.../src/site/site.xml | 15 +-
doxia-modules/doxia-module-apt/pom.xml | 29 +-
.../META-INF/plexus => components}/components.xml | 0
.../apache/maven/doxia/module/apt/AptMarkup.java | 3 +-
.../apache/maven/doxia/module/apt/AptParser.java | 107 +-
.../maven/doxia/module/apt/AptReaderSource.java | 23 +-
.../org/apache/maven/doxia/module/apt/AptSink.java | 29 +-
.../maven/doxia/module/apt/AptSinkFactory.java | 8 +-
.../{AptParserModule.java => AptSiteModule.java} | 20 +-
.../apache/maven/doxia/module/apt/AptUtils.java | 6 +-
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 +-
.../doxia/module/confluence/ConfluenceSink.java | 53 +-
.../module/confluence/ConfluenceSinkFactory.java | 8 +-
...ParserModule.java => ConfluenceSiteModule.java} | 20 +-
.../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 +-
.../module/confluence/parser/LinethroughBlock.java | 45 -
.../module/confluence/parser/MonospaceBlock.java | 4 +-
.../module/confluence/parser/ParagraphBlock.java | 6 +-
.../confluence/parser/ParagraphBlockParser.java | 8 +-
.../doxia/module/confluence/parser/SubBlock.java | 45 -
.../doxia/module/confluence/parser/SupBlock.java | 45 -
.../module/confluence/parser/UnderlineBlock.java | 45 -
.../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 +-
.../META-INF/plexus => components}/components.xml | 6 +-
.../maven/doxia/module/docbook/DocBookParser.java | 34 +-
.../maven/doxia/module/docbook/DocBookSink.java | 59 +-
...ookParserModule.java => DocBookSiteModule.java} | 20 +-
.../maven/doxia/module/docbook/DocbookMarkup.java | 3 +-
.../doxia/module/docbook/DocbookSinkFactory.java | 8 +-
.../module/docbook/SimplifiedDocbookMarkup.java | 3 +-
.../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 +-
.../META-INF/plexus => components}/components.xml | 0
.../maven/doxia/module/fml/FmlContentParser.java | 5 +-
.../apache/maven/doxia/module/fml/FmlMarkup.java | 3 +-
.../apache/maven/doxia/module/fml/FmlParser.java | 75 +-
.../{FmlParserModule.java => FmlSiteModule.java} | 20 +-
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 +-
doxia-modules/doxia-module-markdown/pom.xml | 64 -
.../doxia/module/markdown/MarkdownParser.java | 300 --
.../module/markdown/MarkdownParserModule.java | 52 -
.../markdown/MarkdownToDoxiaHtmlSerializer.java | 59 -
.../doxia-module-markdown/src/site/site.xml | 43 -
.../module/markdown/MarkdownParserModuleTest.java | 51 -
.../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 | 25 -
.../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 +-
.../apache/maven/doxia/module/twiki/TWikiSink.java | 16 +-
.../maven/doxia/module/twiki/TWikiSinkFactory.java | 8 +-
...TWikiParserModule.java => TWikiSiteModule.java} | 20 +-
.../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 +-
.../{test.twiki => TWikiParserTest.twiki} | 0
doxia-modules/doxia-module-xdoc/pom.xml | 30 +-
.../META-INF/plexus => components}/components.xml | 0
.../apache/maven/doxia/module/xdoc/XdocMarkup.java | 3 +-
.../apache/maven/doxia/module/xdoc/XdocParser.java | 119 +-
.../apache/maven/doxia/module/xdoc/XdocSink.java | 8 +-
.../maven/doxia/module/xdoc/XdocSinkFactory.java | 8 +-
.../{XdocParserModule.java => XdocSiteModule.java} | 20 +-
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 +-
.../apache/maven/doxia/module/xhtml/XhtmlSink.java | 6 +-
.../maven/doxia/module/xhtml/XhtmlSinkFactory.java | 8 +-
...XhtmlParserModule.java => XhtmlSiteModule.java} | 20 +-
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 +
src/site/resources/images/doxia-deps.png | Bin 31471 -> 26346 bytes
src/site/site.xml | 26 +-
src/site/xdoc/download.xml.vm | 126 -
src/site/xdoc/doxia-deps.odg | Bin 11552 -> 13820 bytes
src/site/xdoc/index.xml | 63 +-
369 files changed, 11255 insertions(+), 15141 deletions(-)
delete mode 100644 DEPENDENCIES
delete mode 100644 LICENSE
delete mode 100644 NOTICE
create mode 100644 debian/patches/0003-switch-to-plexus-component-metadata.patch
create mode 100644 debian/patches/0007-disable-plexus-javadoc.patch
delete mode 100644 debian/upstream/signing-key.asc
copy {doxia-core => doxia-book}/pom.xml (58%)
create mode 100644 doxia-book/src/main/java/org/apache/maven/doxia/book/BookDoxia.java
create mode 100644 doxia-book/src/main/java/org/apache/maven/doxia/book/BookDoxiaException.java
create mode 100644 doxia-book/src/main/java/org/apache/maven/doxia/book/DefaultBookDoxia.java
create mode 100644 doxia-book/src/main/java/org/apache/maven/doxia/book/InvalidBookDescriptorException.java
create mode 100644 doxia-book/src/main/java/org/apache/maven/doxia/book/context/BookContext.java
copy doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/Block.java => doxia-book/src/main/java/org/apache/maven/doxia/book/context/BookIndex.java (66%)
copy doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ItalicBlock.java => doxia-book/src/main/java/org/apache/maven/doxia/book/services/indexer/BookIndexer.java (52%)
create mode 100644 doxia-book/src/main/java/org/apache/maven/doxia/book/services/indexer/DefaultBookIndexer.java
create mode 100644 doxia-book/src/main/java/org/apache/maven/doxia/book/services/io/BookIo.java
create mode 100644 doxia-book/src/main/java/org/apache/maven/doxia/book/services/io/DefaultBookIo.java
create mode 100644 doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/AbstractITextBookRenderer.java
rename doxia-core/src/main/java/org/apache/maven/doxia/parser/module/ParserModuleManager.java => doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/BookRenderer.java (55%)
create mode 100644 doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/DocbookBookRenderer.java
create mode 100644 doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/LatexBookRenderer.java
copy doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSinkFactory.java => doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/PdfBookRenderer.java (58%)
copy doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSinkFactory.java => doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/RtfBookRenderer.java (58%)
create mode 100644 doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/XHtmlBookRenderer.java
create mode 100644 doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/XdocBookRenderer.java
create mode 100644 doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/docbook/DocBookBookSink.java
create mode 100644 doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/latex/LatexBookSink.java
create mode 100644 doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/AbstractXdocBookSink.java
create mode 100644 doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/ChapterXdocBookSink.java
create mode 100644 doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/IndexXdocBookSink.java
create mode 100644 doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/SectionXdocBookSink.java
create mode 100644 doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xhtml/XhtmlBookSink.java
copy doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/LogEnabled.java => doxia-book/src/main/java/org/apache/maven/doxia/book/services/validation/BookValidator.java (60%)
create mode 100644 doxia-book/src/main/java/org/apache/maven/doxia/book/services/validation/DefaultBookValidator.java
create mode 100644 doxia-book/src/main/java/org/apache/maven/doxia/book/services/validation/ValidationResult.java
create mode 100644 doxia-book/src/main/modello/book.mdo
rename doxia-core/src/main/resources/build-info.properties => doxia-book/src/main/resources/book-renderer.properties (87%)
copy doxia-modules/doxia-module-fo/src/main/resources/doxia-fo_en.properties => doxia-book/src/main/resources/book-renderer_en.properties (96%)
rename src/site/resources/download.cgi => doxia-book/src/main/resources/book-renderer_fr.properties (77%)
create mode 100644 doxia-book/src/site/apt/index.apt
create mode 100644 doxia-book/src/site/apt/usage.apt
rename doxia-modules/doxia-module-markdown/src/site/apt/index.apt => doxia-book/src/site/apt/using-book-xsd.apt (59%)
copy {doxia-modules/doxia-module-xdoc => doxia-book}/src/site/site.xml (62%)
create mode 100644 doxia-book/src/test/java/org/apache/maven/doxia/book/BookRendererTest.java
create mode 100644 doxia-book/src/test/java/org/apache/maven/doxia/book/services/indexer/BookIndexerTest.java
create mode 100644 doxia-book/src/test/java/org/apache/maven/doxia/book/services/renderer/docbook/DocBookBookSinkTest.java
create mode 100644 doxia-book/src/test/resources/book-1.xml
create mode 100644 doxia-book/src/test/resources/book-1/section-1.apt
create mode 100644 doxia-book/src/test/resources/book-1/section-2.apt
create mode 100644 doxia-book/src/test/resources/book-1/section-3.apt
create mode 100644 doxia-book/src/test/resources/book-1/section-4.apt
create mode 100644 doxia-book/src/test/resources/expected/doc-book/plexus-user-guide.xml
delete mode 100644 doxia-core/src/main/java/org/apache/maven/doxia/macro/SsiMacro.java
create mode 100644 doxia-core/src/main/java/org/apache/maven/doxia/module/site/AbstractSiteModule.java
rename doxia-core/src/main/java/org/apache/maven/doxia/{parser/module/ParserModule.java => module/site/SiteModule.java} (69%)
create mode 100644 doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/DefaultSiteModuleManager.java
copy doxia-core/src/main/java/org/apache/maven/doxia/{macro/manager/MacroManager.java => module/site/manager/SiteModuleManager.java} (56%)
rename doxia-core/src/main/java/org/apache/maven/doxia/{parser/module/ParserModuleNotFoundException.java => module/site/manager/SiteModuleNotFoundException.java} (69%)
delete mode 100644 doxia-core/src/main/java/org/apache/maven/doxia/parser/module/AbstractParserModule.java
delete mode 100644 doxia-core/src/main/java/org/apache/maven/doxia/parser/module/DefaultParserModuleManager.java
rename doxia-core/src/main/java/org/apache/maven/doxia/sink/{impl => }/AbstractBinarySinkFactory.java (91%)
rename doxia-core/src/main/java/org/apache/maven/doxia/sink/{impl => }/AbstractSink.java (91%)
rename doxia-core/src/main/java/org/apache/maven/doxia/sink/{impl => }/AbstractTextSink.java (90%)
rename doxia-core/src/main/java/org/apache/maven/doxia/sink/{impl => }/AbstractTextSinkFactory.java (93%)
rename doxia-core/src/main/java/org/apache/maven/doxia/sink/{impl => }/AbstractXmlSink.java (90%)
rename doxia-core/src/main/java/org/apache/maven/doxia/sink/{impl => }/AbstractXmlSinkFactory.java (91%)
rename doxia-core/src/main/java/org/apache/maven/doxia/sink/{impl => }/PipelineSink.java (84%)
rename doxia-core/src/main/java/org/apache/maven/doxia/sink/{impl => }/SinkAdapter.java (78%)
rename doxia-core/src/main/java/org/apache/maven/doxia/sink/{impl => }/SinkEventAttributeSet.java (89%)
rename doxia-core/src/main/java/org/apache/maven/doxia/sink/{impl => }/SinkUtils.java (95%)
rename doxia-core/src/main/java/org/apache/maven/doxia/sink/{impl => }/XhtmlBaseSink.java (87%)
delete mode 100644 doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/RandomAccessSink.java
create mode 100644 doxia-core/src/main/java/org/apache/maven/doxia/sink/render/RenderingContext.java
delete mode 100644 doxia-core/src/site/apt/using-randomaccesssink.apt
delete mode 100644 doxia-core/src/test/java/org/apache/maven/doxia/macro/SsiMacroTest.java
rename doxia-core/src/test/java/org/apache/maven/doxia/sink/{impl => }/AbstractSinkTest.java (87%)
rename doxia-core/src/test/java/org/apache/maven/doxia/sink/{impl => }/AbstractSinkTestCase.java (96%)
rename doxia-core/src/test/java/org/apache/maven/doxia/sink/{impl => }/AbstractXmlSinkTest.java (91%)
rename doxia-core/src/test/java/org/apache/maven/doxia/sink/{impl => }/SinkAdapterTest.java (98%)
rename doxia-core/src/test/java/org/apache/maven/doxia/sink/{impl => }/SinkEventAttributeSetTest.java (97%)
rename doxia-core/src/test/java/org/apache/maven/doxia/sink/{impl => }/SinkEventElement.java (94%)
rename doxia-core/src/test/java/org/apache/maven/doxia/sink/{impl => }/SinkEventTestingSink.java (80%)
rename doxia-core/src/test/java/org/apache/maven/doxia/sink/{impl => }/SinkTestDocument.java (98%)
rename doxia-core/src/test/java/org/apache/maven/doxia/sink/{impl => }/SinkUtilsTest.java (93%)
rename doxia-core/src/test/java/org/apache/maven/doxia/sink/{impl => }/TextSink.java (80%)
rename doxia-core/src/test/java/org/apache/maven/doxia/sink/{impl => }/WellformednessCheckingSink.java (79%)
rename doxia-core/src/test/java/org/apache/maven/doxia/sink/{impl => }/XhtmlBaseSinkTest.java (81%)
delete mode 100644 doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/RandomAccessSinkTest.java
delete mode 100644 doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/TestAbstractSink.java
create mode 100644 doxia-core/src/test/java/org/apache/maven/doxia/sink/render/RenderingContextTest.java
delete mode 100644 doxia-core/src/test/java/org/apache/maven/doxia/util/XmlValidatorTest.java
delete mode 100644 doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
delete mode 100644 doxia-core/src/test/resources/test.xhtml
create mode 100644 doxia-maven-plugin/pom.xml
create mode 100644 doxia-maven-plugin/src/main/java/org/apache/maven/doxia/plugin/Book.java
create mode 100644 doxia-maven-plugin/src/main/java/org/apache/maven/doxia/plugin/DoxiaRenderBooksMojo.java
copy doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ListBlock.java => doxia-maven-plugin/src/main/java/org/apache/maven/doxia/plugin/Format.java (64%)
create mode 100644 doxia-maven-plugin/src/site/apt/index.apt
create mode 100644 doxia-maven-plugin/src/site/apt/usage.apt.vm
copy {doxia-modules/doxia-module-itext => doxia-maven-plugin}/src/site/site.xml (71%)
rename doxia-modules/doxia-module-apt/src/main/{resources/META-INF/plexus => components}/components.xml (100%)
rename doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/{AptParserModule.java => AptSiteModule.java} (66%)
delete mode 100644 doxia-modules/doxia-module-apt/src/test/resources/pom-4.0.0.xml
rename doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/{ConfluenceParserModule.java => ConfluenceSiteModule.java} (64%)
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/LinethroughBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/SubBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/SupBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/UnderlineBlock.java
rename doxia-modules/doxia-module-docbook-simple/src/main/{resources/META-INF/plexus => components}/components.xml (93%)
rename doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/{DocBookParserModule.java => DocBookSiteModule.java} (65%)
delete mode 100644 doxia-modules/doxia-module-docbook-simple/src/site/apt/index.apt.vm
rename doxia-modules/doxia-module-fml/src/main/{resources/META-INF/plexus => components}/components.xml (100%)
rename doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/{FmlParserModule.java => FmlSiteModule.java} (66%)
delete mode 100644 doxia-modules/doxia-module-markdown/pom.xml
delete mode 100644 doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
delete mode 100644 doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParserModule.java
delete mode 100644 doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownToDoxiaHtmlSerializer.java
delete mode 100644 doxia-modules/doxia-module-markdown/src/site/site.xml
delete mode 100644 doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserModuleTest.java
delete mode 100644 doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
delete mode 100644 doxia-modules/doxia-module-markdown/src/test/resources/bold.md
delete mode 100644 doxia-modules/doxia-module-markdown/src/test/resources/code.md
delete mode 100644 doxia-modules/doxia-module-markdown/src/test/resources/comment-before-heading.md
delete mode 100644 doxia-modules/doxia-module-markdown/src/test/resources/first-heading.md
delete mode 100644 doxia-modules/doxia-module-markdown/src/test/resources/html-content.md
delete mode 100644 doxia-modules/doxia-module-markdown/src/test/resources/image.md
delete mode 100644 doxia-modules/doxia-module-markdown/src/test/resources/italic.md
delete mode 100644 doxia-modules/doxia-module-markdown/src/test/resources/link.md
delete mode 100644 doxia-modules/doxia-module-markdown/src/test/resources/list.md
delete mode 100644 doxia-modules/doxia-module-markdown/src/test/resources/macro-toc.md
delete mode 100644 doxia-modules/doxia-module-markdown/src/test/resources/metadata.md
delete mode 100644 doxia-modules/doxia-module-markdown/src/test/resources/numbered-list.md
delete mode 100644 doxia-modules/doxia-module-markdown/src/test/resources/paragraph.md
delete mode 100644 doxia-modules/doxia-module-markdown/src/test/resources/test.md
rename doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/{TWikiParserModule.java => TWikiSiteModule.java} (67%)
delete mode 100644 doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TwikiParserTest.java
rename doxia-modules/doxia-module-twiki/src/test/resources/{test.twiki => TWikiParserTest.twiki} (100%)
rename doxia-modules/doxia-module-xdoc/src/main/{resources/META-INF/plexus => components}/components.xml (100%)
rename doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/{XdocParserModule.java => XdocSiteModule.java} (66%)
delete mode 100644 doxia-modules/doxia-module-xdoc/src/test/resources/pom-4.0.0.xml
rename doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/{XhtmlParserModule.java => XhtmlSiteModule.java} (68%)
create mode 100644 src/main/resources/config/doxia_checkstyle.xml
delete mode 100644 src/site/xdoc/download.xml.vm
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/doxia.git
More information about the pkg-java-commits
mailing list