Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove temporary property. Issue with add resources resolved by discussion on mailing list.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@116157 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
epugh
2004-10-20 18:23:11 +00:00
parent b78f4ba691
commit 297e84ca43
3 changed files with 3 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
eclipse/plugin.properties
View File

@@ -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

6
eclipse/src/plugin-resources/templates/classpath.jelly
View File

@@ -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}">
@@ -156,7 +151,6 @@
</j:if>
</j:forEach>
</j:if>
</j:if>
</j:if>
</j:if>

22
eclipse/src/plugin-test/maven.xml
View File

@@ -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>