svn commit: r1826246 [1/4] - in /sis/trunk: ./ core/sis-metadata/ core/sis-metadata/src/main/java/org/apache/sis/internal/geoapi/ core/sis-metadata/src/main/java/org/apache/sis/internal/geoapi/evolution/ core/sis-metadata/src/main/java/org/apache/sis/i...

Thu, 08 Mar 2018 07:30:43 -0800 

Author: desruisseaux
Date: Thu Mar  8 15:30:28 2018
New Revision: 1826246

URL: http://svn.apache.org/viewvc?rev=1826246&view=rev
Log:
Merge from JDK8 branch: refactoring of XML related classes from sis-utility to 
sis-metadata module.

Added:
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/geoapi/
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/geoapi/evolution/
      - copied from r1826245, 
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/geoapi/evolution/
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/AdapterReplacement.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/AdapterReplacement.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/Context.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/Context.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/FilterByVersion.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/FilterByVersion.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
      - copied, changed from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/LegacyNamespaces.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/LegacyNamespaces.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMap.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMap.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/PrimitiveTypeProperties.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/PrimitiveTypeProperties.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/Schemas.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/Schemas.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java
      - copied, changed from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/UseLegacyMetadata.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/UseLegacyMetadata.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/XmlUtilities.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/XmlUtilities.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/
      - copied from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/
      - copied from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/
      - copied from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/
      - copied from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/
      - copied from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/package-info.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/package-info.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/
      - copied from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/util/
      - copied from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/util/
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/xml/
      - copied from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/xml/
    sis/trunk/core/sis-metadata/src/main/resources/org/apache/sis/util/
      - copied from r1826245, 
sis/trunk/core/sis-utility/src/main/resources/org/apache/sis/util/
    sis/trunk/core/sis-metadata/src/main/resources/org/apache/sis/xml/
      - copied from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/resources/org/apache/sis/xml/
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/XmlUtilitiesTest.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/XmlUtilitiesTest.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/
      - copied from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/
      - copied from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/
      - copied from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/
      - copied from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/simple/
      - copied from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/simple/
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/test/
      - copied from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/test/
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/test/XMLComparator.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/XMLComparator.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/test/XMLTestCase.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/XMLTestCase.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/test/mock/
      - copied from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/mock/
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/util/
      - copied from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/util/
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/LegacyCodesTest.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/LegacyCodesTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/MarshallerPoolTest.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/MarshallerPoolTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/NamespacesTest.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/NamespacesTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonTest.java
      - copied, changed from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/OGCNamespacePrefixMapperTest.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/OGCNamespacePrefixMapperTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/ReferenceResolverMock.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/ReferenceResolverMock.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformingNamespacesTest.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformingNamespacesTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/ValueConverterTest.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/ValueConverterTest.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkTest.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkTest.java
    
sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/internal/jaxb/lan/
      - copied from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/test/resources/org/apache/sis/internal/jaxb/lan/
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/CodeLists.java
      - copied, changed from r1825489, 
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/CodeLists.java
    
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationMock.java
      - copied, changed from r1825489, 
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationMock.java
    
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/LargeCodeList.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/collection/LargeCodeList.java
    
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StreamWriterDelegate.java
      - copied unchanged from r1825489, 
sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StreamWriterDelegate.java
Removed:
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/code/
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/FreeTextMarshallingTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/package-info.txt
    
sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/internal/jaxb/code/
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/geoapi/evolution/
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/CitationConstant.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleAttributeType.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleCitation.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleExtent.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleFormat.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleIdentifiedObject.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleIdentifier.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleMetadata.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/package-info.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/StreamWriterDelegate.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractFactory.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractName.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/CodeListFilter.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultMemberName.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameFactory.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecord.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordSchema.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultScopedName.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultTypeName.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/GlobalNameSpace.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/Names.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/RecordDefinition.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/TypeNames.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/package-info.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/
    sis/trunk/core/sis-utility/src/main/resources/org/apache/sis/util/
    sis/trunk/core/sis-utility/src/main/resources/org/apache/sis/xml/
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/simple/
    
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/test/XMLComparatorTest.java
    
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java
    
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/XMLTestCase.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/mock/
    
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultLocalNameTest.java
    
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultNameFactoryTest.java
    
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultRecordSchemaTest.java
    
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultRecordTest.java
    
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultRecordTypeTest.java
    
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultScopedNameTest.java
    
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/LargeCodeList.java
    
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java
    
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/NamesTest.java
    
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/SerializableRecordSchema.java
    
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java
    
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypesTest.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/xml/
Modified:
    sis/trunk/   (props changed)
    sis/trunk/core/sis-metadata/pom.xml
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/geoapi/evolution/UnsupportedCodeListAdapter.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListAdapter.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListUID.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/EnumAdapter.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_TelephoneTypeCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetLegacy.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ObligationCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimeInstant.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriod.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MX_DataFile.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ServicesForUtility.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/package-info.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/CitationConstant.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleAttributeType.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleCitation.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleFormat.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleIdentifiedObject.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleIdentifier.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleMetadata.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultNameFactory.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultRecordSchema.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/util/iso/RecordDefinition.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/util/iso/Types.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/util/iso/package-info.java
    
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/xml/LegacyCodes.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/DummyInstant.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameterTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFractionTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypesTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java
    
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java
    
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
    
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameterTest.java
    
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
    sis/trunk/core/sis-utility/pom.xml
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/CheckedArrayList.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/MetadataServices.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/package-info.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/IdentifiedObjectFormat.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/TableColumn.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java
    
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
    
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java
    
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/LocalizedParseExceptionTest.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java
    
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
    
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/VersionTest.java
    
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/CodeListSetTest.java
    sis/trunk/ide-project/NetBeans/build.xml
    
sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java
    sis/trunk/storage/sis-xmlstore/pom.xml
    
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/FormattedWriter.java
    
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/NamespaceEraser.java
    
sis/trunk/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java

Propchange: sis/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  8 15:30:28 2018
@@ -2,5 +2,5 @@
 /sis/branches/ISO-19115-3:1804459-1825252
 /sis/branches/JDK6:1394364-1758914
 /sis/branches/JDK7:1394913-1822221
-/sis/branches/JDK8:1584960-1825357
+/sis/branches/JDK8:1584960-1825489
 /sis/branches/JDK9:1773327-1803064

Modified: sis/trunk/core/sis-metadata/pom.xml
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/pom.xml?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/pom.xml (original)
+++ sis/trunk/core/sis-metadata/pom.xml Thu Mar  8 15:30:28 2018
@@ -147,6 +147,14 @@ Implementations of metadata derived from
       <version>${project.version}</version>
     </dependency>
 
+    <!-- Allows compiler to use a JAXB class which should exist on the JVM. -->
+    <dependency>
+      <groupId>com.googlecode.jaxb-namespaceprefixmapper-interfaces</groupId>
+      <artifactId>JAXBNamespacePrefixMapper</artifactId>
+      <version>2.2.4</version>
+      <scope>provided</scope>
+    </dependency>
+
     <!-- Test dependencies -->
     <dependency>
       <groupId>org.apache.sis.core</groupId>

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/geoapi/evolution/UnsupportedCodeListAdapter.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/geoapi/evolution/UnsupportedCodeListAdapter.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/geoapi/evolution/UnsupportedCodeListAdapter.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/geoapi/evolution/UnsupportedCodeListAdapter.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -20,12 +20,12 @@ import javax.xml.bind.annotation.adapter
 import org.opengis.util.CodeList;
 import org.apache.sis.util.iso.Types;
 import org.apache.sis.internal.jaxb.Context;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 
 
 /**
- * An adapter for {@link UnsupportedCodeList}, in order to implement the 
ISO-19139 standard.
- * See {@link org.apache.sis.internal.jaxb.gmd.CodeListAdapter} for more 
information.
+ * An adapter for {@link UnsupportedCodeList}, in order to implement the ISO 
19115-3 standard.
+ * See {@link org.apache.sis.internal.jaxb.cat.CodeListAdapter} for more 
information.
  *
  * @param <ValueType> The subclass implementing this adapter.
  *

Copied: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
 (from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java)
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java?p2=sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java&p1=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java&r1=1825489&r2=1826246&rev=1826246&view=diff
==============================================================================
--- 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -22,7 +22,7 @@ import org.opengis.metadata.citation.Cit
 import org.apache.sis.metadata.iso.citation.Citations;
 
 // Branch-dependent imports
-import org.opengis.util.InternationalString;
+import org.opengis.referencing.ReferenceIdentifier;
 
 
 /**
@@ -35,7 +35,7 @@ import org.opengis.util.InternationalStr
  * @since   0.3
  * @module
  */
