From aa3c153c9f8c1463be32ea6e87c1f2f04c122b13 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 20 Jul 2022 09:55:16 +0200 Subject: [PATCH] Add standard and XSF namespace / prefix mappings --- .../src/org/argeo/api/acr/CrAttributeType.java | 6 +----- org.argeo.api.acr/src/org/argeo/api/acr/CrName.java | 1 - .../org/argeo/api/acr/RuntimeNamespaceContext.java | 13 +++++++++++++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/CrAttributeType.java b/org.argeo.api.acr/src/org/argeo/api/acr/CrAttributeType.java index 0bbf63e71..7cef11926 100644 --- a/org.argeo.api.acr/src/org/argeo/api/acr/CrAttributeType.java +++ b/org.argeo.api.acr/src/org/argeo/api/acr/CrAttributeType.java @@ -34,7 +34,7 @@ public enum CrAttributeType { private final Class clss; private final AttributeFormatter formatter; - private ContentName qName; + private final ContentName qName; private CrAttributeType(Class clss, String namespaceUri, String localName, AttributeFormatter formatter) { this.clss = clss; @@ -47,10 +47,6 @@ public enum CrAttributeType { return qName; } - public void setqName(ContentName qName) { - this.qName = qName; - } - public Class getClss() { return clss; } diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/CrName.java b/org.argeo.api.acr/src/org/argeo/api/acr/CrName.java index 1138d095d..025049966 100644 --- a/org.argeo.api.acr/src/org/argeo/api/acr/CrName.java +++ b/org.argeo.api.acr/src/org/argeo/api/acr/CrName.java @@ -36,7 +36,6 @@ public enum CrName { ; public final static String CR_NAMESPACE_URI = "http://www.argeo.org/ns/cr"; - public final static String CR_DEFAULT_PREFIX = "cr"; public final static String LDAP_NAMESPACE_URI = "http://www.argeo.org/ns/ldap"; diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/RuntimeNamespaceContext.java b/org.argeo.api.acr/src/org/argeo/api/acr/RuntimeNamespaceContext.java index d228c23e8..0941597d7 100644 --- a/org.argeo.api.acr/src/org/argeo/api/acr/RuntimeNamespaceContext.java +++ b/org.argeo.api.acr/src/org/argeo/api/acr/RuntimeNamespaceContext.java @@ -6,6 +6,7 @@ import java.util.Map; import java.util.NavigableMap; import java.util.TreeMap; +import javax.xml.XMLConstants; import javax.xml.namespace.NamespaceContext; /** @@ -13,6 +14,9 @@ import javax.xml.namespace.NamespaceContext; * namespaces MUST register here with a single default prefix. */ public class RuntimeNamespaceContext implements NamespaceContext { + public final static String XSD_DEFAULT_PREFIX = "xs"; + public final static String XSD_INSTANCE_DEFAULT_PREFIX = "xsi"; + private NavigableMap prefixes = new TreeMap<>(); private NavigableMap namespaces = new TreeMap<>(); @@ -48,6 +52,15 @@ public class RuntimeNamespaceContext implements NamespaceContext { private final static RuntimeNamespaceContext INSTANCE = new RuntimeNamespaceContext(); static { + // Standard + register(XMLConstants.XML_NS_URI, XMLConstants.XML_NS_PREFIX); + register(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, XMLConstants.XMLNS_ATTRIBUTE); + + // Common + register(XMLConstants.W3C_XML_SCHEMA_NS_URI, XSD_DEFAULT_PREFIX); + register(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, XSD_INSTANCE_DEFAULT_PREFIX); + + // Argeo specific register(CrName.CR_NAMESPACE_URI, CrName.CR_DEFAULT_PREFIX); register(CrName.LDAP_NAMESPACE_URI, CrName.LDAP_DEFAULT_PREFIX); register(CrName.ROLE_NAMESPACE_URI, CrName.ROLE_DEFAULT_PREFIX); -- 2.30.2