MPECLIPSE-50 Support for Eclipse-Plugin maven projects (or kind="con" classpath)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@116152 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
1545d2f6f5
commit
ac4c80304a
@ -92,6 +92,10 @@
|
|||||||
<ant:echo>Setting compile of ${testSrcDir} to ${testOutputDir}</ant:echo>
|
<ant:echo>Setting compile of ${testSrcDir} to ${testOutputDir}</ant:echo>
|
||||||
<classpathentry kind="src" path="${testSrcDir}" output="${testOutputDir}"/>
|
<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:
|
<!-- Here are the rules:
|
||||||
If the project has maven.eclipse.junit property, add that ver of junit
|
If the project has maven.eclipse.junit property, add that ver of junit
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
xmlns:u="jelly:util"
|
xmlns:u="jelly:util"
|
||||||
xmlns:x="jelly:xml">
|
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>
|
||||||
|
|
||||||
<goal name="test-init">
|
<goal name="test-init">
|
||||||
@ -141,5 +141,18 @@
|
|||||||
<x:set var="countUniqueSrc" select="count($classpathDoc/classpath/classpathentry[contains(@path,'src/main')])"/>
|
<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"/>
|
<assert:assertEquals expected="1" value="${countUniqueSrc.intValue().toString()}" msg="Src directory should be added only once"/>
|
||||||
</goal>
|
</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>
|
</project>
|
||||||
@ -25,6 +25,7 @@
|
|||||||
</properties>
|
</properties>
|
||||||
<body>
|
<body>
|
||||||
<release version="1.9" date="in cvs">
|
<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-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="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>
|
<action dev="evenisse" type="fix" issue="MPECLIPSE-47">Add resources directories and test resources directories to .classpath.</action>
|
||||||
|
|||||||
@ -77,10 +77,19 @@
|
|||||||
<td>maven.eclipse.classpath.include</td>
|
<td>maven.eclipse.classpath.include</td>
|
||||||
<td>Yes</td>
|
<td>Yes</td>
|
||||||
<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>.
|
the classpath, like <code>src/conf</code>.
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</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>
|
<tr>
|
||||||
<td>maven.eclipse.buildcommands</td>
|
<td>maven.eclipse.buildcommands</td>
|
||||||
<td>Yes</td>
|
<td>Yes</td>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user