diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl index 907d91de..61a49c80 100644 --- a/xdoc/src/plugin-resources/site.jsl +++ b/xdoc/src/plugin-resources/site.jsl @@ -976,7 +976,9 @@ - + + + diff --git a/xdoc/src/plugin-test/test01/common/links.xml b/xdoc/src/plugin-test/test01/common/links.xml index 1d0248e3..06d3571f 100644 --- a/xdoc/src/plugin-test/test01/common/links.xml +++ b/xdoc/src/plugin-test/test01/common/links.xml @@ -77,5 +77,11 @@ <set-parent>'> &_set-parent;'> + + + + +&apache.b;'> +&apache.a;'> diff --git a/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml b/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml index a9d390f1..f0b81aea 100644 --- a/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml +++ b/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml @@ -19,7 +19,7 @@ + %common-links; ]> @@ -30,10 +30,58 @@ -
- &_module; +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
EntityExpected resultActual result
_module<module>&_module;
modulemodule&module;
apache.aApache&apache.a;
apache.b<Apache>&apache.b;
apache.c[Apache]&apache.c;
apache.d + <a href="http://www.apache.org/">&apache.b;</a> + &apache.d;
apache.e&apache.b;&apache.e;
apache.f&apache.a;&apache.f;
-

blah

+

blah

foo -> bar

diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml index 660262ca..084c8998 100644 --- a/xdoc/xdocs/changes.xml +++ b/xdoc/xdocs/changes.xml @@ -27,6 +27,7 @@ + Fix xml entities in xdoc source files (only in Maven 1.1 because of a bug in an old Jelly version). Add i18n support for links and breadcrumbs. Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Add a public DTD identifier for xdoc.