MCR-2966 move saxon compatible stylesheets to folder xslt

mycore-base/src/main/java/org/mycore/common/MCRMailer.java

@@ -516,7 +516,8 @@ public static Element sendMail(Document input, String stylesheet) throws Excepti
     private static Document transform(Document input, String stylesheet, Map<String, String> parameters)
         throws Exception {
         MCRJDOMContent source = new MCRJDOMContent(input);
-        MCRXSL2XMLTransformer transformer = MCRXSL2XMLTransformer.getInstance("xsl/" + stylesheet + ".xsl");
+        final String xslFolder = MCRConfiguration2.getStringOrThrow("MCR.Layout.Transformer.Factory.XSLFolder");
+        MCRXSL2XMLTransformer transformer = MCRXSL2XMLTransformer.getInstance(xslFolder + "/" + stylesheet + ".xsl");
         MCRParameterCollector parameterCollector = MCRParameterCollector.getInstanceFromUserSession();
         parameterCollector.setParameters(parameters);
         MCRContent result = transformer.transform(source, parameterCollector);

mycore-base/src/main/java/org/mycore/common/xml/MCRLayoutTransformerFactory.java

@@ -151,7 +151,8 @@ private String getResourceName(String id) {
      * Builds the filename of the stylesheet to use, e. g. "playlist-simple.xsl"
      */
     private String buildStylesheetName(String id) {
-        return String.format(Locale.ROOT, "xsl/%s.xsl", id.replaceAll("-default$", ""));
+        final String xslFolder = MCRConfiguration2.getStringOrThrow("MCR.Layout.Transformer.Factory.XSLFolder");
+        return String.format(Locale.ROOT, "%s/%s.xsl", xslFolder, id.replaceAll("-default$", ""));
     }
 
 }

mycore-base/src/main/java/org/mycore/common/xml/MCRURIResolver.java

@@ -57,6 +57,7 @@
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.xpath.XPathExpressionException;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.cache.HttpCacheContext;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -233,6 +234,7 @@ private HashMap<String, URIResolver> getResolverMapping() {
         supportedSchemes.put("catchEx", new MCRExceptionAsXMLResolver());
         supportedSchemes.put("notnull", new MCRNotNullResolver());
         supportedSchemes.put("xslStyle", new MCRXslStyleResolver());
+        supportedSchemes.put("xslStyleXEditor", new MCRXslStyleXEditorResolver());
         supportedSchemes.put("xslTransform", new MCRLayoutTransformerResolver());
         supportedSchemes.put("xslInclude", new MCRXslIncludeResolver());
         supportedSchemes.put("xslImport", new MCRXslImportResolver());
@@ -266,7 +268,8 @@ private HashMap<String, URIResolver> getResolverMapping() {
     static String getParentDirectoryResourceURI(String base) {
         if (base == null) {
             // the file was not included from another file, so we need to use the default resource directory
-            return "resource:xsl/";
+            final String xslFolder = MCRConfiguration2.getStringOrThrow("MCR.Layout.Transformer.Factory.XSLFolder");
+            return "resource:" + xslFolder + "/";
         } else {
             String resolvingBase = null;
 
@@ -370,7 +373,9 @@ private Source tryResolveXSL(String href, String base) throws TransformerExcepti
         }
 
         // new relative include did not work, now fall back to old behaviour and print a warning if it works
-        Source oldResolveMethodResult = SUPPORTED_SCHEMES.get("resource").resolve("resource:xsl/" + href, base);
+        final String xslFolder = MCRConfiguration2.getStringOrThrow("MCR.Layout.Transformer.Factory.XSLFolder");
+        Source oldResolveMethodResult = SUPPORTED_SCHEMES.get("resource")
+            .resolve("resource:" + xslFolder + "/" + href, base);
         if (oldResolveMethodResult != null) {
             LOGGER.warn("The Stylesheet {} has include {} which only works with an old absolute include " +
                 "mechanism. Please change the include to relative!", base, href);
@@ -1217,7 +1222,19 @@ public Source resolve(String href, String base) throws TransformerException {
             }
         }
 
-        private MCRXSLTransformer getTransformer(String... stylesheet) {
+        protected MCRXSLTransformer getTransformer(String... stylesheet) {
+            final String xslFolder = MCRConfiguration2.getStringOrThrow("MCR.Layout.Transformer.Factory.XSLFolder");
+            String[] stylesheets = new String[stylesheet.length];
+            for (int i = 0; i < stylesheets.length; i++) {
+                stylesheets[i] = xslFolder + "/" + stylesheet[i] + ".xsl";
+            }
+            return MCRXSLTransformer.getInstance(stylesheets);
+        }
+    }
+
+    private static class MCRXslStyleXEditorResolver extends MCRXslStyleResolver {
+        @Override
+        protected MCRXSLTransformer getTransformer(String... stylesheet) {
             String[] stylesheets = new String[stylesheet.length];
             for (int i = 0; i < stylesheets.length; i++) {
                 stylesheets[i] = "xsl/" + stylesheet[i] + ".xsl";
@@ -1329,10 +1346,12 @@ public Source resolve(String href, String base) {
                     .orElseGet(Collections::emptyList);
             }
 
+            final String xslFolder = MCRConfiguration2.getStringOrThrow("MCR.Layout.Transformer.Factory.XSLFolder");
             for (String include : propValue) {
                 // create a new include element
                 Element includeElement = new Element("include", xslNamespace);
-                includeElement.setAttribute("href", include.contains(":") ? include : "resource:xsl/" + include);
+                includeElement.setAttribute("href",
+                    include.contains(":") ? include : "resource:" + xslFolder + "/" + include);
                 root.addContent(includeElement);
                 LOGGER.debug("Resolved XSL include: {}", include);
             }
@@ -1357,7 +1376,30 @@ private static class MCRXslImportResolver implements URIResolver {
 
         @Override
         public Source resolve(String href, String base) throws TransformerException {
-            String importXSL = MCRXMLFunctions.nextImportStep(href.substring(href.indexOf(':') + 1));
+            final String baseURI = getParentDirectoryResourceURI(base);
+            // set xslt folder
+            final String xslFolder;
+            if (StringUtils.contains(baseURI, "/xsl/")) {
+                xslFolder = "xsl";
+            } else {
+                xslFolder = "xslt";
+            }
+
+            // check for old import format: xslImport:property:current.xsl and issue a warning
+            final String importXSL;
+            final String importPart = StringUtils.substringAfter(href, ":");
+            if (StringUtils.contains(importPart, ":")) {
+                final String propertyPart = StringUtils.substringBefore(importPart, ":");
+                LOGGER.warn("{} is in old import format change to xslImport:{}!", href, propertyPart);
+
+                importXSL = MCRXMLFunctions.nextImportStep(importPart);
+            } else {
+                final String selfName = StringUtils.substringAfter(baseURI, xslFolder + "/")
+                    + StringUtils.substringAfterLast(base, "/");
+
+                importXSL = MCRXMLFunctions.nextImportStep(importPart, selfName);
+            }
+
             if (importXSL.isEmpty()) {
                 LOGGER.debug("End of import queue: {}", href);
                 Namespace xslNamespace = Namespace.getNamespace("xsl", "http://www.w3.org/1999/XSL/Transform");
@@ -1366,7 +1408,8 @@ public Source resolve(String href, String base) throws TransformerException {
                 return new JDOMSource(root);
             }
             LOGGER.debug("xslImport importing {}", importXSL);
-            return fallback.resolve("resource:xsl/" + importXSL, base);
+
+            return fallback.resolve("resource:" + xslFolder + "/" + importXSL, base);
         }
     }
 

mycore-base/src/main/java/org/mycore/common/xml/MCRXMLFunctions.java

@@ -750,9 +750,21 @@ public static String nextImportStep(String includePart) {
             selfName = includePart.substring(border + 1);
             includePart = includePart.substring(0, border);
         }
+        return nextImportStep(includePart, selfName);
+    }
+
+    /**
+     * Helper function for xslImport URI resolver and {@link #hasNextImportStep(String)}
+     *
+     * @param includePart substring after xslImport:
+     * @param selfName    name of the current stylesheet
+     * @return the next stylesheet name to import
+     */
+    public static String nextImportStep(String includePart, String selfName) {
         if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("get next import step for {}", includePart);
+            LOGGER.debug("get next import step for {}:{}", includePart, selfName);
         }
+
         // get the parameters from mycore.properties
         List<String> importList = MCRConfiguration2.getString("MCR.URIResolver.xslImports." + includePart)
             .map(MCRConfiguration2::splitValue)
@@ -766,6 +778,9 @@ public static String nextImportStep(String includePart) {
             if (selfName == null && listIterator.hasPrevious()) {
                 return listIterator.previous();
             }
+            if (!importList.contains(selfName) && listIterator.hasPrevious()) {
+                return listIterator.previous();
+            }
 
             while (listIterator.hasPrevious()) {
                 String currentStylesheet = listIterator.previous();

mycore-base/src/main/java/org/mycore/common/xsl/MCRXSLInfoServlet.java

@@ -48,6 +48,7 @@
 import org.jdom2.filter.Filters;
 import org.jdom2.util.IteratorIterable;
 import org.mycore.common.MCRConstants;
+import org.mycore.common.config.MCRConfiguration2;
 import org.mycore.common.config.MCRConfigurationDir;
 import org.mycore.common.content.MCRJDOMContent;
 import org.mycore.common.xml.MCRURIResolver;
@@ -57,8 +58,8 @@
 
 /**
  * Lists all *.xsl stylesheets in the web application located in any 
- * WEB-INF/lib/*.jar or WEB-INF/classes/xsl/ or in {@link MCRConfigurationDir}, outputs the
- * dependencies (import/include) and contained templates.
+ * WEB-INF/lib/*.jar or WEB-INF/classes/[MCR.Layout.Transformer.Factory.XSLFolder]/ or in {@link MCRConfigurationDir},
+ * outputs the dependencies (import/include) and contained templates.
  * 
  * @author Frank Lützenkirchen
  */
@@ -69,6 +70,8 @@ public final class MCRXSLInfoServlet extends MCRServlet {
     private final Map<String, Stylesheet> stylesheets = new HashMap<>();
 
     private final Set<String> unknown = new HashSet<>();
+    private final String xslFolder =
+        MCRConfiguration2.getStringOrThrow("MCR.Layout.Transformer.Factory.XSLFolder") + "/";
 
     protected void doGetPost(MCRServletJob job) throws Exception {
         if ("true".equals(job.getRequest().getParameter("reload"))) {
@@ -202,7 +205,7 @@ private void findInJarInputStream(String pathOfJarFile, InputStream in) throws I
 
             for (ZipEntry ze = zis.getNextEntry(); ze != null; ze = zis.getNextEntry()) {
                 String name = ze.getName();
-                if (name.startsWith("xsl/") && name.endsWith(".xsl")) {
+                if (name.startsWith(xslFolder) && name.endsWith(".xsl")) {
                     foundStylesheet(name, pathOfJarFile);
                 }
                 zis.closeEntry();
@@ -211,7 +214,7 @@ private void findInJarInputStream(String pathOfJarFile, InputStream in) throws I
     }
 
     private void findXSLinClassesDir() {
-        String base = "/WEB-INF/classes/xsl/";
+        String base = "/WEB-INF/classes/" + xslFolder;
         for (String path : diveInto(base)) {
             if (path.endsWith(".xsl")) {
                 foundStylesheet(path, base);
@@ -220,7 +223,7 @@ private void findXSLinClassesDir() {
     }
 
     private void foundStylesheet(String path, String source) {
-        String file = path.substring(path.lastIndexOf("xsl/") + 4);
+        String file = path.substring(path.lastIndexOf(xslFolder) + 4);
         LOGGER.info("Found {} in {}", file, source);
         Stylesheet stylesheet = getStylesheet(file);
         if (source.startsWith("/WEB-INF/")) {
@@ -260,7 +263,7 @@ void inspect() {
         }
 
         private void resolveXSL() {
-            String uri = "resource:xsl/" + name;
+            String uri = "resource:" + xslFolder + name;
             resolveXSL(uri);
             if (xsl == null) {
                 resolveXSL(name);

mycore-base/src/main/java/org/mycore/frontend/cli/MCRCommandUtils.java

@@ -30,6 +30,7 @@
 import org.jdom2.Element;
 import org.jdom2.transform.JDOMSource;
 import org.mycore.common.MCRUsageException;
+import org.mycore.common.config.MCRConfiguration2;
 import org.mycore.common.xml.MCRURIResolver;
 import org.mycore.datamodel.common.MCRXMLMetadataManager;
 import org.mycore.datamodel.metadata.MCRMetadataManager;
@@ -167,7 +168,7 @@ public static Stream<String> getIdsFromIdToId(final String startId, final String
      *            the name of the style to be used when resolving the stylesheet.
      * @param defaultStyle
      *            the name of the default style, ending with <em>.xsl</em> to be used when resolving the stylesheet.
-     *            A corresponding file xsl/<em>defaultStyle</em> must exist.
+     *            A corresponding file [MCR.Layout.Transformer.Factory.XSLFolder]/<em>defaultStyle</em> must exist.
      * @param cache
      *            The transformer cache to be used.
      * @return the transformer
@@ -185,7 +186,8 @@ public static Transformer getTransformer(String style, String defaultStyle, Map<
         Element element = MCRURIResolver.instance().resolve("resource:" + xslFilePath);
         if (element == null) {
             LOGGER.warn("Couldn't find resource {} for style {}, using default.", xslFilePath, style);
-            xslFilePath = "xsl/" + defaultStyle;
+            final String xslFolder = MCRConfiguration2.getStringOrThrow("MCR.Layout.Transformer.Factory.XSLFolder");
+            xslFilePath = xslFolder + "/" + defaultStyle;
             element = MCRURIResolver.instance().resolve("resource:" + xslFilePath);
         }
 

mycore-base/src/main/resources/config/mycore.properties

@@ -91,6 +91,9 @@ MCR.BatchEditor.BaseLevel.object=/mycoreobject
 # Define the LayoutFactory class
 MCR.Layout.Transformer.Factory=org.mycore.common.xml.MCRLayoutTransformerFactory
 
+# Default folder for XSL files, switch to xsl for XSL1 applications
+MCR.Layout.Transformer.Factory.XSLFolder=xslt
+
 # The format of the session ID
 # MCR.Session.Param=;jsessionid=
 
@@ -470,7 +473,6 @@ MCR.Startup.Class=org.mycore.backend.jpa.MCRJPABootstrapper,org.mycore.datamodel
 MCR.Website.ReadAccessVerification=true
 
 MCR.URIResolver.xslIncludes.MyCoReWebPage=classificationBrowser.xsl
-MCR.URIResolver.xslIncludes.MyCoReWebPage-3=classificationBrowser-3.xsl
 MCR.URIResolver.xslIncludes.functions=functions/acl.xsl,functions/classification.xsl,functions/derivate.xsl,functions/i18n.xsl,functions/mcrversion.xsl,functions/property.xsl,functions/stringutils.xsl,functions/url.xsl,functions/layoututils.xsl
 
 ##############################################################################

mycore-base/src/main/resources/xsl/MyCoReWebPage-3.xsl → mycore-base/src/main/resources/xslt/MyCoReWebPage.xsl

@@ -12,8 +12,8 @@
 >
   &html-output;
 
-  <xsl:include href="MyCoReLayout-3.xsl" />
-  <xsl:include href="xslInclude:MyCoReWebPage-3" />
+  <xsl:include href="MyCoReLayout.xsl" />
+  <xsl:include href="xslInclude:MyCoReWebPage" />
   <!-- <xsl:include href="xslInclude:MyCoReWebPage" /> -->
 
   <xsl:variable name="PageID" select="/MyCoReWebPage/@id" />

mycore-base/src/test/java/org/mycore/common/xml/MCRURIResolverTest.java

@@ -1,13 +1,17 @@
 package org.mycore.common.xml;
 
+import org.apache.commons.lang3.StringUtils;
 import org.junit.Assert;
 import org.junit.Test;
+import org.mycore.common.MCRTestCase;
+import org.mycore.common.config.MCRConfiguration2;
 import org.mycore.common.config.MCRConfigurationDir;
 
+import javax.xml.transform.Source;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-public class MCRURIResolverTest {
+public class MCRURIResolverTest extends MCRTestCase {
 
     @Test
     public void testGetParentDirectoryResourceURI() {
@@ -36,4 +40,32 @@ public void testGetParentDirectoryResourceURI() {
             Assert.assertEquals(entry.getValue(), result);
         }
     }
+
+    @Test
+    public void testImportFromSameDirectory() throws Exception {
+        MCRConfiguration2.set("MCR.URIResolver.xslImports.xsl-import", "functions/xsl-1.xsl,functions/xsl-2.xsl");
+
+        Source resolved = MCRURIResolver.instance()
+            .resolve("xslImport:xsl-import:functions/xsl-2.xsl", "file:/tmp/xsl/functions/xsl-2.xsl");
+        Assert.assertNotNull(resolved);
+        Assert.assertTrue(StringUtils.endsWith(resolved.getSystemId(), "/xsl/functions/xsl-1.xsl"));
+
+        resolved = MCRURIResolver.instance()
+            .resolve("xslImport:xsl-import:functions/xsl-2.xsl", "file:/tmp/xslt/functions/xsl-2.xsl");
+        Assert.assertNotNull(resolved);
+        Assert.assertTrue(StringUtils.endsWith(resolved.getSystemId(), "/xslt/functions/xsl-1.xsl"));
+
+        // check with new import layout
+        resolved = MCRURIResolver.instance()
+            .resolve("xslImport:xsl-import", "file:/tmp/xslt/functions/xsl-2.xsl");
+        Assert.assertNotNull(resolved);
+        Assert.assertTrue(StringUtils.endsWith(resolved.getSystemId(), "/xslt/functions/xsl-1.xsl"));
+
+        // check with new import layout for calling xsl
+        resolved = MCRURIResolver.instance()
+            .resolve("xslImport:xsl-import", "file:/tmp/xslt/functions/xsl-parent.xsl");
+        Assert.assertNotNull(resolved);
+        Assert.assertTrue(StringUtils.endsWith(resolved.getSystemId(), "/xslt/functions/xsl-2.xsl"));
+
+    }
 }

mycore-base/src/test/java/org/mycore/common/xml/MCRXMLFunctionsTest.java

@@ -29,6 +29,7 @@
 
 import org.junit.Test;
 import org.mycore.common.MCRTestCase;
+import org.mycore.common.config.MCRConfiguration2;
 
 public class MCRXMLFunctionsTest extends MCRTestCase {
 
@@ -173,4 +174,20 @@ public void toNCNameSecondPart() {
         }
     }
 
+    @Test
+    public void testNextImportStep() {
+        MCRConfiguration2.set("MCR.URIResolver.xslImports.xsl-import", "functions/xsl-1.xsl,functions/xsl-2.xsl");
+
+        // test with old include part
+        String next = MCRXMLFunctions.nextImportStep("xsl-import:functions/xsl-2.xsl");
+        assertEquals("functions/xsl-1.xsl", next);
+
+        // test with new include part
+        next = MCRXMLFunctions.nextImportStep("xsl-import", "functions/xsl-2.xsl");
+        assertEquals("functions/xsl-1.xsl", next);
+
+        // test with new include part and self name not in list (i.e. using base template)
+        next = MCRXMLFunctions.nextImportStep("xsl-import", "xsl-parent.xsl");
+        assertEquals("functions/xsl-2.xsl", next);
+    }
 }

mycore-base/src/test/resources/xsl/functions/xsl-1.xsl

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <!-- test XSL file for MCRURIResolverTest#testImportFromSameDirectory -->
+  <xsl:import href="xslImport:xsl-import:xsl-1.xsl"/>
+</xsl:stylesheet>

mycore-base/src/test/resources/xsl/functions/xsl-2.xsl

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <!-- test XSL file for MCRURIResolverTest#testImportFromSameDirectory -->
+  <xsl:import href="xslImport:xsl-import:xsl-2.xsl"/>
+</xsl:stylesheet>

mycore-base/src/test/resources/xslt/functions/xsl-1.xsl

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <!-- test XSL file for MCRURIResolverTest#testImportFromSameDirectory -->
+  <xsl:import href="xslImport:xsl-import:xsl-1.xsl"/>
+</xsl:stylesheet>

mycore-base/src/test/resources/xslt/functions/xsl-2.xsl

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <!-- test XSL file for MCRURIResolverTest#testImportFromSameDirectory -->
+  <xsl:import href="xslImport:xsl-import:xsl-2.xsl"/>
+</xsl:stylesheet>