svn commit: r1826327 [1/5] - in /sis/branches/JDK9: ./ application/sis-console/src/main/java/org/apache/sis/console/ core/sis-build-helper/src/main/resources/org/apache/sis/ core/sis-metadata/ core/sis-metadata/src/main/java/org/apache/sis/internal/jax...

[desruisseaux]

Author: desruisseaux
Date: Fri Mar  9 11:00:27 2018
New Revision: 1826327

URL: http://svn.apache.org/viewvc?rev=1826327&view=rev
Log:
Merge from JDK8 branch. No adaptation for JDK9 at this stage.

Added:
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/AdapterReplacement.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/AdapterReplacement.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/Context.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/Context.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/FilterByVersion.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/FilterByVersion.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/LegacyNamespaces.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/LegacyNamespaces.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMap.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMap.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/PrimitiveTypeProperties.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/PrimitiveTypeProperties.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/Schemas.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/Schemas.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/UseLegacyMetadata.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/UseLegacyMetadata.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/XmlUtilities.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/XmlUtilities.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/
      - copied from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/cat/
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/
      - copied from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/
      - copied from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/
      - copied from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/
      - copied from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/package-info.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/package-info.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/
      - copied from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/
    sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/util/
      - copied from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/util/
    sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/xml/
      - copied from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/xml/
    sis/branches/JDK9/core/sis-metadata/src/main/resources/org/apache/sis/xml/
      - copied from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/main/resources/org/apache/sis/xml/
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/XmlUtilitiesTest.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/XmlUtilitiesTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/
      - copied from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/
      - copied from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gco/
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/
      - copied from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/
      - copied from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/internal/simple/
      - copied from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/simple/
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/internal/test/
      - copied from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/test/
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/test/XMLComparator.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/XMLComparator.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/test/XMLTestCase.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/XMLTestCase.java
    sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/test/mock/
      - copied from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/mock/
    sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/util/
      - copied from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/util/
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/xml/LegacyCodesTest.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/LegacyCodesTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/xml/MarshallerPoolTest.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/MarshallerPoolTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/xml/NamespacesTest.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/NamespacesTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonTest.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/xml/OGCNamespacePrefixMapperTest.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/OGCNamespacePrefixMapperTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/xml/ReferenceResolverMock.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/ReferenceResolverMock.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformingNamespacesTest.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformingNamespacesTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/xml/ValueConverterTest.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/ValueConverterTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkTest.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/resources/org/apache/sis/internal/jaxb/lan/
      - copied from r1826325, 
sis/branches/JDK8/core/sis-metadata/src/test/resources/org/apache/sis/internal/jaxb/lan/
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/SpecializableTransform.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/SpecializableTransform.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/SpecializableTransform1D.txt
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/SpecializableTransform1D.txt
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/SpecializableTransform2D.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/SpecializableTransform2D.java
    
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/SpecializableTransformTest.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/SpecializableTransformTest.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/util/CodeLists.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/CodeLists.java
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationMock.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationMock.java
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/util/collection/LargeCodeList.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/collection/LargeCodeList.java
    
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/storage/event/
      - copied from r1826325, 
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/event/
    
sis/branches/JDK9/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StreamWriterDelegate.java
      - copied unchanged from r1826325, 
sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StreamWriterDelegate.java
Removed:
    
sis/branches/JDK9/core/sis-build-helper/src/main/resources/org/apache/sis/findbugs-exclude.xml
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/code/
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/xml/FreeTextMarshallingTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/xml/package-info.txt
    
sis/branches/JDK9/core/sis-metadata/src/test/resources/org/apache/sis/internal/jaxb/code/
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/simple/CitationConstant.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleAttributeType.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleCitation.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleExtent.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleFormat.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleIdentifiedObject.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleIdentifier.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleMetadata.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/simple/package-info.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/util/StreamWriterDelegate.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractFactory.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractName.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/iso/CodeListFilter.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultMemberName.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameFactory.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecord.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordSchema.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultScopedName.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultTypeName.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/iso/GlobalNameSpace.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/iso/Names.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/iso/RecordDefinition.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/iso/TypeNames.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/iso/package-info.java
    sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/xml/
    sis/branches/JDK9/core/sis-utility/src/main/resources/org/apache/sis/xml/
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/internal/simple/
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/internal/test/XMLComparatorTest.java
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/test/XMLTestCase.java
    sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/test/mock/
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultLocalNameTest.java
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultNameFactoryTest.java
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultRecordSchemaTest.java
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultRecordTest.java
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultRecordTypeTest.java
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultScopedNameTest.java
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/util/iso/LargeCodeList.java
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/util/iso/NamesTest.java
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/util/iso/SerializableRecordSchema.java
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypesTest.java
    sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/xml/
