From 3e61185e19eca3ca70afeda3fb31a1a544f2b474 Mon Sep 17 00:00:00 2001 From: Gintas Grigelionis Date: Wed, 28 Feb 2018 07:57:16 +0100 Subject: [PATCH] Use HTTPS links when available --- src/main/org/apache/tools/ant/launch/Locator.java | 8 ++++---- src/main/org/apache/tools/ant/types/DTDLocation.java | 2 +- src/main/org/apache/tools/ant/types/ResourceLocation.java | 2 +- src/main/org/apache/tools/ant/types/XMLCatalog.java | 6 +++--- .../tools/ant/types/resolver/ApacheCatalogResolver.java | 4 ++-- src/main/org/apache/tools/ant/types/resolver/package.html | 6 +++--- .../selectors/modifiedselector/ModifiedSelector.java | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/org/apache/tools/ant/launch/Locator.java b/src/main/org/apache/tools/ant/launch/Locator.java index b0c67c539..79ef29dee 100644 --- a/src/main/org/apache/tools/ant/launch/Locator.java +++ b/src/main/org/apache/tools/ant/launch/Locator.java @@ -36,9 +36,9 @@ import java.util.stream.Stream; * It is used at boot time in the launcher, and cannot make use of any of Ant's other classes. *

* This is a surprisingly brittle piece of code, and has had lots of bugs filed against it: - * running ant off a network share can cause Ant to fail, - * use File.toURI().toURL().toExternalForm(), - * Locator implementation not encoding URI strings properly: spaces in paths. + * running ant off a network share can cause Ant to fail, + * use File.toURI().toURL().toExternalForm(), + * Locator implementation not encoding URI strings properly: spaces in paths. * It also breaks Eclipse 3.3 Betas: * Exception if installation path has spaces. *

@@ -157,7 +157,7 @@ public final class Locator { *

Prior to Java 1.4, * swallows '%' that are not followed by two characters.

* - * See dt-sysid + * See dt-sysid * which makes some mention of how * characters not supported by URI Reference syntax should be escaped. * diff --git a/src/main/org/apache/tools/ant/types/DTDLocation.java b/src/main/org/apache/tools/ant/types/DTDLocation.java index 9fdeee293..e0d080dd4 100644 --- a/src/main/org/apache/tools/ant/types/DTDLocation.java +++ b/src/main/org/apache/tools/ant/types/DTDLocation.java @@ -21,7 +21,7 @@ package org.apache.tools.ant.types; *

Helper class to handle the DTD nested element. Instances of * this class correspond to the PUBLIC catalog entry type * of the + * href="https://oasis-open.org/committees/entity/spec-2001-08-06.html"> * OASIS "Open Catalog" standard.

* *

Possible Future Enhancement: Bring the Ant element name into diff --git a/src/main/org/apache/tools/ant/types/ResourceLocation.java b/src/main/org/apache/tools/ant/types/ResourceLocation.java index 08791541a..43629667b 100644 --- a/src/main/org/apache/tools/ant/types/ResourceLocation.java +++ b/src/main/org/apache/tools/ant/types/ResourceLocation.java @@ -24,7 +24,7 @@ import java.net.URL; * <entity> nested elements. These correspond to * the PUBLIC and URI catalog entry types, * respectively, as defined in the + * href="https://oasis-open.org/committees/entity/spec-2001-08-06.html"> * OASIS "Open Catalog" standard.

* *

Possible Future Enhancements:

diff --git a/src/main/org/apache/tools/ant/types/XMLCatalog.java b/src/main/org/apache/tools/ant/types/XMLCatalog.java index b967a8862..78577a25f 100644 --- a/src/main/org/apache/tools/ant/types/XMLCatalog.java +++ b/src/main/org/apache/tools/ant/types/XMLCatalog.java @@ -50,7 +50,7 @@ import org.xml.sax.XMLReader; /** *

This data type provides a catalog of resource locations (such as * DTDs and XML entities), based on the + * href="https://oasis-open.org/committees/entity/spec-2001-08-06.html"> * OASIS "Open Catalog" standard. The catalog entries are used * both for Entity resolution and URI resolution, in accordance with * the {@link org.xml.sax.EntityResolver EntityResolver} and {@link @@ -62,9 +62,9 @@ import org.xml.sax.XMLReader; * external catalog file(s), or both. In order to use an external * catalog file, the xml-commons resolver library ("resolver.jar") * must be in your classpath. External catalog files may be either + * href="https://oasis-open.org/committees/entity/background/9401.html"> * plain text format or + * href="https://www.oasis-open.org/committees/entity/spec-2001-08-06.html"> * XML format. If the xml-commons resolver library is not found * in the classpath, external catalog files, specified in * <catalogpath> paths, will be ignored and a warning will diff --git a/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java b/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java index fccedf7f6..44a17e262 100644 --- a/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java +++ b/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java @@ -40,9 +40,9 @@ import org.apache.xml.resolver.tools.CatalogResolver; *

The {@link org.apache.tools.ant.types.resolver.ApacheCatalog * ApacheCatalog} class is used to parse external catalog files, which * can be in either + * href="https://oasis-open.org/committees/entity/background/9401.html"> * plain text format or + * href="https://www.oasis-open.org/committees/entity/spec-2001-08-06.html"> * XML format.

* *

For each entry found in an external catalog file, if any, an diff --git a/src/main/org/apache/tools/ant/types/resolver/package.html b/src/main/org/apache/tools/ant/types/resolver/package.html index 11b3c7736..93ad15cba 100644 --- a/src/main/org/apache/tools/ant/types/resolver/package.html +++ b/src/main/org/apache/tools/ant/types/resolver/package.html @@ -20,16 +20,16 @@ Ant integration with xml-commons resolver.

These classes enhance the <xmlcatalog> datatype to support external catalog files using the xml-commons resolver, in accordance with the - + OASIS "Open Catalog" standard. They will be used if and only if the xml-commons resolver library is available on the classpath.

-@see Apache xml-commons Project +@see Apache xml-commons Project @see org.apache.tools.ant.types.XMLCatalog @see org.apache.tools.ant.types.resolver.ApacheCatalogResolver @see org.apache.tools.ant.types.resolver.ApacheCatalog -@author Craeg Strong +@author Craeg Strong diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java index f3b33e27a..3d050f8de 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java @@ -115,7 +115,7 @@ import org.apache.tools.ant.util.ResourceUtils; * comparison.

* *

A useful scenario for this selector is inside a build environment - * for homepage generation (e.g. with + * for homepage generation (e.g. with * Apache Forrest).

  * <target name="generate-and-upload-site">
  *     <echo> generate the site using forrest </echo>