aheritier 2004/09/24 15:52:08
Modified: javadoc plugin.jelly
javadoc/xdocs changes.xml properties.xml
Log:
Fix MPJAVADOC-45 : Output encoding and charset are setted to
${maven.docs.outputencoding}
Revision Changes Path
1.63 +5 -0 maven-plugins/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/plugin.jelly,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- plugin.jelly 24 Sep 2004 21:37:36 -0000 1.62
+++ plugin.jelly 24 Sep 2004 22:52:08 -0000 1.63
@@ -444,6 +444,11 @@
<ant:setProperty name="stylesheetfile"
value="${maven.javadoc.stylesheet}" />
</j:if>
+ <j:if test="${context.getVariable('maven.docs.outputencoding') != null}">
+ <ant:setProperty name="docencoding"
value="${maven.docs.outputencoding}" />
+ <ant:setProperty name="charset" value="${maven.docs.outputencoding}" />
+ </j:if>
+
<!-- allow custom tags -->
<util:tokenize var="listOfTags" delim="
">${maven.javadoc.customtags}</util:tokenize>
<j:forEach var="someTag" items="${listOfTags}">
1.53 +1 -0 maven-plugins/javadoc/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/xdocs/changes.xml,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- changes.xml 24 Sep 2004 21:37:36 -0000 1.52
+++ changes.xml 24 Sep 2004 22:52:08 -0000 1.53
@@ -26,6 +26,7 @@
<body>
<release version="1.7-SNAPSHOT" date="In CVS">
<action dev="aheritier" type="fix" issue="MPJAVADOC-46">Standard doclet
parameters were passed to javadoc even if another doclet is used.</action>
+ <action dev="aheritier" type="add" issue="MPJAVADOC-45">Output encoding and
charset are setted to ${maven.docs.outputencoding}</action>
<action dev="aheritier" type="fix" issue="MPJAVADOC-44">Cannot build the
plugin with jdk 1.3</action>
<action dev="aheritier" type="fix" issue="MPJAVADOC-43">Javadoc plugin causes
site to fail </action>
<action dev="felipeal" type="fix" issue="MPJAVADOC-42">Javadoc warning
report was throwing exception when used with <code>Java 1.3</code>.</action>
1.22 +8 -0 maven-plugins/javadoc/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/xdocs/properties.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- properties.xml 21 Aug 2004 14:37:41 -0000 1.21
+++ properties.xml 24 Sep 2004 22:52:08 -0000 1.22
@@ -340,6 +340,14 @@
</td>
</tr>
<tr>
+ <td>Property</td>
+ <td>maven.docs.outputencoding</td>
+ <td>Yes</td>
+ <td>
+ The character encoding for generated documentation.
+ </td>
+ </tr>
+ <tr>
<td>Project descriptor</td>
<td>pom.package</td>
<td>Yes</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
