WW-5385 Decompose StrutsVelocityContext for better re-usability

.asf.yaml

@@ -11,37 +11,9 @@ 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:
-    main:
-      # contexts are the names of checks that must pass.
-      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
-        required_approving_review_count: 0
+    master: { }
   autolink_jira:
     - WW
   dependabot_alerts:  true

.github/workflows/codeql.yml

@@ -17,9 +17,7 @@ name: "CodeQL"
 
 on:
   push:
-    branches:
-      - 'support/struts-6-x-x'
-      - 'release/*'
+    branches: [ "master" ]
   pull_request:
 
 permissions:
@@ -43,21 +41,15 @@ jobs:
       matrix:
         language: [ 'java' ]
     steps:
-      - 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}}"
+    - name: Checkout repository
+      uses: actions/checkout@v4
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v3
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/maven.yml

@@ -19,8 +19,7 @@ on:
   pull_request:
   push:
     branches:
-      - 'support/struts-6-x-x'
-      - 'release/*'
+      - master
 
 permissions: read-all
 

.github/workflows/scorecards-analysis.yaml

@@ -20,8 +20,7 @@ on:
   schedule:
     - cron: "30 1 * * 6"    # Weekly on Saturdays
   push:
-    branches:
-      - 'main' # only default branch is supported
+    branches: [ "master" ]
 
 permissions: read-all
 
@@ -46,7 +45,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46    # 2.4.0
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736    # 2.3.1
         with:
           results_file: results.sarif
           results_format: sarif
@@ -58,13 +57,13 @@ jobs:
           publish_results: true
 
       - name: "Upload artifact"
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882    # 4.4.3
+        uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392    # 4.0.0
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@acb9cb18eec7e3a113ef83cff0be91e75cfd9526    # 2.22.11
+        uses: github/codeql-action/upload-sarif@03e7845b7bfcd5e7fb63d1ae8c61b0e791134fab    # 2.22.11
         with:
           sarif_file: results.sarif

.github/workflows/sonar.yml

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

.gitignore

@@ -1,5 +1,5 @@
 # IDEA
-.idea/
+.idea
 *.iml
 *.ipr
 *.iws
@@ -38,17 +38,11 @@ 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/

.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed 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.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

.mvn/wrapper/maven-wrapper.properties

@@ -5,14 +5,14 @@
 # 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.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

CLAUDE.md

@@ -1,37 +0,0 @@
-# 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,22 +1,4 @@
 #!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
