diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6d7a3d20494..f5377d797d2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -159,6 +159,6 @@ positive response, and those patches require little modifications, the developer will be nominated for core commit access. There is no magic number of patches that make the criteria, it is based mostly -on the nature of the patches, how in depth the they are, etc... Basically it +on the nature of the patches, how in depth they are, etc... Basically it boils down to the developer being able to show that they understand the code base well enough to not seriously break anything. diff --git a/build/cite/wms11/citewms-1.1/mbdemos/lib/model/Context.js b/build/cite/wms11/citewms-1.1/mbdemos/lib/model/Context.js index 5a9944eee57..2e752fa74a9 100644 --- a/build/cite/wms11/citewms-1.1/mbdemos/lib/model/Context.js +++ b/build/cite/wms11/citewms-1.1/mbdemos/lib/model/Context.js @@ -5,7 +5,7 @@ $Id: Context.js,v 1.76 2005/03/06 04:14:50 madair1 Exp $ /** * Stores a Web Map Context (WMC) document as defined by the Open GIS Consortium - * http://opengis.org and extensions the the WMC. + * http://opengis.org and extensions the WMC. * * Listeners supported by this model: * "refresh" called when window parameters (width/height, bbox) are changed diff --git a/build/cite/wms11/citewms-1.1/mbdemos/lib/model/ContextCollection.js b/build/cite/wms11/citewms-1.1/mbdemos/lib/model/ContextCollection.js index 518f9325b62..00792c9d60d 100644 --- a/build/cite/wms11/citewms-1.1/mbdemos/lib/model/ContextCollection.js +++ b/build/cite/wms11/citewms-1.1/mbdemos/lib/model/ContextCollection.js @@ -5,7 +5,7 @@ $Id: ContextCollection.js,v 1.9 2005/03/01 04:49:25 madair1 Exp $ /** * Stores a Web Map Context (WMC) Collection document as defined by the Open - * GIS Consortium http://opengis.org and extensions the the WMC. + * GIS Consortium http://opengis.org and extensions the WMC. * @constructor * @base ModelBase * @author Mike Adair diff --git a/build/cite/wms11/citewms-1.1/mbdemos/lib/model/WmsCapabilities.js b/build/cite/wms11/citewms-1.1/mbdemos/lib/model/WmsCapabilities.js index 6f0debe1af6..87ceecc22d5 100644 --- a/build/cite/wms11/citewms-1.1/mbdemos/lib/model/WmsCapabilities.js +++ b/build/cite/wms11/citewms-1.1/mbdemos/lib/model/WmsCapabilities.js @@ -5,7 +5,7 @@ $Id: WmsCapabilities.js,v 1.6 2005/03/06 04:14:51 madair1 Exp $ /** * Stores a Web Map Server (WMS) Capabilities document as defined by the - * Open Geospatial Consortium (http://opengis.org and extensions the the WMC. + * Open Geospatial Consortium (http://opengis.org and extensions the WMC. * * @constructor * @author Mike Adair diff --git a/doc/en/developer/source/policies/committing.rst b/doc/en/developer/source/policies/committing.rst index a6127e56e93..d8361bbce63 100644 --- a/doc/en/developer/source/policies/committing.rst +++ b/doc/en/developer/source/policies/committing.rst @@ -81,7 +81,7 @@ positive response, and those patches require little modifications, the developer will be nominated for core commit access. There is no magic number of patches that make the criteria, it is based mostly -on the nature of the patches, how in depth the they are, etc... Basically it +on the nature of the patches, how in depth they are, etc... Basically it boils down to the developer being able to show that they understand the code base well enough to not seriously break anything. diff --git a/doc/en/user/source/extensions/mapml/installation.rst b/doc/en/user/source/extensions/mapml/installation.rst index 63e16be87ba..85f25133209 100644 --- a/doc/en/user/source/extensions/mapml/installation.rst +++ b/doc/en/user/source/extensions/mapml/installation.rst @@ -284,7 +284,7 @@ With the MapML Extension module installed, the GeoServer Layer Preview page is m .. figure:: images/mapml_preview_ui.png -You can add layers to the map as you like, by dragging the URL bar value generated by the the Layer Preview WMS formats dropdown menu selection of "MapML" as shown below, and dropping it onto another layer's MapML preview: +You can add layers to the map as you like, by dragging the URL bar value generated by the Layer Preview WMS formats dropdown menu selection of "MapML" as shown below, and dropping it onto another layer's MapML preview: .. figure:: images/mapml_wms_format_dropdown.png diff --git a/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/cancel/Cancel.java b/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/cancel/Cancel.java index 622a594b1a2..9f0d3fdbf2d 100644 --- a/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/cancel/Cancel.java +++ b/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/cancel/Cancel.java @@ -45,7 +45,7 @@ */ public class Cancel extends AbstractAsn1Object { - /** The Id of the the message to cancel */ + /** The Id of the message to cancel */ private int cancelId; /** Length of the sequence */ diff --git a/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/entry/AbstractValue.java b/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/entry/AbstractValue.java index bd01eabd49b..3fd87e84a22 100644 --- a/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/entry/AbstractValue.java +++ b/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/entry/AbstractValue.java @@ -269,7 +269,7 @@ public T getNormalizedValue() /** - * Gets a reference to the the normalized (canonical) representation + * Gets a reference to the normalized (canonical) representation * for the wrapped value. * * @return gets a reference to the normalized value diff --git a/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/entry/StringValue.java b/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/entry/StringValue.java index 388c06fccf4..6bf7cced686 100644 --- a/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/entry/StringValue.java +++ b/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/entry/StringValue.java @@ -178,7 +178,7 @@ public String getNormalizedValue() /** - * Gets a copy of the the normalized (canonical) representation + * Gets a copy of the normalized (canonical) representation * for the wrapped value. * * @return gets a copy of the normalized value diff --git a/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/entry/Value.java b/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/entry/Value.java index 0e0d5c8a315..89ee6af00c0 100644 --- a/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/entry/Value.java +++ b/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/entry/Value.java @@ -133,7 +133,7 @@ public interface Value extends Cloneable, Externalizable, Comparable /** - * Gets a reference to the the normalized (canonical) representation + * Gets a reference to the normalized (canonical) representation * for the wrapped value. * * @return gets a reference to the normalized value @@ -142,7 +142,7 @@ public interface Value extends Cloneable, Externalizable, Comparable /** - * Gets a copy of the the normalized (canonical) representation + * Gets a copy of the normalized (canonical) representation * for the wrapped value. * * @return gets a copy of the normalized value diff --git a/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java b/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java index d7c57cc7af9..f21480ce101 100644 --- a/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java +++ b/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java @@ -177,7 +177,7 @@ public DN( String upName ) throws LdapInvalidDnException /** * Creates a new instance of DN, using varargs to declare the RDNs. Each * String is either a full RDN, or a couple of AttributeType DI and a value. - * If the String contains a '=' symbol, the the constructor will assume that + * If the String contains a '=' symbol, the constructor will assume that * the String arg contains afull RDN, otherwise, it will consider that the * following arg is the value. * An example of usage would be : diff --git a/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/schema/AttributeType.java b/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/schema/AttributeType.java index 6f540a04c64..e0235480dd7 100644 --- a/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/schema/AttributeType.java +++ b/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/schema/AttributeType.java @@ -914,7 +914,7 @@ public void setSyntaxLength( int length ) /** - * Gets the the superior AttributeType of this AttributeType. + * Gets the superior AttributeType of this AttributeType. * * @return the superior AttributeType for this AttributeType */ diff --git a/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/subtree/BaseSubtreeSpecification.java b/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/subtree/BaseSubtreeSpecification.java index 9b28c47dc73..920a265d92d 100644 --- a/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/subtree/BaseSubtreeSpecification.java +++ b/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/subtree/BaseSubtreeSpecification.java @@ -65,7 +65,7 @@ public class BaseSubtreeSpecification implements SubtreeSpecification /** * Creates a simple subtree whose administrative point is necessarily the * base and all subordinates underneath (excluding those that are part of - * inner areas) are part of the the subtree. + * inner areas) are part of the subtree. */ @SuppressWarnings("unchecked") public BaseSubtreeSpecification() @@ -103,7 +103,7 @@ public BaseSubtreeSpecification(ExprNode refinement) /** * Creates a simple subtree whose administrative point above the base and * all subordinates underneath the base (excluding those that are part of - * inner areas) are part of the the subtree. + * inner areas) are part of the subtree. * * @param base * the base of the subtree relative to the administrative point diff --git a/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/util/NestableDelegate.java b/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/util/NestableDelegate.java index 232fe39e494..f5424dc88d1 100644 --- a/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/util/NestableDelegate.java +++ b/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/util/NestableDelegate.java @@ -287,7 +287,7 @@ public int indexOfThrowable( Class type, int fromIndex ) /** - * Prints the stack trace of this exception the the standar error stream. + * Prints the stack trace of this exception the standar error stream. */ public void printStackTrace() { diff --git a/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java b/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java index 539b78bbffe..d8c81deb5d2 100644 --- a/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java +++ b/doc/en/user/source/security/tutorials/ldap/acme-ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java @@ -3757,7 +3757,7 @@ public static String uuidToString( byte[] bytes ) * converts the string representation of an UUID to bytes * * @param string the string representation of an UUID - * @return the bytes, null if the the syntax is not valid + * @return the bytes, null if the syntax is not valid */ public static byte[] uuidToBytes( String string ) { diff --git a/src/community/acl/README.md b/src/community/acl/README.md index 426a163a6f5..760f588e65e 100644 --- a/src/community/acl/README.md +++ b/src/community/acl/README.md @@ -49,7 +49,7 @@ set up the ACL API client target URL and credentials. ### System Properties If you choose to use Java System properties, add the following ones to the GeoServer JVM parameters, -the the appropriate values: +the appropriate values: ``` -Dgeoserver.acl.client.basePath=https://example.com/acl/api diff --git a/src/community/backup-restore/core/src/main/java/org/geoserver/backuprestore/writer/CatalogFileWriter.java b/src/community/backup-restore/core/src/main/java/org/geoserver/backuprestore/writer/CatalogFileWriter.java index c341ae2f34e..26fa8944638 100644 --- a/src/community/backup-restore/core/src/main/java/org/geoserver/backuprestore/writer/CatalogFileWriter.java +++ b/src/community/backup-restore/core/src/main/java/org/geoserver/backuprestore/writer/CatalogFileWriter.java @@ -375,7 +375,7 @@ public void close() { outputBufferedWriter.close(); } } catch (IOException ioe) { - throw new ItemStreamException("Unable to close the the ItemWriter", ioe); + throw new ItemStreamException("Unable to close the ItemWriter", ioe); } finally { if (!transactional) { closeStream(); @@ -389,14 +389,14 @@ private void closeStream() { fileChannel.close(); } } catch (IOException ioe) { - throw new ItemStreamException("Unable to close the the ItemWriter", ioe); + throw new ItemStreamException("Unable to close the ItemWriter", ioe); } finally { try { if (os != null) { os.close(); } } catch (IOException ioe) { - throw new ItemStreamException("Unable to close the the ItemWriter", ioe); + throw new ItemStreamException("Unable to close the ItemWriter", ioe); } } } diff --git a/src/community/hz-cluster/src/main/webapp/WEB-INF/web.xml b/src/community/hz-cluster/src/main/webapp/WEB-INF/web.xml index e41716ba4ca..f4e43aae1d6 100644 --- a/src/community/hz-cluster/src/main/webapp/WEB-INF/web.xml +++ b/src/community/hz-cluster/src/main/webapp/WEB-INF/web.xml @@ -8,7 +8,7 @@ - + @@ -63,7 +63,7 @@ It is separate to, but harmonized with, GeoSciML and conforms to the level 0 of - Display name for the the Contact. + Display name for the Contact. @@ -98,7 +98,7 @@ It is separate to, but harmonized with, GeoSciML and conforms to the level 0 of - URI referring the the GeoSciML Contact feature that describes the instance in detail. Mandatory propery - if not value is provided then a URI referring to a conctrolled concept explaining why the value is nil must be provided. + URI referring the GeoSciML Contact feature that describes the instance in detail. Mandatory propery - if not value is provided then a URI referring to a conctrolled concept explaining why the value is nil must be provided. @@ -145,7 +145,7 @@ It is separate to, but harmonized with, GeoSciML and conforms to the level 0 of - Display name for the the ShearDisplacementStructure. + Display name for the ShearDisplacementStructure. @@ -225,7 +225,7 @@ It is separate to, but harmonized with, GeoSciML and conforms to the level 0 of - URI referring the the GeoSciML ShearDisplacementStructure feature that describes the instance in detail. Mandatory propery - if not value is provided then a URI referring to a conctrolled concept explaining why the value is nil must be provided. + URI referring the GeoSciML ShearDisplacementStructure feature that describes the instance in detail. Mandatory propery - if not value is provided then a URI referring to a conctrolled concept explaining why the value is nil must be provided. @@ -272,7 +272,7 @@ It is separate to, but harmonized with, GeoSciML and conforms to the level 0 of - Display name for the the GeologicalUnit. + Display name for the GeologicalUnit. @@ -342,7 +342,7 @@ It is separate to, but harmonized with, GeoSciML and conforms to the level 0 of - URI referring the the GeoSciML GeologicUnit feature that describes the instance in detail. Mandatory propery - if not value is provided then a URI referring to a conctrolled concept explaining why the value is nil must be provided. + URI referring the GeoSciML GeologicUnit feature that describes the instance in detail. Mandatory propery - if not value is provided then a URI referring to a conctrolled concept explaining why the value is nil must be provided. @@ -389,7 +389,7 @@ It is separate to, but harmonized with, GeoSciML and conforms to the level 0 of - Display name for the the borehole. + Display name for the borehole. @@ -474,7 +474,7 @@ It is separate to, but harmonized with, GeoSciML and conforms to the level 0 of - URI referring the the GeoSciML Borehole feature that describes the instance in detail. Mandatory property - if not value is provided then a URI referring to a controlled concept explaining why the value is nil must be provided. + URI referring the GeoSciML Borehole feature that describes the instance in detail. Mandatory property - if not value is provided then a URI referring to a controlled concept explaining why the value is nil must be provided. diff --git a/src/extension/csw/api/src/main/java/org/geoserver/csw/feature/AbstractFeatureCollection.java b/src/extension/csw/api/src/main/java/org/geoserver/csw/feature/AbstractFeatureCollection.java index 0d7cfbcbe72..b4f881f7f1c 100644 --- a/src/extension/csw/api/src/main/java/org/geoserver/csw/feature/AbstractFeatureCollection.java +++ b/src/extension/csw/api/src/main/java/org/geoserver/csw/feature/AbstractFeatureCollection.java @@ -91,7 +91,7 @@ public void close(FeatureIterator close) { /** * Open a resource based Iterator, we will call close( iterator ). * - *

Please subclass to provide your own iterator for the the ResourceCollection, note + *

Please subclass to provide your own iterator for the ResourceCollection, note * iterator() is implemented to call open() and track the results in for * later purge(). * diff --git a/src/extension/monitor/core/src/main/java/org/geoserver/monitor/RequestData.java b/src/extension/monitor/core/src/main/java/org/geoserver/monitor/RequestData.java index ce34a44e8bd..fb4e9e26557 100644 --- a/src/extension/monitor/core/src/main/java/org/geoserver/monitor/RequestData.java +++ b/src/extension/monitor/core/src/main/java/org/geoserver/monitor/RequestData.java @@ -96,7 +96,7 @@ public static enum Category { /** * The fully qualified name of the client or the last proxy that sent the request. If the engine - * cannot or chooses not to resolve the hostname (to improve performance), the the dotted-string + * cannot or chooses not to resolve the hostname (to improve performance), the dotted-string * form of the IP address. */ private String remoteHost; diff --git a/src/extension/wcs2_0-eo/core/src/main/java/org/geoserver/wcs2_0/eo/response/DescribeEOCoverageSetTransformer.java b/src/extension/wcs2_0-eo/core/src/main/java/org/geoserver/wcs2_0/eo/response/DescribeEOCoverageSetTransformer.java index 9169ff2ab23..a4ad9e6b4f3 100644 --- a/src/extension/wcs2_0-eo/core/src/main/java/org/geoserver/wcs2_0/eo/response/DescribeEOCoverageSetTransformer.java +++ b/src/extension/wcs2_0-eo/core/src/main/java/org/geoserver/wcs2_0/eo/response/DescribeEOCoverageSetTransformer.java @@ -198,7 +198,7 @@ private Integer getMaxCoverages(DescribeEOCoverageSetType dcs) { return dcs.getCount(); } - // fall back on the the default value, it's ok if it's null + // fall back on the default value, it's ok if it's null return wcs.getMetadata().get(WCSEOMetadata.COUNT_DEFAULT.key, Integer.class); } diff --git a/src/extension/wcs2_0-eo/core/src/main/resources/schemas/eop/2.0/eop.xsd b/src/extension/wcs2_0-eo/core/src/main/resources/schemas/eop/2.0/eop.xsd index 561cbe3c669..c3708130707 100644 --- a/src/extension/wcs2_0-eo/core/src/main/resources/schemas/eop/2.0/eop.xsd +++ b/src/extension/wcs2_0-eo/core/src/main/resources/schemas/eop/2.0/eop.xsd @@ -692,7 +692,7 @@ This service could be any kind of URL - e.g. direct link to the image or WMS/W - Information about the the downlinking (to earth) of the data. + Information about the downlinking (to earth) of the data. diff --git a/src/extension/wmts-multi-dimensional/src/main/java/org/geoserver/gwc/wmts/MultiDimensionalExtension.java b/src/extension/wmts-multi-dimensional/src/main/java/org/geoserver/gwc/wmts/MultiDimensionalExtension.java index 59e25bd72cd..73944327b9f 100644 --- a/src/extension/wmts-multi-dimensional/src/main/java/org/geoserver/gwc/wmts/MultiDimensionalExtension.java +++ b/src/extension/wmts-multi-dimensional/src/main/java/org/geoserver/gwc/wmts/MultiDimensionalExtension.java @@ -540,7 +540,7 @@ private void executeGetFeatureOperation(SimpleConveyor conveyor) throws Exceptio Domains domains = getDomains(conveyor); FeaturesTransformer transformer = new FeaturesTransformer(wms); transformer.transform(domains, conveyor.getResponse().getOutputStream()); - // right now we only support gml in the the future we may need to support other formats + // right now we only support gml in the future we may need to support other formats conveyor.getResponse().setContentType("text/xml; subtype=gml/3.1.1"); } diff --git a/src/extension/wps-download/src/main/java/org/geoserver/wps/gs/download/vertical/VerticalResampler.java b/src/extension/wps-download/src/main/java/org/geoserver/wps/gs/download/vertical/VerticalResampler.java index a050bacc6aa..0c12f7eba1e 100644 --- a/src/extension/wps-download/src/main/java/org/geoserver/wps/gs/download/vertical/VerticalResampler.java +++ b/src/extension/wps-download/src/main/java/org/geoserver/wps/gs/download/vertical/VerticalResampler.java @@ -196,7 +196,7 @@ public GridCoverage2D resample(GridCoverage2D gridCoverage) if (!gridEnvelope.intersects(dataEnvelope)) { if (LOGGER.isLoggable(Level.INFO)) { LOGGER.info( - "The computed GridCoverage doesn't intersect the the valid area of the available grid.\"" + "The computed GridCoverage doesn't intersect the valid area of the available grid.\"" + " Data Envelope: " + dataEnvelope + " Vertical Grid File Envelope: " diff --git a/src/extension/wps/wps-kml-ppio/src/test/resources/org/geoserver/wps/ppio/xAL.xsd b/src/extension/wps/wps-kml-ppio/src/test/resources/org/geoserver/wps/ppio/xAL.xsd index fad4919e7e2..4c6ababdb50 100644 --- a/src/extension/wps/wps-kml-ppio/src/test/resources/org/geoserver/wps/ppio/xAL.xsd +++ b/src/extension/wps/wps-kml-ppio/src/test/resources/org/geoserver/wps/ppio/xAL.xsd @@ -416,7 +416,7 @@ - A MailStop is where the the mail is delivered to within a premise/subpremise/firm or a facility. + A MailStop is where the mail is delivered to within a premise/subpremise/firm or a facility. @@ -480,7 +480,7 @@ - Name of the the Mail Stop. eg. MSP, MS, etc + Name of the Mail Stop. eg. MSP, MS, etc @@ -657,7 +657,7 @@ - A MailStop is where the the mail is delivered to within a premise/subpremise/firm or a facility. + A MailStop is where the mail is delivered to within a premise/subpremise/firm or a facility. @@ -1318,7 +1318,7 @@ - A MailStop is where the the mail is delivered to within a premise/subpremise/firm or a facility. + A MailStop is where the mail is delivered to within a premise/subpremise/firm or a facility. @@ -1471,7 +1471,7 @@ - A MailStop is where the the mail is delivered to within a premise/subpremise/firm or a facility. + A MailStop is where the mail is delivered to within a premise/subpremise/firm or a facility. diff --git a/src/kml/src/main/java/org/geoserver/kml/KmlEncodingContext.java b/src/kml/src/main/java/org/geoserver/kml/KmlEncodingContext.java index 5e60f69ad69..0164e8dbf9d 100644 --- a/src/kml/src/main/java/org/geoserver/kml/KmlEncodingContext.java +++ b/src/kml/src/main/java/org/geoserver/kml/KmlEncodingContext.java @@ -179,7 +179,7 @@ private WMSMapContent fixViewport(WMSMapContent mc) { /** Protected constructor used by WFS output format to create a fake kml encoding context */ protected KmlEncodingContext() {} - /** Returns the the kmplacemark value (either specified in the request, or the default one) */ + /** Returns the kmplacemark value (either specified in the request, or the default one) */ boolean computeKmplacemark() { Object kmplacemark = request.getFormatOptions().get("kmplacemark"); if (kmplacemark != null) { @@ -189,7 +189,7 @@ boolean computeKmplacemark() { } } - /** Returns the the kmattr value (either specified in the request, or the default one) */ + /** Returns the kmattr value (either specified in the request, or the default one) */ boolean computeKMAttr() { Object kmattr = request.getFormatOptions().get("kmattr"); if (kmattr == null) { diff --git a/src/kml/src/test/resources/org/geoserver/kml/xAL.xsd b/src/kml/src/test/resources/org/geoserver/kml/xAL.xsd index ce5cffd48a5..2ebde564efa 100644 --- a/src/kml/src/test/resources/org/geoserver/kml/xAL.xsd +++ b/src/kml/src/test/resources/org/geoserver/kml/xAL.xsd @@ -419,7 +419,7 @@ divisions of cities, suburbs, etc. DependentLocality is a recursive element, but - A MailStop is where the the mail is delivered to within a premise/subpremise/firm or a facility. + A MailStop is where the mail is delivered to within a premise/subpremise/firm or a facility. @@ -484,7 +484,7 @@ divisions of cities, suburbs, etc. DependentLocality is a recursive element, but - Name of the the Mail Stop. eg. MSP, MS, etc + Name of the Mail Stop. eg. MSP, MS, etc @@ -662,7 +662,7 @@ number or a single letter that is surrounded by fixed parts at the left (prefix) - A MailStop is where the the mail is delivered to within a premise/subpremise/firm or a facility. + A MailStop is where the mail is delivered to within a premise/subpremise/firm or a facility. @@ -1342,7 +1342,7 @@ a large mail user address, which contains no street. - A MailStop is where the the mail is delivered to within a premise/subpremise/firm or a facility. + A MailStop is where the mail is delivered to within a premise/subpremise/firm or a facility. @@ -1505,7 +1505,7 @@ one premise in a street referenced in an address. For example a building address - A MailStop is where the the mail is delivered to within a premise/subpremise/firm or a facility. + A MailStop is where the mail is delivered to within a premise/subpremise/firm or a facility. diff --git a/src/main/src/main/java/org/geoserver/catalog/Catalog.java b/src/main/src/main/java/org/geoserver/catalog/Catalog.java index 6b582f478ab..456a1ab993c 100644 --- a/src/main/src/main/java/org/geoserver/catalog/Catalog.java +++ b/src/main/src/main/java/org/geoserver/catalog/Catalog.java @@ -611,8 +611,8 @@ public interface Catalog extends CatalogInfo { *

    *
  • If a resource in the default namespace is found matching the specified name, it is * returned. - *
  • If a single resource among all non-default namespaces is found matching the the - * specified name, it is returned. + *
  • If a single resource among all non-default namespaces is found matching the specified + * name, it is returned. *
* * Care should be taken when using this method, use of {@link #getResourceByName(String, String, @@ -794,7 +794,7 @@ List getResourcesByNamespace( *
    *
  • If a feature type in the default namespace is found matching the specified name, it is * returned. - *
  • If a single feature type among all non-default namespaces is found matching the the + *
  • If a single feature type among all non-default namespaces is found matching the * specified name, it is returned. *
* @@ -932,8 +932,8 @@ List getResourcesByNamespace( *
    *
  • If a coverage in the default namespace is found matching the specified name, it is * returned. - *
  • If a single coverage among all non-default namespaces is found matching the the - * specified name, it is returned. + *
  • If a single coverage among all non-default namespaces is found matching the specified + * name, it is returned. *
* * Care should be taken when using this method, use of {@link #getCoverageByName(String, diff --git a/src/main/src/main/java/org/geoserver/catalog/CatalogBuilder.java b/src/main/src/main/java/org/geoserver/catalog/CatalogBuilder.java index 29576653585..3451790b289 100644 --- a/src/main/src/main/java/org/geoserver/catalog/CatalogBuilder.java +++ b/src/main/src/main/java/org/geoserver/catalog/CatalogBuilder.java @@ -1632,7 +1632,7 @@ public StyleInfo getDefaultStyle(ResourceInfo resource) throws IOException { || resource instanceof WMTSLayerInfo) return catalog.getStyleByName(StyleInfo.DEFAULT_RASTER); - // for vectors we depend on the the nature of the default geometry + // for vectors we depend on the nature of the default geometry String styleName; FeatureTypeInfo featureType = (FeatureTypeInfo) resource; if (featureType.getFeatureType() == null) { diff --git a/src/main/src/main/java/org/geoserver/catalog/NamespaceWorkspaceConsistencyListener.java b/src/main/src/main/java/org/geoserver/catalog/NamespaceWorkspaceConsistencyListener.java index f3c8d1c09ed..3d9ddab466b 100644 --- a/src/main/src/main/java/org/geoserver/catalog/NamespaceWorkspaceConsistencyListener.java +++ b/src/main/src/main/java/org/geoserver/catalog/NamespaceWorkspaceConsistencyListener.java @@ -155,7 +155,7 @@ public void reloaded() { * If post modify event catalog object is a namespace or an workspace this method will make sure * both have the same isolation. * - *

The namespaces or the workspace will only be saved if the the isolation is not the same, + *

The namespaces or the workspace will only be saved if the isolation is not the same, * avoiding infinite loops. * * @param info catalog object associate to the event diff --git a/src/main/src/main/java/org/geoserver/config/GeoServerDataDirectory.java b/src/main/src/main/java/org/geoserver/config/GeoServerDataDirectory.java index 1acd319b6f8..d8a128c99df 100644 --- a/src/main/src/main/java/org/geoserver/config/GeoServerDataDirectory.java +++ b/src/main/src/main/java/org/geoserver/config/GeoServerDataDirectory.java @@ -237,7 +237,7 @@ public File findLegacyResourceDir(ResourceInfo resource) throws IOException { } /** - * Retrieve a resource in the the security directory. An empty path will retrieve the directory + * Retrieve a resource in the security directory. An empty path will retrieve the directory * itself. * * @return A {@link Resource} @@ -249,8 +249,8 @@ public File findLegacyResourceDir(ResourceInfo resource) throws IOException { } /** - * Retrieve a resource in the the workspaces directory. An empty path will retrieve the - * directory itself. + * Retrieve a resource in the workspaces directory. An empty path will retrieve the directory + * itself. * * @return A {@link Resource} */ @@ -272,8 +272,8 @@ public File findLegacyResourceDir(ResourceInfo resource) throws IOException { } /** - * Retrieve a resource in the the workspace configuration directory. An empty path will retrieve - * the directory itself. A null workspace will retrieve the resouce in the global configuration + * Retrieve a resource in the workspace configuration directory. An empty path will retrieve the + * directory itself. A null workspace will retrieve the resouce in the global configuration * directory. * * @param ws The workspace @@ -303,7 +303,7 @@ public File findLegacyResourceDir(ResourceInfo resource) throws IOException { } /** - * Retrieve a resource in the the configuration directory of the workspace associated with a + * Retrieve a resource in the configuration directory of the workspace associated with a * namespace. An empty path will retrieve the directory itself. A null namespace will retrieve * the resouce in the global configuration directory. * @@ -334,8 +334,8 @@ public File findLegacyResourceDir(ResourceInfo resource) throws IOException { } /** - * Retrieve a resource in the the configuration directory of a Store. An empty path will - * retrieve the directory itself. + * Retrieve a resource in the configuration directory of a Store. An empty path will retrieve + * the directory itself. * * @param store The store * @return A {@link Resource} @@ -445,8 +445,8 @@ public File findLegacyResourceDir(ResourceInfo resource) throws IOException { } /** - * Retrieve a resource in the the configuration directory of a Resource. An empty path will - * retrieve the directory itself. + * Retrieve a resource in the configuration directory of a Resource. An empty path will retrieve + * the directory itself. * * @param ri The store * @return A {@link Resource} @@ -506,8 +506,8 @@ public File findLegacyResourceDir(ResourceInfo resource) throws IOException { } /** - * Retrieve a resource in the the configuration directory of a Layer. An empty path will - * retrieve the directory itself. + * Retrieve a resource in the configuration directory of a Layer. An empty path will retrieve + * the directory itself. * * @param l The layer * @return A {@link Resource} @@ -544,8 +544,8 @@ public File findLegacyResourceDir(ResourceInfo resource) throws IOException { } /** - * Retrieve a resource in the the layer groups directory. An empty path will retrieve the - * directory itself. + * Retrieve a resource in the layer groups directory. An empty path will retrieve the directory + * itself. * * @return A {@link Resource} */ @@ -556,9 +556,9 @@ public File findLegacyResourceDir(ResourceInfo resource) throws IOException { } /** - * Retrieve a resource in the the layer groups directory of a workspace. An empty path will - * retrieve the directory itself. A null workspace will return the resource in the global layer - * groups directory + * Retrieve a resource in the layer groups directory of a workspace. An empty path will retrieve + * the directory itself. A null workspace will return the resource in the global layer groups + * directory * * @return A {@link Resource} */ @@ -569,7 +569,7 @@ public File findLegacyResourceDir(ResourceInfo resource) throws IOException { } /** - * Retrieve a resource in the the configuration directory of a LayerGroup. An empty path will + * Retrieve a resource in the configuration directory of a LayerGroup. An empty path will * retrieve the directory itself. This directory is shared by all Layer Groups in a Workspace. * * @param lgi The store @@ -595,7 +595,7 @@ public File findLegacyResourceDir(ResourceInfo resource) throws IOException { } /** - * Retrieve a resource in the the styles directory. An empty path will retrieve the directory + * Retrieve a resource in the styles directory. An empty path will retrieve the directory * itself. * * @return A {@link Resource} @@ -607,9 +607,8 @@ public File findLegacyResourceDir(ResourceInfo resource) throws IOException { } /** - * Retrieve a resource in the the styles directory of a workspace. An empty path will retrieve - * the directory itself. A null workspace will return the resource in the global styles - * directory + * Retrieve a resource in the styles directory of a workspace. An empty path will retrieve the + * directory itself. A null workspace will return the resource in the global styles directory * * @return A {@link Resource} */ @@ -620,8 +619,8 @@ public File findLegacyResourceDir(ResourceInfo resource) throws IOException { } /** - * Retrieve a resource in the the configuration directory of a Resource. An empty path will - * retrieve the directory itself. + * Retrieve a resource in the configuration directory of a Resource. An empty path will retrieve + * the directory itself. * * @param si The store * @return A {@link Resource} diff --git a/src/main/src/main/java/org/geoserver/security/GeoServerRoleService.java b/src/main/src/main/java/org/geoserver/security/GeoServerRoleService.java index d4b3a3da733..d8398ecec39 100644 --- a/src/main/src/main/java/org/geoserver/security/GeoServerRoleService.java +++ b/src/main/src/main/java/org/geoserver/security/GeoServerRoleService.java @@ -111,7 +111,7 @@ public interface GeoServerRoleService extends GeoServerSecurityService { *

A user "harry" has assigned the role employee and has a user property "empNr" with the * value 4711 * - *

Now, this method should create a {@link Properties} object containing the the property + *

Now, this method should create a {@link Properties} object containing the property * "employeeNumber" with the value 4711. * *

A GIS example could be a BBOX for specific user to restrict his access to the wms service diff --git a/src/main/src/main/java/org/geoserver/security/GeoServerUserGroupService.java b/src/main/src/main/java/org/geoserver/security/GeoServerUserGroupService.java index c906d415dac..c2e0ef220b0 100644 --- a/src/main/src/main/java/org/geoserver/security/GeoServerUserGroupService.java +++ b/src/main/src/main/java/org/geoserver/security/GeoServerUserGroupService.java @@ -15,7 +15,7 @@ import org.springframework.security.core.userdetails.UserDetailsService; /** - * This interface is an extenstion to {@link UserDetailsService} + * This interface is an extension to {@link UserDetailsService} * *

A class implementing this interface implements a read only backend for user and group * management @@ -40,14 +40,14 @@ public interface GeoServerUserGroupService extends GeoServerSecurityService, Use void unregisterUserGroupLoadedListener(UserGroupLoadedListener listener); /** - * Returns the the group object, null if not found + * Returns the group object, null if not found * * @return null if group not found */ GeoServerUserGroup getGroupByGroupname(String groupname) throws IOException; /** - * Returns the the user object, null if not found + * Returns the user object, null if not found * * @return null if user not found */ diff --git a/src/main/src/main/java/org/geoserver/security/impl/SecureTreeNode.java b/src/main/src/main/java/org/geoserver/security/impl/SecureTreeNode.java index 922bc3849ff..b5d7cd21915 100644 --- a/src/main/src/main/java/org/geoserver/security/impl/SecureTreeNode.java +++ b/src/main/src/main/java/org/geoserver/security/impl/SecureTreeNode.java @@ -115,7 +115,7 @@ public boolean canAccess(Authentication user, AccessMode mode) { // if the roles is just "*" any granted authority will match if (roles.equals(EVERYBODY)) return true; - // let's scan thru the the authorities granted to the user and + // let's scan thru the authorities granted to the user and // see if he matches any of the write roles if (user == null || user.getAuthorities() == null) return false; // look for a match on the roles, using the "root" rules as well (root can do everything) diff --git a/src/main/src/main/java/org/geoserver/security/impl/Util.java b/src/main/src/main/java/org/geoserver/security/impl/Util.java index 9b411d9032a..6e70d1de1da 100644 --- a/src/main/src/main/java/org/geoserver/security/impl/Util.java +++ b/src/main/src/main/java/org/geoserver/security/impl/Util.java @@ -147,8 +147,8 @@ public static String convertPropsToString(Properties props, String heading) { } /** - * Determines if the the input stream is xml if it is, use create properties loaded from xml - * format, otherwise create properties from default format. + * Determines if the input stream is xml if it is, use create properties loaded from xml format, + * otherwise create properties from default format. */ public static Properties loadUniversal(InputStream in) throws IOException { final String xmlDeclarationStart = " In a particular Time System, an Era may be a member of a group. The "group" element implements the back-pointer to the Era at the next level up in the hierarchy. -If the hierarchy is represented by describing the nested components fully in the their nested position inside "member" elements, then the parent can be easily inferred, so the group property is unnecessary. +If the hierarchy is represented by describing the nested components fully in their nested position inside "member" elements, then the parent can be easily inferred, so the group property is unnecessary. However, if the hierarchy is represented by links carried on the "member" property elements, pointing to Eras described fully elsewhere, then it may be useful for a child (member) era to carry an explicit pointer back to its parent (group) Era. diff --git a/src/main/src/test/java/org/geoserver/threadlocals/AbstractThreadLocalTransferTest.java b/src/main/src/test/java/org/geoserver/threadlocals/AbstractThreadLocalTransferTest.java index ba7957403d8..53e737e1ffe 100644 --- a/src/main/src/test/java/org/geoserver/threadlocals/AbstractThreadLocalTransferTest.java +++ b/src/main/src/test/java/org/geoserver/threadlocals/AbstractThreadLocalTransferTest.java @@ -59,14 +59,14 @@ public ThreadLocalTransferCallable(ThreadLocalTransfer transfer) { @Override public Void call() throws Exception { - // this is the the main thread, we are actually running inside the thread pool + // this is the main thread, we are actually running inside the thread pool assertNotEquals(originalThread, Thread.currentThread()); // apply the thread local, check it has been applied correctly transfer.apply(storage); assertThreadLocalApplied(); - // clean up, check the therad local is now empty + // clean up, check the thread local is now empty transfer.cleanup(); assertThreadLocalCleaned(); diff --git a/src/main/src/test/java/org/geoserver/threadlocals/ThreadLocalsTransferTest.java b/src/main/src/test/java/org/geoserver/threadlocals/ThreadLocalsTransferTest.java index efb7d20cb58..32cc7d03a01 100644 --- a/src/main/src/test/java/org/geoserver/threadlocals/ThreadLocalsTransferTest.java +++ b/src/main/src/test/java/org/geoserver/threadlocals/ThreadLocalsTransferTest.java @@ -131,14 +131,14 @@ public ThreadLocalTransferCallable(ThreadLocalTransfer transfer) { @Override public Void call() throws Exception { - // this is the the main thread, we are actually running inside the thread pool + // this is the main thread, we are actually running inside the thread pool assertNotEquals(originalThread, Thread.currentThread()); // apply the thread local, check it has been applied correctly transfer.apply(storage); assertThreadLocalApplied(); - // clean up, check the therad local is now empty + // clean up, check the thread local is now empty transfer.cleanup(); assertThreadLocalCleaned(); diff --git a/src/ows/src/main/java/org/geoserver/ows/util/OwsUtils.java b/src/ows/src/main/java/org/geoserver/ows/util/OwsUtils.java index a09d43a726e..999c3576f25 100644 --- a/src/ows/src/main/java/org/geoserver/ows/util/OwsUtils.java +++ b/src/ows/src/main/java/org/geoserver/ows/util/OwsUtils.java @@ -95,7 +95,7 @@ public static ClassProperties getClassProperties(Class clazz) { /** * Returns a setter method for a property of java bean. * - *

The type parameter may be null to indicate the the setter for the + *

The type parameter may be null to indicate the setter for the * property should be returned regardless of the type. If not null it will be used to filter the * returned method. * diff --git a/src/release/installer/win/build/wrapper/jsl64.ini b/src/release/installer/win/build/wrapper/jsl64.ini index 9d318bc8e30..1dd58be45a5 100644 --- a/src/release/installer/win/build/wrapper/jsl64.ini +++ b/src/release/installer/win/build/wrapper/jsl64.ini @@ -217,7 +217,7 @@ premain.threaddump.interface=127.0.0.1 ;modulepath="e:\java\test\jsl_0_9_9e\release\jsl.exe" -;Configures the the Windows service failure actions. +;Configures the Windows service failure actions. ;The below is not JSL functionality, but rather Windows Server functionality, which can be overridden by the server administrator. ;You need to configure exceptionerrorcode and onexiterror as of above to create the expected behavior ;Configuration will be made at install time (jsl -install). diff --git a/src/restconfig/src/main/java/org/geoserver/rest/security/AbstractAclController.java b/src/restconfig/src/main/java/org/geoserver/rest/security/AbstractAclController.java index 7af1fd7dd58..334c243460e 100644 --- a/src/restconfig/src/main/java/org/geoserver/rest/security/AbstractAclController.java +++ b/src/restconfig/src/main/java/org/geoserver/rest/security/AbstractAclController.java @@ -156,7 +156,7 @@ public RuleMap getMap() throws Exception { return result; } - /** Calculate the the intersection of the keys */ + /** Calculate the intersection of the keys */ protected Set intersection(Map map) { Set result = new HashSet<>(); diff --git a/src/security/jdbc/src/main/java/org/geoserver/security/jdbc/JDBCRoleStore.java b/src/security/jdbc/src/main/java/org/geoserver/security/jdbc/JDBCRoleStore.java index d80c56a88f6..4ee03e23133 100644 --- a/src/security/jdbc/src/main/java/org/geoserver/security/jdbc/JDBCRoleStore.java +++ b/src/security/jdbc/src/main/java/org/geoserver/security/jdbc/JDBCRoleStore.java @@ -43,7 +43,7 @@ protected void closeConnection(Connection con) throws SQLException { // do nothing } - /** To be called at the the end of a transaction, frees the current {@link Connection} */ + /** To be called at the end of a transaction, frees the current {@link Connection} */ protected void releaseConnection() throws SQLException { if (connection != null) { connection.close(); @@ -71,7 +71,7 @@ public void load() throws IOException { protected void addRoleProperties(GeoServerRole role, Connection con) throws SQLException, IOException { - if (role.getProperties().size() == 0) return; // nothing to do + if (role.getProperties().isEmpty()) return; // nothing to do PreparedStatement ps = getDMLStatement("roleprops.insert", con); try { @@ -308,9 +308,8 @@ public void setModified(boolean modified) { public void setParentRole(GeoServerRole role, GeoServerRole parentRole) throws IOException { RoleHierarchyHelper helper = new RoleHierarchyHelper(getParentMappings()); - if (helper.isValidParent( - role.getAuthority(), parentRole == null ? null : parentRole.getAuthority()) - == false) + if (!helper.isValidParent( + role.getAuthority(), parentRole == null ? null : parentRole.getAuthority())) throw new IOException( parentRole.getAuthority() + " is not a valid parent for " diff --git a/src/security/jdbc/src/main/java/org/geoserver/security/jdbc/JDBCUserGroupStore.java b/src/security/jdbc/src/main/java/org/geoserver/security/jdbc/JDBCUserGroupStore.java index 9ccfeaf9899..f471fe90969 100644 --- a/src/security/jdbc/src/main/java/org/geoserver/security/jdbc/JDBCUserGroupStore.java +++ b/src/security/jdbc/src/main/java/org/geoserver/security/jdbc/JDBCUserGroupStore.java @@ -51,7 +51,7 @@ protected void closeConnection(Connection con) throws SQLException { // do nothing } - /** To be called at the the end of a transaction, frees the current {@link Connection} */ + /** To be called at the end of a transaction, frees the current {@link Connection} */ protected void releaseConnection() throws SQLException { if (connection != null) { connection.close(); @@ -102,7 +102,7 @@ public void load() throws IOException { /** Helper method for inserting user properties */ protected void addUserProperties(GeoServerUser user, Connection con) throws SQLException, IOException { - if (user.getProperties().size() == 0) return; // nothing to do + if (user.getProperties().isEmpty()) return; // nothing to do PreparedStatement ps = getDMLStatement("userprops.insert", con); try { diff --git a/src/security/security-tests/src/test/resources/org/geoserver/security/impl/web1.xml b/src/security/security-tests/src/test/resources/org/geoserver/security/impl/web1.xml index 3401dfc4ed4..e184ab0702e 100644 --- a/src/security/security-tests/src/test/resources/org/geoserver/security/impl/web1.xml +++ b/src/security/security-tests/src/test/resources/org/geoserver/security/impl/web1.xml @@ -12,7 +12,7 @@