epugh 2004/08/10 00:41:17
Modified: eclipse/src/plugin-resources/templates classpath.jelly
eclipse/src/plugin-test project.xml maven.xml
eclipse/xdocs changes.xml
Added: eclipse/src/plugin-test project.properties
Log:
MPECLIPSE-37: Cactus jar added in a specific condition
Revision Changes Path
1.20 +5 -0
maven-plugins/eclipse/src/plugin-resources/templates/classpath.jelly
Index: classpath.jelly
===================================================================
RCS file:
/home/cvs/maven-plugins/eclipse/src/plugin-resources/templates/classpath.jelly,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- classpath.jelly 9 Aug 2004 14:28:14 -0000 1.19
+++ classpath.jelly 10 Aug 2004 07:41:16 -0000 1.20
@@ -116,6 +116,7 @@
<j:set var="cactusSourcePresent" value="true"/>
</u:available>
+ <j:set var="ignoreCactus" value="false" />
<j:if test="${cactusSourcePresent == 'true'}">
<ant:echo>Contains Cactus Tests!</ant:echo>
<maven:makeRelativePath var="testSrcDir" basedir="${basedir}"
path="${cactusSrcDir}" />
@@ -124,6 +125,7 @@
<maven:pluginVar var="cactusPlugin" plugin='cactus-maven' property='plugin' />
<j:set
var="depVersion">${cactusPlugin.getDependency('cactus').getVersion()}</j:set>
<classpathentry kind="var"
path="MAVEN_REPO/cactus/jars/cactus-${depVersion}.jar"/>
+ <j:set var="ignoreCactus" value="true" />
</j:if>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
@@ -138,6 +140,9 @@
<!-- ignore specific dependencies -->
</j:when>
<j:when test="${lib.dependency.groupId == 'junit' and ignoreJUnit}">
+ <!-- ignoring junit dependency as we've already created it -->
+ </j:when>
+ <j:when test="${lib.dependency.groupId == 'cactus' and ignoreCactus}">
<!-- ignoring junit dependency as we've already created it -->
</j:when>
<j:otherwise>
1.6 +5 -0 maven-plugins/eclipse/src/plugin-test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/eclipse/src/plugin-test/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 9 Aug 2004 14:28:14 -0000 1.5
+++ project.xml 10 Aug 2004 07:41:16 -0000 1.6
@@ -63,5 +63,10 @@
<artifactId>junit</artifactId>
<version>3.8.1</version>
</dependency>
+ <dependency>
+ <groupId>cactus</groupId>
+ <artifactId>cactus</artifactId>
+ <version>13-1.6.1</version>
+ </dependency>
</dependencies>
</project>
1.10 +5 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- maven.xml 9 Aug 2004 15:01:39 -0000 1.9
+++ maven.xml 10 Aug 2004 07:41:17 -0000 1.10
@@ -38,8 +38,10 @@
<u:file var="classpathFile" name="${dotClasspath}"/>
<x:parse var="classpathDoc" xml="${classpathFile.toURL()}" />
- <x:set var="count"
select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/junit/jars/junit-3.8.1.jar')])"/>
- <assert:assertEquals expected="1" value="${count.intValue().toString()}"
msg="JUnit dependency not found"/>
+ <x:set var="countJUnit"
select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/junit/jars/junit-3.8.1.jar')])"/>
+ <assert:assertEquals expected="1" value="${countJUnit.intValue().toString()}"
msg="JUnit dependency not found"/>
+ <x:set var="countCactus"
select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/cactus/jars/cactus-13-1.6.1.jar')])"/>
+ <assert:assertEquals expected="1" value="${countCactus.intValue().toString()}"
msg="More than one Cactus dependencies found"/>
</goal>
@@ -109,7 +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="2" value="${count.intValue().toString()}"/>
+ <assert:assertEquals expected="3" value="${count.intValue().toString()}"/>
</goal>
1.1 maven-plugins/eclipse/src/plugin-test/project.properties
Index: project.properties
===================================================================
cactus.src.dir=.
1.26 +1 -0 maven-plugins/eclipse/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/eclipse/xdocs/changes.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- changes.xml 9 Aug 2004 15:01:39 -0000 1.25
+++ changes.xml 10 Aug 2004 07:41:17 -0000 1.26
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.8" date="In CVS">
+ <action dev="epugh" type="fix" issue="MPECLIPSE-37" due-to="Felipe
Leme">Fixed a 'race condition' where Cactus dependency is added twice to
.classpath.</action>
<action dev="epugh" type="add" issue="MPECLIPSE-27" due-to="Kristopher
Brown">Add eclipse:clean goal.</action>
<action dev="epugh" type="fix" issue="MPECLIPSE-36" due-to="Felipe
Leme">Fixed a 'race condition' where JUnit dependency is not added to
.classpath.</action>
<action dev="epugh" type="add">Add maven.gen.src property that points to a
directory whose subdirectories are included as separate source directories.</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
