FOP-3236: Add all the needed namespaces to the parent element

Author: Joao Goncalves

src/main/java/org/apache/xmlgraphics/xmp/Metadata.java

@@ -134,6 +134,13 @@ public void toSAX(ContentHandler handler) throws SAXException {
                         if (prefix != null) {
                             handler.startPrefixMapping(prefix, ns);
                         }
+
+                        if (schema != null) {
+                            for (Map.Entry<String, String> entry : schema.getExtraNamespaces().entrySet()) {
+                                handler.startPrefixMapping(entry.getKey(), entry.getValue());
+                            }
+                        }
+
                         handler.startElement(XMPConstants.RDF_NAMESPACE,
                                 "Description", "rdf:Description", atts);
                         empty = false;
@@ -147,6 +154,12 @@ public void toSAX(ContentHandler handler) throws SAXException {
                 if (prefix != null) {
                     handler.endPrefixMapping(prefix);
                 }
+
+                if (schema != null) {
+                    for (String extraPrefix : schema.getExtraNamespaces().keySet()) {
+                        handler.endPrefixMapping(extraPrefix);
+                    }
+                }
             }
         }
 

src/main/java/org/apache/xmlgraphics/xmp/XMPSchema.java

@@ -19,6 +19,9 @@
 
 package org.apache.xmlgraphics.xmp;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.xmlgraphics.util.QName;
 import org.apache.xmlgraphics.xmp.merge.MergeRuleSet;
 
@@ -31,6 +34,7 @@ public class XMPSchema {
 
     private String namespace;
     private String prefix;
+    private Map<String, String> extraNamespaces = new HashMap<>();
 
     /**
      * Constructs a new XMP schema object.
@@ -65,4 +69,13 @@ protected QName getQName(String propName) {
     public MergeRuleSet getDefaultMergeRuleSet() {
         return defaultMergeRuleSet;
     }
+
+    /** Returns the map of extra namespaces to by used by child properties */
+    public Map<String, String> getExtraNamespaces() {
+        return extraNamespaces;
+    }
+
+    public void addExtraNamespace(String prefix, String namespace) {
+        this.extraNamespaces.put(prefix, namespace);
+    }
 }

src/main/java/org/apache/xmlgraphics/xmp/schemas/pdf/PDFAExtensionXMPSchema.java

@@ -31,6 +31,9 @@ public class PDFAExtensionXMPSchema extends XMPSchema {
     /** Creates a new schema instance for Dublin Core. */
     public PDFAExtensionXMPSchema() {
         super(XMPConstants.PDF_A_EXTENSION, "pdfaExtension");
+
+        addExtraNamespace("pdfaSchema", XMPConstants.PDF_A_SCHEMA);
+        addExtraNamespace("pdfaProperty", XMPConstants.PDF_A_PROPERTY);
     }
 
     /**

src/test/java/org/apache/xmlgraphics/xmp/XMPArrayTest.java

@@ -45,6 +45,8 @@ public void testXMPProperties() throws SAXException {
                 + "rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#\n"
                 + "<rdf:RDF>\n"
                 + "pdfaExtension:http://www.aiim.org/pdfa/ns/extension/\n"
+                + "pdfaProperty:http://www.aiim.org/pdfa/ns/property#\n"
+                + "pdfaSchema:http://www.aiim.org/pdfa/ns/schema#\n"
                 + "<rdf:Description rdf:about=\"\">\n"
                 + "<xmlns:http://www.aiim.org/pdfa/ns/property#>\n"
                 + "<rdf:Bag>\n"
@@ -86,6 +88,8 @@ public void testXMPPropertiesInList() throws SAXException {
                 + "rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#\n"
                 + "<rdf:RDF>\n"
                 + "pdfaExtension:http://www.aiim.org/pdfa/ns/extension/\n"
+                + "pdfaProperty:http://www.aiim.org/pdfa/ns/property#\n"
+                + "pdfaSchema:http://www.aiim.org/pdfa/ns/schema#\n"
                 + "<rdf:Description rdf:about=\"\">\n"
                 + "<xmlns:http://www.aiim.org/pdfa/ns/property#>\n"
                 + "<rdf:Bag>\n"

src/test/java/org/apache/xmlgraphics/xmp/XMPPropertyTest.java

@@ -39,6 +39,8 @@ public void testXMPPropertyAsValue() throws Exception {
                 + "rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#\n"
                 + "<rdf:RDF>\n"
                 + "pdfaExtension:http://www.aiim.org/pdfa/ns/extension/\n"
+                + "pdfaProperty:http://www.aiim.org/pdfa/ns/property#\n"
+                + "pdfaSchema:http://www.aiim.org/pdfa/ns/schema#\n"
                 + "<rdf:Description rdf:about=\"\">\n"
                 + "<xmlns:http://www.aiim.org/pdfa/ns/property#>\n"
                 + "<prefix1:name1>\n"

src/test/java/org/apache/xmlgraphics/xmp/schemas/pdf/PDFAExtensionAdapterTest.java

@@ -41,12 +41,13 @@ public void testPDFAExtensionElement() throws SAXException {
                 + "rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#\n"
                 + "<rdf:RDF>\n"
                 + "pdfaExtension:http://www.aiim.org/pdfa/ns/extension/\n"
+                + "pdfaProperty:http://www.aiim.org/pdfa/ns/property#\n"
+                + "pdfaSchema:http://www.aiim.org/pdfa/ns/schema#\n"
                 + "<rdf:Description rdf:about=\"\">\n"
                 + "<pdfaExtension:schemas>\n"
                 + "<rdf:Bag>\n"
                 + "<rdf:li rdf:parseType=\"Resource\">\n"
                 + "<pdfaSchema:schema>\n"
-                + "pdfaSchema:http://www.aiim.org/pdfa/ns/schema#\n"
                 + "PDF/UA identification schema\n"
                 + "</pdfaSchema:schema>\n"
                 + "<pdfaSchema:namespaceURI>\n"
@@ -59,7 +60,6 @@ public void testPDFAExtensionElement() throws SAXException {
                 + "<rdf:Seq>\n"
                 + "<rdf:li rdf:parseType=\"Resource\">\n"
                 + "<pdfaProperty:name>\n"
-                + "pdfaProperty:http://www.aiim.org/pdfa/ns/property#\n"
                 + "part\n"
                 + "</pdfaProperty:name>\n"
                 + "<pdfaProperty:valueType>\n"

src/test/java/org/apache/xmlgraphics/xmp/schemas/pdf/PDFAExtensionXMPSchemaTest.java

@@ -22,6 +22,8 @@
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import org.apache.xmlgraphics.xmp.XMPConstants;
 
@@ -33,6 +35,15 @@ public void testPDFAExtensionSchema() {
 
         assertEquals("pdfaExtension", schema.getPreferredPrefix());
         assertEquals(XMPConstants.PDF_A_EXTENSION, schema.getNamespace());
+        assertFalse("Must have the namespaces of child properties", schema.getExtraNamespaces().isEmpty());
 
+        assertTrue("The prefix must be the key", schema.getExtraNamespaces().containsKey("pdfaSchema"));
+        assertTrue("The prefix must be the key", schema.getExtraNamespaces().containsKey("pdfaProperty"));
+
+
+        assertEquals("Namespace must match the correct prefix`", XMPConstants.PDF_A_SCHEMA,
+                schema.getExtraNamespaces().get("pdfaSchema"));
+        assertEquals("Namespace must match the correct prefix`", XMPConstants.PDF_A_PROPERTY,
+                schema.getExtraNamespaces().get("pdfaProperty"));
     }
 }