You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/07/20 11:33:39 UTC
svn commit: r219868 - in
/maven/components/trunk/maven-plugins/maven-clover/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover:
CloverCheckMojo.java CloverReportMojo.java
Author: brett
Date: Wed Jul 20 02:33:38 2005
New Revision: 219868
URL: http://svn.apache.org/viewcvs?rev=219868&view=rev
Log:
some tidying up
Modified:
maven/components/trunk/maven-plugins/maven-clover/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverCheckMojo.java
maven/components/trunk/maven-plugins/maven-clover/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverReportMojo.java
Modified: maven/components/trunk/maven-plugins/maven-clover/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverCheckMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-clover/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverCheckMojo.java?rev=219868&r1=219867&r2=219868&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-clover/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverCheckMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-clover/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverCheckMojo.java Wed Jul 20 02:33:38 2005
@@ -19,8 +19,8 @@
import com.cenqua.clover.cfg.Percentage;
import com.cenqua.clover.tasks.CloverPassTask;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Taskdef;
/**
@@ -43,7 +43,7 @@
protected String cloverDatabase;
/**
- * @parameter expression="70"
+ * @parameter default-value="70"
* @required
*/
protected float targetPercentage;
@@ -69,6 +69,8 @@
antProject.init();
registerCloverAntTasks( antProject );
+
+ getLog().info( "Checking for coverage of " + targetPercentage + "%" );
CloverPassTask cloverPassTask = (CloverPassTask) antProject.createTask( "clover-check" );
cloverPassTask.setInitString( this.cloverDatabase );
Modified: maven/components/trunk/maven-plugins/maven-clover/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverReportMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-clover/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverReportMojo.java?rev=219868&r1=219867&r2=219868&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-clover/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverReportMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-clover/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverReportMojo.java Wed Jul 20 02:33:38 2005
@@ -1,5 +1,7 @@
+package org.apache.maven.plugin.clover;
+
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,36 +15,35 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.maven.plugin.clover;
+import com.cenqua.clover.reporters.html.HtmlReporter;
+import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
-import org.apache.maven.project.MavenProject;
import org.codehaus.doxia.site.renderer.SiteRenderer;
import java.util.Locale;
import java.util.ResourceBundle;
-import com.cenqua.clover.reporters.html.HtmlReporter;
-
/**
- * @goal report
- * @execute phase="test" lifecycle="clover"
- * @description Generate a Clover report
- *
+ * Generate a Clover report.
+ *
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
* @version $Id$
+ * @goal report
+ * @execute phase="test" lifecycle="clover"
*/
-public class CloverReportMojo extends AbstractMavenReport
+public class CloverReportMojo
+ extends AbstractMavenReport
{
/**
- * @parameter
+ * @parameter expression="${project.build.directory}/clover/clover.db"
* @required
*/
private String cloverDatabase;
/**
- * @parameter expression="${project.build.directory}/site"
+ * @parameter expression="${project.build.directory}/site/clover"
* @required
*/
private String outputDirectory;
@@ -67,10 +68,10 @@
public void executeReport( Locale locale )
throws MavenReportException
{
- int result = HtmlReporter.mainImpl(createCliArgs());
- if (result != 0)
+ int result = HtmlReporter.mainImpl( createCliArgs() );
+ if ( result != 0 )
{
- throw new MavenReportException("Clover has failed to instrument the source files");
+ throw new MavenReportException( "Clover has failed to instrument the source files" );
}
}
@@ -80,14 +81,8 @@
*/
private String[] createCliArgs()
{
- String [] cliArgs = {
-
- "-t", "Maven Clover report",
- "-p", (String) this.project.getCompileSourceRoots().get(0),
- "-i", this.cloverDatabase,
- "-o", this.outputDirectory };
-
- return cliArgs;
+ return new String[]{"-t", "Maven Clover report", "-p", (String) this.project.getCompileSourceRoots().get( 0 ),
+ "-i", this.cloverDatabase, "-o", this.outputDirectory};
}
public String getOutputName()
@@ -105,7 +100,7 @@
private static ResourceBundle getBundle( Locale locale )
{
- return ResourceBundle.getBundle("clover-report", locale, CloverReportMojo.class.getClassLoader() );
+ return ResourceBundle.getBundle( "clover-report", locale, CloverReportMojo.class.getClassLoader() );
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org