You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ca...@apache.org on 2004/08/16 12:50:27 UTC
cvs commit: maven-plugins/ant/src/plugin-test/src/main AClass.java
carlos 2004/08/16 03:50:27
Modified: ant/src/plugin-test maven.xml project.xml
ant/src/plugin-resources/templates build.jelly
ant/xdocs changes.xml
Added: ant/src/plugin-test/src/test ATestCaseClass.java
ant/src/plugin-test/src/main AClass.java
Log:
Fixed reopened MPANT-16: Use relative paths in test resources filesets.
Revision Changes Path
1.10 +5 -0 maven-plugins/ant/src/plugin-test/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ant/src/plugin-test/maven.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- maven.xml 29 Jul 2004 15:12:54 -0000 1.9
+++ maven.xml 16 Aug 2004 10:50:26 -0000 1.10
@@ -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
1.6 +11 -0 maven-plugins/ant/src/plugin-test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ant/src/plugin-test/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 11 May 2004 14:42:42 -0000 1.5
+++ project.xml 16 Aug 2004 10:50:26 -0000 1.6
@@ -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>
1.1 maven-plugins/ant/src/plugin-test/src/test/ATestCaseClass.java
Index: ATestCaseClass.java
===================================================================
/* ====================================================================
* 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.23 +1 -1 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.jelly 19 Jul 2004 20:08:57 -0000 1.22
+++ build.jelly 16 Aug 2004 10:50:26 -0000 1.23
@@ -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>
1.28 +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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- changes.xml 29 Jul 2004 15:12:55 -0000 1.27
+++ changes.xml 16 Aug 2004 10:50:27 -0000 1.28
@@ -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>
1.1 maven-plugins/ant/src/plugin-test/src/main/AClass.java
Index: AClass.java
===================================================================
/* ====================================================================
* 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 {
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org