dion 2003/08/22 01:43:58
Modified: src/plugins-build/javadoc plugin.jelly
src/plugins-build/javadoc/xdocs properties.xml
Log:
Again with MAVEN-694.
The patch didn't apply successfully and I've done it manually again.
Please check....
Revision Changes Path
1.19 +8 -8 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plugin.jelly 22 Aug 2003 01:34:09 -0000 1.18
+++ plugin.jelly 22 Aug 2003 08:43:57 -0000 1.19
@@ -65,8 +65,14 @@
<ant:property name="title" value="${pom.name} ${pom.currentVersion} API"/>
+ <!-- calculate online/offline mode -->
+ <j:set var="online" value="${maven.javadoc.mode.online}"/>
+ <j:if test="${empty(online)}">
+ <j:set var="online" value="${maven.mode.online}"/>
+ </j:if>
+
<j:choose>
- <j:when test="${maven.mode.online}">
+ <j:when test="${online}">
<util:tokenize var="links" delim=","
trim="true">${maven.javadoc.links}</util:tokenize>
<j:forEach var="link" items="${links}">
<ant:echo>Linking with API information from ${link.trim()}
...</ant:echo>
@@ -80,12 +86,6 @@
</j:otherwise>
</j:choose>
- <util:tokenize var="links" delim=","
trim="true">${maven.javadoc.links}</util:tokenize>
-
- <j:forEach var="link" items="${links}">
- <ant:echo>Linking with API information from ${link.trim()} ...</ant:echo>
- </j:forEach>
-
<j:set var="maxMemory" value="${maven.javadoc.maxmemory}" />
<ant:mkdir dir="${maven.build.dir}/javadoc/" />
@@ -147,7 +147,7 @@
<!-- generate the link -->
<j:choose>
- <j:when test="${maven.mode.online}" />
+ <j:when test="${online}" />
<ant:link href="${href}" offline="false"
packagelistLoc="${packagelistLoc}" />
<j:otherwise />
<ant:link href="${href}" offline="true"
packagelistLoc="${packagelistLoc}" />
1.5 +28 -7 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- properties.xml 22 Aug 2003 01:34:09 -0000 1.4
+++ properties.xml 22 Aug 2003 08:43:57 -0000 1.5
@@ -64,8 +64,9 @@
<td>
<p>
Comma separated list of URLs to create links to javadoc output of
- other packages in online mode (maven.online.mode=true), works like
- the "-link" option of the javadoc command.
+ other packages in online mode (see properties maven.online.mode and
+ <a href="#maven.javadoc.mode.online">maven.javadoc.mode.online</a>).
+ Works like the "-link" option of the javadoc command.
</p>
<p>
The URLs must link to a directory where the javadoc generated file
@@ -78,15 +79,35 @@
</td>
</tr>
<tr>
+ <td><a name="maven.javadoc.mode.online">maven.javadoc.mode.online</a></td>
+ <td>Yes</td>
+ <td>
+ <p>
+ Default value is <code>${maven.mode.online}</code>.
+ </p>
+ <p>
+ If set, a value of <code>true</code> forces generation of javadoc in
+ online mode (using <code>${maven.javadoc.links}</code>).
+ </p>
+ <p>
+ Any other value means <code>false</code> and forces generation of
javadoc
+ in offline mode (using <code>${maven.javadoc.offlineLinks}</code>).
+ </p>
+ <p>
+ This tag allows you to generate javadoc in mode different from the
+ "general" online/offline mode <code>${maven.mode.online}</code>.
+ </p>
+ </td>
+ </tr>
+ <tr>
<td>maven.javadoc.offlineLinks</td>
<td>Yes</td>
<td>
<p>
- Comma seperated list of URLs to create links to javadoc output of
- other packages in offline mode (maven.online.mode=false), works like
- the "-linkoffline" option of the javadoc command.
- Comma seperated list of URLs to create links to javadoc output of
- other packages, works like the "-link" option of the javadoc command.
+ Comma separated list of URLs to create links to javadoc output of
+ other packages in offline mode (see properties maven.online.mode and
+ <a href="#maven.javadoc.mode.online">maven.javadoc.mode.online</a>).
+ Works like the "-linkoffline" option of the javadoc command.
</p>
<p>
The URLs must link to a directory where the javadoc generated file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
