Does this test still pass if the Cactus plugin is not installed?
- Brett
[EMAIL PROTECTED] wrote:
felipeal 2004/10/21 23:01:39
Modified: eclipse/src/plugin-test maven.xml project.properties
eclipse/xdocs changes.xml
Added: eclipse/src/plugin-test/src/cactus-test dir.txt
Log:
ECLIPSE-52: set proper cactus.src.dir for plugin test
Revision Changes Path
1.19 +1 -3 maven-plugins/eclipse/src/plugin-test/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/eclipse/src/plugin-test/maven.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- maven.xml 22 Oct 2004 05:40:54 -0000 1.18
+++ maven.xml 22 Oct 2004 06:01:38 -0000 1.19
@@ -111,9 +111,7 @@
<u:file var="classpathFile" name="${dotClasspath}"/>
<x:parse var="classpathDoc" xml="${classpathFile.toURL()}" />
<x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@kind,'src')])"/>
-<!--
- <assert:assertEquals expected="6" value="${count.intValue().toString()}" msg="Wrong number of generated src directories found"/> --->
+ <assert:assertEquals expected="7" value="${count.intValue().toString()}" msg="Wrong number of generated src directories found"/> </goal>
<goal name="test-classpath-has-overridden-jar">
1.3 +2 -2 maven-plugins/eclipse/src/plugin-test/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/maven-plugins/eclipse/src/plugin-test/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 24 Sep 2004 15:51:01 -0000 1.2
+++ project.properties 22 Oct 2004 06:01:38 -0000 1.3
@@ -1,3 +1,3 @@
-cactus.src.dir=.
+cactus.src.dir=${basedir}/src/cactus-test
maven.jar.override=on
-maven.jar.commons-dude=${maven.repo.local}/commons-logging/jars/commons-logging-1.0.3.jar
\ No newline at end of file
+maven.jar.commons-dude=${maven.repo.local}/commons-logging/jars/commons-logging-1.0.3.jar
1.1 maven-plugins/eclipse/src/plugin-test/src/cactus-test/dir.txt
Index: dir.txt
===================================================================
needed for plugin test
1.37 +2 -1 maven-plugins/eclipse/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/eclipse/xdocs/changes.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- changes.xml 22 Oct 2004 05:40:54 -0000 1.36
+++ changes.xml 22 Oct 2004 06:01:39 -0000 1.37
@@ -24,7 +24,8 @@
<author email="[EMAIL PROTECTED]">dIon Gillard</author>
</properties>
<body>
- <release version="1.9" date="in cvs">
+ <release version="1.9-SNAPSHOT" date="in cvs">
+ <action dev="felipeal" type="fix" issue="MPECLIPSE-52">Set proper <code>cactus.src.dir</code></action> <action dev="felipeal" type="fix" issue="MPECLIPSE-51">Fixed duplicated source entry issue.</action> <action dev="epugh" type="add">add property maven.eclipse.addResources=false to prevent the build resources from breaking old Eclipse builds.</action> <action dev="epugh" type="add">Allow includes/excludes in build resources to be used in the classpath generation.</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]
