Author: vsiveton
Date: Wed Feb 25 11:42:53 2009
New Revision: 747757
URL: http://svn.apache.org/viewvc?rev=747757&view=rev
Log:
o make executeClirr() private
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java?rev=747757&r1=747756&r2=747757&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
Wed Feb 25 11:42:53 2009
@@ -365,9 +365,9 @@
{
if ( getLog().isInfoEnabled() )
{
- getLog().info( "NOT fix classes, fields and methods specified.
Nothing to do." );
- return;
+ getLog().info( "Specified to NOT fix classes, fields and
methods. Nothing to do." );
}
+ return;
}
// add warranty msg
@@ -481,64 +481,6 @@
return new URLClassLoader( (URL[]) urls.toArray( new URL[urls.size()]
), null );
}
- /**
- * Calling Clirr to find API differences via clirr-maven-plugin.
- *
- * @throws MojoExecutionException if any
- */
- protected void executeClirr()
- throws MojoExecutionException
- {
- if ( ignoreClirr )
- {
- if ( getLog().isInfoEnabled() )
- {
- getLog().info( "Clirr is ignored." );
- }
- return;
- }
-
- ClirrMojoWrapper wrapper = null;
- try
- {
- wrapper =
- new ClirrMojoWrapper( getClassesDirectory(),
comparisonVersion, getArtifactType( project ),
- artifactFactory, localRepository,
mavenProjectBuilder,
- artifactMetadataSource, project,
artifactResolver, includes, excludes );
-
- wrapper.execute();
- }
- catch ( Exception e )
- {
- if ( getLog().isDebugEnabled() )
- {
- getLog().error( "Error when executing Clirr: " +
e.getMessage(), e );
- }
- else
- {
- getLog().error( "Error when executing Clirr: " +
e.getMessage() );
- }
- getLog().error( "Clirr is ignored" );
- return;
- }
-
- clirrNewClasses = wrapper.getNewClasses();
- clirrNewMethods = wrapper.getNewMethods();
-
- if ( getLog().isInfoEnabled() )
- {
- if ( clirrNewClasses.isEmpty() && clirrNewMethods.isEmpty() )
- {
- getLog().info( "Clirr NOT found API differences." );
- }
- else
- {
- getLog().info( "Clirr found API differences, i.e. new classes
or new methods." );
- writeClirr();
- }
- }
- }
-
// ----------------------------------------------------------------------
// private methods
// ----------------------------------------------------------------------
@@ -689,6 +631,64 @@
}
/**
+ * Calling Clirr to find API differences via clirr-maven-plugin.
+ *
+ * @throws MojoExecutionException if any
+ */
+ private void executeClirr()
+ throws MojoExecutionException
+ {
+ if ( ignoreClirr )
+ {
+ if ( getLog().isInfoEnabled() )
+ {
+ getLog().info( "Clirr is ignored." );
+ }
+ return;
+ }
+
+ ClirrMojoWrapper wrapper = null;
+ try
+ {
+ wrapper =
+ new ClirrMojoWrapper( getClassesDirectory(),
comparisonVersion, getArtifactType( project ),
+ artifactFactory, localRepository,
mavenProjectBuilder,
+ artifactMetadataSource, project,
artifactResolver, includes, excludes );
+
+ wrapper.execute();
+ }
+ catch ( Exception e )
+ {
+ if ( getLog().isDebugEnabled() )
+ {
+ getLog().error( "Error when executing Clirr: " +
e.getMessage(), e );
+ }
+ else
+ {
+ getLog().error( "Error when executing Clirr: " +
e.getMessage() );
+ }
+ getLog().error( "Clirr is ignored" );
+ return;
+ }
+
+ clirrNewClasses = wrapper.getNewClasses();
+ clirrNewMethods = wrapper.getNewMethods();
+
+ if ( getLog().isInfoEnabled() )
+ {
+ if ( clirrNewClasses.isEmpty() && clirrNewMethods.isEmpty() )
+ {
+ getLog().info( "Clirr NOT found API differences." );
+ }
+ else
+ {
+ getLog().info( "Clirr found API differences, i.e. new classes
or new methods." );
+ writeClirr();
+ }
+ }
+ }
+
+ /**
* In debug mode, write {...@link #clirrNewClasses} and {...@link
#clirrNewMethods} in the file
* <code>project.getBuild().getDirectory()/clirr.diff</code>
*/
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java?rev=747757&r1=747756&r2=747757&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java
Wed Feb 25 11:42:53 2009
@@ -84,13 +84,12 @@
return "test-jar";
}
- /** {...@inheritdoc} */
- protected void executeClirr()
- throws MojoExecutionException
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
{
// clirr doesn't analyze test code, so ignore it
ignoreClirr = true;
- return;
+ super.execute();
}
}
