wangwei
/
antliscence
forked from youys/ant
Not watched
1
0
Fork 0
Code
Releases 0 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

Merge branch '1.9.x'

master
Gintas Grigelionis 7 years ago
parent
c05c56df68
commit
1a0884e252
20 changed files with 85 additions and 95 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      src/etc/ant-update.xsl
  2. +1
    -1
      src/etc/jdepend.xsl
  3. +11
    -11
      src/etc/junit-frames-xalan1.xsl
  4. +2
    -2
      src/etc/junit-noframes.xsl
  5. +2
    -2
      src/etc/testcases/filters/build.xml
  6. +2
    -2
      src/etc/testcases/filters/tokenfilter.xml
  7. +9
    -12
      src/etc/testcases/taskdefs/delete.xml
  8. +14
    -24
      src/etc/testcases/taskdefs/jar.xml
  9. +1
    -1
      src/etc/testcases/taskdefs/loadfile.xml
  10. +8
    -8
      src/etc/testcases/taskdefs/optional/javah/build.xml
  11. +8
    -5
      src/etc/testcases/taskdefs/optional/pvcs.xml
  12. +5
    -5
      src/etc/testcases/taskdefs/optional/xalan-redirect-in.xsl
  13. +1
    -1
      src/etc/testcases/taskdefs/optional/xml/endpiece-ns-no-location.xml
  14. +1
    -1
      src/etc/testcases/taskdefs/optional/xml/endpiece.xml
  15. +3
    -3
      src/etc/testcases/taskdefs/typedef.xml
  16. +4
    -4
      src/tests/antunit/core/extension/module1.xml
  17. +5
    -5
      src/tests/antunit/taskdefs/concat-test.xml
  18. +3
    -3
      src/tests/antunit/taskdefs/copy-test.xml
  19. +2
    -2
      src/tests/antunit/taskdefs/get-test.xml
  20. +2
    -2
      src/tests/antunit/taskdefs/optional/javah-test.xml

+ 1
- 1
src/etc/ant-update.xsl View File

@@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="xml" indent="yes"/> <xsl:output method="xml" indent="yes"/>
<!-- <!--
Licensed to the Apache Software Foundation (ASF) under one or more Licensed to the Apache Software Foundation (ASF) under one or more


+ 1
- 1
src/etc/jdepend.xsl View File

@@ -18,7 +18,7 @@
limitations under the License. limitations under the License.
--> -->


<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
<xsl:output method="html" indent="yes" encoding="US-ASCII"/>


<xsl:template match="JDepend"> <xsl:template match="JDepend">
<html> <html>


+ 11
- 11
src/etc/junit-frames-xalan1.xsl View File

