You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2022/12/29 11:20:03 UTC
[maven-doxia] branch DOXIA-617 updated (97889f33 -> da4dc8e8)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch DOXIA-617
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
discard 97889f33 [DOXIA-617] support yaml metadata
omit 24f0066c [DOXIA-662] Non unique IDs generated by IndexingSink
omit 51922943 [DOXIA-671] Double quotes contained in markdown page are removed in HTML output
omit ceb77298 [DOXIA-650] Make MarkdownParser to be a text parser with text markup
omit 47a1bb25 [DOXIA-641] AprParser throws exception if title is not present
omit 539428bd [DOXIA-684] avoid flexmark-all: declare used extensions only
add b2d7537f Bump version to 2.0.0-M1-SNAPSHOT
add 60e1c2c9 [DOXIA-631] Remove all deprecated macros
add 72b50aa4 Disable clirr for now since breaking in 2.0.0 is fine
add ba9b17a4 [DOXIA-630] Remove all deprecated modules
add 9b535447 send PR notifications to issues@maven.a.o
add efb1c4a3 [DOXIA-534] Remove Doxia Logging API
add 8e689f84 [DOXIA-632] Remove remaining deprecated code
add 8bdca3bb [DOXIA-633] Drop and replace usage of HttpComponents in Core
add be44afd9 [DOXIA-634] Drop and replace usage of Commons Lang in Core
add 6f92d3fd [DOXIA-635] Drop and replace usage of Commons IO in Markdown Module
add 72b8490f [DOXIA-636] Upgrade Plexus Utils to 3.3.1
add 2f340cb3 [DOXIA-637] Upgrade XML Unit to 2.8.4
add 5e5cdd84 [DOXIA-638] Replace Plexus Container Default with Sisu Plexus Shim
add 03e312be Exclude non-compatible transitive dependencies of xmlunit-core
add 4b86c5e3 [maven-release-plugin] prepare release doxia-2.0.0-M1
add 793cb886 [maven-release-plugin] prepare for next development iteration
add 4318fa7d Sort depdencies by scope
add 80138875 Fix missing dependencies
add adefec14 [DOXIA-643] Upgrade to Java 8
add 9e998a51 [DOXIA-644] Replace Plexus Annotations with Java Inject along with JUnit 5
add c65bac0d [DOXIA-641] AprParser throws exception if title is not present
add 63843f67 [DOXIA-645] Clean up exceptions
add 86048dbe [maven-release-plugin] prepare release doxia-2.0.0-M2
add e72135a6 [maven-release-plugin] prepare for next development iteration
add 2aea4500 [DOXIA-649] Plexus to Sisu migration misses Singleton annotation
add c098cc99 Shared GitHub action v2
add b0d40921 [DOXIA-650] Make MarkdownParser to be a text parser with text markup
add 87d1ab39 [DOXIA-619] Sink.sectionTitle1() creates <h2> instead of <h1>
add 74bfa2a3 [DOXIA-652] Drop build-info.properties in favor of default pom.properties
add 5508c696 [DOXIA-651] Upgrade Flexmark to 0.50.50
add daf45706 Fix indent
add e3828acf [DOXIA-653] Upgrade Plexus Utils to 3.4.2
add 02026d1f [DOXIA-654] Upgrade XML Unit to 2.9.0
add 8ef6a26a [DOXIA-655] Upgrade SLF4J to 1.7.36
add 6538b6e2 [DOXIA-658] Upgrade test dependencies
add 9be64968 [DOXIA-659] Upgrade Parent to 36
add 9443d815 [DOXIA-656] Make XHTML5 default implementation of HTML
add ca82243f [DOXIA-657] Deprecate XHML(4) module
add adbc36bd [DOXIA-590] Either provided element class or default class gets ignored
add 777f8d36 [DOXIA-660] Add ability to hide table rows via CSS
add 88402364 [DOXIA-661] Upgrade Commons Text to 1.9
add 229a0d29 [maven-release-plugin] prepare release doxia-2.0.0-M3
add fd51e1c9 [maven-release-plugin] prepare for next development iteration
add e808e694 Fix Jekins url
add 082cc112 [DOXIA-662] Non unique IDs generated by IndexingSink
add 2000fe1e Cleanups
add 41312ab9 [DOXIA-663] Remove deprecated XHTML module
add f6b1b1cc [DOXIA-664] Upgrade Flexmark to 0.62.2
add d32ab08b [DOXIA-666] Remove code duplication Xhtml5Sink
add 03ceb77b [DOXIA-665] Add anchors around FML parts
add 6b5d94d1 [DOXIA-599] Replace <a /> element's name attribute with id attribute
add e249e061 Bump junit-jupiter-engine from 5.8.2 to 5.9.0
add 4201a482 Fix dependabot fallout
add 3b1499d0 [DOXIA-669] Improve/rework CachedFileEntityResolver
add d98362ba Simplify boxed code handling
add 61000025 [DOXIA-676] Remove all obsolete elements in HTML5 and add new ones
add fd24f2e0 [DOXIA-671] Double quotes contained in markdown page are removed in HTML output
add 1b2e9a98 [DOXIA-670] Drop dead XdocSink#link(String, String) method
add 13dcd963 [DOXIA-672] Parse id attribute only on <a /> elements by default
add 77f3c139 [DOXIA-673] Remove compat handling of absent Sink#tableRows() calls
add be34bdd7 [DOXIA-674] Replace table border handling with new CSS class
add 4c5b2255 [DOXIA-675] Replace table alignment attributes with CSS styles
add 380a4895 [DOXIA-668] Remove all obsolete attributes in HTML5
add 65d20f83 [maven-release-plugin] prepare release doxia-2.0.0-M4
add dba10ae9 [maven-release-plugin] prepare for next development iteration
add b9a4ff88 [DOXIA-678] Add missing elements in Xhtml5BaseParser
add 39e05e34 update Reproducible Builds badge link
add ea7bc882 [DOXIA-679] Introduce Sink#tableRows(void) method
add 3734db14 [DOXIA-681] Upgrade Plexus Utils to 3.5.0
add cf5858a7 [DOXIA-680] Don't wrap elements in anchors
add e6848f9e [DOXIA-684] avoid flexmark-all: declare used extensions only
new da4dc8e8 [DOXIA-617] support yaml metadata
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 (97889f33)
\
N -- N -- N refs/heads/DOXIA-617 (da4dc8e8)
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 "omit" are not gone; other references still
refer to them. Any revisions marked "discard" 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 "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.asf.yaml | 1 +
.github/workflows/maven-verify.yml | 6 +-
README.md | 2 +-
doxia-core/pom.xml | 86 +-
.../java/org/apache/maven/doxia/DefaultDoxia.java | 17 +-
.../main/java/org/apache/maven/doxia/Doxia.java | 2 -
.../org/apache/maven/doxia/index/IndexEntry.java | 2 +-
.../apache/maven/doxia/macro/AbstractMacro.java | 45 -
.../org/apache/maven/doxia/macro/EchoMacro.java | 7 +-
.../java/org/apache/maven/doxia/macro/Macro.java | 4 -
.../maven/doxia/macro/MacroExecutionException.java | 12 +
.../org/apache/maven/doxia/macro/MacroRequest.java | 19 +-
.../org/apache/maven/doxia/macro/SsiMacro.java | 71 -
.../org/apache/maven/doxia/macro/SwfMacro.java | 169 --
.../doxia/macro/manager/DefaultMacroManager.java | 11 +-
.../maven/doxia/macro/manager/MacroManager.java | 2 -
.../maven/doxia/macro/snippet/SnippetMacro.java | 18 +-
.../org/apache/maven/doxia/macro/toc/TocMacro.java | 10 +-
.../org/apache/maven/doxia/markup/HtmlMarkup.java | 308 ++-
.../apache/maven/doxia/parser/AbstractParser.java | 42 +-
.../maven/doxia/parser/AbstractXmlParser.java | 181 +-
.../apache/maven/doxia/parser/ParseException.java | 65 +-
.../java/org/apache/maven/doxia/parser/Parser.java | 6 +-
.../maven/doxia/parser/Xhtml5BaseParser.java | 238 +-
.../apache/maven/doxia/parser/XhtmlBaseParser.java | 1307 ----------
.../doxia/parser/manager/DefaultParserManager.java | 11 +-
.../maven/doxia/parser/manager/ParserManager.java | 2 -
.../doxia/parser/module/AbstractParserModule.java | 17 -
.../parser/module/DefaultParserModuleManager.java | 12 +-
.../module/ParserModuleNotFoundException.java | 2 +
.../doxia/sink/impl/AbstractBinarySinkFactory.java | 79 -
.../apache/maven/doxia/sink/impl/AbstractSink.java | 26 -
.../doxia/sink/impl/AbstractTextSinkFactory.java | 6 +-
.../maven/doxia/sink/impl/AbstractXmlSink.java | 12 +-
.../maven/doxia/sink/impl/RandomAccessSink.java | 2656 ++++++++++----------
.../apache/maven/doxia/sink/impl/SinkAdapter.java | 71 +-
.../apache/maven/doxia/sink/impl/SinkUtils.java | 29 +-
.../maven/doxia/sink/impl/Xhtml5BaseSink.java | 331 +--
.../maven/doxia/sink/impl/XhtmlBaseSink.java | 2338 -----------------
.../maven/doxia/util/ByLineReaderSource.java | 13 +-
.../org/apache/maven/doxia/util/DoxiaUtils.java | 16 -
.../org/apache/maven/doxia/util/HtmlTools.java | 43 +-
.../org/apache/maven/doxia/util/LineBreaker.java | 2 +-
.../org/apache/maven/doxia/util/XmlValidator.java | 36 +-
doxia-core/src/main/mdo/document.mdo | 1277 ----------
.../src/main/resources/build-info.properties | 18 -
doxia-core/src/main/resources/xml.xsd | 286 +++
.../org/apache/maven/doxia/AbstractModuleTest.java | 10 +-
.../org/apache/maven/doxia/DefaultDoxiaTest.java | 31 +-
.../maven/doxia/document/DocumentModelTest.java | 356 ---
.../apache/maven/doxia/index/IndexEntryTest.java | 6 +-
.../apache/maven/doxia/index/IndexingSinkTest.java | 8 +-
.../apache/maven/doxia/macro/EchoMacroTest.java | 23 +-
.../org/apache/maven/doxia/macro/SsiMacroTest.java | 68 -
.../org/apache/maven/doxia/macro/SwfMacroTest.java | 158 --
.../doxia/macro/manager/MacroManagerTest.java | 27 +-
.../doxia/macro/snippet/SnippetMacroTest.java | 29 +-
.../doxia/macro/snippet/SnippetReaderTest.java | 7 +-
.../apache/maven/doxia/macro/toc/TocMacroTest.java | 44 +-
.../maven/doxia/module/AbstractIdentityTest.java | 12 +-
.../maven/doxia/parser/AbstractParserTest.java | 31 +-
.../maven/doxia/parser/AbstractParserTestCase.java | 8 +-
.../maven/doxia/parser/Xhtml5BaseParserTest.java | 79 +-
.../maven/doxia/parser/XhtmlBaseParserTest.java | 762 ------
.../maven/doxia/sink/impl/AbstractSinkTest.java | 146 +-
.../doxia/sink/impl/AbstractSinkTestCase.java | 8 +-
.../maven/doxia/sink/impl/AbstractXmlSinkTest.java | 8 +-
.../doxia/sink/impl/RandomAccessSinkTest.java | 4 +-
.../maven/doxia/sink/impl/SinkAdapterTest.java | 20 +-
.../doxia/sink/impl/SinkEventAttributeSetTest.java | 8 +-
.../maven/doxia/sink/impl/SinkEventElement.java | 15 +-
.../doxia/sink/impl/SinkEventTestingSink.java | 48 +-
.../maven/doxia/sink/impl/SinkUtilsTest.java | 8 +-
.../maven/doxia/sink/impl/TestAbstractSink.java | 4 +-
.../org/apache/maven/doxia/sink/impl/TextSink.java | 61 +-
.../sink/impl/WellformednessCheckingSink.java | 52 +-
.../maven/doxia/sink/impl/Xhtml5BaseSinkTest.java | 183 +-
.../maven/doxia/sink/impl/XhtmlBaseSinkTest.java | 1060 --------
.../maven/doxia/util/ByLineReaderSourceTest.java | 4 +-
.../apache/maven/doxia/util/DoxiaUtilsTest.java | 79 +-
.../org/apache/maven/doxia/util/HtmlToolsTest.java | 17 +-
.../apache/maven/doxia/util/XmlValidatorTest.java | 15 +-
.../maven/doxia/xsd/AbstractXmlValidator.java | 34 +-
.../maven/doxia/xsd/AbstractXmlValidatorTest.java | 2 +-
doxia-core/src/test/resources/test.xhtml | 96 +-
.../src/test/resources/test.xml | 8 +-
doxia-logging-api/pom.xml | 42 -
.../java/org/apache/maven/doxia/logging/Log.java | 196 --
.../org/apache/maven/doxia/logging/LogEnabled.java | 40 -
.../maven/doxia/logging/PlexusLoggerWrapper.java | 213 --
.../maven/doxia/logging/SystemStreamLog.java | 271 --
doxia-logging-api/src/site/apt/index.apt | 27 -
doxia-logging-api/src/site/site.xml | 42 -
doxia-modules/doxia-module-apt/pom.xml | 32 +-
.../maven/doxia/module/apt/AptParseException.java | 13 +-
.../apache/maven/doxia/module/apt/AptParser.java | 102 +-
.../maven/doxia/module/apt/AptParserModule.java | 8 +-
.../maven/doxia/module/apt/AptReaderSource.java | 2 +-
.../org/apache/maven/doxia/module/apt/AptSink.java | 36 +-
.../maven/doxia/module/apt/AptSinkFactory.java | 8 +-
.../apache/maven/doxia/module/apt/AptUtils.java | 53 -
.../maven/doxia/module/apt/AptParserTest.java | 226 +-
.../apache/maven/doxia/module/apt/AptSinkTest.java | 9 +-
.../maven/doxia/module/apt/AptUtilsTest.java | 73 +-
doxia-modules/doxia-module-confluence/pom.xml | 68 -
.../doxia/module/confluence/ConfluenceMarkup.java | 130 -
.../doxia/module/confluence/ConfluenceParser.java | 173 --
.../module/confluence/ConfluenceParserModule.java | 42 -
.../doxia/module/confluence/ConfluenceSink.java | 1399 -----------
.../module/confluence/ConfluenceSinkFactory.java | 45 -
.../confluence/parser/AbstractFatherBlock.java | 85 -
.../module/confluence/parser/AnchorBlock.java | 47 -
.../doxia/module/confluence/parser/Block.java | 35 -
.../module/confluence/parser/BlockParser.java | 48 -
.../doxia/module/confluence/parser/BoldBlock.java | 53 -
.../confluence/parser/ChildBlocksBuilder.java | 448 ----
.../confluence/parser/DefinitionListBlock.java | 65 -
.../parser/DefinitionListBlockParser.java | 91 -
.../module/confluence/parser/FigureBlock.java | 60 -
.../confluence/parser/FigureBlockParser.java | 104 -
.../confluence/parser/HorizontalRuleBlock.java | 35 -
.../parser/HorizontalRuleBlockParser.java | 43 -
.../module/confluence/parser/ItalicBlock.java | 48 -
.../module/confluence/parser/LinebreakBlock.java | 35 -
.../module/confluence/parser/LinethroughBlock.java | 52 -
.../doxia/module/confluence/parser/LinkBlock.java | 53 -
.../module/confluence/parser/MonospaceBlock.java | 47 -
.../module/confluence/parser/ParagraphBlock.java | 65 -
.../confluence/parser/ParagraphBlockParser.java | 137 -
.../module/confluence/parser/SectionBlock.java | 100 -
.../confluence/parser/SectionBlockParser.java | 74 -
.../doxia/module/confluence/parser/SubBlock.java | 52 -
.../doxia/module/confluence/parser/SupBlock.java | 52 -
.../doxia/module/confluence/parser/TextBlock.java | 49 -
.../module/confluence/parser/UnderlineBlock.java | 52 -
.../module/confluence/parser/VerbatimBlock.java | 49 -
.../confluence/parser/VerbatimBlockParser.java | 65 -
.../confluence/parser/list/BulletedListBlock.java | 51 -
.../module/confluence/parser/list/ListBlock.java | 39 -
.../confluence/parser/list/ListBlockParser.java | 147 --
.../confluence/parser/list/ListItemBlock.java | 69 -
.../confluence/parser/list/NumberedListBlock.java | 52 -
.../confluence/parser/list/TreeComponent.java | 126 -
.../confluence/parser/list/TreeListBuilder.java | 134 -
.../module/confluence/parser/table/TableBlock.java | 64 -
.../confluence/parser/table/TableBlockParser.java | 176 --
.../confluence/parser/table/TableCellBlock.java | 50 -
.../parser/table/TableCellHeaderBlock.java | 50 -
.../confluence/parser/table/TableRowBlock.java | 50 -
.../doxia-module-confluence/src/site/apt/index.apt | 27 -
.../doxia-module-confluence/src/site/site.xml | 43 -
.../module/confluence/ConfluenceParserTest.java | 682 -----
.../module/confluence/ConfluenceSinkTest.java | 428 ----
.../src/test/resources/anchor.confluence | 7 -
.../src/test/resources/code.confluence | 21 -
.../src/test/resources/escapes.confluence | 7 -
.../src/test/resources/figure.confluence | 18 -
.../src/test/resources/linebreak.confluence | 5 -
.../src/test/resources/link.confluence | 9 -
.../src/test/resources/nested-format.confluence | 8 -
.../resources/nested-list-heterogenous.confluence | 4 -
.../src/test/resources/nested-list.confluence | 8 -
.../src/test/resources/note-tip-info.confluence | 27 -
.../src/test/resources/paragraph-figure.confluence | 6 -
.../src/test/resources/paragraph-header.confluence | 6 -
.../src/test/resources/paragraph-list.confluence | 8 -
.../src/test/resources/section.confluence | 9 -
.../src/test/resources/simple-list.confluence | 15 -
.../src/test/resources/simple-paragraph.confluence | 8 -
.../src/test/resources/table-link.confluence | 4 -
.../src/test/resources/table.confluence | 28 -
.../src/test/resources/test.confluence | 98 -
.../src/test/resources/unknown-macro.confluence | 5 -
.../src/test/site/confluence/faq.confluence | 228 --
.../src/test/site/confluence/page.confluence | 98 -
doxia-modules/doxia-module-docbook-simple/pom.xml | 56 -
.../maven/doxia/module/docbook/DocBookParser.java | 1099 --------
.../doxia/module/docbook/DocBookParserModule.java | 42 -
.../maven/doxia/module/docbook/DocBookSink.java | 1913 --------------
.../maven/doxia/module/docbook/DocbookMarkup.java | 474 ----
.../doxia/module/docbook/DocbookSinkFactory.java | 50 -
.../maven/doxia/module/docbook/DocbookUtils.java | 191 --
.../module/docbook/SimplifiedDocbookMarkup.java | 1303 ----------
.../main/resources/META-INF/plexus/components.xml | 44 -
.../src/site/apt/index.apt.vm | 56 -
.../doxia-module-docbook-simple/src/site/site.xml | 43 -
.../doxia/module/docbook/DocBookIdentityTest.java | 46 -
.../doxia/module/docbook/DocBookParserTest.java | 404 ---
.../doxia/module/docbook/DocBookSinkTest.java | 360 ---
.../doxia/module/docbook/DocbookUtilsTest.java | 135 -
.../src/test/resources/book.xml | 134 -
.../src/test/resources/sdocbook_full.xml | 544 ----
.../src/test/resources/test.xml | 154 --
doxia-modules/doxia-module-fml/pom.xml | 30 +-
.../maven/doxia/module/fml/FmlContentParser.java | 14 +-
.../apache/maven/doxia/module/fml/FmlParser.java | 100 +-
.../maven/doxia/module/fml/FmlParserModule.java | 8 +-
.../src/main/resources/fml-1.0.1.xsd | 18 +-
.../maven/doxia/module/fml/FmlParserTest.java | 58 +-
.../maven/doxia/module/fml/FmlValidatorTest.java | 4 +
.../doxia-module-fml/src/test/resources/macro.fml | 96 +-
.../src/test/resources/simpleFaq.fml | 2 +-
.../doxia-module-fml/src/test/resources/test.fml | 2 +-
doxia-modules/doxia-module-fo/pom.xml | 153 --
.../maven/doxia/module/fo/FoAggregateSink.java | 1284 ----------
.../maven/doxia/module/fo/FoConfiguration.java | 207 --
.../org/apache/maven/doxia/module/fo/FoMarkup.java | 333 ---
.../org/apache/maven/doxia/module/fo/FoSink.java | 2052 ---------------
.../maven/doxia/module/fo/FoSinkFactory.java | 50 -
.../org/apache/maven/doxia/module/fo/FoUtils.java | 173 --
.../maven/doxia/module/fo/NumberedListItem.java | 182 --
.../src/main/resources/doxia-fo.properties | 19 -
.../src/main/resources/doxia-fo_en.properties | 23 -
.../src/main/resources/fo-styles.xslt | 510 ----
doxia-modules/doxia-module-fo/src/site/site.xml | 44 -
.../doxia-module-fo/src/site/xdoc/index.xml | 63 -
.../doxia-module-fo/src/site/xdoc/links.xml | 44 -
.../doxia-module-fo/src/site/xdoc/usage.xml | 214 --
.../maven/doxia/module/fo/FoAggregateSinkTest.java | 281 ---
.../maven/doxia/module/fo/FoConfigurationTest.java | 69 -
.../apache/maven/doxia/module/fo/FoSinkTest.java | 636 -----
.../doxia-module-fo/src/test/resources/figure.png | Bin 4545 -> 0 bytes
doxia-modules/doxia-module-itext/pom.xml | 82 -
.../apache/maven/doxia/module/itext/ITextFont.java | 387 ---
.../maven/doxia/module/itext/ITextHeader.java | 138 -
.../apache/maven/doxia/module/itext/ITextSink.java | 2036 ---------------
.../maven/doxia/module/itext/ITextSinkFactory.java | 74 -
.../apache/maven/doxia/module/itext/ITextUtil.java | 178 --
.../doxia/module/itext/SinkActionContext.java | 156 --
.../doxia-module-itext/src/site/apt/index.apt | 27 -
doxia-modules/doxia-module-itext/src/site/site.xml | 43 -
.../doxia/module/itext/ITextSinkTestCase.java | 154 --
.../maven/doxia/module/itext/ITextUtilTest.java | 95 -
.../src/test/resources/images/Context_Menu.png | Bin 22300 -> 0 bytes
.../src/test/resources/images/Generate_Site.png | Bin 36219 -> 0 bytes
.../src/test/resources/images/Open_Project.png | Bin 12405 -> 0 bytes
.../src/test/resources/images/Project_Opened.png | Bin 17655 -> 0 bytes
.../src/test/resources/images/Refresh_Project.png | Bin 29710 -> 0 bytes
.../resources/images/Refreshed_Context_Menu.png | Bin 22630 -> 0 bytes
.../resources/images/Run_Build_Main_Project.png | Bin 32784 -> 0 bytes
.../resources/images/Run_Clean_Main_Project.png | Bin 24235 -> 0 bytes
.../src/test/resources/images/Window_Files.png | Bin 16790 -> 0 bytes
.../src/test/resources/images/figure.png | Bin 17655 -> 0 bytes
.../src/test/resources/itext/itext.xml | 1937 --------------
doxia-modules/doxia-module-latex/pom.xml | 56 -
.../apache/maven/doxia/module/latex/LatexSink.java | 1514 -----------
.../maven/doxia/module/latex/LatexSinkFactory.java | 46 -
.../maven/doxia/module/latex/default_preamble.tex | 31 -
.../doxia/module/latex/default_sink_commands.tex | 16 -
.../doxia-module-latex/src/site/apt/index.apt | 27 -
doxia-modules/doxia-module-latex/src/site/site.xml | 43 -
.../maven/doxia/module/latex/LatexSinkTest.java | 343 ---
doxia-modules/doxia-module-markdown/pom.xml | 48 +-
.../doxia-module-markdown/src/it/general/pom.xml | 2 +-
.../module/markdown/FlexmarkDoxiaLinkResolver.java | 18 +-
.../doxia/module/markdown/MarkdownParser.java | 38 +-
.../module/markdown/MarkdownParserModule.java | 10 +-
.../markdown/FlexmarkDoxiaLinkResolverTest.java | 5 +-
.../module/markdown/MarkdownParserModuleTest.java | 23 +-
.../doxia/module/markdown/MarkdownParserTest.java | 121 +-
.../src/test/resources/comment-before-heading.md | 3 +-
.../src/test/resources/first-heading.md | 4 +-
.../src/test/resources/macro-toc-DOXIA-559.md | 2 +-
.../src/test/resources/macro-toc.md | 4 +-
doxia-modules/doxia-module-rtf/pom.xml | 53 -
.../maven/doxia/module/rtf/AlphaNumerals.java | 51 -
.../org/apache/maven/doxia/module/rtf/Font.java | 102 -
.../apache/maven/doxia/module/rtf/FontMetrics.java | 102 -
.../apache/maven/doxia/module/rtf/Monospace.java | 162 --
.../maven/doxia/module/rtf/MonospaceBold.java | 163 --
.../doxia/module/rtf/MonospaceBoldItalic.java | 162 --
.../maven/doxia/module/rtf/MonospaceItalic.java | 162 --
.../apache/maven/doxia/module/rtf/PBMReader.java | 310 ---
.../maven/doxia/module/rtf/RomanNumerals.java | 58 -
.../org/apache/maven/doxia/module/rtf/RtfSink.java | 2436 ------------------
.../maven/doxia/module/rtf/RtfSinkFactory.java | 46 -
.../apache/maven/doxia/module/rtf/SansSerif.java | 162 --
.../maven/doxia/module/rtf/SansSerifBold.java | 162 --
.../doxia/module/rtf/SansSerifBoldItalic.java | 162 --
.../maven/doxia/module/rtf/SansSerifItalic.java | 162 --
.../org/apache/maven/doxia/module/rtf/Serif.java | 162 --
.../apache/maven/doxia/module/rtf/SerifBold.java | 162 --
.../maven/doxia/module/rtf/SerifBoldItalic.java | 162 --
.../apache/maven/doxia/module/rtf/SerifItalic.java | 162 --
.../apache/maven/doxia/module/rtf/WMFWriter.java | 549 ----
.../doxia-module-rtf/src/site/apt/index.apt | 27 -
doxia-modules/doxia-module-rtf/src/site/site.xml | 43 -
.../apache/maven/doxia/module/rtf/RtfSinkTest.java | 89 -
.../doxia-module-rtf/src/test/resources/test.apt | 16 -
doxia-modules/doxia-module-twiki/pom.xml | 66 -
.../maven/doxia/module/twiki/TWikiMarkup.java | 139 -
.../maven/doxia/module/twiki/TWikiParser.java | 255 --
.../doxia/module/twiki/TWikiParserModule.java | 42 -
.../apache/maven/doxia/module/twiki/TWikiSink.java | 1410 -----------
.../maven/doxia/module/twiki/TWikiSinkFactory.java | 45 -
.../module/twiki/parser/AbstractFatherBlock.java | 139 -
.../doxia/module/twiki/parser/AnchorBlock.java | 96 -
.../maven/doxia/module/twiki/parser/Block.java | 42 -
.../doxia/module/twiki/parser/BlockParser.java | 50 -
.../maven/doxia/module/twiki/parser/BoldBlock.java | 53 -
.../module/twiki/parser/FormatedTextParser.java | 309 ---
.../twiki/parser/GenericListBlockParser.java | 537 ----
.../module/twiki/parser/HRuleBlockParser.java | 78 -
.../module/twiki/parser/HorizontalRuleBlock.java | 53 -
.../doxia/module/twiki/parser/ImageBlock.java | 90 -
.../doxia/module/twiki/parser/ItalicBlock.java | 53 -
.../maven/doxia/module/twiki/parser/LinkBlock.java | 109 -
.../maven/doxia/module/twiki/parser/ListBlock.java | 44 -
.../doxia/module/twiki/parser/ListItemBlock.java | 125 -
.../doxia/module/twiki/parser/MonospaceBlock.java | 53 -
.../maven/doxia/module/twiki/parser/NopBlock.java | 53 -
.../module/twiki/parser/NumeratedListBlock.java | 89 -
.../doxia/module/twiki/parser/ParagraphBlock.java | 46 -
.../module/twiki/parser/ParagraphBlockParser.java | 264 --
.../doxia/module/twiki/parser/SectionBlock.java | 177 --
.../module/twiki/parser/SectionBlockParser.java | 162 --
.../doxia/module/twiki/parser/TableBlock.java | 66 -
.../module/twiki/parser/TableBlockParser.java | 112 -
.../doxia/module/twiki/parser/TableCellBlock.java | 53 -
.../module/twiki/parser/TableCellHeaderBlock.java | 53 -
.../doxia/module/twiki/parser/TableRowBlock.java | 53 -
.../maven/doxia/module/twiki/parser/TextBlock.java | 106 -
.../doxia/module/twiki/parser/TextParser.java | 418 ---
.../module/twiki/parser/UnorderedListBlock.java | 59 -
.../doxia/module/twiki/parser/VerbatimBlock.java | 54 -
.../module/twiki/parser/VerbatimBlockParser.java | 80 -
.../doxia/module/twiki/parser/WikiWordBlock.java | 128 -
.../module/twiki/parser/WikiWordLinkResolver.java | 36 -
.../doxia/module/twiki/parser/XHTMLBlock.java | 88 -
.../twiki/parser/XHTMLWikiWordLinkResolver.java | 42 -
.../doxia-module-twiki/src/site/apt/index.apt | 27 -
doxia-modules/doxia-module-twiki/src/site/site.xml | 43 -
.../maven/doxia/module/twiki/TWikiSinkTest.java | 383 ---
.../module/twiki/parser/AbstractBlockTestCase.java | 105 -
.../maven/doxia/module/twiki/parser/BlockTest.java | 126 -
.../module/twiki/parser/FormatedTextTest.java | 222 --
.../maven/doxia/module/twiki/parser/ListTest.java | 126 -
.../doxia/module/twiki/parser/ParagraphTest.java | 162 --
.../doxia/module/twiki/parser/SectionTest.java | 170 --
.../maven/doxia/module/twiki/parser/TableTest.java | 88 -
.../maven/doxia/module/twiki/parser/TitleTest.java | 127 -
.../doxia/module/twiki/parser/TwikiParserTest.java | 93 -
.../doxia/module/twiki/parser/VerbatimTest.java | 116 -
.../maven/doxia/module/twiki/parser/WordsTest.java | 315 ---
.../src/test/resources/test.twiki | 109 -
doxia-modules/doxia-module-xdoc/pom.xml | 30 +-
.../apache/maven/doxia/module/xdoc/XdocParser.java | 34 +-
.../maven/doxia/module/xdoc/XdocParserModule.java | 8 +-
.../apache/maven/doxia/module/xdoc/XdocSink.java | 69 +-
.../maven/doxia/module/xdoc/XdocSinkFactory.java | 8 +-
.../maven/doxia/module/xdoc/XmlWriterXdocSink.java | 94 -
.../src/main/resources/xdoc-2.0.xsd | 20 +-
.../maven/doxia/module/xdoc/XdocIdentityTest.java | 3 +-
.../maven/doxia/module/xdoc/XdocParserTest.java | 133 +-
.../maven/doxia/module/xdoc/XdocSinkTest.java | 95 +-
.../maven/doxia/module/xdoc/XdocValidatorTest.java | 2 +
.../doxia/module/xdoc/XmlWriterXdocSinkTest.java | 115 -
.../doxia-module-xdoc/src/test/resources/macro.xml | 2 +-
.../src/test/resources/report.xml | 2 +-
.../doxia-module-xdoc/src/test/resources/test.xml | 8 +-
.../doxia-module-xdoc/src/test/resources/toc.xml | 2 +-
doxia-modules/doxia-module-xhtml/pom.xml | 56 -
.../doxia/module/xhtml/AbstractXhtmlSink.java | 33 -
.../maven/doxia/module/xhtml/XhtmlMarkup.java | 45 -
.../maven/doxia/module/xhtml/XhtmlParser.java | 365 ---
.../doxia/module/xhtml/XhtmlParserModule.java | 42 -
.../apache/maven/doxia/module/xhtml/XhtmlSink.java | 277 --
.../maven/doxia/module/xhtml/XhtmlSinkFactory.java | 50 -
doxia-modules/doxia-module-xhtml/src/site/site.xml | 43 -
.../doxia/module/xhtml/XhtmlIdentityTest.java | 85 -
.../maven/doxia/module/xhtml/XhtmlParserTest.java | 198 --
.../maven/doxia/module/xhtml/XhtmlSinkTest.java | 454 ----
.../module/xhtml/XhtmlSinkWithLanguageIdTest.java | 47 -
.../src/test/resources/download.apt.vm | 79 -
.../src/test/resources/file.with.dot.in.name.xml | 20 -
.../doxia-module-xhtml/src/test/resources/fun.html | 66 -
.../src/test/resources/index.xml.vm | 231 --
.../src/test/resources/test.xhtml | 152 --
doxia-modules/doxia-module-xhtml5/pom.xml | 30 +-
.../maven/doxia/module/xhtml5/Xhtml5Markup.java | 4 +-
.../maven/doxia/module/xhtml5/Xhtml5Parser.java | 31 +-
.../doxia/module/xhtml5/Xhtml5ParserModule.java | 10 +-
.../maven/doxia/module/xhtml5/Xhtml5Sink.java | 106 -
.../doxia/module/xhtml5/Xhtml5SinkFactory.java | 10 +-
.../doxia-module-xhtml5/src/site/site.xml | 4 +-
.../doxia/module/xhtml5/Xhtml5IdentityTest.java | 4 +-
.../doxia/module/xhtml5/Xhtml5ParserTest.java | 19 +-
.../maven/doxia/module/xhtml5/Xhtml5SinkTest.java | 29 +-
.../xhtml5/Xhtml5SinkWithLanguageIdTest.java | 4 +-
.../src/test/resources/download.apt.vm | 2 +-
.../src/test/resources/fun.html | 2 +-
.../src/test/resources/index.xml.vm | 16 +-
.../src/test/resources/test.xhtml | 43 +-
doxia-modules/pom.xml | 15 +-
doxia-sink-api/pom.xml | 8 +-
.../java/org/apache/maven/doxia/sink/Sink.java | 74 +-
.../org/apache/maven/doxia/sink/SinkFactory.java | 2 -
.../main/java/org/codehaus/doxia/sink/Sink.java | 31 -
doxia-test-docs/pom.xml | 2 +-
.../resources/doxia-site/xdoc/references/index.xml | 60 -
.../doxia-site/xdoc/references/xdoc-format.xml | 12 +-
.../xdoc/developers/mojo-api-specification.xml | 6 +-
pom.xml | 155 +-
src/site/resources/images/doxia-deps.png | Bin 47116 -> 19941 bytes
src/site/xdoc/doxia-deps.odg | Bin 13937 -> 12594 bytes
src/site/xdoc/index.xml | 37 +-
406 files changed, 3816 insertions(+), 56674 deletions(-)
delete mode 100644 doxia-core/src/main/java/org/apache/maven/doxia/macro/SsiMacro.java
delete mode 100644 doxia-core/src/main/java/org/apache/maven/doxia/macro/SwfMacro.java
delete mode 100644 doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
delete mode 100644 doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/AbstractBinarySinkFactory.java
delete mode 100644 doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSink.java
delete mode 100644 doxia-core/src/main/mdo/document.mdo
delete mode 100644 doxia-core/src/main/resources/build-info.properties
create mode 100644 doxia-core/src/main/resources/xml.xsd
delete mode 100644 doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java
delete mode 100644 doxia-core/src/test/java/org/apache/maven/doxia/macro/SsiMacroTest.java
delete mode 100644 doxia-core/src/test/java/org/apache/maven/doxia/macro/SwfMacroTest.java
delete mode 100644 doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
delete mode 100644 doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSinkTest.java
copy {doxia-modules/doxia-module-xdoc => doxia-core}/src/test/resources/test.xml (95%)
delete mode 100644 doxia-logging-api/pom.xml
delete mode 100644 doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/Log.java
delete mode 100644 doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/LogEnabled.java
delete mode 100644 doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/PlexusLoggerWrapper.java
delete mode 100644 doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/SystemStreamLog.java
delete mode 100644 doxia-logging-api/src/site/apt/index.apt
delete mode 100644 doxia-logging-api/src/site/site.xml
delete mode 100644 doxia-modules/doxia-module-confluence/pom.xml
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceMarkup.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParserModule.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkFactory.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/AbstractFatherBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/AnchorBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/Block.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/BlockParser.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/BoldBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/DefinitionListBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/DefinitionListBlockParser.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/FigureBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/FigureBlockParser.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/HorizontalRuleBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/HorizontalRuleBlockParser.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ItalicBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/LinebreakBlock.java
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/LinkBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/MonospaceBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlockParser.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/TextBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/UnderlineBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/VerbatimBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/VerbatimBlockParser.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/BulletedListBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListItemBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/NumberedListBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/TreeComponent.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/TreeListBuilder.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableCellBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableCellHeaderBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableRowBlock.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/site/apt/index.apt
delete mode 100644 doxia-modules/doxia-module-confluence/src/site/site.xml
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkTest.java
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/resources/anchor.confluence
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/resources/code.confluence
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/resources/escapes.confluence
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/resources/figure.confluence
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/resources/linebreak.confluence
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/resources/link.confluence
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/resources/nested-format.confluence
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/resources/nested-list-heterogenous.confluence
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/resources/nested-list.confluence
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/resources/note-tip-info.confluence
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/resources/paragraph-figure.confluence
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/resources/paragraph-header.confluence
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/resources/paragraph-list.confluence
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/resources/section.confluence
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/resources/simple-list.confluence
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/resources/simple-paragraph.confluence
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/resources/table-link.confluence
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/resources/table.confluence
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/resources/test.confluence
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/resources/unknown-macro.confluence
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/site/confluence/faq.confluence
delete mode 100644 doxia-modules/doxia-module-confluence/src/test/site/confluence/page.confluence
delete mode 100644 doxia-modules/doxia-module-docbook-simple/pom.xml
delete mode 100644 doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java
delete mode 100644 doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParserModule.java
delete mode 100644 doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
delete mode 100644 doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookMarkup.java
delete mode 100644 doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookSinkFactory.java
delete mode 100644 doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookUtils.java
delete mode 100644 doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/SimplifiedDocbookMarkup.java
delete mode 100644 doxia-modules/doxia-module-docbook-simple/src/main/resources/META-INF/plexus/components.xml
delete mode 100644 doxia-modules/doxia-module-docbook-simple/src/site/apt/index.apt.vm
delete mode 100644 doxia-modules/doxia-module-docbook-simple/src/site/site.xml
delete mode 100644 doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookIdentityTest.java
delete mode 100644 doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java
delete mode 100644 doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
delete mode 100644 doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocbookUtilsTest.java
delete mode 100644 doxia-modules/doxia-module-docbook-simple/src/test/resources/book.xml
delete mode 100644 doxia-modules/doxia-module-docbook-simple/src/test/resources/sdocbook_full.xml
delete mode 100644 doxia-modules/doxia-module-docbook-simple/src/test/resources/test.xml
delete mode 100644 doxia-modules/doxia-module-fo/pom.xml
delete mode 100644 doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
delete mode 100644 doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoConfiguration.java
delete mode 100644 doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoMarkup.java
delete mode 100644 doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java
delete mode 100644 doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSinkFactory.java
delete mode 100644 doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoUtils.java
delete mode 100644 doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/NumberedListItem.java
delete mode 100644 doxia-modules/doxia-module-fo/src/main/resources/doxia-fo.properties
delete mode 100644 doxia-modules/doxia-module-fo/src/main/resources/doxia-fo_en.properties
delete mode 100644 doxia-modules/doxia-module-fo/src/main/resources/fo-styles.xslt
delete mode 100644 doxia-modules/doxia-module-fo/src/site/site.xml
delete mode 100644 doxia-modules/doxia-module-fo/src/site/xdoc/index.xml
delete mode 100644 doxia-modules/doxia-module-fo/src/site/xdoc/links.xml
delete mode 100644 doxia-modules/doxia-module-fo/src/site/xdoc/usage.xml
delete mode 100644 doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoAggregateSinkTest.java
delete mode 100644 doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoConfigurationTest.java
delete mode 100644 doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoSinkTest.java
delete mode 100644 doxia-modules/doxia-module-fo/src/test/resources/figure.png
delete mode 100644 doxia-modules/doxia-module-itext/pom.xml
delete mode 100644 doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
delete mode 100644 doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextHeader.java
delete mode 100644 doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
delete mode 100644 doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSinkFactory.java
delete mode 100644 doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
delete mode 100644 doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/SinkActionContext.java
delete mode 100644 doxia-modules/doxia-module-itext/src/site/apt/index.apt
delete mode 100644 doxia-modules/doxia-module-itext/src/site/site.xml
delete mode 100644 doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java
delete mode 100644 doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextUtilTest.java
delete mode 100644 doxia-modules/doxia-module-itext/src/test/resources/images/Context_Menu.png
delete mode 100644 doxia-modules/doxia-module-itext/src/test/resources/images/Generate_Site.png
delete mode 100644 doxia-modules/doxia-module-itext/src/test/resources/images/Open_Project.png
delete mode 100644 doxia-modules/doxia-module-itext/src/test/resources/images/Project_Opened.png
delete mode 100644 doxia-modules/doxia-module-itext/src/test/resources/images/Refresh_Project.png
delete mode 100644 doxia-modules/doxia-module-itext/src/test/resources/images/Refreshed_Context_Menu.png
delete mode 100644 doxia-modules/doxia-module-itext/src/test/resources/images/Run_Build_Main_Project.png
delete mode 100644 doxia-modules/doxia-module-itext/src/test/resources/images/Run_Clean_Main_Project.png
delete mode 100644 doxia-modules/doxia-module-itext/src/test/resources/images/Window_Files.png
delete mode 100644 doxia-modules/doxia-module-itext/src/test/resources/images/figure.png
delete mode 100644 doxia-modules/doxia-module-itext/src/test/resources/itext/itext.xml
delete mode 100644 doxia-modules/doxia-module-latex/pom.xml
delete mode 100644 doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
delete mode 100644 doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSinkFactory.java
delete mode 100644 doxia-modules/doxia-module-latex/src/main/resources/org/apache/maven/doxia/module/latex/default_preamble.tex
delete mode 100644 doxia-modules/doxia-module-latex/src/main/resources/org/apache/maven/doxia/module/latex/default_sink_commands.tex
delete mode 100644 doxia-modules/doxia-module-latex/src/site/apt/index.apt
delete mode 100644 doxia-modules/doxia-module-latex/src/site/site.xml
delete mode 100644 doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
delete mode 100644 doxia-modules/doxia-module-rtf/pom.xml
delete mode 100644 doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/AlphaNumerals.java
delete mode 100644 doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Font.java
delete mode 100644 doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/FontMetrics.java
delete mode 100644 doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Monospace.java
delete mode 100644 doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBold.java
delete mode 100644 doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBoldItalic.java
delete mode 100644 doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceItalic.java
delete mode 100644 doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/PBMReader.java
delete mode 100644 doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RomanNumerals.java
delete mode 100644 doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java
delete mode 100644 doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSinkFactory.java
delete mode 100644 doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerif.java
delete mode 100644 doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBold.java
delete mode 100644 doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBoldItalic.java
delete mode 100644 doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifItalic.java
delete mode 100644 doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Serif.java
delete mode 100644 doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifBold.java
delete mode 100644 doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifBoldItalic.java
delete mode 100644 doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifItalic.java
delete mode 100644 doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/WMFWriter.java
delete mode 100644 doxia-modules/doxia-module-rtf/src/site/apt/index.apt
delete mode 100644 doxia-modules/doxia-module-rtf/src/site/site.xml
delete mode 100644 doxia-modules/doxia-module-rtf/src/test/java/org/apache/maven/doxia/module/rtf/RtfSinkTest.java
delete mode 100644 doxia-modules/doxia-module-rtf/src/test/resources/test.apt
delete mode 100644 doxia-modules/doxia-module-twiki/pom.xml
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiMarkup.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParser.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParserModule.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSinkFactory.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/AbstractFatherBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/AnchorBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/Block.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/BlockParser.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/BoldBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/FormatedTextParser.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/HRuleBlockParser.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/HorizontalRuleBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ImageBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ItalicBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/LinkBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ListBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ListItemBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/MonospaceBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/NopBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/NumeratedListBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ParagraphBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ParagraphBlockParser.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/SectionBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/SectionBlockParser.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableCellBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableCellHeaderBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableRowBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/UnorderedListBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/VerbatimBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/VerbatimBlockParser.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/WikiWordBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/WikiWordLinkResolver.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/XHTMLBlock.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/XHTMLWikiWordLinkResolver.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/site/apt/index.apt
delete mode 100644 doxia-modules/doxia-module-twiki/src/site/site.xml
delete mode 100644 doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/TWikiSinkTest.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/AbstractBlockTestCase.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/BlockTest.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/FormatedTextTest.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ListTest.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ParagraphTest.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/SectionTest.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TableTest.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TitleTest.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TwikiParserTest.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/VerbatimTest.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/WordsTest.java
delete mode 100644 doxia-modules/doxia-module-twiki/src/test/resources/test.twiki
delete mode 100644 doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.java
delete mode 100644 doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSinkTest.java
delete mode 100644 doxia-modules/doxia-module-xhtml/pom.xml
delete mode 100644 doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/AbstractXhtmlSink.java
delete mode 100644 doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlMarkup.java
delete mode 100644 doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
delete mode 100644 doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParserModule.java
delete mode 100644 doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
delete mode 100644 doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java
delete mode 100644 doxia-modules/doxia-module-xhtml/src/site/site.xml
delete mode 100644 doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlIdentityTest.java
delete mode 100644 doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlParserTest.java
delete mode 100644 doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
delete mode 100644 doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkWithLanguageIdTest.java
delete mode 100644 doxia-modules/doxia-module-xhtml/src/test/resources/download.apt.vm
delete mode 100644 doxia-modules/doxia-module-xhtml/src/test/resources/file.with.dot.in.name.xml
delete mode 100644 doxia-modules/doxia-module-xhtml/src/test/resources/fun.html
delete mode 100644 doxia-modules/doxia-module-xhtml/src/test/resources/index.xml.vm
delete mode 100644 doxia-modules/doxia-module-xhtml/src/test/resources/test.xhtml
delete mode 100644 doxia-sink-api/src/main/java/org/codehaus/doxia/sink/Sink.java
[maven-doxia] 01/01: [DOXIA-617] support yaml metadata
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch DOXIA-617
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit da4dc8e81998e1c443904b5f07003f951eac4a34
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Thu Dec 22 08:12:41 2022 +0100
[DOXIA-617] support yaml metadata
---
.../maven/doxia/module/markdown/MarkdownParser.java | 7 +++++++
.../doxia/module/markdown/MarkdownParserTest.java | 19 ++++++++++++++++++-
.../src/test/resources/metadata-yaml.md | 14 ++++++++++++++
3 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
index 99676dd0..5f161165 100644
--- a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
+++ b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
@@ -185,6 +185,13 @@ public class MarkdownParser
html.append( "<html>" );
html.append( "<head>" );
+ // detect yaml style metadata
+ if ( text.startsWith( "---" ) )
+ {
+ // remove the enclosing --- to get back to classical metadata
+ text = text.replaceFirst( "---", "" ).replaceFirst( "---", "" );
+ }
+
// First, we interpret the "metadata" section of the document and add the corresponding HTML headers
Matcher metadataMatcher = METADATA_SECTION_PATTERN.matcher( text );
boolean haveTitle = false;
diff --git a/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java b/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
index 7887f0bd..efcab9a0 100644
--- a/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
+++ b/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
@@ -311,7 +311,24 @@ public class MarkdownParserTest
public void testMetadataSinkEvent()
throws Exception
{
- List<SinkEventElement> eventList = parseFileToEventTestingSink( "metadata" ).getEventList();
+ testMetadataSinkEvent( "metadata" );
+ }
+
+ /**
+ * Assert the metadata is passed through when parsing "metadata-yaml.md".
+ *
+ * @throws Exception if the event list is not correct when parsing the document
+ */
+ public void testMetadataYamlSinkEvent()
+ throws Exception
+ {
+ testMetadataSinkEvent( "metadata-yaml" );
+ }
+
+ private void testMetadataSinkEvent( String doc )
+ throws Exception
+ {
+ List<SinkEventElement> eventList = parseFileToEventTestingSink( doc ).getEventList();
Iterator<SinkEventElement> it = eventList.iterator();
assertSinkEquals( it, "head", "title", "text", "text", "text", "title_", "author", "text", "author_", "date",
diff --git a/doxia-modules/doxia-module-markdown/src/test/resources/metadata-yaml.md b/doxia-modules/doxia-module-markdown/src/test/resources/metadata-yaml.md
new file mode 100644
index 00000000..406c74ff
--- /dev/null
+++ b/doxia-modules/doxia-module-markdown/src/test/resources/metadata-yaml.md
@@ -0,0 +1,14 @@
+---
+title: A Title & a 'Test'
+author: Somebody 'Nickname' Great <so...@somewhere.org>
+date: 2013 © Copyleft
+keywords: maven,doxia,markdown
+---
+
+# The document with look-alike header
+
+copyright: none
+
+## A subheading
+
+Some more text
\ No newline at end of file