Modified:
    sis/branches/JDK9/   (props changed)
    
sis/branches/JDK9/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
    sis/branches/JDK9/core/sis-metadata/pom.xml
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_TelephoneTypeCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/LegacyCharacterSet.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ObligationCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_ParameterDirection.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_Duration.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Responsibility.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MX_DataFile.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ServicesForUtility.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/WKTKeywords.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/package-info.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/package-info.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
    
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameterTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/metadata/NameMapTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/MarshallingTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFractionTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java
    
sis/branches/JDK9/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelopes.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/geometry/package-info.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/DirectPositionView.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/EPSGFactoryProxy.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Formulas.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.properties
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources_fr.properties
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/WKTUtilities.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/package-info.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilder.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/package-info.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ZonedGridSystem.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/package-info.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform1D.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform2D.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform2D.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/IterationStrategy.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransforms.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform.java
    
sis/branches/JDK9/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/package-info.java
    
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractDirectPositionTest.java
    
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/geometry/ArrayEnvelopeTest.java
    
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralDirectPositionTest.java
    
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameterTest.java
    
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/FormulasTest.java
    
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ReferencingUtilitiesTest.java
    
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WKTUtilitiesTest.java
    
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomain.java
    
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/PseudoTransform.java
    
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
    
sis/branches/JDK9/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
    sis/branches/JDK9/core/sis-utility/pom.xml
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/util/CheckedArrayList.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/util/MetadataServices.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/util/Numerics.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/internal/util/package-info.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/io/IdentifiedObjectFormat.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/collection/TableColumn.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListener.java
    
sis/branches/JDK9/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/internal/util/LocalizedParseExceptionTest.java
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/internal/util/NumericsTest.java
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/util/VersionTest.java
    
sis/branches/JDK9/core/sis-utility/src/test/java/org/apache/sis/util/collection/CodeListSetTest.java
    sis/branches/JDK9/ide-project/NetBeans/build.xml
    sis/branches/JDK9/pom.xml
    
sis/branches/JDK9/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GridGeometry.java
    
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
    
sis/branches/JDK9/storage/sis-storage/src/main/java/org/apache/sis/storage/Resource.java
    
sis/branches/JDK9/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java
    sis/branches/JDK9/storage/sis-xmlstore/pom.xml
    
sis/branches/JDK9/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/FormattedWriter.java
    
sis/branches/JDK9/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/NamespaceEraser.java
    
sis/branches/JDK9/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java

Propchange: sis/branches/JDK9/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  9 11:00:27 2018
@@ -1,5 +1,5 @@
 /sis/branches/Android:1430670-1480699
 /sis/branches/ISO-19115-3:1804459-1825252
 /sis/branches/JDK6:1394913-1508480
-/sis/branches/JDK8:1773327-1825254
+/sis/branches/JDK8:1773327-1826325
 /sis/trunk:1394364-1508466,1519089-1519674

Modified: 
sis/branches/JDK9/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
 [UTF-8] Fri Mar  9 11:00:27 2018
