WW-5668 Make the localized-text provider caches size-bounded and align request-locale resolution (6.x) (#1823)

* WW-5668 Add remove(key) to the OgnlCache abstraction

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* WW-5668 Bound the localized-text provider caches with configurable size

Converts bundlesMap, messageFormats and missingBundles to the existing
OgnlCache abstraction, configurable via struts.i18n.cacheType and
struts.i18n.cacheMaxSize (wtlfu / 10000 by default). The caches are kept
transient and rebuilt in readObject so the providers stay serializable,
and bundlesMap-related synchronization moves to a dedicated monitor since
the field is now reassignable.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* WW-5668 Add opt-in request-locale resolution consistency to Dispatcher

Adds struts.locale.validateRequestLocale (default false) so request-derived
locales can be restricted to the JVM's available-locale set, matching what
I18nInterceptor already applies to its own locale sources.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* WW-5668 Keep the localized-text providers deserializable across a version upgrade

Pins serialVersionUID to the value implicitly computed for the pre-6.11.0 class
shape instead of 1L, so a session serialized by a 6.10.0 node still loads on a
6.11.0 one during a rolling upgrade rather than failing with InvalidClassException.

Such a stream carries no value for the new cache settings, and field initialisers
do not run during deserialization, so readObject restores their defaults before
rebuilding the caches - without that guard it failed with a NullPointerException.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5 <noreply@anthropic.com>

.asf.yaml

@@ -11,12 +11,33 @@ notifications:
   jira_options: link label worklog
 
 github:
+  description: "Apache Struts is a free, open-source, MVC framework for creating elegant, modern Java web applications"
+  homepage: https://struts.apache.org/
   del_branch_on_merge: true
   protected_branches:
-    master:
+    main:
       # contexts are the names of checks that must pass.
-      contexts:
-        - build
+      required_status_checks:
+        contexts:
+          - "Build and Test (JDK 17)"
+      required_pull_request_reviews:
+        # it does not work because our github teams are private/secret, see INFRA-25666
+        require_code_owner_reviews: false
+        required_approving_review_count: 0
+    support/struts-6-x-x:
+      # contexts are the names of checks that must pass.
+      required_status_checks:
+        contexts:
+          - "Build and Test (8)"
+      required_pull_request_reviews:
+        # it does not work because our github teams are private/secret, see INFRA-25666
+        require_code_owner_reviews: false
+        required_approving_review_count: 0
+    release/struts-6-*:
+      # contexts are the names of checks that must pass.
+      required_status_checks:
+        contexts:
+          - "Build and Test (8)"
       required_pull_request_reviews:
         # it does not work because our github teams are private/secret, see INFRA-25666
         require_code_owner_reviews: false

.github/workflows/codeql.yml

@@ -18,8 +18,8 @@ name: "CodeQL"
 on:
   push:
     branches:
-      - master
-      - release/struts-7-0-x
+      - 'support/struts-6-x-x'
+      - 'release/*'
   pull_request:
 
 permissions:
@@ -43,21 +43,21 @@ jobs:
       matrix:
         language: [ 'java' ]
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-    - name: Setup Java JDK
-      uses: actions/setup-java@v3
-      with:
-        distribution: temurin
-        java-version: 17
-        cache: 'maven'
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3.27.0
-      with:
-        languages: ${{ matrix.language }}
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v3.27.0
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3.27.0
-      with:
-        category: "/language:${{matrix.language}}"
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Setup Java JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 17
+          cache: 'maven'
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3.28.8
+        with:
+          languages: ${{ matrix.language }}
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v3.28.8
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3.28.8
+        with:
+          category: "/language:${{matrix.language}}"

.github/workflows/maven.yml

@@ -19,8 +19,8 @@ on:
   pull_request:
   push:
     branches:
-      - master
-      - release/struts-7-0-x
+      - 'support/struts-6-x-x'
+      - 'release/*'
 
 permissions: read-all
 
@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '17', '21' ]
+        java: [ '8', '11', '17', '21' ]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

.github/workflows/scorecards-analysis.yaml

@@ -21,7 +21,7 @@ on:
     - cron: "30 1 * * 6"    # Weekly on Saturdays
   push:
     branches:
-      - master
+      - 'main' # only default branch is supported
 
 permissions: read-all
 
@@ -65,6 +65,6 @@ jobs:
           retention-days: 5
 
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@3aa71356c75a8edd8430d54dff2982203a28be45    # 2.22.11
+        uses: github/codeql-action/upload-sarif@acb9cb18eec7e3a113ef83cff0be91e75cfd9526    # 2.22.11
         with:
           sarif_file: results.sarif

.github/workflows/sonar.yml

@@ -19,8 +19,8 @@ on:
   pull_request:
   push:
     branches:
-      - master
-      - release/struts-7-0-x
+      - 'support/struts-6-x-x'
+      - 'release/*'
 
 permissions: read-all
 
@@ -32,12 +32,12 @@ jobs:
   sonarcloud:
     name: Scan
     runs-on: ubuntu-latest
