brett 2004/04/24 20:15:28
Modified: eclipse/src/plugin-resources/templates classpath.jelly
eclipse/xdocs changes.xml
Log:
patch didn't work properly.
source modifications only applied if class actually missing
Revision Changes Path
1.11 +13 -4
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- classpath.jelly 25 Apr 2004 02:26:22 -0000 1.10
+++ classpath.jelly 25 Apr 2004 03:15:28 -0000 1.11
@@ -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>
1.14 +1 -1 maven-plugins/eclipse/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/eclipse/xdocs/changes.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- changes.xml 25 Apr 2004 02:26:22 -0000 1.13
+++ changes.xml 25 Apr 2004 03:15:28 -0000 1.14
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
