MCR-2966 move saxon compatible stylesheets to folder xslt #1964

michael-becker · 2023-09-21T13:19:36Z

Link to jira.

The following changes were made:

moved all XSL3 stylesheets (ending with -3.xsl) to the xslt folder
created a new MCR configuration variable MCR.Layout.Transformer.Factory.XSLFolder=xslt
replaced "xsl/"+stylsesheet statements in code with the configuration variable
created a new URI resolver for XEditor templates: xslStyleXEditor and used this resolver in the xed
created new iview2-solr.xsl in xslt folder and added isFileSupported to MCRIview2URIResolver

move saxon xsls to xslt folder, add configuration variable for default xsl folder

add URI resolver for XEditor XSLs

add xsl to xslt folder

default to xsl3, remove -3 suffixes from configuration

fix class name for XEditor URI resolver

rsteph-de

Bei den Imports verzichten wir noch beim Pfadanfang auf "/xslt" bzw. "/xsl"?
Auch wenn dadurch Dinge "kaputt" gehen, würde ich das gerne vereinheitlichen.
Die "Magie" sollte noch raus. Außerdem können wir so besser erkennen, ob es sich um alte oder neue Stylesheets handelt.

rsteph-de · 2023-09-21T13:33:11Z

mycore-solr/src/main/resources/xslt/solr/indexing/mycoreobject-dynamicfields.xsl

@@ -5,9 +5,9 @@
  xmlns:fn="http://www.w3.org/2005/xpath-functions"
  xmlns:mcrsolr="http://www.mycore.de/xslt/solr">

-  <xsl:import href="xslImport:solr-document-3:solr/indexing/mycoreobject-dynamicfields-3.xsl" />
+  <xsl:import href="xslImport:solr-document:solr/indexing/mycoreobject-dynamicfields.xsl" />


I think, the path should also start with /xsl or /xslt to distinguish version 1 and version 3 XSL templates.
Or does that break to much existing code?

Currently, we cann not use resource:xslt/ in xslImport, since the respective URI resolver always adds a resource: on its own (https://github.com/MyCoRe-Org/mycore/blob/issues/MCR-2966-xslt-folder/mycore-base/src/main/java/org/mycore/common/xml/MCRURIResolver.java#L1400)

rsteph-de · 2023-09-21T13:33:26Z

mycore-solr/src/main/resources/components/solr/config/mycore.properties

-MCR.URIResolver.xslIncludes.xeditorTemplates=%MCR.URIResolver.xslIncludes.xeditorTemplates%,solr-xeditor-templates.xsl
-MCR.URIResolver.xslIncludes.xeditorTemplates-3=%MCR.URIResolver.xslIncludes.xeditorTemplates-3%,solr/xeditor/solr-xeditor-templates-3.xsl
+MCR.URIResolver.xslImports.solr-document=%MCR.URIResolver.xslImports.solr-document%,solr/indexing/mycoreobject-dynamicfields.xsl
+MCR.URIResolver.xslIncludes.xeditorTemplates=%MCR.URIResolver.xslIncludes.xeditorTemplates%,solr/xeditor/solr-xeditor-templates.xsl


I think, the path should also start with /xsl or /xslt to distinguish version 1 and version 3 XSL templates.
Or does that break to much existing code?

as abvoe: xlsImport does not allow for adding resource:xsl/ or /xslt/ in the beginning. I would suggest to adapt these references in a separate PR after we added this.

michael-becker · 2023-09-21T14:45:11Z

Bei den Imports verzichten wir noch beim Pfadanfang auf "/xslt" bzw. "/xsl"? Auch wenn dadurch Dinge "kaputt" gehen, würde ich das gerne vereinheitlichen. Die "Magie" sollte noch raus. Außerdem können wir so besser erkennen, ob es sich um alte oder neue Stylesheets handelt.

Ja wäre ich auch dafür. Das haben wir momentan noch raus gelassen, um den Umstieg etwas sanfter zu machen. Nehmen wir die vollständige Angabe mit resource:xslt/... müssen in allen Anwendungen, die 2023 und XSL1 verwenden, noch mehr an der Konfiguration angepasst werden als ohnehin schon - siehe die Mail, du warst zu schnell ;)

