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 d3957d9a944e8e85abacdfcfdf17afbcaa2b7d78..f213c02d8efcb294b0f272983a52af6215458c0d 100644 (file)
--- 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 5535251861ba4f4e808e080d34a57a92ca2abbf5..1e0191d9cb6c695f79e4a876f796d049f6008efe 100644 (file)
--- 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)",\