-    if: ${{ !github.event.pull_request.head.repo.fork }}
+    if: ${{ !github.event.pull_request.base.repo.fork && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 17
@@ -45,4 +45,4 @@ jobs:
       - env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
-        run: mvn -B -V -Pcoverage -DskipAssembly verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar --no-transfer-progress
+        run: ./mvnw -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pcoverage -DskipAssembly

.gitignore

@@ -1,5 +1,5 @@
 # IDEA
-.idea
+.idea/
 *.iml
 *.ipr
 *.iws
@@ -38,11 +38,17 @@ buildNumber.properties
 .mvn/timing.properties
 .mvn/wrapper/maven-wrapper.jar
 
-plugins/testng/test-output
-test-output
+plugins/testng/test-output/
+test-output/
 
 # Sonar
-/.sonar/
+.sonar/
 
 # Tidelift CLI scanner
 .tidelift
+
+# Claude Code specific local settings
+.claude/
+.metals/
+.bloop/
+.vscode/

CLAUDE.md

@@ -0,0 +1,37 @@
+# CLAUDE.md
+
+## Build Commands
+
+```bash
+# Build without tests (fastest)
+./mvnw clean install -DskipTests -DskipAssembly
+
+# Test a single module
+./mvnw -pl core clean test
+./mvnw -pl plugins/spring clean test
+
+# Full build with tests
+./mvnw clean install
+
+# Integration tests
+./mvnw clean verify -DskipAssembly
+
+# Coverage report
+./mvnw clean verify -Pcoverage -DskipAssembly
+```
+
+## Project-Specific Rules
+
+- This is the **6.x.x** branch (`release/struts-6-8-x`).
+- Uses **javax.servlet** (Java EE), not Jakarta EE. Verify imports use `javax.servlet` namespace.
+- Test pattern: `**/*Test.java`. Test classes use JUnit 4 with `@Test` annotations.
+- OGNL expressions have strict security via `SecurityMemberAccess` — test any new OGNL usage against the security sandbox.
+- Each plugin has its own `struts-plugin.xml` descriptor — register new beans there, not in core config.
+- Run `./mvnw clean prepare-package` before committing to verify Apache RAT license headers pass.
+
+## Module Layout
+
+- `core/` — framework core
+- `plugins/` — 20+ plugin modules (spring, json, tiles, velocity, etc.)
+- `apps/showcase/` — feature demo app
+- `apps/rest-showcase/` — REST examples

Jenkinsfile

@@ -1,4 +1,22 @@
 #!groovy
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 pipeline {
   agent none
@@ -69,7 +87,7 @@ pipeline {
       stages {
         stage('Test & Coverage') {
           steps {
-            sh './mvnw -B verify -Pcoverage -DskipAssembly --no-transfer-progress'
+            sh './mvnw -B verify -Pcoverage -DskipAssembly'
           }
           post {
             always {
@@ -81,49 +99,77 @@ pipeline {
         stage('Code Quality') {
           when {
             anyOf {
-              branch 'master'; branch 'release/struts-7-0-x'
+              branch 'support/struts-6-x-x'
             }
           }
           steps {
             withCredentials([string(credentialsId: 'asf-struts-sonarcloud', variable: 'SONARCLOUD_TOKEN')]) {
-              sh './mvnw -B -Pcoverage -DskipAssembly -Dsonar.login=${SONARCLOUD_TOKEN} verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar --no-transfer-progress'
+              sh './mvnw -B -Pcoverage -DskipAssembly -Dsonar.login=${SONARCLOUD_TOKEN} verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar'
+            }
+          }
+        }
+      }
+      post {
+        always {
+          cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**', type: 'INCLUDE']]
+        }
+      }
+    }
+    stage('JDK 8') {
+      agent {
+        label 'ubuntu'
+      }
+      tools {
+        jdk 'jdk_1.8_latest'
+        maven 'maven_3_latest'
+      }
+      environment {
+        MAVEN_OPTS = "-Xmx1024m"
+      }
+      stages {
+        stage('Build') {
+          steps {
+            sh './mvnw -B clean install -DskipTests -DskipAssembly'
+          }
+        }
+        stage('Test') {
+          steps {
+            sh './mvnw -B verify -DskipAssembly'
+          }
+          post {
+            always {
+              junit(testResults: '**/surefire-reports/*.xml', allowEmptyResults: true)
+              junit(testResults: '**/failsafe-reports/*.xml', allowEmptyResults: true)
             }
           }
         }
         stage('Build Source & JavaDoc') {
           when {
-            anyOf {
-              branch 'master'; branch 'release/struts-7-0-x'
-            }
+            branch 'support/struts-x-x-x'
           }
           steps {
             dir("local-snapshots-dir/") {
               deleteDir()
             }
-            sh './mvnw -B source:jar javadoc:jar -DskipTests -DskipAssembly --no-transfer-progress'
+            sh './mvnw -B source:jar javadoc:jar -DskipTests -DskipAssembly'
           }
         }
         stage('Deploy Snapshot') {
           when {
-            anyOf {
-              branch 'master'; branch 'release/struts-7-0-x'
-            }
+            branch 'support/struts-6-x-x'
           }
           steps {
             withCredentials([file(credentialsId: 'lukaszlenart-repository-access-token', variable: 'CUSTOM_SETTINGS')]) {
-              sh './mvnw -s \${CUSTOM_SETTINGS} deploy -DskipTests -DskipAssembly --no-transfer-progress'
+              sh './mvnw -s \${CUSTOM_SETTINGS} deploy -DskipTests -DskipAssembly'
             }
           }
         }
         stage('Upload nightlies') {
           when {
-            anyOf {
-              branch 'master'
-              branch 'release/struts-7-0-x'
-            }
+            branch 'support/struts-6-x-x'
           }
           steps {
-            sh './mvnw -B package -DskipTests --no-transfer-progress'
+            sh './mvnw -B package -DskipTests'
             sshPublisher(publishers: [
                 sshPublisherDesc(
                     configName: 'Nightlies',

apps/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>7.0.0-M10</version>
+        <version>6.11.0-SNAPSHOT</version>
     </parent>
     <artifactId>struts2-apps</artifactId>
     <packaging>pom</packaging>

apps/rest-showcase/pom.xml

@@ -24,12 +24,12 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>7.0.0-M10</version>
+        <version>6.11.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-rest-showcase</artifactId>
     <packaging>war</packaging>
-    <version>7.0.0-M10</version>
+    <version>6.11.0-SNAPSHOT</version>
     <name>Struts 2 Rest Showcase Webapp</name>
     <description>Struts 2 Rest Showcase Example</description>
 
@@ -76,7 +76,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.htmlunit</groupId>
+            <groupId>net.sourceforge.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
             <scope>test</scope>
         </dependency>
@@ -107,7 +107,7 @@
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>11.0.18</version>
+                <version>9.4.46.v20220331</version>
                 <configuration>
                     <stopKey>CTRL+C</stopKey>
                     <stopPort>8999</stopPort>

apps/rest-showcase/src/main/java/org/demo/rest/example/OrdersController.java

@@ -18,9 +18,9 @@
  */
 package org.demo.rest.example;
 
-import org.apache.struts2.ModelDriven;
-import org.apache.struts2.Validateable;
-import org.apache.struts2.ValidationAwareSupport;
+import com.opensymphony.xwork2.ModelDriven;
+import com.opensymphony.xwork2.Validateable;
+import com.opensymphony.xwork2.ValidationAwareSupport;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.struts2.convention.annotation.Result;

apps/rest-showcase/src/main/resources/log4j2.xml

@@ -26,6 +26,7 @@
         </Console>
     </Appenders>
     <Loggers>
+        <Logger name="com.opensymphony.xwork2" level="info"/>
         <Logger name="org.apache.struts2" level="info"/>
         <Logger name="org.demo.rest" level="debug"/>
         <Root level="warn">

apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/GetOrdersTest.java

@@ -18,41 +18,31 @@
  */
 package it.org.apache.struts2.rest.example;
 
-import org.junit.Before;
-import org.junit.Test;
+import net.sourceforge.jwebunit.junit.WebTestCase;
 
-import static net.sourceforge.jwebunit.junit.JWebUnit.assertTextNotPresent;
-import static net.sourceforge.jwebunit.junit.JWebUnit.assertTextPresent;
-import static net.sourceforge.jwebunit.junit.JWebUnit.beginAt;
-import static net.sourceforge.jwebunit.junit.JWebUnit.getTestContext;
+public class GetOrdersTest extends WebTestCase {
 
-public class GetOrdersTest {
-
-    @Before
     public void setUp() throws Exception {
         getTestContext().setBaseUrl(ParameterUtils.getBaseUrl());
     }
 
-    @Test
+
     public void testGetOrders() {
         beginAt("/orders/3");
         assertTextPresent("Bob");
         assertTextNotPresent("Sarah");
     }
 
-    @Test
     public void testGetOrdersInHtml() {
         beginAt("/orders/3.xhtml");
         assertTextPresent("Bob");
     }
 
-    @Test
     public void testGetOrdersInXml() {
         beginAt("/orders/3.xml");
         assertTextPresent("<clientName>Bob");
     }
 
-    @Test
     public void testGetOrdersInJson() {
         beginAt("/orders/3.json");
         assertTextPresent("\"clientName\":\"Bob\"");

apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/ListOrdersTest.java

@@ -18,21 +18,15 @@
  */
 package it.org.apache.struts2.rest.example;
 
-import org.junit.Before;
-import org.junit.Test;
+import net.sourceforge.jwebunit.junit.WebTestCase;
 
-import static net.sourceforge.jwebunit.junit.JWebUnit.assertTextPresent;
-import static net.sourceforge.jwebunit.junit.JWebUnit.beginAt;
-import static net.sourceforge.jwebunit.junit.JWebUnit.getTestContext;
+public class ListOrdersTest extends WebTestCase {
 
-public class ListOrdersTest {
-
-    @Before
     public void setUp() throws Exception {
         getTestContext().setBaseUrl(ParameterUtils.getBaseUrl());
     }
 
-    @Test
+
     public void testListOrders() {
         beginAt("/orders");
         assertTextPresent("Bob");
@@ -40,7 +34,6 @@ public class ListOrdersTest {
         assertTextPresent("Jim");
     }
 
-    @Test
     public void testListOrdersInHtml() {
         beginAt("/orders.xhtml");
         assertTextPresent("Bob");
@@ -48,7 +41,6 @@ public class ListOrdersTest {
         assertTextPresent("Jim");
     }
 
-    @Test
     public void testListOrdersInXml() {
         beginAt("/orders.xml");
         assertTextPresent("<clientName>Bob");
@@ -56,7 +48,6 @@ public class ListOrdersTest {
         assertTextPresent("<clientName>Jim");
     }
 
-    @Test
     public void testListOrdersInJson() {
         beginAt("/orders.json");
         assertTextPresent("\"clientName\":\"Bob\"");

apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/PostOrderTest.java

@@ -18,37 +18,23 @@
  */
 package it.org.apache.struts2.rest.example;
 
+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+import net.sourceforge.jwebunit.junit.WebTestCase;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.htmlunit.FailingHttpStatusCodeException;
-import org.junit.Before;
-import org.junit.Test;
 
 import java.io.IOException;
 
-import static net.sourceforge.jwebunit.junit.JWebUnit.assertLinkNotPresentWithText;
-import static net.sourceforge.jwebunit.junit.JWebUnit.assertTextFieldEquals;
-import static net.sourceforge.jwebunit.junit.JWebUnit.assertTextPresent;
-import static net.sourceforge.jwebunit.junit.JWebUnit.beginAt;
-import static net.sourceforge.jwebunit.junit.JWebUnit.getTestContext;
-import static net.sourceforge.jwebunit.junit.JWebUnit.setTextField;
-import static net.sourceforge.jwebunit.junit.JWebUnit.setWorkingForm;
-import static net.sourceforge.jwebunit.junit.JWebUnit.submit;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+public class PostOrderTest extends WebTestCase {
 
-public class PostOrderTest {
-
-    @Before
     public void setUp() throws Exception {
         getTestContext().setBaseUrl(ParameterUtils.getBaseUrl());
     }
 
-    @Test
+
     public void testPostOrder() {
         beginAt("/orders/new");
         setWorkingForm(0);
@@ -59,7 +45,6 @@ public class PostOrderTest {
         assertLinkNotPresentWithText("Back to Orders");
     }
 
-    @Test
     public void testPostOrderWithErrors() {
         beginAt("/orders/new");
         setWorkingForm(0);
@@ -73,7 +58,6 @@ public class PostOrderTest {
         assertTextFieldEquals("amount", "321");
     }
 
-    @Test
     public void testPostOrderInHtml() {
         beginAt("/orders/new.xhtml");
         setWorkingForm(0);
@@ -88,7 +72,6 @@ public class PostOrderTest {
         assertLinkNotPresentWithText("Back to Orders");
     }
 
-    @Test
     public void testPostOrderInXml() throws IOException {
         CloseableHttpClient client = HttpClients.createDefault();
         HttpPost httpPost = new HttpPost(ParameterUtils.getBaseUrl() + "/orders.xml");
@@ -102,7 +85,6 @@ public class PostOrderTest {
         client.close();
     }
 
-    @Test
     public void testPostOrderInXmlWithBadData() throws IOException {
         CloseableHttpClient client = HttpClients.createDefault();
         HttpPost httpPost = new HttpPost(ParameterUtils.getBaseUrl() + "/orders.xml");
@@ -116,7 +98,6 @@ public class PostOrderTest {
         client.close();
     }
 
-    @Test
     public void testPostOrderInJson() throws IOException {
         CloseableHttpClient client = HttpClients.createDefault();
         HttpPost httpPost = new HttpPost(ParameterUtils.getBaseUrl() + "/orders.json");
@@ -127,7 +108,6 @@ public class PostOrderTest {
         client.close();
     }
 
-    @Test
     public void testPostOrderInJsonWithBadData() throws IOException {
         CloseableHttpClient client = HttpClients.createDefault();
         HttpPost httpPost = new HttpPost(ParameterUtils.getBaseUrl() + "/orders.json");

apps/showcase/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>7.0.0-M10</version>
+        <version>6.11.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-showcase</artifactId>
@@ -48,11 +48,21 @@
             <artifactId>struts2-config-browser-plugin</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-sitemesh-plugin</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-tiles-plugin</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-dwr-plugin</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-json-plugin</artifactId>
@@ -82,14 +92,6 @@
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-velocity-plugin</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-velocity-tools-view-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-velocity-tools-jsp-jakarta</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
@@ -97,8 +99,8 @@
         </dependency>
 
         <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -119,11 +121,18 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-web</artifactId>
+        </dependency>
 
         <dependency>
-           <groupId>org.sitemesh</groupId>
-           <artifactId>sitemesh</artifactId>
-           <version>3.2.1</version>
+            <groupId>opensymphony</groupId>
+            <artifactId>sitemesh</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.directwebremoting</groupId>
+            <artifactId>dwr</artifactId>
         </dependency>
 
        <dependency>
@@ -139,75 +148,26 @@
         </dependency>
 
        <dependency>
-           <groupId>org.htmlunit</groupId>
-           <artifactId>htmlunit</artifactId>
-           <scope>test</scope>
-       </dependency>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <!-- BeanValidation Example -->
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
             <version>${hibernate-validator.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>jakarta.validation</groupId>
-                    <artifactId>jakarta.validation-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
-        <!--
-         Nashorn (the built-in JDK javascript engine) was deprecated in JDK 11 and removed in JDK 15
-         As a result attempting to use @ScriptAssert on JDK 17 leads to the exception
-         See more details
-         https://stackoverflow.com/questions/78008950/resolve-org-hibernate-validator-spi-scripting-scriptevaluatornotfoundexception
-         -->
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-jsr223</artifactId>
-            <version>3.0.22</version>
-        </dependency>
     </dependencies>
 
     <build>
         <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-dependency-plugin</artifactId>
-              <executions>
-                <execution>
-                  <?m2e ignore?>
-                  <id>copy-dependencies</id>
-                  <phase>package</phase>
-                  <goals>
-                    <goal>copy</goal>
-                  </goals>
-                  <configuration>
-                    <outputDirectory>${project.build.directory}/extraclasspath</outputDirectory>
-                    <artifactItems>
-                      <artifactItem>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-velocity-tools-view-jakarta</artifactId>
-                        <destFileName>struts2-velocity-tools-view-jakarta.jar</destFileName>
-                      </artifactItem>
-                      <artifactItem>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-velocity-tools-jsp-jakarta</artifactId>
-                        <destFileName>struts2-velocity-tools-jsp-jakarta.jar</destFileName>
-                      </artifactItem>
-                    </artifactItems>
-                    <overWriteReleases>false</overWriteReleases>
-                    <overWriteSnapshots>false</overWriteSnapshots>
-                    <overWriteIfNewer>true</overWriteIfNewer>
-                  </configuration>
-                </execution>
-              </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.5.6</version>
                 <configuration>
                     <includes>
                         <include>it.org.apache.struts2.showcase.*Test</include>
@@ -234,7 +194,7 @@
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>11.0.18</version>
+                <version>9.4.46.v20220331</version>
                 <configuration>
                     <stopKey>CTRL+C</stopKey>
                     <stopPort>8999</stopPort>
@@ -247,15 +207,12 @@
                     <httpConnector>
                         <port>8090</port>
                     </httpConnector>
-                    <scan>10</scan>
-                    <webApp>
-                      <extraClasspath>
-                        ${project.build.directory}/extraclasspath/struts2-velocity-tools-view-jakarta.jar,
-                        ${project.build.directory}/extraclasspath/struts2-velocity-tools-jsp-jakarta
-                      </extraClasspath>
-                      <contextPath>/struts2-showcase</contextPath>
-                      <descriptor>${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
-                    </webApp>
+                    <scanIntervalSeconds>10</scanIntervalSeconds>
+                    <webAppSourceDirectory>${basedir}/src/main/webapp/</webAppSourceDirectory>
+                    <webAppConfig>
+                        <contextPath>/struts2-showcase</contextPath>
+                        <descriptor>${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
+                    </webAppConfig>
                 </configuration>
                 <executions>
                     <execution>

apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 import java.text.DateFormat;
 import java.util.Calendar;

apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 import org.apache.struts2.showcase.ajax.tree.Category;
 

apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.ArrayList;

apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**

apps/showcase/src/main/java/org/apache/struts2/showcase/MoreSelectsAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.ArrayList;

apps/showcase/src/main/java/org/apache/struts2/showcase/ShowAjaxDynamicTreeAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 import org.apache.struts2.showcase.ajax.tree.Category;
 

apps/showcase/src/main/java/org/apache/struts2/showcase/ShowDynamicTreeAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.showcase.ajax.tree.Category;
 
 // START SNIPPET: treeExampleDynamicJavaShow

apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java

@@ -20,9 +20,9 @@
  */
 package org.apache.struts2.showcase;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.Validateable;
-import org.apache.struts2.util.ValueStack;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Validateable;
+import com.opensymphony.xwork2.util.ValueStack;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 

apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java

@@ -18,7 +18,7 @@
  */
 package org.apache.struts2.showcase.action;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java

@@ -18,7 +18,7 @@
  */
 package org.apache.struts2.showcase.action;
 
-import org.apache.struts2.Preparable;
+import com.opensymphony.xwork2.Preparable;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

apps/showcase/src/main/java/org/apache/struts2/showcase/action/ExampleAction.java

@@ -18,7 +18,7 @@
  */
 package org.apache.struts2.showcase.action;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 import java.util.Arrays;
 import java.util.Date;

apps/showcase/src/main/java/org/apache/struts2/showcase/action/JSPEvalAction.java

@@ -18,8 +18,8 @@
  */
 package org.apache.struts2.showcase.action;
 
-import org.apache.struts2.action.Action;
-import org.apache.struts2.interceptor.annotations.After;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.interceptor.annotations.After;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 

apps/showcase/src/main/java/org/apache/struts2/showcase/action/ParamsAnnotationAction.java

@@ -18,7 +18,7 @@
  */
 package org.apache.struts2.showcase.action;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 import org.apache.struts2.showcase.model.MyDto;
 

apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java

@@ -18,7 +18,7 @@
  */
 package org.apache.struts2.showcase.action;
 
-import org.apache.struts2.Preparable;
+import com.opensymphony.xwork2.Preparable;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain1.java

@@ -18,7 +18,7 @@
  */
 package org.apache.struts2.showcase.actionchaining;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 public class ActionChain1 extends ActionSupport {

apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain2.java

@@ -18,7 +18,7 @@
  */
 package org.apache.struts2.showcase.actionchaining;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 public class ActionChain2 extends ActionSupport {

apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain3.java

@@ -18,7 +18,7 @@
  */
 package org.apache.struts2.showcase.actionchaining;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 public class ActionChain3 extends ActionSupport {

apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.ajax;
 
-import org.apache.struts2.action.Action;
+import com.opensymphony.xwork2.Action;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.io.Serializable;

apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AutocompleterExampleAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.ajax;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.ArrayList;

apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example4ShowPanelAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.ajax;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.text.SimpleDateFormat;

apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example5Action.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.ajax;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 public class Example5Action extends ActionSupport {

apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java

@@ -46,7 +46,8 @@ public class Category {
 						new Category(15, "Dojo"),
 						new Category(16, "Prototype"),
 						new Category(17, "Scriptaculous"),
-						new Category(18, "OpenRico")));
+						new Category(18, "OpenRico"),
+						new Category(19, "DWR")));
 	}
 
 	public static Category getById(long id) {

apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/GetCategory.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.ajax.tree;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**

apps/showcase/src/main/java/org/apache/struts2/showcase/application/TestDataProvider.java

@@ -31,10 +31,9 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.io.Serial;
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Date;
-import java.util.List;
 
 /**
  * TestDataProvider.
@@ -42,76 +41,74 @@ import java.util.List;
 @Service
 public class TestDataProvider implements Serializable, InitializingBean {
 
-    @Serial
-    private static final long serialVersionUID = 1L;
-    private static final Logger log = LogManager.getLogger(TestDataProvider.class);
+	private static final long serialVersionUID = 1L;
+	private static final Logger log = LogManager.getLogger(TestDataProvider.class);
 
-    public static final String[] POSITIONS = {
-            "Developer",
-            "System Architect",
-            "Sales Manager",
-            "CEO"
-    };
+	public static final String[] POSITIONS = {
+			"Developer",
+			"System Architect",
+			"Sales Manager",
+			"CEO"
+	};
 
-    public static final String[] LEVELS = {
-            "Junior",
-            "Senior",
-            "Master"
-    };
+	public static final String[] LEVELS = {
+			"Junior",
+			"Senior",
+			"Master"
+	};
 
-    private static final Skill[] TEST_SKILLS = {
-            new Skill("WW-SEN", "Struts Senior Developer"),
-            new Skill("WW-JUN", "Struts Junior Developer"),
-            new Skill("SPRING-DEV", "Spring Developer")
-    };
+	private static final Skill[] TEST_SKILLS = {
+			new Skill("WW-SEN", "Struts Senior Developer"),
+			new Skill("WW-JUN", "Struts Junior Developer"),
+			new Skill("SPRING-DEV", "Spring Developer")
+	};
 
-    public static final Employee[] TEST_EMPLOYEES = {
-            new Employee(1L, "Alan", "Smithee", new Date(), 2000f, true, POSITIONS[0],
-                    TEST_SKILLS[0], null, "alan", LEVELS[0], "Nice guy"),
-            new Employee(2L, "Robert", "Robson", new Date(), 10000f, false, POSITIONS[1],
-                    TEST_SKILLS[1], List.of(TEST_SKILLS).subList(1, TEST_SKILLS.length), "rob", LEVELS[1], "Smart guy")
-    };
+	public static final Employee[] TEST_EMPLOYEES = {
+			new Employee(new Long(1), "Alan", "Smithee", new Date(), new Float(2000f), true, POSITIONS[0],
+					TEST_SKILLS[0], null, "alan", LEVELS[0], "Nice guy"),
+			new Employee(new Long(2), "Robert", "Robson", new Date(), new Float(10000f), false, POSITIONS[1],
+					TEST_SKILLS[1], Arrays.asList(TEST_SKILLS).subList(1, TEST_SKILLS.length), "rob", LEVELS[1], "Smart guy")
+	};
 
-    @Autowired
-    private SkillDao skillDao;
+	@Autowired
+	private SkillDao skillDao;
 
-    @Autowired
-    private EmployeeDao employeeDao;
+	@Autowired
+	private EmployeeDao employeeDao;
 
-    protected void addTestSkills() {
-        try {
-            for (Skill testSkill : TEST_SKILLS) {
-                skillDao.merge(testSkill);
-            }
-            if (log.isInfoEnabled()) {
-                log.info("TestDataProvider - [addTestSkills]: Added test skill data.");
-            }
-        } catch (StorageException e) {
-            log.error("TestDataProvider - [addTestSkills]: Exception caught: {}", e.getMessage());
-        }
-    }
+	protected void addTestSkills() {
+		try {
+			for (int i = 0, j = TEST_SKILLS.length; i < j; i++) {
+				skillDao.merge(TEST_SKILLS[i]);
+			}
+			if (log.isInfoEnabled()) {
+				log.info("TestDataProvider - [addTestSkills]: Added test skill data.");
+			}
+		} catch (StorageException e) {
+			log.error("TestDataProvider - [addTestSkills]: Exception catched: " + e.getMessage());
+		}
+	}
 
-    protected void addTestEmployees() {
-        try {
-            for (Employee testEmployee : TEST_EMPLOYEES) {
-                employeeDao.merge(testEmployee);
-            }
-            if (log.isInfoEnabled()) {
-                log.info("TestDataProvider - [addTestEmployees]: Added test employee data.");
-            }
-        } catch (StorageException e) {
-            log.error("TestDataProvider - [addTestEmployees]: Exception caught: {}", e.getMessage());
-        }
-    }
+	protected void addTestEmployees() {
+		try {
+			for (int i = 0, j = TEST_EMPLOYEES.length; i < j; i++) {
+				employeeDao.merge(TEST_EMPLOYEES[i]);
+			}
+			if (log.isInfoEnabled()) {
+				log.info("TestDataProvider - [addTestEmployees]: Added test employee data.");
+			}
+		} catch (StorageException e) {
+			log.error("TestDataProvider - [addTestEmployees]: Exception catched: " + e.getMessage());
+		}
+	}
 
-    protected void addTestData() {
-        addTestSkills();
-        addTestEmployees();
-    }
+	protected void addTestData() {
+		addTestSkills();
+		addTestEmployees();
+	}
 
-    @Override
-    public void afterPropertiesSet() throws Exception {
-        addTestData();
-    }
+	public void afterPropertiesSet() throws Exception {
+		addTestData();
+	}
 
 }

apps/showcase/src/main/java/org/apache/struts2/showcase/async/AsyncFilter.java

@@ -18,13 +18,13 @@
  */
 package org.apache.struts2.showcase.async;
 
-import jakarta.servlet.Filter;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.FilterConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 
 /**

apps/showcase/src/main/java/org/apache/struts2/showcase/async/ChatRoomAction.java

@@ -18,7 +18,7 @@
  */
 package org.apache.struts2.showcase.async;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.ArrayList;

apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java

@@ -21,10 +21,10 @@
 package org.apache.struts2.showcase.chat;
 
 
-import org.apache.struts2.action.Action;
-import org.apache.struts2.ActionContext;
-import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.interceptor.AbstractInterceptor;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java

@@ -20,10 +20,10 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import org.apache.struts2.action.Action;
-import org.apache.struts2.ActionContext;
-import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.interceptor.AbstractInterceptor;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.action.SessionAware;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 

apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 import java.util.Map;
 

apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatSessionListener.java

@@ -25,9 +25,9 @@ import org.apache.logging.log4j.LogManager;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
-import jakarta.servlet.http.HttpSession;
-import jakarta.servlet.http.HttpSessionEvent;
-import jakarta.servlet.http.HttpSessionListener;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionEvent;
+import javax.servlet.http.HttpSessionListener;
 
 public class ChatSessionListener implements HttpSessionListener {
 

apps/showcase/src/main/java/org/apache/struts2/showcase/chat/CrudRoomAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 public class CrudRoomAction extends ActionSupport {

apps/showcase/src/main/java/org/apache/struts2/showcase/chat/DateConverter.java

@@ -20,8 +20,8 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import org.apache.struts2.conversion.impl.XWorkConverter;
-import org.apache.struts2.inject.Inject;
+import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import com.opensymphony.xwork2.inject.Inject;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.apache.struts2.util.StrutsTypeConverter;

apps/showcase/src/main/java/org/apache/struts2/showcase/chat/EnterRoomAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.action.SessionAware;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 

apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ExitRoomAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.action.SessionAware;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 

apps/showcase/src/main/java/org/apache/struts2/showcase/chat/MessagesAvailableInRoomAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.ArrayList;

apps/showcase/src/main/java/org/apache/struts2/showcase/chat/RoomsAvailableAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 import java.util.ArrayList;
 import java.util.List;

apps/showcase/src/main/java/org/apache/struts2/showcase/chat/SendMessageToRoomAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.action.SessionAware;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 

apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 import java.util.ArrayList;
 import java.util.List;

apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableInRoomAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.ArrayList;

apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/AddressAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.conversion;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.LinkedHashSet;

apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnumAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.conversion;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.Arrays;

apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.conversion;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.List;

apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.filedownload;
 
-import org.apache.struts2.action.Action;
+import com.opensymphony.xwork2.Action;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 

apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.fileupload;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.action.UploadedFilesAware;
 import org.apache.struts2.dispatcher.multipart.UploadedFile;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingArrayAction.java

@@ -21,7 +21,7 @@
 // START SNIPPET: entire-file
 package org.apache.struts2.showcase.fileupload;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.action.UploadedFilesAware;
 import org.apache.struts2.dispatcher.multipart.UploadedFile;
 

apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java

@@ -21,7 +21,7 @@
 // START SNIPPET: entire-file
 package org.apache.struts2.showcase.fileupload;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.action.UploadedFilesAware;
 import org.apache.struts2.dispatcher.multipart.UploadedFile;
 

apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManager.java

@@ -20,12 +20,12 @@
  */
 package org.apache.struts2.showcase.freemarker;
 
-import org.apache.struts2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
 import org.apache.struts2.views.freemarker.FreemarkerManager;
 import org.apache.struts2.views.freemarker.ScopesHashModel;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * <p>

apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/StandardTagsAction.java

@@ -20,8 +20,8 @@
  */
 package org.apache.struts2.showcase.freemarker;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.Preparable;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Preparable;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.text.DateFormatSymbols;

apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GetUpdatedHangmanAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.hangman;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 import java.util.Map;
 

apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GuessCharacterAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.hangman;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.action.SessionAware;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 

apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/Hangman.java

@@ -20,34 +20,40 @@
  */
 package org.apache.struts2.showcase.hangman;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class Hangman implements Serializable {
 
-	private static final Logger log = LogManager.getLogger(Hangman.class);
-
-	@Serial
 	private static final long serialVersionUID = 8566954355839652509L;
 
-	private final Vocab vocab;
+	private Vocab vocab;
 
 	private Boolean win = false;
 
 	private int guessLeft = 5;
-	public final List<Character> charactersAvailable;
+	public List<Character> charactersAvailable;
 	public List<Character> charactersGuessed;
 
 	public Hangman(Vocab vocab) {
-		charactersAvailable = new ArrayList<>(List.of(
-                'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
-				'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'));
-		charactersGuessed = new ArrayList<>();
+		// Arrays.asList(...) returns List that doesn't support remove(), hence
+		// we wrap it with an ArrayList to avoid UnsupportedOperationException
+		// when doing a remove()
+		charactersAvailable = new ArrayList<Character>(Arrays.asList(
+				new Character[]{
+						Character.valueOf('A'), Character.valueOf('B'), Character.valueOf('C'),
+						Character.valueOf('D'), Character.valueOf('E'), Character.valueOf('F'),
+						Character.valueOf('G'), Character.valueOf('H'), Character.valueOf('I'),
+						Character.valueOf('J'), Character.valueOf('K'), Character.valueOf('L'),
+						Character.valueOf('M'), Character.valueOf('N'), Character.valueOf('O'),
+						Character.valueOf('P'), Character.valueOf('Q'), Character.valueOf('R'),
+						Character.valueOf('S'), Character.valueOf('T'), Character.valueOf('U'),
+						Character.valueOf('V'), Character.valueOf('W'), Character.valueOf('X'),
+						Character.valueOf('Y'), Character.valueOf('Z')
+				}));
+		charactersGuessed = new ArrayList<Character>();
 		this.vocab = vocab;
 	}
 
@@ -69,8 +75,8 @@ public class Hangman implements Serializable {
 			}
 			if (vocab.containsAllCharacter(charactersGuessed)) {
 				win = true;
-				log.info("Game won");
 			}
+			System.out.println(" *********************************** " + win);
 		}
 	}
 
@@ -92,7 +98,7 @@ public class Hangman implements Serializable {
 
 	public List<Character> getCharactersAvailable() {
 		synchronized (charactersAvailable) {
-			return new ArrayList<>(charactersAvailable);
+			return new ArrayList<Character>(charactersAvailable);
 			//return charactersAvailable;
 		}
 	}

apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.hangman;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 import java.util.Map;
 

apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/Vocab.java

@@ -20,19 +20,17 @@
  */
 package org.apache.struts2.showcase.hangman;
 
-import java.io.Serial;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
 
 public class Vocab implements Serializable {
 
-	@Serial
 	private static final long serialVersionUID = 1L;
 
-	private final String vocab;
-	private final String hint;
+	private String vocab;
+	private String hint;
 	private Character[] characters; // character this vocab is made up of
 
 	public Vocab(String vocab, String hint) {
@@ -54,7 +52,7 @@ public class Vocab implements Serializable {
 	public Boolean containCharacter(Character character) {
 		assert (character != null);
 
-		return vocab.contains(character.toString());
+		return (vocab.contains(character.toString())) ? true : false;
 	}
 
 	public Character[] inCharacters() {
@@ -62,21 +60,32 @@ public class Vocab implements Serializable {
 			char[] c = vocab.toCharArray();
 			characters = new Character[c.length];
 			for (int a = 0; a < c.length; a++) {
-				characters[a] = c[a];
+				characters[a] = Character.valueOf(c[a]);
 			}
 		}
 		return characters;
 	}
 
 	public boolean containsAllCharacter(List<Character> charactersGuessed) {
-		return new HashSet<>(charactersGuessed).containsAll(Arrays.asList(inCharacters()));
+		Character[] chars = inCharacters();
+		List<Character> tmpChars = Arrays.asList(chars);
+		return charactersGuessed.containsAll(tmpChars);
 	}
 
-	public static void main(String[] args) throws Exception {
+	public static void main(String args[]) throws Exception {
 		Vocab v = new Vocab("JAVA", "a java word");
 
-		System.out.println(v.containsAllCharacter(List.of('J', 'V')));
-		System.out.println(v.containsAllCharacter(List.of('J', 'V', 'A')));
+		List<Character> list1 = new ArrayList<Character>();
+		list1.add(new Character('J'));
+		list1.add(new Character('V'));
+
+		List<Character> list2 = new ArrayList<Character>();
+		list2.add(new Character('J'));
+		list2.add(new Character('V'));
+		list2.add(new Character('A'));
+
+		System.out.println(v.containsAllCharacter(list1));
+		System.out.println(v.containsAllCharacter(list2));
 
 	}
 }

apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java

@@ -20,8 +20,8 @@
  */
 package org.apache.struts2.showcase.modelDriven;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.ModelDriven;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.ModelDriven;
 import org.apache.struts2.showcase.modelDriven.model.Gangster;
 
 /**

apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.person;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.convention.annotation.Result;
 import org.apache.struts2.convention.annotation.Results;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.person;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.convention.annotation.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 

apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.person;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.convention.annotation.Result;
 import org.apache.struts2.convention.annotation.Results;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;

apps/showcase/src/main/java/org/apache/struts2/showcase/servlet/TestServlet.java

@@ -20,10 +20,10 @@
  */
 package org.apache.struts2.showcase.servlet;
 
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 public class TestServlet extends HttpServlet {

apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java

@@ -20,12 +20,12 @@
  */
 package org.apache.struts2.showcase.source;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
 import org.apache.struts2.action.ServletContextAware;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
-import jakarta.servlet.ServletContext;
+import javax.servlet.ServletContext;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;

apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.tag.nonui.actionPrefix;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 public class SubmitAction extends ActionSupport {

apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.tag.nonui.actiontag;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 /**
  */

apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/debugtag/DebugTagAction.java

@@ -18,7 +18,7 @@
  */
 package org.apache.struts2.showcase.tag.nonui.debugtag;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.dispatcher.PrepareOperations;
 
 public class DebugTagAction extends ActionSupport {

apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java

@@ -20,8 +20,8 @@
  */
 package org.apache.struts2.showcase.tag.nonui.iteratortag;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.Validateable;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Validateable;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**

apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.tag.nonui.iteratortag;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**

apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java

@@ -20,8 +20,8 @@
  */
 package org.apache.struts2.showcase.tag.nonui.iteratortag;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.Validateable;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Validateable;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 

apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java

@@ -20,8 +20,8 @@
  */
 package org.apache.struts2.showcase.tag.nonui.iteratortag;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.Validateable;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Validateable;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**

apps/showcase/src/main/java/org/apache/struts2/showcase/tiles/TilesAnnotationsAction.java

@@ -24,7 +24,7 @@ import org.apache.struts2.convention.annotation.Result;
 import org.apache.struts2.tiles.annotation.TilesDefinition;
 import org.apache.struts2.tiles.annotation.TilesPutAttribute;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 @Namespace("/tiles")
 @ParentPackage("tiles")

apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java

@@ -20,8 +20,8 @@
  */
 package org.apache.struts2.showcase.token;
 
-import org.apache.struts2.ActionContext;
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.Date;

apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.validation;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 /**
  */

apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AjaxFormSubmitAction.java

@@ -18,15 +18,15 @@
  */
 package org.apache.struts2.showcase.validation;
 
-import org.apache.struts2.validator.annotations.DateRangeFieldValidator;
-import org.apache.struts2.validator.annotations.EmailValidator;
-import org.apache.struts2.validator.annotations.FieldExpressionValidator;
-import org.apache.struts2.validator.annotations.IntRangeFieldValidator;
-import org.apache.struts2.validator.annotations.RegexFieldValidator;
-import org.apache.struts2.validator.annotations.RequiredFieldValidator;
-import org.apache.struts2.validator.annotations.RequiredStringValidator;
-import org.apache.struts2.validator.annotations.StringLengthFieldValidator;
-import org.apache.struts2.validator.annotations.UrlValidator;
+import com.opensymphony.xwork2.validator.annotations.DateRangeFieldValidator;
+import com.opensymphony.xwork2.validator.annotations.EmailValidator;
+import com.opensymphony.xwork2.validator.annotations.FieldExpressionValidator;
+import com.opensymphony.xwork2.validator.annotations.IntRangeFieldValidator;
+import com.opensymphony.xwork2.validator.annotations.RegexFieldValidator;
+import com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator;
+import com.opensymphony.xwork2.validator.annotations.RequiredStringValidator;
+import com.opensymphony.xwork2.validator.annotations.StringLengthFieldValidator;
+import com.opensymphony.xwork2.validator.annotations.UrlValidator;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.sql.Date;

apps/showcase/src/main/java/org/apache/struts2/showcase/validation/BeanValidationExampleAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.validation;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts.beanvalidation.constraints.FieldMatch;
 import org.apache.struts2.convention.annotation.Action;
 import org.apache.struts2.convention.annotation.Namespace;
@@ -31,13 +31,13 @@ import org.apache.struts2.interceptor.validation.SkipValidation;
 import org.hibernate.validator.constraints.ScriptAssert;
 import org.hibernate.validator.constraints.URL;
 
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
-import jakarta.validation.constraints.Size;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
 import java.util.Date;
 
 // <!-- START SNIPPET: beanValidationExample -->

apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.validation;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**

apps/showcase/src/main/java/org/apache/struts2/showcase/validation/SubmitApplication.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.validation;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**

apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.wait;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**

apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java

@@ -20,12 +20,10 @@
  */
 package org.apache.struts2.showcase.xslt;
 
-import org.apache.struts2.ActionSupport;
-
-import jakarta.servlet.http.HttpServletRequest;
-
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.action.ServletRequestAware;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 import java.util.Properties;
 

apps/showcase/src/main/resources/log4j2.xml

@@ -30,5 +30,6 @@
             <AppenderRef ref="STDOUT"/>
         </Root>
         <Logger name="org.apache.struts2" level="info"/>
+        <Logger name="com.opensymphony.xwork2" level="info"/>
     </Loggers>
 </Configuration>

apps/showcase/src/main/resources/myTemplateDir/myTheme/myAnotherTemplate.ftl

@@ -21,6 +21,6 @@
 <div style="background-color:yellow;">
 <p>
 Freemarker Custom Template -
-parameter 'paramName' - ${attributes.paramName}
+parameter 'paramName' - ${parameters.paramName}
 </p>
 </div>

apps/showcase/src/main/resources/struts-fileupload.xml

@@ -24,9 +24,6 @@
 	"https://struts.apache.org/dtds/struts-6.0.dtd">
 
 <struts>
-
-	<constant name="struts.multipart.maxSize" value="10240" />
-
 	<package name="fileupload" extends="struts-default" namespace="/fileupload">
 
         <action name="upload" class="org.apache.struts2.showcase.fileupload.FileUploadAction" method="input">

apps/showcase/src/main/resources/struts-validation.xml

@@ -47,7 +47,12 @@
             <result>/WEB-INF/validation/quiz-success.jsp</result>
         </action>
 
-		<action name="quizClientCss" class="org.apache.struts2.showcase.validation.QuizAction">
+		<action name="quizDwr" class="org.apache.struts2.showcase.validation.QuizAction">
+			<result name="input">/WEB-INF/validation/quiz-dwr.jsp</result>
+			<result>/WEB-INF/validation/quiz-success.jsp</result>
+		</action>
+
+        <action name="quizClientCss" class="org.apache.struts2.showcase.validation.QuizAction">
             <result name="input">/WEB-INF/validation/quiz-client-css.jsp</result>
             <result>/WEB-INF/validation/quiz-success.jsp</result>
         </action>

apps/showcase/src/main/resources/struts.xml

@@ -42,6 +42,7 @@
     "/>
     <constant name="struts.allowlist.classes" value="
             org.apache.struts2.showcase.hangman.Hangman,
+            org.apache.struts2.showcase.hangman.HangmanConstants,
             org.apache.struts2.showcase.hangman.Vocab
     "/>
 

apps/showcase/src/main/resources/template/ajaxErrorContainers/actionerror.ftl

@@ -22,22 +22,22 @@
     Make sure element is always present. To be filled later via JS.
 -->
 <ul<#rt/>
-<#if attributes.id??>
- id="${attributes.id}"<#rt/>
-</#if>
-<#if attributes.cssClass??>
- class="${attributes.cssClass}"<#rt/>
+<#if parameters.id??>
+ id="${parameters.id}"<#rt/>
+</#if>            
+<#if parameters.cssClass??>
+ class="${parameters.cssClass}"<#rt/>
 <#else>
  class="errorMessage"<#rt/>
 </#if>
-<#if attributes.cssStyle??>
- style="${attributes.cssStyle}"<#rt/>
+<#if parameters.cssStyle??>
+ style="${parameters.cssStyle}"<#rt/>
 </#if>
 >
 <#if (actionErrors?? && actionErrors?size > 0)>
 	<#list actionErrors as error>
 		<#if error??>
-            <li><span><#if attributes.escape>${error!}<#else>${error!}</#if></span><#rt/></li><#rt/>
+            <li><span><#if parameters.escape>${error!}<#else>${error!}</#if></span><#rt/></li><#rt/>
         </#if>
 	</#list>
 </#if>

apps/showcase/src/main/resources/template/ajaxErrorContainers/controlfooter.ftl

@@ -18,16 +18,16 @@
  * under the License.
  */
 -->
-${attributes.after!}<#t/>
+${parameters.after!}<#t/>
     </td><#lt/>
 </tr>
-<#if (attributes.errorposition!"top") == 'bottom'>
-<#assign hasFieldErrors = attributes.name?? && fieldErrors?? && fieldErrors.get(attributes.name)??/>
+<#if (parameters.errorposition!"top") == 'bottom'>
+<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors.get(parameters.name)??/>
 <#if hasFieldErrors>
-<tr errorFor="${attributes.id}">
+<tr errorFor="${parameters.id}">
     <td class="tdErrorMessage" colspan="2"><#rt/>
         <#if hasFieldErrors>
-            <#list fieldErrors.get(attributes.name) as error>
+            <#list fieldErrors.get(parameters.name) as error>
                 <div class="errorMessage">${error}</div><#t/>
             </#list>
         </#if>

apps/showcase/src/main/resources/template/ajaxErrorContainers/controlheader-core.ftl

@@ -21,22 +21,22 @@
 <#--
 	Always include elements to show errors. They may be filled later via AJAX.
 -->
-<#assign hasFieldErrors = attributes.name?? && fieldErrors?? && fieldErrors.get(attributes.name)??/>
-<#if (attributes.errorposition!"top") == 'top'>
-<tr errorFor="${attributes.id}">
-    <td class="tdErrorMessage" colspan="2" data-error-for-fieldname="${attributes.name}"><#rt/>
+<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors.get(parameters.name)??/>
+<#if (parameters.errorposition!"top") == 'top'>
+<tr errorFor="${parameters.id}">
+    <td class="tdErrorMessage" colspan="2" data-error-for-fieldname="${parameters.name}"><#rt/>
         <#if hasFieldErrors>
-            <#list fieldErrors.get(attributes.name) as error>
+            <#list fieldErrors.get(parameters.name) as error>
                 <div class="errorMessage">${error}</div><#t/>
             </#list>
         </#if>
     </td><#lt/>
 </tr>
 </#if>
-<#if !attributes.labelPosition?? && (attributes.form.labelPosition)??>
-<#assign labelPos = attributes.form.labelPosition/>
-<#elseif attributes.labelPosition??>
-<#assign labelpos = attributes.labelPosition/>
+<#if !parameters.labelPosition?? && (parameters.form.labelPosition)??>
+<#assign labelPos = parameters.form.labelPosition/>
+<#elseif parameters.labelPosition??>
+<#assign labelpos = parameters.labelPosition/>
 </#if>
 <#--
 	if the label position is top,
@@ -48,10 +48,10 @@
 <#else>
     <td class="tdLabel"><#rt/>
 </#if>
-<#if attributes.label??>
+<#if parameters.label??>
     <label <#t/>
-<#if attributes.id??>
-        for="${attributes.id}" <#t/>
+<#if parameters.id??>
+        for="${parameters.id}" <#t/>
 </#if>
 <#if hasFieldErrors>
         class="errorLabel"<#t/>
@@ -59,15 +59,15 @@
         class="label"<#t/>
 </#if>
     ><#t/>
-<#if attributes.required!false && attributes.requiredPosition!"right" != 'right'>
+<#if parameters.required!false && parameters.requiredPosition!"right" != 'right'>
         <span class="required">*</span><#t/>
 </#if>
-${attributes.label}<#t/>
-<#if attributes.required!false && attributes.requiredPosition!"right" == 'right'>
+${parameters.label}<#t/>
+<#if parameters.required!false && parameters.requiredPosition!"right" == 'right'>
  <span class="required">*</span><#t/>
 </#if>
-${attributes.labelseparator!":"}<#t/>
-<#include "/${attributes.templateDir}/${attributes.expandTheme}/tooltip.ftl" />
+${parameters.labelseparator!":"}<#t/>
+<#include "/${parameters.templateDir}/${parameters.expandTheme}/tooltip.ftl" />
 </label><#t/>
 </#if>
     </td><#lt/>