use folder from configuration, use full resource statement for xeditor XSL

process new xslImport mechanism

sebhofmann · 2023-09-26T15:41:22Z

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

+            final String baseURI = getParentDirectoryResourceURI(base);
+            // set xslt folder
+            final String xslFolder;
+            if (StringUtils.contains(baseURI, "/xsl/")) {


baseURI.startswith would work more secure

If I understand this correctly, getParentDirectoryResourceURI always returns a string starting with resource (https://github.com/MyCoRe-Org/mycore/blob/2022.06.x/mycore-base/src/main/java/org/mycore/common/xml/MCRURIResolver.java#L293)
e.g.:
base: jar:file:/home/musiclpz/production/build/webapps/WEB-INF/lib/mycore-solr-2023.08-SNAPSHOT.jar!/xslt/solr/indexing/mycoreobject-dynamicfields.xsl
baseuri: resource:xslt/solr/indexing/

so startsWith resource:xsl/ should be feasible.

However, in some edge cases getParentDirectoryResourceURI returns the given base. In these cases, this would not work. But I am not totally aware if in these cases something else goes wrong. If we can ignore these edge cases, we can test on startsWith resource:xsl/

If I understand this correctly, getParentDirectoryResourceURI always returns a string starting with resource (https://github.com/MyCoRe-Org/mycore/blob/2022.06.x/mycore-base/src/main/java/org/mycore/common/xml/MCRURIResolver.java#L293)
e.g.:
base: jar:file:/home/musiclpz/production/build/webapps/WEB-INF/lib/mycore-solr-2023.08-SNAPSHOT.jar!/xslt/solr/indexing/mycoreobject-dynamicfields.xsl
baseuri: resource:xslt/solr/indexing/

Yes you are right.

However, in some edge cases getParentDirectoryResourceURI returns the given base. In these cases, this would not work. But I am not totally aware if in these cases something else goes wrong. If we can ignore these edge cases, we can test on startsWith resource:xsl/

I think in the edge cases the property should be used. So check for startsWith resource:xsl/ or resource:xslt/ and if both false than use the property.

Changed to startsWith resource:xsl/ / resource:xslt/

I had to rollback the changes in nextImportStep, since it produced errors when using the proposed new xslImport syntax (without selfname). This resulted in errors because xsl:import href="xslImport:xxx" was included more than once and ultimately failed with a stylesheet including itself. I was not able to fix this and, thus. would suggest to postpone the syntax change to a later point.

sebhofmann · 2023-09-26T15:45:17Z

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

+
+                importXSL = MCRXMLFunctions.nextImportStep(importPart);
+            } else {
+                final String selfName = StringUtils.substringAfter(baseURI, xslFolder + "/")


maybe more secure to use baseURI.substring(xslFolder.length+1)

use startsWith for evaluating folder, fallback via configuration; reverse xmlfunctions:nextImportStep

remove test for new xslimport mechanism

michael-becker · 2023-10-04T12:10:41Z

Falls weiterhin XSLT-1 verwendet werden soll, sind folgende Anpassungen an der Konfiguration vorzunehmen:

Für alle Anwendungen
- MCR.Layout.Transformer.Factory.XSLFolder=xsl
- MCR.LayoutService.TransformerFactoryClass=org.apache.xalan.processor.TransformerFactoryImpl
Anwendungen, die mycore-solr nutzen
- MCR.URIResolver.xslImports.solr-document=solr-basetemplate.xsl
- MCR.URIResolver.xslImports.solr-document=%MCR.URIResolver.xslImports.solr-document%,mycoreobject-dynamicfields.xsl
- MCR.URIResolver.xslIncludes.components=%MCR.URIResolver.xslIncludes.components%,solr-layout-utils.xsl
- MCR.ContentTransformer.response.TransformerFactoryClass=org.apache.xalan.processor.TransformerFactoryImpl
- MCR.ContentTransformer.response.Stylesheet=%MCR.ContentTransformer.response-prepared.Stylesheet%,xsl/response.xsl
- MCR.ContentTransformer.response-browse.Stylesheet=xsl/response-browse.xsl
- MCR.ContentTransformer.mycoreobject-solrdocument.Class=org.mycore.common.content.transformer.MCRXSL2JAXBTransformer
- MCR.ContentTransformer.mycoreobject-solrdocument.TransformerFactoryClass=org.apache.xalan.processor.TransformerFactoryImpl
- MCR.ContentTransformer.mycoreobject-solrdocument.Stylesheet=xsl/mycoreobject-solrdocument.xsl
- MCR.ContentTransformer.mycoreobject-solrdocument.Context=org.mycore.solr.index.document.jaxb
- MCR.ContentTransformer.response-solrdocument.Class=org.mycore.common.content.transformer.MCRXSL2JAXBTransformer
- MCR.ContentTransformer.response-solrdocument.TransformerFactoryClass=org.apache.xalan.processor.TransformerFactoryImpl
- MCR.ContentTransformer.response-solrdocument.Stylesheet=xsl/response2batch.xsl,%MCR.ContentTransformer.mycoreobject-solrdocument.Stylesheet%
- MCR.ContentTransformer.response-solrdocument.Context=%MCR.ContentTransformer.mycoreobject-solrdocument.Context%
- MCR.ContentTransformer.response-prepared.Class=org.mycore.common.content.transformer.MCRXSLTransformer
- MCR.ContentTransformer.response-prepared.TransformerFactoryClass=org.apache.xalan.processor.TransformerFactoryImpl
- MCR.ContentTransformer.response-prepared.Stylesheet=xsl/response-join-results.xsl,xsl/response-addDocId.xsl,xsl/response-addDerivates.xsl
- MCR.URIResolver.xslIncludes.xeditorTemplates=solr-xeditor-templates.xsl
Anwendungen, die mycore-mods nutzen
- MCR.URIResolver.xslImports.solr-document=%MCR.URIResolver.xslImports.solr-document%,mods-solr.xsl

Anwendungen, die schon auf XSLT3 umgestellt sind, brauchen folgende Einträge:

MCR.LayoutService.TransformerFactoryClass=net.sf.saxon.TransformerFactoryImpl
MCR.URIResolver.xslIncludes.xeditorTemplates=resource:xsl/solr-xeditor-templates.xsl

…folder

move saxon xsls to xslt folder, add configuration variable for default xsl folder

add URI resolver for XEditor XSLs

add xsl to xslt folder

default to xsl3, remove -3 suffixes from configuration

fix class name for XEditor URI resolver

use folder from configuration, use full resource statement for xeditor XSL

process new xslImport mechanism

use startsWith for evaluating folder, fallback via configuration; reverse xmlfunctions:nextImportStep

remove test for new xslimport mechanism

…o issues/MCR-2966-xslt-folder

…folder # Conflicts: # mycore-base/src/test/java/org/mycore/common/xml/MCRURIResolverTest.java

fix code style

add response-browse content transformer for XSLT3

…folder

remove duplicate parameter from msie-warnings.xsl

…folder

yagee-de

Works with MIR branch MyCoRe-Org/mir#913

…omment)

@uri

* 2023.06.x: MCR-2647 hibernate 6 jpa 3.1 (#1587) MCR-2959 fix property guid xslt directory MCR-2964 [jobqueue] update yarn dependencies MCR-2966 move saxon compatible stylesheets to folder xslt (#1964) MCR-2990 Added support of <xinclude @uri="..."/> element. (#1988) MCR-2993 Fixed NullPointerException MCR-2995 always return Source with systemId (#1995) MCR-2998 add save-xsl to xslt folder (#1997) MCR-3000 fix exception in MCRACLResolver on factbased access system (#2000) MCR-3002 Fix Javadoc for log4j2 (#2008) MCR-2995 always return Source with systemId (#1995) MCR-3002 fix log4j2 javadoc URL MCR-3003 jobs in queue do not trigger onCommitTasks Revert "MCR-3002 fix log4j2 javadoc URL"

…omment)

* UBO-283 Set mycore version to 2022.06.3-SNAPSHOT * UBO-283 Fixed compile errors * UBO-283 Removed deprecated api invocation * UBO-283 Replaced deprecated StringUtils.getLevenshteinDistance() with LevenshteinDistance.getDefaultInstance().apply(normalizeTitle(titleFromAleph), normalizeTitle(titleFromBibEntry)).intValue() * UBO-283 Moved basket2solradd.xsl and solr2csv.xsl to /xslt. Set TransformerFactoryClass for xslt 1 stylesheets * UBO-283 Include variable $User-Agent in html-layout.xsl to avoid blank landing page * UBO-283 Added configuration as mentioned in MyCoRe-Org/mycore#1964 (comment) * UBO-283 Added mapping files in persistence.xml * UBO-283 Curly braces must now be encoded in json.facet * UBO-283 Improved readability of added properties * UBO-291 Use h2 for testing * UBO-291 Set mycore version to 2023.06.1-SNAPSHOT * UBO-291 Sort poms * UBO-291 Added sort pom plugin * UBO-291 Removed property "<property name="hibernate.dialect" value=" org.hibernate.dialect.H2Dialect"/>" from persistence.xml * UBO-291 Fixed persistence.xml * UBO-291 Set mycore version to 2023.06.2-SNAPSHOT * UBO-283 Fixed compile error and sort pom.xml * UBO-283 Migrated to MCRJobQueue to MCRJobQueueManager * UBO-283 Set mycore version to 2023.06.03-SNAPSHOT * UBO-283 Updated ImportListJobAction to mycore version 2023.06.x * UBO-283 delete obsolete language classification, update versions and installation documentation --------- Co-authored-by: Kathleen Neumann <[email protected]>

Michael Becker added 4 commits September 18, 2023 18:51

MCR-2966 xslt folder

6aef2a6

move saxon xsls to xslt folder, add configuration variable for default xsl folder

MCR-2966 xslt folder

8647253

add URI resolver for XEditor XSLs

MCR-2966 xslt folder

847a36a

add xsl to xslt folder

MCR-2966 xslt folder

216fbad

default to xsl3, remove -3 suffixes from configuration

michael-becker requested review from sebhofmann and rsteph-de September 21, 2023 13:20

MCR-2966 xslt folder

4c42163

fix class name for XEditor URI resolver

rsteph-de requested changes Sep 21, 2023

View reviewed changes

toKrause changed the title ~~mcr-2966 move saxon compatible stylesheets to folder xslt~~ MCR-2966 move saxon compatible stylesheets to folder xslt Sep 21, 2023

Michael Becker added 2 commits September 26, 2023 09:18

MCR-2966 xslt folder

ad1d02e

use folder from configuration, use full resource statement for xeditor XSL

MCR-2966 xslt folder

28603e1

process new xslImport mechanism

sebhofmann reviewed Sep 26, 2023

View reviewed changes

Michael Becker added 2 commits September 28, 2023 15:20

MCR-2966 xslt folder

0ff95fa

use startsWith for evaluating folder, fallback via configuration; reverse xmlfunctions:nextImportStep

MCR-2966 xslt folder

3e5389a

remove test for new xslimport mechanism

michael-becker marked this pull request as ready for review September 29, 2023 09:08

Michael Becker added 13 commits October 4, 2023 15:53

Merge remote-tracking branch 'origin/main' into issues/MCR-2966-xslt-…

79f37ba

…folder

MCR-2966 xslt folder

85fdc2d

move saxon xsls to xslt folder, add configuration variable for default xsl folder

MCR-2966 xslt folder

27999f6

add URI resolver for XEditor XSLs

MCR-2966 xslt folder

c90f88b

add xsl to xslt folder

MCR-2966 xslt folder

0473146

default to xsl3, remove -3 suffixes from configuration

MCR-2966 xslt folder

9fc32c5

fix class name for XEditor URI resolver

MCR-2966 xslt folder

1560f3e

use folder from configuration, use full resource statement for xeditor XSL

MCR-2966 xslt folder

6c97723

process new xslImport mechanism

MCR-2966 xslt folder

d579af3

use startsWith for evaluating folder, fallback via configuration; reverse xmlfunctions:nextImportStep

MCR-2966 xslt folder

c05e7c4

remove test for new xslimport mechanism

Merge remote-tracking branch 'origin/issues/MCR-2966-xslt-folder' int…

49ad890

…o issues/MCR-2966-xslt-folder

Merge remote-tracking branch 'origin/main' into issues/MCR-2966-xslt-…

ffe1dbf

…folder # Conflicts: # mycore-base/src/test/java/org/mycore/common/xml/MCRURIResolverTest.java

MCR-2966 xslt folder

42b4bab

fix code style

Michael Becker added 5 commits October 13, 2023 11:03

MCR-2966 xslt folder

9127faf

add response-browse content transformer for XSLT3

Merge remote-tracking branch 'origin/main' into issues/MCR-2966-xslt-…

e9b3e0e

…folder

Merge remote-tracking branch 'origin/main' into issues/MCR-2966-xslt-…

1eafc4a

…folder

MCR-2966 xslt folder

fb8c445

remove duplicate parameter from msie-warnings.xsl

Merge remote-tracking branch 'origin/main' into issues/MCR-2966-xslt-…

12346d8

…folder

yagee-de mentioned this pull request Oct 30, 2023

MCR-2966 move Saxon ready stylesheets to /xslt MyCoRe-Org/mir#913

Merged

yagee-de approved these changes Nov 1, 2023

View reviewed changes

yagee-de changed the base branch from main to 2023.06.x November 3, 2023 09:25

yagee-de merged commit d797e1a into 2023.06.x Nov 3, 2023
3 checks passed

yagee-de deleted the issues/MCR-2966-xslt-folder branch November 3, 2023 14:12

Possommi added a commit to MyCoRe-Org/ubo that referenced this pull request Nov 16, 2023

UBO-283 Added configuration as mentioned in MyCoRe-Org/mycore#1964 (c…

1f21670

…omment)

Possommi added a commit to MyCoRe-Org/ubo that referenced this pull request Nov 16, 2023

UBO-283 Added configuration as mentioned in MyCoRe-Org/mycore#1964 (c…

840686d

…omment)

