You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2018/01/22 14:33:13 UTC
svn commit: r1821871 - in /sis/branches/ISO-19115-3/core:
sis-metadata/src/main/java/org/apache/sis/metadata/iso/
sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/
sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/ sis-u...
Author: desruisseaux
Date: Mon Jan 22 14:33:13 2018
New Revision: 1821871
URL: http://svn.apache.org/viewvc?rev=1821871&view=rev
Log:
Skip commit 783b71a96171f163f9da1088e11926bc9720101c (Fix bug with PT_FreeText not properly marshalling)
since it has been implemented by a different approach in previous commits. A large part of skipped commit
is about replacing the namespace in "xsi:type" attribute. We skip that part for now, since we may revisit
the way we apply on-the-fly XML transformations (using XMLEventReader instead of XMLStreamReader).
Skip commit 6244373a25dd82df69e168cf80690c40a3344bb6 (Better generalized handling of XML inheritance)
because of above-cited plan to replace XMLStreamReader by XMLEventReader.
Adaptation of commit eb8d83e5b54a9cd08653fb6c4c314e633fca2842 from Image Matter
The project at this revision can be built but is known to have test failures.
Tests will pass only after we completed the port of all ISO 19115-3 work.
Modified:
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java?rev=1821871&r1=1821870&r2=1821871&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java [UTF-8] Mon Jan 22 14:33:13 2018
@@ -79,6 +79,7 @@
@XmlNs(prefix = "mrd", namespaceURI = Namespaces.MRD),
@XmlNs(prefix = "gco", namespaceURI = Namespaces.GCO),
@XmlNs(prefix = "gmw", namespaceURI = Namespaces.GMW),
+ @XmlNs(prefix = "gcx", namespaceURI = Namespaces.GCX),
@XmlNs(prefix = "xsi", namespaceURI = Namespaces.XSI)
})
@XmlAccessorType(XmlAccessType.NONE)
Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java?rev=1821871&r1=1821870&r2=1821871&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java [UTF-8] Mon Jan 22 14:33:13 2018
@@ -75,6 +75,7 @@
@XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC),
@XmlNs(prefix = "gmw", namespaceURI = Namespaces.GMW),
@XmlNs(prefix = "gco", namespaceURI = Namespaces.GCO),
+ @XmlNs(prefix = "gcx", namespaceURI = Namespaces.GCX),
@XmlNs(prefix = "xsi", namespaceURI = Namespaces.XSI)
})
@XmlAccessorType(XmlAccessType.NONE)
Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java?rev=1821871&r1=1821870&r2=1821871&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java [UTF-8] Mon Jan 22 14:33:13 2018
@@ -91,6 +91,7 @@
@XmlNs(prefix = "cit", namespaceURI = Namespaces.CIT),
@XmlNs(prefix = "lan", namespaceURI = Namespaces.LAN),
@XmlNs(prefix = "mcc", namespaceURI = Namespaces.MCC),
+ @XmlNs(prefix = "mex", namespaceURI = Namespaces.MEX),
@XmlNs(prefix = "gco", namespaceURI = Namespaces.GCO),
@XmlNs(prefix = "xsi", namespaceURI = Namespaces.XSI),
@XmlNs(prefix = "gmd", namespaceURI = LegacyNamespaces.GMD)
Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java?rev=1821871&r1=1821870&r2=1821871&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java [UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java [UTF-8] Mon Jan 22 14:33:13 2018
@@ -216,6 +216,7 @@ public class GO_CharacterString {
*
* <p>This method is invoked by JAXB at unmarshalling time and should not need to be invoked directly.</p>
*/
+ @SuppressWarnings("unused")
private void setValue(final Object value) {
if (value instanceof Anchor) {
setText((Anchor) value, ANCHOR);
@@ -267,7 +268,7 @@ public class GO_CharacterString {
* or {@code <gmx:MimeFileType>}. This method presumes that the element name is the CodeList standard name.
* If not, the element will be ignored.
*/
- @SuppressWarnings({ "unchecked", "unused" })
+ @SuppressWarnings({"unchecked", "unused"})
private void setCodeList(final Object value) {
final Element e = (Element) value;
if (e.getNodeType() == Element.ELEMENT_NODE) {