maven-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vmas...@apache.org
Subject cvs commit: maven/src/plugins-build/cactus plugin.jelly
Date Thu, 05 Jun 2003 05:35:33 GMT
vmassol     2003/06/04 22:35:33

  Modified:    src/plugins-build/cactus plugin.jelly
  Log:
  Applied Florin's patch for Fileset include/exclude so that comma separated list are supported.
  
  Revision  Changes    Path
  1.18      +9 -12     maven/src/plugins-build/cactus/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/cactus/plugin.jelly,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- plugin.jelly	28 May 2003 09:41:43 -0000	1.17
  +++ plugin.jelly	5 Jun 2003 05:35:33 -0000	1.18
  @@ -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>
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org


Mime
View raw message