Possommi added a commit to MyCoRe-Org/ubo that referenced this pull request Nov 16, 2023

UBO-283 Added configuration as mentioned in MyCoRe-Org/mycore#1964 (c…

796ec53

…omment)

Possommi added a commit to MyCoRe-Org/ubo that referenced this pull request Nov 16, 2023

UBO-283 Added configuration as mentioned in MyCoRe-Org/mycore#1964 (c…

5e1fc23

…omment)

Possommi added a commit to MyCoRe-Org/ubo that referenced this pull request Jan 3, 2024

UBO-283 Added configuration as mentioned in MyCoRe-Org/mycore#1964 (c…

ca6093c

…omment)

Possommi added a commit to MyCoRe-Org/ubo that referenced this pull request Jan 10, 2024

UBO-283 Added configuration as mentioned in MyCoRe-Org/mycore#1964 (c…

6c4df5a

…omment)

Possommi added a commit to MyCoRe-Org/ubo that referenced this pull request Feb 5, 2024

UBO-283 Added configuration as mentioned in MyCoRe-Org/mycore#1964 (c…

b9ec492

…omment)

Possommi added a commit to MyCoRe-Org/ubo that referenced this pull request Mar 5, 2024

UBO-283 Added configuration as mentioned in MyCoRe-Org/mycore#1964 (c…

