Merge branch '1.9.x' branch into master

7 years ago · 995b518abf
--- a/src/etc/ant-update.xsl
+++ b/src/etc/ant-update.xsl
@@ -1,5 +1,5 @@
 <?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"/>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
--- a/src/etc/jdepend.xsl
+++ b/src/etc/jdepend.xsl
@@ -18,7 +18,7 @@
   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">
    <html>
--- a/src/etc/junit-frames-xalan1.xsl
+++ b/src/etc/junit-frames-xalan1.xsl
@@ -257,11 +257,11 @@ h6 {
            <h2>Tests</h2>
            <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">
                    <tr class="Error">
                        <td colspan="4"><xsl:apply-templates select="./error"/></td>
@@ -295,17 +295,17 @@ h6 {
    </html>
 </xsl:template>
 <!--
  <!--
   Write properties into a JavaScript data structure.
   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();
    <xsl:for-each select="property">
    <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>';
    </xsl:for-each>
 </xsl:template>
  </xsl:template>
 <!-- ======================================================================
@@ -667,8 +667,8 @@ h6 {
                <td><xsl:apply-templates select="error"/></td>
            </xsl:when>
            <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:otherwise>
                <td>Success</td>
--- a/src/etc/junit-noframes.xsl
+++ b/src/etc/junit-noframes.xsl
@@ -405,8 +405,8 @@
                <td><xsl:apply-templates select="error"/></td>
            </xsl:when>
            <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:otherwise>
                <td>Success</td>
--- a/src/etc/poms/ant-javamail/pom.xml
+++ b/src/etc/poms/ant-javamail/pom.xml
@@ -50,7 +50,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
      <version>1.6.1</version>
      <scope>compile</scope>
    </dependency>
  </dependencies> 
  </dependencies>
  <build>
    <plugins>
      <plugin>
--- a/src/etc/testcases/filters/build.xml
+++ b/src/etc/testcases/filters/build.xml
@@ -20,7 +20,7 @@
  <import file="../buildfiletest-base.xml"/>
  <target name="setUp">
    <mkdir dir="${output}"/>
    <mkdir dir="${output}" />
  </target>
  <target name="testLineContains" depends="setUp">
@@ -35,7 +35,7 @@
      </filterchain>
    </copy>
  </target>
  <target name="testNegateLineContains" depends="setUp">
    <copy file="input/linecontains.test"
          tofile="${output}/negatelinecontains.test">
@@ -50,12 +50,12 @@
      <condition>
        <not>
          <filesmatch file1="${output}/negatelinecontains.test"
                      file2="expected/negatelinecontains.test"/>
                      file2="expected/negatelinecontains.test" />
        </not>
      </condition>
    </fail>
  </target>
  <target name="testEscapeUnicode" depends="setUp">
    <copy todir="${output}" encoding="UTF-8">
      <fileset dir="input">
@@ -72,9 +72,9 @@
  <target name="testStripJavaComments" depends="setUp">
    <copy todir="${output}">
      <fileset dir="input" includes="stripjavacomments.test"/>
      <fileset dir="input" includes="stripjavacomments.test" />
      <filterchain>
        <filterreader classname="org.apache.tools.ant.filters.StripJavaComments"/>
        <filterreader classname="org.apache.tools.ant.filters.StripJavaComments" />
      </filterchain>
    </copy>
  </target>
@@ -94,7 +94,7 @@
    <copy tofile="${output}/replaceTokensPropertyFile.test">
      <fileset dir="input" includes="replacetokens.test"/>
      <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"/>
        </filterreader>
      </filterchain>
--- a/src/etc/testcases/filters/head-tail.xml
+++ b/src/etc/testcases/filters/head-tail.xml
@@ -20,7 +20,7 @@
  <import file="../buildfiletest-base.xml"/>
  <target name="setUp">
    <mkdir dir="${output}"/>
    <mkdir dir="${output}" />
  </target>
  <!-- Testcases for HeadFilter -->
@@ -58,7 +58,7 @@
  </target>
  <target name="testFilterReaderHeadLinesSkip" depends="setUp">
    <copy file="input/head-tail.test"
    <copy file="input/head-tail.test" 
          tofile="${output}/head-tail.filterReaderHeadLinesSkip.test">
      <filterchain>
        <filterreader classname="org.apache.tools.ant.filters.HeadFilter">
@@ -112,7 +112,7 @@
  </target>
  <target name="testFilterReaderTailLinesSkip" depends="setUp">
    <copy file="input/head-tail.test"
    <copy file="input/head-tail.test" 
          tofile="${output}/head-tail.filterReaderTailLinesSkip.test">
      <filterchain>
        <filterreader classname="org.apache.tools.ant.filters.TailFilter">
--- a/src/etc/testcases/filters/tokenfilter.xml
+++ b/src/etc/testcases/filters/tokenfilter.xml
@@ -350,8 +350,8 @@
      hello world
    </concat>
    <replaceregexp file="${output}/replaceregexp"
                   match="hello( )world"
                   replace="bye\1world"/>
                  match="hello( )world"
                  replace="bye\1world"/>
  </target>
 </project>
--- a/src/etc/testcases/taskdefs/delete.xml
+++ b/src/etc/testcases/taskdefs/delete.xml
@@ -119,7 +119,7 @@
  <target name="test9" depends="init">
    <delete>
      <files>
        <include name="${dir}/**"/>
          <include name="${dir}/**"/>
      </files>
    </delete>
    <expectabsent />
@@ -188,4 +188,6 @@
    <expectabsent target="${dir}/subdir"/>
  </target>
 </project>
--- a/src/etc/testcases/taskdefs/jar.xml
+++ b/src/etc/testcases/taskdefs/jar.xml
@@ -57,7 +57,8 @@
  </target>
  <target name="testNoRecreateWithUpdate">
    <jar destfile="${tmp.jar}"
    <jar
         destfile="${tmp.jar}"
         basedir="."
         includes="jar.xml"
         update="true"
@@ -69,14 +70,16 @@
  </target>
  <target name="testRecreateWithoutUpdateAdditionalFiles">
    <jar destfile="${tmp.jar}"
    <jar
         destfile="${tmp.jar}"
         includes="*.xml"
         basedir="."
    />
  </target>
  <target name="testRecreateWithUpdateAdditionalFiles">
    <jar destfile="${tmp.jar}"
    <jar
         destfile="${tmp.jar}"
         basedir="."
         includes="*.xml"
         update="true"
@@ -84,14 +87,16 @@
  </target>
  <target name="testRecreateWithoutUpdateNewerFile">
    <jar destfile="${tmp.jar}"
    <jar
         destfile="${tmp.jar}"
         basedir="."
         includes="jar.xml"
    />
  </target>
  <target name="testRecreateWithUpdateNewerFile">
    <jar destfile="${tmp.jar}"
    <jar
         destfile="${tmp.jar}"
         basedir="."
         includes="jar.xml"
         update="true"
@@ -112,7 +117,8 @@
  </target>    
  <target name="testNoRecreateBasedirExcludesWithUpdate">
    <jar destfile="${tmp.jar}"
    <jar
         destfile="${tmp.jar}"
         basedir="."
         includes="j*.xml"
         excludes="java.xml"
@@ -121,7 +127,8 @@
  </target>
  <target name="testNoRecreateBasedirExcludesWithoutUpdate">
    <jar destfile="${tmp.jar}"
    <jar
         destfile="${tmp.jar}"
         basedir="."
         includes="j*.xml"
         excludes="java.xml"
--- a/src/etc/testcases/taskdefs/loadfile.xml
+++ b/src/etc/testcases/taskdefs/loadfile.xml
@@ -115,7 +115,7 @@ public class test1 {
    private static final String GREETING="*/Hello/*";
    private static final String GREETING1="/*Hello*/";
    public static void main(String args[]) {
    public static void main( String args[] ) {
    }
 }</echo>
      <echo file="nocomments.tmp">
@@ -126,7 +126,7 @@ public class test1 {
    private static final String GREETING="*/Hello/*";
    private static final String GREETING1="/*Hello*/";
    public static void main(String args[]) {
    public static void main( String args[] ) {
    }
 }</echo>
      <loadfile srcFile="loadfile1.tmp" 
@@ -160,4 +160,4 @@ public class test1 {
    <delete file="nocomments.tmp"/>
  </target>
 </project>
  </project>
--- a/src/etc/testcases/taskdefs/optional/javah/build.xml
+++ b/src/etc/testcases/taskdefs/optional/javah/build.xml
@@ -44,13 +44,13 @@
  </target>
  <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>
 </project>
--- a/src/etc/testcases/taskdefs/optional/pvcs.xml
+++ b/src/etc/testcases/taskdefs/optional/pvcs.xml
@@ -25,18 +25,15 @@
  </target>
  <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 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 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 name="test5" description="Get the latest from PVCS">
--- a/src/etc/testcases/taskdefs/optional/script.xml
+++ b/src/etc/testcases/taskdefs/optional/script.xml
@@ -29,10 +29,10 @@
    <script language="javascript"> <![CDATA[
      for (i = 1; i <= 10; i++) {
      for (i=1; i<=10; i++) {
        echo = testproject.createTask("echo");
        setup1.addTask(echo);
        echo.setMessage(i * i);
        echo.setMessage(i*i);
      }
    ]]> </script>
--- a/src/etc/testcases/taskdefs/optional/xalan-redirect-in.xsl
+++ b/src/etc/testcases/taskdefs/optional/xalan-redirect-in.xsl
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   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
 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="/">
 <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>
 </xsl:template>
--- a/src/etc/testcases/taskdefs/typedef.xml
+++ b/src/etc/testcases/taskdefs/typedef.xml
@@ -71,11 +71,11 @@
  </target>
  <target name="noresourcefailall">
    <typedef resource="somenotpresentfile.properties" onerror="failall"/>
  	<typedef resource="somenotpresentfile.properties" onerror="failall"/>
  </target>
  <target name="noresourcefail">
    <typedef resource="somenotpresentfile.properties" onerror="fail"/>
  	<typedef resource="somenotpresentfile.properties" onerror="fail"/>
  </target>
  <target name="noresourcenotfail">
--- a/src/tests/antunit/core/extension/module1.xml
+++ b/src/tests/antunit/core/extension/module1.xml
@@ -17,9 +17,9 @@
 -->
 <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>
--- a/src/tests/antunit/taskdefs/concat-test.xml
+++ b/src/tests/antunit/taskdefs/concat-test.xml
@@ -109,10 +109,10 @@
            <file name="2"/>
          </filelist>
          <filterchain>
            <tokenfilter>
              <ignoreblank/>
            </tokenfilter>
          </filterchain>
 	    <tokenfilter>
 	      <ignoreblank/>
 	    </tokenfilter>
 	  </filterchain>
        </concat>
      </resourcesmatch>
    </au:assertTrue>
@@ -142,7 +142,7 @@
    <concat destfile="${output}/TESTDEST" ignoreEmpty="false">
      <filelist dir="${input}" files="thisfiledoesnotexist" />
      <header filtering="false" trim="yes">
        header
 	header
      </header>
    </concat>
    <au:assertFileExists file="${output}/TESTDEST" />
--- a/src/tests/antunit/taskdefs/get-test.xml
+++ b/src/tests/antunit/taskdefs/get-test.xml
@@ -20,7 +20,7 @@
  <import file="../antunit-base.xml" />
  <property name="location" value="http://ant.apache.org/webtest/gettest" />
  <target name="setUp">
    <mkdir dir="${output}" />
  </target>
--- a/src/tests/antunit/taskdefs/optional/javah-test.xml
+++ b/src/tests/antunit/taskdefs/optional/javah-test.xml
@@ -92,10 +92,10 @@ public class Foo {
    <presetdef name="javah-fileset">
      <javah destdir="${output}">
        <fileset dir="${output}">
          <include name="**/*.class"/>
  	  <include name="**/*.class"/>
        </fileset>
        <classpath>
          <pathelement location="${output}"/>
  	  <pathelement location="${output}"/>
        </classpath>
      </javah>
    </presetdef>
--- a/src/tests/antunit/taskdefs/rmic-test.xml
+++ b/src/tests/antunit/taskdefs/rmic-test.xml
@@ -85,7 +85,7 @@ package org.example;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 public interface Foo extends Remote {
    long bar() throws RemoteException;
    long bar() throws RemoteException ;
 }]]></echo>
    <echo file="${input}/org/example/FooImpl.java"><![CDATA[
 package org.example;