Author: ltheussl
Date: Tue May 2 16:43:05 2006
New Revision: 399086
URL: http://svn.apache.org/viewcvs?rev=399086&view=rev
Log:
PR: MPXDOC-17
Fix xml entities in xdoc source files (only in Maven 1.1 because of a bug in
an old Jelly version).
Modified:
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test01/common/links.xml
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml
maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl?rev=399086&r1=399085&r2=399086&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl Tue May 2
16:43:05 2006
@@ -976,7 +976,9 @@
<jsl:template match="text()"><x:expr select="."/></jsl:template>
<!-- copy any other elements through -->
- <jsl:template match="*" trim="false"><jsl:copy
trim="false"><jsl:applyTemplates trim="false"/></jsl:copy></jsl:template>
+ <!-- This does not work with entities, see
http://jira.codehaus.org/browse/MPXDOC-17 -->
+ <!--<jsl:template match="*" trim="false"><jsl:copy
trim="false"><jsl:applyTemplates trim="false"/></jsl:copy></jsl:template>-->
+ <jsl:template match="*" trim="false"><jsl:copyOf select="."/></jsl:template>
<!-- process a message -->
<!-- Key is more important than message... -->
Modified:
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test01/common/links.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test01/common/links.xml?rev=399086&r1=399085&r2=399086&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test01/common/links.xml
(original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test01/common/links.xml
Tue May 2 16:43:05 2006
@@ -77,5 +77,11 @@
<!ENTITY _set-parent '<code><set-parent></code>'>
<!ENTITY set-parent '<a href="rules.html#set-parent">&_set-parent;</a>'>
+<!ENTITY apache.a 'Apache'>
+<!ENTITY apache.b '<Apache>'>
+<!ENTITY apache.c '[Apache]'>
+<!ENTITY apache.d '<a
href="http://www.apache.org/">&apache.b;</a>'>
+<!ENTITY apache.e '<a href="http://www.apache.org/";>&apache.b;</a>'>
+<!ENTITY apache.f '<em>&apache.a;</em>'>
Modified:
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml?rev=399086&r1=399085&r2=399086&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml
(original)
+++
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml
Tue May 2 16:43:05 2006
@@ -19,7 +19,7 @@
<!-- $Id$ -->
<!DOCTYPE document [
- <!ENTITY % common-links SYSTEM "../common/links.xml">
+ <!ENTITY % common-links SYSTEM "common/links.xml">
%common-links;
]>
<document>
@@ -30,10 +30,58 @@
</properties>
<body>
- <section name="test1">
- &_module;
+ <section name="MPXDOC-17">
+ <table>
+ <tr>
+ <th>Entity</th>
+ <th>Expected result</th>
+ <th>Actual result</th>
+ </tr>
+ <tr>
+ <td>_module</td>
+ <td><code><module></code></td>
+ <td>&_module;</td>
+ </tr>
+ <tr>
+ <td>module</td>
+ <td><a href="descriptor.html#module">module</a></td>
+ <td>&module;</td>
+ </tr>
+ <tr>
+ <td>apache.a</td>
+ <td>Apache</td>
+ <td>&apache.a;</td>
+ </tr>
+ <tr>
+ <td>apache.b</td>
+ <td><Apache></td>
+ <td>&apache.b;</td>
+ </tr>
+ <tr>
+ <td>apache.c</td>
+ <td>[Apache]</td>
+ <td>&apache.c;</td>
+ </tr>
+ <tr>
+ <td>apache.d</td>
+ <td>
+ <a
href="http://www.apache.org/">&apache.b;</a>
+ </td>
+ <td>&apache.d;</td>
+ </tr>
+ <tr>
+ <td>apache.e</td>
+ <td><a href="http://www.apache.org/";>&apache.b;</a></td>
+ <td>&apache.e;</td>
+ </tr>
+ <tr>
+ <td>apache.f</td>
+ <td><em>&apache.a;</em></td>
+ <td>&apache.f;</td>
+ </tr>
+ </table>
- <p><a href="#Section 2">blah</a></p>
+ <p><a href="#Section_2">blah</a></p>
</section>
<section name="Section 2">
<p><a href="/servlet/x?param=1&q=foo">foo -> bar</a></p>
Modified: maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml?rev=399086&r1=399085&r2=399086&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Tue May 2 16:43:05 2006
@@ -27,6 +27,7 @@
</properties>
<body>
<release version="1.10-SNAPSHOT" date="in SVN">
+ <action dev="ltheussl" type="fix" issue="MPXDOC-17">Fix xml entities in
xdoc source files (only in Maven 1.1 because of a bug in an old Jelly
version).</action>
<action dev="ltheussl" type="fix" issue="MPXDOC-194">Add i18n support
for links and breadcrumbs.</action>
<action dev="aheritier" type="update" issue="MAVEN-1753">Replace the
deprecated xmlParserAPIs by xml-apis 1.3.03.</action>
<action dev="ltheussl" type="add" issue="MPXDOC-192">Add a public DTD
identifier for xdoc.</action>
