Update of /cvsroot/xdoclet-plugins/xdoclet-plugins/maven-xdoclet2-plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15933
Modified Files:
plugin.jelly
Log Message:
(XDP-76) Fixed bug with incorrect encoding handling in maven plugin
Index: plugin.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/maven-xdoclet2-plugin/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** plugin.jelly 22 Apr 2005 08:52:33 -0000 1.3
--- plugin.jelly 4 Jul 2005 12:31:07 -0000 1.4
***************
*** 84,91 ****
<j:set var="component_class"
value="${context.getVariable(varname)}"/>
<j:set var="varname"
value="maven.xdoclet.${xdoclet_index}.${component_index}."/>
! <ant:component
classname="${component_class}" encoding="utf-8">
! <j:if
test="${maven.compile.encoding} != null}">
! <ant:setProperty
name="encoding" value="${maven.compile.encoding}"/>
! </j:if>
<j:forEach var="prop"
items="${pom.getContext().getVariables().entrySet()}">
<j:if
test="${prop.getKey().startsWith(varname)}">
--- 84,89 ----
<j:set var="component_class"
value="${context.getVariable(varname)}"/>
<j:set var="varname"
value="maven.xdoclet.${xdoclet_index}.${component_index}."/>
! <j:set var="encoding"
value="${maven.compile.encoding}" defaultValue="utf-8"/>
! <ant:component
classname="${component_class}" encoding="${encoding}">
<j:forEach var="prop"
items="${pom.getContext().getVariables().entrySet()}">
<j:if
test="${prop.getKey().startsWith(varname)}">
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits
