sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1498930 - in /sis/branches/0.3/core: sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/ sis-utility/src/main/java/org/apache/sis/xml/
Date Tue, 02 Jul 2013 13:30:03 GMT
Author: desruisseaux
Date: Tue Jul  2 13:30:02 2013
New Revision: 1498930

URL: http://svn.apache.org/r1498930
Log:
Removed the French profile ("FRA" namespace), since they are not yet fully isolated in an
optional module.

Modified:
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/package-info.java
    sis/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java

Modified: sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java?rev=1498930&r1=1498929&r2=1498930&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java
[UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java
[UTF-8] Tue Jul  2 13:30:02 2013
@@ -96,46 +96,4 @@ public class RS_ReferenceSystem extends 
     public void setElement(final ReferenceSystemMetadata metadata) {
         this.metadata = metadata;
     }
-
-    /**
-     * A hook for the French profile.
-     *
-     * @return The metadata to be marshalled.
-     *
-     * @todo We need a better plugin mechanism.
-     */
-    @XmlElement(name = "FRA_DirectReferenceSystem", namespace = Namespaces.FRA)
-    public ReferenceSystemMetadata getDirectReferenceSystem() {
-        return null;
-    }
-
-    /**
-     * Setter method for the French profile hook.
-     *
-     * @param metadata The unmarshalled metadata.
-     */
-    public void setDirectReferenceSystem(final ReferenceSystemMetadata metadata) {
-        this.metadata = metadata;
-    }
-
-    /**
-     * A hook for the French profile.
-     *
-     * @return The metadata to be marshalled.
-     *
-     * @todo We need a better plugin mechanism.
-     */
-    @XmlElement(name = "FRA_IndirectReferenceSystem", namespace = Namespaces.FRA)
-    public ReferenceSystemMetadata getIndirectReferenceSystem() {
-        return null;
-    }
-
-    /**
-     * Setter method for the French profile hook.
-     *
-     * @param metadata The unmarshalled metadata.
-     */
-    public void setIndirectReferenceSystem(final ReferenceSystemMetadata metadata) {
-        this.metadata = metadata;
-    }
 }

Modified: sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/package-info.java?rev=1498930&r1=1498929&r2=1498930&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/package-info.java
[UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/package-info.java
[UTF-8] Tue Jul  2 13:30:02 2013
@@ -58,8 +58,7 @@
 @XmlSchema(elementFormDefault = XmlNsForm.QUALIFIED, namespace = Namespaces.GMD, xmlns =
{
     @XmlNs(prefix = "gmd", namespaceURI = Namespaces.GMD),
     @XmlNs(prefix = "gco", namespaceURI = Namespaces.GCO),
-    @XmlNs(prefix = "xsi", namespaceURI = Namespaces.XSI),
-    @XmlNs(prefix = "fra", namespaceURI = Namespaces.FRA)
+    @XmlNs(prefix = "xsi", namespaceURI = Namespaces.XSI)
 })
 @XmlAccessorType(XmlAccessType.NONE)
 package org.apache.sis.internal.jaxb.metadata;

Modified: sis/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java?rev=1498930&r1=1498929&r2=1498930&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java [UTF-8]
(original)
+++ sis/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java [UTF-8]
Tue Jul  2 13:30:02 2013
@@ -131,14 +131,6 @@ public final class Namespaces extends St
     public static final String XLINK = "http://www.w3.org/1999/xlink";
 
     /**
-     * The <code>{@value}</code> URL.
-     * The usual prefix for this namespace is {@code "fra"}.
-     *
-     * @category Profiles
-     */
-    public static final String FRA = "http://www.cnig.gouv.fr/2005/fra";
-
-    /**
      * URLs for which the prefix to use directly follows them.
      */
     private static final String[] GENERIC_URLS = {



Mime
View raw message