c9278af

…omment)

Possommi added a commit to MyCoRe-Org/ubo that referenced this pull request Mar 13, 2024

UBO-283 Added configuration as mentioned in MyCoRe-Org/mycore#1964 (c…

451049c

…omment)

Possommi added a commit to MyCoRe-Org/ubo that referenced this pull request Apr 5, 2024

UBO-283 Added configuration as mentioned in MyCoRe-Org/mycore#1964 (c…

7af5bc0

…omment)

Possommi added a commit to MyCoRe-Org/ubo that referenced this pull request Apr 22, 2024

UBO-283 Added configuration as mentioned in MyCoRe-Org/mycore#1964 (c…

a124b40

…omment)

Possommi added a commit to MyCoRe-Org/ubo that referenced this pull request May 29, 2024

UBO-283 Added configuration as mentioned in MyCoRe-Org/mycore#1964 (c…

1d5d06d

…omment)

Possommi added a commit to MyCoRe-Org/ubo that referenced this pull request Jun 6, 2024

UBO-283 Added configuration as mentioned in MyCoRe-Org/mycore#1964 (c…

9e5ed30

…omment)

Possommi added a commit to MyCoRe-Org/ubo that referenced this pull request Jun 21, 2024

UBO-283 Added configuration as mentioned in MyCoRe-Org/mycore#1964 (c…

