[maven-release-plugin] prepare release STRUTS_2_5_18

WW-4948 delete temp files on close instead of on JVM exists

.asf.yaml

@@ -1,37 +0,0 @@
-# Documentation https://s.apache.org/asfyaml
-notifications:
-  commits: commits@struts.apache.org
-  # Send all issue emails (new, closed, comments) to issues@
-  issues: issues@struts.apache.org
-  # Send new/closed PR notifications to commits@
-  pullrequests_status: notifications@struts.apache.org
-  # Send individual PR comments/reviews to issues@
-  pullrequests_comment: notifications@struts.apache.org
-  # Link opened PRs with JIRA
-  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.
-      contexts:
-        - build
-      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-7-x:
-      # contexts are the names of checks that must pass.
-      contexts:
-        - build
-      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
-  autolink_jira:
-    - WW
-  dependabot_alerts:  true
-  dependabot_updates: true

.gitattributes

@@ -1,5 +0,0 @@
-# Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
-*.bat eol=crlf
-*.cmd eol=crlf
-*.sh eol=lf

.github/dependabot.yml

@@ -1,11 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "maven"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    ignore: []

.github/workflows/codeql.yml

@@ -1,63 +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.
-
-name: "CodeQL"
-
-on:
-  push:
-    branches:
-      - 'main'
-      - 'release/*'
-  pull_request:
-
-permissions:
-  # Needed to upload the results to code-scanning dashboard.
-  security-events: write
-  actions: read
-  contents: read
-  # Needed to access OIDC token.
-  id-token: write
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-    strategy:
-      fail-fast: false
-      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.9
-      with:
-        languages: ${{ matrix.language }}
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v3.28.9
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3.28.9
-      with:
-        category: "/language:${{matrix.language}}"

.github/workflows/maven.yml

@@ -1,47 +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.
-
-name: Java Maven
-
-on:
-  pull_request:
-  push:
-    branches:
-      - 'main'
-      - 'release/*'
-
-permissions: read-all
-
-env:
-  MAVEN_OPTS: -Xmx2048m -Xms1024m
-  LANG: en_US.utf8
-
-jobs:
-  build:
-    name: Build and Test
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ '17', '21' ]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: ${{ matrix.java }}
-          cache: 'maven'
-      - name: Build with Maven on Java ${{ matrix.java }}
-        run: mvn -B -V -DskipAssembly verify --no-transfer-progress

.github/workflows/scorecards-analysis.yaml

@@ -1,70 +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.
-
-name: "Scorecards supply-chain security"
-
-on:
-  branch_protection_rule:
-  schedule:
-    - cron: "30 1 * * 6"    # Weekly on Saturdays
-  push:
-    branches:
-      - "main"
-
-permissions: read-all
-
-jobs:
-
-  analysis:
-
-    name: "Scorecards analysis"
-    runs-on: ubuntu-latest
-    permissions:
-      # Needed to upload the results to the code-scanning dashboard.
-      security-events: write
-      actions: read
-      id-token: write # This is required for requesting the JWT
-      contents: read  # This is required for actions/checkout
-
-    steps:
-
-      - name: "Checkout code"
-        uses: actions/checkout@v4   # 3.1.0
-        with:
-          persist-credentials: false
-
-      - name: "Run analysis"
-        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46    # 2.4.0
-        with:
-          results_file: results.sarif
-          results_format: sarif
-          # A read-only PAT token, which is sufficient for the action to function.
-          # The relevant discussion: https://github.com/ossf/scorecard-action/issues/188
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          # Publish the results for public repositories to enable scorecard badges.
-          # For more details: https://github.com/ossf/scorecard-action#publishing-results
-          publish_results: true
-
-      - name: "Upload artifact"
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08    # 4.6.0
-        with:
-          name: SARIF file
-          path: results.sarif
-          retention-days: 5
-
-      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@0a35e8f6866a39b001e5f7ad1d0daf9836786896    # 2.22.11
-        with:
-          sarif_file: results.sarif

.github/workflows/sonar.yml

@@ -1,47 +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.
-
-name: SonarCloud
-
-on:
-  pull_request:
-  push:
-    branches:
-      - 'main'
-
-permissions: read-all
-
-env:
-  MAVEN_OPTS: -Xmx2048m -Xms1024m
-  LANG: en_US.utf8
-
-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@v4
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 21
-          cache: 'maven'
-      - 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

.gitignore

@@ -11,9 +11,6 @@
 .metadata/
 Servers/
 
-# Java annotation processor (APT)
-.factorypath
-
 #VSCode
 .vscode
 
@@ -27,22 +24,41 @@ Servers/
 .java-version
 
 # Maven
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
-.mvn/wrapper/maven-wrapper.jar
-
+core/target
+plugins/convention/target
+plugins/embeddedjsp/target
+plugins/osgi/target
+plugins/cdi/target
+plugins/spring/target
+plugins/jfreechart/target
+apps/rest-showcase/target
+apps/mailreader/target
+apps/portlet/target
+apps/blank/target
+apps/jboss-blank/target
+apps/mailreader/target
+apps/portlet/target
+apps/showcase/target
+apps/target
+bundles/admin/target
+plugins/config-browser/target
+plugins/jasperreports/target
+plugins/json/target
+plugins/portlet-tiles/target
+plugins/portlet/target
+plugins/sitegraph/target
+plugins/sitemesh/target
+plugins/javatemplates/target
+bundles/demo/target
+plugins/rest/target
+plugins/plexus/target
+plugins/testng/target
+plugins/dwr/target
+plugins/gxp/target
+plugins/oval/target
+plugins/junit/target
+plugins/tiles/target
+bundles/target
+plugins/target
+target
 plugins/testng/test-output
-test-output
-
-# Sonar
-/.sonar/
-
-# Tidelift CLI scanner
-.tidelift

.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,110 @@
+/*
+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.
+*/
+
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    /**
+     * 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/0.4.0/maven-wrapper-0.4.0.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 direcrory '" + 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 {
+        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

@@ -1,19 +1 @@
-# 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.
-wrapperVersion=3.3.2
-distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip

.travis.yml

@@ -0,0 +1,21 @@
+language: java
+sudo: false
+
+jdk:
+  - openjdk7
+  - oraclejdk8
+
+install: true
+script: mvn test -DskipAssembly
+
+after_success:
+  - mvn clean cobertura:cobertura org.eluder.coveralls:coveralls-maven-plugin:report com.updateimpact:updateimpact-maven-plugin:submit -Ptravis-coveralls,update-impact -DskipAssembly
+
+env:
+  global:
+    secure: DusDFL9cuX+mj64tXQfrYVbUVYnxlXmad4nuIMj0/lgDbwJ6kxYasJmR99bdvwu08gS9D5b7a+m7WJTN0FNATzEiiGDXcM+TiDPlYDh7dcalU4QGiLmMuCCEw1r7hp2XE4BWVgDfFhCsHhStgjE4RXzHIyPowoPXr4ugPf8at6w=
+
+cache:
+  directories:
+  - $HOME/.m2
+  

CODEOWNERS

@@ -1,2 +0,0 @@
-# Request PR review from any Apache Struts committer
-* @apache/struts-committers

Jenkinsfile

@@ -1,215 +0,0 @@
-#!groovy
-
-pipeline {
-  agent none
-  options {
-    buildDiscarder logRotator(daysToKeepStr: '14', numToKeepStr: '10')
-    timeout(80)
-    disableConcurrentBuilds()
-    skipStagesAfterUnstable()
-    quietPeriod(30)
-  }
-  triggers {
-    pollSCM 'H/15 * * * *'
-  }
-  stages {
-    stage('Prepare') {
-      agent {
-        label 'ubuntu'
-      }
-      stages {
-        stage('Clean up') {
-          steps {
-            cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**', type: 'INCLUDE']]
-          }
-        }
-      }
-    }
-    stage('JDK 21') {
-      agent {
-        label 'ubuntu'
-      }
-      tools {
-        jdk 'jdk_21_latest'
-        maven 'maven_3_latest'
-      }
-      environment {
-        MAVEN_OPTS = "-Xmx1024m"
-      }
-      stages {
-        stage('Test') {
-          steps {
-            sh './mvnw -B -DskipAssembly verify'
-          }
-          post {
-            always {
-              junit(testResults: '**/surefire-reports/*.xml', allowEmptyResults: true)
-              junit(testResults: '**/failsafe-reports/*.xml', allowEmptyResults: true)
-            }
-          }
-        }
-      }
-      post {
-        always {
-          cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**', type: 'INCLUDE']]
-        }
-      }
-    }
-    stage('JDK 17') {
-      agent {
-        label 'ubuntu'
-      }
-      tools {
-        jdk 'jdk_17_latest'
-        maven 'maven_3_latest'
-      }
-      environment {
-        MAVEN_OPTS = "-Xmx2048m"
-      }
-      stages {
-        stage('Install') {
-          steps {
-            sh './mvnw -B install -DskipTests -DskipAssembly'
-          }
-        }
-        stage('Test') {
-          steps {
-            sh './mvnw -B verify -Pcoverage -DskipAssembly'
-          }
-          post {
-            always {
-              junit(testResults: '**/surefire-reports/*.xml', allowEmptyResults: true)
-              junit(testResults: '**/failsafe-reports/*.xml', allowEmptyResults: true)
-            }
-          }
-        }
-        stage('Build Source & JavaDoc') {
-          when {
-            anyOf {
-              branch 'main'
-              branch 'release/struts-6-7-x'
-            }
-          }
-          steps {
-            dir("local-snapshots-dir/") {
-              deleteDir()
-            }
-            sh './mvnw -B source:jar javadoc:jar -DskipTests -DskipAssembly'
-          }
-        }
-        stage('Deploy Snapshot') {
-          when {
-            anyOf {
-              branch 'main'
-              branch 'release/struts-6-7-x'
-            }
-          }
-          steps {
-            withCredentials([file(credentialsId: 'lukaszlenart-repository-access-token', variable: 'CUSTOM_SETTINGS')]) {
-              sh './mvnw -s \${CUSTOM_SETTINGS} deploy -DskipTests -DskipAssembly'
-            }
-          }
-        }
-        stage('Upload nightlies') {
-          when {
-            anyOf {
-              branch 'main'
-              branch 'release/struts-6-7-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'
-                        )
-                    ],
-                    verbose: true
-                )
-            ])
-          }
-        }
-      }
-      post {
-        always {
-          cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**', type: 'INCLUDE']]
-        }
-      }
-    }
-  }
-  post {
-    // If this build failed, send an email to the list.
-    failure {
-      script {
-        emailext(
-            to: "notifications@struts.apache.org",
-            recipientProviders: [[$class: 'DevelopersRecipientProvider']],
-            from: "Mr. Jenkins <jenkins@builds.apache.org>",
-            subject: "Jenkins job ${env.JOB_NAME}#${env.BUILD_NUMBER} failed",
-            body: """
-There is a build failure in ${env.JOB_NAME}.
-
-Build: ${env.BUILD_URL}
-Logs: ${env.BUILD_URL}console
-Changes: ${env.BUILD_URL}changes
-
---
-Mr. Jenkins
-Director of Continuous Integration
-"""
-        )
-      }
-    }
-
-    // If this build didn't fail, but there were failing tests, send an email to the list.
-    unstable {
-      script {
-        emailext(
-            to: "notifications@struts.apache.org",
-            recipientProviders: [[$class: 'DevelopersRecipientProvider']],
-            from: "Mr. Jenkins <jenkins@builds.apache.org>",
-            subject: "Jenkins job ${env.JOB_NAME}#${env.BUILD_NUMBER} unstable",
-            body: """
-Some tests have failed in ${env.JOB_NAME}.
-
-Build: ${env.BUILD_URL}
-Logs: ${env.BUILD_URL}console
-Changes: ${env.BUILD_URL}changes
-
---
-Mr. Jenkins
-Director of Continuous Integration
-"""
-        )
-      }
-    }
-
-    // Send an email, if the last build was not successful and this one is.
-    fixed {
-      script {
-        emailext(
-            to: "notifications@struts.apache.org",
-            recipientProviders: [[$class: 'DevelopersRecipientProvider']],
-            from: 'Mr. Jenkins <jenkins@builds.apache.org>',
-            subject: "Jenkins job ${env.JOB_NAME}#${env.BUILD_NUMBER} back to normal",
-            body: """
-The build for ${env.JOB_NAME} completed successfully and is back to normal.
-
-Build: ${env.BUILD_URL}
-Logs: ${env.BUILD_URL}console
-Changes: ${env.BUILD_URL}changes
-
---
-Mr. Jenkins
-Director of Continuous Integration
-"""
-        )
-      }
-    }
-  }
-}

README.md

@@ -17,22 +17,20 @@
 The Apache Struts web framework
 -------------------------------
 
-[![Build Status](https://ci-builds.apache.org/buildStatus/icon?job=Struts%2FStruts+Core%2Fmain)](https://ci-builds.apache.org/job/Struts/job/Struts%20Core/job/main/)
-[![Java Build](https://github.com/apache/struts/actions/workflows/maven.yml/badge.svg)](https://github.com/apache/struts/actions/workflows/maven.yml)
+[![Build Status @ Jenkins](https://builds.apache.org/buildStatus/icon?job=Struts-master-JDK7)](https://builds.apache.org/view/S-Z/view/Struts/job/Struts-master-JDK7/)
+[![Build Status @ Travis](https://travis-ci.org/apache/struts.svg?branch=master)](https://travis-ci.org/apache/struts)
 [![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)
-[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=apache_struts&metric=coverage)](https://sonarcloud.io/summary/new_code?id=apache_struts)
-[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/apache/struts/badge)](https://deps.dev/maven/org.apache.struts%3Astruts2-core)
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/6618/badge)](https://bestpractices.coreinfrastructure.org/projects/6618)
+[![Coverage Status](https://coveralls.io/repos/github/apache/struts/badge.svg)](https://coveralls.io/github/apache/struts)
+[![Dependencies](https://app.updateimpact.com/badge/713283867011846144/Struts%202.svg?config=test)](https://app.updateimpact.com/latest/713283867011846144/Struts%202)
 [![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
 
 The Apache Struts web framework is a free open-source solution for creating Java web applications.
 
 ## Documentation
 
-More information can be found on the [homepage](https://struts.apache.org/). Please read the [Security Guide](https://struts.apache.org/security/),
+More information can be found on the [homepage](https://struts.apache.org/). Please read the [Security Guide](https://struts.apache.org/security/) 
 and the [JavaDocs](https://struts.apache.org/maven/struts2-core/apidocs/index.html) can be browsed.
-Questions related to the usage of Apache Struts should be posted to the [user mailing list](https://struts.apache.org/mail.html).
+Questions related to the usage of the Apache Struts should be posted to the [user mailing list](https://struts.apache.org/mail.html).
 
 ## Description
 
@@ -45,15 +43,13 @@ In practice, we find that unless these concerns are separated, larger applicatio
 One way to separate concerns in a software application is to use a Model-View-Controller (MVC) architecture. The Model 
 represents the business or database code, the View represents the page design code, and the Controller represents 
 the navigational code. The Struts framework is designed to help developers create web applications that utilize 
-an MVC architecture.
+a MVC architecture.
 
 The framework provides three key components:
 
-- A “request” handler provided by the application developer that is mapped to a standard URI.
-- A “response” handler that transfers control to another resource which completes the response.
-- A tag library that helps developers create interactive form-based applications with server pages.
-
-The framework’s architecture and tags are buzzword compliant. Struts works well
+A “request” handler provided by the application developer that is mapped to a standard URI. A “response” handler that 
+transfers control to another resource which completes the response. A tag library that helps developers create interactive 
+form-based applications with server pages. The framework’s architecture and tags are buzzword compliant. Struts works well
 with conventional REST applications and with technologies like SOAP and AJAX.
 
 ## The Apache Struts Project
@@ -69,7 +65,7 @@ platform into a coherent whole. Our goal is to leverage existing standards by pr
 enterprise-grade applications that are easy to maintain over time.
 
 The Apache Struts Project offered two major versions of the Struts framework. Currently we are only maintaining the Struts 2 
-version. It is recommended to upgrade all Struts 1.x applications to Struts 2. Please do not start new application development 
+version. It is recommended to upgrade all Struts 1.x application to Struts 2. Please do not start new application development 
 using Struts 1.x, as we are no longer issuing security patches.
 
 Struts 2 was originally known as WebWork 2. After working independently for several years, the WebWork and Struts 
@@ -78,40 +74,25 @@ to difficult problems.
 
 ## Why should you use Apache Struts?
 
-Apache Struts is a modern, maintained and full-featured web framework. As it has been around for years and grown a huge user 
-base it is unlikely it will go away anytime soon. Not only that, we have dedicated users and developers 
-on the project. Apache Struts is licensed under the Apache License 2.0 and this will not change. We maintain a clean IP 
+Apache Struts is a modern, maintained and full-featured web framework. It has been there for years and give the huge user 
+base it is unlikely it will go away anytime soon in the future. Not only that we have dedicated users and developers 
+on the project. Apache Struts is licensed to the Apache License 2.0 and this will not change. We maintain a clean IP 
 and you are “safe” to use the project. Sometimes you are not “safe” to use a project when a company controls the SCM. 
 Access to Source Code doesn’t mean it is free. With Apache Struts, you are not only free to “do what you want with it”, 
-you can even contribute (which is not always the case). And best of all: you can become a part of the core team too.
+you can even contribute (which is not always the case). And best of it: you can become a part of the core team too.
 
 It is usually very easy to integrate other technologies with Apache Struts. If you are using an ORM like Apache Cayenne, 
-Hibernate or JDBC, you will not have any restrictions. Apache Struts is not even tied too much to a frontend technology. 
+Hibernate or JDBC you will not have any restrictions. Apache Struts is not even tied too much to a frontend technology. 
 In old days it was JSP, then came Velocity and Freemarker. Nowadays you might build your web application with just static 
-HTML and AngularJS. Or you might want to use Sitemesh or Tiles. This all is no problem due to Struts' elegant and easy-to-use 
+HTML and AngularJS. Or you want to use Sitemesh or Tiles. This all is no problem due to Struts elegant and easy to use 
 extension mechanisms.
 
-Unlike other, component-oriented frameworks, we do not aim to hide the stateless nature of the web. We think it is 
+Unlike other, component oriented frameworks, we do not aim to hide the stateless nature of the web. We think it is 
 perfectly acceptable to build upon a Request/Response cycle. We also think the MVC pattern is not so bad, just because 
 it is old. In fact, we believe the Apache Struts architecture is clean and easy to understand.
 
-Of course, if you wish to build components on the server side which render on the front end side, you will most likely 
-not want Struts. This is a different approach which promises to reduce the amount of HTML/JavaScript knowledge needed 
+Of course, if you wish to build components on the server side which render on the front end side, you are most likely 
+wrong with Struts. This is a different approach which promises to reduce the amount of HTML/JavaScript knowledge needed 
 and to create reusable components for the view layer. Projects like Wicket and Tapestry serve this purpose very well. 
-As with every framework, you need to decide if it makes sense for you to build components or if you prefer 
-the Struts approach.
-
-## Commercial Support
-
-The Apache Struts community does not offer commercial support by itself, but we maintain [a list of companies offering
-commercial support on our website](https://struts.apache.org/commercial-support.html).
-
-Some Apache Struts maintainers are working with [Tidelift](https://tidelift.com/) to provide commercial support and
-invest paid working time in the improvement of the Apache Struts framework. For more information, visit 
-the [Tidelift resources regarding Apache Struts](https://tidelift.com/subscription/pkg/maven-org-apache-struts-struts2-core?utm_source=maven-org-apache-struts-struts2-core&utm_medium=referral&utm_campaign=readme)
-
-## Thank you
-
-[YourKit](https://www.yourkit.com/) is kindly supporting open source projects with its full-featured Java Profiler.
-YourKit is the creator of innovative and intelligent tools for profiling Java and .NET applications.
-As an Apache committer, you can get a free license at [YourKit's open source sponsorship program](https://www.yourkit.com/java/profiler/purchase/#os_license).
+As with every framework you need to decide if it makes sense for you to build components or if you are better with 
+the Struts-approach.

SECURITY.md

@@ -1,40 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Please visit 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          |
-|---------|--------------------|
-| 7.x     | :white_check_mark: |
-| 6.7.x   | :white_check_mark: |
-| 2.5.x   | ❌ |
-
-## Reporting New Security Issues with thr Apache Struts
-
-([original](https://struts.apache.org/security.html))
-
-The Apache Struts project takes a very active stance in eliminating security problems
-and denial of service attacks against applications using the Apache Struts framework.
-
-**We strongly encourage folks to report such security problems to our private security mailing list first,
-before disclosing them in a public forum**.
-
-We cannot accept regular bug reports or other queries at this address, we ask that you use our
-[issue tracker (JIRA)](https://issues.apache.org/jira/browse/WW) for those.
-
-```
-All mail sent to this address that does not relate to security problems in the Apache Struts source code will be ignored
-```
-
-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
-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)
-
-[General network server security tips](http://httpd.apache.org/docs/trunk/misc/security_tips.html)
-
-[The Apache Security Team](http://www.apache.org/security/)

apps/README.md

@@ -1,12 +0,0 @@
-# Struts 2 Apps
-These module consists of two example applications, which were built using the Apache Struts project.
-One is an old-fashioned Web application and another is a modern REST based single page app.
-
-## Installation
-Enter a given folder, either `showcase/` or `rest-showcase/` and start the app using Maven:
-
-```
-mvn jetty:run
-```
-
-then open your browser at http://localhost:8080 and navigate to a proper context.

apps/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>7.0.3</version>
+        <version>2.5.18</version>
     </parent>
     <artifactId>struts2-apps</artifactId>
     <packaging>pom</packaging>

apps/rest-showcase/pom.xml

@@ -24,12 +24,12 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>7.0.3</version>
+        <version>2.5.18</version>
     </parent>
 
     <artifactId>struts2-rest-showcase</artifactId>
     <packaging>war</packaging>
-    <version>7.0.3</version>
+    <version>2.5.18</version>
     <name>Struts 2 Rest Showcase Webapp</name>
     <description>Struts 2 Rest Showcase Example</description>
 
@@ -56,10 +56,12 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
+            <version>${log4j2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
+            <version>${log4j2.version}</version>
         </dependency>
 
         <dependency>
@@ -71,31 +73,26 @@
         <dependency>
             <groupId>net.sourceforge.jwebunit</groupId>
             <artifactId>jwebunit-core</artifactId>
-            <version>3.3</version>
+            <version>1.4.1</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
-            <groupId>org.htmlunit</groupId>
-            <artifactId>htmlunit</artifactId>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>net.sourceforge.jwebunit</groupId>
             <artifactId>jwebunit-htmlunit-plugin</artifactId>
-            <version>3.3</version>
+            <version>1.4.1</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
                     <groupId>xom</groupId>
                     <artifactId>xom</artifactId>
                 </exclusion>
-                <!-- not necessary to compile and it force dependency convergence issues -->
-                <exclusion>
-                    <groupId>net.sourceforge.htmlunit</groupId>
-                    <artifactId>htmlunit</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
 
@@ -105,12 +102,18 @@
         <finalName>struts2-rest-showcase</finalName>
         <plugins>
             <plugin>
-                <groupId>org.eclipse.jetty</groupId>
+                <groupId>org.mortbay.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>11.0.18</version>
+                <version>8.1.16.v20140903</version>
                 <configuration>
                     <stopKey>CTRL+C</stopKey>
                     <stopPort>8999</stopPort>
+                    <systemProperties>
+                        <systemProperty>
+                            <name>xwork.loggerFactory</name>
+                            <value>com.opensymphony.xwork2.util.logging.log4j2.Log4j2LoggerFactory</value>
+                        </systemProperty>
+                    </systemProperties>
                     <scanIntervalSeconds>10</scanIntervalSeconds>
                     <webAppSourceDirectory>${basedir}/src/main/webapp/</webAppSourceDirectory>
                     <webAppConfig>
@@ -122,7 +125,6 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>@{argLine}</argLine>
                     <excludes>
                         <exclude>it/**</exclude>
                         <exclude>**/*$*</exclude>

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

@@ -18,30 +18,30 @@
  */
 package org.demo.rest.example;
 
-import org.apache.struts2.ModelDriven;
-import org.apache.struts2.Validateable;
-import org.apache.struts2.ValidationAwareSupport;
+import java.util.Collection;
+
 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 org.apache.struts2.convention.annotation.Results;
+import org.apache.struts2.convention.annotation.Result;
 
-import java.util.Collection;
+import com.opensymphony.xwork2.ModelDriven;
+import com.opensymphony.xwork2.Validateable;
+import com.opensymphony.xwork2.ValidationAwareSupport;
 
 @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/rest-showcase/src/main/resources/log4j2.xml

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

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

@@ -20,8 +20,8 @@
  */
 -->
 <!DOCTYPE struts PUBLIC
-        "-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
-        "https://struts.apache.org/dtds/struts-6.0.dtd">
+        "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+        "http://struts.apache.org/dtds/struts-2.5.dtd">
 
 
 <struts>
@@ -41,4 +41,4 @@
     <package name="rest-showcase" extends="rest-default">
         <global-allowed-methods>index,show,create,update,destroy,deleteConfirm,edit,editNew</global-allowed-methods>
     </package>
-</struts>
+</struts>

apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-deleteConfirm.jsp

@@ -27,16 +27,14 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Orders</title>
-    <!-- Using a standard HTML link tag with JSP EL to get the contextPath may be simpler, but this is an equivalent for s:link -->
-    <s:set var="pageContextPath"><%=((HttpServletRequest)request).getContextPath()%></s:set>
-    <s:link href="%{#pageContextPath}/css/bootstrap.min.css" rel="stylesheet"></s:link>
-    <s:link href="%{#pageContextPath}/css/app.css" rel="stylesheet"></s:link>
+    <link href="${pageContext.request.contextPath}/css/bootstrap.min.css" rel="stylesheet">
+    <link href="${pageContext.request.contextPath}/css/app.css" rel="stylesheet">
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
-    <s:script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></s:script>
-    <s:script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></s:script>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
 </head>
 <body>

apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-edit.jsp

@@ -27,16 +27,14 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Orders</title>
-    <!-- Using a standard HTML link tag with JSP EL to get the contextPath may be simpler, but this is an equivalent for s:link -->
-    <s:set var="pageContextPath"><%=((HttpServletRequest)request).getContextPath()%></s:set>
-    <s:link href="%{#pageContextPath}/css/bootstrap.min.css" rel="stylesheet"></s:link>
-    <s:link href="%{#pageContextPath}/css/app.css" rel="stylesheet"></s:link>
+    <link href="${pageContext.request.contextPath}/css/bootstrap.min.css" rel="stylesheet">
+    <link href="${pageContext.request.contextPath}/css/app.css" rel="stylesheet">
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
-    <s:script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></s:script>
-    <s:script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></s:script>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
 </head>
 <body>

apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-editNew.jsp

@@ -27,16 +27,13 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Orders</title>
-    <!-- Using a standard HTML link tag with JSP EL to get the contextPath may be simpler, but this is an equivalent for s:link -->
-    <s:set var="pageContextPath"><%=((HttpServletRequest)request).getContextPath()%></s:set>
-    <s:link href="%{#pageContextPath}/css/bootstrap.min.css" rel="stylesheet"></s:link>
-    <s:link href="%{#pageContextPath}/css/app.css" rel="stylesheet"></s:link>
-
+    <link href="${pageContext.request.contextPath}/css/bootstrap.min.css" rel="stylesheet">
+    <link href="${pageContext.request.contextPath}/css/app.css" rel="stylesheet">
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
-    <s:script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></s:script>
-    <s:script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></s:script>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
 </head>
 <body>

apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-index.jsp

@@ -27,16 +27,14 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Orders</title>
-    <!-- Using a standard HTML link tag with JSP EL to get the contextPath may be simpler, but this is an equivalent for s:link -->
-    <s:set var="pageContextPath"><%=((HttpServletRequest)request).getContextPath()%></s:set>
-    <s:link href="%{#pageContextPath}/css/bootstrap.min.css" rel="stylesheet"></s:link>
-    <s:link href="%{#pageContextPath}/css/app.css" rel="stylesheet"></s:link>
+    <link href="${pageContext.request.contextPath}/css/bootstrap.min.css" rel="stylesheet">
+    <link href="${pageContext.request.contextPath}/css/app.css" rel="stylesheet">
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
-    <s:script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></s:script>
-    <s:script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></s:script>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
 </head>
 <body>

apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-show.jsp

