dion 2003/10/08 09:22:00
Modified: src/plugins-build/javadoc plugin.jelly project.xml
src/plugins-build/javadoc/xdocs properties.xml changes.xml
Log:
Apply MAVEN-894
Revision Changes Path
1.24 +7 -0 maven/src/plugins-build/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/javadoc/plugin.jelly,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- plugin.jelly 21 Sep 2003 06:43:20 -0000 1.23
+++ plugin.jelly 8 Oct 2003 16:22:00 -0000 1.24
@@ -193,6 +193,13 @@
enabled="${enabled}" scope="${scope}"/>
</j:forEach>
+ <!-- allow taglets -->
+ <util:tokenize var="listOfTaglets" delim=","
trim="true">${maven.javadoc.taglets}</util:tokenize>
+ <j:set var="tagletPath"
value="${context.getVariable('maven.javadoc.tagletpath')}" />
+ <j:forEach var="someTaglet" items="${listOfTaglets}">
+ <ant:taglet name="${someTaglet}" path="${tagletPath}" />
+ </j:forEach>
+
</ant:javadoc>
<ant:record name="${maven.build.dir}/javadoc/report.txt" action="stop" />
1.20 +1 -1 maven/src/plugins-build/javadoc/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/javadoc/project.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- project.xml 29 Sep 2003 05:19:12 -0000 1.19
+++ project.xml 8 Oct 2003 16:22:00 -0000 1.20
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-javadoc-plugin</id>
<name>Maven Javadoc Plug-in</name>
- <currentVersion>1.3</currentVersion>
+ <currentVersion>1.4-SNAPSHOT</currentVersion>
<description/>
<shortDescription>Produce Javadocs and report</shortDescription>
<url>http://maven.apache.org/reference/plugins/javadoc/</url>
1.10 +22 -0 maven/src/plugins-build/javadoc/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/javadoc/xdocs/properties.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- properties.xml 21 Sep 2003 06:43:20 -0000 1.9
+++ properties.xml 8 Oct 2003 16:22:00 -0000 1.10
@@ -165,6 +165,28 @@
</td>
</tr>
<tr>
+ <td>maven.javadoc.taglets</td>
+ <td>Yes</td>
+ <td>
+ Comma separated list of taglet classes to use when calling javadoc
+ (use fully-qualified class names).
+ You must also set <a href="#maven.javadoc.tagletpath">
+ maven.javadoc.tagletpath</a>.
+ See <a href="http://ant.apache.org/manual/CoreTasks/javadoc.html";>the
+ ant javadoc task</a> documentation for more detail.
+ </td>
+ </tr>
+ <tr>
+ <td><a name="maven.javadoc.tagletpath">maven.javadoc.tagletpath</a></td>
+ <td>Yes</td>
+ <td>
+ Specifies the path to the taglet classes when calling javadoc
+ with taglets. See
+ <a href="http://ant.apache.org/manual/CoreTasks/javadoc.html";>the
+ ant javadoc task</a> documentation for more detail.
+ </td>
+ </tr>
+ <tr>
<td>maven.javadoc.use</td>
<td>Yes</td>
<td>
1.11 +7 -0 maven/src/plugins-build/javadoc/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/javadoc/xdocs/changes.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- changes.xml 29 Sep 2003 06:18:41 -0000 1.10
+++ changes.xml 8 Oct 2003 16:22:00 -0000 1.11
@@ -7,6 +7,13 @@
</properties>
<body>
+
+ <release version="1.4" date="in CVS">
+ <action dev="dion" type="add">
+ Applied MAVEN-894. Allow custom taglets.
+ </action>
+ </release>
+
<release version="1.3" date="2003-09-29">
<action dev="evenisse" type="add">
MAVEN-639. Add maven.javadoc.overview property.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