-final class IdentifierMapEntry extends 
AbstractMap.SimpleEntry<Citation,String> implements Identifier {
+final class IdentifierMapEntry extends 
AbstractMap.SimpleEntry<Citation,String> implements ReferenceIdentifier {
     /**
      * For cross-version compatibility.
      */
@@ -89,29 +89,16 @@ final class IdentifierMapEntry extends A
     }
 
     /**
-     * Returns {@code null} since this class does not hold natural language 
description.
-     *
-     * @return {@code null}.
-     *
-     * @since 0.5
-     */
-    @Override
-    public InternationalString getDescription() {
-        return null;
-    }
-
-    /**
      * Same than the above, but as an immutable entry. We use this 
implementation when the
      * entry has been created on-the-fly at iteration time rather than being 
stored in the
      * identifier collection.
      */
-    static final class Immutable extends 
AbstractMap.SimpleImmutableEntry<Citation,String> implements Identifier {
+    static final class Immutable extends 
AbstractMap.SimpleImmutableEntry<Citation,String> implements 
ReferenceIdentifier {
         private static final long serialVersionUID = -6857931598565368465L;
         Immutable(Citation authority, String code) {super(authority, code);}
         @Override public Citation            getAuthority()   {return 
getKey();}
         @Override public String              getCode()        {return 
getValue();}
         @Override public String              getCodeSpace()   {return 
Citations.getCodeSpace(getAuthority());}
         @Override public String              getVersion()     {return null;}
-        @Override public InternationalString getDescription() {return null;}
     }
 }

Copied: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java
 (from r1825489, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java)
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java?p2=sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java&p1=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java&r1=1825489&r2=1826246&rev=1826246&view=diff
==============================================================================
--- 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -32,8 +32,7 @@ import org.apache.sis.util.resources.Mes
 import org.apache.sis.metadata.iso.citation.Citations;
 
 // Branch-dependent imports
-import org.opengis.metadata.Identifier;
-import org.opengis.util.InternationalString;
+import org.opengis.referencing.ReferenceIdentifier;
 
 
 /**
@@ -49,7 +48,7 @@ import org.opengis.util.InternationalStr
  * @since 0.3
  * @module
  */
-public final class SpecializedIdentifier<T> implements Identifier, Cloneable, 
Serializable {
+public final class SpecializedIdentifier<T> implements ReferenceIdentifier, 
Cloneable, Serializable {
     /**
      * For cross-version compatibility.
      */
@@ -98,7 +97,7 @@ public final class SpecializedIdentifier
      *
      * @see IdentifierMapAdapter#put(Citation, String)
      */
-    static Identifier parse(final Citation authority, final String code) {
+    static ReferenceIdentifier parse(final Citation authority, final String 
code) {
         if (authority instanceof NonMarshalledAuthority) {
             final int ordinal = ((NonMarshalledAuthority) authority).ordinal;
             switch (ordinal) {
@@ -212,18 +211,6 @@ public final class SpecializedIdentifier
         return null;
     }
 
-    /**
-     * Returns {@code null} since this class does not hold natural language 
description.
-     *
-     * @return {@code null}.
-     *
-     * @since 0.5
-     */
-    @Override
-    public InternationalString getDescription() {
-        return null;
-    }
-
     /**
      * Returns a hash code value for this identifier.
      */

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListAdapter.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListAdapter.java?rev=1826246&r1=1825489&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListAdapter.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListAdapter.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -127,7 +127,33 @@ public abstract class CodeListAdapter<Va
      */
     @Override
     public final ValueType marshal(final BoundType code) {
-        return (code != null) ? wrap(new CodeListUID(Context.current(), code)) 
: null;
+        if (code == null) {
+            return null;
+        }
+        final CodeListUID p;
+        if (isEnum()) {
+            // To be removed after GEO-199 resolution.
+            p = new CodeListUID();
+            p.value = Types.getCodeName(code);
+        } else {
+            p = new CodeListUID(Context.current(), code);
+        }
+        return wrap(p);
+    }
+
+    /**
+     * Returns {@code true} if this code list is actually an enum. The default 
implementation
+     * returns {@code false} in every cases, since there is very few enums in 
ISO 19115.
+     *
+     * @return {@code true} if this code list is actually an enum.
+     *
+     * @todo Remove this method after we refactored enum wrappers as {@code 
EnumAdapter} subclasses
+     *       instead of {@code CodeListAdapter}. This requires the resolution 
of GEO-199 first.
+     *
+     * @see <a href="http://jira.codehaus.org/browse/GEO-199";>GEO-199</a>
+     */
+    protected boolean isEnum() {
+        return false;
     }
 
     /**

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListUID.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListUID.java?rev=1826246&r1=1825489&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListUID.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/CodeListUID.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -23,7 +23,6 @@ import javax.xml.bind.annotation.XmlAttr
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 import org.opengis.util.CodeList;
-import org.opengis.util.ControlledVocabulary;
 import org.apache.sis.util.iso.Types;
 import org.apache.sis.internal.jaxb.Context;
 import org.apache.sis.internal.jaxb.Schemas;
@@ -145,7 +144,7 @@ public final class CodeListUID {
      * @param context  the current (un)marshalling context, or {@code null} if 
none.
      * @param code     the code list to wrap.
      */
-    public CodeListUID(final Context context, final ControlledVocabulary code) 
{
+    public CodeListUID(final Context context, final CodeList<?> code) {
         final String classID = Types.getListName(code);
         final String fieldID = Types.getCodeName(code);
         codeList = schema(context, classID);
@@ -162,6 +161,9 @@ public final class CodeListUID {
             try {
                 value = 
ResourceBundle.getBundle("org.opengis.metadata.CodeLists",
                         locale, 
CodeList.class.getClassLoader()).getString(key);
+                if ("Off line access".equals(value)) {
+                    value = "Offline access";               // For having the 
same value than GeoAPI 3.1.
+                }
             } catch (MissingResourceException e) {
                 Context.warningOccured(context, CodeListAdapter.class, 
"marshal", e, false);
             }

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/EnumAdapter.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/EnumAdapter.java?rev=1826246&r1=1825489&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/EnumAdapter.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/EnumAdapter.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -17,10 +17,6 @@
 package org.apache.sis.internal.jaxb.cat;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
-import org.apache.sis.util.iso.Types;
-
-// Branch-dependent imports
-import org.opengis.util.ControlledVocabulary;
 
 
 /**
@@ -87,7 +83,7 @@ public abstract class EnumAdapter<ValueT
      * @param  e  the enumeration constant.
      * @return the text to write in the XML element.
      */
-    protected static String value(final ControlledVocabulary e) {
-        return Types.getCodeName(e);
+    protected static String value(final Enum<?> e) {
+        return e.name();
     }
 }

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.citation.DateType;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.citation.OnLineFunction;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.citation.PresentationForm;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.citation.Role;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_TelephoneTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_TelephoneTypeCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_TelephoneTypeCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_TelephoneTypeCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
 import javax.xml.bind.annotation.XmlElement;
 import org.apache.sis.internal.geoapi.evolution.UnsupportedCodeListAdapter;
 import org.apache.sis.internal.jaxb.FilterByVersion;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,7 +18,7 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.apache.sis.xml.Namespaces;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.internal.geoapi.evolution.UnsupportedCodeListAdapter;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.quality.EvaluationMethodType;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.identification.AssociationType;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.identification.InitiativeType;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.spatial.CellGeometry;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.adapter
 import org.apache.sis.xml.Namespaces;
 import org.apache.sis.xml.ValueConverter;
 import org.apache.sis.internal.jaxb.Context;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 
 
 /**

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetLegacy.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetLegacy.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetLegacy.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetLegacy.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.identification.CharacterSet;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.internal.jaxb.LegacyNamespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.constraint.Classification;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.content.CoverageContentType;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.Datatype;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.spatial.DimensionNameType;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.spatial.GeometricObjectType;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.content.ImagingCondition;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.identification.KeywordType;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.maintenance.MaintenanceFrequency;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.distribution.MediumFormat;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.distribution.MediumName;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.internal.jaxb.LegacyNamespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ObligationCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ObligationCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ObligationCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ObligationCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,7 +18,7 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.annotation.Obligation;
-import org.apache.sis.internal.jaxb.gmd.EnumAdapter;
+import org.apache.sis.internal.jaxb.cat.EnumAdapter;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.spatial.PixelOrientation;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.identification.Progress;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.constraint.Restriction;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.maintenance.ScopeCode;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.spatial.SpatialRepresentationType;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.identification.TopicCategory;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.spatial.TopologyLevel;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.content.BandDefinition;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.acquisition.Context;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.acquisition.GeometryType;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.acquisition.ObjectiveType;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.acquisition.OperationType;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.content.PolarizationOrientation;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.acquisition.Priority;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.acquisition.Sequence;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.content.TransferFunctionType;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.acquisition.Trigger;
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -18,7 +18,7 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.apache.sis.internal.geoapi.evolution.UnsupportedCodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java?rev=1826246&r1=1826245&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -22,10 +22,10 @@
  *
  * <ul>
  *   <li>
- *     {@linkplain org.opengis.metadata.identification.CharacterSet character 
set}:
- *     {@code <gmd:MD_CharacterSetCode
- *       
codeList="http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#MD_CharacterSetCode";
- *       codeListValue="utf8"/>}
+ *     {@linkplain org.opengis.metadata.citation.Role Role}:
+ *     {@code <cit:CI_RoleCode
+ *       
codeList="http://standards.iso.org/iso/19115/resources/Codelist/cat/codelists.xml#CI_RoleCode";
+         codeListValue="originator">Originator</cit:CI_RoleCode>}
  *   </li>
  * </ul>
  *

Modified: 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java?rev=1826246&r1=1825489&r2=1826246&view=diff
==============================================================================
--- 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
 [UTF-8] (original)
+++ 
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
 [UTF-8] Thu Mar  8 15:30:28 2018
@@ -27,7 +27,6 @@ import javax.xml.bind.annotation.XmlRoot
 import javax.xml.bind.annotation.XmlSeeAlso;
 import org.w3c.dom.Element;
 import org.opengis.util.CodeList;
-import org.opengis.util.ControlledVocabulary;
 import org.apache.sis.xml.Namespaces;
 import org.apache.sis.internal.jaxb.Context;
 import org.apache.sis.internal.jaxb.gcx.Anchor;
@@ -259,7 +258,7 @@ public class GO_CharacterString {
         if (type != ENUM) {
             return null;
         }
-        final ControlledVocabulary code = Types.forCodeTitle(text);
+        final CodeList<?> code = Types.forCodeTitle(text);
         final String name = Types.getListName(code);
         /*
          * The namespace has have various value like CIT, SRV, MDQ, MRI, MSR, 
LAN, etc.

Reply via email to