Author: tilman
Date: Mon Dec 8 10:28:46 2025
New Revision: 1930357
Log:
PDFBOX-5292: move validateNaming() to more appropriate position, revert
preflight change
Modified:
pdfbox/branches/2.0/preflight/src/test/resources/expected_errors.txt
pdfbox/branches/2.0/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java
Modified: pdfbox/branches/2.0/preflight/src/test/resources/expected_errors.txt
==============================================================================
--- pdfbox/branches/2.0/preflight/src/test/resources/expected_errors.txt
Mon Dec 8 10:06:47 2025 (r1930356)
+++ pdfbox/branches/2.0/preflight/src/test/resources/expected_errors.txt
Mon Dec 8 10:28:46 2025 (r1930357)
@@ -210,7 +210,7 @@ isartor-6-7-3-t01-fail-c.pdf=7.2
isartor-6-7-5-t01-fail-a.pdf=7.0.0
isartor-6-7-5-t02-fail-a.pdf=7.0.0
isartor-6-7-8-t01-fail-a.pdf=7.3
-isartor-6-7-8-t02-fail-a.pdf=7.4.1 // 7.4.2 Impossible car NSPrefix utilisé
pour identifier pdfschemaext. Ici il est vu comme un schema inconnu; After
PDFBOX-5292 still rejected, but for better reason.
+isartor-6-7-8-t02-fail-a.pdf=7.3 // 7.4.2 Impossible car NSPrefix utilisé pour
identifier pdfschemaext. Ici il est vu comme un schema inconnu
isartor-6-7-8-t02-fail-b.pdf=7.4.1
isartor-6-7-8-t02-fail-c.pdf=7.1 //traité comme probleme de format
isartor-6-7-8-t02-fail-d.pdf=7.1.1 // Property missing so Property unknown
(7.1.1)
Modified:
pdfbox/branches/2.0/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java
==============================================================================
---
pdfbox/branches/2.0/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java
Mon Dec 8 10:06:47 2025 (r1930356)
+++
pdfbox/branches/2.0/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java
Mon Dec 8 10:28:46 2025 (r1930357)
@@ -186,7 +186,6 @@ public class DomXmpParser
List<Element> descriptions = DomHelper.getElementChildren(rdfRdf);
for (Element description : descriptions)
{
- PdfaExtensionHelper.validateNaming(xmp, description);
parseSchemaExtensions(xmp, description);
}
@@ -223,6 +222,10 @@ public class DomXmpParser
schemaExtensions.add(element);
}
}
+ if (!schemaExtensions.isEmpty())
+ {
+ PdfaExtensionHelper.validateNaming(xmp, description);
+ }
for (final Element schemaExtension : schemaExtensions)
{
final String namespace = schemaExtension.getNamespaceURI();