patch didn't work properly.

source modifications only applied if class actually missing


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115047 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
brett
2004-04-25 03:15:28 +00:00
parent 453a3f0448
commit e8bf7f313a
2 changed files with 14 additions and 5 deletions

View File

@@ -31,11 +31,20 @@
<maven:makeRelativePath var="srcDir" basedir="${basedir}" path="${pom.build.sourceDirectory}"/>
<j:set var="excluding" value=""/>
<j:forEach var="sm" items="${pom.build.sourceModifications}">
<j:forEach var="exclude" items="${sm.excludes}">
<j:set var="excluding" value="${excluding},${exclude}"/>
</j:forEach>
<ant:available property="classPresent" classname="${sm.className}"/>
<j:if test="${classPresent != 'true'}">
<j:forEach var="exclude" items="${sm.excludes}">
<j:choose>
<j:when test="${excluding.length() == 0}">
<j:set var="excluding" value="${exclude}"/>
</j:when>
<j:otherwise>
<j:set var="excluding" value="${excluding},${exclude}"/>
</j:otherwise>
</j:choose>
</j:forEach>
</j:if>
</j:forEach>
<j:set var="excluding">${excluding.substring(1)}</j:set>
<classpathentry kind="src" path="${srcDir}" excluding="${excluding}" />
</j:if>

View File

@@ -25,7 +25,7 @@
</properties>
<body>
<release version="1.7-SNAPSHOT" date="in CVS">
<action dev="brett" type="update" due-to="Boris Boehlen" issue="MPECLIPSE-21">Honour sourceModifications in classpath file</action>
<action dev="brett" type="update" issue="MPECLIPSE-21">Honour sourceModifications in classpath file</action>
</release>
<release version="1.6" date="2004-03-10">
<action dev="vmassol" type="fix" issue="MPECLIPSE-15">Fixed Cactus support (there were problems due to the move of the Cactus plugin outside of the Maven project).</action>