@@ -85,7 +67,12 @@ pipeline {
         MAVEN_OPTS = "-Xmx1024m"
       }
       stages {
-        stage('Test & Coverage') {
+        stage('Build') {
+          steps {
+            sh './mvnw -B -DskipAssembly verify --no-transfer-progress'
+          }
+        }
+        stage('Test') {
           steps {
             sh './mvnw -B verify -Pcoverage -DskipAssembly'
           }
@@ -99,7 +86,7 @@ pipeline {
         stage('Code Quality') {
           when {
             anyOf {
-              branch 'support/struts-6-x-x'
+              branch 'master'; branch 'release/struts-7-0-x'
             }
           }
           steps {
@@ -108,6 +95,84 @@ pipeline {
             }
           }
         }
+        stage('Build Source & JavaDoc') {
+          when {
+            branch 'release/struts-7-0-x'
+          }
+          steps {
+            dir("local-snapshots-dir/") {
+              deleteDir()
+            }
+            sh './mvnw -B source:jar javadoc:jar -DskipTests -DskipAssembly'
+          }
+        }
+        stage('Deploy Snapshot') {
+          when {
+            branch 'release/struts-7-0-x'
+          }
+          steps {
+            withCredentials([file(credentialsId: 'lukaszlenart-repository-access-token', variable: 'CUSTOM_SETTINGS')]) {
+              sh './mvnw -s \${CUSTOM_SETTINGS} deploy -DskipTests -DskipAssembly'
+            }
+          }
+        }
+        stage('Upload nightlies') {
+          when {
+            branch 'release/struts-7-0-x'
+          }
+          steps {
+            sh './mvnw -B package -DskipTests'
+            sshPublisher(publishers: [
+                sshPublisherDesc(
+                    configName: 'Nightlies',
+                    transfers: [
+                        sshTransfer(
+                            remoteDirectory: '/struts/snapshot',
+                            removePrefix: 'assembly/target/assembly/out',
+                            sourceFiles: 'assembly/target/assembly/out/struts-*.zip',
+                            cleanRemote: true
+                        )
+                    ],
+                    verbose: true
+                )
+            ])
+          }
+        }
+      }
+      post {
+        always {
+          cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**', type: 'INCLUDE']]
+        }
+      }
+    }
+    stage('JDK 11') {
+      agent {
+        label 'ubuntu'
+      }
+      tools {
+        jdk 'jdk_11_latest'
+        maven 'maven_3_latest'
+      }
+      environment {
+        MAVEN_OPTS = "-Xmx1024m"
+      }
+      stages {
+        stage('Build') {
+          steps {
+            sh './mvnw -B -DskipAssembly verify --no-transfer-progress'
+          }
+        }
+        stage('Test') {
+          steps {
+            sh './mvnw -B test'
+          }
+          post {
+            always {
+              junit(testResults: '**/surefire-reports/*.xml', allowEmptyResults: true)
+              junit(testResults: '**/failsafe-reports/*.xml', allowEmptyResults: true)
+            }
+          }
+        }
       }
       post {
         always {
@@ -134,7 +199,7 @@ pipeline {
         }
         stage('Test') {
           steps {
-            sh './mvnw -B verify -DskipAssembly'
+            sh './mvnw -B test'
           }
           post {
             always {
@@ -145,7 +210,7 @@ pipeline {
         }
         stage('Build Source & JavaDoc') {
           when {
-            branch 'support/struts-x-x-x'
+            branch 'master'
           }
           steps {
             dir("local-snapshots-dir/") {
@@ -156,7 +221,7 @@ pipeline {
         }
         stage('Deploy Snapshot') {
           when {
-            branch 'support/struts-6-x-x'
+            branch 'master'
           }
           steps {
             withCredentials([file(credentialsId: 'lukaszlenart-repository-access-token', variable: 'CUSTOM_SETTINGS')]) {
@@ -166,7 +231,7 @@ pipeline {
         }
         stage('Upload nightlies') {
           when {
-            branch 'support/struts-6-x-x'
+            branch 'master'
           }
           steps {
             sh './mvnw -B package -DskipTests'

README.md

@@ -17,7 +17,7 @@
 The Apache Struts web framework
 -------------------------------
 
-[![Build Status](https://ci-builds.apache.org/buildStatus/icon?job=Struts%2FStruts+Core%2Fmaster)](https://ci-builds.apache.org/job/Struts/job/Struts%20Core/job/master/)
+[![Jenkins Build](https://builds.apache.org/buildStatus/icon?job=Struts%2FStruts+Core%2Fmaster)](https://ci-builds.apache.org/job/Struts/job/Struts%20Core/job/master/)
 [![Java Build](https://github.com/apache/struts/actions/workflows/maven.yml/badge.svg)](https://github.com/apache/struts/actions/workflows/maven.yml)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.struts/struts2-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.struts/struts2-core/)
 [![Javadocs](https://javadoc.io/badge/org.apache.struts/struts2-core.svg)](https://javadoc.io/doc/org.apache.struts/struts2-core)

SECURITY.md

@@ -2,13 +2,13 @@
 
 ## Supported Versions
 
-Please visit the [Releases](https://struts.apache.org/releases.html#prior-releases) page to see full information about each version 
+Please vist the [Releases](https://struts.apache.org/releases.html#prior-releases) page to see full information about each version 
 and what potential vulnerability it can have:
 
 | Version | Supported          |
-|---------|--------------------|
-| 6.x     | :white_check_mark: |
-| 2.5.x   | :white_check_mark: |
+| ------- | ------------------ |
+| 6.0.0   | :white_check_mark: |
+| 2.5.30  | :white_check_mark: |
 
 ## Reporting New Security Issues with thr Apache Struts
 
@@ -28,8 +28,8 @@ All mail sent to this address that does not relate to security problems in the A
 ```
 
 Note that all networked servers are subject to denial of service attacks, and we cannot promise magic
-workarounds to generic problems (such as a client streaming lots of data to your server, or requesting
-the same URL repeatedly). In general, our philosophy is to avoid any attacks that can cause the server
+workarounds to generic problems (such as a client streaming lots of data to your server, or re-requesting
+the same URL repeatedly). In general our philosophy is to avoid any attacks which can cause the server
 to consume resources in a non-linear relationship to the size of inputs.
 
 The mailing address is: [security@struts.apache.org](mailto:security@struts.apache.org)

apps/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>6.11.0</version>
+        <version>6.4.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>6.11.0</version>
+        <version>6.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-rest-showcase</artifactId>
     <packaging>war</packaging>
-    <version>6.11.0</version>
+    <version>6.4.0-SNAPSHOT</version>
     <name>Struts 2 Rest Showcase Webapp</name>
     <description>Struts 2 Rest Showcase Example</description>
 

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

@@ -18,30 +18,30 @@
  */
 package org.demo.rest.example;
 
+import java.util.Collection;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.struts2.rest.DefaultHttpHeaders;
+import org.apache.struts2.rest.HttpHeaders;
+import org.apache.struts2.convention.annotation.Results;
+import org.apache.struts2.convention.annotation.Result;
+
 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;
-import org.apache.struts2.convention.annotation.Results;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
-import org.apache.struts2.rest.DefaultHttpHeaders;
-import org.apache.struts2.rest.HttpHeaders;
-
-import java.util.Collection;
 
 @Results({
     @Result(name="success", type="redirectAction", params = {"actionName" , "orders"})
 })
-public class OrdersController extends ValidationAwareSupport implements ModelDriven<Object>, Validateable {
+public class OrdersController extends ValidationAwareSupport implements ModelDriven<Object>, Validateable{
 
     private static final Logger log = LogManager.getLogger(OrdersController.class);
 
     private Order model = new Order();
     private String id;
     private Collection<Order> list;
-    private final OrdersService ordersService = new OrdersService();
+    private OrdersService ordersService = new OrdersService();
 
     // GET /orders/1
     public HttpHeaders show() {
@@ -54,7 +54,7 @@ public class OrdersController extends ValidationAwareSupport implements ModelDri
         return new DefaultHttpHeaders("index")
             .disableCaching();
     }
-
+    
     // GET /orders/1/edit
     public String edit() {
         return "edit";
@@ -101,15 +101,13 @@ public class OrdersController extends ValidationAwareSupport implements ModelDri
         }
     }
 
-    @StrutsParameter
     public void setId(String id) {
         if (id != null) {
             this.model = ordersService.get(id);
         }
         this.id = id;
     }
-
-    @Override
+    
     public Object getModel() {
         return (list != null ? list : model);
     }

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

@@ -18,14 +18,11 @@
  */
 package org.demo.rest.example;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class OrdersService {
 
-    private static final Map<String,Order> orders = new HashMap<>();
+    private static Map<String,Order> orders = new HashMap<String,Order>();
     private static int nextId = 6;
     static {
         orders.put("3", new Order("3", "Bob", 33));

apps/showcase/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>6.11.0</version>
+        <version>6.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-showcase</artifactId>
@@ -121,10 +121,6 @@
             <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>opensymphony</groupId>
@@ -141,12 +137,6 @@
            <scope>test</scope>
        </dependency>
 
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-
        <dependency>
             <groupId>net.sourceforge.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
@@ -167,7 +157,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.5.6</version>
+                <version>3.0.0-M6</version>
                 <configuration>
                     <includes>
                         <include>it.org.apache.struts2.showcase.*Test</include>

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

@@ -21,7 +21,6 @@
 package org.apache.struts2.showcase;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 import org.apache.struts2.showcase.ajax.tree.Category;
 
 //START SNIPPET: treeExampleDynamicJavaSelected
@@ -31,7 +30,7 @@ public class DynamicTreeSelectAction extends ActionSupport {
 	private long nodeId;
 	private Category currentCategory;
 
-	@StrutsParameter
+
 	public void setNodeId(long nodeId) {
 		this.nodeId = nodeId;
 	}

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

@@ -21,7 +21,6 @@
 package org.apache.struts2.showcase;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -75,7 +74,6 @@ public class LotsOfOptiontransferselectAction extends ActionSupport {
 		return _favouriteCartoonCharactersKeys;
 	}
 
-	@StrutsParameter
 	public void setFavouriteCartoonCharacters(List favouriteCartoonCharacters) {
 		_favouriteCartoonCharactersKeys = favouriteCartoonCharacters;
 	}
@@ -84,7 +82,6 @@ public class LotsOfOptiontransferselectAction extends ActionSupport {
 		return _notFavouriteCartoonCharactersKeys;
 	}
 
-	@StrutsParameter
 	public void setNotFavouriteCartoonCharacters(List notFavouriteCartoonCharacters) {
 		_notFavouriteCartoonCharactersKeys = notFavouriteCartoonCharacters;
 	}
@@ -111,7 +108,6 @@ public class LotsOfOptiontransferselectAction extends ActionSupport {
 		return _favouriteCarsKeys;
 	}
 
-	@StrutsParameter
 	public void setFavouriteCars(List favouriteCars) {
 		_favouriteCarsKeys = favouriteCars;
 	}
@@ -120,7 +116,6 @@ public class LotsOfOptiontransferselectAction extends ActionSupport {
 		return _notFavouriteCarsKeys;
 	}
 
-	@StrutsParameter
 	public void setNotFavouriteCars(List notFavouriteCars) {
 		_notFavouriteCarsKeys = notFavouriteCars;
 	}
@@ -147,7 +142,6 @@ public class LotsOfOptiontransferselectAction extends ActionSupport {
 		return _favouriteMotorcyclesKeys;
 	}
 
-	@StrutsParameter
 	public void setFavouriteMotorcycles(List favouriteMotorcycles) {
 		_favouriteMotorcyclesKeys = favouriteMotorcycles;
 	}
@@ -156,7 +150,6 @@ public class LotsOfOptiontransferselectAction extends ActionSupport {
 		return _notFavouriteMotorcyclesKeys;
 	}
 
-	@StrutsParameter
 	public void setNotFavouriteMotorcycles(List notFavouriteMotorcycles) {
 		_notFavouriteMotorcyclesKeys = notFavouriteMotorcycles;
 	}
@@ -183,7 +176,6 @@ public class LotsOfOptiontransferselectAction extends ActionSupport {
 		return _favouriteCountriesKeys;
 	}
 
-	@StrutsParameter
 	public void setFavouriteCountries(List favouriteCountries) {
 		_favouriteCountriesKeys = favouriteCountries;
 	}
@@ -192,7 +184,6 @@ public class LotsOfOptiontransferselectAction extends ActionSupport {
 		return _notFavouriteCountriesKeys;
 	}
 
-	@StrutsParameter
 	public void setNotFavouriteCountries(List notFavouriteCountries) {
 		_notFavouriteCountriesKeys = notFavouriteCountries;
 	}
@@ -214,7 +205,6 @@ public class LotsOfOptiontransferselectAction extends ActionSupport {
 		return _favouriteSportsKeys;
 	}
 
-	@StrutsParameter
 	public void setFavouriteSports(List favouriteSportsKeys) {
 		this._favouriteSportsKeys = favouriteSportsKeys;
 	}
@@ -223,7 +213,6 @@ public class LotsOfOptiontransferselectAction extends ActionSupport {
 		return _nonFavouriteSportsKeys;
 	}
 
-	@StrutsParameter
 	public void setNonFavouriteSports(List notFavouriteSportsKeys) {
 		this._nonFavouriteSportsKeys = notFavouriteSportsKeys;
 	}
@@ -233,7 +222,6 @@ public class LotsOfOptiontransferselectAction extends ActionSupport {
 		return _prioritisedFavouriteCartoonCharacters;
 	}
 
-	@StrutsParameter
 	public void setPrioritisedFavouriteCartoonCharacters(List prioritisedFavouriteCartoonCharacters) {
 		_prioritisedFavouriteCartoonCharacters = prioritisedFavouriteCartoonCharacters;
 	}
@@ -242,7 +230,6 @@ public class LotsOfOptiontransferselectAction extends ActionSupport {
 		return _prioritisedFavouriteCars;
 	}
 
-	@StrutsParameter
 	public void setPrioritisedFavouriteCars(List prioritisedFavouriteCars) {
 		_prioritisedFavouriteCars = prioritisedFavouriteCars;
 	}
@@ -252,7 +239,6 @@ public class LotsOfOptiontransferselectAction extends ActionSupport {
 		return _prioritisedFavouriteCountries;
 	}
 
-	@StrutsParameter
 	public void setPrioritisedFavouriteCountries(List prioritisedFavouriteCountries) {
 		_prioritisedFavouriteCountries = prioritisedFavouriteCountries;
 	}
@@ -278,13 +264,12 @@ public class LotsOfOptiontransferselectAction extends ActionSupport {
 		return _favouriteCities;
 	}
 
-	@StrutsParameter
 	public void setFavouriteCities(List favouriteCities) {
 		this._favouriteCities = favouriteCities;
 	}
 
 	// actions
-	@Override
+
 	public String input() throws Exception {
 		return SUCCESS;
 	}

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

@@ -21,7 +21,6 @@
 package org.apache.struts2.showcase;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**
  *
@@ -37,7 +36,6 @@ public class LotsOfRichtexteditorAction extends ActionSupport {
 		return this.description1;
 	}
 
-	@StrutsParameter
 	public void setDescription1(String description1) {
 		this.description1 = description1;
 	}
@@ -47,7 +45,6 @@ public class LotsOfRichtexteditorAction extends ActionSupport {
 		return this.description2;
 	}
 
-	@StrutsParameter
 	public void setDescription2(String description2) {
 		this.description2 = description2;
 	}
@@ -57,7 +54,6 @@ public class LotsOfRichtexteditorAction extends ActionSupport {
 		return this.description3;
 	}
 
-	@StrutsParameter
 	public void setDescription3(String description3) {
 		this.description3 = description3;
 	}
@@ -67,12 +63,11 @@ public class LotsOfRichtexteditorAction extends ActionSupport {
 		return this.description4;
 	}
 
-	@StrutsParameter
 	public void setDescription4(String description4) {
 		this.description4 = description4;
 	}
 
-	@Override
+
 	public String input() throws Exception {
 		return SUCCESS;
 	}

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

@@ -21,7 +21,6 @@
 package org.apache.struts2.showcase;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -76,11 +75,11 @@ public class MoreSelectsAction extends ActionSupport {
 		return list;
 	}
 
+
 	public List getPrioritisedFavouriteCartoonCharacters() {
 		return _prioritisedFavouriteCartoonCharacters;
 	}
 
-	@StrutsParameter
 	public void setPrioritisedFavouriteCartoonCharacters(List prioritisedFavouriteCartoonCharacters) {
 		_prioritisedFavouriteCartoonCharacters = prioritisedFavouriteCartoonCharacters;
 	}
@@ -89,16 +88,15 @@ public class MoreSelectsAction extends ActionSupport {
 		return _prioritisedFavouriteCars;
 	}
 
-	@StrutsParameter
 	public void setPrioritisedFavouriteCars(List prioritisedFavouriteCars) {
 		_prioritisedFavouriteCars = prioritisedFavouriteCars;
 	}
 
+
 	public List getPrioritisedFavouriteCountries() {
 		return _prioritisedFavouriteCountries;
 	}
 
-	@StrutsParameter
 	public void setPrioritisedFavouriteCountries(List prioritisedFavouriteCountries) {
 		_prioritisedFavouriteCountries = prioritisedFavouriteCountries;
 	}
@@ -107,7 +105,6 @@ public class MoreSelectsAction extends ActionSupport {
 		return favouriteNumbers;
 	}
 
-	@StrutsParameter
 	public void setFavouriteNumbers(List favouriteNumbers) {
 		this.favouriteNumbers = favouriteNumbers;
 	}
@@ -132,13 +129,12 @@ public class MoreSelectsAction extends ActionSupport {
 		return favouriteCities;
 	}
 
-	@StrutsParameter
 	public void setFavouriteCities(List favouriteCities) {
 		this.favouriteCities = favouriteCities;
 	}
 
 	// actions
-	@Override
+
 	public String input() throws Exception {
 		return SUCCESS;
 	}

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

@@ -21,7 +21,6 @@
 package org.apache.struts2.showcase;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 import org.apache.struts2.showcase.ajax.tree.Category;
 
 public class ShowAjaxDynamicTreeAction extends ActionSupport {
@@ -35,7 +34,6 @@ public class ShowAjaxDynamicTreeAction extends ActionSupport {
 		return nodeId;
 	}
 
-	@StrutsParameter
 	public void setNodeId(int nodeId) {
 		this.nodeId = nodeId;
 	}

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

@@ -24,15 +24,9 @@ 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;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  */
@@ -95,7 +89,6 @@ public class UITagExample extends ActionSupport implements Validateable {
 		return leftSideCartoonCharacters;
 	}
 
-	@StrutsParameter
 	public void setLeftSideCartoonCharacters(List leftSideCartoonCharacters) {
 		this.leftSideCartoonCharacters = leftSideCartoonCharacters;
 	}
@@ -105,7 +98,6 @@ public class UITagExample extends ActionSupport implements Validateable {
 		return rightSideCartoonCharacters;
 	}
 
-	@StrutsParameter
 	public void setRightSideCartoonCharacters(List rightSideCartoonCharacters) {
 		this.rightSideCartoonCharacters = rightSideCartoonCharacters;
 	}
@@ -115,7 +107,6 @@ public class UITagExample extends ActionSupport implements Validateable {
 		return favouriteVehicalType;
 	}
 
-	@StrutsParameter
 	public void setFavouriteVehicalType(String favouriteVehicalType) {
 		this.favouriteVehicalType = favouriteVehicalType;
 	}
@@ -124,7 +115,6 @@ public class UITagExample extends ActionSupport implements Validateable {
 		return favouriteVehicalSpecific;
 	}
 
-	@StrutsParameter
 	public void setFavouriteVehicalSpecific(String favouriteVehicalSpecific) {
 		this.favouriteVehicalSpecific = favouriteVehicalSpecific;
 	}
@@ -155,7 +145,6 @@ public class UITagExample extends ActionSupport implements Validateable {
 		return name;
 	}
 
-	@StrutsParameter
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -164,7 +153,6 @@ public class UITagExample extends ActionSupport implements Validateable {
 		return birthday;
 	}
 
-	@StrutsParameter
 	public void setBirthday(Date birthday) {
 		this.birthday = birthday;
 	}
@@ -173,7 +161,6 @@ public class UITagExample extends ActionSupport implements Validateable {
 		return bio;
 	}
 
-	@StrutsParameter
 	public void setBio(String bio) {
 		this.bio = bio;
 	}
@@ -182,7 +169,6 @@ public class UITagExample extends ActionSupport implements Validateable {
 		return favouriteColor;
 	}
 
-	@StrutsParameter
 	public void setFavouriteColor(String favoriteColor) {
 		this.favouriteColor = favoriteColor;
 	}
@@ -191,7 +177,6 @@ public class UITagExample extends ActionSupport implements Validateable {
 		return friends;
 	}
 
-	@StrutsParameter
 	public void setFriends(List friends) {
 		this.friends = friends;
 	}
@@ -200,7 +185,6 @@ public class UITagExample extends ActionSupport implements Validateable {
 		return bestFriend;
 	}
 
-	@StrutsParameter
 	public void setBestFriend(String bestFriend) {
 		this.bestFriend = bestFriend;
 	}
@@ -209,7 +193,6 @@ public class UITagExample extends ActionSupport implements Validateable {
 		return legalAge;
 	}
 
-	@StrutsParameter
 	public void setLegalAge(boolean legalAge) {
 		this.legalAge = legalAge;
 	}
@@ -218,7 +201,6 @@ public class UITagExample extends ActionSupport implements Validateable {
 		return state;
 	}
 
-	@StrutsParameter
 	public void setState(String state) {
 		this.state = state;
 	}
@@ -227,12 +209,10 @@ public class UITagExample extends ActionSupport implements Validateable {
 		return region;
 	}
 
-	@StrutsParameter
 	public void setRegion(String region) {
 		this.region = region;
 	}
 
-	@StrutsParameter
 	public void setPicture(File picture) {
 		this.picture = picture;
 	}
@@ -241,17 +221,14 @@ public class UITagExample extends ActionSupport implements Validateable {
 		return this.picture;
 	}
 
-	@StrutsParameter
 	public void setPictureContentType(String pictureContentType) {
 		this.pictureContentType = pictureContentType;
 	}
 
-	@StrutsParameter
 	public void setPictureFileName(String pictureFileName) {
 		this.pictureFileName = pictureFileName;
 	}
 
-	@StrutsParameter
 	public void setFavouriteLanguage(String favouriteLanguage) {
 		this.favouriteLanguage = favouriteLanguage;
 	}
@@ -260,7 +237,7 @@ public class UITagExample extends ActionSupport implements Validateable {
 		return favouriteLanguage;
 	}
 
-	@StrutsParameter
+
 	public void setThoughts(String thoughts) {
 		this.thoughts = thoughts;
 	}
@@ -273,7 +250,6 @@ public class UITagExample extends ActionSupport implements Validateable {
 		return wakeup;
 	}
 
-	@StrutsParameter
 	public void setWakeup(Date wakeup) {
 		this.wakeup = wakeup;
 	}
@@ -327,7 +303,6 @@ public class UITagExample extends ActionSupport implements Validateable {
 			return this.description;
 		}
 
-		@Override
 		public boolean equals(Object obj) {
 			if (!(obj instanceof VehicalType)) {
 				return false;
@@ -336,7 +311,6 @@ public class UITagExample extends ActionSupport implements Validateable {
 			}
 		}
 
-		@Override
 		public int hashCode() {
 			return key.hashCode();
 		}
@@ -360,7 +334,6 @@ public class UITagExample extends ActionSupport implements Validateable {
 			return this.description;
 		}
 
-		@Override
 		public boolean equals(Object obj) {
 			if (!(obj instanceof VehicalSpecific)) {
 				return false;
@@ -369,7 +342,6 @@ public class UITagExample extends ActionSupport implements Validateable {
 			}
 		}
 
-		@Override
 		public int hashCode() {
 			return key.hashCode();
 		}

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

@@ -21,7 +21,6 @@ package org.apache.struts2.showcase.action;
 import com.opensymphony.xwork2.ActionSupport;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 import org.apache.struts2.showcase.dao.Dao;
 import org.apache.struts2.showcase.model.IdEntity;
 
@@ -34,62 +33,62 @@ import java.util.Collection;
 
 public abstract class AbstractCRUDAction extends ActionSupport {
 
-    private static final Logger log = LogManager.getLogger(AbstractCRUDAction.class);
+	private static final Logger log = LogManager.getLogger(AbstractCRUDAction.class);
 
-    private Collection availableItems;
-    private String[] toDelete;
+	private Collection availableItems;
+	private String[] toDelete;
 
-    protected abstract Dao getDao();
+	protected abstract Dao getDao();
 
-    public Collection getAvailableItems() {
-        return availableItems;
-    }
 
-    public String[] getToDelete() {
-        return toDelete;
-    }
+	public Collection getAvailableItems() {
+		return availableItems;
+	}
 
-    @StrutsParameter
-    public void setToDelete(String[] toDelete) {
-        this.toDelete = toDelete;
-    }
+	public String[] getToDelete() {
+		return toDelete;
+	}
 
-    public String list() throws Exception {
-        this.availableItems = getDao().findAll();
-        if (log.isDebugEnabled()) {
-            log.debug("AbstractCRUDAction - [list]: " + (availableItems != null ? "" + availableItems.size() : "no") + " items found");
-        }
-        return execute();
-    }
+	public void setToDelete(String[] toDelete) {
+		this.toDelete = toDelete;
+	}
 
-    public String delete() throws Exception {
-        if (toDelete != null) {
-            int count = 0;
-            for (String s : toDelete) {
-                count = count + getDao().delete(s);
-            }
-            if (log.isDebugEnabled()) {
-                log.debug("AbstractCRUDAction - [delete]: {} items deleted.", count);
-            }
-        }
-        return SUCCESS;
-    }
+	public String list() throws Exception {
+		this.availableItems = getDao().findAll();
+		if (log.isDebugEnabled()) {
+			log.debug("AbstractCRUDAction - [list]: " + (availableItems != null ? "" + availableItems.size() : "no") + " items found");
+		}
+		return execute();
+	}
 
-    /**
-     * Utility method for fetching already persistent object from storage for usage in params-prepare-params cycle.
-     *
-     * @param tryId     The id to try to get persistent object for
-     * @param tryObject The object, induced by first params invocation, possibly containing id to try to get persistent
-     *                  object for
-     * @return The persistent object, if found. <tt>null</tt> otherwise.
-     */
-    protected IdEntity fetch(Serializable tryId, IdEntity tryObject) {
-        IdEntity result = null;
-        if (tryId != null) {
-            result = getDao().get(tryId);
-        } else if (tryObject != null) {
-            result = getDao().get(tryObject.getId());
-        }
-        return result;
-    }
+	public String delete() throws Exception {
+		if (toDelete != null) {
+			int count = 0;
+			for (int i = 0, j = toDelete.length; i < j; i++) {
+				count = count + getDao().delete(toDelete[i]);
+			}
+			if (log.isDebugEnabled()) {
+				log.debug("AbstractCRUDAction - [delete]: " + count + " items deleted.");
+			}
+		}
+		return SUCCESS;
+	}
+
+	/**
+	 * Utility method for fetching already persistent object from storage for usage in params-prepare-params cycle.
+	 *
+	 * @param tryId     The id to try to get persistent object for
+	 * @param tryObject The object, induced by first params invocation, possibly containing id to try to get persistent
+	 *                  object for
+	 * @return The persistent object, if found. <tt>null</tt> otherwise.
+	 */
+	protected IdEntity fetch(Serializable tryId, IdEntity tryObject) {
+		IdEntity result = null;
+		if (tryId != null) {
+			result = getDao().get(tryId);
+		} else if (tryObject != null) {
+			result = getDao().get(tryObject.getId());
+		}
+		return result;
+	}
 }

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

@@ -21,7 +21,6 @@ package org.apache.struts2.showcase.action;
 import com.opensymphony.xwork2.Preparable;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 import org.apache.struts2.showcase.application.TestDataProvider;
 import org.apache.struts2.showcase.dao.Dao;
 import org.apache.struts2.showcase.dao.EmployeeDao;
@@ -53,7 +52,7 @@ public class EmployeeAction extends AbstractCRUDAction implements Preparable {
 
 	public String execute() throws Exception {
 		if (getCurrentEmployee() != null && getCurrentEmployee().getOtherSkills() != null) {
-			setSelectedSkills(new ArrayList<>());
+			setSelectedSkills(new ArrayList<String>());
 			Iterator it = getCurrentEmployee().getOtherSkills().iterator();
 			while (it.hasNext()) {
 				getSelectedSkills().add(((Skill) it.next()).getName());
@@ -74,12 +73,10 @@ public class EmployeeAction extends AbstractCRUDAction implements Preparable {
 		return empId;
 	}
 
-	@StrutsParameter
 	public void setEmpId(Long empId) {
 		this.empId = empId;
 	}
 
-	@StrutsParameter(depth = 2)
 	public Employee getCurrentEmployee() {
 		return currentEmployee;
 	}

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

@@ -20,11 +20,7 @@ package org.apache.struts2.showcase.action;
 
 import com.opensymphony.xwork2.ActionSupport;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class ExampleAction extends ActionSupport {
 	public static final String CONSTANT = "Struts Rocks!";
@@ -50,7 +46,7 @@ public class ExampleAction extends ActionSupport {
 	}
 
 	public Map<String, Book> getBooks() {
-		Map<String, Book> books = new HashMap<>();
+		Map<String, Book> books = new HashMap<String, Book>();
 		books.put("Iliad", new Book("Iliad", "Homer"));
 		books.put("The Republic", new Book("The Replublic", "Plato"));
 		books.put("Thus Spake Zarathustra", new Book("Thus Spake Zarathustra",
@@ -83,4 +79,4 @@ class Book {
 	public void setAuthor(String author) {
 		this.author = author;
 	}
-}
+}

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

@@ -21,13 +21,8 @@ package org.apache.struts2.showcase.action;
 import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.interceptor.annotations.After;
 import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
+import java.io.*;
 import java.net.URL;
 
 /**
@@ -67,7 +62,6 @@ public class JSPEvalAction extends ExampleAction {
 		}
 	}
 
-	@StrutsParameter
 	public void setJsp(String jsp) {
 		this.jsp = jsp;
 	}

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

@@ -1,133 +0,0 @@
-/*
- * 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.
- */
-package org.apache.struts2.showcase.action;
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
-import org.apache.struts2.showcase.model.MyDto;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static java.util.Collections.singletonList;
-import static java.util.Collections.singletonMap;
-
-/**
- * This class supports {@link com.atlassian.confluence.stateless.webdriver.selenium3.security.StrutsParametersTest}
- * which prevents critical security regressions. Do NOT modify without understanding the motivation behind the tests and
- * the implications of any changes.
- */
-public class ParamsAnnotationAction extends ActionSupport {
-
-    @StrutsParameter
-    public String varToPrint;
-
-    public String publicField = "no";
-
-    @StrutsParameter
-    public String publicFieldAnnotated = "no";
-
-    private String privateField = "no";
-
-    public int[] publicArray = new int[]{0};
-
-    @StrutsParameter(depth = 1)
-    public int[] publicArrayAnnotated = new int[]{0};
-
-    public List<String> publicList = new ArrayList<>(singletonList("no"));
-
-    @StrutsParameter(depth = 1)
-    public List<String> publicListAnnotated = new ArrayList<>(singletonList("no"));
-
-    private List<String> privateList = new ArrayList<>(singletonList("no"));
-
-    public Map<String, String> publicMap = new HashMap<>(singletonMap("key", "no"));
-
-    @StrutsParameter(depth = 1)
-    public Map<String, String> publicMapAnnotated = new HashMap<>(singletonMap("key", "no"));
-
-    public MyDto publicMyDto = new MyDto();
-
-    @StrutsParameter(depth = 2)
-    public MyDto publicMyDtoAnnotated = new MyDto();
-
-    @StrutsParameter(depth = 1)
-    public MyDto publicMyDtoAnnotatedDepthOne = new MyDto();
-
-    private MyDto privateMyDto = new MyDto();
-
-    public void setPrivateFieldMethod(String privateField) {
-        this.privateField = privateField;
-    }
-
-    @StrutsParameter
-    public void setPrivateFieldMethodAnnotated(String privateField) {
-        this.privateField = privateField;
-    }
-
-    public List<String> getPrivateListMethod() {
-        return privateList;
-    }
-
-    @StrutsParameter(depth = 1)
-    public List<String> getPrivateListMethodAnnotated() {
-        return privateList;
-    }
-
-    public MyDto getUnsafeMethodMyDto() {
-        return privateMyDto;
-    }
-
-    @StrutsParameter(depth = 2)
-    public MyDto getSafeMethodMyDto() {
-        return privateMyDto;
-    }
-
-    @StrutsParameter(depth = 1)
-    public MyDto getSafeMethodMyDtoDepthOne() {
-        return privateMyDto;
-    }
-
-    public String renderVarToPrint() throws ReflectiveOperationException {
-        if (varToPrint == null) {
-            return "null";
-        }
-        Field field = this.getClass().getDeclaredField(varToPrint);
-        field.setAccessible(true);
-        try {
-            return String.format("%s{%s}", varToPrint,
-                    field.getType().isArray() ? stringifyArray(field.get(this)) : field.get(this));
-        } finally {
-            field.setAccessible(false);
-        }
-    }
-
-    private String stringifyArray(Object array) {
-        switch (array.getClass().getComponentType().getName()) {
-            case "int":
-                return Arrays.toString((int[]) array);
-            default:
-                return "TODO";
-        }
-    }
-}

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

@@ -21,7 +21,6 @@ package org.apache.struts2.showcase.action;
 import com.opensymphony.xwork2.Preparable;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 import org.apache.struts2.showcase.dao.Dao;
 import org.apache.struts2.showcase.dao.SkillDao;
 import org.apache.struts2.showcase.model.Skill;
@@ -46,7 +45,6 @@ public class SkillAction extends AbstractCRUDAction implements Preparable {
 	 *
 	 * @throws Exception thrown if a system level exception occurs.
 	 */
-	@Override
 	public void prepare() throws Exception {
 		Skill preFetched = (Skill) fetch(getSkillName(), getCurrentSkill());
 		if (preFetched != null) {
@@ -65,7 +63,6 @@ public class SkillAction extends AbstractCRUDAction implements Preparable {
 		return skillName;
 	}
 
-	@StrutsParameter
 	public void setSkillName(String skillName) {
 		this.skillName = skillName;
 	}
@@ -74,7 +71,6 @@ public class SkillAction extends AbstractCRUDAction implements Preparable {
 		return skillDao;
 	}
 
-	@StrutsParameter(depth = 1)
 	public Skill getCurrentSkill() {
 		return currentSkill;
 	}

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

@@ -19,7 +19,6 @@
 package org.apache.struts2.showcase.actionchaining;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 public class ActionChain1 extends ActionSupport {
 
@@ -27,7 +26,6 @@ public class ActionChain1 extends ActionSupport {
 
 	private String actionChain1Property1 = "Property Set In Action Chain 1";
 
-	@Override
 	public String input() throws Exception {
 		return SUCCESS;
 	}
@@ -36,7 +34,6 @@ public class ActionChain1 extends ActionSupport {
 		return actionChain1Property1;
 	}
 
-	@StrutsParameter
 	public void setActionChain1Property1(String actionChain1Property1) {
 		this.actionChain1Property1 = actionChain1Property1;
 	}

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

@@ -19,7 +19,6 @@
 package org.apache.struts2.showcase.actionchaining;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 public class ActionChain2 extends ActionSupport {
 
@@ -28,7 +27,6 @@ public class ActionChain2 extends ActionSupport {
 	private String actionChain1Property1;
 	private String actionChain2Property1 = "Property Set in Action Chain 2";
 
-	@Override
 	public String execute() throws Exception {
 		return SUCCESS;
 	}
@@ -37,16 +35,15 @@ public class ActionChain2 extends ActionSupport {
 		return actionChain1Property1;
 	}
 
-	@StrutsParameter
 	public void setActionChain1Property1(String actionChain1Property1) {
 		this.actionChain1Property1 = actionChain1Property1;
 	}
 
+
 	public String getActionChain2Property1() {
 		return actionChain2Property1;
 	}
 
-	@StrutsParameter
 	public void setActionChain2Property1(String actionChain2Property1) {
 		this.actionChain2Property1 = actionChain2Property1;
 	}

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

@@ -19,7 +19,6 @@
 package org.apache.struts2.showcase.actionchaining;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 public class ActionChain3 extends ActionSupport {
 
@@ -29,7 +28,7 @@ public class ActionChain3 extends ActionSupport {
 	private String actionChain2Property1;
 	private String actionChain3Property1 = "Property set in Action Chain 3";
 
-	@Override
+
 	public String execute() throws Exception {
 		return SUCCESS;
 	}
@@ -38,25 +37,24 @@ public class ActionChain3 extends ActionSupport {
 		return actionChain1Property1;
 	}
 
-	@StrutsParameter
 	public void setActionChain1Property1(String actionChain1Property1) {
 		this.actionChain1Property1 = actionChain1Property1;
 	}
 
+
 	public String getActionChain2Property1() {
 		return actionChain2Property1;
 	}
 
-	@StrutsParameter
 	public void setActionChain2Property1(String actionChain2Property1) {
 		this.actionChain2Property1 = actionChain2Property1;
 	}
 
+
 	public String getActionChain3Property1() {
 		return actionChain3Property1;
 	}
 
-	@StrutsParameter
 	public void setActionChain3Property1(String actionChain3Property1) {
 		this.actionChain3Property1 = actionChain3Property1;
 	}

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

@@ -21,10 +21,10 @@
 package org.apache.struts2.showcase.ajax;
 
 import com.opensymphony.xwork2.Action;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.io.Serializable;
 
+
 public class AjaxTestAction implements Action, Serializable {
 
 	private static int counter = 0;
@@ -46,7 +46,6 @@ public class AjaxTestAction implements Action, Serializable {
 		return data;
 	}
 
-	@StrutsParameter
 	public void setData(String data) {
 		this.data = data;
 	}

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

@@ -21,18 +21,16 @@
 package org.apache.struts2.showcase.ajax;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class AutocompleterExampleAction extends ActionSupport {
 	private String select;
-	private final List<String> options = new ArrayList<>();
+	private List<String> options = new ArrayList<String>();
 
 	private static final long serialVersionUID = -8481638176160014396L;
 
-	@Override
 	public String execute() throws Exception {
 		if ("fruits".equals(select)) {
 			options.add("apple");
@@ -51,7 +49,6 @@ public class AutocompleterExampleAction extends ActionSupport {
 		return select;
 	}
 
-	@StrutsParameter
 	public void setSelect(String select) {
 		this.select = select;
 	}

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

@@ -21,7 +21,6 @@
 package org.apache.struts2.showcase.ajax;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -52,7 +51,6 @@ public class Example4ShowPanelAction extends ActionSupport {
 		return gender;
 	}
 
-	@StrutsParameter
 	public void setGender(String gender) {
 		this.gender = gender;
 	}
@@ -61,7 +59,6 @@ public class Example4ShowPanelAction extends ActionSupport {
 		return name;
 	}
 
-	@StrutsParameter
 	public void setName(String name) {
 		this.name = name;
 	}

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

@@ -21,7 +21,6 @@
 package org.apache.struts2.showcase.ajax;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 public class Example5Action extends ActionSupport {
 
@@ -38,7 +37,6 @@ public class Example5Action extends ActionSupport {
 		return name;
 	}
 
-	@StrutsParameter
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -47,7 +45,6 @@ public class Example5Action extends ActionSupport {
 		return age;
 	}
 
-	@StrutsParameter
 	public void setAge(Integer age) {
 		this.age = age;
 	}

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

@@ -21,7 +21,6 @@
 package org.apache.struts2.showcase.ajax.tree;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**
  */
@@ -29,7 +28,6 @@ public class GetCategory extends ActionSupport {
 	private long catId;
 	private Category category;
 
-	@Override
 	public String execute() throws Exception {
 		if (catId < 1) {
 			// force the root
@@ -41,7 +39,6 @@ public class GetCategory extends ActionSupport {
 		return SUCCESS;
 	}
 
-	@StrutsParameter
 	public void setCatId(long catId) {
 		this.catId = catId;
 	}

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

@@ -24,8 +24,6 @@ package org.apache.struts2.showcase.ajax.tree;
 /**
  */
 public class Toggle extends GetCategory {
-
-	@Override
 	public String execute() throws Exception {
 		super.execute();
 

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

@@ -19,7 +19,6 @@
 package org.apache.struts2.showcase.async;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,12 +34,10 @@ public class ChatRoomAction extends ActionSupport {
 
     private static final List<String> messages = new ArrayList<>();
 
-    @StrutsParameter
     public void setMessage(String message) {
         this.message = message;
     }
 
-    @StrutsParameter
     public void setLastIndex(Integer lastIndex) {
         this.lastIndex = lastIndex;
     }
@@ -50,12 +47,15 @@ public class ChatRoomAction extends ActionSupport {
     }
 
     public Callable<String> receiveNewMessages() throws Exception {
-        return () -> {
-            while (lastIndex >= messages.size()) {
-                Thread.sleep(3000);
+        return new Callable<String>() {
+            @Override
+            public String call() throws Exception {
+                while (lastIndex >= messages.size()) {
+                    Thread.sleep(3000);
+                }
+                newMessages = messages.subList(lastIndex, messages.size());
+                return SUCCESS;
             }
-            newMessages = messages.subList(lastIndex, messages.size());
-            return SUCCESS;
         };
     }
 

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

@@ -21,11 +21,11 @@
 package org.apache.struts2.showcase.chat;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.action.SessionAware;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.Map;
 
+import org.apache.struts2.action.SessionAware;
+
 public class ChatLoginAction extends ActionSupport implements SessionAware {
 
 	private static final long serialVersionUID = 1L;
@@ -43,7 +43,6 @@ public class ChatLoginAction extends ActionSupport implements SessionAware {
 		return this.name;
 	}
 
-	@StrutsParameter
 	public void setName(String name) {
 		this.name = name;
 	}

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

@@ -21,7 +21,6 @@
 package org.apache.struts2.showcase.chat;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 public class CrudRoomAction extends ActionSupport {
 
@@ -37,7 +36,6 @@ public class CrudRoomAction extends ActionSupport {
 		return description;
 	}
 
-	@StrutsParameter
 	public void setDescription(String description) {
 		this.description = description;
 	}
@@ -46,7 +44,6 @@ public class CrudRoomAction extends ActionSupport {
 		return name;
 	}
 
-	@StrutsParameter
 	public void setName(String name) {
 		this.name = name;
 	}

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

@@ -21,11 +21,11 @@
 package org.apache.struts2.showcase.chat;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.action.SessionAware;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.Map;
 
+import org.apache.struts2.action.SessionAware;
+
 public class EnterRoomAction extends ActionSupport implements SessionAware {
 
 	private static final long serialVersionUID = 1L;
@@ -38,7 +38,6 @@ public class EnterRoomAction extends ActionSupport implements SessionAware {
 		return this.roomName;
 	}
 
-	@StrutsParameter
 	public void setRoomName(String roomName) {
 		this.roomName = roomName;
 	}

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

@@ -21,11 +21,11 @@
 package org.apache.struts2.showcase.chat;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.action.SessionAware;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.Map;
 
+import org.apache.struts2.action.SessionAware;
+
 public class ExitRoomAction extends ActionSupport implements SessionAware {
 
 	private static final long serialVersionUID = 1L;
@@ -38,7 +38,6 @@ public class ExitRoomAction extends ActionSupport implements SessionAware {
 		return roomName;
 	}
 
-	@StrutsParameter
 	public void setRoomName(String roomName) {
 		this.roomName = roomName;
 	}

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

@@ -21,7 +21,6 @@
 package org.apache.struts2.showcase.chat;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,14 +30,13 @@ public class MessagesAvailableInRoomAction extends ActionSupport {
 	private static final long serialVersionUID = 1L;
 
 	private String roomName;
-	private final ChatService chatService;
-	private List<ChatMessage> messagesAvailableInRoom = new ArrayList<>();
+	private ChatService chatService;
+	private List<ChatMessage> messagesAvailableInRoom = new ArrayList<ChatMessage>();
 
 	public String getRoomName() {
 		return this.roomName;
 	}
 
-	@StrutsParameter
 	public void setRoomName(String roomName) {
 		this.roomName = roomName;
 	}

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

@@ -21,16 +21,16 @@
 package org.apache.struts2.showcase.chat;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.action.SessionAware;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.Map;
 
+import org.apache.struts2.action.SessionAware;
+
 public class SendMessageToRoomAction extends ActionSupport implements SessionAware {
 
 	private static final long serialVersionUID = 1L;
 
-	private final ChatService chatService;
+	private ChatService chatService;
 
 	private String roomName;
 	private String message;
@@ -45,7 +45,6 @@ public class SendMessageToRoomAction extends ActionSupport implements SessionAwa
 		return this.roomName;
 	}
 
-	@StrutsParameter
 	public void setRoomName(String roomName) {
 		this.roomName = roomName;
 	}
@@ -54,12 +53,11 @@ public class SendMessageToRoomAction extends ActionSupport implements SessionAwa
 		return this.message;
 	}
 
-	@StrutsParameter
 	public void setMessage(String message) {
 		this.message = message;
 	}
 
-	@Override
+
 	public String execute() throws Exception {
 		User user = (User) session.get(ChatAuthenticationInterceptor.USER_SESSION_KEY);
 		try {

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

@@ -21,7 +21,6 @@
 package org.apache.struts2.showcase.chat;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,8 +29,8 @@ public class UsersAvailableInRoomAction extends ActionSupport {
 
 	private static final long serialVersionUID = 1L;
 
-	private final ChatService chatService;
-	private List<User> usersAvailableInRoom = new ArrayList<>();
+	private ChatService chatService;
+	private List<User> usersAvailableInRoom = new ArrayList<User>();
 
 	private String roomName;
 
@@ -44,7 +43,6 @@ public class UsersAvailableInRoomAction extends ActionSupport {
 		return this.roomName;
 	}
 
-	@StrutsParameter
 	public void setRoomName(String roomName) {
 		this.roomName = roomName;
 	}
@@ -53,7 +51,6 @@ public class UsersAvailableInRoomAction extends ActionSupport {
 		return usersAvailableInRoom;
 	}
 
-	@Override
 	public String execute() throws Exception {
 		try {
 			usersAvailableInRoom = chatService.getUsersAvailableInRoom(roomName);

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

@@ -21,7 +21,6 @@
 package org.apache.struts2.showcase.conversion;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
@@ -31,7 +30,7 @@ import java.util.Set;
  */
 public class AddressAction extends ActionSupport {
 
-	private Set<Address> addresses = new LinkedHashSet<>();
+	private Set<Address> addresses = new LinkedHashSet<Address>();
 
 	public String input() throws Exception {
 		return SUCCESS;
@@ -42,7 +41,6 @@ public class AddressAction extends ActionSupport {
 		return SUCCESS;
 	}
 
-	@StrutsParameter(depth = 2)
 	public Set<Address> getAddresses() {
 		return addresses;
 	}

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

@@ -21,7 +21,6 @@
 package org.apache.struts2.showcase.conversion;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.Arrays;
 import java.util.LinkedList;
@@ -34,7 +33,7 @@ public class OperationsEnumAction extends ActionSupport {
 
 	private static final long serialVersionUID = -2229489704988870318L;
 
-	private List<OperationsEnum> selectedOperations = new LinkedList<>();
+	private List<OperationsEnum> selectedOperations = new LinkedList<OperationsEnum>();
 
 	public String input() throws Exception {
 		return SUCCESS;
@@ -48,11 +47,11 @@ public class OperationsEnumAction extends ActionSupport {
 		return this.selectedOperations;
 	}
 
-	@StrutsParameter
 	public void setSelectedOperations(List<OperationsEnum> selectedOperations) {
 		this.selectedOperations = selectedOperations;
 	}
 
+
 	public List<OperationsEnum> getAvailableOperations() {
 		return Arrays.asList(OperationsEnum.values());
 	}

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

@@ -21,7 +21,6 @@
 package org.apache.struts2.showcase.conversion;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.List;
 
@@ -37,7 +36,6 @@ public class PersonAction extends ActionSupport {
 		return SUCCESS;
 	}
 
-	@StrutsParameter(depth = 2)
 	public List<Person> getPersons() {
 		return persons;
 	}

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

@@ -22,7 +22,6 @@ package org.apache.struts2.showcase.filedownload;
 
 import com.opensymphony.xwork2.Action;
 import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.io.InputStream;
 
@@ -39,7 +38,6 @@ public class FileDownloadAction implements Action {
 		return SUCCESS;
 	}
 
-	@StrutsParameter
 	public void setInputPath(String value) {
 		inputPath = sanitizeInputPath(value);
 	}

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

@@ -23,7 +23,6 @@ package org.apache.struts2.showcase.fileupload;
 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;
 
 import java.util.List;
 
@@ -37,7 +36,6 @@ public class FileUploadAction extends ActionSupport implements UploadedFilesAwar
     private String fileName;
     private String caption;
     private String originalName;
-    private String inputName;
 
     public String input() throws Exception {
         return SUCCESS;
@@ -59,10 +57,6 @@ public class FileUploadAction extends ActionSupport implements UploadedFilesAwar
         return originalName;
     }
 
-    public String getInputName() {
-        return inputName;
-    }
-
     public Object getUploadedFile() {
         return uploadedFile.getContent();
     }
@@ -71,7 +65,6 @@ public class FileUploadAction extends ActionSupport implements UploadedFilesAwar
         return caption;
     }
 
-    @StrutsParameter
     public void setCaption(String caption) {
         this.caption = caption;
     }
@@ -90,6 +83,5 @@ public class FileUploadAction extends ActionSupport implements UploadedFilesAwar
         this.fileName = uploadedFile.getName();
         this.contentType = uploadedFile.getContentType();
         this.originalName = uploadedFile.getOriginalName();
-        this.inputName = uploadedFile.getInputName();
     }
 }

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

@@ -22,55 +22,61 @@
 package org.apache.struts2.showcase.fileupload;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.action.UploadedFilesAware;
-import org.apache.struts2.dispatcher.multipart.UploadedFile;
 
-import java.util.List;
+import java.io.File;
 
 /**
- * Showcase action - multiple file upload using array.
+ * Showcase action - mutiple file upload using array.
+ *
+ * @version $Date$ $Id$
  */
-public class MultipleFileUploadUsingArrayAction extends ActionSupport implements UploadedFilesAware {
+public class MultipleFileUploadUsingArrayAction extends ActionSupport {
 
-    private List<UploadedFile> uploadedFiles;
+	private File[] uploads = new File[0];
+	private String[] uploadFileNames = new String[0];
+	private String[] uploadContentTypes = new String[0];
 
-    public List<UploadedFile> getUpload() {
-        return this.uploadedFiles;
-    }
 
-    public String upload() throws Exception {
-        System.out.println("\n\n upload2");
-        System.out.println("files:");
-        for (UploadedFile u : uploadedFiles) {
-            System.out.println("*** " + u + "\t" + u.length());
-        }
-        System.out.println("filenames:");
-        for (String n : getUploadFileNames()) {
-            System.out.println("*** " + n);
-        }
-        System.out.println("content types:");
-        for (String c : getUploadContentTypes()) {
-            System.out.println("*** " + c);
-        }
-        System.out.println("\n\n");
-        return SUCCESS;
-    }
+	public String upload() throws Exception {
+		System.out.println("\n\n upload2");
+		System.out.println("files:");
+		for (File u : uploads) {
+			System.out.println("*** " + u + "\t" + u.length());
+		}
+		System.out.println("filenames:");
+		for (String n : uploadFileNames) {
+			System.out.println("*** " + n);
+		}
+		System.out.println("content types:");
+		for (String c : uploadContentTypes) {
+			System.out.println("*** " + c);
+		}
+		System.out.println("\n\n");
+		return SUCCESS;
+	}
 
-    @Override
-    public void withUploadedFiles(List<UploadedFile> uploadedFiles) {
-        this.uploadedFiles = uploadedFiles;
-    }
+	public File[] getUpload() {
+		return this.uploads;
+	}
 
-    private String[] getUploadFileNames() {
-        return this.uploadedFiles.stream()
-                .map(UploadedFile::getOriginalName)
-                .toArray(String[]::new);
-    }
+	public void setUpload(File[] upload) {
+		this.uploads = upload;
+	}
 
-    private String[] getUploadContentTypes() {
-        return this.uploadedFiles.stream()
-                .map(UploadedFile::getContentType)
-                .toArray(String[]::new);
-    }
+	public String[] getUploadFileName() {
+		return this.uploadFileNames;
+	}
 
+	public void setUploadFileName(String[] uploadFileName) {
+		this.uploadFileNames = uploadFileName;
+	}
+
+	public String[] getUploadContentType() {
+		return this.uploadContentTypes;
+	}
+
+	public void setUploadContentType(String[] uploadContentType) {
+		this.uploadContentTypes = uploadContentType;
+	}
 }
+// END SNIPPET: entire-file

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

@@ -22,56 +22,64 @@
 package org.apache.struts2.showcase.fileupload;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.action.UploadedFilesAware;
-import org.apache.struts2.dispatcher.multipart.UploadedFile;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * Showcase action - multiple file upload using List
+ *
+ * @version $Date$ $Id$
  */
-public class MultipleFileUploadUsingListAction extends ActionSupport implements UploadedFilesAware {
+public class MultipleFileUploadUsingListAction extends ActionSupport {
 
-    private List<UploadedFile> uploads = new ArrayList<>();
+	private List<File> uploads = new ArrayList<>();
+	private List<String> uploadFileNames = new ArrayList<>();
+	private List<String> uploadContentTypes = new ArrayList<>();
 
-    public List<UploadedFile> getUpload() {
-        return this.uploads;
-    }
 
-    @Override
-    public void withUploadedFiles(List<UploadedFile> uploads) {
-        this.uploads = uploads;
-    }
+	public List<File> getUpload() {
+		return this.uploads;
+	}
 
-    private List<String> getUploadFileNames() {
-        return this.uploads.stream()
-                .map(UploadedFile::getOriginalName)
-                .collect(Collectors.toList());
-    }
+	public void setUpload(List<File> uploads) {
+		this.uploads = uploads;
+	}
 
-    private List<String> getUploadContentTypes() {
-        return this.uploads.stream()
-                .map(UploadedFile::getContentType)
-                .collect(Collectors.toList());
-    }
+	public List<String> getUploadFileName() {
+		return this.uploadFileNames;
+	}
 
-    public String upload() throws Exception {
-        System.out.println("\n\n upload1");
-        System.out.println("files:");
-        for (UploadedFile u : uploads) {
-            System.out.println("*** " + u + "\t" + u.length());
-        }
-        System.out.println("filenames:");
-        for (String n : getUploadFileNames()) {
-            System.out.println("*** " + n);
-        }
-        System.out.println("content types:");
-        for (String c : getUploadContentTypes()) {
-            System.out.println("*** " + c);
-        }
-        System.out.println("\n\n");
-        return SUCCESS;
-    }
-}
+	public void setUploadFileName(List<String> uploadFileNames) {
+		this.uploadFileNames = uploadFileNames;
+	}
+
+	public List<String> getUploadContentType() {
+		return this.uploadContentTypes;
+	}
+
+	public void setUploadContentType(List<String> contentTypes) {
+		this.uploadContentTypes = contentTypes;
+	}
+
+	public String upload() throws Exception {
+
+		System.out.println("\n\n upload1");
+		System.out.println("files:");
+		for (File u : uploads) {
+			System.out.println("*** " + u + "\t" + u.length());
+		}
+		System.out.println("filenames:");
+		for (String n : uploadFileNames) {
+			System.out.println("*** " + n);
+		}
+		System.out.println("content types:");
+		for (String c : uploadContentTypes) {
+			System.out.println("*** " + c);
+		}
+		System.out.println("\n\n");
+		return SUCCESS;
+	}
+}
+// END SNIPPET: entire-file

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

@@ -22,7 +22,6 @@ package org.apache.struts2.showcase.freemarker;
 
 import com.opensymphony.xwork2.ActionSupport;
 import com.opensymphony.xwork2.Preparable;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.text.DateFormatSymbols;
 
@@ -35,7 +34,6 @@ public class StandardTagsAction extends ActionSupport implements Preparable {
 	private String[] gender;
 	private String[] months;
 
-	@Override
 	public void prepare() {
 		months = new DateFormatSymbols().getMonths();
 		name = StandardTagsAction.class.getName().substring(StandardTagsAction.class.getName().lastIndexOf(".") + 1);
@@ -46,7 +44,6 @@ public class StandardTagsAction extends ActionSupport implements Preparable {
 		return name;
 	}
 
-	@StrutsParameter
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -55,16 +52,15 @@ public class StandardTagsAction extends ActionSupport implements Preparable {
 		return months;
 	}
 
-	@StrutsParameter
 	public void setMonths(String[] months) {
 		this.months = months;
 	}
 
+
 	public String[] getGender() {
 		return gender;
 	}
 
-	@StrutsParameter
 	public void setGender(String[] gender) {
 		this.gender = gender;
 	}

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

@@ -21,11 +21,11 @@
 package org.apache.struts2.showcase.hangman;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.action.SessionAware;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.Map;
 
+import org.apache.struts2.action.SessionAware;
+
 public class GuessCharacterAction extends ActionSupport implements SessionAware {
 
 	private static final long serialVersionUID = 9050915577007590674L;
@@ -34,7 +34,6 @@ public class GuessCharacterAction extends ActionSupport implements SessionAware
 	private Character character;
 	private Hangman hangman;
 
-	@Override
 	public String execute() throws Exception {
 		hangman = (Hangman) session.get(HangmanConstants.HANGMAN_SESSION_KEY);
 		hangman.guess(character);
@@ -46,7 +45,6 @@ public class GuessCharacterAction extends ActionSupport implements SessionAware
 		return hangman;
 	}
 
-	@StrutsParameter
 	public void setCharacter(Character character) {
 		this.character = character;
 	}

apps/showcase/src/main/java/org/apache/struts2/showcase/model/MyDto.java

@@ -1,38 +0,0 @@
-/*
- * 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.
- */
-package org.apache.struts2.showcase.model;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import static java.util.Collections.singletonMap;
-
-public class MyDto {
-
-    public String str = "no";
-
-    public Map<String, String> map = new HashMap<>(singletonMap("key", "no"));
-    public int[] array = new int[]{0};
-
-    @Override
-    public String toString() {
-        return "str=" + str + ", map=" + map + ", array=" + Arrays.toString(array);
-    }
-}

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

@@ -18,7 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.showcase.modelDriven.model;
+package org.apache.struts2.showcase.modelDriven;
 
 import java.io.Serializable;
 

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

@@ -22,7 +22,6 @@ package org.apache.struts2.showcase.modelDriven;
 
 import com.opensymphony.xwork2.ActionSupport;
 import com.opensymphony.xwork2.ModelDriven;
-import org.apache.struts2.showcase.modelDriven.model.Gangster;
 
 /**
  * Action to demonstrate simple model-driven feature of the framework.
@@ -31,18 +30,15 @@ public class ModelDrivenAction extends ActionSupport implements ModelDriven {
 
 	private static final long serialVersionUID = 1271130427666936592L;
 
-	@Override
 	public String input() throws Exception {
 		return SUCCESS;
 	}
 
-	@Override
 	public String execute() throws Exception {
 		return SUCCESS;
 	}
 
-	@Override
-	public Gangster getModel() {
+	public Object getModel() {
 		return new Gangster();
 	}
 }

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

@@ -23,10 +23,10 @@ package org.apache.struts2.showcase.person;
 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;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -42,14 +42,13 @@ public class EditPersonAction extends ActionSupport {
 
 	@Autowired
 	private PersonManager personManager;
-	private List<Person> persons = new ArrayList<>();
+	private List<Person> persons = new ArrayList<Person>();
 
 	/**
 	 * A default implementation that does nothing an returns "success".
 	 *
 	 * @return {@link #INPUT}
 	 */
-	@Override
 	public String execute() throws Exception {
 		persons.addAll(personManager.getPeople());
 		return INPUT;
@@ -69,7 +68,6 @@ public class EditPersonAction extends ActionSupport {
 		return "list";
 	}
 
-	@StrutsParameter(depth = 2)
 	public List<Person> getPersons() {
 		return persons;
 	}

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

@@ -35,9 +35,8 @@ public class ListPeopleAction extends ActionSupport {
 	@Autowired
 	private PersonManager personManager;
 
-	private final List<Person> people = new ArrayList<>();
+	private List<Person> people = new ArrayList<Person>();
 
-	@Override
 	public String execute() {
 		people.addAll(personManager.getPeople());
 

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

@@ -23,7 +23,6 @@ package org.apache.struts2.showcase.person;
 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;
 import org.springframework.beans.factory.annotation.Autowired;
 
 
@@ -39,14 +38,12 @@ public class NewPersonAction extends ActionSupport {
 	private PersonManager personManager;
 	private Person person;
 
-	@Override
 	public String execute() {
 		personManager.createPerson(person);
 
 		return "list";
 	}
 
-	@StrutsParameter(depth = 1)
 	public Person getPerson() {
 		return person;
 	}

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

@@ -23,7 +23,6 @@ package org.apache.struts2.showcase.source;
 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 javax.servlet.ServletContext;
 import java.io.BufferedReader;
@@ -99,9 +98,8 @@ public class ViewSourceAction extends ActionSupport implements ServletContextAwa
     /**
      * @param className the className to set
      */
-    @StrutsParameter
     public void setClassName(String className) {
-        if (className != null && !className.trim().isEmpty()) {
+        if (className != null && className.trim().length() > 0) {
             this.className = className;
         }
     }
@@ -109,9 +107,8 @@ public class ViewSourceAction extends ActionSupport implements ServletContextAwa
     /**
      * @param config the config to set
      */
-    @StrutsParameter
     public void setConfig(String config) {
-        if (config != null && !config.trim().isEmpty()) {
+        if (config != null && config.trim().length() > 0) {
             this.config = config;
         }
     }
@@ -119,9 +116,8 @@ public class ViewSourceAction extends ActionSupport implements ServletContextAwa
     /**
      * @param page the page to set
      */
-    @StrutsParameter
     public void setPage(String page) {
-        if (page != null && !page.trim().isEmpty()) {
+        if (page != null && page.trim().length() > 0) {
             this.page = page;
         }
     }
@@ -129,7 +125,6 @@ public class ViewSourceAction extends ActionSupport implements ServletContextAwa
     /**
      * @param padding the padding to set
      */
-    @StrutsParameter
     public void setPadding(int padding) {
         this.padding = padding;
     }
@@ -227,7 +222,6 @@ public class ViewSourceAction extends ActionSupport implements ServletContextAwa
         return snippet;
     }
 
-    @Override
     public void withServletContext(ServletContext arg0) {
         this.servletContext = arg0;
     }

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

@@ -21,7 +21,6 @@
 package org.apache.struts2.showcase.tag.nonui.actionPrefix;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 public class SubmitAction extends ActionSupport {
 
@@ -33,12 +32,10 @@ public class SubmitAction extends ActionSupport {
 		return text;
 	}
 
-	@StrutsParameter
 	public void setText(String text) {
 		this.text = text;
 	}
 
-	@Override
 	public String execute() throws Exception {
 		return SUCCESS;
 	}

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

@@ -23,9 +23,8 @@ import org.apache.struts2.dispatcher.PrepareOperations;
 
 public class DebugTagAction extends ActionSupport {
 
-    @Override
     public String execute() throws Exception {
         PrepareOperations.overrideDevMode(true); // Just for Showcase, explicitly switch on for this action only
         return SUCCESS;
     }
-}
+}

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

@@ -22,7 +22,6 @@ package org.apache.struts2.showcase.tag.nonui.iteratortag;
 
 import com.opensymphony.xwork2.ActionSupport;
 import com.opensymphony.xwork2.Validateable;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**
  *
@@ -48,25 +47,25 @@ public class AppendIteratorTagDemo extends ActionSupport implements Validateable
 		}
 	}
 
+
 	public String getIteratorValue1() {
 		return iteratorValue1;
 	}
 
-	@StrutsParameter
 	public void setIteratorValue1(String iteratorValue1) {
 		this.iteratorValue1 = iteratorValue1;
 	}
 
+
 	public String getIteratorValue2() {
 		return iteratorValue2;
 	}
 
-	@StrutsParameter
 	public void setIteratorValue2(String iteratorValue2) {
 		this.iteratorValue2 = iteratorValue2;
 	}
 
-	@Override
+
 	public String input() throws Exception {
 		return SUCCESS;
 	}

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

@@ -21,7 +21,6 @@
 package org.apache.struts2.showcase.tag.nonui.iteratortag;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**
  */
@@ -38,34 +37,34 @@ public class IteratorGeneratorTagDemo extends ActionSupport {
 		return value;
 	}
 
-	@StrutsParameter
 	public void setValue(String value) {
 		this.value = value;
 	}
 
+
 	public Integer getCount() {
 		return count;
 	}
 
-	@StrutsParameter
 	public void setCount(Integer count) {
 		this.count = count;
 	}
 
+
 	public String getSeparator() {
 		return this.separator;
 	}
 
-	@StrutsParameter
 	public void setSeparator(String separator) {
 		this.separator = separator;
 	}
 
+
 	public String submit() throws Exception {
 		return SUCCESS;
 	}
 
-	@Override
+
 	public String input() throws Exception {
 		return SUCCESS;
 	}

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

@@ -22,7 +22,6 @@ package org.apache.struts2.showcase.tag.nonui.iteratortag;
 
 import com.opensymphony.xwork2.ActionSupport;
 import com.opensymphony.xwork2.Validateable;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 
 /**
@@ -34,7 +33,7 @@ public class MergeIteratorTagDemo extends ActionSupport implements Validateable
 	private String iteratorValue1;
 	private String iteratorValue2;
 
-	@Override
+
 	public void validate() {
 		if (iteratorValue1 == null || iteratorValue1.trim().length() <= 0) {
 			addFieldError("iteratorValue1", "iterator value 1 cannot be empty");
@@ -48,25 +47,25 @@ public class MergeIteratorTagDemo extends ActionSupport implements Validateable
 		}
 	}
 
+
 	public String getIteratorValue1() {
 		return this.iteratorValue1;
 	}
 
-	@StrutsParameter
 	public void setIteratorValue1(String iteratorValue1) {
 		this.iteratorValue1 = iteratorValue1;
 	}
 
+
 	public String getIteratorValue2() {
 		return this.iteratorValue2;
 	}
 
-	@StrutsParameter
 	public void setIteratorValue2(String iteratorValue2) {
 		this.iteratorValue2 = iteratorValue2;
 	}
 
-	@Override
+
 	public String input() throws Exception {
 		return SUCCESS;
 	}

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

@@ -22,7 +22,6 @@ package org.apache.struts2.showcase.tag.nonui.iteratortag;
 
 import com.opensymphony.xwork2.ActionSupport;
 import com.opensymphony.xwork2.Validateable;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**
  *
@@ -35,7 +34,7 @@ public class SubsetIteratorTagDemo extends ActionSupport implements Validateable
 	private Integer count;
 	private Integer start;
 
-	@Override
+
 	public void validate() {
 		if (iteratorValue == null || iteratorValue.trim().length() <= 0) {
 			addFieldError("iteratorValue1", "iterator value 1 cannot be empty");
@@ -44,34 +43,34 @@ public class SubsetIteratorTagDemo extends ActionSupport implements Validateable
 		}
 	}
 
+
 	public String getIteratorValue() {
 		return this.iteratorValue;
 	}
 
-	@StrutsParameter
 	public void setIteratorValue(String iteratorValue) {
 		this.iteratorValue = iteratorValue;
 	}
 
+
 	public Integer getCount() {
 		return this.count;
 	}
 
-	@StrutsParameter
 	public void setCount(Integer count) {
 		this.count = count;
 	}
 
+
 	public Integer getStart() {
 		return this.start;
 	}
 
-	@StrutsParameter
 	public void setStart(Integer start) {
 		this.start = start;
 	}
 
-	@Override
+
 	public String input() throws Exception {
 		return SUCCESS;
 	}
@@ -79,4 +78,6 @@ public class SubsetIteratorTagDemo extends ActionSupport implements Validateable
 	public String submit() throws Exception {
 		return SUCCESS;
 	}
+
+
 }

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

@@ -22,7 +22,6 @@ package org.apache.struts2.showcase.token;
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.Date;
 
@@ -77,7 +76,6 @@ public class TokenAction extends ActionSupport {
 		return amount;
 	}
 
-	@StrutsParameter
 	public void setAmount(int amount) {
 		this.amount = amount;
 	}

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

@@ -30,7 +30,6 @@ public abstract class AbstractValidationActionSupport extends ActionSupport {
 		return "success";
 	}
 
-	@Override
 	public String input() throws Exception {
 		return "input";
 	}

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

@@ -18,6 +18,8 @@
  */
 package org.apache.struts2.showcase.validation;
 
+import java.sql.Date;
+
 import com.opensymphony.xwork2.validator.annotations.DateRangeFieldValidator;
 import com.opensymphony.xwork2.validator.annotations.EmailValidator;
 import com.opensymphony.xwork2.validator.annotations.FieldExpressionValidator;
@@ -27,9 +29,6 @@ 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;
 
 /**
  * <!-- START SNIPPET: ajaxFormSubmit -->
@@ -73,10 +72,9 @@ public class AjaxFormSubmitAction extends AbstractValidationActionSupport {
     }
 
     @DateRangeFieldValidator(
-        min="01/01/1990",
-        max="01/01/2000",
+        min="01/01/1990", 
+        max="01/01/2000", 
         message="must be a min 01-01-1990 max 01-01-2000 if supplied")
-    @StrutsParameter
     public void setDateValidatorField(Date dateValidatorField) {
         this.dateValidatorField = dateValidatorField;
     }
@@ -86,7 +84,6 @@ public class AjaxFormSubmitAction extends AbstractValidationActionSupport {
     }
 
     @EmailValidator(message="must be a valid email if supplied")
-    @StrutsParameter
     public void setEmailValidatorField(String emailValidatorField) {
         this.emailValidatorField = emailValidatorField;
     }
@@ -96,7 +93,6 @@ public class AjaxFormSubmitAction extends AbstractValidationActionSupport {
     }
 
     @IntRangeFieldValidator(min="1", max="10", message="must be integer min 1 max 10 if supplied")
-    @StrutsParameter
     public void setIntegerValidatorField(Integer integerValidatorField) {
         this.integerValidatorField = integerValidatorField;
     }
@@ -106,9 +102,8 @@ public class AjaxFormSubmitAction extends AbstractValidationActionSupport {
     }
 
     @RegexFieldValidator(
-        regex="[^<>]+",
+        regex="[^<>]+", 
         message="regexValidatorField must match a regexp (.*\\.txt) if specified")
-    @StrutsParameter
     public void setRegexValidatorField(String regexValidatorField) {
         this.regexValidatorField = regexValidatorField;
     }
@@ -118,7 +113,6 @@ public class AjaxFormSubmitAction extends AbstractValidationActionSupport {
     }
 
     @RequiredStringValidator(trim=true, message="required and must be string")
-    @StrutsParameter
     public void setRequiredStringValidatorField(String requiredStringValidatorField) {
         this.requiredStringValidatorField = requiredStringValidatorField;
     }
@@ -128,7 +122,6 @@ public class AjaxFormSubmitAction extends AbstractValidationActionSupport {
     }
 
     @RequiredFieldValidator(message="required")
-    @StrutsParameter
     public void setRequiredValidatorField(String requiredValidatorField) {
         this.requiredValidatorField = requiredValidatorField;
     }
@@ -138,11 +131,10 @@ public class AjaxFormSubmitAction extends AbstractValidationActionSupport {
     }
 
     @StringLengthFieldValidator(
-        minLength="2",
-        maxLength="4",
-        trim=true,
+        minLength="2", 
+        maxLength="4", 
+        trim=true, 
         message="must be a String of a specific greater than 1 less than 5 if specified")
-    @StrutsParameter
     public void setStringLengthValidatorField(String stringLengthValidatorField) {
         this.stringLengthValidatorField = stringLengthValidatorField;
     }
@@ -152,10 +144,10 @@ public class AjaxFormSubmitAction extends AbstractValidationActionSupport {
     }
 
 	@FieldExpressionValidator(
-        expression = "(fieldExpressionValidatorField == requiredValidatorField)",
+        expression = "(fieldExpressionValidatorField == requiredValidatorField)", 
         message = "must be the same as the Required Validator Field if specified")
-    @StrutsParameter
-    public void setFieldExpressionValidatorField(String fieldExpressionValidatorField) {
+    public void setFieldExpressionValidatorField(
+            String fieldExpressionValidatorField) {
         this.fieldExpressionValidatorField = fieldExpressionValidatorField;
     }
 
@@ -164,7 +156,6 @@ public class AjaxFormSubmitAction extends AbstractValidationActionSupport {
     }
 
     @UrlValidator(message="must be a valid url if supplied")
-    @StrutsParameter
     public void setUrlValidatorField(String urlValidatorField) {
         this.urlValidatorField = urlValidatorField;
     }

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

@@ -26,7 +26,6 @@ import org.apache.struts2.convention.annotation.Action;
 import org.apache.struts2.convention.annotation.Namespace;
 import org.apache.struts2.convention.annotation.ParentPackage;
 import org.apache.struts2.convention.annotation.Result;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 import org.apache.struts2.interceptor.validation.SkipValidation;
 import org.hibernate.validator.constraints.ScriptAssert;
 import org.hibernate.validator.constraints.URL;
@@ -96,7 +95,6 @@ public class BeanValidationExampleAction extends ActionSupport {
         return dateValidatorField;
     }
 
-    @StrutsParameter
     public void setDateValidatorField(Date dateValidatorField) {
         this.dateValidatorField = dateValidatorField;
     }
@@ -105,7 +103,6 @@ public class BeanValidationExampleAction extends ActionSupport {
         return emailValidatorField;
     }
 
-    @StrutsParameter
     public void setEmailValidatorField(String emailValidatorField) {
         this.emailValidatorField = emailValidatorField;
     }
@@ -114,7 +111,6 @@ public class BeanValidationExampleAction extends ActionSupport {
         return integerValidatorField;
     }
 
-    @StrutsParameter
     public void setIntegerValidatorField(Integer integerValidatorField) {
         this.integerValidatorField = integerValidatorField;
     }
@@ -123,7 +119,6 @@ public class BeanValidationExampleAction extends ActionSupport {
         return regexValidatorField;
     }
 
-    @StrutsParameter
     public void setRegexValidatorField(String regexValidatorField) {
         this.regexValidatorField = regexValidatorField;
     }
@@ -132,7 +127,6 @@ public class BeanValidationExampleAction extends ActionSupport {
         return requiredStringValidatorField;
     }
 
-    @StrutsParameter
     public void setRequiredStringValidatorField(String requiredStringValidatorField) {
         this.requiredStringValidatorField = requiredStringValidatorField;
     }
@@ -141,7 +135,6 @@ public class BeanValidationExampleAction extends ActionSupport {
         return requiredValidatorField;
     }
 
-    @StrutsParameter
     public void setRequiredValidatorField(String requiredValidatorField) {
         this.requiredValidatorField = requiredValidatorField;
     }
@@ -150,7 +143,6 @@ public class BeanValidationExampleAction extends ActionSupport {
         return stringLengthValidatorField;
     }
 
-    @StrutsParameter
     public void setStringLengthValidatorField(String stringLengthValidatorField) {
         this.stringLengthValidatorField = stringLengthValidatorField;
     }
@@ -159,8 +151,8 @@ public class BeanValidationExampleAction extends ActionSupport {
         return fieldExpressionValidatorField;
     }
 
-    @StrutsParameter
-    public void setFieldExpressionValidatorField(String fieldExpressionValidatorField) {
+    public void setFieldExpressionValidatorField(
+        String fieldExpressionValidatorField) {
         this.fieldExpressionValidatorField = fieldExpressionValidatorField;
     }
 
@@ -168,7 +160,6 @@ public class BeanValidationExampleAction extends ActionSupport {
         return urlValidatorField;
     }
 
-    @StrutsParameter
     public void setUrlValidatorField(String urlValidatorField) {
         this.urlValidatorField = urlValidatorField;
     }

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

@@ -20,8 +20,6 @@
  */
 package org.apache.struts2.showcase.validation;
 
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
-
 import java.sql.Date;
 
 /**
@@ -46,7 +44,6 @@ public class FieldValidatorsExampleAction extends AbstractValidationActionSuppor
         return dateValidatorField;
     }
 
-    @StrutsParameter
     public void setDateValidatorField(Date dateValidatorField) {
         this.dateValidatorField = dateValidatorField;
     }
@@ -55,7 +52,6 @@ public class FieldValidatorsExampleAction extends AbstractValidationActionSuppor
         return emailValidatorField;
     }
 
-    @StrutsParameter
     public void setEmailValidatorField(String emailValidatorField) {
         this.emailValidatorField = emailValidatorField;
     }
@@ -64,7 +60,6 @@ public class FieldValidatorsExampleAction extends AbstractValidationActionSuppor
         return integerValidatorField;
     }
 
-    @StrutsParameter
     public void setIntegerValidatorField(Integer integerValidatorField) {
         this.integerValidatorField = integerValidatorField;
     }
@@ -73,7 +68,6 @@ public class FieldValidatorsExampleAction extends AbstractValidationActionSuppor
         return regexValidatorField;
     }
 
-    @StrutsParameter
     public void setRegexValidatorField(String regexValidatorField) {
         this.regexValidatorField = regexValidatorField;
     }
@@ -82,7 +76,6 @@ public class FieldValidatorsExampleAction extends AbstractValidationActionSuppor
         return requiredStringValidatorField;
     }
 
-    @StrutsParameter
     public void setRequiredStringValidatorField(String requiredStringValidatorField) {
         this.requiredStringValidatorField = requiredStringValidatorField;
     }
@@ -91,7 +84,6 @@ public class FieldValidatorsExampleAction extends AbstractValidationActionSuppor
         return requiredValidatorField;
     }
 
-    @StrutsParameter
     public void setRequiredValidatorField(String requiredValidatorField) {
         this.requiredValidatorField = requiredValidatorField;
     }
@@ -100,7 +92,6 @@ public class FieldValidatorsExampleAction extends AbstractValidationActionSuppor
         return stringLengthValidatorField;
     }
 
-    @StrutsParameter
     public void setStringLengthValidatorField(String stringLengthValidatorField) {
         this.stringLengthValidatorField = stringLengthValidatorField;
     }
@@ -109,7 +100,6 @@ public class FieldValidatorsExampleAction extends AbstractValidationActionSuppor
         return fieldExpressionValidatorField;
     }
 
-    @StrutsParameter
     public void setFieldExpressionValidatorField(
             String fieldExpressionValidatorField) {
         this.fieldExpressionValidatorField = fieldExpressionValidatorField;
@@ -119,7 +109,6 @@ public class FieldValidatorsExampleAction extends AbstractValidationActionSuppor
         return urlValidatorField;
     }
 
-    @StrutsParameter
     public void setUrlValidatorField(String urlValidatorField) {
         this.urlValidatorField = urlValidatorField;
     }

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

@@ -20,8 +20,6 @@
  */
 package org.apache.struts2.showcase.validation;
 
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
-
 /**
  */
 
@@ -39,7 +37,6 @@ public class NonFieldValidatorsExampleAction extends AbstractValidationActionSup
 		return someText;
 	}
 
-	@StrutsParameter
 	public void setSomeText(String someText) {
 		this.someText = someText;
 	}
@@ -48,7 +45,6 @@ public class NonFieldValidatorsExampleAction extends AbstractValidationActionSup
 		return someTextRetype;
 	}
 
-	@StrutsParameter
 	public void setSomeTextRetype(String someTextRetype) {
 		this.someTextRetype = someTextRetype;
 	}
@@ -57,7 +53,6 @@ public class NonFieldValidatorsExampleAction extends AbstractValidationActionSup
 		return someTextRetypeAgain;
 	}
 
-	@StrutsParameter
 	public void setSomeTextRetypeAgain(String someTextRetypeAgain) {
 		this.someTextRetypeAgain = someTextRetypeAgain;
 	}

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

@@ -21,7 +21,6 @@
 package org.apache.struts2.showcase.validation;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**
  */
@@ -40,7 +39,6 @@ public class QuizAction extends ActionSupport {
 		return name;
 	}
 
-	@StrutsParameter
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -49,7 +47,6 @@ public class QuizAction extends ActionSupport {
 		return age;
 	}
 
-	@StrutsParameter
 	public void setAge(int age) {
 		this.age = age;
 	}
@@ -58,7 +55,6 @@ public class QuizAction extends ActionSupport {
 		return answer;
 	}
 
-	@StrutsParameter
 	public void setAnswer(String answer) {
 		this.answer = answer;
 	}

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

@@ -21,7 +21,6 @@
 package org.apache.struts2.showcase.validation;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**
  * @version $Date$ $Id$
@@ -31,7 +30,6 @@ public class SubmitApplication extends ActionSupport {
 	private String name;
 	private Integer age;
 
-	@StrutsParameter
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -40,7 +38,6 @@ public class SubmitApplication extends ActionSupport {
 		return this.name;
 	}
 
-	@StrutsParameter
 	public void setAge(Integer age) {
 		this.age = age;
 	}

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

@@ -23,15 +23,12 @@ package org.apache.struts2.showcase.validation;
 
 // START SNIPPET: visitorValidatorsExample
 
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
-
 public class VisitorValidatorsExampleAction extends AbstractValidationActionSupport {
 
 	private static final long serialVersionUID = 4375454086939598216L;
 
 	private User user;
 
-	@StrutsParameter(depth = 1)
 	public User getUser() {
 		return user;
 	}

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

@@ -21,7 +21,6 @@
 package org.apache.struts2.showcase.wait;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**
  * Example to illustrate the <code>execAndWait</code> interceptor.
@@ -42,7 +41,6 @@ public class LongProcessAction extends ActionSupport {
 		return time;
 	}
 
-	@StrutsParameter
 	public void setTime(int time) {
 		this.time = time;
 	}

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

@@ -21,9 +21,11 @@
 package org.apache.struts2.showcase.xslt;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.action.ServletRequestAware;
 
 import javax.servlet.http.HttpServletRequest;
+
+import org.apache.struts2.action.ServletRequestAware;
+
 import java.util.Map;
 import java.util.Properties;
 
@@ -70,7 +72,7 @@ public class JVMAction implements ServletRequestAware {
 		this.info = info;
 	}
 
-	public static class ImportantInfo {
+	public class ImportantInfo {
 		private String classpath;
 		private Properties systemProperties;
 

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

@@ -40,7 +40,7 @@
 		</action>
 
 		<action name="doMultipleUploadUsingList" class="org.apache.struts2.showcase.fileupload.MultipleFileUploadUsingListAction" method="upload">
-			<result name="input">/WEB-INF/fileupload/multipleUploadUsingList.jsp</result>
+                        <result name="input">/WEB-INF/fileupload/multipleUploadUsingList.jsp</result>
 			<result>/WEB-INF/fileupload/multiple-success.jsp</result>
 		</action>
 
@@ -50,7 +50,7 @@
 		</action>
 
 		<action name="doMultipleUploadUsingArray" class="org.apache.struts2.showcase.fileupload.MultipleFileUploadUsingArrayAction" method="upload">
-			<result name="input">/WEB-INF/fileupload/multipleUploadUsingArray.jsp</result>
+                        <result name="input">/WEB-INF/fileupload/multipleUploadUsingArray.jsp</result>
 			<result>/WEB-INF/fileupload/multiple-success.jsp</result>
 		</action>
 

apps/showcase/src/main/resources/struts-params-annotation.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-/*
- * 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.
- */
--->
-<!DOCTYPE struts PUBLIC
-        "-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
-        "https://struts.apache.org/dtds/struts-6.0.dtd">
-
-<struts>
-    <package name="params-annotation" extends="velocity-default" namespace="/paramsannotation">
-        <action name="test" class="org.apache.struts2.showcase.action.ParamsAnnotationAction">
-            <result type="velocity">/WEB-INF/paramsannotation.vm</result>
-        </action>
-    </package>
-</struts>

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

@@ -35,15 +35,16 @@
     <constant name="struts.action.extension" value="action,," />
 
     <constant name="struts.allowlist.enable" value="true" />
-    <constant name="struts.parameters.requireAnnotations" value="true" />
-    <constant name="struts.allowlist.packageNames" value="
-            org.apache.struts2.showcase.model,
-            org.apache.struts2.showcase.modelDriven.model
+    <constant name="struts.allowlist.packageNames"
+              value="
+                org.apache.struts2.showcase.model,
+                org.apache.struts2.showcase.conversion
     "/>
-    <constant name="struts.allowlist.classes" value="
-            org.apache.struts2.showcase.hangman.Hangman,
-            org.apache.struts2.showcase.hangman.HangmanConstants,
-            org.apache.struts2.showcase.hangman.Vocab
+    <constant name="struts.allowlist.classes"
+              value="
+                org.apache.struts2.showcase.UITagExample$Language,
+                org.apache.struts2.showcase.UITagExample$VehicalType,
+                org.apache.struts2.showcase.UITagExample$VehicalSpecific
     "/>
 
     <constant name="struts.convention.package.locators.basePackage" value="org.apache.struts2.showcase" />
@@ -92,8 +93,6 @@
 
     <include file="struts-dispatcher.xml" />
 
-    <include file="struts-params-annotation.xml" />
-
     <package name="default" extends="struts-default">
         <interceptors>
             <interceptor-stack name="crudStack">

apps/showcase/src/main/webapp/WEB-INF/fileupload/upload-success.jsp

@@ -41,8 +41,7 @@
 		        <li>FileName: <s:property value="fileName" /></li>
 		        <li>Original FileName: <s:property value="originalName" /></li>
 		        <li>File: <s:property value="uploadedFile" /></li>
-		        <li>Caption: <s:property value="caption" /></li>
-		        <li id="input-name">Input name: <s:property value="inputName" /></li>
+		        <li>Caption:<s:property value="caption" /></li>
 	        </ul>
 		</div>
 	</div>

apps/showcase/src/main/webapp/WEB-INF/paramsannotation.vm

@@ -1,19 +0,0 @@
-#*
-* 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.
-*#
-<div id="output">$action.renderVarToPrint()</div>

apps/showcase/src/test/java/it/org/apache/struts2/showcase/ConventionTest.java

@@ -1,88 +0,0 @@
-/*
- * 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.
- */
-package it.org.apache.struts2.showcase;
-
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class ConventionTest {
-
-    private WebClient webClient;
-
-    @Before
-    public void setUp() throws Exception {
-        webClient = new WebClient();
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        webClient.close();
-    }
-
-    @Test
-    public void listPeople() throws Exception {
-        HtmlPage page = webClient.getPage(ParameterUtils.getBaseUrl() + "/person/list-people.action");
-
-        assertThat(page.asNormalizedText()).contains(
-                "3\tAlexandru\tPapesco\n" +
-                "4\tJay\tBoss\n" +
-                "5\tRainer\tHermanos\n"
-        );
-    }
-
-    @Test
-    public void editPeople() throws Exception {
-        HtmlPage page = webClient.getPage(ParameterUtils.getBaseUrl() + "/person/edit-person.action");
-        HtmlForm form = page.getForms().get(0);
-
-        form.getInputByName("persons(1).name").setValue("Lukasz");
-        form.getInputByName("persons(1).lastName").setValue("Lenart");
-        form.getInputByName("persons(2).name").setValue("Kusal");
-        form.getInputByName("persons(2).lastName").setValue("Kithul-Godage");
-
-        HtmlSubmitInput button = form.getInputByValue("Save all persons");
-        page = button.click();
-
-        assertThat(page.asNormalizedText()).contains(
-                "1\tLukasz\tLenart\n" +
-                "2\tKusal\tKithul-Godage\n"
-        );
-    }
-
-    @Test
-    public void createPerson() throws Exception {
-        HtmlPage page = webClient.getPage(ParameterUtils.getBaseUrl() + "/person/new-person!input.action");
-        HtmlForm form = page.getForms().get(0);
-
-        form.getInputByName("person.name").type("Lukasz");
-        form.getInputByName("person.lastName").type("Lenart");
-
-        HtmlSubmitInput button = form.getInputByValue("Create person");
-        page = button.click();
-
-        assertThat(page.asNormalizedText()).contains("6\tLukasz\tLenart\n");
-    }
-}

apps/showcase/src/test/java/it/org/apache/struts2/showcase/FileUploadTest.java

@@ -25,14 +25,10 @@ import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlInput;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 
 public class FileUploadTest {
 
@@ -49,31 +45,9 @@ public class FileUploadTest {
             uploadInput.setValueAttribute(tempFile.getAbsolutePath());
             final HtmlSubmitInput button = form.getInputByValue("Submit");
             final HtmlPage resultPage = button.click();
-
             DomElement errorMessage = resultPage.getFirstByXPath("//span[@class='errorMessage']");
-            assertNotNull(errorMessage);
-            assertEquals("File cannot be empty", errorMessage.getVisibleText());
-        }
-    }
-
-    @Test
-    public void testFileUpload() throws Exception {
-        try (final WebClient webClient = new WebClient()) {
-            final HtmlPage page = webClient.getPage(ParameterUtils.getBaseUrl() + "/fileupload/doUpload.action");
-            final HtmlForm form = page.getFormByName("doUpload");
-            HtmlInput captionInput = form.getInputByName("caption");
-            HtmlFileInput uploadInput = form.getInputByName("upload");
-            captionInput.type("some caption");
-            File tempFile = File.createTempFile("testEmptyFile", ".tmp");
-            Files.write(Paths.get(tempFile.toURI()), "some content".getBytes());
-            tempFile.deleteOnExit();
-            uploadInput.setValueAttribute(tempFile.getAbsolutePath());
-            final HtmlSubmitInput button = form.getInputByValue("Submit");
-            final HtmlPage resultPage = button.click();
-
-            DomElement inputName = resultPage.getElementById("input-name");
-            assertNotNull(inputName);
-            assertEquals("Input name: upload", inputName.getTextContent().trim());
+            Assert.assertNotNull(errorMessage);
+            Assert.assertEquals("File cannot be empty", errorMessage.getVisibleText());
         }
     }
 

apps/showcase/src/test/java/it/org/apache/struts2/showcase/StrutsParametersTest.java

@@ -1,239 +0,0 @@
-/*
- * 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.
- */
-package it.org.apache.struts2.showcase;
-
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.web.util.UriComponentsBuilder;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-
-public class StrutsParametersTest {
-
-    private WebClient webClient;
-
-    @Before
-    public void setUp() throws Exception {
-        webClient = new WebClient();
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        webClient.close();
-    }
-
-    @Test
-    public void public_StringField_WithoutGetterSetter_FieldNotAnnotated() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("publicField", "yes");
-        params.put("varToPrint", "publicField");
-        assertText(params, "publicField{no}");
-    }
-
-    @Test
-    public void public_StringField_WithoutGetterSetter_FieldAnnotated() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("publicFieldAnnotated", "yes");
-        params.put("varToPrint", "publicFieldAnnotated");
-        assertText(params, "publicFieldAnnotated{yes}");
-    }
-
-    @Test
-    public void private_StringField_WithSetter_MethodNotAnnotated() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("privateFieldMethod", "yes");
-        params.put("varToPrint", "privateField");
-        assertText(params, "privateField{no}");
-    }
-
-    @Test
-    public void private_StringField_WithSetter_MethodAnnotated() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("privateFieldMethodAnnotated", "yes");
-        params.put("varToPrint", "privateField");
-        assertText(params, "privateField{yes}");
-    }
-
-    @Test
-    public void public_ArrayField_WithoutGetterSetter_FieldNotAnnotated() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("publicArray[0]", "1");
-        params.put("varToPrint", "publicArray");
-        assertText(params, "publicArray{[0]}");
-    }
-
-    @Test
-    public void public_ArrayField_WithoutGetterSetter_FieldAnnotated() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("publicArrayAnnotated[0]", "1");
-        params.put("varToPrint", "publicArrayAnnotated");
-        assertText(params, "publicArrayAnnotated{[1]}");
-    }
-
-    @Test
-    public void public_ListField_WithoutGetterSetter_FieldNotAnnotated() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("publicList[0]", "yes");
-        params.put("varToPrint", "publicList");
-        assertText(params, "publicList{[no]}");
-    }
-
-    @Test
-    public void public_ListField_WithoutGetterSetter_FieldAnnotated() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("publicListAnnotated[0]", "yes");
-        params.put("varToPrint", "publicListAnnotated");
-        assertText(params, "publicListAnnotated{[yes]}");
-    }
-
-    @Test
-    public void private_ListField_WithGetterNoSetter_MethodNotAnnotated() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("privateListMethod[0]", "yes");
-        params.put("varToPrint", "privateList");
-        assertText(params, "privateList{[no]}");
-    }
-
-    @Test
-    public void private_ListField_WithGetterNoSetter_MethodAnnotated() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("privateListMethodAnnotated[0]", "yes");
-        params.put("varToPrint", "privateList");
-        assertText(params, "privateList{[yes]}");
-    }
-
-    @Test
-    public void public_MapField_WithoutGetterSetter_FieldNotAnnotated() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("publicMap['key']", "yes");
-        params.put("varToPrint", "publicMap");
-        assertText(params, "publicMap{{key=no}}");
-    }
-
-    @Test
-    public void public_MapField_WithoutGetterSetter_FieldAnnotated() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("publicMapAnnotated['key']", "yes");
-        params.put("varToPrint", "publicMapAnnotated");
-        assertText(params, "publicMapAnnotated{{key=yes}}");
-    }
-
-    @Test
-    public void public_MapField_Insert_WithoutGetterSetter_FieldNotAnnotated() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("publicMap[999]", "yes");
-        params.put("varToPrint", "publicMap");
-        assertText(params, "publicMap{{key=no}}");
-    }
-
-    @Test
-    public void public_MapField_Insert_WithoutGetterSetter_FieldAnnotated() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("publicMapAnnotated[999]", "yes");
-        params.put("varToPrint", "publicMapAnnotated");
-        assertText(params, "publicMapAnnotated{{999=yes, key=no}}");
-    }
-
-    @Test
-    public void public_MyDtoField_WithoutGetter_FieldNotAnnotated() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("publicMyDto.str", "yes");
-        params.put("publicMyDto.map['key']", "yes");
-        params.put("publicMyDto.array[0]", "1");
-        params.put("varToPrint", "publicMyDto");
-        assertText(params, "publicMyDto{str=no, map={key=no}, array=[0]}");
-    }
-
-    @Test
-    public void public_MyDtoField_WithoutGetter_FieldAnnotated() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("publicMyDtoAnnotated.str", "yes");
-        params.put("publicMyDtoAnnotated.map['key']", "yes");
-        params.put("publicMyDtoAnnotated.array[0]", "1");
-        params.put("varToPrint", "publicMyDtoAnnotated");
-        assertText(params, "publicMyDtoAnnotated{str=yes, map={key=yes}, array=[1]}");
-    }
-
-    @Test
-    public void public_MyDtoField_WithoutGetter_FieldAnnotatedDepthOne() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("publicMyDtoAnnotatedDepthOne.str", "yes");
-        params.put("publicMyDtoAnnotatedDepthOne.map['key']", "yes");
-        params.put("publicMyDtoAnnotatedDepthOne.array[0]", "1");
-        params.put("varToPrint", "publicMyDtoAnnotatedDepthOne");
-        assertText(params, "publicMyDtoAnnotatedDepthOne{str=yes, map={key=no}, array=[0]}");
-    }
-
-    @Test
-    public void private_MyDtoField_WithGetter_MethodNotAnnotated() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("unsafeMethodMyDto.str", "yes");
-        params.put("unsafeMethodMyDto.map['key']", "yes");
-        params.put("unsafeMethodMyDto.array[0]", "1");
-        params.put("varToPrint", "privateMyDto");
-        assertText(params, "privateMyDto{str=no, map={key=no}, array=[0]}");
-    }
-
-    @Test
-    public void private_MyDtoField_WithGetter_MethodNotAnnotated_Alternate() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("unsafeMethodMyDto['str']", "yes");
-        params.put("unsafeMethodMyDto['map']['key']", "yes");
-        params.put("unsafeMethodMyDto['map'][999]", "yes");
-        params.put("unsafeMethodMyDto['array'][0]", "1");
-        params.put("varToPrint", "privateMyDto");
-        assertText(params, "privateMyDto{str=no, map={key=no}, array=[0]}");
-    }
-
-    @Test
-    public void private_MyDtoField_WithGetter_MethodAnnotated() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("safeMethodMyDto.str", "yes");
-        params.put("safeMethodMyDto.map['key']", "yes");
-        params.put("safeMethodMyDto.array[0]", "1");
-        params.put("varToPrint", "privateMyDto");
-        assertText(params, "privateMyDto{str=yes, map={key=yes}, array=[1]}");
-    }
-
-    @Test
-    public void private_MyDtoField_WithGetter_MethodAnnotatedDepthOne() throws Exception {
-        Map<String, String> params = new HashMap<>();
-        params.put("safeMethodMyDtoDepthOne.str", "yes");
-        params.put("safeMethodMyDtoDepthOne.map['key']", "yes");
-        params.put("safeMethodMyDtoDepthOne.array[0]", "1");
-        params.put("varToPrint", "privateMyDto");
-        assertText(params, "privateMyDto{str=yes, map={key=no}, array=[0]}");
-    }
-
-    private void assertText(Map<String, String> params, String text) throws IOException {
-        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(ParameterUtils.getBaseUrl()).path("/paramsannotation/test.action");
-        params.forEach(builder::queryParam);
-        String url = builder.toUriString();
-        HtmlPage page = webClient.getPage(url);
-        String output = page.getElementById("output").asNormalizedText();
-        assertEquals(text, output);
-    }
-}

assembly/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>6.11.0</version>
+        <version>6.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-assembly</artifactId>
@@ -104,9 +104,7 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.8.0</version>
                 <executions>
                     <execution>
                         <id>make-assembly</id>

assembly/src/main/assembly/min-lib.xml

@@ -41,8 +41,6 @@
         <include>ognl:ognl</include>
         <include>commons-fileupload:commons-fileupload</include>
         <include>org.apache.commons:commons-io</include>
-        <include>com.github.ben-manes.caffeine:caffeine</include>
-        <include>org.javassist:javassist</include>
       </includes>
     </dependencySet>
   </dependencySets>

bom/pom.xml

@@ -25,10 +25,11 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>6.11.0</version>
+        <version>6.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-bom</artifactId>
+    <version>6.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Struts 2 Bill of Materials</name>
@@ -43,7 +44,7 @@
     </licenses>
 
     <properties>
-        <struts-version.version>6.11.0</struts-version.version>
+        <struts-version.version>6.4.0-SNAPSHOT</struts-version.version>
         <maven.site.skip>true</maven.site.skip>
         <maven.site.deploy.skip>true</maven.site.deploy.skip>
     </properties>
@@ -189,7 +190,7 @@
     </dependencyManagement>
 
   <scm>
-    <tag>STRUTS_6_11_0</tag>
+    <tag>STRUTS_6_3_0_1</tag>
     <connection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</developerConnection>
     <url>https://github.com/apache/struts/</url>

bundles/admin/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-osgi-bundles</artifactId>
-        <version>6.11.0</version>
+        <version>6.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-osgi-admin-bundle</artifactId>

bundles/admin/src/main/java/org/apache/struts2/osgi/admin/actions/BundlesAction.java

@@ -25,11 +25,10 @@ import com.opensymphony.xwork2.ActionSupport;
 import com.opensymphony.xwork2.config.Configuration;
 import com.opensymphony.xwork2.config.entities.PackageConfig;
 import com.opensymphony.xwork2.inject.Inject;
-import org.apache.struts2.action.ServletContextAware;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 import org.apache.struts2.osgi.BundleAccessor;
-import org.apache.struts2.osgi.StrutsOsgiListener;
 import org.apache.struts2.osgi.host.OsgiHost;
+import org.apache.struts2.osgi.StrutsOsgiListener;
+import org.apache.struts2.action.ServletContextAware;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
 
@@ -37,8 +36,9 @@ import javax.servlet.ServletContext;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
+import java.util.Collections;
+import java.util.Comparator;
 
 public class BundlesAction extends ActionSupport implements ServletContextAware {
 
@@ -114,7 +114,6 @@ public class BundlesAction extends ActionSupport implements ServletContextAware
         return id;
     }
 
-    @StrutsParameter
     public void setId(String id) {
         this.id = id;
     }

bundles/admin/src/main/java/org/apache/struts2/osgi/admin/actions/ShellAction.java

@@ -21,25 +21,25 @@
 
 package org.apache.struts2.osgi.admin.actions;
 
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionSupport;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+
 import org.apache.felix.shell.ShellService;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 import org.apache.struts2.osgi.DefaultBundleAccessor;
 import org.apache.struts2.osgi.interceptor.BundleContextAware;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionSupport;
 
 /**
  * This action executes commands on the Felix Shell.
- *
+ * 
  * The action is BundleContextAware so that if the OSGi interceptor is used the BundleContext
  * can be provided for configurations where the DefaultBundleAccessor is insufficient.
- *
+ * 
  */
 public class ShellAction extends ActionSupport implements BundleContextAware {
     private String command;
@@ -77,7 +77,6 @@ public class ShellAction extends ActionSupport implements BundleContextAware {
         return command;
     }
 
-    @StrutsParameter
     public void setCommand(String command) {
         this.command = command;
     }

bundles/demo/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-osgi-bundles</artifactId>
-        <version>6.11.0</version>
+        <version>6.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-osgi-demo-bundle</artifactId>

bundles/demo/src/main/java/actions/osgi/BundlesAction.java

@@ -33,7 +33,6 @@ import org.osgi.framework.BundleContext;
 public class BundlesAction extends ActionSupport implements BundleContextAware {
     private BundleContext bundleContext;
 
-    @Override
     public void withBundleContext(BundleContext bundleContext) {
         this.bundleContext = bundleContext;
     }

bundles/demo/src/main/java/actions/osgi/HelloWorldAction.java

@@ -26,7 +26,6 @@ import org.apache.struts2.convention.annotation.Actions;
 import org.apache.struts2.convention.annotation.Namespace;
 import org.apache.struts2.convention.annotation.Result;
 import org.apache.struts2.convention.annotation.ResultPath;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 @Namespace("/osgi")
 @ResultPath("/content/osgi")
@@ -42,7 +41,6 @@ public class HelloWorldAction extends ActionSupport {
         return SUCCESS;
     }
 
-    @StrutsParameter(depth = 1)
     public Message getMessage() {
         return message;
     }
@@ -62,4 +60,4 @@ public class HelloWorldAction extends ActionSupport {
         sb.append("}");
         return sb.toString();
     }
-}
+}

bundles/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>6.11.0</version>
+        <version>6.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-osgi-bundles</artifactId>

core/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>6.11.0</version>
+        <version>6.4.0-SNAPSHOT</version>
     </parent>
     <artifactId>struts2-core</artifactId>
     <packaging>jar</packaging>
@@ -230,15 +230,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
         </dependency>
-
-        <!-- Optional used in com.opensymphony.xwork2.util.ProxyUtil to detect if object is HibernateProxy -->
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>5.6.15.Final</version>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -260,12 +251,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

core/src/main/java/com/opensymphony/xwork2/Action.java

@@ -19,10 +19,70 @@
 package com.opensymphony.xwork2;
 
 /**
- * {@inheritDoc}
- *
- * @deprecated since 6.7.0, use {@link org.apache.struts2.action.Action} instead.
+ * All actions <b>may</b> implement this interface, which exposes the <code>execute()</code> method.
+ * <p>
+ * However, as of XWork 1.1, this is <b>not</b> required and is only here to assist users. You are free to create POJOs
+ * that honor the same contract defined by this interface without actually implementing the interface.
+ * </p>
  */
-@Deprecated
-public interface Action extends org.apache.struts2.action.Action {
+public interface Action {
+
+    /**
+     * The action execution was successful. Show result
+     * view to the end user.
+     */
+    public static final String SUCCESS = "success";
+
+    /**
+     * The action execution was successful but do not
+     * show a view. This is useful for actions that are
+     * handling the view in another fashion like redirect.
+     */
+    public static final String NONE = "none";
+
+    /**
+     * The action execution was a failure.
+     * Show an error view, possibly asking the
+     * user to retry entering data.
+     */
+    public static final String ERROR = "error";
+
+    /**
+     * <p>
+     * The action execution require more input
+     * in order to succeed.
+     * This result is typically used if a form
+     * handling action has been executed so as
+     * to provide defaults for a form. The
+     * form associated with the handler should be
+     * shown to the end user.
+     * </p>
+     *
+     * <p>
+     * This result is also used if the given input
+     * params are invalid, meaning the user
+     * should try providing input again.
+     * </p>
+     */
+    public static final String INPUT = "input";
+
+    /**
+     * The action could not execute, since the
+     * user most was not logged in. The login view
+     * should be shown.
+     */
+    public static final String LOGIN = "login";
+
+
+    /**
+     * Where the logic of the action is executed.
+     *
+     * @return a string representing the logical result of the execution.
+     *         See constants in this interface for a list of standard result values.
+     * @throws Exception thrown if a system level exception occurs.
+     *                   <b>Note:</b> Application level exceptions should be handled by returning
+     *                   an error value, such as <code>Action.ERROR</code>.
+     */
+    public String execute() throws Exception;
+
 }

core/src/main/java/com/opensymphony/xwork2/ActionChainResult.java

@@ -18,21 +18,263 @@
  */
 package com.opensymphony.xwork2;
 
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.TextParseUtil;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.struts2.StrutsException;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
 /**
- * @deprecated since 6.7.0, use {@link org.apache.struts2.result.ActionChainResult} instead.
- */
-@Deprecated
-public class ActionChainResult extends org.apache.struts2.result.ActionChainResult {
+* <!-- START SNIPPET: description -->
+*
+* This result invokes an entire other action, complete with it's own interceptor stack and result.
+*
+* <!-- END SNIPPET: description -->
+*
+* <b>This result type takes the following parameters:</b>
+*
+* <!-- START SNIPPET: params -->
+*
+* <ul>
+*
+* <li><b>actionName (default)</b> - the name of the action that will be chained to</li>
+*
+* <li><b>namespace</b> - used to determine which namespace the Action is in that we're chaining. If namespace is null,
+* this defaults to the current namespace</li>
+*
+* <li><b>method</b> - used to specify another method on target action to be invoked.
+* If null, this defaults to execute method</li>
+*
+* <li><b>skipActions</b> - (optional) the list of comma separated action names for the
+* actions that could be chained to</li>
+*
+* </ul>
+*
+* <!-- END SNIPPET: params -->
+*
+* <b>Example:</b>
+*
+* <pre><!-- START SNIPPET: example -->
+* &lt;package name="public" extends="struts-default"&gt;
+*     &lt;!-- Chain creatAccount to login, using the default parameter --&gt;
+*     &lt;action name="createAccount" class="..."&gt;
+*         &lt;result type="chain"&gt;login&lt;/result&gt;
+*     &lt;/action&gt;
+*
+*     &lt;action name="login" class="..."&gt;
+*         &lt;!-- Chain to another namespace --&gt;
+*         &lt;result type="chain"&gt;
+*             &lt;param name="actionName"&gt;dashboard&lt;/param&gt;
+*             &lt;param name="namespace"&gt;/secure&lt;/param&gt;
+*         &lt;/result&gt;
+*     &lt;/action&gt;
+* &lt;/package&gt;
+*
+* &lt;package name="secure" extends="struts-default" namespace="/secure"&gt;
+*     &lt;action name="dashboard" class="..."&gt;
+*         &lt;result&gt;dashboard.jsp&lt;/result&gt;
+*     &lt;/action&gt;
+* &lt;/package&gt;
+* <!-- END SNIPPET: example --></pre>
+*
+* @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
+*/
+public class ActionChainResult implements Result {
+
+    private static final Logger LOG = LogManager.getLogger(ActionChainResult.class);
+
+    /**
+     * The result parameter name to set the name of the action to chain to.
+     */
+    public static final String DEFAULT_PARAM = "actionName";
+
+    /**
+     * The action context key to save the chain history.
+     */
+    private static final String CHAIN_HISTORY = "CHAIN_HISTORY";
+
+    private ActionProxy proxy;
+    private String actionName;
+
+    private String namespace;
+
+    private String methodName;
+
+    /**
+     * The list of actions to skip.
+     */
+    private String skipActions;
+
+    private ActionProxyFactory actionProxyFactory;
 
     public ActionChainResult() {
         super();
     }
 
     public ActionChainResult(String namespace, String actionName, String methodName) {
-        super(namespace, actionName, methodName);
+        this.namespace = namespace;
+        this.actionName = actionName;
+        this.methodName = methodName;
     }
 
     public ActionChainResult(String namespace, String actionName, String methodName, String skipActions) {
-        super(namespace, actionName, methodName, skipActions);
+        this.namespace = namespace;
+        this.actionName = actionName;
+        this.methodName = methodName;
+        this.skipActions = skipActions;
+    }
+
+    /**
+     * @param actionProxyFactory the actionProxyFactory to set
+     */
+    @Inject
+    public void setActionProxyFactory(ActionProxyFactory actionProxyFactory) {
+        this.actionProxyFactory = actionProxyFactory;
+    }
+
+    /**
+     * Set the action name.
+     *
+     * @param actionName The action name.
+     */
+    public void setActionName(String actionName) {
+        this.actionName = actionName;
+    }
+
+    /**
+     * sets the namespace of the Action that we're chaining to.  if namespace
+     * is null, this defaults to the current namespace.
+     *
+     * @param namespace the name of the namespace we're chaining to
+     */
+    public void setNamespace(String namespace) {
+        this.namespace = namespace;
+    }
+
+    /**
+     * Set the list of actions to skip.
+     * To test if an action should not throe an infinite recursion,
+     * only the action name is used, not the namespace.
+     *
+     * @param actions The list of action name separated by a white space.
+     */
+    public void setSkipActions(String actions) {
+        this.skipActions = actions;
+    }
+
+    public void setMethod(String method) {
+        this.methodName = method;
+    }
+
+    public ActionProxy getProxy() {
+        return proxy;
+    }
+
+    /**
+     * Get the XWork chain history.
+     * The stack is a list of <code>namespace/action!method</code> keys.
+     *
+     * @return the chain history as string list
+     */
+    public static LinkedList<String> getChainHistory() {
+        LinkedList<String> chainHistory = (LinkedList<String>) ActionContext.getContext().get(CHAIN_HISTORY);
+        //  Add if not exists
+        if (chainHistory == null) {
+            chainHistory = new LinkedList<>();
+            ActionContext.getContext().put(CHAIN_HISTORY, chainHistory);
+        }
+
+        return chainHistory;
+    }
+
+    /**
+     * @param invocation the DefaultActionInvocation calling the action call stack
+     */
+    public void execute(ActionInvocation invocation) throws Exception {
+        if (invocation == null) {
+            throw new IllegalArgumentException("Invocation cannot be null!");
+        }
+
+        String finalNamespace = namespace != null ? translateVariables(namespace) : invocation.getProxy()
+                .getNamespace();
+        String finalActionName = translateVariables(actionName);
+        String finalMethodName = methodName != null ? translateVariables(methodName) : null;
+
+        if (isInChainHistory(finalNamespace, finalActionName, finalMethodName)) {
+            addToHistory(finalNamespace, finalActionName, finalMethodName);
+            throw new StrutsException("Infinite recursion detected: " + ActionChainResult.getChainHistory());
+        }
+
+        if (ActionChainResult.getChainHistory().isEmpty() && invocation.getProxy() != null) {
+            addToHistory(finalNamespace, invocation.getProxy().getActionName(), invocation.getProxy().getMethod());
+        }
+        addToHistory(finalNamespace, finalActionName, finalMethodName);
+
+        Map<String, Object> extraContext = ActionContext.of()
+            .withValueStack(invocation.getInvocationContext().getValueStack())
+            .withParameters(invocation.getInvocationContext().getParameters())
+            .with(CHAIN_HISTORY, ActionChainResult.getChainHistory())
+            .getContextMap();
+
+        LOG.debug("Chaining to action {}", finalActionName);
+
+        proxy = actionProxyFactory.createActionProxy(finalNamespace, finalActionName, finalMethodName, extraContext);
+        proxy.execute();
+    }
+
+    protected String translateVariables(String text) {
+        return TextParseUtil.translateVariables(text, ActionContext.getContext().getValueStack());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ActionChainResult that = (ActionChainResult) o;
+        return Objects.equals(actionName, that.actionName) && Objects.equals(methodName,
+                that.methodName) && Objects.equals(namespace, that.namespace);
+    }
+
+    @Override
+    public int hashCode() {
+        int result;
+        result = (actionName != null ? actionName.hashCode() : 0);
+        result = 31 * result + (namespace != null ? namespace.hashCode() : 0);
+        result = 31 * result + (methodName != null ? methodName.hashCode() : 0);
+        return result;
+    }
+
+    private boolean isInChainHistory(String namespace, String actionName, String methodName) {
+        LinkedList<? extends String> chainHistory = ActionChainResult.getChainHistory();
+        Set<String> skipActionsList = new HashSet<>();
+        if (skipActions != null && skipActions.length() > 0) {
+            String finalSkipActions = translateVariables(skipActions);
+            skipActionsList.addAll(TextParseUtil.commaDelimitedStringToSet(finalSkipActions));
+        }
+        if (!skipActionsList.contains(actionName)) {
+            return chainHistory.contains(makeKey(namespace, actionName, methodName));
+        }
+        return false;
+    }
+
+    private void addToHistory(String namespace, String actionName, String methodName) {
+        List<String> chainHistory = ActionChainResult.getChainHistory();
+        chainHistory.add(makeKey(namespace, actionName, methodName));
+    }
+
+    private String makeKey(String namespace, String actionName, String methodName) {
+        return namespace + "/" + actionName + (methodName != null ? "!" + methodName : "");
     }
 }