brett 2004/04/20 18:05:47
Modified: xdoc plugin.jelly
xdoc/xdocs changes.xml
Log:
PR: MPXDOC-95
Submitted by: fabrizio giustina
Reviewed by: Brett Porter
fix doc:jslToSite
Revision Changes Path
1.57 +13 -3 maven-plugins/xdoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/xdoc/plugin.jelly,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- plugin.jelly 18 Mar 2004 10:08:54 -0000 1.56
+++ plugin.jelly 21 Apr 2004 01:05:47 -0000 1.57
@@ -361,6 +361,9 @@
<maven:pluginVar var="maven.xdoc.jsl"
plugin='maven-xdoc-plugin' property='maven.xdoc.jsl' />
+ <!-- copy old value for restoring it later -->
+ <j:set var="previous.plugin.resources" value="${plugin.resources}" />
+
<maven:pluginVar var="plugin.resources"
plugin='maven-xdoc-plugin' property='plugin.resources' />
@@ -386,15 +389,22 @@
<doc:performJSL srcdir="${srcdir}" destdir="${maven.docs.dest}" />
+ <!-- restore plugin.resources -->
+ <j:set var="plugin.resources" value="${previous.plugin.resources}" />
+
</define:tag>
<!--
| escapes a string for generating a valid name token (need for "name"
attribute in html anchors)
| @value given token
-->
- <!-- fixme: is there any better way to replace multiple chars using jelly (and
maybe with a working trim)? -->
- <define:tag name="escapeNameToken"><util:replace var="escapedToken" oldChar=" "
newChar="_" value="${value}"/><util:replace var="escapedToken" oldChar="." newChar="_"
value="${escapedToken}"/><util:replace var="escapedToken" oldChar="," newChar="_"
value="${escapedToken}"/><util:replace var="escapedToken" oldChar="!" newChar="_"
value="${escapedToken}"/><util:replace var="escapedToken" oldChar="?" newChar="_"
value="${escapedToken}"/><util:replace var="escapedToken" oldChar="/" newChar="_"
value="${escapedToken}"/><util:replace var="escapedToken" oldChar="(" newChar="_"
value="${escapedToken}"/><util:replace var="escapedToken" oldChar=")" newChar="_"
value="${escapedToken}"/>${escapedToken}</define:tag>
-
+ <define:tag name="escapeNameToken">
+ <j:invokeStatic var="escapedtoken"
className="org.apache.commons.lang.StringUtils" method="replaceChars">
+ <j:arg type="java.lang.String" value="${value}"
useContextClassLoader="true"/>
+ <j:arg type="java.lang.String" value=" .,;!?/'\()[]{}+*°"
useContextClassLoader="true"/>
+ <j:arg type="java.lang.String" value="__________________"
useContextClassLoader="true"/>
+ </j:invokeStatic>${escapedtoken}</define:tag>
+
</define:taglib>
<!-- ================================================================== -->
1.40 +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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- changes.xml 12 Apr 2004 22:54:54 -0000 1.39
+++ changes.xml 21 Apr 2004 01:05:47 -0000 1.40
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.7-SNAPSHOT" date="in CVS">
+ <action dev="brett" type="fix" issue="MPXDOC-95" due-to="fabrizio
giustina">jslToSite fix, escapeNameTokens improvement</action>
<action dev="brett" type="fix" issue="MPXDOC-63">make anchor tags not wrap
text, but sit in front of it</action>
<action dev="brett" type="fix" due-to="Chad McHenry" issue="MPXDOC-78">indent
nested menus in navigation</action>
<action dev="brett" type="fix">remove changes-report.xml which was generating
over the top of the actual report. This information already exists in the changes
plugin documentation.</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
