Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove old duplicated code to copy resources for tests

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115860 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
aheritier 2004-07-19 18:12:04 +00:00
parent 1c963b380f
commit b23c94e67a
1 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ant/src/plugin-resources/templates/build.jelly
View File

@ -142,40 +142,6 @@
</j:forEach> </j:forEach>
<!-- Copy any resources required for unit testing -->
<j:forEach var="resource" items="${pom.build.unitTest.resources}">
<j:choose trim="true">
<j:when test="${(resource.targetPath != null) and (!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="/"/>
<j:if test="${empty dir}">
<j:set var="dir" value="."/>
</j:if>
<fileset dir="${dir}">
<j:forEach var="pattern" items="${resource.includes}">
<include name="${pattern}"/>
</j:forEach>
<j:forEach var="pattern" items="${resource.excludes}">
<exclude name="${pattern}"/>
</j:forEach>
</fileset>
</copy>
</j:forEach>
</target> </target>
<target <target
@ -286,6 +252,8 @@
</classpath> </classpath>
</javac> </javac>
<!-- Copy any resources required for unit testing -->
<j:if test="${!pom.build.unitTest.resources.isEmpty()}"> <j:if test="${!pom.build.unitTest.resources.isEmpty()}">
<j:forEach var="resource" items="${pom.build.unitTest.resources}"> <j:forEach var="resource" items="${pom.build.unitTest.resources}">
<j:choose trim="true"> <j:choose trim="true">
@ -302,7 +270,7 @@
<j:if test="${maven.has.test.resource.patterns}"> <j:if test="${maven.has.test.resource.patterns}">
<j:forEach var="resource" items="${pom.build.unitTest.resources}"> <j:forEach var="resource" items="${pom.build.unitTest.resources}">
<j:choose trim="true"> <j:choose trim="true">
<j:when test="${(resource.targetPath != null) &amp;&amp; (!resource.targetPath.equals(''))}"> <j:when test="${(resource.targetPath != null) and (!resource.targetPath.equals(''))}">
<j:set var="outputDir" value="$${testclassesdir}/${resource.targetPath}"/> <j:set var="outputDir" value="$${testclassesdir}/${resource.targetPath}"/>
<mkdir dir="$${testclassesdir}/${resource.targetPath}"/> <mkdir dir="$${testclassesdir}/${resource.targetPath}"/>
</j:when> </j:when>