epugh 2004/10/20 11:23:11
Modified: eclipse plugin.properties
eclipse/src/plugin-resources/templates classpath.jelly
eclipse/src/plugin-test maven.xml
Log:
Remove temporary property. Issue with add resources resolved by discussion on
mailing list.
Revision Changes Path
1.8 +0 -1 maven-plugins/eclipse/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/eclipse/plugin.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.properties 19 Oct 2004 14:13:04 -0000 1.7
+++ plugin.properties 20 Oct 2004 18:23:11 -0000 1.8
@@ -26,4 +26,3 @@
maven.eclipse.goals = plugins
maven.gen.src=${maven.build.dir}/generated-sources
maven.eclipse.src.extension = zip
-maven.eclipse.addResources=false
1.29 +0 -6
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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- classpath.jelly 19 Oct 2004 14:13:04 -0000 1.28
+++ classpath.jelly 20 Oct 2004 18:23:11 -0000 1.29
@@ -57,8 +57,6 @@
<classpathentry kind="src" path="${srcDir}" excluding="${excluding}" />
<j:if test="${!pom.build.resources.isEmpty()}">
- <!-- Turn off for most users this buggy code-->
- <j:if test="${maven.eclipse.addResources == 'true'}">
<j:forEach var="resource" items="${pom.build.resources}">
<j:set var="includingAsString" value="" />
<j:forEach var="res" items="${resource.includes}">
@@ -75,7 +73,6 @@
</j:if>
</j:forEach>
</j:if>
- </j:if>
</j:if>
<!-- Add the list of additional directories for the classpath from
${maven.eclipse.classpath.include}-->
@@ -138,8 +135,6 @@
<j:if test="${pom.build.unitTest != null}">
<j:if test="${!pom.build.unitTest.resources.isEmpty()}">
- <!-- Turn off for most users this buggy code-->
- <j:if test="${maven.eclipse.addResources == 'true'}">
<j:forEach var="resource" items="${pom.build.unitTest.resources}">
<j:set var="includingAsString" value="" />
<j:forEach var="res" items="${resource.includes}">
@@ -155,7 +150,6 @@
<classpathentry kind="src" path="${resourceDirectory}"
output="${testOutputDir}" including="${includingAsString}"
excluding="${excludingAsString}"/>
</j:if>
</j:forEach>
- </j:if>
</j:if>
</j:if>
</j:if>
1.17 +3 -19 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- maven.xml 19 Oct 2004 14:13:04 -0000 1.16
+++ maven.xml 20 Oct 2004 18:23:11 -0000 1.17
@@ -20,7 +20,7 @@
xmlns:u="jelly:util"
xmlns:x="jelly:xml">
- <goal name="testPlugin"
prereqs="test-eclipse,test-natures,test-builders,test-natures-and-builders,test-classpath-has-generated-source,test-classpath-has-overridden-jar,test-noduplicates,test-classpath-con-entry,test-maven-eclipse-addResources">
+ <goal name="testPlugin"
prereqs="test-eclipse,test-natures,test-builders,test-natures-and-builders,test-classpath-has-generated-source,test-classpath-has-overridden-jar,test-noduplicates,test-classpath-con-entry">
</goal>
<goal name="test-init">
@@ -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="4" 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>
@@ -153,22 +153,6 @@
<x:parse var="classpathDoc" xml="${classpathFile.toURL()}" />
<x:set var="countConEntries"
select="count($classpathDoc/classpath/classpathentry[contains(@kind,'con')])"/>
<assert:assertEquals expected="2"
value="${countConEntries.intValue().toString()}" msg="Classpath entry kind='con'
should be added twice, once mandatory, other variable"/>
- </goal>
-
- <goal name="test-maven-eclipse-addResources">
- <attainGoal name="test-init"/>
- <!-- Not working! ARgh-->
- <j:set var="maven.eclipse.addResources" value="true"/>
- <attainGoal name="eclipse"/>
-
- <assert:assertFileExists file="${dotProject}" />
- <assert:assertFileExists file="${dotClasspath}" />
-
- <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="4" value="${count.intValue().toString()}"
msg="Wrong number of generated src directories found"/>
-
- </goal>
+ </goal>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
