aheritier 2004/07/07 14:55:27
Modified: javadoc plugin.jelly
javadoc/xdocs changes.xml properties.xml
Log:
PR: MPJAVADOC-31
Submitted by: Takayoshi Kimura
Reviewed by: Arnaud Heritier
Encoding used when reading sources
Revision Changes Path
1.48 +10 -1 maven-plugins/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/plugin.jelly,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- plugin.jelly 7 Jul 2004 21:21:45 -0000 1.47
+++ plugin.jelly 7 Jul 2004 21:55:27 -0000 1.48
@@ -33,6 +33,7 @@
<!-- ================================================================== -->
<goal name="javadoc:init" prereqs="xdoc:init">
+
<!-- internal variables -->
<j:set var="internal.javadoc.jar"
value="${maven.build.dir}/${maven.final.name}_javadoc.jar"/>
<j:set var="internal.javadoc.needed" value="null"/>
@@ -43,6 +44,10 @@
<ant:echo>
### Debug mode is on ###
==================================
+=== java plugin properties ===
+==================================
+maven.compile.encoding = [${maven.compile.encoding}]
+==================================
=== javadoc plugin properties ===
==================================
maven.javadoc.additionalparam = [${maven.javadoc.additionalparam}]
@@ -245,7 +250,11 @@
<j:if test="${context.getVariable('maven.javadoc.source') != null}">
<ant:setProperty name="source" value="${maven.javadoc.source}" />
</j:if>
-
+
+ <j:if test="${context.getVariable('maven.compile.encoding') != null}">
+ <ant:setProperty name="encoding" value="${maven.compile.encoding}" />
+ </j:if>
+
<!-- Process/Parse links -->
<!-- This code allows to specify a packagelistLoc even when in online mode
-->
<j:forEach var="link" items="${links}">
1.35 +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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- changes.xml 7 Jul 2004 21:21:45 -0000 1.34
+++ changes.xml 7 Jul 2004 21:55:27 -0000 1.35
@@ -24,6 +24,7 @@
</properties>
<body>
<release version="1.5.1-SNAPSHOT" date="In CVS">
+ <action dev="aheritier" type="fix" issue="MPJAVADOC-31" due-to="Takayoshi
Kimura">Use the property 'maven.compile.encoding' to set the encoding used when
reading sources in javadoc task.</action>
<action dev="aheritier" type="fix" issue="MPJAVADOC-29">Packages list broken
on jdk 1.3 for multiple packages.</action>
<action dev="aheritier" type="fix" issue="MPJAVADOC-28">@link tag not working
with package names.</action>
<action dev="aheritier" type="add">Add the property maven.javadoc.debug to
print informations to debug the plugin.</action>
1.17 +16 -0 maven-plugins/javadoc/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/xdocs/properties.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- properties.xml 7 Jul 2004 21:21:45 -0000 1.16
+++ properties.xml 7 Jul 2004 21:55:27 -0000 1.17
@@ -306,5 +306,21 @@
</tr>
</table>
</section>
+ <section name="Other Settings">
+ <table>
+ <tr>
+ <th>Property</th>
+ <th>Optional?</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td>maven.compile.encoding</td>
+ <td>Yes</td>
+ <td>
+ Sets the encoding of the .java files being documented (and compiled).
+ </td>
+ </tr>
+ </table>
+ </section>
</body>
</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
