Author: desruisseaux
Date: Tue Feb 27 18:31:47 2018
New Revision: 1825489
URL: http://svn.apache.org/viewvc?rev=1825489&view=rev
Log:
Renamed gmx package as gcx.
Added:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/Anchor.java
- copied, changed from r1825488,
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmx/Anchor.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/FileName.java
- copied, changed from r1825488,
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmx/FileName.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/MimeFileType.java
- copied, changed from r1825488,
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileType.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/MimeFileTypeAdapter.java
- copied, changed from r1825488,
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileTypeAdapter.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/package-info.java
- copied, changed from r1825488,
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmx/package-info.java
Removed:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmx/
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MX_DataFile.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/xml/ReferenceResolver.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/MarshallingTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java?rev=1825489&r1=1825488&r2=1825489&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java
[UTF-8] Tue Feb 27 18:31:47 2018
@@ -23,7 +23,7 @@ import org.apache.sis.xml.XLink;
import org.apache.sis.xml.ReferenceResolver;
import org.apache.sis.internal.jaxb.Context;
import org.apache.sis.internal.jaxb.FilterByVersion;
-import org.apache.sis.internal.jaxb.gmx.Anchor;
+import org.apache.sis.internal.jaxb.gcx.Anchor;
import org.apache.sis.internal.jaxb.lan.PT_FreeText;
@@ -115,7 +115,7 @@ public class CharSequenceAdapter extends
return null;
}
/*
- * Substitute <gco:CharacterString> by <gmx:Anchor> if a linkage is
found.
+ * Substitute <gco:CharacterString> by <gcx:Anchor> if a linkage is
found.
*/
if (!(value instanceof Anchor)) {
final String key = CharSequences.trimWhitespaces(value.toString());
@@ -137,7 +137,7 @@ public class CharSequenceAdapter extends
*
*
┌──────────────────────────────────────────────────┬────────────────────────────────┐
* │ <mdb:someElement> │
<mdb:someElement> │
- * │ <gco:CharacterString>...</gco:CharacterString> │
<gmx:Anchor>...</gmx:Anchor> │
+ * │ <gco:CharacterString>...</gco:CharacterString> │
<gcx:Anchor>...</gcx:Anchor> │
* │ </mdb:someElement> │
</mdb:someElement> │
*
└──────────────────────────────────────────────────┴────────────────────────────────┘
*/
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java?rev=1825489&r1=1825488&r2=1825489&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
[UTF-8] Tue Feb 27 18:31:47 2018
@@ -30,9 +30,9 @@ import org.opengis.util.CodeList;
import org.opengis.util.ControlledVocabulary;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.internal.jaxb.Context;
-import org.apache.sis.internal.jaxb.gmx.Anchor;
-import org.apache.sis.internal.jaxb.gmx.FileName;
-import org.apache.sis.internal.jaxb.gmx.MimeFileType;
+import org.apache.sis.internal.jaxb.gcx.Anchor;
+import org.apache.sis.internal.jaxb.gcx.FileName;
+import org.apache.sis.internal.jaxb.gcx.MimeFileType;
import org.apache.sis.internal.jaxb.cat.CodeListUID;
import org.apache.sis.internal.jaxb.LegacyNamespaces;
import org.apache.sis.util.CharSequences;
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java?rev=1825489&r1=1825488&r2=1825489&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java
[UTF-8] Tue Feb 27 18:31:47 2018
@@ -24,7 +24,7 @@ import org.apache.sis.internal.jaxb.Cont
/**
- * JAXB adapter wrapping a URI value with a {@code <gmx:FileName>} element,
for ISO 19139:2007 compliance.
+ * JAXB adapter wrapping a URI value with a {@code <gcx:FileName>} element.
*
* @author Cédric Briançon (Geomatys)
* @author Martin Desruisseaux (Geomatys)
Copied:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/Anchor.java
(from r1825488,
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmx/Anchor.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/Anchor.java?p2=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/Anchor.java&p1=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmx/Anchor.java&r1=1825488&r2=1825489&rev=1825489&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmx/Anchor.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/Anchor.java
[UTF-8] Tue Feb 27 18:31:47 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.gmx;
+package org.apache.sis.internal.jaxb.gcx;
import java.net.URI;
import java.util.Locale;
Copied:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/FileName.java
(from r1825488,
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmx/FileName.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/FileName.java?p2=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/FileName.java&p1=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmx/FileName.java&r1=1825488&r2=1825489&rev=1825489&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmx/FileName.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/FileName.java
[UTF-8] Tue Feb 27 18:31:47 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.gmx;
+package org.apache.sis.internal.jaxb.gcx;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
Copied:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/MimeFileType.java
(from r1825488,
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileType.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/MimeFileType.java?p2=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/MimeFileType.java&p1=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileType.java&r1=1825488&r2=1825489&rev=1825489&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileType.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/MimeFileType.java
[UTF-8] Tue Feb 27 18:31:47 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.gmx;
+package org.apache.sis.internal.jaxb.gcx;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
Copied:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/MimeFileTypeAdapter.java
(from r1825488,
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileTypeAdapter.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/MimeFileTypeAdapter.java?p2=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/MimeFileTypeAdapter.java&p1=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileTypeAdapter.java&r1=1825488&r2=1825489&rev=1825489&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileTypeAdapter.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/MimeFileTypeAdapter.java
[UTF-8] Tue Feb 27 18:31:47 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.gmx;
+package org.apache.sis.internal.jaxb.gcx;
import org.apache.sis.internal.jaxb.Context;
import org.apache.sis.internal.jaxb.gco.StringAdapter;
Copied:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/package-info.java
(from r1825488,
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmx/package-info.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/package-info.java?p2=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/package-info.java&p1=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmx/package-info.java&r1=1825488&r2=1825489&rev=1825489&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmx/package-info.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gcx/package-info.java
[UTF-8] Tue Feb 27 18:31:47 2018
@@ -34,7 +34,7 @@
})
@XmlAccessorType(XmlAccessType.NONE)
@XmlJavaTypeAdapter(InternationalStringConverter.class)
-package org.apache.sis.internal.jaxb.gmx;
+package org.apache.sis.internal.jaxb.gcx;
import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlNsForm;
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MX_DataFile.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MX_DataFile.java?rev=1825489&r1=1825488&r2=1825489&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MX_DataFile.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MX_DataFile.java
[UTF-8] Tue Feb 27 18:31:47 2018
@@ -60,7 +60,7 @@ public final class MX_DataFile extends P
/**
* Invoked by {@link PropertyType} at marshalling time for wrapping the
given metadata value
- * in a {@code <gmx:MX_DataFile>} XML element.
+ * in a {@code <gcx:MX_DataFile>} XML element.
*
* @param metadata the metadata element to marshall.
* @return a {@code PropertyType} wrapping the given the metadata element.
@@ -72,7 +72,7 @@ public final class MX_DataFile extends P
/**
* Invoked by JAXB at marshalling time for getting the actual metadata to
write
- * inside the {@code <gmx:MX_DataFile>} XML element.
+ * inside the {@code <gcx:MX_DataFile>} XML element.
* This is the value or a copy of the value given in argument to the
{@code wrap} method.
*
* @return the metadata to be marshalled.
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java?rev=1825489&r1=1825488&r2=1825489&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java
[UTF-8] Tue Feb 27 18:31:47 2018
@@ -29,7 +29,7 @@ import org.apache.sis.xml.Namespaces;
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.internal.jaxb.FilterByVersion;
import org.apache.sis.internal.jaxb.LegacyNamespaces;
-import org.apache.sis.internal.jaxb.gmx.MimeFileTypeAdapter;
+import org.apache.sis.internal.jaxb.gcx.MimeFileTypeAdapter;
import org.opengis.util.InternationalString;
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java?rev=1825489&r1=1825488&r2=1825489&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java
[UTF-8] Tue Feb 27 18:31:47 2018
@@ -27,7 +27,7 @@ import org.opengis.metadata.citation.Onl
import org.opengis.metadata.constraint.Constraints;
import org.opengis.metadata.identification.BrowseGraphic;
import org.apache.sis.metadata.iso.ISOMetadata;
-import org.apache.sis.internal.jaxb.gmx.MimeFileTypeAdapter;
+import org.apache.sis.internal.jaxb.gcx.MimeFileTypeAdapter;
import org.apache.sis.internal.jaxb.FilterByVersion;
import org.apache.sis.xml.Namespaces;
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/xml/ReferenceResolver.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/xml/ReferenceResolver.java?rev=1825489&r1=1825488&r2=1825489&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/xml/ReferenceResolver.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/xml/ReferenceResolver.java
[UTF-8] Tue Feb 27 18:31:47 2018
@@ -23,7 +23,7 @@ import org.opengis.metadata.Identifier;
import org.apache.sis.util.Emptiable;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.LenientComparable;
-import org.apache.sis.internal.jaxb.gmx.Anchor;
+import org.apache.sis.internal.jaxb.gcx.Anchor;
import org.apache.sis.internal.jaxb.Context;
import static org.apache.sis.util.ArgumentChecks.*;
@@ -241,7 +241,7 @@ public class ReferenceResolver {
}
/**
- * Returns the {@code <gmx:Anchor>} to use for the given text, or {@code
null} if none.
+ * Returns the {@code <gcx:Anchor>} to use for the given text, or {@code
null} if none.
* Anchors can appear in ISO 19115-3 documents where we would normally
expect a character sequence.
* For example:
*
@@ -249,7 +249,7 @@ public class ReferenceResolver {
* <caption>XML representations of string</caption>
* <tr>
* <th>As {@code <gco:CharacterString>}</th>
- * <th>As {@code <gmx:Anchor>}</th>
+ * <th>As {@code <gcx:Anchor>}</th>
* </tr><tr>
* <td>
* <pre> <gmd:country>
@@ -257,7 +257,7 @@ public class ReferenceResolver {
* </gmd:country></pre>
* </td><td>
* <pre> <gmd:country>
- * <gmx:Anchor
xlink:href="SDN:C320:2:FR">France</gmx:Anchor>
+ * <gcx:Anchor
xlink:href="SDN:C320:2:FR">France</gcx:Anchor>
* </gmd:country></pre>
* </td></tr>
* </table>
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java?rev=1825489&r1=1825488&r2=1825489&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java
[UTF-8] Tue Feb 27 18:31:47 2018
@@ -311,10 +311,10 @@ public final class XML extends Static {
* The value for this property shall be a {@code String[]} array of any of
the following values:
*
* <ul>
- * <li>"{@code language}" for substituting {@code <gmd:LanguageCode>}
elements</li>
- * <li>"{@code country}" for substituting {@code <gmd:Country>}
elements</li>
- * <li>"{@code filename}" for substituting {@code <gmx:FileName>}
elements</li>
- * <li>"{@code mimetype}" for substituting {@code <gmx:MimeFileType>}
elements</li>
+ * <li>"{@code language}" for substituting {@code <lan:LanguageCode>}
elements</li>
+ * <li>"{@code country}" for substituting {@code <lan:Country>}
elements</li>
+ * <li>"{@code filename}" for substituting {@code <gcx:FileName>}
elements</li>
+ * <li>"{@code mimetype}" for substituting {@code <gcx:MimeFileType>}
elements</li>
* </ul>
*
* <div class="note"><b>Example:</b>
@@ -332,9 +332,9 @@ public final class XML extends Static {
* the language code like below (which is legal according OGC schemas, but
is not INSPIRE compliant):
*
* {@preformat xml
- * <gmd:language>
+ * <lan:language>
* <gco:CharacterString>fra</gco:CharacterString>
- * </gmd:language>
+ * </lan:language>
* }
* </div>
*/
Modified:
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/MarshallingTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/MarshallingTest.java?rev=1825489&r1=1825488&r2=1825489&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/MarshallingTest.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/MarshallingTest.java
[UTF-8] Tue Feb 27 18:31:47 2018
@@ -55,7 +55,7 @@ import org.apache.sis.util.logging.Warni
import org.apache.sis.measure.Units;
import org.apache.sis.xml.XML;
import org.apache.sis.xml.MarshallerPool;
-import org.apache.sis.internal.jaxb.gmx.Anchor;
+import org.apache.sis.internal.jaxb.gcx.Anchor;
import org.apache.sis.internal.jaxb.metadata.replace.ReferenceSystemMetadata;
import org.apache.sis.test.XMLTestCase;
import org.junit.Test;
Modified:
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java?rev=1825489&r1=1825488&r2=1825489&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
[UTF-8] Tue Feb 27 18:31:47 2018
@@ -26,6 +26,8 @@ import org.opengis.referencing.Identifie
import org.apache.sis.io.wkt.Symbols;
import org.apache.sis.io.wkt.WKTFormat;
import org.apache.sis.io.wkt.Convention;
+import org.apache.sis.xml.Namespaces;
+import org.apache.sis.internal.jaxb.LegacyNamespaces;
// Branch-specific imports
import org.opengis.metadata.citation.Responsibility;
@@ -183,13 +185,13 @@ public strictfp class MetadataAssert ext
* <caption>Predefined prefix mapping</caption>
* <tr><th>Prefix</th> <th>URL</th></tr>
* <tr><td>xmlns</td> <td>{@code
"http://www.w3.org/2000/xmlns"}</td></tr>
- * <tr><td>xlink</td> <td>{@value
org.apache.sis.xml.Namespaces#XLINK}</td></tr>
- * <tr><td>xsi</td> <td>{@value
org.apache.sis.xml.Namespaces#XSI}</td></tr>
- * <tr><td>gml</td> <td>{@value
org.apache.sis.xml.Namespaces#GML}</td></tr>
- * <tr><td>gmd</td> <td>{@value
org.apache.sis.xml.Namespaces#GMD}</td></tr>
- * <tr><td>gmx</td> <td>{@value
org.apache.sis.xml.Namespaces#GMX}</td></tr>
- * <tr><td>gmi</td> <td>{@value
org.apache.sis.xml.Namespaces#GMI}</td></tr>
- * <tr><td>gco</td> <td>{@value
org.apache.sis.xml.Namespaces#GCO}</td></tr>
+ * <tr><td>xlink</td> <td>{@value Namespaces#XLINK}</td></tr>
+ * <tr><td>xsi</td> <td>{@value Namespaces#XSI}</td></tr>
+ * <tr><td>gml</td> <td>{@value Namespaces#GML}</td></tr>
+ * <tr><td>gco</td> <td>{@value Namespaces#GCO}</td></tr>
+ * <tr><td>gmd</td> <td>{@value LegacyNamespaces#GMD}</td></tr>
+ * <tr><td>gmx</td> <td>{@value LegacyNamespaces#GMX}</td></tr>
+ * <tr><td>gmi</td> <td>{@value LegacyNamespaces#GMI}</td></tr>
* </table>
*
* <p>For example in order to ignore the namespace, type and schema
location declaration,
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java?rev=1825489&r1=1825488&r2=1825489&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
[UTF-8] Tue Feb 27 18:31:47 2018
@@ -280,7 +280,7 @@ public class NamedIdentifier extends Imm
return c;
}
/*
- * May happen if the user gave us an instance of
'org.apache.sis.internal.jaxb.gmx.Anchor' class
+ * May happen if the user gave us an instance of
'org.apache.sis.internal.jaxb.gcx.Anchor' class
* (maybe he got the instance indirectly) and the construction of that
instance is not completed.
*/
throw new
IllegalArgumentException(Errors.format(Errors.Keys.IllegalArgumentClass_2,
"code", code.getClass()));
Modified:
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java?rev=1825489&r1=1825488&r2=1825489&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
[UTF-8] Tue Feb 27 18:31:47 2018
@@ -61,7 +61,7 @@ import org.apache.sis.referencing.cs.Def
import org.apache.sis.referencing.crs.DefaultVerticalCRS;
import org.apache.sis.internal.jaxb.metadata.replace.ReferenceSystemMetadata;
import org.apache.sis.internal.jaxb.LegacyNamespaces;
-import org.apache.sis.internal.jaxb.gmx.Anchor;
+import org.apache.sis.internal.jaxb.gcx.Anchor;
import org.apache.sis.internal.system.Loggers;
import org.apache.sis.referencing.NamedIdentifier;
import org.apache.sis.util.iso.SimpleInternationalString;
