You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2018/10/20 13:58:30 UTC
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1 (XML prefix
updates in documentation, miscellaneous).
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit ba5a515c373be318e58f3e67f3d2740cdd324b2f
Merge: b30fc90 3301523
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Oct 20 15:51:12 2018 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1 (XML prefix updates in documentation, miscellaneous).
.../apache/sis/internal/book/CodeColorizer.java | 4 +--
.../org/apache/sis/internal/book/XML_PREFIX.lst | 35 +++++++++++++++++++++-
.../sis/internal/jaxb/gco/ObjectReference.java | 12 ++++----
.../apache/sis/internal/jaxb/gco/PropertyType.java | 12 ++++----
.../apache/sis/internal/jaxb/gmi/package-info.java | 2 +-
.../apache/sis/internal/jaxb/gml/GMLAdapter.java | 2 +-
.../org/apache/sis/internal/jaxb/gml/Measure.java | 4 +--
.../sis/internal/jaxb/metadata/CI_Address.java | 4 +--
.../sis/internal/jaxb/metadata/CI_Citation.java | 4 +--
.../sis/internal/jaxb/metadata/CI_Contact.java | 4 +--
.../apache/sis/internal/jaxb/metadata/CI_Date.java | 4 +--
.../internal/jaxb/metadata/CI_OnlineResource.java | 4 +--
.../sis/internal/jaxb/metadata/CI_Party.java | 4 +--
.../internal/jaxb/metadata/CI_Responsibility.java | 4 +--
.../sis/internal/jaxb/metadata/CI_Series.java | 4 +--
.../sis/internal/jaxb/metadata/CI_Telephone.java | 4 +--
.../sis/internal/jaxb/metadata/DQ_DataQuality.java | 4 +--
.../sis/internal/jaxb/metadata/DQ_Element.java | 4 +--
.../jaxb/metadata/DQ_PositionalAccuracy.java | 4 +--
.../sis/internal/jaxb/metadata/DQ_Result.java | 4 +--
.../sis/internal/jaxb/metadata/EX_Extent.java | 4 +--
.../jaxb/metadata/EX_GeographicExtent.java | 4 +--
.../internal/jaxb/metadata/EX_TemporalExtent.java | 4 +--
.../internal/jaxb/metadata/EX_VerticalExtent.java | 4 +--
.../sis/internal/jaxb/metadata/LE_Algorithm.java | 4 +--
.../jaxb/metadata/LE_NominalResolution.java | 4 +--
.../jaxb/metadata/LE_ProcessStepReport.java | 4 +--
.../sis/internal/jaxb/metadata/LE_Processing.java | 4 +--
.../sis/internal/jaxb/metadata/LI_Lineage.java | 4 +--
.../sis/internal/jaxb/metadata/LI_ProcessStep.java | 4 +--
.../sis/internal/jaxb/metadata/LI_Source.java | 4 +--
.../metadata/MD_ApplicationSchemaInformation.java | 4 +--
.../jaxb/metadata/MD_AssociatedResource.java | 4 +--
.../internal/jaxb/metadata/MD_AttributeGroup.java | 4 +--
.../internal/jaxb/metadata/MD_BrowseGraphic.java | 4 +--
.../sis/internal/jaxb/metadata/MD_Constraints.java | 4 +--
.../jaxb/metadata/MD_ContentInformation.java | 4 +--
.../jaxb/metadata/MD_DataIdentification.java | 4 +--
.../jaxb/metadata/MD_DigitalTransferOptions.java | 4 +--
.../sis/internal/jaxb/metadata/MD_Dimension.java | 4 +--
.../internal/jaxb/metadata/MD_Distribution.java | 4 +--
.../sis/internal/jaxb/metadata/MD_Distributor.java | 4 +--
.../metadata/MD_ExtendedElementInformation.java | 4 +--
.../internal/jaxb/metadata/MD_FeatureTypeInfo.java | 4 +--
.../sis/internal/jaxb/metadata/MD_Format.java | 4 +--
.../jaxb/metadata/MD_GeometricObjects.java | 4 +--
.../internal/jaxb/metadata/MD_Identification.java | 4 +--
.../sis/internal/jaxb/metadata/MD_Identifier.java | 4 +--
.../internal/jaxb/metadata/MD_KeywordClass.java | 4 +--
.../sis/internal/jaxb/metadata/MD_Keywords.java | 4 +--
.../jaxb/metadata/MD_MaintenanceInformation.java | 4 +--
.../sis/internal/jaxb/metadata/MD_Medium.java | 4 +--
.../sis/internal/jaxb/metadata/MD_Metadata.java | 4 +--
.../metadata/MD_MetadataExtensionInformation.java | 4 +--
.../internal/jaxb/metadata/MD_MetadataScope.java | 4 +--
.../metadata/MD_PortrayalCatalogueReference.java | 4 +--
.../internal/jaxb/metadata/MD_RangeDimension.java | 4 +--
.../internal/jaxb/metadata/MD_Releasability.java | 4 +--
.../jaxb/metadata/MD_RepresentativeFraction.java | 4 +--
.../sis/internal/jaxb/metadata/MD_Resolution.java | 4 +--
.../jaxb/metadata/MD_ScopeDescription.java | 4 +--
.../jaxb/metadata/MD_SpatialRepresentation.java | 4 +--
.../jaxb/metadata/MD_StandardOrderProcess.java | 4 +--
.../sis/internal/jaxb/metadata/MD_Usage.java | 4 +--
.../jaxb/metadata/MI_AcquisitionInformation.java | 4 +--
.../jaxb/metadata/MI_EnvironmentalRecord.java | 4 +--
.../sis/internal/jaxb/metadata/MI_Event.java | 4 +--
.../apache/sis/internal/jaxb/metadata/MI_GCP.java | 4 +--
.../jaxb/metadata/MI_GeolocationInformation.java | 4 +--
.../sis/internal/jaxb/metadata/MI_Instrument.java | 4 +--
.../sis/internal/jaxb/metadata/MI_Objective.java | 4 +--
.../sis/internal/jaxb/metadata/MI_Operation.java | 4 +--
.../apache/sis/internal/jaxb/metadata/MI_Plan.java | 4 +--
.../sis/internal/jaxb/metadata/MI_Platform.java | 4 +--
.../internal/jaxb/metadata/MI_PlatformPass.java | 4 +--
.../jaxb/metadata/MI_RangeElementDescription.java | 4 +--
.../internal/jaxb/metadata/MI_RequestedDate.java | 4 +--
.../sis/internal/jaxb/metadata/MI_Requirement.java | 4 +--
.../sis/internal/jaxb/metadata/package-info.java | 3 +-
.../metadata/iso/acquisition/DefaultObjective.java | 2 +-
.../sis/metadata/iso/citation/DefaultCitation.java | 2 +-
.../main/java/org/apache/sis/util/iso/Types.java | 10 +++----
.../java/org/apache/sis/util/iso/package-info.java | 2 +-
.../java/org/apache/sis/xml/IdentifierSpace.java | 14 ++++-----
.../main/java/org/apache/sis/xml/NilObject.java | 18 +++++------
.../java/org/apache/sis/xml/ReferenceResolver.java | 8 ++---
.../src/main/java/org/apache/sis/xml/XML.java | 2 +-
.../main/java/org/apache/sis/xml/package-info.java | 8 ++---
.../sis/metadata/iso/extent/DefaultExtentTest.java | 2 +-
.../identification/DefaultBrowseGraphicTest.java | 4 +--
.../org/apache/sis/xml/UUIDMarshallingTest.java | 20 ++++++-------
.../apache/sis/coverage/grid/GridGeometryTest.java | 6 ++--
.../apache/sis/measure/SexagesimalConverter.java | 35 +++++++++++++++++-----
.../apache/sis/storage/netcdf/MetadataReader.java | 8 ++---
.../org/apache/sis/internal/storage/xml/Store.java | 2 +-
95 files changed, 276 insertions(+), 225 deletions(-)