@@ -257,11 +257,11 @@ h6 {


<h2>Tests</h2> <h2>Tests</h2>
<table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
<xsl:call-template name="testcase.test.header"/>
<!--
test can even not be started at all (failure to load the class)
so report the error directly
-->
<xsl:call-template name="testcase.test.header"/>
<!--
test can even not be started at all (failure to load the class)
so report the error directly
-->
<xsl:if test="./error"> <xsl:if test="./error">
<tr class="Error"> <tr class="Error">
<td colspan="4"><xsl:apply-templates select="./error"/></td> <td colspan="4"><xsl:apply-templates select="./error"/></td>
@@ -295,17 +295,17 @@ h6 {
</html> </html>
</xsl:template> </xsl:template>


<!--
<!--
Write properties into a JavaScript data structure. Write properties into a JavaScript data structure.
This is based on the original idea by Erik Hatcher (ehatcher@apache.org) This is based on the original idea by Erik Hatcher (ehatcher@apache.org)
-->
<xsl:template match="properties">
-->
<xsl:template match="properties">
cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of select="../@name"/>'] = new Array(); cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of select="../@name"/>'] = new Array();
<xsl:for-each select="property"> <xsl:for-each select="property">
<xsl:sort select="@name"/> <xsl:sort select="@name"/>
cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>'; cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>';
</xsl:for-each> </xsl:for-each>
</xsl:template>
</xsl:template>




<!-- ====================================================================== <!-- ======================================================================
@@ -667,8 +667,8 @@ h6 {
<td><xsl:apply-templates select="error"/></td> <td><xsl:apply-templates select="error"/></td>
</xsl:when> </xsl:when>
<xsl:when test="skipped"> <xsl:when test="skipped">
<td>Skipped</td>
<td><xsl:apply-templates select="skipped"/></td>
<td>Skipped</td>
<td><xsl:apply-templates select="skipped"/></td>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<td>Success</td> <td>Success</td>


+ 2
- 2
src/etc/junit-noframes.xsl View File

@@ -405,8 +405,8 @@
<td><xsl:apply-templates select="error"/></td> <td><xsl:apply-templates select="error"/></td>
</xsl:when> </xsl:when>
<xsl:when test="skipped"> <xsl:when test="skipped">
<td>Skipped</td>
<td><xsl:apply-templates select="skipped"/></td>
<td>Skipped</td>
<td><xsl:apply-templates select="skipped"/></td>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<td>Success</td> <td>Success</td>


+ 2
- 2
src/etc/testcases/filters/build.xml View File

@@ -94,9 +94,9 @@
<copy tofile="${output}/replaceTokensPropertyFile.test"> <copy tofile="${output}/replaceTokensPropertyFile.test">
<fileset dir="input" includes="replacetokens.test"/> <fileset dir="input" includes="replacetokens.test"/>
<filterchain> <filterchain>
<filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
<filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
<param type="propertiesfile" value="${basedir}/input/sample.properties"/> <param type="propertiesfile" value="${basedir}/input/sample.properties"/>
</filterreader>
</filterreader>
</filterchain> </filterchain>
</copy> </copy>
</target> </target>


+ 2
- 2
src/etc/testcases/filters/tokenfilter.xml View File

@@ -350,8 +350,8 @@
hello world hello world
</concat> </concat>
<replaceregexp file="${output}/replaceregexp" <replaceregexp file="${output}/replaceregexp"
match="hello( )world"
replace="bye\1world"/>
match="hello( )world"
replace="bye\1world"/>
</target> </target>


</project> </project>

+ 9
- 12
src/etc/testcases/taskdefs/delete.xml View File

@@ -20,7 +20,6 @@


<import file="../buildfiletest-base.xml"/> <import file="../buildfiletest-base.xml"/>



<property name="dir" location="${output}"/> <property name="dir" location="${output}"/>
<basename property="dirname" file="${output}"/> <basename property="dirname" file="${output}"/>


@@ -120,7 +119,7 @@
<target name="test9" depends="init"> <target name="test9" depends="init">
<delete> <delete>
<files> <files>
<include name="${dir}/**"/>
<include name="${dir}/**"/>
</files> </files>
</delete> </delete>
<expectabsent/> <expectabsent/>
@@ -153,17 +152,17 @@
</target> </target>


<target name="test14" depends="init"> <target name="test14" depends="init">
<delete quiet="false">
<fileset dir="${dir}"/>
<fileset dir="${dir}"/>
</delete>
<delete quiet="false">
<fileset dir="${dir}"/>
<fileset dir="${dir}"/>
</delete>
</target> </target>


<target name="test15" depends="init"> <target name="test15" depends="init">
<delete quiet="true">
<fileset dir="${dir}"/>
<fileset dir="${dir}"/>
</delete>
<delete quiet="true">
<fileset dir="${dir}"/>
<fileset dir="${dir}"/>
</delete>
</target> </target>
<!-- Bugzilla 40313 --> <!-- Bugzilla 40313 -->
<target name="test16.init"> <target name="test16.init">
@@ -189,6 +188,4 @@
<expectabsent target="${dir}/subdir"/> <expectabsent target="${dir}/subdir"/>
</target> </target>




</project> </project>

+ 14
- 24
src/etc/testcases/taskdefs/jar.xml View File

@@ -35,27 +35,23 @@
</target> </target>


<target name="test2"> <target name="test2">
<jar
jarfile="jar.tmp"
manifest="none"/>
<jar jarfile="jar.tmp"
manifest="none"/>
</target> </target>


<target name="test3"> <target name="test3">
<jar
destfile="jar.tmp"
whenempty="format C: /y"/>
<jar destfile="jar.tmp"
whenempty="format C: /y"/>
</target> </target>


<target name="test4"> <target name="test4">
<jar
destfile="${tmp.jar}"
basedir="."
includes="jar.xml"/>
<jar destfile="${tmp.jar}"
basedir="."
includes="jar.xml"/>
</target> </target>


<target name="testNoRecreateWithUpdate"> <target name="testNoRecreateWithUpdate">
<jar
destfile="${tmp.jar}"
<jar destfile="${tmp.jar}"
basedir="." basedir="."
includes="jar.xml" includes="jar.xml"
update="true"/> update="true"/>
@@ -66,30 +62,26 @@
</target> </target>


<target name="testRecreateWithoutUpdateAdditionalFiles"> <target name="testRecreateWithoutUpdateAdditionalFiles">
<jar
destfile="${tmp.jar}"
<jar destfile="${tmp.jar}"
includes="*.xml" includes="*.xml"
basedir="."/> basedir="."/>
</target> </target>


<target name="testRecreateWithUpdateAdditionalFiles"> <target name="testRecreateWithUpdateAdditionalFiles">
<jar
destfile="${tmp.jar}"
<jar destfile="${tmp.jar}"
basedir="." basedir="."
includes="*.xml" includes="*.xml"
update="true"/> update="true"/>
</target> </target>


<target name="testRecreateWithoutUpdateNewerFile"> <target name="testRecreateWithoutUpdateNewerFile">
<jar
destfile="${tmp.jar}"
<jar destfile="${tmp.jar}"
basedir="." basedir="."
includes="jar.xml"/> includes="jar.xml"/>
</target> </target>


<target name="testRecreateWithUpdateNewerFile"> <target name="testRecreateWithUpdateNewerFile">
<jar
destfile="${tmp.jar}"
<jar destfile="${tmp.jar}"
basedir="." basedir="."
includes="jar.xml" includes="jar.xml"
update="true"/> update="true"/>
@@ -109,8 +101,7 @@
</target> </target>


<target name="testNoRecreateBasedirExcludesWithUpdate"> <target name="testNoRecreateBasedirExcludesWithUpdate">
<jar
destfile="${tmp.jar}"
<jar destfile="${tmp.jar}"
basedir="." basedir="."
includes="j*.xml" includes="j*.xml"
excludes="java.xml" excludes="java.xml"
@@ -118,8 +109,7 @@
</target> </target>


<target name="testNoRecreateBasedirExcludesWithoutUpdate"> <target name="testNoRecreateBasedirExcludesWithoutUpdate">
<jar
destfile="${tmp.jar}"
<jar destfile="${tmp.jar}"
basedir="." basedir="."
includes="j*.xml" includes="j*.xml"
excludes="java.xml"/> excludes="java.xml"/>


+ 1
- 1
src/etc/testcases/taskdefs/loadfile.xml View File

@@ -157,4 +157,4 @@ public class test1 {
<delete file="nocomments.tmp"/> <delete file="nocomments.tmp"/>
</target> </target>


</project>
</project>

+ 8
- 8
src/etc/testcases/taskdefs/optional/javah/build.xml View File

@@ -44,13 +44,13 @@
</target> </target>


<target name="test-fileset" depends="compile"> <target name="test-fileset" depends="compile">
<javah destdir="${output}">
<fileset dir="${output}">
<include name="**/*.class"/>
</fileset>
<classpath>
<pathelement location="${output}"/>
</classpath>
</javah>
<javah destdir="${output}">
<fileset dir="${output}">
<include name="**/*.class"/>
</fileset>
<classpath>
<pathelement location="${output}"/>
</classpath>
</javah>
</target> </target>
</project> </project>

+ 8
- 5
src/etc/testcases/taskdefs/optional/pvcs.xml View File

@@ -25,25 +25,28 @@
</target> </target>


<target name="test2"> <target name="test2">
<pvcs pvcsbin="/home/tc/projects/pvcsant/src/etc/testcases/taskdefs" repository="/mnt/pvcs"/>
<pvcs pvcsbin="/home/tc/projects/pvcsant/src/etc/testcases/taskdefs"
repository="/mnt/pvcs"/>
</target> </target>


<target name="test3"> <target name="test3">
<pvcs pvcsbin="\home\cvs\pvcsant\src\etc\testcases\taskdefs" repository="/mnt/pvcs" pvcsproject="/qviknet"/>
<pvcs pvcsbin="\home\cvs\pvcsant\src\etc\testcases\taskdefs"
repository="/mnt/pvcs" pvcsproject="/qviknet"/>
</target> </target>


<target name="test4"> <target name="test4">
<pvcs pvcsbin="\home\cvs\pvcsant\src\etc\testcases\taskdefs" repository="/mnt/pvcs" pvcsproject="/qviknet" workspace="/@/Public/buildws"/>
<pvcs pvcsbin="\home\cvs\pvcsant\src\etc\testcases\taskdefs"
repository="/mnt/pvcs" pvcsproject="/qviknet" workspace="/@/Public/buildws"/>
</target> </target>


<target name="test5" description="Get the latest from PVCS"> <target name="test5" description="Get the latest from PVCS">
<pvcs pvcsbin="/home/cvs/pvcsant/src/etc/testcases/taskdefs" <pvcs pvcsbin="/home/cvs/pvcsant/src/etc/testcases/taskdefs"
repository="//ct4serv2/pvcs/monitor"/>
repository="//ct4serv2/pvcs/monitor"/>
</target> </target>


<target name="test6" description="No pcli to be found"> <target name="test6" description="No pcli to be found">
<pvcs pvcsbin="/never/heard/of/a/directory/structure/like/this" <pvcs pvcsbin="/never/heard/of/a/directory/structure/like/this"
repository="//ct4serv2/pvcs/monitor"/>
repository="//ct4serv2/pvcs/monitor"/>
</target> </target>






+ 5
- 5
src/etc/testcases/taskdefs/optional/xalan-redirect-in.xsl View File

@@ -15,10 +15,10 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
xmlns:lxslt="http://xml.apache.org/xslt"
xmlns:redirect="http://xml.apache.org/xalan/redirect"
extension-element-prefixes="redirect">
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
xmlns:lxslt="http://xml.apache.org/xslt"
xmlns:redirect="http://xml.apache.org/xalan/redirect"
extension-element-prefixes="redirect">
<!-- <!--
This is a test to ensure that systemid is set correctly This is a test to ensure that systemid is set correctly
for a xsl...the behavior might be dependent on Xalan1 for a xsl...the behavior might be dependent on Xalan1
@@ -30,7 +30,7 @@ the base or the JVM working dir just like: new File("xalan-redirect-out.tmp")


<xsl:template match="/"> <xsl:template match="/">
<redirect:write file="./xalan{$xalan-version}-redirect-out.tmp"> <redirect:write file="./xalan{$xalan-version}-redirect-out.tmp">
<test>This should be written to the file</test>
<test>This should be written to the file</test>
</redirect:write> </redirect:write>
</xsl:template> </xsl:template>




+ 1
- 1
src/etc/testcases/taskdefs/optional/xml/endpiece-ns-no-location.xml View File

@@ -16,7 +16,7 @@
limitations under the License. limitations under the License.
--> -->
<doc xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="doc-in-ns.xsd" xmlns="http://apache.org/ant/doc/"> <doc xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="doc-in-ns.xsd" xmlns="http://apache.org/ant/doc/">
<section title="endpiece">
<section title="endpiece">
With a little luck, the network will pick me up. With a little luck, the network will pick me up.
This is Ripley - last survivor of The Nostromo - signing off. This is Ripley - last survivor of The Nostromo - signing off.
</section> </section>


+ 1
- 1
src/etc/testcases/taskdefs/optional/xml/endpiece.xml View File

@@ -16,7 +16,7 @@
limitations under the License. limitations under the License.
--> -->
<doc xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="doc-in-ns.xsd" xmlns="http://apache.org/ant/doc/"> <doc xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="doc-in-ns.xsd" xmlns="http://apache.org/ant/doc/">
<section title="endpiece">
<section title="endpiece">
With a little luck, the network will pick me up. With a little luck, the network will pick me up.
This is Ripley - last survivor of The Nostromo - signing off. This is Ripley - last survivor of The Nostromo - signing off.
</section> </section>


+ 3
- 3
src/etc/testcases/taskdefs/typedef.xml View File

@@ -71,14 +71,14 @@
</target> </target>


<target name="noresourcefailall"> <target name="noresourcefailall">
<typedef resource="somenotpresentfile.properties" onerror="failall"/>
<typedef resource="somenotpresentfile.properties" onerror="failall"/>
</target> </target>


<target name="noresourcefail"> <target name="noresourcefail">
<typedef resource="somenotpresentfile.properties" onerror="fail"/>
<typedef resource="somenotpresentfile.properties" onerror="fail"/>
</target> </target>


<target name="noresourcenotfail"> <target name="noresourcenotfail">
<typedef resource="somenotpresentfile.properties"/>
<typedef resource="somenotpresentfile.properties"/>
</target> </target>
</project> </project>

+ 4
- 4
src/tests/antunit/core/extension/module1.xml View File

@@ -17,9 +17,9 @@
--> -->
<project name="module1"> <project name="module1">


<!-- declare a target with the same name as one in the master -->
<target name="compile" extensionOf="all.compile">
<echo message="In module1 compile. Yay!"/>
</target>
<!-- declare a target with the same name as one in the master -->
<target name="compile" extensionOf="all.compile">
<echo message="In module1 compile. Yay!"/>
</target>


</project> </project>

+ 5
- 5
src/tests/antunit/taskdefs/concat-test.xml View File

@@ -109,10 +109,10 @@
<file name="2"/> <file name="2"/>
</filelist> </filelist>
<filterchain> <filterchain>
<tokenfilter>
<ignoreblank/>
</tokenfilter>
</filterchain>
<tokenfilter>
<ignoreblank/>
</tokenfilter>
</filterchain>
</concat> </concat>
</resourcesmatch> </resourcesmatch>
</au:assertTrue> </au:assertTrue>
@@ -142,7 +142,7 @@
<concat destfile="${output}/TESTDEST" ignoreEmpty="false"> <concat destfile="${output}/TESTDEST" ignoreEmpty="false">
<filelist dir="${input}" files="thisfiledoesnotexist"/> <filelist dir="${input}" files="thisfiledoesnotexist"/>
<header filtering="false" trim="yes"> <header filtering="false" trim="yes">
header
header
</header> </header>
</concat> </concat>
<au:assertFileExists file="${output}/TESTDEST"/> <au:assertFileExists file="${output}/TESTDEST"/>


+ 3
- 3
src/tests/antunit/taskdefs/copy-test.xml View File

@@ -244,7 +244,7 @@ public class NullByteStreamResource extends Resource {
<mkdir dir="${output}"/> <mkdir dir="${output}"/>
<mkdir dir="${input}"/> <mkdir dir="${input}"/>
<copy file="${input}/not-there.txt" todir="${output}" failonerror="false" quiet="true"/> <copy file="${input}/not-there.txt" todir="${output}" failonerror="false" quiet="true"/>
<au:assertLogDoesntContain text="Could not find file"/>
<au:assertLogDoesntContain text="Could not find file"/>
</target> </target>


<target name="testMissingFilesetRoot"> <target name="testMissingFilesetRoot">
@@ -468,8 +468,8 @@ public class NullByteStreamResource extends Resource {
<mkdir dir="${output}"/> <mkdir dir="${output}"/>
<copy todir="${output}"> <copy todir="${output}">
<mappedresources> <mappedresources>
<fileset dir="${input}"/>
<globmapper from="a.*" to="*"/>
<fileset dir="${input}"/>
<globmapper from="a.*" to="*"/>
</mappedresources> </mappedresources>
</copy> </copy>
<au:assertFileExists file="${output}/filea"/> <au:assertFileExists file="${output}/filea"/>


+ 2
- 2
src/tests/antunit/taskdefs/get-test.xml View File

@@ -95,14 +95,14 @@




<target name="testInfiniteRedirect" unless="jenkins"> <target name="testInfiniteRedirect" unless="jenkins">
<au:expectfailure expectedmessage="More than 25 times redirected, giving up">
<au:expectfailure expectedmessage="More than 25 times redirected, giving up">
<get src="${location}/infinite.txt" dest="${output}/infinite.tmp"/> <get src="${location}/infinite.txt" dest="${output}/infinite.tmp"/>
</au:expectfailure> </au:expectfailure>
</target> </target>




<target name="testNestedResources"> <target name="testNestedResources">
<get dest="${output}/downloads">
<get dest="${output}/downloads">
<url url="http://ant.apache.org/index.html"/> <url url="http://ant.apache.org/index.html"/>
<url url="http://ant.apache.org/faq.html"/> <url url="http://ant.apache.org/faq.html"/>
</get> </get>


+ 2
- 2
src/tests/antunit/taskdefs/optional/javah-test.xml View File

@@ -92,10 +92,10 @@ public class Foo {
<presetdef name="javah-fileset"> <presetdef name="javah-fileset">
<javah destdir="${output}"> <javah destdir="${output}">
<fileset dir="${output}"> <fileset dir="${output}">
<include name="**/*.class"/>
<include name="**/*.class"/>
</fileset> </fileset>
<classpath> <classpath>
<pathelement location="${output}"/>
<pathelement location="${output}"/>
</classpath> </classpath>
</javah> </javah>
</presetdef> </presetdef>


Write Preview
Loading…
Cancel
Save