felipeal 2004/12/12 13:04:27
Modified: xdoc/src/plugin-resources site.jsl
xdoc/xdocs changes.xml index.xml
Added: xdoc/xdocs escapeXml.xml
Log:
MPXDOC-118 - add a new tag (escapeXml)
Revision Changes Path
1.63 +2 -0 maven-plugins/xdoc/src/plugin-resources/site.jsl
Index: site.jsl
===================================================================
RCS file: /home/cvs/maven-plugins/xdoc/src/plugin-resources/site.jsl,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- site.jsl 16 Sep 2004 23:18:59 -0000 1.62
+++ site.jsl 12 Dec 2004 21:04:27 -0000 1.63
@@ -381,6 +381,8 @@
<div class="source"><pre><jsl:applyTemplates /></pre></div>
</jsl:template>
+ <jsl:template match="escapeXml" trim="false"><j:set
var="escapedChunk"><jsl:applyTemplates/></j:set>${escapedChunk}</jsl:template>
+
<!-- preserve whitespace in the following elements -->
<jsl:template match="pre | script | style" trim="true">
<x:set var="nodename" select="name()"/>
1.68 +1 -0 maven-plugins/xdoc/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/xdoc/xdocs/changes.xml,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- changes.xml 26 Oct 2004 09:02:52 -0000 1.67
+++ changes.xml 12 Dec 2004 21:04:27 -0000 1.68
@@ -27,6 +27,7 @@
</properties>
<body>
<release version="1.9-SNAPSHOT" date="in CVS">
+ <action dev="felipel" type="add" issue="MPXDOC-118">Added new tag
<code><escapeXml></code>.</action>
<action dev="epugh" type="add" issue="MPXDOC-124" due-to="Shinobu
Kawai">Maven xdoc plugin clean up generated velocity log as part of calling
clean.</action>
<action dev="aheritier" type="add" issue="MPXDOC-123">New property
(maven.xdoc.xml.copy) to copy only and not transform some xml files provided in
the ${maven.docs.src} directory.</action>
<action dev="brett" type="update">Make compatible with Maven
1.1</action>
1.7 +25 -0 maven-plugins/xdoc/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/maven-plugins/xdoc/xdocs/index.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- index.xml 4 Mar 2004 18:39:50 -0000 1.6
+++ index.xml 12 Dec 2004 21:04:27 -0000 1.7
@@ -1,4 +1,7 @@
<?xml version="1.0"?>
+<!DOCTYPE document [
+ <!ENTITY escapeXmlExample SYSTEM "file:xdocs/escapeXml.xml">
+]>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -79,6 +82,28 @@
<code>@import</code>. This allows you to easily add and modify
the styles that are provided by Maven.
</p>
+ <p>
+ If you need to include the contents of another XML document in your
document, you can use the
+ <code><escapeXml></code> tag, as demonstrated below. For
instance, the code:
+ </p>
+ <source>
+<![CDATA[
+<?xml version="1.0"?>
+<!DOCTYPE document [
+ <!ENTITY escapeXmlExample SYSTEM "file:xdocs/escapeXml.xml">
+]>
+<escapeXml>&escapeXmlExample;</escapeXml>
+]]>
+ </source>
+ <p>
+ Would produce the following output (click <a
href="escapeXml.html">here</a> to see the content of
<code>escapeXml.xml</code>):
+ </p>
+ <source>
+
+<escapeXml>&escapeXmlExample;</escapeXml>
+ </source>
+
+
</section>
</body>
</document>
1.1 maven-plugins/xdoc/xdocs/escapeXml.xml
Index: escapeXml.xml
===================================================================
<!--
* ========================================================================
*
* Copyright 2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ========================================================================
-->
<example name="escapeXml">
<text>This is an example of the escapeXml tag usage.</text>
<!-- note that comments are ignored -->
</example>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
