MPECLIPSE-47. Add resources directories and test resources directories to .classpath.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@116129 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -54,6 +54,19 @@
|
||||
</j:if>
|
||||
</j:forEach>
|
||||
<classpathentry kind="src" path="${srcDir}" excluding="${excluding}" />
|
||||
|
||||
<j:if test="${!pom.build.resources.isEmpty()}">
|
||||
<j:forEach var="resource" items="${pom.build.resources}">
|
||||
<j:new var="file" className="java.io.File">
|
||||
<j:arg value="${basedir}"/>
|
||||
</j:new>
|
||||
<j:invokeStatic var="resourceDirectory" className="org.apache.maven.MavenUtils" method="makeRelativePath">
|
||||
<j:arg value="${file}"/>
|
||||
<j:arg value="${resource.directory}"/>
|
||||
</j:invokeStatic>
|
||||
<classpathentry kind="src" path="${resourceDirectory}"/>
|
||||
</j:forEach>
|
||||
</j:if>
|
||||
</j:if>
|
||||
|
||||
<!-- Add the list of additional directories for the classpath from ${maven.eclipse.classpath.include}-->
|
||||
@@ -109,6 +122,21 @@
|
||||
<j:set var="ignoreJUnit" value="true" />
|
||||
<classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-${depVersion}.jar"/>
|
||||
</j:if>
|
||||
|
||||
<j:if test="${pom.build.unitTest != null}">
|
||||
<j:if test="${!pom.build.unitTest.resources.isEmpty()}">
|
||||
<j:forEach var="resource" items="${pom.build.unitTest.resources}">
|
||||
<j:new var="file" className="java.io.File">
|
||||
<j:arg value="${basedir}"/>
|
||||
</j:new>
|
||||
<j:invokeStatic var="resourceDirectory" className="org.apache.maven.MavenUtils" method="makeRelativePath">
|
||||
<j:arg value="${file}"/>
|
||||
<j:arg value="${resource.directory}"/>
|
||||
</j:invokeStatic>
|
||||
<classpathentry kind="src" path="${resourceDirectory}" output="${testOutputDir}"/>
|
||||
</j:forEach>
|
||||
</j:if>
|
||||
</j:if>
|
||||
</j:if>
|
||||
|
||||
<maven:pluginVar var="cactusSrcDir" plugin='cactus-maven' property='cactus.src.dir' />
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
</properties>
|
||||
<body>
|
||||
<release version="1.9" date="in cvs">
|
||||
<action dev="evenisse" type="fix" issue="MPECLIPSE-47">Add resources directories and test resources directories to .classpath.</action>
|
||||
<action dev="epugh" type="fix" issue="MPECLIPSE-46" due-to="Archimedes Trajano">Overriden jar that resides outside maven repo doesn't get resolved properly.</action>
|
||||
<action dev="epugh" type="fix" issue="MPECLIPSE-38">Jar overrides are now properly supported.</action>
|
||||
</release>
|
||||
|
||||
Reference in New Issue
Block a user