From 1a0884e252c68ce56cb7fd3182abf474985bbb54 Mon Sep 17 00:00:00 2001 From: Gintas Grigelionis Date: Wed, 4 Jul 2018 17:49:53 +0200 Subject: [PATCH] Merge branch '1.9.x' --- src/etc/ant-update.xsl | 2 +- src/etc/jdepend.xsl | 2 +- src/etc/junit-frames-xalan1.xsl | 22 +++++------ src/etc/junit-noframes.xsl | 4 +- src/etc/testcases/filters/build.xml | 4 +- src/etc/testcases/filters/tokenfilter.xml | 4 +- src/etc/testcases/taskdefs/delete.xml | 21 +++++----- src/etc/testcases/taskdefs/jar.xml | 38 +++++++------------ src/etc/testcases/taskdefs/loadfile.xml | 2 +- .../taskdefs/optional/javah/build.xml | 16 ++++---- src/etc/testcases/taskdefs/optional/pvcs.xml | 13 ++++--- .../taskdefs/optional/xalan-redirect-in.xsl | 10 ++--- .../optional/xml/endpiece-ns-no-location.xml | 2 +- .../taskdefs/optional/xml/endpiece.xml | 2 +- src/etc/testcases/taskdefs/typedef.xml | 6 +-- src/tests/antunit/core/extension/module1.xml | 8 ++-- src/tests/antunit/taskdefs/concat-test.xml | 10 ++--- src/tests/antunit/taskdefs/copy-test.xml | 6 +-- src/tests/antunit/taskdefs/get-test.xml | 4 +- .../antunit/taskdefs/optional/javah-test.xml | 4 +- 20 files changed, 85 insertions(+), 95 deletions(-) diff --git a/src/etc/ant-update.xsl b/src/etc/ant-update.xsl index e013c13e7..659867ffa 100644 --- a/src/etc/ant-update.xsl +++ b/src/etc/ant-update.xsl @@ -1,5 +1,5 @@ - + - + diff --git a/src/etc/junit-frames-xalan1.xsl b/src/etc/junit-frames-xalan1.xsl index f8035e72f..9e7a5548b 100644 --- a/src/etc/junit-frames-xalan1.xsl +++ b/src/etc/junit-frames-xalan1.xsl @@ -257,11 +257,11 @@ h6 {

Tests

- - + + @@ -295,17 +295,17 @@ h6 { - - +--> + cur = TestCases['.'] = new Array(); cur[''] = ''; - + @@ -189,6 +188,4 @@ - - diff --git a/src/etc/testcases/taskdefs/jar.xml b/src/etc/testcases/taskdefs/jar.xml index bd18be5fb..8704d83d4 100644 --- a/src/etc/testcases/taskdefs/jar.xml +++ b/src/etc/testcases/taskdefs/jar.xml @@ -35,27 +35,23 @@ - + - + - + - @@ -66,30 +62,26 @@ - - - - @@ -109,8 +101,7 @@ - - diff --git a/src/etc/testcases/taskdefs/loadfile.xml b/src/etc/testcases/taskdefs/loadfile.xml index 55fdf9d26..75b206396 100644 --- a/src/etc/testcases/taskdefs/loadfile.xml +++ b/src/etc/testcases/taskdefs/loadfile.xml @@ -157,4 +157,4 @@ public class test1 { - + diff --git a/src/etc/testcases/taskdefs/optional/javah/build.xml b/src/etc/testcases/taskdefs/optional/javah/build.xml index c95d2ad2c..d9ebbf306 100644 --- a/src/etc/testcases/taskdefs/optional/javah/build.xml +++ b/src/etc/testcases/taskdefs/optional/javah/build.xml @@ -44,13 +44,13 @@ - - - - - - - - + + + + + + + + diff --git a/src/etc/testcases/taskdefs/optional/pvcs.xml b/src/etc/testcases/taskdefs/optional/pvcs.xml index 6f372596d..d6c7a5f88 100644 --- a/src/etc/testcases/taskdefs/optional/pvcs.xml +++ b/src/etc/testcases/taskdefs/optional/pvcs.xml @@ -25,25 +25,28 @@ - + - + - + + repository="//ct4serv2/pvcs/monitor"/> + repository="//ct4serv2/pvcs/monitor"/> diff --git a/src/etc/testcases/taskdefs/optional/xalan-redirect-in.xsl b/src/etc/testcases/taskdefs/optional/xalan-redirect-in.xsl index 4cd1345c3..222c24279 100644 --- 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. --> - + -
+
With a little luck, the network will pick me up. This is Ripley - last survivor of The Nostromo - signing off.
diff --git a/src/etc/testcases/taskdefs/optional/xml/endpiece.xml b/src/etc/testcases/taskdefs/optional/xml/endpiece.xml index 471af9634..04feed5d2 100644 --- a/src/etc/testcases/taskdefs/optional/xml/endpiece.xml +++ b/src/etc/testcases/taskdefs/optional/xml/endpiece.xml @@ -16,7 +16,7 @@ limitations under the License. --> -
+
With a little luck, the network will pick me up. This is Ripley - last survivor of The Nostromo - signing off.
diff --git a/src/etc/testcases/taskdefs/typedef.xml b/src/etc/testcases/taskdefs/typedef.xml index a63f28dba..071d5ed1a 100644 --- a/src/etc/testcases/taskdefs/typedef.xml +++ b/src/etc/testcases/taskdefs/typedef.xml @@ -71,14 +71,14 @@ - + - + - + diff --git a/src/tests/antunit/core/extension/module1.xml b/src/tests/antunit/core/extension/module1.xml index 3b6312f6b..86d0508f4 100644 --- a/src/tests/antunit/core/extension/module1.xml +++ b/src/tests/antunit/core/extension/module1.xml @@ -17,9 +17,9 @@ --> - - - - + + + + diff --git a/src/tests/antunit/taskdefs/concat-test.xml b/src/tests/antunit/taskdefs/concat-test.xml index 18c5fd9f3..8fd4fff3d 100644 --- a/src/tests/antunit/taskdefs/concat-test.xml +++ b/src/tests/antunit/taskdefs/concat-test.xml @@ -109,10 +109,10 @@ - - - - + + + + @@ -142,7 +142,7 @@
- header + header
diff --git a/src/tests/antunit/taskdefs/copy-test.xml b/src/tests/antunit/taskdefs/copy-test.xml index 69bcb01c0..b18b05d2e 100644 --- a/src/tests/antunit/taskdefs/copy-test.xml +++ b/src/tests/antunit/taskdefs/copy-test.xml @@ -244,7 +244,7 @@ public class NullByteStreamResource extends Resource { - + @@ -468,8 +468,8 @@ public class NullByteStreamResource extends Resource { - - + + diff --git a/src/tests/antunit/taskdefs/get-test.xml b/src/tests/antunit/taskdefs/get-test.xml index ced1dbd23..2e041e4d2 100644 --- a/src/tests/antunit/taskdefs/get-test.xml +++ b/src/tests/antunit/taskdefs/get-test.xml @@ -95,14 +95,14 @@ - + - + diff --git a/src/tests/antunit/taskdefs/optional/javah-test.xml b/src/tests/antunit/taskdefs/optional/javah-test.xml index 41ed9a397..0038d8473 100644 --- 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 { - + - +