Applied Florin's patch for Fileset include/exclude so that comma separated list are supported.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113466 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -230,10 +230,9 @@
|
||||
<ant:setProperty name="serverxml" value="${cactus.tomcat4x.config}"/>
|
||||
</j:if>
|
||||
<j:if test="${context.getVariable('cactus.tomcat4x.conf.dir') != null}">
|
||||
<conf dir="${cactus.tomcat4x.conf.dir}">
|
||||
<ant:include name="${cactus.tomcat4x.conf.includes}"/>
|
||||
<ant:exclude name="${cactus.tomcat4x.conf.excludes}"/>
|
||||
</conf>
|
||||
<conf dir="${cactus.tomcat4x.conf.dir}"
|
||||
includes="${cactus.tomcat4x.conf.includes}"
|
||||
excludes="${cactus.tomcat4x.conf.excludes}"/>
|
||||
</j:if>
|
||||
</tomcat4x>
|
||||
|
||||
@@ -245,10 +244,9 @@
|
||||
<ant:setProperty name="serverxml" value="${cactus.tomcat5x.config}"/>
|
||||
</j:if>
|
||||
<j:if test="${context.getVariable('cactus.tomcat5x.conf.dir') != null}">
|
||||
<conf dir="${cactus.tomcat5x.conf.dir}">
|
||||
<ant:include name="${cactus.tomcat5x.conf.includes}"/>
|
||||
<ant:exclude name="${cactus.tomcat5x.conf.excludes}"/>
|
||||
</conf>
|
||||
<conf dir="${cactus.tomcat5x.conf.dir}"
|
||||
includes="${cactus.tomcat5x.conf.includes}"
|
||||
excludes="${cactus.tomcat5x.conf.excludes}"/>
|
||||
</j:if>
|
||||
</tomcat5x>
|
||||
|
||||
@@ -256,10 +254,9 @@
|
||||
<ant:formatter type="plain" usefile="${cactus.junit.usefile}"/>
|
||||
<ant:formatter type="xml"/>
|
||||
<ant:batchtest>
|
||||
<ant:fileset dir="${cactus.src.dir}">
|
||||
<ant:include name="${cactus.src.includes}"/>
|
||||
<ant:exclude name="${cactus.src.excludes}"/>
|
||||
</ant:fileset>
|
||||
<ant:fileset dir="${cactus.src.dir}"
|
||||
includes="${cactus.src.includes}"
|
||||
excludes="${cactus.src.excludes}"/>
|
||||
</ant:batchtest>
|
||||
</cactus>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user