1a8dce5

…omment)

Possommi added a commit to MyCoRe-Org/ubo that referenced this pull request Jul 9, 2024

UBO-283 Added configuration as mentioned in MyCoRe-Org/mycore#1964 (c…

c5b39c2

…omment)

Possommi added a commit to MyCoRe-Org/ubo that referenced this pull request Jul 17, 2024

UBO-283 Added configuration as mentioned in MyCoRe-Org/mycore#1964 (c…

dea49e3

…omment)

Possommi added a commit to MyCoRe-Org/ubo that referenced this pull request Jul 29, 2024

UBO-283 Added configuration as mentioned in MyCoRe-Org/mycore#1964 (c…

ea1da14

…omment)

Possommi added a commit to MyCoRe-Org/ubo that referenced this pull request Aug 14, 2024

UBO-283 Added configuration as mentioned in MyCoRe-Org/mycore#1964 (c…

d18e633

…omment)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MCR-2966 move saxon compatible stylesheets to folder xslt #1964

MCR-2966 move saxon compatible stylesheets to folder xslt #1964

michael-becker commented Sep 21, 2023

rsteph-de left a comment

rsteph-de Sep 21, 2023 •

edited

Loading

michael-becker Sep 29, 2023 •

edited

Loading

rsteph-de Sep 21, 2023 •

