evenisse 2004/10/15 06:48:11
Modified: eclipse/src/plugin-resources/templates classpath.jelly
eclipse/src/plugin-test maven.xml
Log:
- Use maven:makeRelativePath instead of use invokeStatic tag
- Generate all path with '/' separator for obtain independant platform .classpath
file
Revision Changes Path
1.25 +10 -22
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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- classpath.jelly 15 Oct 2004 09:45:05 -0000 1.24
+++ classpath.jelly 15 Oct 2004 13:48:11 -0000 1.25
@@ -30,13 +30,13 @@
<u:available file="${maven.gen.src}">
<u:file var="genSrcRootDir" name="${maven.gen.src}"/>
<j:forEach var="genSrcDir" items="${genSrcRootDir.listFiles()}">
- <maven:makeRelativePath var="srcDir" basedir="${basedir}"
path="${genSrcDir}"/>
+ <maven:makeRelativePath var="srcDir" basedir="${basedir}" path="${genSrcDir}"
separator="/"/>
<classpathentry kind="src" path="${srcDir}"/>
</j:forEach>
</u:available>
<j:if test="${sourcesPresent}">
- <maven:makeRelativePath var="srcDir" basedir="${basedir}"
path="${pom.build.sourceDirectory}"/>
+ <maven:makeRelativePath var="srcDir" basedir="${basedir}"
path="${pom.build.sourceDirectory}" separator="/"/>
<j:set var="excluding" value=""/>
<j:forEach var="sm" items="${pom.build.sourceModifications}">
<ant:available property="classPresent" classname="${sm.className}"/>
@@ -57,13 +57,7 @@
<j:if test="${!pom.build.resources.isEmpty()}">
<j:forEach var="resource" items="${pom.build.resources}">
- <j:new var="file" className="java.io.File">
- <j:arg value="${basedir}"/>
- </j:new>
- <j:invokeStatic var="resourceDirectory"
className="org.apache.maven.MavenUtils" method="makeRelativePath">
- <j:arg value="${file}"/>
- <j:arg value="${resource.directory}"/>
- </j:invokeStatic>
+ <maven:makeRelativePath var="resourceDirectory" basedir="${basedir}"
path="${resource.directory}" separator="/"/>
<!-- don't add duplicate directories -->
<j:if test="${!resourceDirectory.equals(srcDir)}">
<classpathentry kind="src" path="${resourceDirectory}"
including="${include}" excluding="${exclude}" />
@@ -77,14 +71,14 @@
<!-- add extra directories to be included in the classpath -->
<j:forEach var="res" items="${maven.eclipse.classpath.include.split}">
- <maven:makeRelativePath var="srcDir" basedir="${basedir}" path="${res}" />
+ <maven:makeRelativePath var="srcDir" basedir="${basedir}" path="${res}"
separator="/"/>
<classpathentry kind="src" path="${srcDir}"/>
</j:forEach>
<!-- set a flag so JUnit jar is included only once -->
<j:set var="ignoreJUnit" value="false" />
<j:if test="${unitTestSourcesPresent}">
<ant:echo>Contains JUnit tests</ant:echo>
- <maven:makeRelativePath var="testSrcDir" basedir="${basedir}"
path="${pom.build.unitTestSourceDirectory}"/>
+ <maven:makeRelativePath var="testSrcDir" basedir="${basedir}"
path="${pom.build.unitTestSourceDirectory}" separator="/"/>
<!-- Eclipse supports an output directory per input directory -->
<j:set var="testOutputDir" value="${maven.eclipse.test.output.dir}"/>
@@ -92,7 +86,7 @@
<maven:pluginVar var="testOutputDir" plugin='maven-test-plugin'
property='maven.test.dest'/>
</j:if>
- <maven:makeRelativePath var="testOutputDir" basedir="${basedir}"
path="${testOutputDir}" />
+ <maven:makeRelativePath var="testOutputDir" basedir="${basedir}"
path="${testOutputDir}" separator="/"/>
<ant:echo>Setting compile of ${testSrcDir} to ${testOutputDir}</ant:echo>
<classpathentry kind="src" path="${testSrcDir}" output="${testOutputDir}"/>
@@ -139,13 +133,7 @@
<j:if test="${pom.build.unitTest != null}">
<j:if test="${!pom.build.unitTest.resources.isEmpty()}">
<j:forEach var="resource" items="${pom.build.unitTest.resources}">
- <j:new var="file" className="java.io.File">
- <j:arg value="${basedir}"/>
- </j:new>
- <j:invokeStatic var="resourceDirectory"
className="org.apache.maven.MavenUtils" method="makeRelativePath">
- <j:arg value="${file}"/>
- <j:arg value="${resource.directory}"/>
- </j:invokeStatic>
+ <maven:makeRelativePath var="resourceDirectory" basedir="${basedir}"
path="${resource.directory}" separator="/"/>
<!-- don't add duplicate directories -->
<j:if test="${!resourceDirectory.equals(testSrcDir)}">
<classpathentry kind="src" path="${resourceDirectory}"
output="${testOutputDir}" />
@@ -163,7 +151,7 @@
<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}" />
+ <maven:makeRelativePath var="testSrcDir" basedir="${basedir}"
path="${cactusSrcDir}" separator="/"/>
<classpathentry kind="src" path="${testSrcDir}"/>
<maven:pluginVar var="cactusPlugin" plugin='cactus-maven' property='plugin' />
@@ -206,7 +194,7 @@
<!-- make sure it's a classpath dependency -->
<j:set var="isClasspath" value="${lib.dependency.isAddedToClasspath()}"/>
<j:if test="${isClasspath}">
- <maven:makeRelativePath var="relativePath" basedir="${maven.repo.local}"
path="${lib.path}"/>
+ <maven:makeRelativePath var="relativePath" basedir="${maven.repo.local}"
path="${lib.path}" separator="/"/>
<u:file var="checkExist" name="${maven.repo.local}/${relativePath}" />
<j:choose>
<j:when test="${checkExist.exists()}">
@@ -237,7 +225,7 @@
<j:if test="${empty outputDir}">
<j:set var="outputDir" value="${maven.build.dest}"/>
</j:if>
- <maven:makeRelativePath var="outputDir" basedir="${basedir}" path="${outputDir}"
/>
+ <maven:makeRelativePath var="outputDir" basedir="${basedir}" path="${outputDir}"
separator="/"/>
<classpathentry kind="output" path="${outputDir}"/>
<ant:echo>Setting default output directory to ${outputDir}</ant:echo>
</classpath>
1.14 +4 -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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- maven.xml 15 Oct 2004 09:45:05 -0000 1.13
+++ maven.xml 15 Oct 2004 13:48:11 -0000 1.14
@@ -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="7" value="${count.intValue().toString()}"
msg="Wrong number of generated src directories found"/>
+ <assert:assertEquals expected="6" value="${count.intValue().toString()}"
msg="Wrong number of generated src directories found"/>
</goal>
@@ -123,9 +123,9 @@
<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')])"/>
+ <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')])"/>
+ <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>
@@ -138,7 +138,7 @@
<u:file var="classpathFile" name="${dotClasspath}"/>
<x:parse var="classpathDoc" xml="${classpathFile.toURL()}" />
- <x:set var="countUniqueSrc"
select="count($classpathDoc/classpath/classpathentry[contains(@path,'src\main')])"/>
+ <x:set var="countUniqueSrc"
select="count($classpathDoc/classpath/classpathentry[contains(@path,'src/main')])"/>
<assert:assertEquals expected="1"
value="${countUniqueSrc.intValue().toString()}" msg="Src directory should be added
only once"/>
</goal>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
