PR: MPJAVADOC-31

Submitted by:	Takayoshi Kimura
Reviewed by:	Arnaud Heritier
Encoding used when reading sources


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115685 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
aheritier
2004-07-07 21:55:27 +00:00
parent 5b2162e21e
commit fa85504ba7
3 changed files with 27 additions and 1 deletions

View File

@@ -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 @@ internal.javadoc.working.dir = [${internal.javadoc.working.dir}]
<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}">

View File

@@ -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>

View File

@@ -306,5 +306,21 @@ maven.javadoc.offlineLinks=http://java.sun.com/j2se/1.4.2/docs/api/#/opt/java-ap
</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>