You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/09/13 10:29:01 UTC
svn commit: r1170082 - in /maven/plugins/trunk/maven-javadoc-plugin/src:
it/additionnal-dependencies-non-aggregate/pom.xml
it/additionnal-dependencies/pom.xml
main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Author: hboutemy
Date: Tue Sep 13 08:29:01 2011
New Revision: 1170082
URL: http://svn.apache.org/viewvc?rev=1170082&view=rev
Log:
[MJAVADOC-326] add a path separator before docletPath
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies-non-aggregate/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies-non-aggregate/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies-non-aggregate/pom.xml?rev=1170082&r1=1170081&r2=1170082&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies-non-aggregate/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies-non-aggregate/pom.xml Tue Sep 13 08:29:01 2011
@@ -97,6 +97,7 @@
<version>1.0.3</version>
</docletArtifact>
<doclet>com.google.doclava.Doclava</doclet>
+ <docletPath>/</docletPath>
<!--
| bootclasspath required by Sun's JVM
-->
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies/pom.xml?rev=1170082&r1=1170081&r2=1170082&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/additionnal-dependencies/pom.xml Tue Sep 13 08:29:01 2011
@@ -99,6 +99,7 @@
<version>1.0.3</version>
</docletArtifact>
<doclet>com.google.doclava.Doclava</doclet>
+ <docletPath>/</docletPath>
<!--
| bootclasspath required by Sun's JVM
-->
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/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=1170082&r1=1170081&r2=1170082&view=diff
==============================================================================
--- 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 Tue Sep 13 08:29:01 2011
@@ -2799,15 +2799,14 @@ public abstract class AbstractJavadocMoj
}
}
- StringBuffer path = new StringBuffer();
- path.append( StringUtils.join( pathParts.iterator(), File.pathSeparator ) );
-
if ( !StringUtils.isEmpty( docletPath ) )
{
- path.append( JavadocUtil.unifyPathSeparator( docletPath ) );
+ pathParts.add( JavadocUtil.unifyPathSeparator( docletPath ) );
}
- if ( StringUtils.isEmpty( path.toString() ) && getLog().isWarnEnabled() )
+ String path = StringUtils.join( pathParts.iterator(), File.pathSeparator );
+
+ if ( StringUtils.isEmpty( path ) && getLog().isWarnEnabled() )
{
getLog().warn( "No docletpath option was found. Please review <docletpath/> or <docletArtifact/>"
+ " or <doclets/>." );