You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2004/04/25 04:26:22 UTC
cvs commit: maven-plugins/eclipse/xdocs changes.xml
brett 2004/04/24 19:26:22
Modified: eclipse project.xml
eclipse/src/plugin-resources/templates classpath.jelly
eclipse/xdocs changes.xml
Log:
PR: MPECLIPSE-21
Submitted by: Boris Boehlen
use sourcemods
Revision Changes Path
1.27 +1 -1 maven-plugins/eclipse/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/eclipse/project.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- project.xml 10 Apr 2004 00:59:23 -0000 1.26
+++ project.xml 25 Apr 2004 02:26:22 -0000 1.27
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-eclipse-plugin</id>
<name>Maven Eclipse Plug-in</name>
- <currentVersion>1.6</currentVersion>
+ <currentVersion>1.7-SNAPSHOT</currentVersion>
<description>A plugin to generate various files for the Eclipse IDE and ease the use of Maven within that environment. Requires Maven 1.0 RC2.</description>
<shortDescription>Eclipse Plugin for Maven</shortDescription>
<url>http://maven.apache.org/reference/plugins/eclipse/</url>
1.10 +8 -1 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- classpath.jelly 4 Mar 2004 18:04:37 -0000 1.9
+++ classpath.jelly 25 Apr 2004 02:26:22 -0000 1.10
@@ -29,7 +29,14 @@
<classpath>
<j:if test="${sourcesPresent}">
<maven:makeRelativePath var="srcDir" basedir="${basedir}" path="${pom.build.sourceDirectory}"/>
- <classpathentry kind="src" path="${srcDir}"/>
+ <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>
+ </j:forEach>
+ <j:set var="excluding">${excluding.substring(1)}</j:set>
+ <classpathentry kind="src" path="${srcDir}" excluding="${excluding}" />
</j:if>
<j:if test="${unitTestSourcesPresent}">
1.13 +3 -0 maven-plugins/eclipse/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/eclipse/xdocs/changes.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- changes.xml 10 Mar 2004 12:32:46 -0000 1.12
+++ changes.xml 25 Apr 2004 02:26:22 -0000 1.13
@@ -24,6 +24,9 @@
<author email="dion@multitask.com.au">dIon Gillard</author>
</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>
+ </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>
<action dev="epugh" type="add">Add support for having multiple other directories included in the classpath.</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: cvs commit: maven-plugins/eclipse/xdocs changes.xml
Posted by di...@multitask.com.au.
brett@apache.org wrote on 25/04/2004 12:26:22 PM:
> brett 2004/04/24 19:26:22
>
> Modified: eclipse project.xml
> eclipse/src/plugin-resources/templates classpath.jelly
> eclipse/xdocs changes.xml
> Log:
> PR: MPECLIPSE-21
> Submitted by: Boris Boehlen
> use sourcemods
I had a problem with this patch, in that it blindy assumed the conditions
of the sourceModification are met, e.g.
> + <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>
> + </j:forEach>
> + <j:set var="excluding">${excluding.substring(1)}</j:set>
> + <classpathentry kind="src" path="${srcDir}"
excluding="${excluding}" />
Note that the class in sourceModifications isn't used.
I'd rather we didn't apply this one.
--
dIon
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org