@@ -586,7 +586,7 @@ final class TransformCommand extends For
         if (toDomainOfValidity != null && (bbox = 
CRS.getGeographicBoundingBox(operation)) != null) {
             domainOfValidity = new ImmutableEnvelope(bbox);
             domainCoordinate = new 
double[toDomainOfValidity.getTargetDimensions()];
-            positionInDomain = new DirectPositionView(domainCoordinate, 0, 
domainCoordinate.length);
+            positionInDomain = new DirectPositionView.Double(domainCoordinate, 
0, domainCoordinate.length);
         } else {
             domainOfValidity = null;
             domainCoordinate = null;

Modified: sis/branches/JDK9/core/sis-metadata/pom.xml
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/pom.xml?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- sis/branches/JDK9/core/sis-metadata/pom.xml (original)
+++ sis/branches/JDK9/core/sis-metadata/pom.xml Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_TelephoneTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_TelephoneTypeCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_TelephoneTypeCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_TelephoneTypeCode.java
 [UTF-8] Fri Mar  9 11:00:27 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.citation.TelephoneType;
-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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
 [UTF-8] Fri Mar  9 11:00:27 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.identification.DistributedComputingPlatform;
-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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/LegacyCharacterSet.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/LegacyCharacterSet.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/LegacyCharacterSet.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/LegacyCharacterSet.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ObligationCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ObligationCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ObligationCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ObligationCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java
 [UTF-8] Fri Mar  9 11:00:27 2018
@@ -18,7 +18,7 @@ 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.EnumAdapter;
+import org.apache.sis.internal.jaxb.cat.EnumAdapter;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java
 [UTF-8] Fri Mar  9 11:00:27 2018
@@ -18,9 +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.Context;
+import org.apache.sis.internal.jaxb.cat.CodeListAdapter;
+import org.apache.sis.internal.jaxb.cat.CodeListUID;
 import org.apache.sis.xml.Namespaces;
 
 
@@ -60,8 +59,10 @@ public final class MD_RestrictionCode ex
      */
     @Override
     protected MD_RestrictionCode wrap(final CodeListUID value) {
-        if ("licence".equals(value.codeListValue) && 
Context.isFlagSet(Context.current(), Context.LEGACY_METADATA)) {
+        if ("licence".equals(value.codeListValue) && !accept2014()) {
             value.codeListValue = "license";
+        } else if ("license".equals(value.codeListValue) && accept2014()) {
+            value.codeListValue = "licence";
         }
         return new MD_RestrictionCode(value);
     }
@@ -93,6 +94,9 @@ public final class MD_RestrictionCode ex
      * @param  value  the unmarshalled value.
      */
     public void setElement(final CodeListUID value) {
+        if (value != null && "license".equalsIgnoreCase(value.codeListValue)) {
+            value.codeListValue = "licence";    // For matching current 
spelling (ISO 19115-3:2016).
+        }
         identifier = value;
     }
 }

Modified: 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java
 [UTF-8] Fri Mar  9 11:00:27 2018
@@ -18,7 +18,7 @@ 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.EnumAdapter;
+import org.apache.sis.internal.jaxb.cat.EnumAdapter;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java
 [UTF-8] Fri Mar  9 11:00:27 2018
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.identification.CouplingType;
-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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_ParameterDirection.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_ParameterDirection.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_ParameterDirection.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_ParameterDirection.java
 [UTF-8] Fri Mar  9 11:00:27 2018
@@ -18,7 +18,7 @@ package org.apache.sis.internal.jaxb.cod
 
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.parameter.ParameterDirection;
-import org.apache.sis.internal.jaxb.gmd.EnumAdapter;
+import org.apache.sis.internal.jaxb.cat.EnumAdapter;
 import org.apache.sis.xml.Namespaces;
 
 

Modified: 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java
 [UTF-8] Fri Mar  9 11:00:27 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/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_Duration.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_Duration.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_Duration.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_Duration.java
 [UTF-8] Fri Mar  9 11:00:27 2018
@@ -78,7 +78,7 @@ public final class TM_Duration extends P
      * Returns the {@link Duration} generated from the metadata value.
      * This method is systematically called at marshalling time by JAXB.
      *
-     * @return The time period, or {@code null}.
+     * @return the time period, or {@code null}.
      */
     @XmlElement(name = "TM_Duration")
     public javax.xml.datatype.Duration getElement() {
@@ -96,7 +96,7 @@ public final class TM_Duration extends P
      * Sets the value from the {@link Duration}.
      * This method is called at unmarshalling time by JAXB.
      *
-     * @param duration The adapter to set.
+     * @param  duration  the value to set.
      */
     public void setElement(final javax.xml.datatype.Duration duration) {
         metadata = TM_PeriodDuration.toISO(duration);

Modified: 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Responsibility.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Responsibility.java?rev=1826327&r1=1826326&r2=1826327&view=diff
==============================================================================
--- 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Responsibility.java
 [UTF-8] (original)
+++ 
sis/branches/JDK9/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Responsibility.java
 [UTF-8] Fri Mar  9 11:00:27 2018
@@ -89,8 +89,10 @@ public final class CI_Responsibility ext
                 return new DefaultResponsibility(metadata);
             }
             return DefaultResponsibility.castOrCopy(metadata);
-        } else {
+        } else if (FilterByVersion.LEGACY_METADATA.accept()) {
             return DefaultResponsibleParty.castOrCopy(metadata);
+        } else {
+            return null;
         }
     }