Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Again with MAVEN-694.

Browse Source 
The patch didn't apply successfully and I've done it manually again.

Please check....


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113870 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
dion 2003-08-22 08:43:57 +00:00
parent d8829f536d
commit 04620f87c9
2 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
javadoc/plugin.jelly
View File

@ -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}" />

35
javadoc/xdocs/properties.xml
View File

@ -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
@ -77,16 +78,36 @@ maven.javadoc.links=http://java.sun.com/j2se/1.4.2/docs/api/, http://maven.apach
</source>
</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