incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlboud...@apache.org
Subject svn commit: r1369456 - /incubator/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant
Date Sat, 04 Aug 2012 21:20:03 GMT
Author: jlboudart
Date: Sat Aug  4 21:20:03 2012
New Revision: 1369456

URL: http://svn.apache.org/viewvc?rev=1369456&view=rev
Log:
Fixes antcontrib namespace issues in abstract-test

Modified:
    incubator/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant

Modified: incubator/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant?rev=1369456&r1=1369455&r2=1369456&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant (original)
+++ incubator/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant Sat
Aug  4 21:20:03 2012
@@ -134,49 +134,49 @@
                          erroronmissingdir="false"/>
             </resources>
 
-            <if>
+            <ac:if>
                 <istrue value="${@{prefix}.scan.path}"/>
-                <then>
-                    <for param="test.collection">
+                <ac:then>
+                    <ac:for param="test.collection">
                         <test-path/>
                         <sequential>
                             <echo level="verbose">Examining @{test.collection} for
test cases</echo>
-                            <if>
+                            <ac:if>
                                 <and>
                                     <available file="@{test.collection}" type="file"/>
                                     <matches string="@{test.collection}" pattern="${@{prefix}.jar.pattern}"/>
                                 </and>
-                                <then>
+                                <ac:then>
                                     <echo level="verbose">Adding test cases from test
jar @{test.collection}</echo>
                                     <augment id="target.@{prefix}.set">
                                         <zipfileset src="@{test.collection}" includes="${@{prefix}.run.includes.pattern}"
excludes="${@{prefix}.run.excludes.pattern}"/>
                                     </augment>
-                                </then>
-                                <else>
-                                    <if>
+                                </ac:then>
+                                <ac:else>
+                                    <ac:if>
                                         <available file="@{test.collection}" type="dir"/>
-                                        <then>
+                                        <ac:then>
                                             <echo level="verbose">Adding test cases
from test class directory @{test.collection}</echo>
                                             <augment id="target.@{prefix}.set">
                                                 <fileset dir="@{test.collection}" includes="${@{prefix}.run.includes.pattern}"
excludes="${@{prefix}.run.excludes.pattern}"/>
                                             </augment>
-                                        </then>
-                                        <else>
+                                        </ac:then>
+                                        <ac:else>
                                             <echo level="verbose">Test path entry @{test.collection}
does not appear to be a directory or a test jar, skipping</echo>
-                                        </else>
-                                    </if>
-                                </else>
-                            </if>
+                                        </ac:else>
+                                    </ac:if>
+                                </ac:else>
+                            </ac:if>
                         </sequential>
-                    </for>
+                    </ac:for>
                     <condition property="skip.@{prefix}">
                         <resourcecount refid="target.@{prefix}.set" when="equal" count="0"/>
                     </condition>
-                </then>
-                <else>
+                </ac:then>
+                <ac:else>
                     <echo level="verbose">Test path scanning disabled by property @{prefix}.scan.path</echo>
-                </else>
-            </if>
+                </ac:else>
+            </ac:if>
 
         </sequential>
     </macrodef>



Mime
View raw message