Author: vmassol
Date: Sun Mar 25 02:24:07 2007
New Revision: 522185
URL: http://svn.apache.org/viewvc?view=rev&rev=522185
Log:
MCLOVER-68: XDoclet plugin executes before the Clover plugin in the lifecycle
forked by the latter
* Added integration test
Updated old license used in the license integration test module
Added:
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/ (with props)
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/goals.txt
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/pom.xml
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/main/
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/main/java/
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/main/java/org/
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/main/java/org/apache/
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/main/java/org/apache/maven/
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/main/java/org/apache/maven/plugin/
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/main/java/org/apache/maven/plugin/clover/
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/main/java/org/apache/maven/plugin/clover/samples/
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/main/java/org/apache/maven/plugin/clover/samples/xdoclet/
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/main/java/org/apache/maven/plugin/clover/samples/xdoclet/Simple.java
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/test/
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/test/java/
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/test/java/org/
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/test/java/org/apache/
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/test/java/org/apache/maven/
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/test/java/org/apache/maven/plugin/
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/test/java/org/apache/maven/plugin/clover/
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/test/java/org/apache/maven/plugin/clover/samples/
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/test/java/org/apache/maven/plugin/clover/samples/xdoclet/
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/test/java/org/apache/maven/plugin/clover/samples/xdoclet/SimpleTest.java
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/test/verifier/
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/test/verifier/verifications.xml
Modified:
maven/plugins/trunk/maven-clover-plugin/pom.xml
maven/plugins/trunk/maven-clover-plugin/src/it/license/ (props changed)
maven/plugins/trunk/maven-clover-plugin/src/it/license/build-tools/
(props changed)
maven/plugins/trunk/maven-clover-plugin/src/it/license/build-tools/src/main/resources/myclover.license
Modified: maven/plugins/trunk/maven-clover-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clover-plugin/pom.xml?view=diff&rev=522185&r1=522184&r2=522185
==============================================================================
--- maven/plugins/trunk/maven-clover-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-clover-plugin/pom.xml Sun Mar 25 02:24:07 2007
@@ -184,6 +184,8 @@
<pomInclude>**/simple/pom.xml</pomInclude>
<pomInclude>**/multiproject/pom.xml</pomInclude>
<pomInclude>**/license/pom.xml</pomInclude>
+ <pomInclude>**/license/pom.xml</pomInclude>
+ <pomInclude>**/xdoclet/pom.xml</pomInclude>
</pomIncludes>
<postBuildHookScript>verify.bsh</postBuildHookScript>
</configuration>
Propchange: maven/plugins/trunk/maven-clover-plugin/src/it/license/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Mar 25 02:24:07 2007
@@ -0,0 +1,2 @@
+target
+build.log
Propchange: maven/plugins/trunk/maven-clover-plugin/src/it/license/build-tools/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Mar 25 02:24:07 2007
@@ -0,0 +1 @@
+target
Modified:
maven/plugins/trunk/maven-clover-plugin/src/it/license/build-tools/src/main/resources/myclover.license
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clover-plugin/src/it/license/build-tools/src/main/resources/myclover.license?view=diff&rev=522185&r1=522184&r2=522185
==============================================================================
---
maven/plugins/trunk/maven-clover-plugin/src/it/license/build-tools/src/main/resources/myclover.license
(original)
+++
maven/plugins/trunk/maven-clover-plugin/src/it/license/build-tools/src/main/resources/myclover.license
Sun Mar 25 02:24:07 2007
@@ -1,24 +1,26 @@
Product: Clover
License: Maven License, 0.x, 1.x
Issued: Sun Feb 20 2005 16:07:54 CST
-Expiry: Tue Jan 30 2007 00:00:00 CST
+Expiry: Wed Jan 30 2008 00:00:00 CST
+Maintenance Expiry: Never
Key: cb1bdacca8bc16c87e3a54ba8
Name: Vincent Massol
Org: Maven
-Certificate: AAACSW+Ow8B7/zEbxOMqqKwwrdpP+b9RI3QpJp1t7GEdsHEZ1bTfFsNcI
-BFgt6wjtrbhk5osqpdgk/yEZJj3job+JBdaXy0D57q4LR5IvOBFb4CejKlB7R0tBLMtZB1
+Certificate: AAACX2+Ow8B7/zEbxOMqqKwwrdpP+b9RI3QpJp5q7WYZtHEZ1bTfFsNcI
+BFgt6wgsbfml54sqpdgk/yEZJj3job+JBdaXy0D57q4LR5IvOBFb4Cej6lB7R0tBLMtZB1
z8E40a4RpZPEs1unqS5oRKOLDDsuZMK6fVZK9RnYiEzfIO6UjDvImCYDyjkq8SSYBJdTpP
KHHttTJZrrTOMq/onTG48fHvG9PJns/HPb08BUDW+OhGX392JfAVPEJPR3tJ3kJbsdNe3K
-DbyXxMdbmpVPTFD/p1UWP4Cm+zU6apE12fkU37zazJkv0Q1mB4tJSu103bmrK83fzu+OQj
-HD73nDmuu84w+7Wz6BkTwZ3Pgbru/ZBE0Kq+kRj6NrNxlW/DiEd4zB+AW7+Qy14jzsO+S3
-W1eBP1QQz88lSku5Vsdlezr9RI3QpYckovj9d43Rdl/GKLKVBMQFrzvg86OLtkp4kqZRa0
-6P9INP30s+9c1JaZikH7732AANCtuALXuLGyoNd9hstErAhNgwvwAI1cpY7IeAvn/XgW5R
-9MvPLTNa0La7aN4umT2tlUWLJULQ5XfI5TYO5m1S8TVgIbN74fPLj/snfZ+/CNJ79v2SOt
-pGR/T1bZCZ8f+G79hUWSK2zZmbvzsrGEekROxW3ZH4QOsMYdDKWbDO2PJPp9ErbWTnoywC
-fr3+03UmSok12cAN7xTm5Pl3jLQmT4Z1VoEc8RGrbvVHt6abF3h72zjPGov0xmP/XxKNjD
-Dl2cUDIupIJHlit5kJn5pLN0UT6cmt3yzrO+BX3scmXzeu17h1HJLOQy9q0o7miSCEcOEH
-LjJ1P78PDE3rjL5NC2IROehYovQkUBV6sLclEk9vAKS+dEAlnzKMur44hl0A8VXYIg4xUQ
-y9EfblF3m8BcH5d9ggEI168IblSrBoovsoeDoKnL9iqcl2afQabsFPXk2g9
+DbyXxMdbmpVPTFD/p1UWP4Cm+zU6apE12fkU37zazJkv0Q0WM54pIuk18CWTU82bE/qDJ3
+m2nl1rTqOhpwv3Xw8VlGD53Pkix5LgFFlL5y0Br5trY11jwFmgqpjZlDSHdAj90km828T2
+D8+BbmgEz5oZUg6V/lt5LlqUDHHBRN/4/rD9d7z1Gl/3BLKNOMVlxz+h3i/C10s576cJt1
+777Mbzjy8WqZBw1PCURv+aqUUQY0/5Zef7KwdNY7QF1drchZAkn3UMvdI51ecw3n/SlU9M
+UP+nVRcuoPqifU5y8AzNpU37eP7h+JO49RIm5m1S8TVgcaNGgZvPztarEfenTIMeqsyDE+
+seso2MMNXw/EKy96xICTr2zBzu6l4CQBq1PfEj3dBwHId1WOn6VJhT0Opf04B/MHinu0gC
+DtCurhRLcvFQhP0BywiupMQDlJkTF8IAGpkomBWzTvXOh6rnDyXrpwjSDuusmxebNyO9lC
+XBRIBr0seprG0K661h574HJ1lPzESsVp3kjLiC5SjJulXMw9TPL8/dK332UmZ4ASWYbMSh
+sv52uy3MzMtIND8vPa5jmVaWOxJEjsQb8K7667i7mpuAOZme/Ut7KAr+zeiQclQ7UkpIyk
+IR8gnZ8lCzUBB+qTFkNRB1op6H1A3f/8EN4r2/KiSfbUxdMl+LGlu0aThdkLmodjA4AZ0w
+1lVC887Ld7OAXfO1Vtg==
License Agreement: CENQUA CLOVER EVALUATION SOFTWARE LICENSE AGREEMENT
CENQUA IS WILLING TO LICENSE CLOVER AND ACCOMPANYING DOCUMENTATION
@@ -30,27 +32,27 @@
1. Software: The licensed Software is "Clover Evaluation Edition".
-2. Grant of License: Cortex eBusiness Pty Ltd ("Cenqua") hereby
- grants to Evaluator, for 30 days (the "Evaluation Period")
- following the execution of this Agreement (the "Agreement"), a
- limited, nontransferable, nonexclusive, nonsublicensable,
- revocable, worldwide license to use the Software for the purposes
- of internal evaluation and testing for suitability for commercial
- licensing ("Evaluation") by Evaluator. Title to the Software shall
- remain with Cenqua at all times.
+2. Grant of License: Cenqua Pty Ltd ("CENQUA") hereby grants to
+ Evaluator, for 30 days (the "Evaluation Period") following the
+ execution of this Agreement (the "Agreement"), a limited,
+ nontransferable, nonexclusive, nonsublicensable, revocable,
+ worldwide license to use the Software for the purposes of internal
+ evaluation and testing for suitability for commercial licensing
+ ("Evaluation") by Evaluator. Title to the Software shall remain with
+ CENQUA at all times.
-3. Exclusions: Evaluator shall not: a. copy any part of the Software
- except to make one copy for back-up purposes only; b. reverse
+3. Exclusions: Evaluator shall not: (a) copy any part of the Software
+ except to make one copy for back-up purposes only; (b) reverse
compile or reverse assemble any portion of the Software where the
- source code is not freely accessible; c. distribute, disclose,
- market, rent, lease, or transfer the Software; d. export the
- Software; or e. allow others to make or obtain copies of the
+ source code is not freely accessible; (c) distribute, disclose,
+ market, rent, lease, or transfer the Software; (d) export the
+ Software; or (e) allow others to make or obtain copies of the
Software.
-4. Support: Cenqua may, during the Evaluation Period, make
+4. Support: CENQUA may, during the Evaluation Period, make
available updates, enhancements, and/or modifications to the
Software and may provide such updates to Evaluator, but is under no
- obligation to do so. The provision by Cenqua to Evaluator of
+ obligation to do so. The provision by CENQUA to Evaluator of
such updates, enhancements, and/or modifications to the Software
shall be subject to all terms and conditions of this Agreement and
shall expire at the end of the Evaluation Period.
@@ -67,18 +69,18 @@
IF CENQUA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
6. Termination: Evaluator's license to use the Software shall
- terminate on the earlier of (i) written notice by either Cenqua
+ terminate on the earlier of (i) written notice by either CENQUA
or Evaluator, or (ii) expiration of the Evaluation Period. Upon
termination of the license as provided above, Evaluator shall
promptly destroy the Software and any back-up copy of the Software
made during the Evaluation Period. Evaluator shall also promptly
- return all materials provided by Cenqua in connection with the
+ return all materials provided by CENQUA in connection with the
Software.
7. Warranties and Representations; Indemnification. Evaluator warrants
and represents that Evaluator's actions with regard to the Software
will be in compliance with all applicable laws; and Evaluator will
- indemnify, defend, and hold Cenqua harmless from and against any
+ indemnify, defend, and hold CENQUA harmless from and against any
and all liabilities, damages, losses, claims, costs, and expenses
(including legal fees) arising out of or resulting from Evaluator's
failure to observe the use restrictions set forth herein.
@@ -86,18 +88,18 @@
8. Governing Law: This Agreement shall be governed by the laws of New
South Wales, Australia.
-9.Independent Contractors; Assignment: The parties are independent
- contractors with respect to each other, and nothing in this
- Agreement shall be construed as creating an employer-employee
- relationship, a partnership, agency relationship or a joint venture
- between the parties. This Agreement is not assignable or
- transferable by Evaluator.
+9. Independent Contractors; Assignment: The parties are independent
+ contractors with respect to each other, and nothing in this
+ Agreement shall be construed as creating an employer-employee
+ relationship, a partnership, agency relationship or a joint venture
+ between the parties. This Agreement is not assignable or
+ transferable by Evaluator.
10.Entire Agreement: This Agreement constitutes the entire agreement
between the parties concerning Evaluator's use of the
Software. This Agreement supersedes any prior verbal understanding
between the parties and any Evaluator purchase order or other
ordering document, regardless of whether such document is received
- by Cenqua before or after execution of this Agreement. This
- Agreement may be amended only in writing by Cenqua.
+ by CENQUA before or after execution of this Agreement. This
+ Agreement may be amended only in writing by CENQUA.
Propchange: maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Mar 25 02:24:07 2007
@@ -0,0 +1,2 @@
+target
+build.log
Added: maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/goals.txt?view=auto&rev=522185
==============================================================================
--- maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/goals.txt (added)
+++ maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/goals.txt Sun Mar 25
02:24:07 2007
@@ -0,0 +1 @@
+clean install
Added: maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/pom.xml?view=auto&rev=522185
==============================================================================
--- maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/pom.xml (added)
+++ maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/pom.xml Sun Mar 25
02:24:07 2007
@@ -0,0 +1,69 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clover-plugin-sample-xdoclet</artifactId>
+ <packaging>jar</packaging>
+ <name>Maven Clover Plugin XDoclet Sample</name>
+ <description>Maven Clover Plugin XDoclet Sample</description>
+ <version>1.0-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clover-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>instrument</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xdoclet-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>xdoclet</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <mkdir dir="${project.build.directory}"/>
+ <!-- Create a file that should go in the target/clover/
directory when the XDoclet plugin is called
+ in the forked lifecycle. We verify that it exists using
the verifier plugin below. -->
+ <touch file="${project.build.directory}/test.clover"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-verifier-plugin</artifactId>
+ <configuration>
+ <failOnError>true</failOnError>
+
<verificationFile>${basedir}/src/test/verifier/verifications.xml</verificationFile>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added:
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/main/java/org/apache/maven/plugin/clover/samples/xdoclet/Simple.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/main/java/org/apache/maven/plugin/clover/samples/xdoclet/Simple.java?view=auto&rev=522185
==============================================================================
---
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/main/java/org/apache/maven/plugin/clover/samples/xdoclet/Simple.java
(added)
+++
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/main/java/org/apache/maven/plugin/clover/samples/xdoclet/Simple.java
Sun Mar 25 02:24:07 2007
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2007 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.
+ */
+package org.apache.maven.plugin.clover.samples.xdoclet;
+
+public class Simple
+{
+ public void someMethod()
+ {
+ int i = 0;
+ if (i > 0)
+ {
+ i = i + 1;
+ }
+ }
+}
Added:
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/test/java/org/apache/maven/plugin/clover/samples/xdoclet/SimpleTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/test/java/org/apache/maven/plugin/clover/samples/xdoclet/SimpleTest.java?view=auto&rev=522185
==============================================================================
---
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/test/java/org/apache/maven/plugin/clover/samples/xdoclet/SimpleTest.java
(added)
+++
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/test/java/org/apache/maven/plugin/clover/samples/xdoclet/SimpleTest.java
Sun Mar 25 02:24:07 2007
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2007 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.
+ */
+package org.apache.maven.plugin.clover.samples.xdoclet;
+
+import junit.framework.TestCase;
+import java.util.Properties;
+
+public class SimpleTest extends TestCase
+{
+ public void testSomeMethod() throws Exception
+ {
+ Simple simple = new Simple();
+ simple.someMethod();
+ }
+}
+
\ No newline at end of file
Added:
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/test/verifier/verifications.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/test/verifier/verifications.xml?view=auto&rev=522185
==============================================================================
---
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/test/verifier/verifications.xml
(added)
+++
maven/plugins/trunk/maven-clover-plugin/src/it/xdoclet/src/test/verifier/verifications.xml
Sun Mar 25 02:24:07 2007
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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.
+-->
+
+<verifications>
+ <files>
+ <file>
+ <location>target/clover/test.clover</location>
+ </file>
+ </files>
+</verifications>
