From d799bf984ec13b9bba6c54b91e417e9ec23530dd Mon Sep 17 00:00:00 2001
From: carlos <carlos@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 16 Aug 2004 10:50:27 +0000
Subject: [PATCH] Fixed reopened MPANT-16: Use relative paths in test resources
 filesets.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115968 13f79535-47bb-0310-9956-ffa450edef68
---
 .../plugin-resources/templates/build.jelly    |  2 +-
 ant/src/plugin-test/maven.xml                 |  5 ++++
 ant/src/plugin-test/project.xml               | 11 ++++++++
 ant/src/plugin-test/src/main/AClass.java      | 26 +++++++++++++++++++
 .../plugin-test/src/test/ATestCaseClass.java  | 26 +++++++++++++++++++
 ant/xdocs/changes.xml                         |  1 +
 6 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 ant/src/plugin-test/src/main/AClass.java
 create mode 100644 ant/src/plugin-test/src/test/ATestCaseClass.java

diff --git a/ant/src/plugin-resources/templates/build.jelly b/ant/src/plugin-resources/templates/build.jelly
index 8c0b5e3d..90b4a644 100644
--- a/ant/src/plugin-resources/templates/build.jelly
+++ b/ant/src/plugin-resources/templates/build.jelly
@@ -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>
diff --git a/ant/src/plugin-test/maven.xml b/ant/src/plugin-test/maven.xml
index d988dab6..116393c5 100644
--- a/ant/src/plugin-test/maven.xml
+++ b/ant/src/plugin-test/maven.xml
@@ -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
diff --git a/ant/src/plugin-test/project.xml b/ant/src/plugin-test/project.xml
index 749de11f..35f2396f 100644
--- a/ant/src/plugin-test/project.xml
+++ b/ant/src/plugin-test/project.xml
@@ -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>
diff --git a/ant/src/plugin-test/src/main/AClass.java b/ant/src/plugin-test/src/main/AClass.java
new file mode 100644
index 00000000..f760b895
--- /dev/null
+++ b/ant/src/plugin-test/src/main/AClass.java
@@ -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 {
+
+}
diff --git a/ant/src/plugin-test/src/test/ATestCaseClass.java b/ant/src/plugin-test/src/test/ATestCaseClass.java
new file mode 100644
index 00000000..37ef2daa
--- /dev/null
+++ b/ant/src/plugin-test/src/test/ATestCaseClass.java
@@ -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 {
+
+}
diff --git a/ant/xdocs/changes.xml b/ant/xdocs/changes.xml
index b10a15fb..532a508e 100644
--- a/ant/xdocs/changes.xml
+++ b/ant/xdocs/changes.xml
@@ -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>