@@ -27,16 +27,14 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Orders</title>
-    <!-- Using a standard HTML link tag with JSP EL to get the contextPath may be simpler, but this is an equivalent for s:link -->
-    <s:set var="pageContextPath"><%=((HttpServletRequest)request).getContextPath()%></s:set>
-    <s:link href="%{#pageContextPath}/css/bootstrap.min.css" rel="stylesheet"></s:link>
-    <s:link href="%{#pageContextPath}/css/app.css" rel="stylesheet"></s:link>
+    <link href="${pageContext.request.contextPath}/css/bootstrap.min.css" rel="stylesheet">
+    <link href="${pageContext.request.contextPath}/css/app.css" rel="stylesheet">
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
-    <s:script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></s:script>
-    <s:script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></s:script>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
 </head>
 <body>

apps/rest-showcase/src/main/webapp/WEB-INF/web.xml

@@ -19,16 +19,16 @@
  * under the License.
  */
 -->
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<web-app id="starter" version="2.4"
+         xmlns="http://java.sun.com/xml/ns/j2ee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-         http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
-         version="3.1">
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 
-    <display-name>Struts 2 Rest Example</display-name>
+  <display-name>Struts 2 Rest Example</display-name>
 
-    <!-- Filters -->
-    <!-- START SNIPPET: filter -->
+
+  <!-- Filters -->
+  <!-- START SNIPPET: filter -->
     <filter>
         <filter-name>action2</filter-name>
         <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>

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

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

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

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

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

@@ -18,37 +18,22 @@
  */
 package it.org.apache.struts2.rest.example;
 
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.htmlunit.FailingHttpStatusCodeException;
-import org.junit.Before;
-import org.junit.Test;
+import net.sourceforge.jwebunit.junit.WebTestCase;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.StringRequestEntity;
 
 import java.io.IOException;
 
-import static net.sourceforge.jwebunit.junit.JWebUnit.assertLinkNotPresentWithText;
-import static net.sourceforge.jwebunit.junit.JWebUnit.assertTextFieldEquals;
-import static net.sourceforge.jwebunit.junit.JWebUnit.assertTextPresent;
-import static net.sourceforge.jwebunit.junit.JWebUnit.beginAt;
-import static net.sourceforge.jwebunit.junit.JWebUnit.getTestContext;
-import static net.sourceforge.jwebunit.junit.JWebUnit.setTextField;
-import static net.sourceforge.jwebunit.junit.JWebUnit.setWorkingForm;
-import static net.sourceforge.jwebunit.junit.JWebUnit.submit;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
 
