Trailing whitespace Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/2f64e0b5 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/2f64e0b5 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/2f64e0b5
Branch: refs/heads/master Commit: 2f64e0b51c295960cb15aa77c7c1f447b2518e14 Parents: aad5b51 Author: Gintas Grigelionis <[email protected]> Authored: Sun Jul 1 15:31:35 2018 +0200 Committer: Gintas Grigelionis <[email protected]> Committed: Sun Jul 1 15:31:35 2018 +0200 ---------------------------------------------------------------------- WHATSNEW | 2 +- src/etc/ant-update.xsl | 18 +- src/etc/changelog.xsl | 18 +- .../checkstyle-frames-sortby-check.xsl | 188 +++---- src/etc/checkstyle/checkstyle-frames.xsl | 6 +- src/etc/checkstyle/checkstyle-text.xsl | 1 - src/etc/checkstyle/checkstyle-xdoc.xsl | 3 +- src/etc/common2master.xsl | 11 +- src/etc/coverage-frames.xsl | 2 +- src/etc/jdepend-frames.xsl | 2 +- src/etc/jdepend.xsl | 44 +- src/etc/junit-frames-saxon.xsl | 6 +- src/etc/junit-frames-xalan1.xsl | 6 +- src/etc/junit-frames.xsl | 8 +- src/etc/junit-noframes-saxon.xsl | 14 +- src/etc/junit-noframes.xsl | 14 +- src/etc/log.xsl | 20 +- src/etc/maudit-frames.xsl | 2 +- src/etc/mmetrics-frames.xsl | 2 +- src/etc/performance/build.xml | 4 +- src/etc/performance/dirscanner.xml | 4 +- src/etc/poms/ant-apache-log4j/pom.xml | 4 +- src/etc/poms/ant-apache-regexp/pom.xml | 4 +- src/etc/poms/ant-apache-resolver/pom.xml | 2 +- src/etc/poms/ant-apache-xalan2/pom.xml | 6 +- src/etc/poms/ant-commons-logging/pom.xml | 2 +- src/etc/poms/ant-commons-net/pom.xml | 2 +- src/etc/poms/ant-javamail/pom.xml | 6 +- src/etc/poms/ant-jdepend/pom.xml | 2 +- src/etc/poms/ant-jmf/pom.xml | 4 +- src/etc/poms/ant-jsch/pom.xml | 4 +- src/etc/poms/ant-junit/pom.xml | 6 +- src/etc/poms/ant-netrexx/pom.xml | 4 +- src/etc/poms/ant-swing/pom.xml | 2 +- src/etc/poms/ant-testutil/pom.xml | 2 +- src/etc/poms/ant-xz/pom.xml | 2 +- src/etc/tagdiff.xsl | 20 +- src/etc/testcases/buildfiletest-base.xml | 2 +- src/etc/testcases/core/directoryscanner.xml | 2 +- src/etc/testcases/core/dispatch/dispatch.xml | 6 +- src/etc/testcases/core/executor.xml | 2 +- src/etc/testcases/core/extended-taskdef.xml | 4 +- src/etc/testcases/core/immutable.xml | 12 +- src/etc/testcases/core/loaderref/loaderref.xml | 2 +- src/etc/testcases/core/location.xml | 6 +- src/etc/testcases/core/taskcontainer.xml | 26 +- .../testcases/core/topleveltasks/notarget.xml | 4 +- .../core/topleveltasks/targetlevelant.xml | 2 +- .../core/topleveltasks/toplevelant.xml | 4 +- src/etc/testcases/core/unknownelement.xml | 2 +- src/etc/testcases/filters/concat.xml | 2 +- src/etc/testcases/filters/dynamicfilter.xml | 12 +- src/etc/testcases/filters/tokenfilter.xml | 16 +- src/etc/testcases/taskdefs/abstractcvstask.xml | 6 +- src/etc/testcases/taskdefs/ant.xml | 84 +-- src/etc/testcases/taskdefs/ant/ant.xml | 6 +- src/etc/testcases/taskdefs/ant/references.xml | 4 +- src/etc/testcases/taskdefs/antlib.xml | 12 +- src/etc/testcases/taskdefs/available.xml | 62 +-- src/etc/testcases/taskdefs/basename.xml | 4 +- src/etc/testcases/taskdefs/bunzip2.xml | 2 +- src/etc/testcases/taskdefs/bzip2.xml | 4 +- src/etc/testcases/taskdefs/checksum.xml | 108 ++-- src/etc/testcases/taskdefs/classloader.xml | 18 +- src/etc/testcases/taskdefs/concat.xml | 14 +- src/etc/testcases/taskdefs/condition.xml | 232 ++++----- .../taskdefs/conditions/antversion.xml | 12 +- .../testcases/taskdefs/conditions/isfailure.xml | 36 +- .../testcases/taskdefs/conditions/issigned.xml | 2 +- .../taskdefs/conditions/parsersupports.xml | 17 +- .../testcases/taskdefs/conditions/typefound.xml | 4 +- src/etc/testcases/taskdefs/conditions/xor.xml | 48 +- src/etc/testcases/taskdefs/copy.xml | 38 +- src/etc/testcases/taskdefs/copydir.xml | 10 +- src/etc/testcases/taskdefs/copyfile.xml | 8 +- src/etc/testcases/taskdefs/cvspass.xml | 32 +- src/etc/testcases/taskdefs/delete.xml | 64 +-- src/etc/testcases/taskdefs/dynamictask.xml | 6 +- src/etc/testcases/taskdefs/echoxml.xml | 14 +- src/etc/testcases/taskdefs/email/mail.xml | 18 +- src/etc/testcases/taskdefs/exec/blabla.xml | 2 +- src/etc/testcases/taskdefs/fail.xml | 32 +- src/etc/testcases/taskdefs/filter.xml | 18 +- src/etc/testcases/taskdefs/fixcrlf/build.xml | 156 +++--- src/etc/testcases/taskdefs/get.xml | 34 +- src/etc/testcases/taskdefs/gunzip.xml | 10 +- src/etc/testcases/taskdefs/gzip.xml | 10 +- src/etc/testcases/taskdefs/import/import.xml | 6 +- src/etc/testcases/taskdefs/import/imported.xml | 6 +- .../testcases/taskdefs/import/subdir/serial.xml | 1 - src/etc/testcases/taskdefs/initializeclass.xml | 4 +- src/etc/testcases/taskdefs/input.xml | 41 +- src/etc/testcases/taskdefs/jar.xml | 53 +- src/etc/testcases/taskdefs/java.xml | 161 +++--- src/etc/testcases/taskdefs/javadoc/javadoc.xml | 36 +- src/etc/testcases/taskdefs/loadfile.xml | 27 +- src/etc/testcases/taskdefs/makeurl.xml | 25 +- src/etc/testcases/taskdefs/manifest.xml | 48 +- .../testcases/taskdefs/manifestclasspath.xml | 146 +++--- src/etc/testcases/taskdefs/mkdir.xml | 2 +- src/etc/testcases/taskdefs/move.xml | 76 +-- src/etc/testcases/taskdefs/multimap.xml | 8 +- src/etc/testcases/taskdefs/nice.xml | 14 +- .../testcases/taskdefs/optional/antlr/antlr.xml | 16 +- .../taskdefs/optional/depend/depend.xml | 20 +- .../taskdefs/optional/depend/src1/A.java | 1 - .../taskdefs/optional/depend/src1/B.java | 1 - .../taskdefs/optional/depend/src1/C.java | 1 - .../taskdefs/optional/depend/src1/D.java | 1 - .../taskdefs/optional/depend/src1/E.java | 1 - .../taskdefs/optional/depend/src2/A.java | 1 - .../taskdefs/optional/depend/src2/B.java | 1 - .../taskdefs/optional/depend/src3/A.java | 1 - .../taskdefs/optional/depend/src3/B.java | 1 - .../optional/depend/src4/test/MethodParam.java | 1 - .../optional/depend/src4/test/Outer.java | 1 - .../taskdefs/optional/depend/src5/B.java | 1 - .../taskdefs/optional/echoproperties.xml | 39 +- .../optional/i18n/translate/translate.xml | 1 - .../testcases/taskdefs/optional/javah/build.xml | 2 +- .../taskdefs/optional/jdepend/jdepend.xml | 12 +- src/etc/testcases/taskdefs/optional/junit.xml | 113 ++-- .../optional/junit/teardownlistener.xml | 4 +- .../taskdefs/optional/junitlauncher.xml | 1 - .../testcases/taskdefs/optional/junitreport.xml | 5 +- .../taskdefs/optional/native2ascii/build.xml | 1 - src/etc/testcases/taskdefs/optional/net/ftp.xml | 256 +++++---- .../taskdefs/optional/propertyfile.xml | 28 +- src/etc/testcases/taskdefs/optional/pvcs.xml | 4 +- .../taskdefs/optional/replaceregexp.xml | 25 +- .../taskdefs/optional/schemavalidate.xml | 59 ++- src/etc/testcases/taskdefs/optional/script.xml | 14 +- .../taskdefs/optional/script/scriptdef.xml | 132 ++--- .../taskdefs/optional/unix/symlink.xml | 70 +-- .../taskdefs/optional/xalan-redirect-in.xsl | 2 +- .../testcases/taskdefs/optional/xml/about.xml | 3 +- .../testcases/taskdefs/optional/xml/apache.xsl | 2 +- .../taskdefs/optional/xml/doc-in-ns.xsd | 2 +- src/etc/testcases/taskdefs/optional/xml/doc.dtd | 5 - src/etc/testcases/taskdefs/optional/xml/doc.xsd | 4 +- src/etc/testcases/taskdefs/optional/xml/doc.xsl | 6 +- .../optional/xml/endpiece-noSchema-invalid.xml | 10 +- .../taskdefs/optional/xml/endpiece-noSchema.xml | 8 +- .../optional/xml/endpiece-ns-no-location.xml | 2 +- .../taskdefs/optional/xml/endpiece.xml | 2 +- .../taskdefs/optional/xml/endpiece2.xml | 4 +- .../optional/xml/stylesheet_include.xsl | 2 +- .../testcases/taskdefs/optional/xml/test.xml | 1 - .../testcases/taskdefs/optional/xml/test.xsl | 4 +- .../taskdefs/optional/xml/validate.xml | 4 +- .../testcases/taskdefs/optional/xmlvalidate.xml | 117 +++-- src/etc/testcases/taskdefs/optional/xslt.xml | 12 +- src/etc/testcases/taskdefs/parallel.xml | 6 +- src/etc/testcases/taskdefs/pathconvert.xml | 12 +- src/etc/testcases/taskdefs/presetdef.xml | 8 +- src/etc/testcases/taskdefs/property.xml | 14 +- src/etc/testcases/taskdefs/recorder2.xml | 8 +- src/etc/testcases/taskdefs/rename.xml | 8 +- src/etc/testcases/taskdefs/replace.xml | 12 +- src/etc/testcases/taskdefs/rmic/rmic.xml | 138 +++-- src/etc/testcases/taskdefs/signjar.xml | 23 +- src/etc/testcases/taskdefs/sleep.xml | 6 +- src/etc/testcases/taskdefs/style/build.xml | 18 +- src/etc/testcases/taskdefs/sync.xml | 4 +- src/etc/testcases/taskdefs/tar.xml | 6 +- src/etc/testcases/taskdefs/taskdef.xml | 22 +- src/etc/testcases/taskdefs/test.antlib.xml | 2 +- src/etc/testcases/taskdefs/test2.antlib.xml | 2 +- src/etc/testcases/taskdefs/touch.xml | 96 ++-- src/etc/testcases/taskdefs/typeadapter.xml | 4 +- src/etc/testcases/taskdefs/typedef.xml | 26 +- src/etc/testcases/taskdefs/untar.xml | 18 +- src/etc/testcases/taskdefs/unzip.xml | 12 +- src/etc/testcases/taskdefs/war.xml | 4 +- src/etc/testcases/taskdefs/xmlns.xml | 14 +- .../taskdefs/xmlproperty/inputs/original.xml | 1 - src/etc/testcases/taskdefs/xmlproperty_data.dtd | 1 - src/etc/testcases/taskdefs/zip.xml | 76 +-- src/etc/testcases/types/addtype.xml | 26 +- src/etc/testcases/types/assertions.xml | 117 ++--- src/etc/testcases/types/filterset.xml | 40 +- src/etc/testcases/types/flexinteger.xml | 9 +- src/etc/testcases/types/mapper.xml | 8 +- .../types/mappers/define.mapperresult.xml | 4 +- src/etc/testcases/types/mappers/globmapper.xml | 2 +- .../testcases/types/mappers/scriptmapper.xml | 4 +- src/etc/testcases/types/poly.xml | 16 +- src/etc/testcases/types/quote1.xml | 2 +- src/etc/testcases/types/quote2.xml | 3 +- src/etc/testcases/types/redirector.xml | 26 +- src/etc/testcases/types/resources/tarentry.xml | 4 +- src/etc/testcases/types/selectors.xml | 93 ++-- .../types/selectors/scriptselector.xml | 40 +- .../types/selectors/signedselector.xml | 2 +- src/etc/testcases/types/xmlcatalog.xml | 163 +++--- src/etc/testcases/types/xmlcatalog.xsl | 4 +- src/etc/testcases/types/xmlcatalog1.xml | 2 +- src/etc/testcases/types/xmlcatalog2.xml | 2 +- src/main/org/apache/tools/ant/antlib.xml | 44 +- .../tools/ant/types/conditions/antlib.xml | 2 +- .../ant/types/resources/comparators/antlib.xml | 14 +- .../ant/types/resources/selectors/antlib.xml | 34 +- src/tests/antunit/antunit-base.xml | 4 +- .../antunit/bugfixes/br50866/br50866-test.xml | 6 +- src/tests/antunit/bugfixes/br50866/common.xml | 6 +- src/tests/antunit/bugfixes/br50866/middle.xml | 6 +- .../bugzilla-43324-stackoverflow-test.xml | 16 +- src/tests/antunit/core/ant-attribute-test.xml | 7 +- src/tests/antunit/core/bindtargets-test.xml | 8 +- .../antunit/core/dirscanner-symlinks-test.xml | 2 +- src/tests/antunit/core/extension-point-test.xml | 4 +- .../antunit/core/extension/include-test.xml | 10 +- src/tests/antunit/core/location/location.xml | 28 +- src/tests/antunit/core/magic-names-test.xml | 2 +- src/tests/antunit/core/nested-elements-test.xml | 6 +- src/tests/antunit/core/nested-text-test.xml | 2 +- src/tests/antunit/core/projecthelpers-test.xml | 6 +- .../build-cross-extension-ref.xml | 8 +- .../projecthelpers/build-cross-extension.xml | 16 +- .../projecthelpers/build-cross-targets-ref.xml | 4 +- .../core/projecthelpers/build-cross-targets.xml | 8 +- .../projecthelpers/build-many-import-common.xml | 4 +- .../build-many-import-commonref.xml | 4 +- .../projecthelpers/build-many-import-ref.xml | 8 +- .../core/projecthelpers/build-many-import.xml | 18 +- .../projecthelpers/build-many-import2-ref.xml | 10 +- .../antunit/core/ref-psyntax-hint-test.xml | 4 +- .../antunit/filters/expandproperties-test.xml | 36 +- src/tests/antunit/filters/native2ascii-test.xml | 2 +- .../antunit/filters/replacetokens-test.xml | 2 +- src/tests/antunit/filters/sort-test.xml | 2 +- .../antunit/filters/striplinecomments-test.xml | 22 +- src/tests/antunit/filters/suffix-test.xml | 2 +- src/tests/antunit/filters/uniq-test.xml | 2 +- src/tests/antunit/junit-noframes.xsl | 4 +- src/tests/antunit/taskdefs/ant-test.xml | 2 +- src/tests/antunit/taskdefs/antcall-test.xml | 2 +- src/tests/antunit/taskdefs/augment-test.xml | 24 +- src/tests/antunit/taskdefs/bunzip2-test.xml | 2 +- src/tests/antunit/taskdefs/checksum-test.xml | 2 +- .../commandlauncher/commandlauncher-test.xml | 6 +- src/tests/antunit/taskdefs/concat-test.xml | 86 ++-- .../taskdefs/condition/antversion-test.xml | 26 +- .../antunit/taskdefs/condition/equals-test.xml | 34 +- .../taskdefs/condition/filesmatch-test.xml | 2 +- .../taskdefs/condition/hasfreespace-test.xml | 20 +- .../taskdefs/condition/hasmethod-text.xml | 2 +- .../taskdefs/condition/javaversion-test.xml | 8 +- .../condition/resourcecontains-test.xml | 14 +- src/tests/antunit/taskdefs/copy-test.xml | 24 +- src/tests/antunit/taskdefs/cvs/cvs.xml | 2 +- .../antunit/taskdefs/defaultexcludes-test.xml | 2 +- .../taskdefs/delete-and-symlinks-test.xml | 6 +- src/tests/antunit/taskdefs/delete-test.xml | 31 +- src/tests/antunit/taskdefs/dependset-test.xml | 170 +++--- src/tests/antunit/taskdefs/dirname-test.xml | 4 +- src/tests/antunit/taskdefs/ear-test.xml | 2 +- src/tests/antunit/taskdefs/echo-test.xml | 48 +- src/tests/antunit/taskdefs/echoxml-test.xml | 16 +- src/tests/antunit/taskdefs/exec/apply-test.xml | 514 +++++++++---------- src/tests/antunit/taskdefs/exec/exec-test.xml | 358 ++++++------- src/tests/antunit/taskdefs/fail-test.xml | 2 +- src/tests/antunit/taskdefs/get-test.xml | 58 +-- src/tests/antunit/taskdefs/gunzip-test.xml | 5 +- src/tests/antunit/taskdefs/gzip-test.xml | 14 +- src/tests/antunit/taskdefs/hostinfo-test.xml | 34 +- src/tests/antunit/taskdefs/import-test.xml | 2 +- src/tests/antunit/taskdefs/import-url-test.xml | 2 +- src/tests/antunit/taskdefs/importtests/a.xml | 1 - src/tests/antunit/taskdefs/importtests/b.xml | 1 - .../antunit/taskdefs/importtests/override.xml | 1 - src/tests/antunit/taskdefs/include-test.xml | 2 +- src/tests/antunit/taskdefs/jar-spi-test.xml | 4 +- src/tests/antunit/taskdefs/jar-test.xml | 22 +- src/tests/antunit/taskdefs/java-test.xml | 3 +- src/tests/antunit/taskdefs/javac-test.xml | 156 +++--- src/tests/antunit/taskdefs/javadoc-test.xml | 2 +- src/tests/antunit/taskdefs/length-test.xml | 120 ++--- .../antunit/taskdefs/loadproperties-test.xml | 56 +- .../antunit/taskdefs/loadresource-test.xml | 6 +- src/tests/antunit/taskdefs/local-test.xml | 80 +-- src/tests/antunit/taskdefs/macrodef-test.xml | 2 +- src/tests/antunit/taskdefs/manifest-test.xml | 12 +- .../antunit/taskdefs/manifestclasspath-test.xml | 2 +- src/tests/antunit/taskdefs/move-test.xml | 13 +- src/tests/antunit/taskdefs/optional/cab.xml | 2 +- .../taskdefs/optional/depend/depend-test.xml | 16 +- .../antunit/taskdefs/optional/funtest-test.xml | 2 +- .../antunit/taskdefs/optional/javah-test.xml | 26 +- .../optional/junit/junit-formatter-test.xml | 4 +- .../junit/junit-outputtoformatters-test.xml | 9 +- .../taskdefs/optional/junit/junit-test.xml | 266 +++++----- .../optional/junit/xmlformatter-test.xml | 6 +- .../taskdefs/optional/native2ascii-test.xml | 4 +- .../taskdefs/optional/propertyfile-test.xml | 2 +- .../optional/propertyfilelayout-test.xml | 2 +- .../taskdefs/optional/replaceregexp-test.xml | 2 +- .../taskdefs/optional/script/scriptdef-test.xml | 50 +- .../taskdefs/optional/unix/symlink-test.xml | 10 +- .../taskdefs/optional/windows/attrib-test.xml | 4 +- .../antunit/taskdefs/optional/xz/unxz-test.xml | 3 +- .../antunit/taskdefs/optional/xz/xz-test.xml | 14 +- src/tests/antunit/taskdefs/parallel-test.xml | 10 +- src/tests/antunit/taskdefs/pathconvert-test.xml | 2 +- src/tests/antunit/taskdefs/property-test.xml | 10 +- .../antunit/taskdefs/propertyfile-test.xml | 16 +- .../antunit/taskdefs/propertyhelper-test.xml | 76 +-- src/tests/antunit/taskdefs/replace-test.xml | 2 +- src/tests/antunit/taskdefs/rmic-test.xml | 2 +- src/tests/antunit/taskdefs/secure-input.xml | 6 +- .../antunit/taskdefs/setpermissions-test.xml | 4 +- src/tests/antunit/taskdefs/signjar-test.xml | 135 +++-- src/tests/antunit/taskdefs/subant-test.xml | 10 +- src/tests/antunit/taskdefs/sync-test.xml | 2 +- src/tests/antunit/taskdefs/tar-test.xml | 10 +- .../antunit/taskdefs/taskdef-antlib-test.xml | 28 +- src/tests/antunit/taskdefs/taskdef-test.xml | 2 +- src/tests/antunit/taskdefs/tempfile-test.xml | 2 +- src/tests/antunit/taskdefs/touch-test.xml | 4 +- .../antunit/taskdefs/truncate/truncate-test.xml | 74 +-- src/tests/antunit/taskdefs/tstamp-test.xml | 2 +- src/tests/antunit/taskdefs/untar-test.xml | 6 +- src/tests/antunit/taskdefs/unzip-test.xml | 10 +- src/tests/antunit/taskdefs/uptodate-test.xml | 2 +- src/tests/antunit/taskdefs/war-test.xml | 44 +- .../antunit/taskdefs/whichresource-test.xml | 6 +- src/tests/antunit/taskdefs/xmlproperty-test.xml | 3 +- .../antunit/taskdefs/xmlproperty.multi.xml | 4 +- src/tests/antunit/taskdefs/xslt-test.xml | 11 +- src/tests/antunit/taskdefs/zip-test.xml | 20 +- .../types/conditions/isreference-test.xml | 3 +- .../antunit/types/conditions/matches-test.xml | 8 +- src/tests/antunit/types/cutdirs-test.xml | 4 +- .../antunit/types/defer-reference-test.xml | 16 +- src/tests/antunit/types/fileset-test.xml | 6 +- src/tests/antunit/types/filterset-test.xml | 33 +- src/tests/antunit/types/firstmatch-test.xml | 2 +- src/tests/antunit/types/javaresource-test.xml | 4 +- src/tests/antunit/types/mapper-ref.xml | 22 +- src/tests/antunit/types/mappers/glob-test.xml | 2 +- .../types/mappers/packagemapper-test.xml | 4 +- .../types/optional/xz/xzresource-test.xml | 2 +- src/tests/antunit/types/path-test.xml | 12 +- .../antunit/types/patternset-invert-test.xml | 22 +- src/tests/antunit/types/patternset-test.xml | 2 +- src/tests/antunit/types/propertyset-test.xml | 26 +- .../antunit/types/resources/archives-test.xml | 2 +- .../types/resources/comparators/test.xml | 176 +++---- .../types/resources/concat-resource-test.xml | 40 +- .../types/resources/fileresource-test.xml | 14 +- .../antunit/types/resources/first-last-test.xml | 100 ++-- .../antunit/types/resources/latepath-test.xml | 10 +- .../types/resources/multirootfileset-test.xml | 2 +- .../types/resources/resourcelist-test.xml | 2 +- .../types/resources/selectors/name-test.xml | 2 +- .../resources/selectors/readwrite-test.xml | 2 +- .../resources/selectors/test-componentdef.xml | 288 +++++------ .../antunit/types/resources/selectors/test.xml | 304 +++++------ src/tests/antunit/types/resources/test.xml | 192 +++---- .../antunit/types/resources/tokens-test.xml | 56 +- .../antunit/types/selectors/depend-test.xml | 12 +- .../antunit/types/selectors/different-test.xml | 10 +- .../antunit/types/selectors/executable-test.xml | 2 +- .../antunit/types/selectors/filename-test.xml | 2 +- .../antunit/types/selectors/modified-test.xml | 2 +- .../antunit/types/selectors/ownedby-test.xml | 2 +- .../antunit/types/selectors/present-test.xml | 12 +- .../antunit/types/selectors/readwrite-test.xml | 2 +- .../antunit/types/selectors/select-test.xml | 2 +- .../antunit/types/selectors/symlink-test.xml | 2 +- src/tests/antunit/types/zipfileset-test.xml | 3 +- src/tests/junit/org/example/tasks/antlib.xml | 1 - src/tests/junit/org/example/tasks/antlib2.xml | 1 - .../01-propertyaccess/build.xml | 6 +- .../02-fileset/build.xml | 6 +- .../03-paths/build.xml | 6 +- .../04-lists/build.xml | 6 +- .../tasks-filesets-properties/final/build.xml | 6 +- src/tutorial/tasks-start-writing/build.xml | 6 +- 379 files changed, 4522 insertions(+), 4664 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/WHATSNEW ---------------------------------------------------------------------- diff --git a/WHATSNEW b/WHATSNEW index b950a35..5233a0a 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -48,7 +48,7 @@ Fixed bugs: * <cab> died with a NullPointerException since Ant 1.10.2. Bugzilla Report 62335 - * The <depend> task would fail with + * The <depend> task would fail with "java.lang.ClassFormatError: Invalid Constant Pool entry Type 19" while parsing a module-info.class. The task is compatible with Java bytecode version 53 now. http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/ant-update.xsl ---------------------------------------------------------------------- diff --git a/src/etc/ant-update.xsl b/src/etc/ant-update.xsl index c81a39f..e013c13 100644 --- a/src/etc/ant-update.xsl +++ b/src/etc/ant-update.xsl @@ -17,21 +17,21 @@ See the License for the specific language governing permissions and limitations under the License. --> - + <!-- The purpose have this XSL is to provide a fast way to update a buildfile from deprecated tasks. - + It should particularly be useful when there is a lot of build files to migrate. If you do not want to migrate to a particular task and want to keep it for various reason, just comment the appropriate template. - + !!!! Use at your own risk. !!!! - + --> - - + + <!-- (zip|jar|war|ear)file attributes are replaced by destfile in their respective task --> <xsl:template match="zip"> <zip destfile="{@zipfile}"> @@ -53,8 +53,8 @@ <xsl:apply-templates select="@*[not(name()='earfile')]|node()"/> </ear> </xsl:template> - - + + <!-- copydir is replaced by copy --> <xsl:template match="copydir"> <copy todir="{@dest}"> @@ -113,5 +113,5 @@ <xsl:apply-templates select="@*|node()"/> </xsl:copy> </xsl:template> - + </xsl:stylesheet> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/changelog.xsl ---------------------------------------------------------------------- diff --git a/src/etc/changelog.xsl b/src/etc/changelog.xsl index c6aef8f..b6fc9b9 100644 --- a/src/etc/changelog.xsl +++ b/src/etc/changelog.xsl @@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + --> <xsl:param name="title"/> <xsl:param name="module"/> @@ -79,18 +79,18 @@ <p style="text-align: right">Designed for use with <a href="http://ant.apache.org/">Apache Ant</a>.</p> <hr/> <table border="0" width="100%" cellspacing="1"> - + <xsl:apply-templates select=".//entry"> <xsl:sort select="date" data-type="text" order="descending"/> <xsl:sort select="time" data-type="text" order="descending"/> </xsl:apply-templates> - + </table> - + </body> </html> </xsl:template> - + <xsl:template match="entry"> <tr> <td class="dateAndAuthor"> @@ -129,13 +129,13 @@ <a> <xsl:choose> <xsl:when test="string-length(prevrevision) = 0 "> - <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?rev=<xsl:value-of select="revision" />&content-type=text/x-cvsweb-markup</xsl:attribute> + <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module"/>/<xsl:value-of select="name"/>?rev=<xsl:value-of select="revision"/>&content-type=text/x-cvsweb-markup</xsl:attribute> </xsl:when> <xsl:otherwise> - <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?r1=<xsl:value-of select="revision" />&r2=<xsl:value-of select="prevrevision"/></xsl:attribute> + <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module"/>/<xsl:value-of select="name"/>?r1=<xsl:value-of select="revision"/>&r2=<xsl:value-of select="prevrevision"/></xsl:attribute> </xsl:otherwise> </xsl:choose> - <xsl:value-of select="name" /> (<xsl:value-of select="revision"/>)</a> + <xsl:value-of select="name"/> (<xsl:value-of select="revision"/>)</a> </li> </xsl:template> @@ -144,5 +144,5 @@ <xsl:template match="msg"> <xsl:apply-templates/> </xsl:template> - + </xsl:stylesheet> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/checkstyle/checkstyle-frames-sortby-check.xsl ---------------------------------------------------------------------- diff --git a/src/etc/checkstyle/checkstyle-frames-sortby-check.xsl b/src/etc/checkstyle/checkstyle-frames-sortby-check.xsl index 060f878..c39c13a 100644 --- a/src/etc/checkstyle/checkstyle-frames-sortby-check.xsl +++ b/src/etc/checkstyle/checkstyle-frames-sortby-check.xsl @@ -22,7 +22,7 @@ --> <xsl:output method="html" indent="yes" encoding="US-ASCII"/> - <xsl:decimal-format decimal-separator="." grouping-separator="," /> + <xsl:decimal-format decimal-separator="." grouping-separator=","/> <xsl:param name="output.dir" select="'.'"/> <xsl:param name="basedir" select="'.'"/> @@ -76,7 +76,7 @@ <!-- - Key for detecting duplicate CheckModules + Key for detecting duplicate CheckModules --> <xsl:key name="module" match="file/error" use="@source"/> @@ -84,7 +84,7 @@ <!-- Generates the navagation bar. - --> + --> <xsl:template match="checkstyle" mode="navigation"> <ul id="navigation"> <xsl:for-each select="file/error[generate-id() = generate-id(key('module',@source))]"> @@ -100,13 +100,13 @@ </a></li> </xsl:for-each> </ul> - </xsl:template> + </xsl:template> <!-- Generates the data part. - --> + --> <xsl:template match="checkstyle" mode="data"> <div id="content"> <xsl:for-each select="file/error[generate-id() = generate-id(key('module',@source))]"> @@ -120,13 +120,13 @@ </div> </xsl:for-each> </div> - </xsl:template> + </xsl:template> <!-- Generates the content table for the given check module. - @param filter full qualified module name + @param filter full qualified module name --> <xsl:template name="data"> <xsl:param name="filter"/> @@ -157,7 +157,7 @@ Generates the data rows for the current check module. Ignores errors in the current file from other modules. @param node the file with the errors - @param filter full qualified module name + @param filter full qualified module name --> <xsl:template name="data-rows"> <xsl:param name="node"/> @@ -180,68 +180,68 @@ - <!-- + <!-- Generates the CSS with the layout instructions. Generated so this XSL is the single source of the whole report. --> <xsl:template name="sorted.css"> - body { + body { font:normal 80% arial,helvetica,sanserif; - color: black; - background-color: white; - margin: 0; - padding: 1em; + color: black; + background-color: white; + margin: 0; + padding: 1em; min-width: 41em; - } - h1 { + } + h1 { font-weight:bold; font-size:140%; - margin: 0 0 0.7em; - padding: 0.3em; - text-align: center; - background-color: #eee; - border: 2px ridge silver; - } - html<xsl:text disable-output-escaping="yes">></xsl:text>body h1 { + margin: 0 0 0.7em; + padding: 0.3em; + text-align: center; + background-color: #eee; + border: 2px ridge silver; + } + html<xsl:text disable-output-escaping="yes">></xsl:text>body h1 { border-color: gray; - } - - ul#navigation { - font-size: 0.83em; - float: left; width: 18em; - margin: 0 0 1.2em; padding: 0; - border: 1px dashed silver; - } - ul#navigation li { - list-style: none; - margin: 0; padding: 0.2em; - } - ul#navigation a { - display: block; - padding: 0.2em; - font-weight: bold; - } - ul#navigation a:link { - color: black; background-color: #eee; - } - ul#navigation a:visited { - color: #666; background-color: #eee; - } - ul#navigation a:hover { - color: red; background-color: white; - } - ul#navigation a:active { - color: white; background-color: gray; } - div#content { - margin: 0 1em 1em 16em; - padding: 0 1em; - } - * html div#content { - height: 1em; /* Workaround 3-Pixel-Bug of Internet Explorers */ - } - div#content h2 { + ul#navigation { + font-size: 0.83em; + float: left; width: 18em; + margin: 0 0 1.2em; padding: 0; + border: 1px dashed silver; + } + ul#navigation li { + list-style: none; + margin: 0; padding: 0.2em; + } + ul#navigation a { + display: block; + padding: 0.2em; + font-weight: bold; + } + ul#navigation a:link { + color: black; background-color: #eee; + } + ul#navigation a:visited { + color: #666; background-color: #eee; + } + ul#navigation a:hover { + color: red; background-color: white; + } + ul#navigation a:active { + color: white; background-color: gray; + } + + div#content { + margin: 0 1em 1em 16em; + padding: 0 1em; + } + * html div#content { + height: 1em; /* Workaround 3-Pixel-Bug of Internet Explorers */ + } + div#content h2 { font-size:100%; font-weight:bold; background: #525D76; @@ -251,11 +251,11 @@ margin-right: 2px; margin-left: 2px; margin-bottom: 0; - } - div#content p { - font-size: 1em; - margin: 1em 0; - } + } + div#content p { + font-size: 1em; + margin: 1em 0; + } table { width:100%; border-collapse:collapse; @@ -275,55 +275,55 @@ table tr:nth-child(even) td { background: #fff; } - </xsl:template> + </xsl:template> - <!-- - Generates the JavaScript for the dynamic style. + <!-- + Generates the JavaScript for the dynamic style. Generated so this XSL is the single source of the whole report. --> <xsl:template name="switch.js"> - /* + /* * Hides all "hideable" div-containers */ function hideAll() { allElements = document.getElementsByTagName("div"); - for (i = 0; i <xsl:text disable-output-escaping="yes"><</xsl:text> allElements.length; i++) { - if (allElements[i].className=="hideable") { - allElements[i].style.display="none"; - } - } - return; - } - - /* + for (i = 0; i <xsl:text disable-output-escaping="yes"><</xsl:text> allElements.length; i++) { + if (allElements[i].className=="hideable") { + allElements[i].style.display="none"; + } + } + return; + } + + /* * Shows one div-container and hides the other. * @param id id of the element to show */ - function change(id) { - hideAll(); - e = document.getElementById(id); - if (e.style.display=="none") { - e.style.display=""; - } - window.scrollTo(0, 0); - return; - } - - /* + function change(id) { + hideAll(); + e = document.getElementById(id); + if (e.style.display=="none") { + e.style.display=""; + } + window.scrollTo(0, 0); + return; + } + + /* * Shows only the first data row. * Used in body:onload so the user could directly see some messages. */ function openFirst() { hideAll(); - for (i = 0; i <xsl:text disable-output-escaping="yes"><</xsl:text> allElements.length; i++) { - if (allElements[i].className=="hideable") { + for (i = 0; i <xsl:text disable-output-escaping="yes"><</xsl:text> allElements.length; i++) { + if (allElements[i].className=="hideable") { allElements[i].style.display=""; - return; - } - } - return; + return; + } + } + return; } </xsl:template> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/checkstyle/checkstyle-frames.xsl ---------------------------------------------------------------------- diff --git a/src/etc/checkstyle/checkstyle-frames.xsl b/src/etc/checkstyle/checkstyle-frames.xsl index c79c0b7..0a76bfd 100644 --- a/src/etc/checkstyle/checkstyle-frames.xsl +++ b/src/etc/checkstyle/checkstyle-frames.xsl @@ -22,7 +22,7 @@ --> <xsl:output method="html" indent="yes" encoding="US-ASCII"/> - <xsl:decimal-format decimal-separator="." grouping-separator="," /> + <xsl:decimal-format decimal-separator="." grouping-separator=","/> <xsl:param name="output.dir" select="'.'"/> <xsl:param name="basedir" select="'.'"/> @@ -229,7 +229,7 @@ <!-- Convert a windows path '\' to a unix path '/' for further processing. --> <xsl:variable name="path2" select="translate($path,'\','/')"/> - + <xsl:if test="contains($path2,'/')"> <xsl:text>../</xsl:text> <xsl:call-template name="path"> @@ -296,4 +296,4 @@ <xsl:if test="position() mod 2 = 0">evenrow</xsl:if> </xsl:attribute> </xsl:template> -</xsl:stylesheet> \ No newline at end of file +</xsl:stylesheet> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/checkstyle/checkstyle-text.xsl ---------------------------------------------------------------------- diff --git a/src/etc/checkstyle/checkstyle-text.xsl b/src/etc/checkstyle/checkstyle-text.xsl index 7359e41..7a2f08c 100644 --- a/src/etc/checkstyle/checkstyle-text.xsl +++ b/src/etc/checkstyle/checkstyle-text.xsl @@ -31,4 +31,3 @@ <xsl:value-of select="@message"/> </xsl:template> </xsl:stylesheet> - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/checkstyle/checkstyle-xdoc.xsl ---------------------------------------------------------------------- diff --git a/src/etc/checkstyle/checkstyle-xdoc.xsl b/src/etc/checkstyle/checkstyle-xdoc.xsl index 5fc6eab..76a86e2 100644 --- a/src/etc/checkstyle/checkstyle-xdoc.xsl +++ b/src/etc/checkstyle/checkstyle-xdoc.xsl @@ -22,7 +22,7 @@ --> <xsl:output method="xml" indent="yes"/> - <xsl:decimal-format decimal-separator="." grouping-separator="," /> + <xsl:decimal-format decimal-separator="." grouping-separator=","/> <xsl:param name="output.dir" select="'.'"/> <xsl:param name="basedir" select="'.'"/> @@ -127,4 +127,3 @@ </xsl:attribute> </xsl:template> </xsl:stylesheet> - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/common2master.xsl ---------------------------------------------------------------------- diff --git a/src/etc/common2master.xsl b/src/etc/common2master.xsl index da1527e..b4c22ba 100644 --- a/src/etc/common2master.xsl +++ b/src/etc/common2master.xsl @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- +<!-- This stylesheet can be used to generate a master buildfile from a common buildfile (see manual for <subant>). - Foreach <target> in the common buildfile it generates a corresponding + Foreach <target> in the common buildfile it generates a corresponding target in the master buildfile for iterating over that target. --> <xsl:stylesheet @@ -38,7 +38,7 @@ <xsl:template match="project"> <![CDATA[ -<project name="master"> +<project name="master"> <macrodef name="iterate"> <attribute name="target"/> @@ -49,9 +49,9 @@ </sequential> </macrodef> ]]> - + <xsl:apply-templates/> - + <![CDATA[ </project> ]]> @@ -70,4 +70,3 @@ </xsl:stylesheet> - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/coverage-frames.xsl ---------------------------------------------------------------------- diff --git a/src/etc/coverage-frames.xsl b/src/etc/coverage-frames.xsl index 9603597..a02f543 100644 --- a/src/etc/coverage-frames.xsl +++ b/src/etc/coverage-frames.xsl @@ -4,7 +4,7 @@ xmlns:redirect="org.apache.xalan.lib.Redirect" extension-element-prefixes="redirect"> <xsl:output method="html" indent="yes"/> -<xsl:decimal-format decimal-separator="." grouping-separator="," /> +<xsl:decimal-format decimal-separator="." grouping-separator=","/> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/jdepend-frames.xsl ---------------------------------------------------------------------- diff --git a/src/etc/jdepend-frames.xsl b/src/etc/jdepend-frames.xsl index 8028734..a9bb68d 100644 --- a/src/etc/jdepend-frames.xsl +++ b/src/etc/jdepend-frames.xsl @@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + --> <!-- http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/jdepend.xsl ---------------------------------------------------------------------- diff --git a/src/etc/jdepend.xsl b/src/etc/jdepend.xsl index f813297..907ade2 100644 --- a/src/etc/jdepend.xsl +++ b/src/etc/jdepend.xsl @@ -24,7 +24,7 @@ <html> <head> <title>JDepend Analysis</title> - + <style type="text/css"> body { font:normal 68% verdana,arial,helvetica; @@ -41,7 +41,7 @@ table.details tr td{ background:#eeeee0; } - + p { line-height:1.5em; margin-top:0.5em; margin-bottom:1.0em; @@ -76,8 +76,8 @@ text-align:right; } </style> - - + + </head> <body> <!--h1>JDepend Report</h1> @@ -87,11 +87,11 @@ <li><xsl:value-of select="@name"/></li> </xsl:for-each> </ul--> - + <h1><a name="top">JDepend Analysis</a></h1> - <p align="right">Designed for use with <a href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and <a href="http://jakarta.apache.org">Ant</a>.</p> - <hr size="2" /> - + <p align="right">Designed for use with <a href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and <a href="https://ant.apache.org">Ant</a>.</p> + <hr size="2"/> + <table width="100%"><tr><td> <a name="NVsummary"><h2>Summary</h2></a> </td><td align="right"> @@ -100,7 +100,7 @@ [<a href="#NVcycles">cycles</a>] [<a href="#NVexplanations">explanations</a>] </td></tr></table> - + <table width="100%" class="details"> <tr> <th>Package</th> @@ -112,7 +112,7 @@ <th><a href="#EXabstractness">Abstractness</a></th> <th><a href="#EXinstability">Instability</a></th> <th><a href="#EXdistance">Distance</a></th> - + </tr> <xsl:for-each select="./Packages/Package"> <xsl:if test="count(error) = 0"> @@ -132,7 +132,7 @@ <td align="right"><xsl:value-of select="Stats/A"/></td> <td align="right"><xsl:value-of select="Stats/I"/></td> <td align="right"><xsl:value-of select="Stats/D"/></td> - + </tr> </xsl:if> @@ -148,7 +148,7 @@ </xsl:if> </xsl:for-each> </table> - + <table width="100%"><tr><td> <a name="NVpackages"><h2>Packages</h2></a> </td><td align="right"> @@ -157,12 +157,12 @@ [<a href="#NVcycles">cycles</a>] [<a href="#NVexplanations">explanations</a>] </td></tr></table> - + <xsl:for-each select="./Packages/Package"> <xsl:if test="count(error) = 0"> <h3><a><xsl:attribute name="name">PK<xsl:value-of select="@name"/></xsl:attribute> <xsl:value-of select="@name"/></a></h3> - + <table width="100%"><tr> <td><a href="#EXafferent">Afferent Couplings</a>: <xsl:value-of select="Stats/Ca"/></td> <td><a href="#EXefferent">Efferent Couplings</a>: <xsl:value-of select="Stats/Ce"/></td> @@ -170,7 +170,7 @@ <td><a href="#EXinstability">Instability</a>: <xsl:value-of select="Stats/I"/></td> <td><a href="#EXdistance">Distance</a>: <xsl:value-of select="Stats/D"/></td> </tr></table> - + <table width="100%" class="details"> <tr> <th>Abstract Classes</th> @@ -221,7 +221,7 @@ </table> </xsl:if> </xsl:for-each> - + <table width="100%"><tr><td> <a name="NVcycles"><h2>Cycles</h2></a> </td><td align="right"> @@ -230,7 +230,7 @@ [<a href="#NVcycles">cycles</a>] [<a href="#NVexplanations">explanations</a>] </td></tr></table> - + <xsl:if test="count(Cycles/Package) = 0"> <p>There are no cyclic dependancies.</p> </xsl:if> @@ -240,7 +240,7 @@ <xsl:value-of select="."/><br/> </xsl:for-each></p> </xsl:for-each> - + <table width="100%"><tr><td> <a name="NVexplanations"><h2>Explanations</h2></a> </td><td align="right"> @@ -249,16 +249,16 @@ [<a href="#NVcycles">cycles</a>] [<a href="#NVexplanations">explanations</a>] </td></tr></table> - + <p>The following explanations are for quick reference and are lifted directly from the original <a href="http://www.clarkware.com/software/JDepend.html">JDepend documentation</a>.</p> - + <h3><a name="EXnumber">Number of Classes</a></h3> <p>The number of concrete and abstract classes (and interfaces) in the package is an indicator of the extensibility of the package.</p> <h3><a name="EXafferent">Afferent Couplings</a></h3> <p>The number of other packages that depend upon classes within the package is an indicator of the package's responsibility. </p> <h3><a name="EXefferent">Efferent Couplings</a></h3> <p>The number of other packages that the classes in the package depend upon is an indicator of the package's independence. </p> - <h3><a name="EXabstractness">Abstractness</a></h3> + <h3><a name="EXabstractness">Abstractness</a></h3> <p>The ratio of the number of abstract classes (and interfaces) in the analyzed package to the total number of classes in the analyzed package. </p> <p>The range for this metric is 0 to 1, with A=0 indicating a completely concrete package and A=1 indicating a completely abstract package. </p> <h3><a name="EXinstability">Instability</a></h3> @@ -268,7 +268,7 @@ <p>The perpendicular distance of a package from the idealized line A + I = 1. This metric is an indicator of the package's balance between abstractness and stability. </p> <p>A package squarely on the main sequence is optimally balanced with respect to its abstractness and stability. Ideal packages are either completely abstract and stable (x=0, y=1) or completely concrete and instable (x=1, y=0). </p> <p>The range for this metric is 0 to 1, with D=0 indicating a package that is coincident with the main sequence and D=1 indicating a package that is as far from the main sequence as possible. </p> - + </body> </html> </xsl:template> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/junit-frames-saxon.xsl ---------------------------------------------------------------------- diff --git a/src/etc/junit-frames-saxon.xsl b/src/etc/junit-frames-saxon.xsl index 233352f..c984ac8 100644 --- a/src/etc/junit-frames-saxon.xsl +++ b/src/etc/junit-frames-saxon.xsl @@ -592,7 +592,7 @@ <xsl:variable name="testCount" select="sum(testsuite/@tests)"/> <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/> <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/> - <xsl:variable name="skippedCount" select="sum(testsuite/@skipped)" /> + <xsl:variable name="skippedCount" select="sum(testsuite/@skipped)"/> <xsl:variable name="timeCount" select="sum(testsuite/@time)"/> <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/> <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> @@ -615,7 +615,7 @@ <td><a title="Display all tests" href="all-tests.html"><xsl:value-of select="$testCount"/></a></td> <td><a title="Display all failures" href="alltests-fails.html"><xsl:value-of select="$failureCount"/></a></td> <td><a title="Display all errors" href="alltests-errors.html"><xsl:value-of select="$errorCount"/></a></td> - <td><a title="Display all skipped test" href="alltests-skipped.html"><xsl:value-of select="$skippedCount" /></a></td> + <td><a title="Display all skipped test" href="alltests-skipped.html"><xsl:value-of select="$skippedCount"/></a></td> <td> <xsl:call-template name="display-percent"> <xsl:with-param name="value" select="$successRate"/> @@ -659,7 +659,7 @@ <td><xsl:value-of select="sum($insamepackage/@tests)"/></td> <td><xsl:value-of select="sum($insamepackage/@errors)"/></td> <td><xsl:value-of select="sum($insamepackage/@failures)"/></td> - <td><xsl:value-of select="sum($insamepackage/@skipped)" /></td> + <td><xsl:value-of select="sum($insamepackage/@skipped)"/></td> <td> <xsl:call-template name="display-time"> <xsl:with-param name="value" select="sum($insamepackage/@time)"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/junit-frames-xalan1.xsl ---------------------------------------------------------------------- diff --git a/src/etc/junit-frames-xalan1.xsl b/src/etc/junit-frames-xalan1.xsl index fbc28e1..f8035e7 100644 --- a/src/etc/junit-frames-xalan1.xsl +++ b/src/etc/junit-frames-xalan1.xsl @@ -466,7 +466,7 @@ h6 { <td><xsl:value-of select="$testCount"/></td> <td><xsl:value-of select="$failureCount"/></td> <td><xsl:value-of select="$errorCount"/></td> - <td><xsl:value-of select="$skipCount" /></td> + <td><xsl:value-of select="$skipCount"/></td> <td> <xsl:call-template name="display-percent"> <xsl:with-param name="value" select="$successRate"/> @@ -510,7 +510,7 @@ h6 { <td><xsl:value-of select="sum($insamepackage/@tests)"/></td> <td><xsl:value-of select="sum($insamepackage/@errors)"/></td> <td><xsl:value-of select="sum($insamepackage/@failures)"/></td> - <td><xsl:value-of select="sum($insamepackage/@skipped)" /></td> + <td><xsl:value-of select="sum($insamepackage/@skipped)"/></td> <td> <xsl:call-template name="display-time"> <xsl:with-param name="value" select="sum($insamepackage/@time)"/> @@ -637,7 +637,7 @@ h6 { <td><xsl:apply-templates select="@tests"/></td> <td><xsl:apply-templates select="@errors"/></td> <td><xsl:apply-templates select="@failures"/></td> - <td><xsl:apply-templates select="@skipped" /></td> + <td><xsl:apply-templates select="@skipped"/></td> <td><xsl:call-template name="display-time"> <xsl:with-param name="value" select="@time"/> </xsl:call-template> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/junit-frames.xsl ---------------------------------------------------------------------- diff --git a/src/etc/junit-frames.xsl b/src/etc/junit-frames.xsl index 49fc667..cdbb669 100644 --- a/src/etc/junit-frames.xsl +++ b/src/etc/junit-frames.xsl @@ -79,7 +79,7 @@ <xsl:with-param name="type" select="'errors'"/> </xsl:apply-templates> </redirect:write> - + <!-- create the alltests-skipped.html at the root --> <redirect:write file="{$output.dir}/alltests-skipped.html"> <xsl:apply-templates select="." mode="all.tests"> @@ -593,7 +593,7 @@ h6 { <xsl:variable name="testCount" select="sum(testsuite/@tests)"/> <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/> <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/> - <xsl:variable name="skippedCount" select="sum(testsuite/@skipped)" /> + <xsl:variable name="skippedCount" select="sum(testsuite/@skipped)"/> <xsl:variable name="timeCount" select="sum(testsuite/@time)"/> <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/> <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> @@ -616,7 +616,7 @@ h6 { <td><a title="Display all tests" href="all-tests.html"><xsl:value-of select="$testCount"/></a></td> <td><a title="Display all failures" href="alltests-fails.html"><xsl:value-of select="$failureCount"/></a></td> <td><a title="Display all errors" href="alltests-errors.html"><xsl:value-of select="$errorCount"/></a></td> - <td><a title="Display all skipped test" href="alltests-skipped.html"><xsl:value-of select="$skippedCount" /></a></td> + <td><a title="Display all skipped test" href="alltests-skipped.html"><xsl:value-of select="$skippedCount"/></a></td> <td> <xsl:call-template name="display-percent"> <xsl:with-param name="value" select="$successRate"/> @@ -660,7 +660,7 @@ h6 { <td><xsl:value-of select="sum($insamepackage/@tests)"/></td> <td><xsl:value-of select="sum($insamepackage/@errors)"/></td> <td><xsl:value-of select="sum($insamepackage/@failures)"/></td> - <td><xsl:value-of select="sum($insamepackage/@skipped)" /></td> + <td><xsl:value-of select="sum($insamepackage/@skipped)"/></td> <td> <xsl:call-template name="display-time"> <xsl:with-param name="value" select="sum($insamepackage/@time)"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/junit-noframes-saxon.xsl ---------------------------------------------------------------------- diff --git a/src/etc/junit-noframes-saxon.xsl b/src/etc/junit-noframes-saxon.xsl index fd1d3c9..ca9acb9 100644 --- a/src/etc/junit-noframes-saxon.xsl +++ b/src/etc/junit-noframes-saxon.xsl @@ -4,8 +4,8 @@ exclude-result-prefixes="xs" version="2.0"> <xsl:output method="html" indent="yes" encoding="UTF-8" - doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" /> -<xsl:decimal-format decimal-separator="." grouping-separator="," /> + doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"/> +<xsl:decimal-format decimal-separator="." grouping-separator=","/> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -165,7 +165,7 @@ <xsl:variable name="testCount" select="sum($testsuites-in-package/@tests)"/> <xsl:variable name="errorCount" select="sum($testsuites-in-package/@errors)"/> <xsl:variable name="failureCount" select="sum($testsuites-in-package/@failures)"/> - <xsl:variable name="skippedCount" select="sum($testsuites-in-package/@skipped)" /> + <xsl:variable name="skippedCount" select="sum($testsuites-in-package/@skipped)"/> <xsl:variable name="timeCount" select="sum($testsuites-in-package/@time)"/> <!-- write a summary for the package --> @@ -181,7 +181,7 @@ <td><xsl:value-of select="$testCount"/></td> <td><xsl:value-of select="$errorCount"/></td> <td><xsl:value-of select="$failureCount"/></td> - <td><xsl:value-of select="$skippedCount" /></td> + <td><xsl:value-of select="$skippedCount"/></td> <td> <xsl:call-template name="display-time"> <xsl:with-param name="value" select="$timeCount"/> @@ -256,7 +256,7 @@ <xsl:variable name="testCount" select="sum(testsuite/@tests)"/> <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/> <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/> - <xsl:variable name="skippedCount" select="sum(testsuite/@skipped)" /> + <xsl:variable name="skippedCount" select="sum(testsuite/@skipped)"/> <xsl:variable name="timeCount" select="sum(testsuite/@time)"/> <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/> <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> @@ -278,7 +278,7 @@ <td><xsl:value-of select="$testCount"/></td> <td><xsl:value-of select="$failureCount"/></td> <td><xsl:value-of select="$errorCount"/></td> - <td><xsl:value-of select="$skippedCount" /></td> + <td><xsl:value-of select="$skippedCount"/></td> <td> <xsl:call-template name="display-percent"> <xsl:with-param name="value" select="$successRate"/> @@ -377,7 +377,7 @@ <td><xsl:value-of select="@tests"/></td> <td><xsl:value-of select="@errors"/></td> <td><xsl:value-of select="@failures"/></td> - <td><xsl:value-of select="@skipped" /></td> + <td><xsl:value-of select="@skipped"/></td> <td> <xsl:call-template name="display-time"> <xsl:with-param name="value" select="@time"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/junit-noframes.xsl ---------------------------------------------------------------------- diff --git a/src/etc/junit-noframes.xsl b/src/etc/junit-noframes.xsl index fa3ac3e..f478fbb 100644 --- a/src/etc/junit-noframes.xsl +++ b/src/etc/junit-noframes.xsl @@ -3,8 +3,8 @@ xmlns:lxslt="http://xml.apache.org/xslt" xmlns:string="xalan://java.lang.String"> <xsl:output method="html" indent="yes" encoding="UTF-8" - doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" /> -<xsl:decimal-format decimal-separator="." grouping-separator="," /> + doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"/> +<xsl:decimal-format decimal-separator="." grouping-separator=","/> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -164,7 +164,7 @@ <xsl:variable name="testCount" select="sum($testsuites-in-package/@tests)"/> <xsl:variable name="errorCount" select="sum($testsuites-in-package/@errors)"/> <xsl:variable name="failureCount" select="sum($testsuites-in-package/@failures)"/> - <xsl:variable name="skippedCount" select="sum($testsuites-in-package/@skipped)" /> + <xsl:variable name="skippedCount" select="sum($testsuites-in-package/@skipped)"/> <xsl:variable name="timeCount" select="sum($testsuites-in-package/@time)"/> <!-- write a summary for the package --> @@ -180,7 +180,7 @@ <td><xsl:value-of select="$testCount"/></td> <td><xsl:value-of select="$errorCount"/></td> <td><xsl:value-of select="$failureCount"/></td> - <td><xsl:value-of select="$skippedCount" /></td> + <td><xsl:value-of select="$skippedCount"/></td> <td> <xsl:call-template name="display-time"> <xsl:with-param name="value" select="$timeCount"/> @@ -255,7 +255,7 @@ <xsl:variable name="testCount" select="sum(testsuite/@tests)"/> <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/> <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/> - <xsl:variable name="skippedCount" select="sum(testsuite/@skipped)" /> + <xsl:variable name="skippedCount" select="sum(testsuite/@skipped)"/> <xsl:variable name="timeCount" select="sum(testsuite/@time)"/> <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/> <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> @@ -277,7 +277,7 @@ <td><xsl:value-of select="$testCount"/></td> <td><xsl:value-of select="$failureCount"/></td> <td><xsl:value-of select="$errorCount"/></td> - <td><xsl:value-of select="$skippedCount" /></td> + <td><xsl:value-of select="$skippedCount"/></td> <td> <xsl:call-template name="display-percent"> <xsl:with-param name="value" select="$successRate"/> @@ -376,7 +376,7 @@ <td><xsl:value-of select="@tests"/></td> <td><xsl:value-of select="@errors"/></td> <td><xsl:value-of select="@failures"/></td> - <td><xsl:value-of select="@skipped" /></td> + <td><xsl:value-of select="@skipped"/></td> <td> <xsl:call-template name="display-time"> <xsl:with-param name="value" select="@time"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/log.xsl ---------------------------------------------------------------------- diff --git a/src/etc/log.xsl b/src/etc/log.xsl index 5040993..062d139 100644 --- a/src/etc/log.xsl +++ b/src/etc/log.xsl @@ -16,18 +16,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + --> - + <!-- The purpose have this XSL is to provide a nice way to look at the output - from the Ant XmlLogger (ie: ant -listener org.apache.tools.ant.XmlLogger ) - + from the Ant XmlLogger (ie: ant -listener org.apache.tools.ant.XmlLogger) + @author <a href="mailto:[email protected]">Stephane Bailliez</a> - + --> -<xsl:decimal-format decimal-separator="." grouping-separator="," /> +<xsl:decimal-format decimal-separator="." grouping-separator=","/> <xsl:template match="/"> <html> @@ -75,10 +75,10 @@ color:#FFFFFF; font-weight: bold } - .a td { + .a td { background: #efefef; } - .b td { + .b td { background: #fff; } th, td { @@ -118,7 +118,7 @@ </td> </tr> </table> - + <table border="0" width="100%"> <tr><td><hr noshade="yes" size="1"/></td></tr> </table> @@ -138,7 +138,7 @@ </xsl:attribute> <tr> <xsl:if test="@error"> - <td nowrap="yes">Build Failed</td> + <td nowrap="yes">Build Failed</td> </xsl:if> <xsl:if test="not(@error)"> <td nowrap="yes">Build Complete</td> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/maudit-frames.xsl ---------------------------------------------------------------------- diff --git a/src/etc/maudit-frames.xsl b/src/etc/maudit-frames.xsl index c81f8dc..0ab62bc 100644 --- a/src/etc/maudit-frames.xsl +++ b/src/etc/maudit-frames.xsl @@ -4,7 +4,7 @@ xmlns:redirect="org.apache.xalan.lib.Redirect" extension-element-prefixes="redirect"> <xsl:output method="html" indent="yes" encoding="US-ASCII"/> -<xsl:decimal-format decimal-separator="." grouping-separator="," /> +<xsl:decimal-format decimal-separator="." grouping-separator=","/> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/mmetrics-frames.xsl ---------------------------------------------------------------------- diff --git a/src/etc/mmetrics-frames.xsl b/src/etc/mmetrics-frames.xsl index 2b0f6b8..dce25db 100644 --- a/src/etc/mmetrics-frames.xsl +++ b/src/etc/mmetrics-frames.xsl @@ -6,7 +6,7 @@ exclude-result-prefixes="xalan" extension-element-prefixes="redirect"> <xsl:output method="html" indent="yes" encoding="US-ASCII"/> -<xsl:decimal-format decimal-separator="." grouping-separator="," /> +<xsl:decimal-format decimal-separator="." grouping-separator=","/> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/performance/build.xml ---------------------------------------------------------------------- diff --git a/src/etc/performance/build.xml b/src/etc/performance/build.xml index c3e3ed9..2497dfa 100644 --- a/src/etc/performance/build.xml +++ b/src/etc/performance/build.xml @@ -28,7 +28,7 @@ ANT_HOME_6_5 (the directory containing ant 1.6.5) ANT_HOME_6_4 ANT_HOME_5_4 - + * run ant For example: export ANT_HOME="c:/cygwin/home/me/svn/trunk/dist" @@ -63,7 +63,7 @@ </ac:if> </sequential> </macrodef> - + <target name="do-times"> <run-ant-files env-ant="env.ANT_HOME"/> <run-ant-files env-ant="env.ANT_HOME_6_5"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/performance/dirscanner.xml ---------------------------------------------------------------------- diff --git a/src/etc/performance/dirscanner.xml b/src/etc/performance/dirscanner.xml index 5628a46..2c845c3 100644 --- a/src/etc/performance/dirscanner.xml +++ b/src/etc/performance/dirscanner.xml @@ -57,8 +57,8 @@ <target name="prepare-setup"> <mkdir dir="${test.dir}/src/org/apache/tools/ant"/> <mkdir dir="${test.dir}/dest"/> - <echo file="${test.dir}/src/org/apache/tools/ant/DirscannerSetup.java" - ><![CDATA[ + <echo file="${test.dir}/src/org/apache/tools/ant/DirscannerSetup.java"> + <![CDATA[ /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/poms/ant-apache-log4j/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-apache-log4j/pom.xml b/src/etc/poms/ant-apache-log4j/pom.xml index 13e6282..13184d8 100644 --- a/src/etc/poms/ant-apache-log4j/pom.xml +++ b/src/etc/poms/ant-apache-log4j/pom.xml @@ -20,7 +20,7 @@ Please contact us if you are not satisfied with the data contained in this POM. URL : http://ant.apache.org --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.apache.ant</groupId> @@ -29,7 +29,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <version>1.10.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <url>http://ant.apache.org/</url> + <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-log4j</artifactId> <version>1.10.5-SNAPSHOT</version> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/poms/ant-apache-regexp/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-apache-regexp/pom.xml b/src/etc/poms/ant-apache-regexp/pom.xml index dfd3a60..7b0b529 100644 --- a/src/etc/poms/ant-apache-regexp/pom.xml +++ b/src/etc/poms/ant-apache-regexp/pom.xml @@ -20,7 +20,7 @@ Please contact us if you are not satisfied with the data contained in this POM. URL : http://ant.apache.org --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.apache.ant</groupId> @@ -66,5 +66,5 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory> <directory>../../../../target/${project.artifactId}</directory> </build> - + </project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/poms/ant-apache-resolver/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-apache-resolver/pom.xml b/src/etc/poms/ant-apache-resolver/pom.xml index 290637a..716ec07 100644 --- a/src/etc/poms/ant-apache-resolver/pom.xml +++ b/src/etc/poms/ant-apache-resolver/pom.xml @@ -20,7 +20,7 @@ Please contact us if you are not satisfied with the data contained in this POM. URL : http://ant.apache.org --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.apache.ant</groupId> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/poms/ant-apache-xalan2/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-apache-xalan2/pom.xml b/src/etc/poms/ant-apache-xalan2/pom.xml index fbd868a..1216081 100644 --- a/src/etc/poms/ant-apache-xalan2/pom.xml +++ b/src/etc/poms/ant-apache-xalan2/pom.xml @@ -20,7 +20,7 @@ Please contact us if you are not satisfied with the data contained in this POM. URL : http://ant.apache.org --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.apache.ant</groupId> @@ -29,7 +29,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <version>1.10.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <url>http://ant.apache.org/</url> + <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-xalan2</artifactId> <version>1.10.5-SNAPSHOT</version> @@ -68,7 +68,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <include name="junit-frames.xsl"/> <include name="junit-noframes.xsl"/> </fileset> - </copy> + </copy> </tasks> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/poms/ant-commons-logging/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-commons-logging/pom.xml b/src/etc/poms/ant-commons-logging/pom.xml index 6363392..3349ede 100644 --- a/src/etc/poms/ant-commons-logging/pom.xml +++ b/src/etc/poms/ant-commons-logging/pom.xml @@ -20,7 +20,7 @@ Please contact us if you are not satisfied with the data contained in this POM. URL : http://ant.apache.org --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.apache.ant</groupId> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/poms/ant-commons-net/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-commons-net/pom.xml b/src/etc/poms/ant-commons-net/pom.xml index be4dbbd..a7f8ae5 100644 --- a/src/etc/poms/ant-commons-net/pom.xml +++ b/src/etc/poms/ant-commons-net/pom.xml @@ -20,7 +20,7 @@ Please contact us if you are not satisfied with the data contained in this POM. URL : http://ant.apache.org --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.apache.ant</groupId> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/poms/ant-javamail/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-javamail/pom.xml b/src/etc/poms/ant-javamail/pom.xml index f35c8e8..382a489 100644 --- a/src/etc/poms/ant-javamail/pom.xml +++ b/src/etc/poms/ant-javamail/pom.xml @@ -20,7 +20,7 @@ Please contact us if you are not satisfied with the data contained in this POM. URL : http://ant.apache.org --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.apache.ant</groupId> @@ -29,7 +29,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <version>1.10.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <url>http://ant.apache.org/</url> + <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-javamail</artifactId> <version>1.10.5-SNAPSHOT</version> @@ -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> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/poms/ant-jdepend/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-jdepend/pom.xml b/src/etc/poms/ant-jdepend/pom.xml index 37943e6..e2bf3c9 100644 --- a/src/etc/poms/ant-jdepend/pom.xml +++ b/src/etc/poms/ant-jdepend/pom.xml @@ -30,7 +30,7 @@ <version>1.10.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <url>http://ant.apache.org/</url> + <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-jdepend</artifactId> <version>1.10.5-SNAPSHOT</version> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/poms/ant-jmf/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-jmf/pom.xml b/src/etc/poms/ant-jmf/pom.xml index 31975df..cb80123 100644 --- a/src/etc/poms/ant-jmf/pom.xml +++ b/src/etc/poms/ant-jmf/pom.xml @@ -20,7 +20,7 @@ Please contact us if you are not satisfied with the data contained in this POM. URL : http://ant.apache.org --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.apache.ant</groupId> @@ -29,7 +29,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <version>1.10.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <url>http://ant.apache.org/</url> + <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-jmf</artifactId> <version>1.10.5-SNAPSHOT</version> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/poms/ant-jsch/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-jsch/pom.xml b/src/etc/poms/ant-jsch/pom.xml index 85b70c3..4fa7116 100644 --- a/src/etc/poms/ant-jsch/pom.xml +++ b/src/etc/poms/ant-jsch/pom.xml @@ -20,7 +20,7 @@ Please contact us if you are not satisfied with the data contained in this POM. URL : http://ant.apache.org --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.apache.ant</groupId> @@ -29,7 +29,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <version>1.10.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <url>http://ant.apache.org/</url> + <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-jsch</artifactId> <version>1.10.5-SNAPSHOT</version> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/poms/ant-junit/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-junit/pom.xml b/src/etc/poms/ant-junit/pom.xml index ed1b6f4..1b97d59 100644 --- a/src/etc/poms/ant-junit/pom.xml +++ b/src/etc/poms/ant-junit/pom.xml @@ -20,7 +20,7 @@ Please contact us if you are not satisfied with the data contained in this POM. URL : http://ant.apache.org --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.apache.ant</groupId> @@ -29,7 +29,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <version>1.10.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <url>http://ant.apache.org/</url> + <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-junit</artifactId> <version>1.10.5-SNAPSHOT</version> @@ -70,7 +70,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <include name="junit-frames-saxon.xsl"/> <include name="junit-noframes-saxon.xsl"/> </fileset> - </copy> + </copy> </tasks> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/poms/ant-netrexx/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-netrexx/pom.xml b/src/etc/poms/ant-netrexx/pom.xml index 8c883c4..99d721d 100644 --- a/src/etc/poms/ant-netrexx/pom.xml +++ b/src/etc/poms/ant-netrexx/pom.xml @@ -20,7 +20,7 @@ Please contact us if you are not satisfied with the data contained in this POM. URL : http://ant.apache.org --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.apache.ant</groupId> @@ -29,7 +29,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <version>1.10.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <url>http://ant.apache.org/</url> + <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-netrexx</artifactId> <version>1.10.5-SNAPSHOT</version> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/poms/ant-swing/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-swing/pom.xml b/src/etc/poms/ant-swing/pom.xml index 1bbb2d4..4ab2dc7 100644 --- a/src/etc/poms/ant-swing/pom.xml +++ b/src/etc/poms/ant-swing/pom.xml @@ -30,7 +30,7 @@ <version>1.10.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <url>http://ant.apache.org/</url> + <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-swing</artifactId> <version>1.10.5-SNAPSHOT</version> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/poms/ant-testutil/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-testutil/pom.xml b/src/etc/poms/ant-testutil/pom.xml index 10224fa..6217339 100644 --- a/src/etc/poms/ant-testutil/pom.xml +++ b/src/etc/poms/ant-testutil/pom.xml @@ -30,7 +30,7 @@ <version>1.10.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <url>http://ant.apache.org/</url> + <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-testutil</artifactId> <version>1.10.5-SNAPSHOT</version> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/poms/ant-xz/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-xz/pom.xml b/src/etc/poms/ant-xz/pom.xml index a358729..c5d63e6 100644 --- a/src/etc/poms/ant-xz/pom.xml +++ b/src/etc/poms/ant-xz/pom.xml @@ -20,7 +20,7 @@ Please contact us if you are not satisfied with the data contained in this POM. URL : http://ant.apache.org --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.apache.ant</groupId> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/tagdiff.xsl ---------------------------------------------------------------------- diff --git a/src/etc/tagdiff.xsl b/src/etc/tagdiff.xsl index 5d430a7..774ac83 100644 --- a/src/etc/tagdiff.xsl +++ b/src/etc/tagdiff.xsl @@ -56,10 +56,10 @@ font-family: verdana,arial,helvetica; font-size: 80%; background:#eeeee0; - } - </style> + } + </style> </head> - <body link="#000000" alink="#000000" vlink="#000000" text="#000000"> + <body link="#000000" alink="#000000" vlink="#000000" text="#000000"> <h1> <a name="top"><xsl:value-of select="$title"/></a> </h1> @@ -97,7 +97,7 @@ <xsl:with-param name="entries" select=".//entry[not(file/revision)][file/prevrevision]"/> </xsl:call-template> </table> - + </body> </html> </xsl:template> @@ -125,7 +125,7 @@ </ul> </td> </tr> - </xsl:template> + </xsl:template> <xsl:template match="entry"> <xsl:apply-templates select="file"/> @@ -151,18 +151,18 @@ <xsl:template match="file"> <li> <a target="_new"> - <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" /></xsl:attribute> - <xsl:value-of select="name" /> + <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module"/>/<xsl:value-of select="name"/></xsl:attribute> + <xsl:value-of select="name"/> </a> <xsl:if test="string-length(prevrevision) > 0 or string-length(revision) > 0"> <xsl:text> </xsl:text> <a target="_new"> <xsl:choose> <xsl:when test="string-length(prevrevision) = 0 "> - <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?rev=<xsl:value-of select="revision" />&content-type=text/x-cvsweb-markup</xsl:attribute> + <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module"/>/<xsl:value-of select="name"/>?rev=<xsl:value-of select="revision"/>&content-type=text/x-cvsweb-markup</xsl:attribute> </xsl:when> <xsl:otherwise> - <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?r1=<xsl:value-of select="revision" />&r2=<xsl:value-of select="prevrevision"/>&diff_format=h</xsl:attribute> + <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module"/>/<xsl:value-of select="name"/>?r1=<xsl:value-of select="revision"/>&r2=<xsl:value-of select="prevrevision"/>&diff_format=h</xsl:attribute> </xsl:otherwise> </xsl:choose> (<xsl:if test="count(prevrevision) > 0"> <xsl:value-of select="prevrevision"/> --> </xsl:if> <xsl:value-of select="revision"/>) </a> @@ -175,5 +175,5 @@ <xsl:template match="msg"> <b><xsl:apply-templates/></b> </xsl:template> - + </xsl:stylesheet> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/buildfiletest-base.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/buildfiletest-base.xml b/src/etc/testcases/buildfiletest-base.xml index fc1e8b0..5e0439a 100644 --- a/src/etc/testcases/buildfiletest-base.xml +++ b/src/etc/testcases/buildfiletest-base.xml @@ -7,5 +7,5 @@ <delete dir="${input}"/> <delete dir="${output}"/> </target> - + </project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/core/directoryscanner.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/core/directoryscanner.xml b/src/etc/testcases/core/directoryscanner.xml index 7e8683a..0ef2f79 100644 --- a/src/etc/testcases/core/directoryscanner.xml +++ b/src/etc/testcases/core/directoryscanner.xml @@ -29,7 +29,7 @@ <touch file="${output}/delta/delta.xml"/> </target> - <target name="children-of-excluded-dir-setup" depends="extended-setup" /> + <target name="children-of-excluded-dir-setup" depends="extended-setup"/> <target name="symlink-setup" depends="setUp"> <mkdir dir="${output}/epsilon/gamma"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/core/dispatch/dispatch.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/core/dispatch/dispatch.xml b/src/etc/testcases/core/dispatch/dispatch.xml index d529644..43eef73 100644 --- a/src/etc/testcases/core/dispatch/dispatch.xml +++ b/src/etc/testcases/core/dispatch/dispatch.xml @@ -19,14 +19,14 @@ <project name="dispatch-test" default="disp"> <path id="testclasses"> - <pathelement location="../../../../build/testcases" /> - <pathelement path="${java.class.path}" /> + <pathelement location="../../../../build/testcases"/> + <pathelement path="${java.class.path}"/> </path> <target name="disp"> <taskdef name="disptask" classname="org.apache.tools.ant.taskdefs.PickOneTask"> - <classpath refid="testclasses" /> + <classpath refid="testclasses"/> </taskdef> <disptask action="list"/> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/core/executor.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/core/executor.xml b/src/etc/testcases/core/executor.xml index 080c8dc..005baa5 100644 --- a/src/etc/testcases/core/executor.xml +++ b/src/etc/testcases/core/executor.xml @@ -18,7 +18,7 @@ <project> <target name="foo"> <echo>foo</echo> - <fail if="failfoo" message="failfoo" /> + <fail if="failfoo" message="failfoo"/> </target> <target name="a" depends="foo"> <echo>a</echo> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/core/extended-taskdef.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/core/extended-taskdef.xml b/src/etc/testcases/core/extended-taskdef.xml index 58ca979..0d63ea8 100644 --- a/src/etc/testcases/core/extended-taskdef.xml +++ b/src/etc/testcases/core/extended-taskdef.xml @@ -24,7 +24,7 @@ <property name="src" value="Foo.java"/> <property name="taskdefs" value="tasks.properties"/> - <target name="write" > + <target name="write"> <echo file="${src}"> import org.apache.tools.ant.BuildException; @@ -67,7 +67,7 @@ <fileset dir="${basedir}" includes="${src},*.class"/> </delete> - <delete file="${taskdefs}" /> + <delete file="${taskdefs}"/> </target> </project>
