You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by vm...@apache.org on 2005/07/30 09:50:25 UTC
svn commit: r226483 - in
/maven/components/trunk/maven-plugins/maven-clover-plugin: ./
src/main/java/org/apache/maven/plugin/clover/
Author: vmassol
Date: Sat Jul 30 00:50:03 2005
New Revision: 226483
URL: http://svn.apache.org/viewcvs?rev=226483&view=rev
Log:
- Upgrade to Clover 1.3.9
- Added CloverLogMojo (clover:log goal) to display the content of the clover database
Added:
maven/components/trunk/maven-plugins/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverLogMojo.java (with props)
Modified:
maven/components/trunk/maven-plugins/maven-clover-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/AbstractCloverMojo.java
maven/components/trunk/maven-plugins/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverCheckMojo.java
Modified: maven/components/trunk/maven-plugins/maven-clover-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-clover-plugin/pom.xml?rev=226483&r1=226482&r2=226483&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-clover-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-clover-plugin/pom.xml Sat Jul 30 00:50:03 2005
@@ -47,7 +47,7 @@
<dependency>
<groupId>clover</groupId>
<artifactId>clover</artifactId>
- <version>1.3.8</version>
+ <version>1.3.9</version>
</dependency>
<dependency>
<groupId>ant</groupId>
Modified: maven/components/trunk/maven-plugins/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/AbstractCloverMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/AbstractCloverMojo.java?rev=226483&r1=226482&r2=226483&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/AbstractCloverMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/AbstractCloverMojo.java Sat Jul 30 00:50:03 2005
@@ -16,6 +16,8 @@
package org.apache.maven.plugin.clover;
import org.apache.maven.plugin.AbstractMojo;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.Taskdef;
public abstract class AbstractCloverMojo extends AbstractMojo
{
@@ -40,4 +42,17 @@
System.setProperty("clover.license.path", licenseToUse);
}
+
+ protected Project registerCloverAntTasks()
+ {
+ Project antProject = new Project();
+ antProject.init();
+
+ Taskdef taskdef = (Taskdef) antProject.createTask( "taskdef" );
+ taskdef.setResource( "clovertasks" );
+ taskdef.execute();
+
+ return antProject;
+ }
+
}
Modified: maven/components/trunk/maven-plugins/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-plugin/src/main/java/org/apache/maven/plugin/clover/CloverCheckMojo.java?rev=226483&r1=226482&r2=226483&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverCheckMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverCheckMojo.java Sat Jul 30 00:50:03 2005
@@ -51,24 +51,7 @@
public void execute()
throws MojoExecutionException
{
- registerLicenseFile();
- checkCoverage();
- }
-
- private void registerCloverAntTasks( Project antProject )
- {
- Taskdef taskdef = (Taskdef) antProject.createTask( "taskdef" );
- taskdef.setResource( "clovertasks" );
- taskdef.execute();
- }
-
- private void checkCoverage()
- throws MojoExecutionException
- {
- Project antProject = new Project();
- antProject.init();
-
- registerCloverAntTasks( antProject );
+ Project antProject = registerCloverAntTasks();
getLog().info( "Checking for coverage of " + targetPercentage + "%" );
@@ -76,13 +59,14 @@
cloverPassTask.setInitString( this.cloverDatabase );
cloverPassTask.setHaltOnFailure( true );
cloverPassTask.setTarget( new Percentage( this.targetPercentage ) );
+ cloverPassTask.setFailureProperty("clovercheckproperty");
try
{
cloverPassTask.execute();
}
catch ( BuildException e )
{
- // TODO: change to a failure, hopefully get a decent Java API out of them so we can get a better exception
+ getLog().error( antProject.getProperty("clovercheckproperty") );
throw new MojoExecutionException( e.getMessage(), e );
}
}
Added: maven/components/trunk/maven-plugins/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverLogMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverLogMojo.java?rev=226483&view=auto
==============================================================================
--- maven/components/trunk/maven-plugins/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverLogMojo.java (added)
+++ maven/components/trunk/maven-plugins/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverLogMojo.java Sat Jul 30 00:50:03 2005
@@ -0,0 +1,57 @@
+package org.apache.maven.plugin.clover;
+
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * 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 "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.cenqua.clover.cfg.Percentage;
+import com.cenqua.clover.tasks.CloverPassTask;
+import com.cenqua.clover.tasks.CloverLogTask;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.Taskdef;
+import com_cenqua_clover.CloverVersionInfo;
+
+/**
+ * Provides information on the current Clover database.
+ *
+ * @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
+ * @version $Id$
+ * @goal log
+ *
+ */
+public class CloverLogMojo
+ extends AbstractCloverMojo
+{
+ /**
+ * @parameter expression="${project.build.directory}/clover/clover.db"
+ * @required
+ */
+ protected String cloverDatabase;
+
+ public void execute()
+ throws MojoExecutionException
+ {
+ Project antProject = registerCloverAntTasks();
+
+ CloverLogTask cloverLogTask = (CloverLogTask) antProject.createTask( "clover-log" );
+ cloverLogTask.setInitString( this.cloverDatabase );
+ cloverLogTask.setOutputProperty( "cloverlogproperty" );
+ cloverLogTask.execute();
+
+ getLog().info( antProject.getProperty( "cloverlogproperty" ) );
+ }
+}
Propchange: maven/components/trunk/maven-plugins/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverLogMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-plugins/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverLogMojo.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org