From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 24 May 2023 06:59:20 +0000 (+0200)
Subject: Explicitly use Saxon instead of Xalan
X-Git-Tag: v2.3.14~1
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=f31f16f37622ebab4a4a82aa3090ffa5707c2448

Explicitly use Saxon instead of Xalan
---

diff --git a/org.argeo.app.core/src/org/argeo/app/docbook/Dbk4Converter.java b/org.argeo.app.core/src/org/argeo/app/docbook/Dbk4Converter.java
index d3957d9..f213c02 100644
--- a/org.argeo.app.core/src/org/argeo/app/docbook/Dbk4Converter.java
+++ b/org.argeo.app.core/src/org/argeo/app/docbook/Dbk4Converter.java
@@ -23,12 +23,14 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.xalan.processor.TransformerFactoryImpl;
 import org.argeo.jcr.JcrException;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
+import net.sf.saxon.BasicTransformerFactory;
+import net.sf.saxon.TransformerFactoryImpl;
+
 /** Convert from DocBook v4 to DocBook v5, using the official XSL. */
 public class Dbk4Converter {
 	private final Templates templates;
@@ -36,7 +38,8 @@ public class Dbk4Converter {
 	public Dbk4Converter() {
 		try (InputStream in = getClass().getResourceAsStream("db4-upgrade.xsl")) {
 			Source xsl = new StreamSource(in);
-			TransformerFactory transformerFactory = new TransformerFactoryImpl();
+			TransformerFactory transformerFactory = new BasicTransformerFactory();
+//			TransformerFactory transformerFactory = new TransformerFactoryImpl();
 			templates = transformerFactory.newTemplates(xsl);
 		} catch (IOException | TransformerConfigurationException e) {
 			throw new RuntimeException("Cannot initialise DocBook v4 converter", e);
diff --git a/org.argeo.app.servlet.publish/bnd.bnd b/org.argeo.app.servlet.publish/bnd.bnd
index 5535251..1e0191d 100644
--- a/org.argeo.app.servlet.publish/bnd.bnd
+++ b/org.argeo.app.servlet.publish/bnd.bnd
@@ -3,7 +3,6 @@ org.apache.xmlgraphics.image.loader,\
 org.osgi.service.http.context,\
 javax.jcr.nodetype,\
 org.osgi.framework,\
-org.apache.xml.serializer,\
 org.argeo.app.api,\
 org.argeo.cms.acr.xml,\
 javax.servlet.*;version="[3,5)",\