epugh 2004/09/24 08:51:01
Modified: eclipse/src/plugin-resources/templates classpath.jelly
eclipse/src/plugin-test project.properties project.xml
maven.xml
eclipse/xdocs changes.xml
Log:
MPECLIPSE-38 Jar Overrides are now properly supported.
Revision Changes Path
1.21 +2 -1
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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- classpath.jelly 10 Aug 2004 07:41:16 -0000 1.20
+++ classpath.jelly 24 Sep 2004 15:51:01 -0000 1.21
@@ -149,7 +149,8 @@
<!-- make sure it's a classpath dependency -->
<j:set var="isClasspath" value="${lib.dependency.isAddedToClasspath()}"/>
<j:if test="${isClasspath}">
- <classpathentry kind="var" path="MAVEN_REPO${lib.urlPath}"/>
+ <maven:makeRelativePath var="relativePath" basedir="${maven.repo.local}"
path="${lib.path}"/>
+ <classpathentry kind="var" path="MAVEN_REPO/${relativePath}"/>
</j:if>
</j:otherwise>
</j:choose>
1.2 +3 -1 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 10 Aug 2004 07:41:16 -0000 1.1
+++ project.properties 24 Sep 2004 15:51:01 -0000 1.2
@@ -1 +1,3 @@
-cactus.src.dir=.
\ No newline at end of file
+cactus.src.dir=.
+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
1.8 +7 -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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 24 Sep 2004 12:22:15 -0000 1.7
+++ project.xml 24 Sep 2004 15:51:01 -0000 1.8
@@ -53,6 +53,13 @@
</developers>
<dependencies>
+ <dependency>
+ <groupId>facts</groupId>
+ <artifactId>commons-dude</artifactId>
+ <version>1.0.3</version>
+ <type>jar</type>
+ <properties/>
+ </dependency>
<dependency>
<id>maven</id>
<version>beta-8</version>
1.12 +6 -4 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- maven.xml 24 Sep 2004 12:22:15 -0000 1.11
+++ maven.xml 24 Sep 2004 15:51:01 -0000 1.12
@@ -38,7 +38,7 @@
<u:file var="classpathFile" name="${dotClasspath}"/>
<x:parse var="classpathDoc" xml="${classpathFile.toURL()}" />
- <x:set var="countJUnit"
select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/junit/jars/junit-3.8.1.jar')])"/>
+ <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"/>
@@ -111,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="3" value="${count.intValue().toString()}"/>
+ <assert:assertEquals expected="3" value="${count.intValue().toString()}"
msg="Not enough generated src directories found"/>
</goal>
@@ -123,8 +123,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/maven/jars/maven.jar')])"/>
- <assert:assertEquals expected="1" value="${count.intValue().toString()}"/>
+ <x:set var="count"
select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/maven\jars\maven.jar')])"/>
+ <assert:assertEquals expected="1" value="${count.intValue().toString()}"
msg="override by jar tag not found"/>
+ <x:set var="count"
select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/commons-logging\jars\commons-logging-1.0.3.jar')])"/>
+ <assert:assertEquals expected="1" value="${count.intValue().toString()}"
msg="maven.jar.override didn't work"/>
</goal>
1.30 +1 -1 maven-plugins/eclipse/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/eclipse/xdocs/changes.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- changes.xml 24 Sep 2004 12:22:15 -0000 1.29
+++ changes.xml 24 Sep 2004 15:51:01 -0000 1.30
@@ -25,7 +25,7 @@
</properties>
<body>
<release version="1.9" date="in cvs">
- <action dev="epugh" type="fix" issue="MPECLIPSE-38">Jar overrides are not
supported. Unit test to verify fix</action>
+ <action dev="epugh" type="fix" issue="MPECLIPSE-38">Jar overrides are now
properly supported.</action>
</release>
<release version="1.8" date="2004-08-14">
<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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
