added maven.eclipse.resources.addtoclasspath switch to provide backwards compatibilty
with older project structures using the plugin. git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@116186 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
1 parent
e87957e80a
commit
0046ae6bab
6 files changed
+64
-33
No files matched your search
@@ -59,23 +59,24 @@
|
||||
</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:set var="includingAsString" value="" />
|
||||
<j:forEach var="res" items="${resource.includes}">
|
||||
<j:set var="includingAsString" value="${includingAsString}${res}|" />
|
||||
<j:if test="${maven.eclipse.resources.addtoclasspath}">
|
||||
<j:if test="${!pom.build.resources.isEmpty()}">
|
||||
<j:forEach var="resource" items="${pom.build.resources}">
|
||||
<j:set var="includingAsString" value="" />
|
||||
<j:forEach var="res" items="${resource.includes}">
|
||||
<j:set var="includingAsString" value="${includingAsString}${res}|" />
|
||||
</j:forEach>
|
||||
<j:set var="excludingAsString" value="" />
|
||||
<j:forEach var="res" items="${resource.excludes}">
|
||||
<j:set var="excludingAsString" value="${excludingAsString}${res}|" />
|
||||
</j:forEach>
|
||||
<maven:makeRelativePath var="resourceDirectory" basedir="${basedir}" path="${resource.directory}" separator="/"/>
|
||||
<!-- don't add duplicate directories -->
|
||||
<j:if test="${!resourceDirectory.equals(srcDir) and (!resourceDirectory.equals(testSrcDir) or !unitTestSourcesPresent)}">
|
||||
<classpathentry kind="src" path="${resourceDirectory}" including="${includingAsString}" excluding="${excludingAsString}" />
|
||||
</j:if>
|
||||
</j:forEach>
|
||||
<j:set var="excludingAsString" value="" />
|
||||
<j:forEach var="res" items="${resource.excludes}">
|
||||
<j:set var="excludingAsString" value="${excludingAsString}${res}|" />
|
||||
</j:forEach>
|
||||
<maven:makeRelativePath var="resourceDirectory" basedir="${basedir}" path="${resource.directory}" separator="/"/>
|
||||
<!-- don't add duplicate directories -->
|
||||
<j:if test="${!resourceDirectory.equals(srcDir) and (!resourceDirectory.equals(testSrcDir) or !unitTestSourcesPresent)}">
|
||||
<classpathentry kind="src" path="${resourceDirectory}" including="${includingAsString}" excluding="${excludingAsString}" />
|
||||
</j:if>
|
||||
</j:forEach>
|
||||
</j:if>
|
||||
</j:if>
|
||||
</j:if>
|
||||
|
||||
@@ -136,24 +137,26 @@
|
||||
</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:set var="includingAsString" value="" />
|
||||
<j:forEach var="res" items="${resource.includes}">
|
||||
<j:set var="includingAsString" value="${includingAsString}${res}|" />
|
||||
<j:if test="${maven.eclipse.resources.addtoclasspath}">
|
||||
<j:if test="${!pom.build.unitTest.resources.isEmpty()}">
|
||||
<j:forEach var="resource" items="${pom.build.unitTest.resources}">
|
||||
<j:set var="includingAsString" value="" />
|
||||
<j:forEach var="res" items="${resource.includes}">
|
||||
<j:set var="includingAsString" value="${includingAsString}${res}|" />
|
||||
</j:forEach>
|
||||
<j:set var="excludingAsString" value="" />
|
||||
<j:forEach var="res" items="${resource.excludes}">
|
||||
<j:set var="excludingAsString" value="${excludingAsString}${res}|" />
|
||||
</j:forEach>
|
||||
<maven:makeRelativePath var="resourceDirectory" basedir="${basedir}" path="${resource.directory}" separator="/"/>
|
||||
<!-- don't add duplicate directories -->
|
||||
<j:if test="${!resourceDirectory.equals(testSrcDir) and (!resourceDirectory.equals(srcDir) or !sourcesPresent)}">
|
||||
<classpathentry kind="src" path="${resourceDirectory}" output="${testOutputDir}" including="${includingAsString}" excluding="${excludingAsString}"/>
|
||||
</j:if>
|
||||
</j:forEach>
|
||||
<j:set var="excludingAsString" value="" />
|
||||
<j:forEach var="res" items="${resource.excludes}">
|
||||
<j:set var="excludingAsString" value="${excludingAsString}${res}|" />
|
||||
</j:forEach>
|
||||
<maven:makeRelativePath var="resourceDirectory" basedir="${basedir}" path="${resource.directory}" separator="/"/>
|
||||
<!-- don't add duplicate directories -->
|
||||
<j:if test="${!resourceDirectory.equals(testSrcDir) and (!resourceDirectory.equals(srcDir) or !sourcesPresent)}">
|
||||
<classpathentry kind="src" path="${resourceDirectory}" output="${testOutputDir}" including="${includingAsString}" excluding="${excludingAsString}"/>
|
||||
</j:if>
|
||||
</j:forEach>
|
||||
</j:if>
|
||||
</j:if>
|
||||
</j:if>
|
||||
</j:if>
|
||||
</j:if>
|
||||
|
||||
<maven:get var="cactusSrcDir" plugin='cactus-maven' property='cactus.src.dir' />
|
||||
|
||||
Reference in new issue
Block a user