You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2006/11/28 15:41:35 UTC
svn commit: r480069 -
/maven/maven-1/plugins/trunk/eclipse/src/plugin-test/maintest/maven.xml
Author: aheritier
Date: Tue Nov 28 06:41:34 2006
New Revision: 480069
URL: http://svn.apache.org/viewvc?view=rev&rev=480069
Log:
Fix test on windows which didn't work because ${mOneDotOnePath}=c:\XXX\YYY\ZZZ\maven-1.1-RC1-20061029/lib/maven.jar and in the .classpath we have something like c:\XXX\YYY\ZZZ\maven-1.1-RC1-20061029\lib\maven.jar
Modified:
maven/maven-1/plugins/trunk/eclipse/src/plugin-test/maintest/maven.xml
Modified: maven/maven-1/plugins/trunk/eclipse/src/plugin-test/maintest/maven.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/eclipse/src/plugin-test/maintest/maven.xml?view=diff&rev=480069&r1=480068&r2=480069
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/src/plugin-test/maintest/maven.xml (original)
+++ maven/maven-1/plugins/trunk/eclipse/src/plugin-test/maintest/maven.xml Tue Nov 28 06:41:34 2006
@@ -141,11 +141,12 @@
<!-- maven.jar is now overrided as from maven 1.1-RC1 so break the test here -->
<x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/maven/jars/maven.jar')])"/>
<j:if test="${count == 0}">
- <j:set var="mOneDotOnePath" value="${maven.home}/lib/maven.jar"/>
+ <u:file var="mOneDotOneJar" name="${maven.home}/lib/maven.jar" />
+ <j:set var="mOneDotOnePath" value="${mOneDotOneJar.absolutePath}"/>
<x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@path,$mOneDotOnePath)])"/>
</j:if>
<assert:assertEquals expected="1" value="${count.intValue().toString()}" msg="maven.jar.override didn't work"/>
- <x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar')])"/>
+ <x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar')])"/>
<assert:assertEquals expected="1" value="${count.intValue().toString()}" msg="override by jar tag not found"/>
</goal>