Author: vmassol Date: Sat May 21 07:46:36 2005 New Revision: 171214 URL: http://svn.apache.org/viewcvs?rev=171214&view=rev Log: MPCLOVER-32: Fully disable Clover in <code>clover:off</code> so that the Clover compiler adapter delegates straight to the default compiler.
Added: maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/ maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/maven.xml maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/project.xml maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/ maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/main/ maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/main/org/ maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/main/org/apache/ maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/main/org/apache/maven/ maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/main/org/apache/maven/clover/ maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/main/org/apache/maven/clover/test/ maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/main/org/apache/maven/clover/test/Simple.java (with props) maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/test/ maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/test/org/ maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/test/org/apache/ maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/test/org/apache/maven/ maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/test/org/apache/maven/clover/ maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/test/org/apache/maven/clover/test/ maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/test/org/apache/maven/clover/test/SimpleTest.java (with props) Modified: maven/maven-1/plugins/trunk/clover/plugin.jelly maven/maven-1/plugins/trunk/clover/xdocs/changes.xml Modified: maven/maven-1/plugins/trunk/clover/plugin.jelly URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/clover/plugin.jelly?rev=171214&r1=171213&r2=171214&view=diff ============================================================================== --- maven/maven-1/plugins/trunk/clover/plugin.jelly (original) +++ maven/maven-1/plugins/trunk/clover/plugin.jelly Sat May 21 07:46:36 2005 @@ -214,6 +214,11 @@ --> <goal name="clover:off-internal"> + <!-- Disable Clover --> + <ant:clover-setup + initstring="${maven.clover.database}" + enabled="false"/> + <j:set var="maven.build.dest" value="${mavenBuildDestOld}" scope="parent" /> ${context.removeVariable('build.compiler')} Added: maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/maven.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/maven.xml?rev=171214&view=auto ============================================================================== --- maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/maven.xml (added) +++ maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/maven.xml Sat May 21 07:46:36 2005 @@ -0,0 +1,43 @@ +<!-- +/* + * Copyright 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. + */ + --> +<project default="testPlugin" + xmlns:util="jelly:util" + xmlns:j="jelly:core" + xmlns:ant="jelly:ant" + xmlns:x="jelly:xml" + xmlns:maven="jelly:maven" + xmlns:assert="assert"> + + <goal name="testPlugin"> + + <attainGoal name="clean"/> + <attainGoal name="clover:on"/> + <attainGoal name="jar"/> + <attainGoal name="clover:off"/> + + <ant:delete dir="${maven.build.dest}"/> + <ant:record name="${maven.build.dir}/log.txt" action="start"/> + <attainGoal name="jar"/> + <ant:record name="${maven.build.dir}/log.txt" action="stop"/> + + <assert:assertFileContains file="${maven.build.dir}/log.txt" + match="Clover is disabled. Delegating straight to the compiler"/> + + </goal> + +</project> \ No newline at end of file Added: maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/project.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/project.xml?rev=171214&view=auto ============================================================================== --- maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/project.xml (added) +++ maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/project.xml Sat May 21 07:46:36 2005 @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +/* + * Copyright 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. + */ + --> + +<project> + <extend>${basedir}/../project.xml</extend> + <id>testCloverOffCleansProperly</id> + <name>testCloverOffCleansProperly</name> + <build> + <sourceDirectory>src/main</sourceDirectory> + <unitTestSourceDirectory>src/test</unitTestSourceDirectory> + <unitTest> + <includes> + <include>**/*Test.java</include> + </includes> + </unitTest> + </build> +</project> Added: maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/main/org/apache/maven/clover/test/Simple.java URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/main/org/apache/maven/clover/test/Simple.java?rev=171214&view=auto ============================================================================== --- maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/main/org/apache/maven/clover/test/Simple.java (added) +++ maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/main/org/apache/maven/clover/test/Simple.java Sat May 21 07:46:36 2005 @@ -0,0 +1,25 @@ +package org.apache.maven.clover.test; + +/* ==================================================================== + * 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. + * ==================================================================== + */ + +public class Simple +{ + public void someMethod() + { + } +} \ No newline at end of file Propchange: maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/main/org/apache/maven/clover/test/Simple.java ------------------------------------------------------------------------------ svn:keywords = Id Added: maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/test/org/apache/maven/clover/test/SimpleTest.java URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/test/org/apache/maven/clover/test/SimpleTest.java?rev=171214&view=auto ============================================================================== --- maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/test/org/apache/maven/clover/test/SimpleTest.java (added) +++ maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/test/org/apache/maven/clover/test/SimpleTest.java Sat May 21 07:46:36 2005 @@ -0,0 +1,29 @@ +package org.apache.maven.clover.test; + +/* ==================================================================== + * 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 junit.framework.TestCase; + +public class SimpleTest extends TestCase +{ + public void testSomeMethod() + { + Simple simple = new Simple(); + simple.someMethod(); + } +} \ No newline at end of file Propchange: maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/src/test/org/apache/maven/clover/test/SimpleTest.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: maven/maven-1/plugins/trunk/clover/xdocs/changes.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/clover/xdocs/changes.xml?rev=171214&r1=171213&r2=171214&view=diff ============================================================================== --- maven/maven-1/plugins/trunk/clover/xdocs/changes.xml (original) +++ maven/maven-1/plugins/trunk/clover/xdocs/changes.xml Sat May 21 07:46:36 2005 @@ -26,6 +26,10 @@ </properties> <body> <release version="1.9-SNAPSHOT" date="in SVN"> + <action dev="vmassol" type="fix" issue="MPCLOVER-32"> + Fully disable Clover in <code>clover:off</code> so that the Clover + compiler adapter delegates straight to the default compiler. + </action> <action dev="vmassol" type="remove"> Removed the <code>maven.clover.jar</code> property that was used to override the default Clover jar. This property was not working --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]