Was a failing test case created for this?
It would be nice, since we have plugin tests for the ant plugin to have
added the tests and made sure they succeed.
Who said it: "Fixing a bug without a failing test is asking someone to
break it later"
--
dIon Gillard, Multitask Consulting
[EMAIL PROTECTED] wrote on 04/05/2004 10:18:10 AM:
> aheritier 2004/05/03 17:18:10
>
> Modified: ant project.xml
> ant/src/plugin-resources/templates build.jelly
> ant/xdocs changes.xml
> Log:
> MPANT-14 fix
>
> Revision Changes Path
> 1.35 +10 -0 maven-plugins/ant/project.xml
>
> Index: project.xml
> ===================================================================
> RCS file: /home/cvs/maven-plugins/ant/project.xml,v
> retrieving revision 1.34
> retrieving revision 1.35
> diff -u -r1.34 -r1.35
> --- project.xml 2 May 2004 12:34:02 -0000 1.34
> +++ project.xml 4 May 2004 00:18:09 -0000 1.35
> @@ -62,6 +62,16 @@
> <role>Release Manager</role>
> </roles>
> </developer>
> + <developer>
> + <name>Arnaud Heritier</name>
> + <id>aheritier</id>
> + <email>[EMAIL PROTECTED]</email>
> + <organization/>
> + <roles>
> + <role>Java Developer</role>
> + </roles>
> + <timezone>+1</timezone>
> + </developer>
> </developers>
> <dependencies>
> <dependency>
>
>
>
> 1.12 +77 -46 maven-plugins/ant/src/plugin-
> resources/templates/build.jelly
>
> Index: build.jelly
> ===================================================================
> RCS file: /home/cvs/maven-plugins/ant/src/plugin-
> resources/templates/build.jelly,v
> retrieving revision 1.11
> retrieving revision 1.12
> diff -u -r1.11 -r1.12
> --- build.jelly 28 Apr 2004 21:31:16 -0000 1.11
> +++ build.jelly 4 May 2004 00:18:09 -0000 1.12
> @@ -73,53 +73,75 @@
>
> <mkdir dir="$${classesdir}"/>
>
> - <javac
> - destdir="$${classesdir}"
> - excludes="**/package.html"
> - debug="true"
> - deprecation="true"
> - optimize="false">
> - <src>
> - <pathelement location="${srcDir}"/>
> - </src>
> - <classpath>
> - <fileset dir="$${libdir}">
> - <include name="*.jar"/>
> - </fileset>
> - </classpath>
> - </javac>
> + <j:if test="${sourcesPresent}">
> + <javac
> + destdir="$${classesdir}"
> + excludes="**/package.html"
> + debug="true"
> + deprecation="true"
> + optimize="false">
> + <src>
> + <pathelement location="${srcDir}"/>
> + </src>
> + <classpath>
> + <fileset dir="$${libdir}">
> + <include name="*.jar"/>
> + </fileset>
> + </classpath>
> + </javac>
> + </j:if>
>
> <!--
| Copy any resources that must be present in
> the deployed
| JAR file.
-->
> <j:forEach var="resource" items="${pom.build.resources}">
> -
> - <copy todir="$${classesdir}">
> -
> - <maven:makeRelativePath var="dir" basedir="${basedir}"
> path="${resource.directory}" separator="/"/>
>
> - <j:if test="${empty dir}">
> - <j:set var="dir" value="."/>
> - </j:if>
> -
> - <fileset dir="${dir}">
> -
> - <j:forEach var="res" items="${resource.includes}">
> - <include name="${res}"/>
> - </j:forEach>
> - <j:forEach var="res" items="${resource.excludes}">
> - <exclude name="${res}"/>
> - </j:forEach>
> - </fileset>
> - </copy>
> + <j:choose trim="true">
> + <j:when test="${(resource.targetPath != null) &&
> (!resource.targetPath.equals(''))}">
> + <j:set var="outputDir" value="$${classesdir}
> /${resource.targetPath}"/>
> + <mkdir dir="$${classesdir}/${resource.targetPath}"/>
> + </j:when>
> + <j:otherwise>
> + <j:set var="outputDir" value="$${classesdir}"/>
> + </j:otherwise>
> + </j:choose>
> +
> + <copy todir="${outputDir}">
> +
> + <maven:makeRelativePath var="dir" basedir="${basedir}"
> path="${resource.directory}" separator="/"/>
> +
> + <j:if test="${empty dir}">
> + <j:set var="dir" value="."/>
> + </j:if>
> +
> + <fileset dir="${dir}">
> +
> + <j:forEach var="res" items="${resource.includes}">
> + <include name="${res}"/>
> + </j:forEach>
> + <j:forEach var="res" items="${resource.excludes}">
> + <exclude name="${res}"/>
> + </j:forEach>
> + </fileset>
> + </copy>
>
> </j:forEach>
>
> <!-- Copy any resources required for unit testing -->
> <j:forEach var="resource"
items="${pom.build.unitTest.resources}">
>
> - <copy todir="$${testclassesdir}">
> + <j:choose trim="true">
> + <j:when test="${(resource.targetPath != null) && (!
> resource.targetPath.equals(''))}">
> + <j:set var="outputDir" value="$${testclassesdir}
> /${resource.targetPath}"/>
> + <mkdir dir="$${testclassesdir}/${resource.targetPath}"/>
> + </j:when>
> + <j:otherwise>
> + <j:set var="outputDir" value="$${testclassesdir}"/>
> + </j:otherwise>
> + </j:choose>
> +
> + <copy todir="${outputDir}">
>
> <maven:makeRelativePath var="dir" basedir="${basedir}"
> path="${resource.directory}" separator="/"/>
>
> @@ -259,18 +281,27 @@
> </j:if>
>
> <j:if test="${maven.has.test.resource.patterns}">
> - <copy todir="$${testclassesdir}">
> - <fileset dir="${pom.build.unitTestSourceDirectory}">
> - <j:forEach var="resource" items="${pom.build.unitTest.
> resources}">
> - <j:forEach var="res" items="${resource.includes}">
> - <include name="${res}"/>
> - </j:forEach>
> - <j:forEach var="res" items="${resource.excludes}">
> - <exclude name="${res}"/>
> - </j:forEach>
> - </j:forEach>
> - </fileset>
> - </copy>
> + <j:forEach var="resource" items="${pom.build.unitTest.
> resources}">
> + <j:choose trim="true">
> + <j:when test="${(resource.targetPath != null) &
> & (!resource.targetPath.equals(''))}">
> + <j:set var="outputDir" value="$${testclassesdir}
> /${resource.targetPath}"/>
> + <mkdir
dir="$${testclassesdir}/${resource.targetPath}"/>
> + </j:when>
> + <j:otherwise>
> + <j:set var="outputDir" value="$${testclassesdir}"/>
> + </j:otherwise>
> + </j:choose>
> + <copy todir="${outputDir}">
> + <fileset dir="${pom.build.unitTestSourceDirectory}">
> + <j:forEach var="res" items="${resource.includes}">
> + <include name="${res}"/>
> + </j:forEach>
> + <j:forEach var="res" items="${resource.excludes}">
> + <exclude name="${res}"/>
> + </j:forEach>
> + </fileset>
> + </copy>
> + </j:forEach>
> </j:if>
> </j:if>
> </target>
>
>
>
> 1.20 +1 -0 maven-plugins/ant/xdocs/changes.xml
>
> Index: changes.xml
> ===================================================================
> RCS file: /home/cvs/maven-plugins/ant/xdocs/changes.xml,v
> retrieving revision 1.19
> retrieving revision 1.20
> diff -u -r1.19 -r1.20
> --- changes.xml 28 Apr 2004 21:18:45 -0000 1.19
> +++ changes.xml 4 May 2004 00:18:10 -0000 1.20
> @@ -25,6 +25,7 @@
> </properties>
> <body>
> <release version="1.7" date="in CVS">
> + <action dev="aheritier" type="fix"
> issue="MPANT-14">Resources are correctly copied to the specified
> targetPath.</action>
> <action dev="aheritier" type="fix"
> issue="MPANT-13">Corrects also NumberFormatException. <code>pom.
> build.unitTest.resources</code> is made up of several
> <code>resource</code> elements.</action>
> <action dev="aheritier" type="fix" issue="MPANT-12">Remove
> NumberFormatException if <code>pom.build.unitTest.resources</code>
> doesn't exist.</action>
> <action dev="dion" type="fix" issue="MPANT-11">Change
> plugin tests to use 'assert' tags</action>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
