You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ep...@apache.org on 2004/10/19 13:55:28 UTC
cvs commit: maven-plugins/eclipse/xdocs changes.xml properties.xml
epugh 2004/10/19 04:55:28
Modified: eclipse/src/plugin-resources/templates classpath.jelly
eclipse/src/plugin-test maven.xml
eclipse/xdocs changes.xml properties.xml
Log:
MPECLIPSE-50 Support for Eclipse-Plugin maven projects (or kind="con" classpath)
Revision Changes Path
1.27 +4 -0 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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- classpath.jelly 15 Oct 2004 18:08:29 -0000 1.26
+++ classpath.jelly 19 Oct 2004 11:55:28 -0000 1.27
@@ -92,6 +92,10 @@
<ant:echo>Setting compile of ${testSrcDir} to ${testOutputDir}</ant:echo>
<classpathentry kind="src" path="${testSrcDir}" output="${testOutputDir}"/>
+ <u:tokenize var="conclasspaths" delim=",">${maven.eclipse.conclasspath}</u:tokenize>
+ <j:forEach var="conclasspath" items="${conclasspaths}" trim="true">
+ <classpathentry kind="con" path="${conclasspath}"/>
+ </j:forEach>
<!-- Here are the rules:
If the project has maven.eclipse.junit property, add that ver of junit
1.15 +14 -1 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- maven.xml 15 Oct 2004 13:48:11 -0000 1.14
+++ maven.xml 19 Oct 2004 11:55:28 -0000 1.15
@@ -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">
+ <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">
@@ -141,5 +141,18 @@
<x:set var="countUniqueSrc" select="count($classpathDoc/classpath/classpathentry[contains(@path,'src/main')])"/>
<assert:assertEquals expected="1" value="${countUniqueSrc.intValue().toString()}" msg="Src directory should be added only once"/>
</goal>
+
+ <goal name="test-classpath-con-entry">
+ <attainGoal name="test-init"/>
+ <j:set var="maven.eclipse.conclasspath" value="org.eclipse.pde.core.requiredPlugins"/>
+ <attainGoal name="eclipse"/>
+
+ <assert:assertFileExists file="${dotClasspath}" />
+
+ <u:file var="classpathFile" name="${dotClasspath}"/>
+ <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>
</project>
1.34 +1 -0 maven-plugins/eclipse/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/eclipse/xdocs/changes.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- changes.xml 15 Oct 2004 09:45:05 -0000 1.33
+++ changes.xml 19 Oct 2004 11:55:28 -0000 1.34
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.9" date="in cvs">
+ <action dev="epugh" type="add" issue="MPECLIPSE-50" due-to="Simon Ringuette">Support for Eclipse-Plugin maven projects (or kind="con" classpath).</action>
<action dev="epugh" type="fix" issue="MPECLIPSE-49" due-to="Fabrizio Giustina">duplicate build path added if resouce directory is the same as java source dir.</action>
<action dev="epugh" type="fix" issue="MPECLIPSE-48" due-to="Fabrizio Giustina">Simple implementation of handling source artifacts.</action>
<action dev="evenisse" type="fix" issue="MPECLIPSE-47">Add resources directories and test resources directories to .classpath.</action>
1.13 +10 -1 maven-plugins/eclipse/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/eclipse/xdocs/properties.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- properties.xml 15 Oct 2004 09:45:05 -0000 1.12
+++ properties.xml 19 Oct 2004 11:55:28 -0000 1.13
@@ -77,8 +77,17 @@
<td>maven.eclipse.classpath.include</td>
<td>Yes</td>
<td>
- Comma delimited list of additional directories to include in
+ Comma delimited list of additional source directories to include in
the classpath, like <code>src/conf</code>.
+ </td>
+ </tr>
+ <tr>
+ <td>maven.eclipse.conclasspath</td>
+ <td>Yes</td>
+ <td>
+ Comma delimited list of additional kind "con" path
+ to include in the classpath description file like
+ <code>org.eclipse.pde.core.requiredPlugins</code>
</td>
</tr>
<tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org