Add StaticXmpCoreContainers

xmp-core/src/main/java/org/verapdf/xmp/XMPSchemaRegistry.java

@@ -66,9 +66,10 @@ public interface XMPSchemaRegistry
 	 *         otherwise the existing prefix.
 	 * @throws XMPException If the parameters are not accordingly set
 	 */
-	String registerNamespace(String namespaceURI, String suggestedPrefix) throws XMPException;
+	String registerStandardNamespace(String namespaceURI, String suggestedPrefix) throws XMPException;
+
+	String registerNamespace(String namespaceURI, String suggestedPrefix, boolean isStandard) throws XMPException;
 
-
 	/**
 	 * Obtain the prefix for a registered namespace URI.
 	 * <p>

xmp-core/src/main/java/org/verapdf/xmp/containers/StaticXmpCoreContainers.java

@@ -0,0 +1,37 @@
+package org.verapdf.xmp.containers;
+
+import java.util.*;
+
+public class StaticXmpCoreContainers {
+
+    /**
+     * a map from a namespace URI to its registered prefix
+     */
+    private static final ThreadLocal<Map<String, String>> namespaceToPrefixMap = new ThreadLocal<>();
+
+    /**
+     * a map from a prefix to the associated namespace URI
+     */
+    private static final ThreadLocal<Map<String, String>> prefixToNamespaceMap = new ThreadLocal<>();
+
+    public static void clearAllContainers() {
+        namespaceToPrefixMap.set(new HashMap<>());
+        prefixToNamespaceMap.set(new HashMap<>());
+    }
+
+    public static Map<String, String> getNamespaceToPrefixMap() {
+        return namespaceToPrefixMap.get();
+    }
+
+    public static Map<String, String> getPrefixToNamespaceMap() {
+        return prefixToNamespaceMap.get();
+    }
+
+    public static void setNamespaceToPrefixMap(Map<String, String> namespaceToPrefixMap) {
+        StaticXmpCoreContainers.namespaceToPrefixMap.set(namespaceToPrefixMap);
+    }
+
+    public static void setPrefixToNamespaceMap(Map<String, String> prefixToNamespaceMap) {
+        StaticXmpCoreContainers.prefixToNamespaceMap.set(prefixToNamespaceMap);
+    }
+}

xmp-core/src/main/java/org/verapdf/xmp/impl/ParseRDF.java

@@ -997,7 +997,7 @@ private static XMPNode addChildNode(XMPMetaImpl xmp, XMPNode xmpParent, Node xml
 			if (prefix == null)
 			{
 				prefix = xmlNode.getPrefix() != null ? xmlNode.getPrefix() : DEFAULT_PREFIX;
-				prefix = registry.registerNamespace(namespace, prefix);
+				prefix = registry.registerNamespace(namespace, prefix, false);
 			}
 			childName = prefix + xmlNode.getLocalName();
 		}

xmp-core/src/main/java/org/verapdf/xmp/impl/VeraPDFMeta.java

@@ -1,6 +1,8 @@
 package org.verapdf.xmp.impl;
 
 import org.verapdf.xmp.*;
+import org.verapdf.xmp.impl.xpath.XMPPath;
+import org.verapdf.xmp.impl.xpath.XMPPathParser;
 import org.verapdf.xmp.options.ParseOptions;
 import org.verapdf.xmp.options.PropertyOptions;
 import org.verapdf.xmp.options.SerializeOptions;

xmp-core/src/main/java/org/verapdf/xmp/impl/XMPNodeUtils.java

@@ -108,7 +108,7 @@ static XMPNode findSchemaNode(XMPNode tree, String namespaceURI, String suggeste
 				if (suggestedPrefix != null  &&  suggestedPrefix.length() != 0)
 				{
 					prefix = XMPMetaFactory.getSchemaRegistry().registerNamespace(namespaceURI,
-							suggestedPrefix);
+							suggestedPrefix, false);
 				}
 				else
 				{