-public class PostOrderTest {
+public class PostOrderTest extends WebTestCase {
 
-    @Before
     public void setUp() throws Exception {
         getTestContext().setBaseUrl(ParameterUtils.getBaseUrl());
     }
 
-    @Test
+
     public void testPostOrder() {
         beginAt("/orders/new");
         setWorkingForm(0);
@@ -59,7 +44,6 @@ public class PostOrderTest {
         assertLinkNotPresentWithText("Back to Orders");
     }
 
-    @Test
     public void testPostOrderWithErrors() {
         beginAt("/orders/new");
         setWorkingForm(0);
@@ -73,7 +57,6 @@ public class PostOrderTest {
         assertTextFieldEquals("amount", "321");
     }
 
-    @Test
     public void testPostOrderInHtml() {
         beginAt("/orders/new.xhtml");
         setWorkingForm(0);
@@ -88,55 +71,69 @@ public class PostOrderTest {
         assertLinkNotPresentWithText("Back to Orders");
     }
 
-    @Test
     public void testPostOrderInXml() throws IOException {
-        CloseableHttpClient client = HttpClients.createDefault();
-        HttpPost httpPost = new HttpPost(ParameterUtils.getBaseUrl() + "/orders.xml");
-        httpPost.setEntity(new StringEntity("<org.apache.struts2.rest.example.Order>\n" +
-                "<clientName>Test3</clientName>\n" +
-                "<amount>3342</amount>\n" +
-                "</org.apache.struts2.rest.example.Order>"));
-        CloseableHttpResponse response = client.execute(httpPost);
-        assertEquals(201, response.getStatusLine().getStatusCode());
-        assertTrue(response.getHeaders("Location")[0].getValue().startsWith(ParameterUtils.getBaseUrl() + "/orders/"));
-        client.close();
+        HttpClient client = new HttpClient();
+        PostMethod method = null;
+        try {
+            method = new PostMethod(ParameterUtils.getBaseUrl()+"/orders.xml");
+            method.setRequestEntity(new StringRequestEntity("<org.apache.struts2.rest.example.Order>\n" +
+                    "<clientName>Test3</clientName>\n" +
+                    "<amount>3342</amount>\n" +
+                    "</org.apache.struts2.rest.example.Order>"));
+            client.executeMethod(method);
+            assertEquals(201, method.getStatusCode());
+            assertTrue(method.getResponseHeader("Location").getValue().startsWith(ParameterUtils.getBaseUrl()+"/orders/"));
+        } finally {
+            method.releaseConnection();
+        }
     }
 
-    @Test
     public void testPostOrderInXmlWithBadData() throws IOException {
-        CloseableHttpClient client = HttpClients.createDefault();
-        HttpPost httpPost = new HttpPost(ParameterUtils.getBaseUrl() + "/orders.xml");
-        httpPost.setEntity(new StringEntity("<org.apache.struts2.rest.example.Order>\n" +
-                "<amount>3342</amount>\n" +
-                "</org.apache.struts2.rest.example.Order>"));
-        CloseableHttpResponse response = client.execute(httpPost);
-        assertEquals(400, response.getStatusLine().getStatusCode());
-        assertTrue(response.toString().contains("<string>The client name is empty"));
-        assertNull(response.getHeaders("Location"));
-        client.close();
+        HttpClient client = new HttpClient();
+        PostMethod method = null;
+        try {
+            method = new PostMethod(ParameterUtils.getBaseUrl()+"/orders.xml");
+            method.setRequestEntity(new StringRequestEntity("<org.apache.struts2.rest.example.Order>\n" +
+                    "<amount>3342</amount>\n" +
+                    "</org.apache.struts2.rest.example.Order>"));
+            client.executeMethod(method);
+            assertEquals(400, method.getStatusCode());
+            String response = method.getResponseBodyAsString();
+            assertTrue(response.contains("<string>The client name is empty"));
+            assertNull(method.getResponseHeader("Location"));
+        } finally {
+            method.releaseConnection();
+        }
     }
 
-    @Test
     public void testPostOrderInJson() throws IOException {
-        CloseableHttpClient client = HttpClients.createDefault();
-        HttpPost httpPost = new HttpPost(ParameterUtils.getBaseUrl() + "/orders.json");
-        httpPost.setEntity(new StringEntity("{\"amount\":33,\"clientName\":\"Test4\"}"));
-        CloseableHttpResponse response = client.execute(httpPost);
-        assertEquals(201, response.getStatusLine().getStatusCode());
-        assertTrue(response.getHeaders("Location")[0].getValue().startsWith(ParameterUtils.getBaseUrl() + "/orders/"));
-        client.close();
+        HttpClient client = new HttpClient();
+        PostMethod method = null;
+        try {
+            method = new PostMethod(ParameterUtils.getBaseUrl()+"/orders.json");
+            method.setRequestEntity(new StringRequestEntity("{\"amount\":33,\"clientName\":\"Test4\"}"));
+            client.executeMethod(method);
+            assertEquals(201, method.getStatusCode());
+            assertTrue(method.getResponseHeader("Location").getValue().startsWith(ParameterUtils.getBaseUrl()+"/orders/"));
+        } finally {
+            method.releaseConnection();
+        }
     }
 
-    @Test
     public void testPostOrderInJsonWithBadData() throws IOException {
-        CloseableHttpClient client = HttpClients.createDefault();
-        HttpPost httpPost = new HttpPost(ParameterUtils.getBaseUrl() + "/orders.json");
-        httpPost.setEntity(new StringEntity("{\"amount\":33}"));
-        CloseableHttpResponse response = client.execute(httpPost);
-        assertEquals(400, response.getStatusLine().getStatusCode());
-        assertTrue(response.toString()
-                .contains("{\"actionErrors\":[],\"fieldErrors\":{\"clientName\":[\"The client name is empty\"]}}"));
-        assertNull(response.getHeaders("Location"));
-        client.close();
+        HttpClient client = new HttpClient();
+        PostMethod method = null;
+        try {
+            method = new PostMethod(ParameterUtils.getBaseUrl()+"/orders.json");
+            method.setRequestEntity(new StringRequestEntity("{\"amount\":33}"));
+            client.executeMethod(method);
+            String response = method.getResponseBodyAsString();
+            assertEquals(400, method.getStatusCode());
+
+            assertEquals("{\"actionErrors\":[],\"fieldErrors\":{\"clientName\":[\"The client name is empty\"]}}", response);
+            assertNull(method.getResponseHeader("Location"));
+        } finally {
+            method.releaseConnection();
+        }
     }
 }

apps/showcase/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>7.0.3</version>
+        <version>2.5.18</version>
     </parent>
 
     <artifactId>struts2-showcase</artifactId>
@@ -48,16 +48,32 @@
             <artifactId>struts2-config-browser-plugin</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-sitemesh-plugin</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-tiles-plugin</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-dwr-plugin</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-json-plugin</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.tiles</groupId>
+            <artifactId>tiles-jsp</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>
@@ -74,31 +90,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-async-plugin</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-velocity-plugin</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-velocity-tools-view-jakarta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-velocity-tools-jsp-jakarta</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-xslt-plugin</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -106,181 +99,119 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
+            <version>${log4j2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
+            <version>${log4j2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-jcl</artifactId>
+            <version>${log4j2.version}</version>
         </dependency>
+
+        <!-- Velocity -->
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
         </dependency>
 
         <dependency>
-           <groupId>org.sitemesh</groupId>
-           <artifactId>sitemesh</artifactId>
-           <version>3.2.2</version>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-tools</artifactId>
         </dependency>
 
-       <dependency>
-           <groupId>junit</groupId>
-           <artifactId>junit</artifactId>
-           <scope>test</scope>
-       </dependency>
+        <dependency>
+            <groupId>opensymphony</groupId>
+            <artifactId>sitemesh</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>uk.ltd.getahead</groupId>
+            <artifactId>dwr</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+        </dependency>
 
         <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
+            <groupId>net.sourceforge.jwebunit</groupId>
+            <artifactId>jwebunit-core</artifactId>
+            <version>1.4.1</version>
             <scope>test</scope>
         </dependency>
 
-       <dependency>
-           <groupId>org.htmlunit</groupId>
-           <artifactId>htmlunit</artifactId>
-           <scope>test</scope>
-       </dependency>
-
-        <!-- BeanValidation Example -->
         <dependency>
-            <groupId>org.hibernate.validator</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>${hibernate-validator.version}</version>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sourceforge.jwebunit</groupId>
+            <artifactId>jwebunit-htmlunit-plugin</artifactId>
+            <version>1.4.1</version>
+            <scope>test</scope>
             <exclusions>
                 <exclusion>
-                    <groupId>jakarta.validation</groupId>
-                    <artifactId>jakarta.validation-api</artifactId>
+                    <groupId>xom</groupId>
+                    <artifactId>xom</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
 
-        <!--
-         Nashorn (the built-in JDK javascript engine) was deprecated in JDK 11 and removed in JDK 15
-         As a result attempting to use @ScriptAssert on JDK 17 leads to the exception
-         See more details
-         https://stackoverflow.com/questions/78008950/resolve-org-hibernate-validator-spi-scripting-scriptevaluatornotfoundexception
-         -->
+        <!-- BeanValidation Example -->
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-jsr223</artifactId>
-            <version>3.0.22</version>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>5.1.3.Final</version>
         </dependency>
+
+        <!-- The Servlet API mocks in Spring Framework 4.x only supports Servlet 3.0 and higher.
+           This is only necessary in tests-->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-dependency-plugin</artifactId>
-              <executions>
-                <execution>
-                  <?m2e ignore?>
-                  <id>copy-dependencies</id>
-                  <phase>package</phase>
-                  <goals>
-                    <goal>copy</goal>
-                  </goals>
-                  <configuration>
-                    <outputDirectory>${project.build.directory}/extraclasspath</outputDirectory>
-                    <artifactItems>
-                      <artifactItem>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-velocity-tools-view-jakarta</artifactId>
-                        <destFileName>struts2-velocity-tools-view-jakarta.jar</destFileName>
-                      </artifactItem>
-                      <artifactItem>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-velocity-tools-jsp-jakarta</artifactId>
-                        <destFileName>struts2-velocity-tools-jsp-jakarta.jar</destFileName>
-                      </artifactItem>
-                    </artifactItems>
-                    <overWriteReleases>false</overWriteReleases>
-                    <overWriteSnapshots>false</overWriteSnapshots>
-                    <overWriteIfNewer>true</overWriteIfNewer>
-                  </configuration>
-                </execution>
-              </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.5.2</version>
-                <configuration>
-                    <includes>
-                        <include>it.org.apache.struts2.showcase.*Test</include>
-                    </includes>
-                    <systemPropertyVariables>
-                        <http.port>8090</http.port>
-                    </systemPropertyVariables>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>integration-test</id>
-                        <goals>
-                            <goal>integration-test</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>verify</id>
-                        <goals>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.eclipse.jetty</groupId>
+                <groupId>org.mortbay.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>11.0.18</version>
+                <version>8.1.16.v20140903</version>
                 <configuration>
                     <stopKey>CTRL+C</stopKey>
                     <stopPort>8999</stopPort>
                     <systemProperties>
+                        <systemProperty>
+                            <name>log4j.configuration</name>
+                            <value>file:${basedir}/src/main/resources/log4j.properties</value>
+                        </systemProperty>
                         <systemProperty>
                             <name>slf4j</name>
                             <value>false</value>
                         </systemProperty>
                     </systemProperties>
-                    <httpConnector>
-                        <port>8090</port>
-                    </httpConnector>
-                    <scan>10</scan>
-                    <webApp>
-                      <extraClasspath>
-                        ${project.build.directory}/extraclasspath/struts2-velocity-tools-view-jakarta.jar,
-                        ${project.build.directory}/extraclasspath/struts2-velocity-tools-jsp-jakarta
-                      </extraClasspath>
-                      <contextPath>/struts2-showcase</contextPath>
-                      <descriptor>${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
-                    </webApp>
+                    <scanIntervalSeconds>10</scanIntervalSeconds>
+                    <webAppSourceDirectory>${basedir}/src/main/webapp/</webAppSourceDirectory>
+                    <webAppConfig>
+                        <contextPath>/struts2-showcase</contextPath>
+                        <descriptor>${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
+                    </webAppConfig>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>start-jetty</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <!-- stop any previous instance to free up the port -->
-                            <goal>stop</goal>
-                            <goal>start</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>stop-jetty</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>stop</goal>
-                        </goals>
-                    </execution>
-                </executions>
              </plugin>
 
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>@{argLine}</argLine>
                     <excludes>
                         <exclude>it/**</exclude>
                         <exclude>**/*$*</exclude>

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

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

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

@@ -20,8 +20,7 @@
  */
 package org.apache.struts2.showcase;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
 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

@@ -20,8 +20,7 @@
  */
 package org.apache.struts2.showcase;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
 
 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

@@ -20,8 +20,7 @@
  */
 package org.apache.struts2.showcase;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
 
 /**
  *
@@ -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

@@ -20,8 +20,7 @@
  */
 package org.apache.struts2.showcase;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -37,7 +36,6 @@ public class MoreSelectsAction extends ActionSupport {
 	private List _prioritisedFavouriteCars;
 	private List _prioritisedFavouriteCountries;
 	private List favouriteNumbers;
-        private List favouriteCities;
 
 
 	// Cartoon Characters
@@ -76,11 +74,11 @@ public class MoreSelectsAction extends ActionSupport {
 		return list;
 	}
 
+
 	public List getPrioritisedFavouriteCartoonCharacters() {
 		return _prioritisedFavouriteCartoonCharacters;
 	}
 
-	@StrutsParameter
 	public void setPrioritisedFavouriteCartoonCharacters(List prioritisedFavouriteCartoonCharacters) {
 		_prioritisedFavouriteCartoonCharacters = prioritisedFavouriteCartoonCharacters;
 	}
@@ -89,16 +87,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 +104,6 @@ public class MoreSelectsAction extends ActionSupport {
 		return favouriteNumbers;
 	}
 
-	@StrutsParameter
 	public void setFavouriteNumbers(List favouriteNumbers) {
 		this.favouriteNumbers = favouriteNumbers;
 	}
@@ -128,17 +124,8 @@ public class MoreSelectsAction extends ActionSupport {
 		return list;
 	}
 
-	public List getFavouriteCities() {
-		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

@@ -20,8 +20,7 @@
  */
 package org.apache.struts2.showcase;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
 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/ShowDynamicTreeAction.java

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

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

@@ -20,19 +20,13 @@
  */
 package org.apache.struts2.showcase;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.Validateable;
-import org.apache.struts2.util.ValueStack;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Validateable;
+import com.opensymphony.xwork2.util.ValueStack;
 import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 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

@@ -18,10 +18,9 @@
  */
 package org.apache.struts2.showcase.action;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 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

@@ -18,10 +18,9 @@
  */
 package org.apache.struts2.showcase.action;
 
-import org.apache.struts2.Preparable;
+import com.opensymphony.xwork2.Preparable;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 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

@@ -18,13 +18,9 @@
  */
 package org.apache.struts2.showcase.action;
 
-import org.apache.struts2.ActionSupport;
+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

@@ -18,16 +18,11 @@
  */
 package org.apache.struts2.showcase.action;
 
-import org.apache.struts2.action.Action;
-import org.apache.struts2.interceptor.annotations.After;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.interceptor.annotations.After;
 import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
-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 org.apache.struts2.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

@@ -18,10 +18,9 @@
  */
 package org.apache.struts2.showcase.action;
 
-import org.apache.struts2.Preparable;
+import com.opensymphony.xwork2.Preparable;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 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

@@ -18,8 +18,7 @@
  */
 package org.apache.struts2.showcase.actionchaining;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
 
 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

@@ -18,8 +18,7 @@
  */
 package org.apache.struts2.showcase.actionchaining;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
 
 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

@@ -18,8 +18,7 @@
  */
 package org.apache.struts2.showcase.actionchaining;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
 
 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

@@ -20,11 +20,11 @@
  */
 package org.apache.struts2.showcase.ajax;
 
-import org.apache.struts2.action.Action;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.Action;
 
 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

@@ -20,19 +20,17 @@
  */
 package org.apache.struts2.showcase.ajax;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
 
 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

@@ -20,8 +20,7 @@
  */
 package org.apache.struts2.showcase.ajax;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
 
 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

@@ -20,8 +20,7 @@
  */
 package org.apache.struts2.showcase.ajax;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
 
 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/Category.java

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

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

@@ -20,8 +20,7 @@
  */
 package org.apache.struts2.showcase.ajax.tree;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
 
 /**
  */
@@ -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/application/TestDataProvider.java

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

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

@@ -1,53 +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.async;
-
-import jakarta.servlet.Filter;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.FilterConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
-import java.io.IOException;
-
-/**
- * Filters async actions directly to Struts servlet
- */
-public class AsyncFilter implements Filter {
-    @Override
-    public void init(FilterConfig filterConfig) throws ServletException {
-
-    }
-
-    @Override
-    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
-        String requestURI = ((HttpServletRequest) servletRequest).getRequestURI();
-        if (!requestURI.contains("/async/receiveNewMessages")) {
-            filterChain.doFilter(servletRequest, servletResponse); // Just continue chain.
-        } else {
-            servletRequest.getRequestDispatcher("/async/receiveNewMessages").forward(servletRequest, servletResponse);
-        }
-    }
-
-    @Override
-    public void destroy() {
-
-    }
-}

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

@@ -1,68 +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.async;
-
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Callable;
-
-/**
- * Example to illustrate the <code>async</code> plugin.
- */
-public class ChatRoomAction extends ActionSupport {
-    private String message;
-    private Integer lastIndex;
-    private List<String> newMessages;
-
-    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;
-    }
-
-    public List<String> getNewMessages() {
-        return newMessages;
-    }
-
-    public Callable<String> receiveNewMessages() throws Exception {
-        return () -> {
-            while (lastIndex >= messages.size()) {
-                Thread.sleep(3000);
-            }
-            newMessages = messages.subList(lastIndex, messages.size());
-            return SUCCESS;
-        };
-    }
-
-    public String sendMessage() {
-        synchronized (messages) {
-            messages.add(message);
-        }
-        return SUCCESS;
-    }
-}

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

@@ -21,32 +21,31 @@
 package org.apache.struts2.showcase.chat;
 
 
-import org.apache.struts2.action.Action;
-import org.apache.struts2.ActionContext;
-import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.interceptor.AbstractInterceptor;
-import org.apache.logging.log4j.LogManager;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
 import org.apache.logging.log4j.Logger;
-
-import java.util.Map;
+import org.apache.logging.log4j.LogManager;
+import org.apache.struts2.dispatcher.SessionMap;
 
 public class ChatAuthenticationInterceptor extends AbstractInterceptor {
 
-    private static final long serialVersionUID = 1L;
-    private static final Logger LOG = LogManager.getLogger(ChatAuthenticationInterceptor.class);
-    public static final String USER_SESSION_KEY = "chatUserSessionKey";
+	private static final long serialVersionUID = 1L;
+	private static final Logger LOG = LogManager.getLogger(ChatAuthenticationInterceptor.class);
+	public static final String USER_SESSION_KEY = "chatUserSessionKey";
 
-    public String intercept(ActionInvocation invocation) throws Exception {
+	public String intercept(ActionInvocation invocation) throws Exception {
 
-        LOG.debug("Authenticating chat user");
+		LOG.debug("Authenticating chat user");
 
-        Map<String, Object> session = ActionContext.getContext().getSession();
-        User user = (User) session.get(USER_SESSION_KEY);
+		SessionMap session = (SessionMap) ActionContext.getContext().get(ActionContext.SESSION);
+		User user = (User) session.get(USER_SESSION_KEY);
 
-        if (user == null) {
-            return Action.LOGIN;
-        }
-        return invocation.invoke();
-    }
+		if (user == null) {
+			return Action.LOGIN;
+		}
+		return invocation.invoke();
+	}
 
 }

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

@@ -20,35 +20,35 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import org.apache.struts2.action.Action;
-import org.apache.struts2.ActionContext;
-import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.interceptor.AbstractInterceptor;
-import org.apache.logging.log4j.LogManager;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
-import java.util.Map;
+import javax.servlet.http.HttpSession;
 
 /**
  * Authenticate showcase chat example, make sure everyone have a username.
  */
 public class ChatInterceptor extends AbstractInterceptor {
 
-    private static final Logger LOG = LogManager.getLogger(ChatInterceptor.class);
+	private static final Logger LOG = LogManager.getLogger(ChatInterceptor.class);
 
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-    public static final String CHAT_USER_SESSION_KEY = "ChatUserSessionKey";
+	public static final String CHAT_USER_SESSION_KEY = "ChatUserSessionKey";
 
-    public String intercept(ActionInvocation invocation) throws Exception {
-        Map<String, Object> session = ActionContext.getContext().getSession();
-        User chatUser = (User) session.get(CHAT_USER_SESSION_KEY);
-        if (chatUser == null) {
-            LOG.debug("Chat user not logged in");
-            return Action.LOGIN;
-        }
-        return invocation.invoke();
-    }
+	public String intercept(ActionInvocation invocation) throws Exception {
+		HttpSession session = (HttpSession) ActionContext.getContext().get(ActionContext.SESSION);
+		User chatUser = (User) session.getAttribute(CHAT_USER_SESSION_KEY);
+		if (chatUser == null) {
+			LOG.debug("Chat user not logged in");
+			return Action.LOGIN;
+		}
+		return invocation.invoke();
+	}
 }
 
 

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

@@ -20,9 +20,8 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.action.SessionAware;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.SessionAware;
 
 import java.util.Map;
 
@@ -31,7 +30,7 @@ public class ChatLoginAction extends ActionSupport implements SessionAware {
 	private static final long serialVersionUID = 1L;
 
 	private ChatService chatService;
-	private Map<String, Object> session;
+	private Map session;
 
 	private String name;
 
@@ -43,7 +42,6 @@ public class ChatLoginAction extends ActionSupport implements SessionAware {
 		return this.name;
 	}
 
-	@StrutsParameter
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -62,8 +60,8 @@ public class ChatLoginAction extends ActionSupport implements SessionAware {
 	}
 
 
-    @Override
-    public void withSession(Map<String, Object> session) {
-        this.session = session;
-    }
+	// === SessionAware ===
+	public void setSession(Map session) {
+		this.session = session;
+	}
 }

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

@@ -20,19 +20,18 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.SessionAware;
 
 import java.util.Map;
 
-import org.apache.struts2.action.SessionAware;
-
 public class ChatLogoutAction extends ActionSupport implements SessionAware {
 
 	private static final long serialVersionUID = 1L;
 
 	private ChatService chatService;
 
-	private Map<String, Object> session;
+	private Map session;
 
 
 	public ChatLogoutAction(ChatService chatService) {
@@ -51,8 +50,8 @@ public class ChatLogoutAction extends ActionSupport implements SessionAware {
 	}
 
 
-    @Override
-    public void withSession(Map<String, Object> session) {
-        this.session = session;
-    }
+	// === SessionAware ===
+	public void setSession(Map session) {
+		this.session = session;
+	}
 }

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

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

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

@@ -20,8 +20,7 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
 
 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/DateConverter.java

@@ -20,8 +20,6 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import org.apache.struts2.conversion.impl.XWorkConverter;
-import org.apache.struts2.inject.Inject;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.apache.struts2.util.StrutsTypeConverter;
@@ -35,13 +33,6 @@ public class DateConverter extends StrutsTypeConverter {
 
 	private static final Logger LOG = LogManager.getLogger(DateConverter.class);
 
-	private XWorkConverter fallbackConverter;
-
-	@Inject
-	public void setXWorkConverter(XWorkConverter fallbackConverter) {
-		this.fallbackConverter = fallbackConverter;
-	}
-
 	public Object convertFromString(Map context, String[] values, Class toClass) {
 
 		if (values.length > 0 && values[0] != null && values[0].trim().length() > 0) {
@@ -49,8 +40,7 @@ public class DateConverter extends StrutsTypeConverter {
 			try {
 				return sdf.parse(values[0]);
 			} catch (ParseException e) {
-				LOG.warn("error converting value [" + values[0] + "] to Date. Trying fallback converter.");
-				return this.fallbackConverter.convertValue(context, values[0], toClass);
+				LOG.error("error converting value [" + values[0] + "] to Date ", e);
 			}
 		}
 		return null;

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

@@ -20,9 +20,8 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.action.SessionAware;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.SessionAware;
 
 import java.util.Map;
 
@@ -31,14 +30,13 @@ public class EnterRoomAction extends ActionSupport implements SessionAware {
 	private static final long serialVersionUID = 1L;
 
 	private ChatService chatService;
-	private Map<String, Object> session;
+	private Map session;
 	private String roomName;
 
 	public String getRoomName() {
 		return this.roomName;
 	}
 
-	@StrutsParameter
 	public void setRoomName(String roomName) {
 		this.roomName = roomName;
 	}
@@ -58,9 +56,10 @@ public class EnterRoomAction extends ActionSupport implements SessionAware {
 		return SUCCESS;
 	}
 
-    @Override
-    public void withSession(Map<String, Object> session) {
-        this.session = session;
-    }
+
+	// === SessionAware ===
+	public void setSession(Map session) {
+		this.session = session;
+	}
 
 }

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

@@ -20,9 +20,8 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.action.SessionAware;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.SessionAware;
 
 import java.util.Map;
 
@@ -32,13 +31,12 @@ public class ExitRoomAction extends ActionSupport implements SessionAware {
 
 	private String roomName;
 
-	private Map<String, Object> session;
+	private Map session;
 
 	public String getRoomName() {
 		return roomName;
 	}
 
-	@StrutsParameter
 	public void setRoomName(String roomName) {
 		this.roomName = roomName;
 	}
@@ -56,9 +54,9 @@ public class ExitRoomAction extends ActionSupport implements SessionAware {
 		return SUCCESS;
 	}
 
-    @Override
-    public void withSession(Map<String, Object> session) {
-        this.session = session;
-    }
+	// === SessionAware ===
+	public void setSession(Map session) {
+		this.session = session;
+	}
 
 }

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

@@ -20,8 +20,7 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
 
 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/RoomsAvailableAction.java

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

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

@@ -20,9 +20,8 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.action.SessionAware;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.SessionAware;
 
 import java.util.Map;
 
@@ -30,11 +29,11 @@ public class SendMessageToRoomAction extends ActionSupport implements SessionAwa
 
 	private static final long serialVersionUID = 1L;
 
-	private final ChatService chatService;
+	private ChatService chatService;
 
 	private String roomName;
 	private String message;
-	private Map<String, Object> session;
+	private Map session;
 
 
 	public SendMessageToRoomAction(ChatService chatService) {
@@ -45,7 +44,6 @@ public class SendMessageToRoomAction extends ActionSupport implements SessionAwa
 		return this.roomName;
 	}
 
-	@StrutsParameter
 	public void setRoomName(String roomName) {
 		this.roomName = roomName;
 	}
@@ -54,12 +52,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 {
@@ -70,10 +67,9 @@ public class SendMessageToRoomAction extends ActionSupport implements SessionAwa
 		return SUCCESS;
 	}
 
-    @Override
-    public void withSession(Map<String, Object> session) {
-        this.session = session;
-    }
+	public void setSession(Map session) {
+		this.session = session;
+	}
 
 
 }

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

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

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

@@ -20,8 +20,7 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
 
 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

@@ -20,8 +20,7 @@
  */
 package org.apache.struts2.showcase.conversion;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
 
 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

@@ -20,8 +20,7 @@
  */
 package org.apache.struts2.showcase.conversion;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
 
 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

@@ -20,8 +20,7 @@
  */
 package org.apache.struts2.showcase.conversion;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
 
 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

@@ -20,9 +20,8 @@
  */
 package org.apache.struts2.showcase.filedownload;
 
-import org.apache.struts2.action.Action;
+import com.opensymphony.xwork2.Action;
 import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 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

@@ -20,76 +20,68 @@
  */
 package org.apache.struts2.showcase.fileupload;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.action.UploadedFilesAware;
-import org.apache.struts2.dispatcher.multipart.UploadedFile;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
 
-import java.util.List;
+import java.io.File;
 
 /**
  * Show case File Upload example's action. <code>FileUploadAction</code>
  */
-public class FileUploadAction extends ActionSupport implements UploadedFilesAware {
+public class FileUploadAction extends ActionSupport {
 
-    private String contentType;
-    private UploadedFile uploadedFile;
-    private String fileName;
-    private String caption;
-    private String originalName;
-    private String inputName;
+	private static final long serialVersionUID = 5156288255337069381L;
 
-    public String input() throws Exception {
-        return SUCCESS;
-    }
+	private String contentType;
+	private File upload;
+	private String fileName;
+	private String caption;
 
-    public String upload() throws Exception {
-        return SUCCESS;
-    }
+	public String input() throws Exception {
+		return SUCCESS;
+	}
 
-    public String getContentType() {
-        return contentType;
-    }
+	public String upload() throws Exception {
+		return SUCCESS;
+	}
 
-    public String getFileName() {
-        return fileName;
-    }
+	// since we are using <s:file name="upload" .../> the file name will be
+	// obtained through getter/setter of <file-tag-name>FileName
+	public String getUploadFileName() {
+		return fileName;
+	}
 
-    public String getOriginalName() {
-        return originalName;
-    }
+	public void setUploadFileName(String fileName) {
+		this.fileName = fileName;
+	}
 
-    public String getInputName() {
-        return inputName;
-    }
 
-    public Object getUploadedFile() {
-        return uploadedFile.getContent();
-    }
+	// since we are using <s:file name="upload" ... /> the content type will be
+	// obtained through getter/setter of <file-tag-name>ContentType
+	public String getUploadContentType() {
+		return contentType;
+	}
 
-    public String getCaption() {
-        return caption;
-    }
+	public void setUploadContentType(String contentType) {
+		this.contentType = contentType;
+	}
 
-    @StrutsParameter
-    public void setCaption(String caption) {
-        this.caption = caption;
-    }
 
-    public long getUploadSize() {
-        if (uploadedFile != null) {
-            return uploadedFile.length();
-        } else {
-            return 0;
-        }
-    }
+	// since we are using <s:file name="upload" ... /> the File itself will be
+	// obtained through getter/setter of <file-tag-name>
+	public File getUpload() {
+		return upload;
+	}
 
-    @Override
-    public void withUploadedFiles(List<UploadedFile> uploadedFiles) {
-        this.uploadedFile = uploadedFiles.get(0);
-        this.fileName = uploadedFile.getName();
-        this.contentType = uploadedFile.getContentType();
-        this.originalName = uploadedFile.getOriginalName();
-        this.inputName = uploadedFile.getInputName();
-    }
+	public void setUpload(File upload) {
+		this.upload = upload;
+	}
+
+
+	public String getCaption() {
+		return caption;
+	}
+
+	public void setCaption(String caption) {
+		this.caption = caption;
+	}
 }

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

@@ -21,56 +21,62 @@
 // START SNIPPET: entire-file
 package org.apache.struts2.showcase.fileupload;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.action.UploadedFilesAware;
-import org.apache.struts2.dispatcher.multipart.UploadedFile;
+import com.opensymphony.xwork2.ActionSupport;
 
-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;
+	private String[] uploadFileNames;
+	private String[] uploadContentTypes;
 
-    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

@@ -21,57 +21,65 @@
 // START SNIPPET: entire-file
 package org.apache.struts2.showcase.fileupload;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.action.UploadedFilesAware;
-import org.apache.struts2.dispatcher.multipart.UploadedFile;
+import com.opensymphony.xwork2.ActionSupport;
 
+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/CustomFreemarkerManager.java

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

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

@@ -20,9 +20,8 @@
  */
 package org.apache.struts2.showcase.freemarker;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.Preparable;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Preparable;
 
 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/GetUpdatedHangmanAction.java

@@ -20,17 +20,16 @@
  */
 package org.apache.struts2.showcase.hangman;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.SessionAware;
 
 import java.util.Map;
 
-import org.apache.struts2.action.SessionAware;
-
 public class GetUpdatedHangmanAction extends ActionSupport implements SessionAware {
 
 	private static final long serialVersionUID = 5506025785406043027L;
 
-	private Map<String, Object> session;
+	private Map session;
 	private Hangman hangman;
 
 
@@ -46,6 +45,10 @@ public class GetUpdatedHangmanAction extends ActionSupport implements SessionAwa
 		return SUCCESS;
 	}
 
+	public void setSession(Map session) {
+		this.session = session;
+	}
+
 	public Hangman getHangman() {
 		return hangman;
 	}
@@ -53,9 +56,4 @@ public class GetUpdatedHangmanAction extends ActionSupport implements SessionAwa
 	public void setHangman(Hangman hangman) {
 		this.hangman = hangman;
 	}
-
-    @Override
-    public void withSession(Map<String, Object> session) {
-        this.session = session;
-    }
 }

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

@@ -20,9 +20,8 @@
  */
 package org.apache.struts2.showcase.hangman;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.action.SessionAware;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.SessionAware;
 
 import java.util.Map;
 
@@ -30,11 +29,10 @@ public class GuessCharacterAction extends ActionSupport implements SessionAware
 
 	private static final long serialVersionUID = 9050915577007590674L;
 
-	private Map<String, Object> session;
+	private Map session;
 	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 +44,10 @@ public class GuessCharacterAction extends ActionSupport implements SessionAware
 		return hangman;
 	}
 
-	@StrutsParameter
+	public void setSession(Map session) {
+		this.session = session;
+	}
+
 	public void setCharacter(Character character) {
 		this.character = character;
 	}
@@ -54,9 +55,4 @@ public class GuessCharacterAction extends ActionSupport implements SessionAware
 	public Character getCharacter() {
 		return this.character;
 	}
-
-    @Override
-    public void withSession(Map<String, Object> session) {
-        this.session = session;
-    }
 }

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

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

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

@@ -20,12 +20,11 @@
  */
 package org.apache.struts2.showcase.hangman;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.SessionAware;
 
 import java.util.Map;
 
-import org.apache.struts2.action.SessionAware;
-
 import static org.apache.struts2.showcase.hangman.HangmanConstants.HANGMAN_SESSION_KEY;
 
 public class StartHangmanAction extends ActionSupport implements SessionAware {
@@ -34,7 +33,7 @@ public class StartHangmanAction extends ActionSupport implements SessionAware {
 
 	private HangmanService service;
 	private Hangman hangman;
-	private Map<String, Object> session;
+	private Map session;
 
 
 	public StartHangmanAction(HangmanService service) {
@@ -54,8 +53,8 @@ public class StartHangmanAction extends ActionSupport implements SessionAware {
 	}
 
 
-    @Override
-    public void withSession(Map<String, Object> session) {
-        this.session = session;
-    }
+	// === SessionAware ===
+	public void setSession(Map session) {
+		this.session = session;
+	}
 }

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

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

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

@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.showcase.model;
 
-import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 
 import java.io.Serializable;
 

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

@@ -20,9 +20,8 @@
  */
 package org.apache.struts2.showcase.modelDriven;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.ModelDriven;
-import org.apache.struts2.showcase.modelDriven.model.Gangster;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.ModelDriven;
 
 /**
  * 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

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

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

@@ -20,10 +20,9 @@
  */
 package org.apache.struts2.showcase.person;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.convention.annotation.Result;
 import org.apache.struts2.convention.annotation.Results;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
 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/servlet/TestServlet.java

@@ -1,41 +0,0 @@
-/*
- * $Id$
- *
- * 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.servlet;
-
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-public class TestServlet extends HttpServlet {
-    @Override
-    public void service(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
-        switch (request.getPathInfo()) {
-            case "/forward":
-                getServletContext().getRequestDispatcher("/dispatcher/dispatch.action").forward(request, response);
-                break;
-            default:
-                response.sendError(404);
-                break;
-        }
-    }
-}

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

@@ -20,16 +20,17 @@
  */
 package org.apache.struts2.showcase.source;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.util.ClassLoaderUtil;
-import org.apache.struts2.action.ServletContextAware;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.util.ServletContextAware;
 
-import jakarta.servlet.ServletContext;
+import javax.servlet.ServletContext;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
@@ -40,197 +41,195 @@ import java.util.List;
  */
 public class ViewSourceAction extends ActionSupport implements ServletContextAware {
 
-    private String page;
-    private String className;
-    private String config;
+	private String page;
+	private String className;
+	private String config;
 
-    private List<String> pageLines;
-    private List<String> classLines;
-    private List<String> configLines;
+	private List pageLines;
+	private List classLines;
+	private List configLines;
 
-    private int configLine;
-    private int padding = 10;
+	private int configLine;
+	private int padding = 10;
 
-    private ServletContext servletContext;
+	private ServletContext servletContext;
 
-    public String execute() throws IOException {
+	public String execute() throws MalformedURLException, IOException {
 
-        if (page != null) {
+		if (page != null) {
 
-            InputStream in = ClassLoaderUtil.getResourceAsStream(page.substring(page.indexOf("//") + 1), getClass());
-            page = page.replace("//", "/");
+			InputStream in = ClassLoaderUtil.getResourceAsStream(page.substring(page.indexOf("//") + 1), getClass());
+			page = page.replace("//", "/");
 
-            if (in == null) {
-                in = servletContext.getResourceAsStream(page);
-                while (in == null && page.indexOf('/', 1) > 0) {
-                    page = page.substring(page.indexOf('/', 1));
-                    in = servletContext.getResourceAsStream(page);
-                }
-            }
-            pageLines = read(in, -1);
+			if (in == null) {
+				in = servletContext.getResourceAsStream(page);
+				while (in == null && page.indexOf('/', 1) > 0) {
+					page = page.substring(page.indexOf('/', 1));
+					in = servletContext.getResourceAsStream(page);
+				}
+			}
+			pageLines = read(in, -1);
 
-            if (in != null) {
-                in.close();
-            }
-        }
+			if (in != null) {
+				in.close();
+			}
+		}
 
-        if (className != null) {
-            className = "/" + className.replace('.', '/') + ".java";
-            InputStream in = getClass().getResourceAsStream(className);
-            if (in == null) {
-                in = servletContext.getResourceAsStream("/WEB-INF/src/java" + className);
-            }
-            classLines = read(in, -1);
+		if (className != null) {
+			className = "/" + className.replace('.', '/') + ".java";
+			InputStream in = getClass().getResourceAsStream(className);
+			if (in == null) {
+				in = servletContext.getResourceAsStream("/WEB-INF/src" + className);
+			}
+			classLines = read(in, -1);
 
-            if (in != null) {
-                in.close();
-            }
-        }
+			if (in != null) {
+				in.close();
+			}
+		}
 
-        if (config != null && config.startsWith("file:/")) {
-            int pos = config.lastIndexOf(':');
-            configLine = Integer.parseInt(config.substring(pos + 1));
-            configLines = read(new URL(config.substring(0, pos)).openStream(), configLine);
-        }
-        return SUCCESS;
-    }
+		String rootPath = ServletActionContext.getServletContext().getRealPath("/");
+
+		if (config != null && (rootPath == null || config.startsWith(rootPath))) {
+			int pos = config.lastIndexOf(':');
+			configLine = Integer.parseInt(config.substring(pos + 1));
+			config = config.substring(0, pos).replace("//", "/");
+			configLines = read(new URL(config).openStream(), configLine);
+		}
+		return SUCCESS;
+	}
 
 
-    /**
-     * @param className the className to set
-     */
-    @StrutsParameter
-    public void setClassName(String className) {
-        if (className != null && !className.trim().isEmpty()) {
-            this.className = className;
-        }
-    }
+	/**
+	 * @param className the className to set
+	 */
+	public void setClassName(String className) {
+		if (className != null && className.trim().length() > 0) {
+			this.className = className;
+		}
+	}
 
-    /**
-     * @param config the config to set
-     */
-    @StrutsParameter
-    public void setConfig(String config) {
-        if (config != null && !config.trim().isEmpty()) {
-            this.config = config;
-        }
-    }
+	/**
+	 * @param config the config to set
+	 */
+	public void setConfig(String config) {
+		if (config != null && config.trim().length() > 0) {
+			this.config = config;
+		}
+	}
 
-    /**
-     * @param page the page to set
-     */
-    @StrutsParameter
-    public void setPage(String page) {
-        if (page != null && !page.trim().isEmpty()) {
-            this.page = page;
-        }
-    }
+	/**
+	 * @param page the page to set
+	 */
+	public void setPage(String page) {
+		if (page != null && page.trim().length() > 0) {
+			this.page = page;
+		}
+	}
 
-    /**
-     * @param padding the padding to set
-     */
-    @StrutsParameter
-    public void setPadding(int padding) {
-        this.padding = padding;
-    }
+	/**
+	 * @param padding the padding to set
+	 */
+	public void setPadding(int padding) {
+		this.padding = padding;
+	}
 
 
-    /**
-     * @return the classLines
-     */
-    public List<String> getClassLines() {
-        return classLines;
-    }
+	/**
+	 * @return the classLines
+	 */
+	public List getClassLines() {
+		return classLines;
+	}
 
-    /**
-     * @return the configLines
-     */
-    public List<String> getConfigLines() {
-        return configLines;
-    }
+	/**
+	 * @return the configLines
+	 */
+	public List getConfigLines() {
+		return configLines;
+	}
 
-    /**
-     * @return the pageLines
-     */
-    public List<String> getPageLines() {
-        return pageLines;
-    }
+	/**
+	 * @return the pageLines
+	 */
+	public List getPageLines() {
+		return pageLines;
+	}
 
-    /**
-     * @return the className
-     */
-    public String getClassName() {
-        return className;
-    }
+	/**
+	 * @return the className
+	 */
+	public String getClassName() {
+		return className;
+	}
 
-    /**
-     * @return the config
-     */
-    public String getConfig() {
-        return config;
-    }
+	/**
+	 * @return the config
+	 */
+	public String getConfig() {
+		return config;
+	}
 
-    /**
-     * @return the page
-     */
-    public String getPage() {
-        return page;
-    }
+	/**
+	 * @return the page
+	 */
+	public String getPage() {
+		return page;
+	}
 
-    /**
-     * @return the configLine
-     */
-    public int getConfigLine() {
-        return configLine;
-    }
+	/**
+	 * @return the configLine
+	 */
+	public int getConfigLine() {
+		return configLine;
+	}
 
-    /**
-     * @return the padding
-     */
-    public int getPadding() {
-        return padding;
-    }
+	/**
+	 * @return the padding
+	 */
+	public int getPadding() {
+		return padding;
+	}
 
-    /**
-     * Reads in a stream, optionally only including the target line number
-     * and its padding
-     *
-     * @param in               The input stream
-     * @param targetLineNumber The target line number, negative to read all
-     * @return A list of lines
-     */
-    private List<String> read(InputStream in, int targetLineNumber) {
-        List<String> snippet = null;
-        if (in != null) {
-            snippet = new ArrayList<>();
-            int startLine = 0;
-            int endLine = Integer.MAX_VALUE;
-            if (targetLineNumber > 0) {
-                startLine = targetLineNumber - padding;
-                endLine = targetLineNumber + padding;
-            }
-            try {
-                BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+	/**
+	 * Reads in a strea, optionally only including the target line number
+	 * and its padding
+	 *
+	 * @param in               The input stream
+	 * @param targetLineNumber The target line number, negative to read all
+	 * @return A list of lines
+	 */
+	private List read(InputStream in, int targetLineNumber) {
+		List snippet = null;
+		if (in != null) {
+			snippet = new ArrayList();
+			int startLine = 0;
+			int endLine = Integer.MAX_VALUE;
+			if (targetLineNumber > 0) {
+				startLine = targetLineNumber - padding;
+				endLine = targetLineNumber + padding;
+			}
+			try {
+				BufferedReader reader = new BufferedReader(new InputStreamReader(in));
 
-                int lineno = 0;
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    lineno++;
-                    if (lineno >= startLine && lineno <= endLine) {
-                        snippet.add(line);
-                    }
-                }
-            } catch (Exception ex) {
-                // ignoring as snippet not available isn't a big deal
-            }
-        }
-        return snippet;
-    }
+				int lineno = 0;
+				String line;
+				while ((line = reader.readLine()) != null) {
+					lineno++;
+					if (lineno >= startLine && lineno <= endLine) {
+						snippet.add(line);
+					}
+				}
+			} catch (Exception ex) {
+				// ignoring as snippet not available isn't a big deal
+			}
+		}
+		return snippet;
+	}
 
-    @Override
-    public void withServletContext(ServletContext arg0) {
-        this.servletContext = arg0;
-    }
+	public void setServletContext(ServletContext arg0) {
+		this.servletContext = arg0;
+	}
 
 
 }

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

@@ -20,8 +20,7 @@
  */
 package org.apache.struts2.showcase.tag.nonui.actionPrefix;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
 
 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/actiontag/ActionTagDemo.java

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

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

@@ -18,14 +18,13 @@
  */
 package org.apache.struts2.showcase.tag.nonui.debugtag;
 
-import org.apache.struts2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.dispatcher.PrepareOperations;
 
 public class DebugTagAction extends ActionSupport {
 
-    @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

@@ -20,9 +20,8 @@
  */
 package org.apache.struts2.showcase.tag.nonui.iteratortag;
 
-import org.apache.struts2.ActionSupport;
-import org.apache.struts2.Validateable;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Validateable;
 
 /**
  *
@@ -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;
 	}