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

Fixed reopened MPANT-16: Use relative paths in test resources filesets.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115968 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
carlos
2004-08-16 10:50:27 +00:00
parent f2f3ddeeb4
commit d799bf984e
6 changed files with 70 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -282,7 +282,7 @@
</j:otherwise>
</j:choose>
<copy todir="${outputDir}">
<fileset dir="${pom.build.unitTestSourceDirectory}">
<fileset dir="${testSrcDir}">
<j:forEach var="res" items="${resource.includes}">
<include name="${res}"/>
</j:forEach>

5
ant/src/plugin-test/maven.xml
View File

@@ -47,6 +47,11 @@
<assert:assertEquals expected="target" value="${defaulttargetdirValue}"
msg="defaulttargetdir property is not relative"/>
<!-- check test filesets -->
<x:set var="testFilesetDirs" select="$buildXml/project/target[@name = 'compile-tests']/copy/fileset/@dir"/>
<assert:assertEquals expected="src/test" value="${testFilesetDirs[0].value}"
msg="test fileset dirs are not relative"/>
<assert:assertFileExists file="${maven.build.dest}/directory-1/file1.properties"/>
<assert:assertFileExists file="${maven.build.dest}/file2.properties"/>
<!-- there are no unit test sources present, so the resources wont be copied either

11
ant/src/plugin-test/project.xml
View File

@@ -52,6 +52,17 @@
</developer>
</developers>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<properties>
<classloader>root</classloader>
</properties>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>

26
ant/src/plugin-test/src/main/AClass.java Normal file
View File

@@ -0,0 +1,26 @@
/* ====================================================================
* Copyright 2001-2004 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.
* ====================================================================
*/
/**
* A simple class
*
* @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
* @version $Id: AClass.java,v 1.1 2004/08/16 10:50:27 carlos Exp $
*/
public class AClass {
}

26
ant/src/plugin-test/src/test/ATestCaseClass.java Normal file
View File

@@ -0,0 +1,26 @@
/* ====================================================================
* Copyright 2001-2004 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.
* ====================================================================
*/
/**
* A simple class
*
* @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
* @version $Id: ATestCaseClass.java,v 1.1 2004/08/16 10:50:26 carlos Exp $
*/
public class ATestCaseClass {
}

1
ant/xdocs/changes.xml
View File

@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.8.1-SNAPSHOT" date="in CVS">
<action dev="carlos" type="fix" issue="MPANT-16">Use relative paths in test resources filesets.</action>
</release>
<release version="1.8" date="2004-07-20">
<action dev="aheritier" type="add" issue="MPANT-9" due-to="Jan Nielsen">Add ant's setproxy tag.</action>