Author: evenisse Date: Sun Jan 23 06:59:39 2005 New Revision: 126211 URL: http://svn.apache.org/viewcvs?view=rev&rev=126211 Log: - MPJCOVERAGE-20 : Allow comma separeted values for maven.jcoverage.instrumentation.excludes. - MPJCOVERAGE-16 : Fix tests failures when user use maven.jcoverage.instrumentation.excludes Modified: maven/maven-1/plugins/trunk/jcoverage/plugin.jelly maven/maven-1/plugins/trunk/jcoverage/xdocs/changes.xml maven/maven-1/plugins/trunk/jcoverage/xdocs/properties.xml
Modified: maven/maven-1/plugins/trunk/jcoverage/plugin.jelly Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jcoverage/plugin.jelly?view=diff&rev=126211&p1=maven/maven-1/plugins/trunk/jcoverage/plugin.jelly&r1=126210&p2=maven/maven-1/plugins/trunk/jcoverage/plugin.jelly&r2=126211 ============================================================================== --- maven/maven-1/plugins/trunk/jcoverage/plugin.jelly (original) +++ maven/maven-1/plugins/trunk/jcoverage/plugin.jelly Sun Jan 23 06:59:39 2005 @@ -121,10 +121,16 @@ <maven:addPath id="maven.dependency.classpath" refid="jcoverage.classpath"/> + + <u:tokenize var="maven.jcoverage.instrumentation.excludes.split" delim=",">${maven.jcoverage.instrumentation.excludes}</u:tokenize> + <instrument todir="${maven.jcoverage.instrumentation}"> - <ant:fileset dir="${maven.build.dest}" - includes="${maven.jcoverage.instrumentation.includes}" - excludes="${maven.jcoverage.instrumentation.excludes}"/> + <ant:fileset dir="${maven.build.dest}"> + <ant:include name="${maven.jcoverage.instrumentation.includes}" /> + <j:forEach var="var" items="${maven.jcoverage.instrumentation.excludes.split}"> + <ant:exclude name="${var}" /> + </j:forEach> + </ant:fileset> <ant:classpath> <ant:path refid="jcoverage.classpath"/> </ant:classpath> @@ -133,7 +139,11 @@ <ant:copy todir="${maven.jcoverage.instrumentation}"> <ant:fileset dir="${maven.build.dest}"> <ant:exclude name="**/*.class" /> - <ant:exclude name="${maven.jcoverage.instrumentation.excludes}" /> + </ant:fileset> + <ant:fileset dir="${maven.build.dest}"> + <j:forEach var="var" items="${maven.jcoverage.instrumentation.excludes.split}"> + <ant:include name="${var}" /> + </j:forEach> </ant:fileset> </ant:copy> Modified: maven/maven-1/plugins/trunk/jcoverage/xdocs/changes.xml Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jcoverage/xdocs/changes.xml?view=diff&rev=126211&p1=maven/maven-1/plugins/trunk/jcoverage/xdocs/changes.xml&r1=126210&p2=maven/maven-1/plugins/trunk/jcoverage/xdocs/changes.xml&r2=126211 ============================================================================== --- maven/maven-1/plugins/trunk/jcoverage/xdocs/changes.xml (original) +++ maven/maven-1/plugins/trunk/jcoverage/xdocs/changes.xml Sun Jan 23 06:59:39 2005 @@ -26,6 +26,8 @@ <body> <release version="1.0.10" date="IN CVS"> <action dev="evenisse" type="fix">Open report in a new window.</action> + <action dev="evenisse" type="fix" issue="MPJCOVERAGE-20">Allow comma separeted values for maven.jcoverage.instrumentation.excludes.</action> + <action dev="evenisse" type="fix" issue="MPJCOVERAGE-16">Fix tests failures when user use maven.jcoverage.instrumentation.excludes</action> </release> <release version="1.0.9" date="2004-11-10"> <action dev="brett" type="fix">Fix incorrect usage of maven:addPath tag</action> Modified: maven/maven-1/plugins/trunk/jcoverage/xdocs/properties.xml Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jcoverage/xdocs/properties.xml?view=diff&rev=126211&p1=maven/maven-1/plugins/trunk/jcoverage/xdocs/properties.xml&r1=126210&p2=maven/maven-1/plugins/trunk/jcoverage/xdocs/properties.xml&r2=126211 ============================================================================== --- maven/maven-1/plugins/trunk/jcoverage/xdocs/properties.xml (original) +++ maven/maven-1/plugins/trunk/jcoverage/xdocs/properties.xml Sun Jan 23 06:59:39 2005 @@ -69,7 +69,7 @@ <td>Not defined</td> <td>Yes</td> <td> - Specifies the pattern for the excluded classes of instrumentation. + Specifies the pattern for the excluded classes of instrumentation. It's a comma separated property. </td> </tr> <!--tr> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
