Brian and Vincent, are you advocating removing just the one line that added @aggregator, or the entire change related to MJAVADOC-104?
Carlos, any thoughts on this? -- Wendy On Thu, Feb 28, 2008 at 9:55 PM, Brian E. Fox <[EMAIL PROTECTED]> wrote: > I say pull the aggregation out (MJAVADOC-104) and find another way to > deal with this. It's far too destructive. Thanks Wendy for looking this > up. > > > > -----Original Message----- > From: Wendy Smoak [mailto:[EMAIL PROTECTED] > Sent: Thursday, February 28, 2008 10:32 PM > To: dev@maven.apache.org > Subject: Re: svn commit: r518309 - > /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven > /plugin/javadoc/AbstractJavadocMojo.java > > This change (adding @aggregator) is being pointed to as the cause of > many problems with version 2.3 of the Javadoc plugin. > > See http://jira.codehaus.org/browse/MJAVADOC-137 and related issues. > > Should all or part of this be reverted? > > -- > Wendy > > On Wed, Mar 14, 2007 at 1:28 PM, <[EMAIL PROTECTED]> wrote: > > Author: carlos > > Date: Wed Mar 14 13:28:56 2007 > > New Revision: 518309 > > > > URL: http://svn.apache.org/viewvc?view=rev&rev=518309 > > Log: > > [MJAVADOC-104] Javadoc of generated sources is not generated when > aggregate=true > > Submitted By: Julien Henry > > > > Modified: > > > maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/ > plugin/javadoc/AbstractJavadocMojo.java > > > > Modified: > maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/ > plugin/javadoc/AbstractJavadocMojo.java > > URL: > http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/sr > c/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?vie > > > w=diff&rev=518309&r1=518308&r2=518309 > > > ======================================================================== > ====== > > --- > maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/ > plugin/javadoc/AbstractJavadocMojo.java (original) > > +++ > maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/ > plugin/javadoc/AbstractJavadocMojo.java Wed Mar 14 13:28:56 2007 > > @@ -9,7 +9,7 @@ > > * "License"); you may not use this file except in compliance > > * with the License. You may obtain a copy of the License at > > * > > - * http://www.apache.org/licenses/LICENSE-2.0 > > + * http://www.apache.org/licenses/LICENSE-2.0 > > * > > * Unless required by applicable law or agreed to in writing, > > * software distributed under the License is distributed on an > > @@ -73,6 +73,7 @@ > > * @author <a href="mailto:[EMAIL PROTECTED]">Vincent > Siveton</a> > > * @requiresDependencyResolution compile > > * @execute phase="generate-sources" > > + * @aggregator > > */ > > public abstract class AbstractJavadocMojo > > extends AbstractMojo > > @@ -1338,6 +1339,12 @@ > > MavenProject project = (MavenProject) i.next(); > > > > List sourceRoots = > project.getCompileSourceRoots(); > > + > > + if ( project.getExecutionProject() != null ) > > + { > > + sourceRoots.addAll( > project.getExecutionProject().getCompileSourceRoots() ); > > + } > > + > > ArtifactHandler artifactHandler = > project.getArtifact().getArtifactHandler(); > > if ( "java".equals( artifactHandler.getLanguage() > ) ) > > { > > @@ -1956,7 +1963,7 @@ > > * @param repeatKey repeat or not the key in the command line > > * @param splitValue if <code>true</code> given value will be > tokenized by comma > > */ > > - private void addArgIfNotEmpty( List arguments, String key, > String value, > > + private void addArgIfNotEmpty( List arguments, String key, > String value, > > boolean repeatKey, boolean splitValue ) > > { > > if ( StringUtils.isNotEmpty( value ) ) > > @@ -1971,11 +1978,11 @@ > > while ( token.hasMoreTokens() ) > > { > > String current = token.nextToken().trim(); > > - > > + > > if ( StringUtils.isNotEmpty( current ) ) > > { > > arguments.add( current ); > > - > > + > > if ( token.hasMoreTokens() && repeatKey ) > > { > > arguments.add( key ); > > @@ -1987,7 +1994,7 @@ > > } > > } > > } > > - > > + > > /** > > * Convenience method to add an argument to the <code>command > line</code> > > * if the the value is not null or empty. > > > > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > > --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
