Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java?rev=1825481&r1=1825480&r2=1825481&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java [UTF-8] Tue Feb 27 17:55:49 2018 @@ -28,7 +28,7 @@ import org.opengis.metadata.citation.Cit import org.opengis.metadata.identification.TopicCategory; import org.opengis.metadata.identification.DataIdentification; import org.apache.sis.internal.metadata.OtherLocales; -import org.apache.sis.internal.jaxb.gmd.LocaleAdapter; +import org.apache.sis.internal.jaxb.lan.LocaleAdapter; import org.apache.sis.internal.jaxb.LegacyNamespaces; import org.apache.sis.internal.jaxb.FilterByVersion; import org.apache.sis.internal.util.CollectionsExt;
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java?rev=1825481&r1=1825480&r2=1825481&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java [UTF-8] Tue Feb 27 17:55:49 2018 @@ -162,6 +162,7 @@ import javax.xml.bind.annotation.adapter import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters; import org.apache.sis.xml.Namespaces; import org.apache.sis.internal.jaxb.LegacyNamespaces; +import org.apache.sis.internal.jaxb.lan.PT_Locale; import org.apache.sis.internal.jaxb.gco.*; import org.apache.sis.internal.jaxb.gts.*; import org.apache.sis.internal.jaxb.code.*; Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java?rev=1825481&r1=1825480&r2=1825481&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java [UTF-8] Tue Feb 27 17:55:49 2018 @@ -142,6 +142,7 @@ import javax.xml.bind.annotation.adapter import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters; import org.apache.sis.xml.Namespaces; import org.apache.sis.internal.jaxb.LegacyNamespaces; +import org.apache.sis.internal.jaxb.lan.PT_Locale; import org.apache.sis.internal.jaxb.gco.*; import org.apache.sis.internal.jaxb.code.*; import org.apache.sis.internal.jaxb.metadata.*; Copied: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java (from r1825480, sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/code/CodeListMarshallingTest.java) URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java?p2=sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java&p1=sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/code/CodeListMarshallingTest.java&r1=1825480&r2=1825481&rev=1825481&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/code/CodeListMarshallingTest.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java [UTF-8] Tue Feb 27 17:55:49 2018 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.code; +package org.apache.sis.internal.jaxb.cat; import java.util.Arrays; import java.util.Locale; Copied: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumAdapterTest.java (from r1825480, sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gmd/EnumAdapterTest.java) URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumAdapterTest.java?p2=sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumAdapterTest.java&p1=sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gmd/EnumAdapterTest.java&r1=1825480&r2=1825481&rev=1825481&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gmd/EnumAdapterTest.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumAdapterTest.java [UTF-8] Tue Feb 27 17:55:49 2018 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.gmd; +package org.apache.sis.internal.jaxb.cat; import org.apache.sis.test.XMLTestCase; import org.junit.Test; Copied: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java (from r1825480, sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/code/EnumMarshallingTest.java) URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java?p2=sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java&p1=sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/code/EnumMarshallingTest.java&r1=1825480&r2=1825481&rev=1825481&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/code/EnumMarshallingTest.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java [UTF-8] Tue Feb 27 17:55:49 2018 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.code; +package org.apache.sis.internal.jaxb.cat; import java.util.Arrays; import java.util.EnumSet; Copied: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/FreeTextMarshallingTest.java (from r1825480, sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/FreeTextMarshallingTest.java) URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/FreeTextMarshallingTest.java?p2=sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/FreeTextMarshallingTest.java&p1=sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/FreeTextMarshallingTest.java&r1=1825480&r2=1825481&rev=1825481&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/FreeTextMarshallingTest.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/FreeTextMarshallingTest.java [UTF-8] Tue Feb 27 17:55:49 2018 @@ -14,13 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.xml; +package org.apache.sis.internal.jaxb.lan; import java.util.Locale; import javax.xml.bind.JAXBException; import org.opengis.metadata.citation.Citation; import org.apache.sis.util.iso.DefaultInternationalString; import org.apache.sis.test.XMLTestCase; +import org.apache.sis.xml.Namespaces; import org.junit.Test; import static org.apache.sis.test.MetadataAssert.*; Copied: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java (from r1825480, sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gmd/LanguageCodeTest.java) URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java?p2=sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java&p1=sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gmd/LanguageCodeTest.java&r1=1825480&r2=1825481&rev=1825481&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gmd/LanguageCodeTest.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java [UTF-8] Tue Feb 27 17:55:49 2018 @@ -14,8 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.gmd; +package org.apache.sis.internal.jaxb.lan; +import org.apache.sis.test.mock.MetadataMock; import java.util.Map; import java.util.HashMap; import java.util.Locale; Copied: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/PT_LocaleTest.java (from r1825480, sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/code/PT_LocaleTest.java) URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/PT_LocaleTest.java?p2=sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/PT_LocaleTest.java&p1=sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/code/PT_LocaleTest.java&r1=1825480&r2=1825481&rev=1825481&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/code/PT_LocaleTest.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/PT_LocaleTest.java [UTF-8] Tue Feb 27 17:55:49 2018 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.code; +package org.apache.sis.internal.jaxb.lan; import java.util.Arrays; import java.util.Locale; Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java?rev=1825481&r1=1825480&r2=1825481&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java [UTF-8] Tue Feb 27 17:55:49 2018 @@ -20,7 +20,7 @@ import java.util.Locale; import javax.xml.bind.JAXBException; import org.opengis.metadata.quality.Result; import org.opengis.util.InternationalString; -import org.apache.sis.xml.FreeTextMarshallingTest; +import org.apache.sis.internal.jaxb.lan.FreeTextMarshallingTest; import org.apache.sis.util.Version; import org.apache.sis.test.XMLTestCase; import org.apache.sis.test.DependsOn; Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/XMLComparator.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/XMLComparator.java?rev=1825481&r1=1825480&r2=1825481&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/XMLComparator.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/XMLComparator.java [UTF-8] Tue Feb 27 17:55:49 2018 @@ -74,7 +74,7 @@ import static org.apache.sis.util.CharSe * @version 1.0 * * @see XMLTestCase - * @see Assert#assertXmlEquals(Object, Object, String[]) + * @see MetadataAssert#assertXmlEquals(Object, Object, String[]) * * @since 0.3 * @module @@ -82,7 +82,7 @@ import static org.apache.sis.util.CharSe public strictfp class XMLComparator { /** * Commonly used prefixes for namespaces. Used as shorthands for calls to - * {@link Assert#assertXmlEquals(Object, Object, String[])}. + * {@link MetadataAssert#assertXmlEquals(Object, Object, String[])}. * * @see #substitutePrefix(String) */ @@ -158,7 +158,7 @@ public strictfp class XMLComparator { * "http://www.w3.org/2001/XMLSchema-instance:type"; * } * - * Note that for convenience, the {@link Assert#assertXmlEquals(Object, Object, String[])} method + * Note that for convenience, the {@link MetadataAssert#assertXmlEquals(Object, Object, String[])} method * automatically replaces some widely used prefixes by their full URL. */ public final Set<String> ignoredAttributes; Copied: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/mock/MetadataMock.java (from r1825480, sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gmd/MetadataMock.java) URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/mock/MetadataMock.java?p2=sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/mock/MetadataMock.java&p1=sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gmd/MetadataMock.java&r1=1825480&r2=1825481&rev=1825481&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gmd/MetadataMock.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/mock/MetadataMock.java [UTF-8] Tue Feb 27 17:55:49 2018 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.jaxb.gmd; +package org.apache.sis.test.mock; import java.util.Locale; import java.util.Collection; @@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlElem import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.apache.sis.internal.jaxb.LegacyNamespaces; +import org.apache.sis.internal.jaxb.lan.LocaleAdapter; import org.apache.sis.internal.simple.SimpleMetadata; import org.apache.sis.xml.Namespaces; @@ -40,7 +41,7 @@ import org.apache.sis.xml.Namespaces; * @module */ @XmlRootElement(name = "MD_Metadata", namespace = Namespaces.MDB) -final strictfp class MetadataMock extends SimpleMetadata { +public final strictfp class MetadataMock extends SimpleMetadata { /** * The language used for documenting metadata. */ Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/mock/package-info.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/mock/package-info.java?rev=1825481&r1=1825480&r2=1825481&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/mock/package-info.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/mock/package-info.java [UTF-8] Tue Feb 27 17:55:49 2018 @@ -33,6 +33,7 @@ */ @XmlSchema(elementFormDefault = XmlNsForm.QUALIFIED, namespace = Namespaces.GML, xmlns = { @XmlNs(prefix = "gml", namespaceURI = Namespaces.GML), + @XmlNs(prefix = "mdb", namespaceURI = Namespaces.MDB), @XmlNs(prefix = "gco", namespaceURI = Namespaces.GCO) }) @XmlAccessorType(XmlAccessType.NONE) Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java?rev=1825481&r1=1825480&r2=1825481&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java [UTF-8] Tue Feb 27 17:55:49 2018 @@ -70,14 +70,14 @@ import org.junit.BeforeClass; org.apache.sis.internal.jaxb.ModifiableIdentifierMapTest.class, org.apache.sis.internal.jaxb.gco.StringAdapterTest.class, org.apache.sis.internal.jaxb.gco.PropertyTypeTest.class, - org.apache.sis.internal.jaxb.gmd.EnumAdapterTest.class, - org.apache.sis.internal.jaxb.gmd.LanguageCodeTest.class, + org.apache.sis.internal.jaxb.lan.PT_LocaleTest.class, + org.apache.sis.internal.jaxb.lan.LanguageCodeTest.class, + org.apache.sis.internal.jaxb.lan.FreeTextMarshallingTest.class, + org.apache.sis.internal.jaxb.cat.EnumAdapterTest.class, + org.apache.sis.internal.jaxb.cat.EnumMarshallingTest.class, + org.apache.sis.internal.jaxb.cat.CodeListMarshallingTest.class, org.apache.sis.internal.jaxb.gml.TimePeriodTest.class, org.apache.sis.internal.jaxb.gml.MeasureTest.class, - org.apache.sis.internal.jaxb.code.EnumMarshallingTest.class, - org.apache.sis.internal.jaxb.code.CodeListMarshallingTest.class, - org.apache.sis.internal.jaxb.code.PT_LocaleTest.class, - org.apache.sis.xml.FreeTextMarshallingTest.class, org.apache.sis.xml.NilReasonMarshallingTest.class, org.apache.sis.xml.CharSequenceSubstitutionTest.class, org.apache.sis.xml.UUIDMarshallingTest.class,
