Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PR: MPXDOC-17

Browse Source 
Fix xml entities in xdoc source files (only in Maven 1.1 because of a  bug in an old Jelly version).


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@399086 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ltheussl 2006-05-02 23:43:05 +00:00
parent 5c758c38ae
commit 6fb61d0831
4 changed files with 62 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xdoc/src/plugin-resources/site.jsl
View File

@ -976,7 +976,9 @@
<jsl:template match="text()"><x:expr select="."/></jsl:template> <jsl:template match="text()"><x:expr select="."/></jsl:template>
<!-- copy any other elements through --> <!-- 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 --> <!-- process a message -->
<!-- Key is more important than message... --> <!-- Key is more important than message... -->

6
xdoc/src/plugin-test/test01/common/links.xml
View File

@ -77,5 +77,11 @@
<!ENTITY _set-parent '<code>&lt;set-parent&gt;</code>'> <!ENTITY _set-parent '<code>&lt;set-parent&gt;</code>'>
<!ENTITY set-parent '<a href="rules.html#set-parent">&_set-parent;</a>'> <!ENTITY set-parent '<a href="rules.html#set-parent">&_set-parent;</a>'>
<!ENTITY apache.a 'Apache'>
<!ENTITY apache.b '&lt;Apache&gt;'>
<!ENTITY apache.c '[Apache]'>
<!ENTITY apache.d '&lt;a href=&quot;http://www.apache.org/&quot;&gt;&apache.b;&lt;/a&gt;'>
<!ENTITY apache.e '<a href="http://www.apache.org/">&apache.b;</a>'>
<!ENTITY apache.f '<em>&apache.a;</em>'>

56
xdoc/src/plugin-test/test01/xdocs-replacement/test.xml
View File

@ -19,7 +19,7 @@
<!-- $Id$ --> <!-- $Id$ -->
<!DOCTYPE document [ <!DOCTYPE document [
<!ENTITY % common-links SYSTEM "../common/links.xml"> <!ENTITY % common-links SYSTEM "common/links.xml">
%common-links; %common-links;
]> ]>
<document> <document>
@ -30,10 +30,58 @@
</properties> </properties>
<body> <body>
<section name="test1"> <section name="MPXDOC-17">
&_module; <table>
<tr>
<th>Entity</th>
<th>Expected result</th>
<th>Actual result</th>
</tr>
<tr>
<td>_module</td>
<td><code>&lt;module&gt;</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>&lt;Apache&gt;</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>
&lt;a href=&quot;http://www.apache.org/&quot;&gt;&apache.b;&lt;/a&gt;
</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>
<section name="Section 2"> <section name="Section 2">
<p><a href="/servlet/x?param=1&amp;q=foo">foo -&gt; bar</a></p> <p><a href="/servlet/x?param=1&amp;q=foo">foo -&gt; bar</a></p>

1
xdoc/xdocs/changes.xml
View File

@ -27,6 +27,7 @@
</properties> </properties>
<body> <body>
<release version="1.10-SNAPSHOT" date="in SVN"> <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="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="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> <action dev="ltheussl" type="add" issue="MPXDOC-192">Add a public DTD identifier for xdoc.</action>