You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2006/09/05 00:03:53 UTC
svn commit: r440194 - in
/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc:
AbstractJavadocMojo.java JavadocReport.java
Author: vsiveton
Date: Mon Sep 4 15:03:52 2006
New Revision: 440194
URL: http://svn.apache.org/viewvc?view=rev&rev=440194
Log:
o Prevent a null in the reportOutputDirectory path for mvn javadoc:javadoc
o Improved the display for Javadoc Warnings
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.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/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?view=diff&rev=440194&r1=440193&r2=440194
==============================================================================
--- 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 Mon Sep 4 15:03:52 2006
@@ -886,8 +886,15 @@
// Javadoc warnings
if ( StringUtils.isNotEmpty( err.getOutput() ) )
{
- getLog().warn( "Javadoc Warnings" );
- getLog().warn( err.getOutput() );
+ getLog().info( "Javadoc Warnings" );
+
+ StringTokenizer token = new StringTokenizer( err.getOutput(), "\n" );
+ while ( token.hasMoreTokens() )
+ {
+ String current = token.nextToken().trim();
+
+ getLog().warn( current );
+ }
}
}
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java?view=diff&rev=440194&r1=440193&r2=440194
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java Mon Sep 4 15:03:52 2006
@@ -60,7 +60,7 @@
/**
* Specifies the destination directory where javadoc saves the generated HTML files.
*
- * @parameter expression="${project.reporting.outputDirectory}/${destDir}"
+ * @parameter expression="${project.reporting.outputDirectory}/apidocs"
* @required
*/
private File reportOutputDirectory;