edited

Loading

michael-becker Sep 29, 2023

michael-becker commented Sep 21, 2023

sebhofmann Sep 26, 2023

michael-becker Sep 27, 2023

sebhofmann Sep 27, 2023

michael-becker Sep 28, 2023

sebhofmann Sep 26, 2023

michael-becker commented Oct 4, 2023 •

edited

Loading

yagee-de left a comment

MCR-2966 move saxon compatible stylesheets to folder xslt #1964

MCR-2966 move saxon compatible stylesheets to folder xslt #1964

Conversation

michael-becker commented Sep 21, 2023

rsteph-de left a comment

Choose a reason for hiding this comment

rsteph-de Sep 21, 2023 • edited Loading

Choose a reason for hiding this comment

michael-becker Sep 29, 2023 • edited Loading

Choose a reason for hiding this comment

rsteph-de Sep 21, 2023 • edited Loading

Choose a reason for hiding this comment

michael-becker Sep 29, 2023

Choose a reason for hiding this comment

michael-becker commented Sep 21, 2023

sebhofmann Sep 26, 2023

Choose a reason for hiding this comment

michael-becker Sep 27, 2023

Choose a reason for hiding this comment

sebhofmann Sep 27, 2023

Choose a reason for hiding this comment

michael-becker Sep 28, 2023

Choose a reason for hiding this comment

sebhofmann Sep 26, 2023

Choose a reason for hiding this comment

michael-becker commented Oct 4, 2023 • edited Loading

yagee-de left a comment

Choose a reason for hiding this comment

rsteph-de Sep 21, 2023 •

edited

Loading

michael-becker Sep 29, 2023 •

edited

Loading

rsteph-de Sep 21, 2023 •

edited

Loading

michael-becker commented Oct 4, 2023 •

edited

Loading