From 93bba45f8081f6780e6cc28fa8bd2e1b220abe5c Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Thu, 28 Apr 2022 16:30:26 -0500 Subject: [PATCH] Revert changes to OAI-PMH TransformerFactory initialization. MUST use Saxon --- .../xoai/services/impl/resources/DSpaceResourceResolver.java | 3 ++- .../org/dspace/xoai/tests/stylesheets/AbstractXSLTest.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dspace-oai/src/main/java/org/dspace/xoai/services/impl/resources/DSpaceResourceResolver.java b/dspace-oai/src/main/java/org/dspace/xoai/services/impl/resources/DSpaceResourceResolver.java index b2a0fc2795..e67e9c56bd 100644 --- a/dspace-oai/src/main/java/org/dspace/xoai/services/impl/resources/DSpaceResourceResolver.java +++ b/dspace-oai/src/main/java/org/dspace/xoai/services/impl/resources/DSpaceResourceResolver.java @@ -22,8 +22,9 @@ import org.dspace.services.ConfigurationService; import org.dspace.services.factory.DSpaceServicesFactory; public class DSpaceResourceResolver implements ResourceResolver { + // Requires usage of Saxon as OAI-PMH uses some XSLT 2 functions private static final TransformerFactory transformerFactory = TransformerFactory - .newInstance(); + .newInstance("net.sf.saxon.TransformerFactoryImpl", null); private final String basePath; diff --git a/dspace-oai/src/test/java/org/dspace/xoai/tests/stylesheets/AbstractXSLTest.java b/dspace-oai/src/test/java/org/dspace/xoai/tests/stylesheets/AbstractXSLTest.java index 4527c6dc70..42dbed04b6 100644 --- a/dspace-oai/src/test/java/org/dspace/xoai/tests/stylesheets/AbstractXSLTest.java +++ b/dspace-oai/src/test/java/org/dspace/xoai/tests/stylesheets/AbstractXSLTest.java @@ -19,8 +19,9 @@ import javax.xml.transform.stream.StreamSource; import org.apache.commons.io.IOUtils; public abstract class AbstractXSLTest { + // Requires usage of Saxon as OAI-PMH uses some XSLT 2 functions private static final TransformerFactory factory = TransformerFactory - .newInstance(); + .newInstance("net.sf.saxon.TransformerFactoryImpl", null); protected TransformBuilder apply(String xslLocation) throws Exception { return new TransformBuilder(xslLocation);