From 63dd9536cab7c1d10baea11c2b35ce9ea3ca06f0 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Tue, 13 Dec 2022 07:34:22 +0100
Subject: [PATCH 1/2] WW-5264 Removes XSLTResult from struts-default.xml as it
 was moved into plugin

---
 core/src/main/resources/struts-default.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 3aa0c6105..aec2e0278 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -38,7 +38,6 @@
             <result-type name="redirect" class="org.apache.struts2.result.ServletRedirectResult"/>
             <result-type name="redirectAction" class="org.apache.struts2.result.ServletActionRedirectResult"/>
             <result-type name="stream" class="org.apache.struts2.result.StreamResult"/>
-            <result-type name="xslt" class="org.apache.struts2.result.xslt.XSLTResult"/>
             <result-type name="plainText" class="org.apache.struts2.result.PlainTextResult"/>
             <result-type name="postback" class="org.apache.struts2.result.PostbackResult"/>
         </result-types>

From d11cf771b64bd1350d1e181a917b6beb106d0f6b Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Tue, 13 Dec 2022 07:43:10 +0100
Subject: [PATCH 2/2] WW-5264 Uses proper parent package when testing XSLT
 result

---
 apps/showcase/src/main/resources/struts-xslt.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/showcase/src/main/resources/struts-xslt.xml b/apps/showcase/src/main/resources/struts-xslt.xml
index 261b367e4..663e84e93 100644
--- a/apps/showcase/src/main/resources/struts-xslt.xml
+++ b/apps/showcase/src/main/resources/struts-xslt.xml
@@ -20,11 +20,11 @@
  */
 -->
 <!DOCTYPE struts PUBLIC
-	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"https://struts.apache.org/dtds/struts-2.5.dtd">
+        "-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
+        "https://struts.apache.org/dtds/struts-6.0.dtd">
 
 <struts>
-    <package name="xslt" extends="struts-default" namespace="/xslt">
+    <package name="xslt" extends="xslt-default" namespace="/xslt">
         <default-action-ref name="index"/>
 
         <action name="index">