evenisse 2004/07/11 08:19:33
Modified: jcoverage plugin.jelly project.xml
jcoverage/xdocs changes.xml
Log:
Fixed tests execution when artifact contains properties.
- Remove deprecated APIs.
Revision Changes Path
1.15 +13 -11 maven-plugins/jcoverage/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/jcoverage/plugin.jelly,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- plugin.jelly 3 Jul 2004 02:08:16 -0000 1.14
+++ plugin.jelly 11 Jul 2004 15:19:32 -0000 1.15
@@ -50,8 +50,8 @@
<ant:taskdef classpath="${plugin.getDependencyPath('jcoverage')}"
resource="tasks.properties" />
- <j:set var="maven.coverage.dir"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}/jcoverage"
/>
+ <maven:get plugin="maven-xdoc-plugin" property="maven.docs.dest" var="docsDest"/>
+ <j:set var="jcoverageDocs" value="${docsDest}/jcoverage"/>
<!-- ================================================================== -->
<!-- J C O V E R A G E R E P O R T D E -/R E G I S T R A T I O N -->
@@ -101,17 +101,18 @@
<j:set var="instrumented" value="${maven.jcoverage.instrumentation}"/>
<j:set var="oldBuildDest" value="${maven.build.dest}"/>
<j:set var="fork" value="${maven.jcoverage.junit.fork}"/>
- <j:set var="oldfork"
value="${pom.getPluginContext('maven-test-plugin').getVariable('maven.junit.fork')}"/>
+ <maven:get plugin="maven-test-plugin" property="maven.junit.fork"
var="oldfork"/>
<!-- reset the maven.build.dest for the test plugin to find the instrumented
classes -->
- ${pom.getPluginContext('maven-test-plugin').setVariable('maven.build.dest',
instrumented)}
+ <maven:set plugin="maven-java-plugin" property="maven.build.dest"
value="${instrumented}"/>
+ <maven:set plugin="maven-test-plugin" property="maven.build.dest"
value="${instrumented}"/>
<!--
set the maven.junit.fork property
-->
- ${pom.getPluginContext('maven-test-plugin').setVariable('maven.junit.fork',
fork)}
+ <maven:set plugin="maven-test-plugin" property="maven.junit.fork"
value="${fork}"/>
- <ant:mkdir dir="${maven.coverage.dir}" />
+ <ant:mkdir dir="${jcoverageDocs}" />
<ant:mkdir dir="${maven.jcoverage.database.dir}" />
<ant:mkdir dir="${maven.jcoverage.instrumentation}" />
@@ -179,7 +180,7 @@
<j:set var="template" value="${maven.jcoverage.report.template}"/>
<j:choose>
<j:when test="${template == 'jcoverage'}">
- <report srcdir="${sourceDir}" destdir="${maven.coverage.dir}">
+ <report srcdir="${sourceDir}" destdir="${jcoverageDocs}">
<ant:classpath>
<ant:path refid="jcoverage.classpath"/>
</ant:classpath>
@@ -195,21 +196,22 @@
</ant:classpath>
</report>
<j:set var="stylesheet"
value="${maven.jcoverage.report.stylesheet}"/>
- <ant:copy file="${stylesheet}"
tofile="${maven.coverage.dir}/style.css"/>
+ <ant:copy file="${stylesheet}" tofile="${jcoverageDocs}/style.css"/>
<jcoverage:report
dataFile="${maven.jcoverage.dir}/coverage.xml"
- outputDir="${maven.coverage.dir}"/>
+ outputDir="${jcoverageDocs}"/>
</j:otherwise>
</j:choose>
<!--
restore the maven.junit.fork property
-->
-
${pom.getPluginContext('maven-test-plugin').setVariable('maven.junit.fork', oldfork)}
+ <maven:set plugin="maven-java-plugin" property="maven.junit.fork"
value="${oldfork}"/>
<!--
restore the maven.build.dest property
-->
-
${pom.getPluginContext('maven-test-plugin').setVariable('maven.build.dest',
oldBuildDest)}
+ <maven:set plugin="maven-java-plugin" property="maven.build.dest"
value="${oldBuildDest}"/>
+ <maven:set plugin="maven-test-plugin" property="maven.build.dest"
value="${oldBuildDest}"/>
</j:catch>
<j:if test="${ex != null}">
<log:error>${ex}</log:error>
1.28 +1 -1 maven-plugins/jcoverage/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/jcoverage/project.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- project.xml 8 Jul 2004 14:47:50 -0000 1.27
+++ project.xml 11 Jul 2004 15:19:32 -0000 1.28
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-jcoverage-plugin</id>
<name>Maven JCoverage plugin</name>
- <currentVersion>1.0.6</currentVersion>
+ <currentVersion>1.0.7-SNAPSHOT</currentVersion>
<package>org.apache.maven.jcoveragereport</package>
<description>This plugin provides coverage analysis of your source-code based on
the open-source jcoverage tool.</description>
<shortDescription>This plugin provides coverage analysis of your source-code
based on the open-source jcoverage tool.</shortDescription>
1.21 +4 -0 maven-plugins/jcoverage/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/jcoverage/xdocs/changes.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- changes.xml 8 Jul 2004 14:47:50 -0000 1.20
+++ changes.xml 11 Jul 2004 15:19:33 -0000 1.21
@@ -24,6 +24,10 @@
<author email="[EMAIL PROTECTED]">Emmanuel Venisse</author>
</properties>
<body>
+ <release version="1.0.7" date="In CVS">
+ <action dev="evenisse" type="fix">Fixed tests execution when artifact
contains properties.</action>
+ <action dev="evenisse" type="fix">Remove deprecated APIs.</action>
+ </release>
<release version="1.0.6" date="2004-07-08">
<action dev="evenisse" type="fix" issue="MPJCOVERAGE-9">Fixed path to
stylesheet.</action>
<action dev="brett" type="fix">Remove postGoal on clean to avoid introducing
all these dependencies on a simple clean.</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
