* Alain Javier Guarnieri del Gesu <[EMAIL PROTECTED]> [2003-11-28 23:55]:
> * Alain Javier Guarnieri del Gesu <[EMAIL PROTECTED]> [2003-11-27 21:41]:
> > Dion?
> >
> > I've fixed the problem I was having with Javadoc linking. I create a
> > temporary directory and copy the source fields specified by the
> > includes and excludes. I then run Javadoc on that directory. It
> > works well.
> >
> > Interested? I can JIRA and patch.
>
> Still wondering...
A patch is attached...
--
Alain Javier Guarnieri del Gesu - [EMAIL PROTECTED]
diff -rup old/maven-javadoc-plugin-1.4-SNAPSHOT/plugin.jelly
new/maven-javadoc-plugin-1.4-SNAPSHOT/plugin.jelly
--- old/maven-javadoc-plugin-1.4-SNAPSHOT/plugin.jelly Sun Nov 30 01:38:34 2003
+++ new/maven-javadoc-plugin-1.4-SNAPSHOT/plugin.jelly Sun Nov 30 01:38:33 2003
@@ -87,6 +87,24 @@
<j:set var="maxMemory" value="${maven.javadoc.maxmemory}" />
<ant:mkdir dir="${maven.build.dir}/javadoc/" />
+
+ <ant:mkdir dir="${maven.build.dir}/javadoc/source" />
+ <ant:copy todir="${maven.build.dir}/javadoc/source">
+ <ant:fileset dir="${pom.build.sourceDirectory}">
+ <ant:include name="**/*.java"/>
+ <j:forEach var="sm" items="${pom.build.sourceModifications}">
+ <ant:available property="classPresent" classname="${sm.className}"/>
+ <j:if test="${classPresent != 'true'}">
+ <j:forEach var="exclude" items="${sm.excludes}">
+ <ant:exclude name="${exclude}"/>
+ </j:forEach>
+ <j:forEach var="include" items="${sm.includes}">
+ <ant:include name="${include}"/>
+ </j:forEach>
+ </j:if>
+ </j:forEach>
+ </ant:fileset>
+ </ant:copy>
<ant:record name="${maven.build.dir}/javadoc/report.txt" action="start" />
<ant:javadoc
@@ -103,25 +121,10 @@
bottom="${copyright}"
stylesheetfile="${maven.javadoc.stylesheet}"
additionalparam="${maven.javadoc.additionalparam}"
- useexternalfile="${maven.javadoc.useexternalfile}">
+ useexternalfile="${maven.javadoc.useexternalfile}"
+ sourcepath="${maven.build.dir}/javadoc/source"
+ >
- <ant:fileset dir="${pom.build.sourceDirectory}">
- <ant:include name="**/*.java"/>
- <!-- FIXME: This is a bad cut and paste -->
- <!-- handle source modifications -->
- <j:forEach var="sm" items="${pom.build.sourceModifications}">
- <ant:available property="classPresent" classname="${sm.className}"/>
- <j:if test="${classPresent != 'true'}">
- <j:forEach var="exclude" items="${sm.excludes}">
- <ant:exclude name="${exclude}"/>
- </j:forEach>
- <j:forEach var="include" items="${sm.includes}">
- <ant:include name="${include}"/>
- </j:forEach>
- </j:if>
- </j:forEach>
- </ant:fileset>
-
<j:if test="${context.getVariable('maven.javadoc.source') != null}">
<ant:setProperty name="source" value="${maven.javadoc.source}" />
</j:if>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
