projects
/
lgpl
/
argeo-commons.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
283501c
)
Add standard and XSF namespace / prefix mappings
author
Mathieu Baudier <mbaudier@argeo.org>
Wed, 20 Jul 2022 07:55:16 +0000
(09:55 +0200)
committer
Mathieu Baudier <mbaudier@argeo.org>
Wed, 20 Jul 2022 07:55:16 +0000
(09:55 +0200)
org.argeo.api.acr/src/org/argeo/api/acr/CrAttributeType.java
patch
|
blob
|
history
org.argeo.api.acr/src/org/argeo/api/acr/CrName.java
patch
|
blob
|
history
org.argeo.api.acr/src/org/argeo/api/acr/RuntimeNamespaceContext.java
patch
|
blob
|
history
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 0bbf63e710142bd881c18c6815e0181b57cbe1f6..7cef11926f829bfcb9464e4b2db8bceda949cf81 100644
(file)
--- 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 final Class<?> clss;
private final AttributeFormatter<?> formatter;
- private ContentName qName;
+ private
final
ContentName qName;
private <T> CrAttributeType(Class<T> clss, String namespaceUri, String localName, AttributeFormatter<T> formatter) {
this.clss = clss;
private <T> CrAttributeType(Class<T> clss, String namespaceUri, String localName, AttributeFormatter<T> formatter) {
this.clss = clss;
@@
-47,10
+47,6
@@
public enum CrAttributeType {
return qName;
}
return qName;
}
- public void setqName(ContentName qName) {
- this.qName = qName;
- }
-
public Class<?> getClss() {
return clss;
}
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 1138d095d799afb792012e35b4991cfa195f00be..025049966dfcd00bb6971ee9da2167dc0199990e 100644
(file)
--- 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_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";
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 d228c23e87af182cb64acd63e8a43862d17daeb0..0941597d749b7887f7dc4227e76e71acd211979c 100644
(file)
--- 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 java.util.NavigableMap;
import java.util.TreeMap;
+import javax.xml.XMLConstants;
import javax.xml.namespace.NamespaceContext;
/**
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 {
* 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<String, String> prefixes = new TreeMap<>();
private NavigableMap<String, String> namespaces = new TreeMap<>();
private NavigableMap<String, String> prefixes = new TreeMap<>();
private NavigableMap<String, String> namespaces = new TreeMap<>();
@@
-48,6
+52,15
@@
public class RuntimeNamespaceContext implements NamespaceContext {
private final static RuntimeNamespaceContext INSTANCE = new RuntimeNamespaceContext();
static {
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);
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);