[maven-release-plugin] prepare release STRUTS_2_5_19

[WW-4975] Upgrades commons-fileupload to version 1.4 - Struts 2.5.x

.asf.yaml

@@ -1,20 +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 dev@
-  pullrequests_status: dev@struts.apache.org
-  # Send individual PR comments/reviews to issues@
-  pullrequests_comment: issues@struts.apache.org
-  # Link opened PRs with JIRA
-  jira_options: link label worklog
-
-github:
-  del_branch_on_merge: true
-  protected_branches:
-    master: { }
-  autolink_jira:
-    - WW
-  dependabot_alerts:  true
-  dependabot_updates: true

.github/dependabot.yml

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

.github/workflows/codeql.yml

@@ -1,55 +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: [ "master" ]
-  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@v3
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
-      with:
-        category: "/language:${{matrix.language}}"

.github/workflows/maven.yml

@@ -1,59 +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 Build
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-
-permissions: read-all
-
-env:
-  MAVEN_OPTS: -Xmx2048m -Xms1024m
-  LANG: en_US.utf8
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ '8', '11', '17' ]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3.0.2
-      - name: Set up cache
-        uses: actions/cache@v3.3.1
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
-        with:
-          distribution: adopt
-          java-version: ${{ matrix.java }}
-      - name: Build with Maven on Java ${{ matrix.java }}
-        if: matrix.java != '17'
-        run: mvn -B -V -DskipAssembly verify --no-transfer-progress
-      - name: Code coverage on Java ${{ matrix.java }}
-        if: matrix.java == '17'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
-        run: mvn -B -V -Pcoverage -DskipAssembly verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar --no-transfer-progress

.github/workflows/scorecards-analysis.yaml

@@ -1,69 +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: [ "master" ]
-
-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@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8   # 3.1.0
-        with:
-          persist-credentials: false
-
-      - name: "Run analysis"
-        uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031    # 2.2.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@0b7f8abb1508181956e8e162db84b466c27e18ce    # 3.1.2
-        with:
-          name: SARIF file
-          path: results.sarif
-          retention-days: 5
-
-      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b398f525a5587552e573b247ac661067fafa920b    # 2.1.22
-        with:
-          sarif_file: results.sarif

.gitignore

@@ -11,9 +11,6 @@
 .metadata/
 Servers/
 
-# Java annotation processor (APT)
-.factorypath
-
 #VSCode
 .vscode
 
@@ -27,22 +24,42 @@ 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

@@ -1,18 +1,22 @@
 /*
- * Copyright 2007-present the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+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.*;
@@ -20,12 +24,11 @@ import java.util.Properties;
 
 public class MavenWrapperDownloader {
 
-    private static final String WRAPPER_VERSION = "0.5.6";
     /**
      * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
      */
-    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
-        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+    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
@@ -73,13 +76,13 @@ public class MavenWrapperDownloader {
                 }
             }
         }
-        System.out.println("- Downloading from: " + url);
+        System.out.println("- Downloading from: : " + url);
 
         File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
         if(!outputFile.getParentFile().exists()) {
             if(!outputFile.getParentFile().mkdirs()) {
                 System.out.println(
-                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+                        "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
             }
         }
         System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
@@ -95,16 +98,6 @@ public class MavenWrapperDownloader {
     }
 
     private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
-            String username = System.getenv("MVNW_USERNAME");
-            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
-            Authenticator.setDefault(new Authenticator() {
-                @Override
-                protected PasswordAuthentication getPasswordAuthentication() {
-                    return new PasswordAuthentication(username, password);
-                }
-            });
-        }
         URL website = new URL(urlString);
         ReadableByteChannel rbc;
         rbc = Channels.newChannel(website.openStream());

.mvn/wrapper/maven-wrapper.properties

@@ -1,18 +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.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
+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,28 @@
+language: java
+sudo: false
+
+jdk:
+  - openjdk7
+  - oraclejdk8
+  - oraclejdk9
+  - oraclejdk11
+
+install: true
+script: mvn test -DskipAssembly
+
+after_success:
+  # TODO delete following if statement after fix of https://github.com/cobertura/cobertura/issues/271
+  - if [ "$TRAVIS_JDK_VERSION" == "openjdk8" ] || [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]; then
+      mvn cobertura:cobertura org.eluder.coveralls:coveralls-maven-plugin:report com.updateimpact:updateimpact-maven-plugin:submit -Ptravis-coveralls,update-impact -DskipAssembly;
+    else
+      echo "Not reporting coverage for $TRAVIS_JDK_VERSION due to incompatibility or to save performance";
+    fi;
+
+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,257 +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 17') {
-      agent {
-        label 'ubuntu'
-      }
-      tools {
-        jdk 'jdk_17_latest'
-        maven 'maven_3_latest'
-      }
-      environment {
-        MAVEN_OPTS = "-Xmx1024m"
-      }
-      stages {
-        stage('Build') {
-          steps {
-            sh './mvnw -B clean install -DskipTests -DskipAssembly'
-          }
-        }
-        stage('Test') {
-          steps {
-            sh './mvnw -B verify -Pcoverage -DskipAssembly'
-          }
-          post {
-            always {
-              junit(testResults: '**/surefire-reports/*.xml', allowEmptyResults: true)
-              junit(testResults: '**/failsafe-reports/*.xml', allowEmptyResults: true)
-            }
-          }
-        }
-        stage('Code Quality') {
-          when {
-            branch 'master'
-          }
-          steps {
-            withCredentials([string(credentialsId: 'asf-struts-sonarcloud', variable: 'SONARCLOUD_TOKEN')]) {
-              sh './mvnw -B -Pcoverage -DskipAssembly -Dsonar.login=${SONARCLOUD_TOKEN} verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar'
-            }
-          }
-        }
-      }
-      post {
-        always {
-          cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**', type: 'INCLUDE']]
-        }
-      }
-    }
-    stage('JDK 11') {
-      agent {
-        label 'ubuntu'
-      }
-      tools {
-        jdk 'jdk_11_latest'
-        maven 'maven_3_latest'
-      }
-      environment {
-        MAVEN_OPTS = "-Xmx1024m"
-      }
-      stages {
-        stage('Build') {
-          steps {
-            sh './mvnw -B clean install -DskipTests -DskipAssembly'
-          }
-        }
-        stage('Test') {
-          steps {
-            sh './mvnw -B test'
-          }
-          post {
-            always {
-              junit(testResults: '**/surefire-reports/*.xml', allowEmptyResults: true)
-              junit(testResults: '**/failsafe-reports/*.xml', allowEmptyResults: true)
-            }
-          }
-        }
-      }
-      post {
-        always {
-          cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**', type: 'INCLUDE']]
-        }
-      }
-    }
-    stage('JDK 8') {
-      agent {
-        label 'ubuntu'
-      }
-      tools {
-        jdk 'jdk_1.8_latest'
-        maven 'maven_3_latest'
-      }
-      environment {
-        MAVEN_OPTS = "-Xmx1024m"
-      }
-      stages {
-        stage('Build') {
-          steps {
-            sh './mvnw -B clean install -DskipTests -DskipAssembly'
-          }
-        }
-        stage('Test') {
-          steps {
-            sh './mvnw -B test'
-          }
-          post {
-            always {
-              junit(testResults: '**/surefire-reports/*.xml', allowEmptyResults: true)
-              junit(testResults: '**/failsafe-reports/*.xml', allowEmptyResults: true)
-            }
-          }
-        }
-        stage('Build Source & JavaDoc') {
-          when {
-            branch 'master'
-          }
-          steps {
-            dir("local-snapshots-dir/") {
-              deleteDir()
-            }
-            sh './mvnw -B source:jar javadoc:jar -DskipTests -DskipAssembly'
-          }
-        }
-        stage('Deploy Snapshot') {
-          when {
-            branch 'master'
-          }
-          steps {
-            withCredentials([file(credentialsId: 'lukaszlenart-repository-access-token', variable: 'CUSTOM_SETTINGS')]) {
-              sh './mvnw -s \${CUSTOM_SETTINGS} deploy -DskipTests -DskipAssembly'
-            }
-          }
-        }
-        stage('Upload nightlies') {
-          when {
-            branch 'master'
-          }
-          steps {
-            sh './mvnw -B package -DskipTests'
-            sshPublisher(publishers: [
-                sshPublisherDesc(
-                    configName: 'Nightlies',
-                    transfers: [
-                        sshTransfer(
-                            remoteDirectory: '/struts/snapshot',
-                            removePrefix: 'assembly/target/assembly/out',
-                            sourceFiles: 'assembly/target/assembly/out/struts-*.zip',
-                            cleanRemote: true
-                        )
-                    ],
-                    verbose: true
-                )
-            ])
-          }
-        }
-      }
-      post {
-        always {
-          cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**', type: 'INCLUDE']]
-        }
-      }
-    }
-  }
-  post {
-    // If this build failed, send an email to the list.
-    failure {
-      script {
-        emailext(
-            to: "dev@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: "dev@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: "dev@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
 -------------------------------
 
-[![Jenkins Build](https://builds.apache.org/buildStatus/icon?job=Struts%2FStruts+Core%2Fmaster)](https://ci-builds.apache.org/job/Struts/job/Struts%20Core/job/master/)
-[![Java Build](https://github.com/apache/struts/actions/workflows/maven.yml/badge.svg)](https://github.com/apache/struts/actions/workflows/maven.yml)
+[![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,33 +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.
-
-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)
+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,39 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Please vist the [Releases](https://struts.apache.org/releases.html#prior-releases) page to see full information about each version 
-and what potential vulnerability it can have:
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 6.0.0   | :white_check_mark: |
-| 2.5.30  | :white_check_mark: |
-
-## 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 re-requesting
-the same URL repeatedly). In general our philosophy is to avoid any attacks which can cause the server
-to consume resources in a non-linear relationship to the size of inputs.
-
-The mailing address is: [security@struts.apache.org](mailto:security@struts.apache.org)
-
-[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>6.3.0</version>
+        <version>2.5.19</version>
     </parent>
     <artifactId>struts2-apps</artifactId>
     <packaging>pom</packaging>

apps/rest-showcase/pom.xml

@@ -24,12 +24,12 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>6.3.0</version>
+        <version>2.5.19</version>
     </parent>
 
     <artifactId>struts2-rest-showcase</artifactId>
     <packaging>war</packaging>
-    <version>6.3.0</version>
+    <version>2.5.19</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,32 +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>net.sourceforge.htmlunit</groupId>
-            <artifactId>htmlunit</artifactId>
-            <version>2.39.0</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>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>
 
@@ -106,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>9.4.46.v20220331</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>
@@ -123,7 +125,6 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>@{argLine}</argLine>
                     <excludes>
                         <exclude>it/**</exclude>
                         <exclude>**/*$*</exclude>

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/PostOrderTest.java

@@ -18,16 +18,15 @@
  */
 package it.org.apache.struts2.rest.example;
 
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
 import net.sourceforge.jwebunit.junit.WebTestCase;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.StringRequestEntity;
 
 import java.io.IOException;
 
+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+
 public class PostOrderTest extends WebTestCase {
 
     public void setUp() throws Exception {
@@ -73,50 +72,68 @@ public class PostOrderTest extends WebTestCase {
     }
 
     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();
+        }
     }
 
     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();
+        }
     }
 
     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();
+        }
     }
 
     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>6.3.0</version>
+        <version>2.5.19</version>
     </parent>
 
     <artifactId>struts2-showcase</artifactId>
@@ -68,6 +68,12 @@
             <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>
@@ -83,24 +89,9 @@
             <artifactId>struts2-bean-validation-plugin</artifactId>
         </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-xslt-plugin</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <artifactId>servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -108,18 +99,28 @@
         <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.apache.velocity</groupId>
+            <artifactId>velocity-tools</artifactId>
         </dependency>
 
         <dependency>
@@ -127,28 +128,55 @@
             <artifactId>sitemesh</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.directwebremoting</groupId>
+            <groupId>uk.ltd.getahead</groupId>
             <artifactId>dwr</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+        </dependency>
 
-       <dependency>
-           <groupId>junit</groupId>
-           <artifactId>junit</artifactId>
-           <scope>test</scope>
-       </dependency>
-
-       <dependency>
-            <groupId>net.sourceforge.htmlunit</groupId>
-            <artifactId>htmlunit</artifactId>
-            <version>2.61.0</version>
+        <dependency>
+            <groupId>net.sourceforge.jwebunit</groupId>
+            <artifactId>jwebunit-core</artifactId>
+            <version>1.4.1</version>
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <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>xom</groupId>
+                    <artifactId>xom</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <!-- BeanValidation Example -->
         <dependency>
-            <groupId>org.hibernate.validator</groupId>
+            <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>${hibernate-validator.version}</version>
+            <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>
@@ -156,48 +184,22 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.0.0-M6</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>9.4.46.v20220331</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>
                     <scanIntervalSeconds>10</scanIntervalSeconds>
                     <webAppSourceDirectory>${basedir}/src/main/webapp/</webAppSourceDirectory>
                     <webAppConfig>
@@ -205,30 +207,11 @@
                         <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/MoreSelectsAction.java

@@ -36,7 +36,6 @@ public class MoreSelectsAction extends ActionSupport {
 	private List _prioritisedFavouriteCars;
 	private List _prioritisedFavouriteCountries;
 	private List favouriteNumbers;
-        private List favouriteCities;
 
 
 	// Cartoon Characters
@@ -125,14 +124,6 @@ public class MoreSelectsAction extends ActionSupport {
 		return list;
 	}
 
-	public List getFavouriteCities() {
-		return favouriteCities;
-	}
-
-	public void setFavouriteCities(List favouriteCities) {
-		this.favouriteCities = favouriteCities;
-	}
-
 	// actions
 
 	public String input() throws Exception {

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 javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-
-/**
- * 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 com.opensymphony.xwork2.ActionSupport;
-
-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<>();
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public void setLastIndex(Integer lastIndex) {
-        this.lastIndex = lastIndex;
-    }
-
-    public List<String> getNewMessages() {
-        return newMessages;
-    }
-
-    public Callable<String> receiveNewMessages() throws Exception {
-        return new Callable<String>() {
-            @Override
-            public String call() throws Exception {
-                while (lastIndex >= messages.size()) {
-                    Thread.sleep(3000);
-                }
-                newMessages = messages.subList(lastIndex, messages.size());
-                return SUCCESS;
-            }
-        };
-    }
-
-    public String sendMessage() {
-        synchronized (messages) {
-            messages.add(message);
-        }
-        return SUCCESS;
-    }
-}

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

@@ -25,28 +25,27 @@ import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-
-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

@@ -24,31 +24,31 @@ import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+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

@@ -21,17 +21,16 @@
 package org.apache.struts2.showcase.chat;
 
 import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.SessionAware;
 
 import java.util.Map;
 
-import org.apache.struts2.action.SessionAware;
-
 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;
 
@@ -61,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

@@ -21,18 +21,17 @@
 package org.apache.struts2.showcase.chat;
 
 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/DateConverter.java

@@ -20,8 +20,6 @@
  */
 package org.apache.struts2.showcase.chat;
 
-import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
-import com.opensymphony.xwork2.inject.Inject;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.apache.struts2.util.StrutsTypeConverter;
@@ -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

@@ -21,17 +21,16 @@
 package org.apache.struts2.showcase.chat;
 
 import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.SessionAware;
 
 import java.util.Map;
 
-import org.apache.struts2.action.SessionAware;
-
 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() {
@@ -57,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

@@ -21,18 +21,17 @@
 package org.apache.struts2.showcase.chat;
 
 import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.SessionAware;
 
 import java.util.Map;
 
-import org.apache.struts2.action.SessionAware;
-
 public class ExitRoomAction extends ActionSupport implements SessionAware {
 
 	private static final long serialVersionUID = 1L;
 
 	private String roomName;
 
-	private Map<String, Object> session;
+	private Map session;
 
 	public String getRoomName() {
 		return roomName;
@@ -55,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/SendMessageToRoomAction.java

@@ -21,11 +21,10 @@
 package org.apache.struts2.showcase.chat;
 
 import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.SessionAware;
 
 import java.util.Map;
 
-import org.apache.struts2.action.SessionAware;
-
 public class SendMessageToRoomAction extends ActionSupport implements SessionAware {
 
 	private static final long serialVersionUID = 1L;
@@ -34,7 +33,7 @@ public class SendMessageToRoomAction extends ActionSupport implements SessionAwa
 
 	private String roomName;
 	private String message;
-	private Map<String, Object> session;
+	private Map session;
 
 
 	public SendMessageToRoomAction(ChatService chatService) {
@@ -68,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/fileupload/FileUploadAction.java

@@ -84,12 +84,4 @@ public class FileUploadAction extends ActionSupport {
 	public void setCaption(String caption) {
 		this.caption = caption;
 	}
-
-        public long getUploadSize() {
-            if (upload != null) {
-                return upload.length();
-            } else {
-                return 0;
-            }
-        }
 }

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

@@ -32,9 +32,9 @@ import java.io.File;
  */
 public class MultipleFileUploadUsingArrayAction extends ActionSupport {
 
-	private File[] uploads = new File[0];
-	private String[] uploadFileNames = new String[0];
-	private String[] uploadContentTypes = new String[0];
+	private File[] uploads;
+	private String[] uploadFileNames;
+	private String[] uploadContentTypes;
 
 
 	public String upload() throws Exception {

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

@@ -21,16 +21,15 @@
 package org.apache.struts2.showcase.hangman;
 
 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

@@ -21,16 +21,15 @@
 package org.apache.struts2.showcase.hangman;
 
 import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.SessionAware;
 
 import java.util.Map;
 
-import org.apache.struts2.action.SessionAware;
-
 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;
 
@@ -45,6 +44,10 @@ public class GuessCharacterAction extends ActionSupport implements SessionAware
 		return hangman;
 	}
 
+	public void setSession(Map session) {
+		this.session = session;
+	}
+
 	public void setCharacter(Character character) {
 		this.character = character;
 	}
@@ -52,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/StartHangmanAction.java

@@ -21,11 +21,10 @@
 package org.apache.struts2.showcase.hangman;
 
 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/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/source/ViewSourceAction.java

@@ -22,13 +22,15 @@ package org.apache.struts2.showcase.source;
 
 import com.opensymphony.xwork2.ActionSupport;
 import com.opensymphony.xwork2.util.ClassLoaderUtil;
-import org.apache.struts2.action.ServletContextAware;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.util.ServletContextAware;
 
 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;
@@ -39,192 +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
-     */
-    public void setClassName(String className) {
-        if (className != null && className.trim().length() > 0) {
-            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
-     */
-    public void setConfig(String config) {
-        if (config != null && config.trim().length() > 0) {
-            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
-     */
-    public void setPage(String page) {
-        if (page != null && page.trim().length() > 0) {
-            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
-     */
-    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;
+	}
 
-    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/validation/BeanValidationExampleAction.java

@@ -27,24 +27,22 @@ import org.apache.struts2.convention.annotation.Namespace;
 import org.apache.struts2.convention.annotation.ParentPackage;
 import org.apache.struts2.convention.annotation.Result;
 import org.apache.struts2.interceptor.validation.SkipValidation;
+import org.hibernate.validator.constraints.Email;
+import org.hibernate.validator.constraints.NotBlank;
 import org.hibernate.validator.constraints.ScriptAssert;
 import org.hibernate.validator.constraints.URL;
 
-import javax.validation.constraints.Email;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import javax.validation.constraints.*;
 import java.util.Date;
 
-// <!-- START SNIPPET: beanValidationExample -->
+/**
+ * <!-- START SNIPPET: beanValidatationExample -->
+ */
 @Namespace("/bean-validation")
 @ParentPackage("bean-validation")
 @Action(results = {
-    @Result(name = "input", location = "bean-validation.jsp"),
-    @Result(name = "success", location = "/WEB-INF/validation/successFieldValidatorsExample.jsp")
+        @Result(name = "input", location = "bean-validation.jsp"),
+        @Result(name = "success", location = "/WEB-INF/validation/successFieldValidatorsExample.jsp")
 })
 @FieldMatch(first = "fieldExpressionValidatorField", second = "requiredValidatorField", message = "requiredValidatorField and fieldExpressionValidatorField are not matching")
 @ScriptAssert(lang = "javascript", script = "_this.dateValidatorField != null && _this.dateValidatorField.before(new java.util.Date())", message = "Date need to before now")
@@ -84,10 +82,10 @@ public class BeanValidationExampleAction extends ActionSupport {
     private String fieldExpressionValidatorField = null;
 
     @Action(value = "bean-validation", results = {
-        @Result(name = "success", location = "bean-validation.jsp")
+            @Result(name = "success", location = "bean-validation.jsp")
     })
     @SkipValidation
-    public String beanValidation() {
+    public String beanValidation(){
         return SUCCESS;
     }
 
@@ -152,7 +150,7 @@ public class BeanValidationExampleAction extends ActionSupport {
     }
 
     public void setFieldExpressionValidatorField(
-        String fieldExpressionValidatorField) {
+            String fieldExpressionValidatorField) {
         this.fieldExpressionValidatorField = fieldExpressionValidatorField;
     }
 
@@ -165,4 +163,8 @@ public class BeanValidationExampleAction extends ActionSupport {
     }
 }
 
-// <!-- END SNIPPET: beanValidationExample -->
+/**
+ * <!-- END SNIPPET: beanValidatationExample -->
+ */
+
+

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

@@ -1,56 +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.wait;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.struts2.interceptor.exec.ExecutorProvider;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-public class ThreadPoolExecutorProvider implements ExecutorProvider {
-
-    private static final Logger LOG = LogManager.getLogger(ThreadPoolExecutorProvider.class);
-
-    private final ExecutorService executor;
-
-    public ThreadPoolExecutorProvider() {
-        this.executor = new ThreadPoolExecutor(1, 2, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingDeque<>());
-    }
-
-    @Override
-    public void execute(Runnable task) {
-        LOG.info("Executing task: {}", task);
-        executor.execute(task);
-    }
-
-    @Override
-    public boolean isShutdown() {
-        return executor.isShutdown();
-    }
-
-    @Override
-    public void shutdown() {
-        LOG.info("Shutting down executor");
-        executor.shutdown();
-    }
-}

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

@@ -21,11 +21,9 @@
 package org.apache.struts2.showcase.xslt;
 
 import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.ServletRequestAware;
 
 import javax.servlet.http.HttpServletRequest;
-
-import org.apache.struts2.action.ServletRequestAware;
-
 import java.util.Map;
 import java.util.Properties;
 
@@ -55,6 +53,10 @@ public class JVMAction implements ServletRequestAware {
 		return servletRequest;
 	}
 
+	public void setServletRequest(HttpServletRequest servletRequest) {
+		this.servletRequest = servletRequest;
+	}
+
 	public Map<String, String> getEnvironment() {
 		return environment;
 	}
@@ -98,9 +100,4 @@ public class JVMAction implements ServletRequestAware {
 			this.systemProperties = systemProperties;
 		}
 	}
-
-    @Override
-    public void withServletRequest(HttpServletRequest request) {
-        this.servletRequest = request;
-    }
 }

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

@@ -22,14 +22,15 @@
 <Configuration>
     <Appenders>
         <Console name="STDOUT" target="SYSTEM_OUT">
-            <PatternLayout pattern="[%-5p] %C{2} (%F:%L) - %m%n"/>
+            <PatternLayout pattern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
         </Console>
     </Appenders>
     <Loggers>
+        <Logger name="com.opensymphony.xwork2" level="info"/>
+        <Logger name="org.apache.struts2" level="info"/>
+        <Logger name="org.springframework" level="info"/>
         <Root level="info">
             <AppenderRef ref="STDOUT"/>
         </Root>
-        <Logger name="org.apache.struts2" level="info"/>
-        <Logger name="com.opensymphony.xwork2" level="info"/>
     </Loggers>
-</Configuration>
+</Configuration>

apps/showcase/src/main/resources/org/apache/struts2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml

@@ -21,31 +21,31 @@
 -->
 <!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0.2//EN"
-  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-
+  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+  		
 <validators>
 	<field name="description1">
 		<field-validator type="requiredstring">
 			<message>Description1 Is Required !!!</message>
 		</field-validator>
 	</field>
-
+	
 	<field name="description2">
 		<field-validator type="requiredstring">
 			<message>Description2 Is Required !!!</message>
 		</field-validator>
 	</field>
-
+	
 	<field name="description3">
 		<field-validator type="requiredstring">
 			<message>Description3 Is Required !!!</message>
 		</field-validator>
 	</field>
-
+	
 	<field name="description4">
 		<field-validator type="requiredstring">
 			<message>Description4 Is Required !!!</message>
 		</field-validator>
 	</field>
-</validators>
-
+</validators>  		
+ 

apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction-validation.xml

@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <!-- Field-Validator Syntax -->
     <field name="currentEmployee.empId">

apps/showcase/src/main/resources/org/apache/struts2/showcase/action/SkillAction-validation.xml

@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <!-- Field-Validator Syntax -->
     <field name="currentSkill.name">

apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/FileUploadAction-validation.xml

@@ -21,12 +21,12 @@
 -->
 <!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0.2//EN"
-  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 
 <validators>
 	<field name="upload">
 		<field-validator type="fieldexpression">
-			<param name="expression"><![CDATA[getUploadSize() > 0]]></param>
+			<param name="expression"><![CDATA[upload.length() > 0]]></param>
 			<message>File cannot be empty</message>
 		</field-validator>
 	</field>
@@ -35,4 +35,5 @@
 			<message>Caption cannot be empty</message>
 		</field-validator>
 	</field>
-</validators>
+</validators>  		
+  		

apps/showcase/src/main/resources/org/apache/struts2/showcase/person/NewPersonAction-validation.xml

@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="person">
         <field-validator type="visitor">

apps/showcase/src/main/resources/org/apache/struts2/showcase/person/Person-validation.xml

@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="name">
         <field-validator type="requiredstring">

apps/showcase/src/main/resources/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml

@@ -21,8 +21,8 @@
 -->
 <!DOCTYPE validators PUBLIC
 	"-//Apache Struts//XWork Validator 1.0.2//EN"
-	"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-
+	"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+	
 <validators>
 	<field name="value">
 		<field-validator type="requiredstring">
@@ -30,13 +30,13 @@
 			<message>Value must not be empty</message>
 		</field-validator>
 	</field>
-
-
+	
+	
 	<field name="count">
 		<field-validator type="int">
 			<message>Count must be an integer</message>
-		</field-validator>
+		</field-validator>	
 	</field>
-</validators>
+</validators>	
 
 

apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml

@@ -21,10 +21,10 @@
 -->
 <!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0//EN"
-  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-
-<!-- START SNIPPET: fieldValidatorsExample -->
-
+  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+  		
+<!-- START SNIPPET: fieldValidatorsExample -->  		
+  		
 <validators>
 	<field name="requiredValidatorField">
 		<field-validator type="required">

apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml

@@ -19,12 +19,12 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC
+<!DOCTYPE validators PUBLIC 
   		"-//Apache Struts//XWork Validator 1.0//EN"
-  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-
-<!-- START SNIPPET: fieldValidatorsExample -->
-
+  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+  		
+<!-- START SNIPPET: fieldValidatorsExample -->  		
+  		
 <validators>
 	<field name="requiredValidatorField">
 		<field-validator type="required">
@@ -71,7 +71,7 @@
 	</field>
 	<field name="regexValidatorField">
 		<field-validator type="regex">
-			<param name="regex"><![CDATA[ .*\.txt ]]></param>
+			<param name="regex"><![CDATA[ [^<>]+ ]]></param>
 			<message><![CDATA[ regexValidatorField must match a regexp (.*\.txt) if specified ]]></message>
 		</field-validator>
 	</field>

apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml

@@ -19,13 +19,13 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC
+<!DOCTYPE validators PUBLIC 
   		"-//Apache Struts//XWork Validator 1.0//EN"
-  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-
-
-<!-- START SNIPPET: nonFieldValidatorsExample -->
-
+  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+  		
+  		
+<!-- START SNIPPET: nonFieldValidatorsExample -->  		
+  		
 <validators>
 	<validator type="expression">
 		<param name="expression"><![CDATA[ ( (someText == someTextRetype) && (someTextRetype == someTextRetypeAgain) ) ]]></param>

apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/QuizAction-validation.xml

@@ -19,11 +19,11 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 <!--  START SNIPPET: quizValidators -->
 <!--
     Add the following DOCTYPE declaration as first line of your XXX-validation.xml file:
-    <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+    <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 -->
 <validators>
     <field name="name">

apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/SubmitApplication-submitApplication-validation.xml

@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0//EN"
-  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 
 <validators>
 	<field name="name">

apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/User-userContext-validation.xml

@@ -19,17 +19,17 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC
+<!DOCTYPE validators PUBLIC 
   		"-//Apache Struts//XWork Validator 1.0//EN"
-  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-
+  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+  		
 <validators>
 	<field name="name">
 		<field-validator type="requiredstring">
 			<message>Name Required</message>
 		</field-validator>
 	</field>
-	<field name="age">
+	<field name="age">	
 		<field-validator type="int">
 			<param name="min">1</param>
 			<param name="max">100</param>
@@ -41,6 +41,6 @@
 			<message>Birthday Required</message>
 		</field-validator>
 	</field>
-</validators>
+</validators>  		
 
 

apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml

@@ -19,10 +19,10 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC
+<!DOCTYPE validators PUBLIC 
   		"-//Apache Struts//XWork Validator 1.0//EN"
-  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-
+  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+  		
 <!-- START SNIPPET: visitorValidatorsExample -->
 
 <validators>

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

@@ -20,13 +20,13 @@
  */
 -->
 <!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>
 	<package name="actionchaining" extends="struts-default" namespace="/actionchaining">
 		<action name="actionChain1" class="org.apache.struts2.showcase.actionchaining.ActionChain1">
-			<result type="chain">actionChain2</result>
+			<result type="chain">actionChain2</result>		
 		</action>
 		<action name="actionChain2" class="org.apache.struts2.showcase.actionchaining.ActionChain2">
 			<result type="chain">actionChain3</result>

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

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<!DOCTYPE struts PUBLIC
-	"-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
-	"https://struts.apache.org/dtds/struts-6.0.dtd">
-
-<struts>
-    <package name="async" extends="json-default" namespace="/async">
-
-        <action name="receiveNewMessages" class="org.apache.struts2.showcase.async.ChatRoomAction" method="receiveNewMessages">
-            <result name="success" type="json">
-                <param name="root">newMessages</param>
-            </result>
-            <result name="timeout" type="json">
-                <param name="root">newMessages</param>
-            </result>
-        </action>
-
-        <action name="sendMessage" class="org.apache.struts2.showcase.async.ChatRoomAction" method="sendMessage">
-            <result name="success" type="json">
-                <param name="root">newMessages</param>
-            </result>
-            <result name="timeout" type="json">
-                <param name="root">newMessages</param>
-            </result>
-        </action>
-
-    </package>
-
-</struts>

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

@@ -20,16 +20,16 @@
  */
 -->
 <!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>
 	<package name="conversion" namespace="/conversion" extends="struts-default">
-
+	
         <action name="index">
             <result>/WEB-INF/conversion/index.jsp</result>
         </action>
-
+        
 		<!-- Example populating a List inside an Action -->
 		<action name="enterPersonsInfo" method="input"
 				class="org.apache.struts2.showcase.conversion.PersonAction">
@@ -49,8 +49,8 @@
 		<action name="showPersonJavaCode">
 			<result type="plainText">/WEB-INF/conversion/Person.java.txt</result>
 		</action>
-
-
+		
+		
 		<!-- Example populating a Set inside an Action -->
 		<action name="enterAddressesInfo" class="org.apache.struts2.showcase.conversion.AddressAction" method="input">
 			<result>/WEB-INF/conversion/enterAddressInfo.jsp</result>
@@ -68,9 +68,9 @@
 		<action name="showAddressJavaCode">
 			<result type="plainText">/WEB-INF/conversion/Address.java.txt</result>
 		</action>
-
-
-		<!-- Example populating a List with Tiger 5 Enum  -->
+		
+		
+		<!-- Example populating a List with Tiger 5 Enum  -->		
 		<action name="enterOperationEnumInfo" class="org.apache.struts2.showcase.conversion.OperationsEnumAction" method="input">
 			<result>/WEB-INF/conversion/enterOperations.jsp</result>
 		</action>
@@ -93,6 +93,6 @@
 		<action name="showOperationsEnumActionConversionProperties">
 			<result type="plainText">/WEB-INF/conversion/OperationsEnumActionConversion.txt</result>
 		</action>
-
+		
 	</package>
-</struts>
+</struts>	

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

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<!DOCTYPE struts PUBLIC
-        "-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
-        "https://struts.apache.org/dtds/struts-6.0.dtd">
-
-<struts>
-    <package name="dispatcher" extends="struts-default" namespace="/dispatcher">
-
-        <action name="dispatch">
-            <result type="dispatcher">
-                /WEB-INF/dispatcher/dispatch-result.jsp
-            </result>
-        </action>
-
-        <action name="forward">
-            <result type="dispatcher">/dispatcher/dispatch.action</result>
-        </action>
-
-    </package>
-</struts>

apps/showcase/src/main/resources/struts-filedownload.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>
 	<package name="filedownload" extends="struts-default" namespace="/filedownload">

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

@@ -20,12 +20,12 @@
  */
 -->
 <!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>
 	<package name="fileupload" extends="struts-default" namespace="/fileupload">
-
+        
         <action name="upload" class="org.apache.struts2.showcase.fileupload.FileUploadAction" method="input">
 			<result>/WEB-INF/fileupload/upload.jsp</result>
 		</action>
@@ -34,13 +34,12 @@
         	<result name="input">/WEB-INF/fileupload/upload.jsp</result>
 			<result>/WEB-INF/fileupload/upload-success.jsp</result>
 		</action>
-
+		
 		<action name="multipleUploadUsingList">
 			<result>/WEB-INF/fileupload/multipleUploadUsingList.jsp</result>
 		</action>
-
+		
 		<action name="doMultipleUploadUsingList" class="org.apache.struts2.showcase.fileupload.MultipleFileUploadUsingListAction" method="upload">
-                        <result name="input">/WEB-INF/fileupload/multipleUploadUsingList.jsp</result>
 			<result>/WEB-INF/fileupload/multiple-success.jsp</result>
 		</action>
 
@@ -50,7 +49,6 @@
 		</action>
 
 		<action name="doMultipleUploadUsingArray" class="org.apache.struts2.showcase.fileupload.MultipleFileUploadUsingArrayAction" method="upload">
-                        <result name="input">/WEB-INF/fileupload/multipleUploadUsingArray.jsp</result>
 			<result>/WEB-INF/fileupload/multiple-success.jsp</result>
 		</action>
 

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

@@ -20,17 +20,17 @@
  */
 -->
 <!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>
     <package name="freemarker" namespace="/freemarker" extends="struts-default">
         <action name="customFreemarkerManagerDemo">
             <result type="freemarker">/WEB-INF/freemarker/customFreemarkerManagerUsage.ftl</result>
         </action>
-
+        
         <action name="standardTags" class="org.apache.struts2.showcase.freemarker.StandardTagsAction">
             <result type="freemarker">/WEB-INF/freemarker/standardTags.ftl</result>
         </action>
     </package>
-</struts>
+</struts>	

apps/showcase/src/main/resources/struts-hangman.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>
 	<package name="hangman" extends="struts-default" namespace="/hangman">
@@ -41,9 +41,9 @@
 			<result type="freemarker">/WEB-INF/hangman/hangmanNonAjax.ftl</result>
 		</action>
 	</package>
-
-
-
+	
+	
+	
 	<package name="hangman-ajax" extends="struts-default" namespace="/hangman/ajax">
 		<action name="blank">
 			<result type="freemarker">/WEB-INF/hangman/blank.ftl</result>
@@ -61,4 +61,4 @@
 			<result type="freemarker">/WEB-INF/hangman/updateGuessLeft.ftl</result>
 		</action>
 	</package>
-</struts>
+</struts>	

apps/showcase/src/main/resources/struts-interactive.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>
     <package name="interactive" namespace="/interactive" extends="struts-default">
@@ -38,4 +38,4 @@
         </action>
         <action name="example" class="org.apache.struts2.showcase.action.ExampleAction" />
     </package>
-</struts>
+</struts>    

apps/showcase/src/main/resources/struts-model-driven.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>
 	<package name="modelDriven" extends="struts-default" namespace="/modelDriven">
@@ -29,10 +29,11 @@
 		<action name="modelDriven" class="org.apache.struts2.showcase.modelDriven.ModelDrivenAction" method="input">
 			<result>/WEB-INF/modelDriven/modelDriven.jsp</result>
 		</action>
-
+		
 		<!-- Display the result page whose content is populated using the Model-Driven technique -->
 		<action name="modelDrivenResult" class="org.apache.struts2.showcase.modelDriven.ModelDrivenAction">
 			<result>/WEB-INF/modelDriven/modelDrivenResult.jsp</result>
 		</action>
 	</package>
-</struts>
+</struts>	
+	

apps/showcase/src/main/resources/struts-person.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">
 
 <!-- START SNIPPET: xworkSample -->
 

apps/showcase/src/main/resources/struts-tags-non-ui.xml

@@ -20,15 +20,15 @@
  */
 -->
 <!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>
-
+	
 	<!-- ================================== -->
 	<!-- === Package for ActionTag Demo === -->
 	<!-- ================================== -->
-
+	
 	<package name="actionTag" extends="struts-default" namespace="/tags/non-ui/actionTag">
 		<action name="showActionTagDemo" class="org.apache.struts2.showcase.tag.nonui.actiontag.ActionTagDemo" method="show">
 			<result>/WEB-INF/tags/non-ui/actionTag/showActionTagDemo.jsp</result>
@@ -46,11 +46,11 @@
 			<result type="plainText">/WEB-INF/tags/non-ui/actionTag/showActionTagDemo.jsp</result>
 		</action>
 	</package>
-
+	
 	<!-- ==================================== -->
 	<!-- === Package for IteratorGeneratorTag Demo === -->
 	<!-- ==================================== -->
-
+	
 	<package name="iteratorGeneratorTag" extends="struts-default" namespace="/tags/non-ui/iteratorGeneratorTag">
 		<action name="showGeneratorTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.IteratorGeneratorTagDemo" method="input">
 			<result>/WEB-INF/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp</result>
@@ -60,8 +60,8 @@
 			<result>/WEB-INF/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp</result>
 		</action>
 	</package>
-
-
+	
+	
 	<!-- ===================================== -->
 	<!-- === Package for AppendIteratorTag Demo ===  -->
 	<!-- ========================================== -->
@@ -74,8 +74,8 @@
 			<result>/WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp</result>
 		</action>
 	</package>
-
-
+	
+	
 	<!-- ====================================== -->
 	<!-- === Package for MergeIteratorTag Demo === -->
 	<!-- ========================================= -->
@@ -88,7 +88,7 @@
 			<result>/WEB-INF/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp</result>
 		</action>
 	</package>
-
+	
 	<!-- ============================================= -->
 	<!-- === Package for SubsetIteratorTag Demo === -->
 	<!-- =========================================== -->
@@ -101,14 +101,14 @@
 			<result>/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp</result>
 		</action>
 	</package>
-
+	
 	<!-- ========================================= -->
 	<!-- === Package for Action Prefix Example === -->
 	<!-- ========================================= -->
 	<package name="actionPrefix" extends="struts-default" namespace="/tags/non-ui/actionPrefix">
 		<action name="actionPrefixExampleUsingFreemarker">
 			<result type="freemarker">/WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl</result>
-		</action>
+		</action>	
 		<action name="submit" class="org.apache.struts2.showcase.tag.nonui.actionPrefix.SubmitAction">
 			<result type="freemarker">/WEB-INF/tags/non-ui/actionPrefix/normalSubmit.ftl</result>
 		</action>
@@ -131,7 +131,7 @@
 			<result type="plainText">/WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl</result>
 		</action>
 	</package>
-
+	
 	<!--  ========================================== -->
 	<!--  === Package for If Tag Test / Examples === -->
 	<!--  ========================================== -->

apps/showcase/src/main/resources/struts-tags-ui.xml

@@ -20,11 +20,11 @@
  */
 -->
 <!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>
-    <package name="ui-tags" extends="velocity-default" namespace="/tags/ui">
+    <package name="ui-tags" extends="struts-default" namespace="/tags/ui">
         <action name="example" class="org.apache.struts2.showcase.UITagExample">
             <result>/WEB-INF/tags/ui/example.jsp</result>
             <result name="input">/WEB-INF/tags/ui/example.jsp</result>

apps/showcase/src/main/resources/struts-tags.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>
     <include file="struts-tags-ui.xml"/>

apps/showcase/src/main/resources/struts-tiles.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>
     <package name="tiles" extends="tiles-default" namespace="/tiles">

apps/showcase/src/main/resources/struts-token.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>
     <package name="token" extends="struts-default" namespace="/token">
 
@@ -48,7 +48,7 @@
             <interceptor-ref name="defaultStack"/>
             <interceptor-ref name="token"/>
             <result name="invalid.token">/WEB-INF/token/doublePost.jsp</result>
-            <result name="success">/WEB-INF/token/transferDone.jsp</result>
+            <result name="success" type="redirect">/WEB-INF/token/transferDone.jsp</result>
         </action>
 
 
@@ -62,7 +62,7 @@
             <interceptor-ref name="defaultStack"/>
             <interceptor-ref name="tokenSession"/>
             <result name="invalid.token">/WEB-INF/token/doublePost.jsp</result>
-            <result name="success">/WEB-INF/token/transferDone.jsp</result>
+            <result name="success" type="redirect">/WEB-INF/token/transferDone.jsp</result>
         </action>
 
 

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

@@ -20,9 +20,9 @@
  */
 -->
 <!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>
 
     <constant name="struts.beanValidation.providerClass" value="org.hibernate.validator.HibernateValidator"/>
@@ -34,33 +34,28 @@
 
 	<package name="validation" extends="json-default" namespace="/validation">
         <action name="index">
-            <result>index.jsp</result>
+            <result>/WEB-INF/validation/index.jsp</result>
         </action>
 
 	    <action name="quizBasic" class="org.apache.struts2.showcase.validation.QuizAction">
-            <result name="input">/WEB-INF/validation/quiz-basic.jsp</result>
-            <result>/WEB-INF/validation/quiz-success.jsp</result>
+            <result name="input">quiz-basic.jsp</result>
+            <result>quiz-success.jsp</result>
         </action>
 
         <action name="quizClient" class="org.apache.struts2.showcase.validation.QuizAction">
-            <result name="input">/WEB-INF/validation/quiz-client.jsp</result>
-            <result>/WEB-INF/validation/quiz-success.jsp</result>
+            <result name="input">quiz-client.jsp</result>
+            <result>quiz-success.jsp</result>
         </action>
 
-		<action name="quizDwr" class="org.apache.struts2.showcase.validation.QuizAction">
-			<result name="input">/WEB-INF/validation/quiz-dwr.jsp</result>
-			<result>/WEB-INF/validation/quiz-success.jsp</result>
-		</action>
-
         <action name="quizClientCss" class="org.apache.struts2.showcase.validation.QuizAction">
-            <result name="input">/WEB-INF/validation/quiz-client-css.jsp</result>
-            <result>/WEB-INF/validation/quiz-success.jsp</result>
+            <result name="input">quiz-client-css.jsp</result>
+            <result>quiz-success.jsp</result>
         </action>
 
         <action name="quizAjax" class="org.apache.struts2.showcase.validation.QuizAction">
             <interceptor-ref name="jsonValidationWorkflowStack"/>
-            <result name="input">/WEB-INF/validation/quiz-ajax.jsp</result>
-            <result>/WEB-INF/validation/quiz-success.jsp</result>
+            <result name="input">quiz-ajax.jsp</result>
+            <result>quiz-success.jsp</result>
         </action>
 
 		<!-- =========================================== -->
@@ -74,7 +69,7 @@
 		<action name="ajaxFormSubmitSuccess" class="org.apache.struts2.showcase.validation.AjaxFormSubmitSuccessAction">
 			<result>/WEB-INF/validation/ajaxFormSubmitSuccess.jsp</result>
 		</action>
-
+		
 	</package>
 
 
@@ -83,46 +78,46 @@
 		<action name="list">
 			<result>index.jsp</result>
 		</action>
-
-
+		
+		
 		<!-- ======================== -->
 		<!-- === Field Validators === -->
 		<!-- ======================== -->
-
+		
 		<action name="showFieldValidatorsExamples" class="org.apache.struts2.showcase.validation.FieldValidatorsExampleAction" method="input">
 			<result name="input" type="dispatcher">/WEB-INF/validation/fieldValidatorsExample.jsp</result>
 		</action>
-
+		
 		<action name="submitFieldValidatorsExamples" class="org.apache.struts2.showcase.validation.FieldValidatorsExampleAction" method="submit">
 			<result name="input" type="dispatcher">/WEB-INF/validation/fieldValidatorsExample.jsp</result>
 			<result type="dispatcher">/WEB-INF/validation/successFieldValidatorsExample.jsp</result>
 		</action>
-
-
-
+		
+		
+		
 		<!-- ============================ -->
 		<!-- === Non Field Validators === -->
 		<!-- ============================ -->
-
+		
 		<action name="showNonFieldValidatorsExamples" class="org.apache.struts2.showcase.validation.NonFieldValidatorsExampleAction" method="input">
 			<result name="input">/WEB-INF/validation/nonFieldValidatorsExample.jsp</result>
 		</action>
-
+		
 		<action name="submitNonFieldValidatorsExamples" class="org.apache.struts2.showcase.validation.NonFieldValidatorsExampleAction" method="submit">
 			<result name="input">/WEB-INF/validation/nonFieldValidatorsExample.jsp</result>
 			<result>/WEB-INF/validation/successNonFieldValidatorsExample.jsp</result>
 		</action>
-
-
-
+		
+		
+		
 		<!-- ========================== -->
 		<!-- === Visitor Validators === -->
 		<!-- ========================== -->
-
+		
 		<action name="showVisitorValidatorsExamples" class="org.apache.struts2.showcase.validation.VisitorValidatorsExampleAction" method="input">
 			<result name="input">/WEB-INF/validation/visitorValidatorsExample.jsp</result>
 		</action>
-
+		
 		<action name="submitVisitorValidatorsExamples" class="org.apache.struts2.showcase.validation.VisitorValidatorsExampleAction" method="submit">
 			<result name="input">/WEB-INF/validation/visitorValidatorsExample.jsp</result>
 			<result>/WEB-INF/validation/successVisitorValidatorsExample.jsp</result>
@@ -146,7 +141,7 @@
 		<!-- =========================================== -->
 		<!-- === Store Error Messages Across Request === -->
 		<!-- =========================================== -->
-
+		
 		<action name="submitApplication" class="org.apache.struts2.showcase.validation.SubmitApplication" method="submitApplication">
 			<interceptor-ref name="store">
 				<param name="operationMode">STORE</param>
@@ -173,7 +168,7 @@
 		<action name="cancelApplication" class="org.apache.struts2.showcase.validation.SubmitApplication" method="cancelApplication">
 			<result>/WEB-INF/validation/storeErrorsAcrossRequestCancel.jsp</result>
 		</action>
-
+		
     </package>
 </struts>
-
+	

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

@@ -20,21 +20,11 @@
  */
 -->
 <!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>
-
-    <bean type="org.apache.struts2.interceptor.exec.ExecutorProvider" name="threadPool"
-          class="org.apache.struts2.showcase.wait.ThreadPoolExecutorProvider"/>
-
-    <constant name="struts.executor.provider" value="threadPool"/>
-
     <package name="wait" extends="struts-default" namespace="/wait">
-        <default-action-ref name="index"/>
-        <action name="index">
-            <result>/WEB-INF/wait/index.jsp</result>
-        </action>
 
         <action name="example1">
             <result>/WEB-INF/wait/example1.jsp</result>

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

@@ -20,11 +20,11 @@
  */
 -->
 <!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>
-    <package name="xslt" extends="xslt-default" namespace="/xslt">
+    <package name="xslt" extends="struts-default" namespace="/xslt">
         <default-action-ref name="index"/>
 
         <action name="index">
@@ -36,7 +36,7 @@
                 <param name="exposedValue">info.classpath</param>
             </result>
         </action>
-
+        
         <action name="jvmInfoRaw" class="org.apache.struts2.showcase.xslt.JVMAction">
             <result type="xslt">
                 <param name="exposedValue">info</param>

apps/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">
 
 <!-- START SNIPPET: xworkSample -->
 <struts>
@@ -44,8 +44,6 @@
     <constant name="struts.serve.static" value="true" />
     <constant name="struts.serve.static.browserCache" value="false" />
 
-    <constant name="struts.action.excludePattern" value=".*/images/.*\.gif,.*/img/.*\.gif,.*/styles/.*\.css,.*/js/.*\.js,/testServlet/.*"/>
-
     <include file="struts-interactive.xml" />
 
     <include file="struts-hangman.xml" />
@@ -76,10 +74,6 @@
 
     <include file="struts-xslt.xml" />
 
-    <include file="struts-async.xml" />
-
-    <include file="struts-dispatcher.xml" />
-
     <package name="default" extends="struts-default">
         <interceptors>
             <interceptor-stack name="crudStack">

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

@@ -23,21 +23,21 @@
 -->
 <ul<#rt/>
 <#if parameters.id??>
- id="${parameters.id}"<#rt/>
+ id="${parameters.id?html}"<#rt/>
 </#if>            
 <#if parameters.cssClass??>
- class="${parameters.cssClass}"<#rt/>
+ class="${parameters.cssClass?html}"<#rt/>
 <#else>
  class="errorMessage"<#rt/>
 </#if>
 <#if parameters.cssStyle??>
- style="${parameters.cssStyle}"<#rt/>
+ style="${parameters.cssStyle?html}"<#rt/>
 </#if>
 >
 <#if (actionErrors?? && actionErrors?size > 0)>
 	<#list actionErrors as error>
 		<#if error??>
-            <li><span><#if parameters.escape>${error!}<#else>${error!}</#if></span><#rt/></li><#rt/>
+            <li><span><#if parameters.escape>${error!?html}<#else>${error!}</#if></span><#rt/></li><#rt/>
         </#if>
 	</#list>
 </#if>

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

@@ -22,13 +22,13 @@ ${parameters.after!}<#t/>
     </td><#lt/>
 </tr>
 <#if (parameters.errorposition!"top") == 'bottom'>
-<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors.get(parameters.name)??/>
+<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/>
 <#if hasFieldErrors>
 <tr errorFor="${parameters.id}">
     <td class="tdErrorMessage" colspan="2"><#rt/>
         <#if hasFieldErrors>
-            <#list fieldErrors.get(parameters.name) as error>
-                <div class="errorMessage">${error}</div><#t/>
+            <#list fieldErrors[parameters.name] as error>
+                <div class="errorMessage">${error?html}</div><#t/>
             </#list>
         </#if>
     </td><#lt/>

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

@@ -21,29 +21,29 @@
 <#--
 	Always include elements to show errors. They may be filled later via AJAX.
 -->
-<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors.get(parameters.name)??/>
+<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/>
 <#if (parameters.errorposition!"top") == 'top'>
 <tr errorFor="${parameters.id}">
     <td class="tdErrorMessage" colspan="2" data-error-for-fieldname="${parameters.name}"><#rt/>
         <#if hasFieldErrors>
-            <#list fieldErrors.get(parameters.name) as error>
-                <div class="errorMessage">${error}</div><#t/>
+            <#list fieldErrors[parameters.name] as error>
+                <div class="errorMessage">${error?html}</div><#t/>
             </#list>
         </#if>
     </td><#lt/>
 </tr>
 </#if>
-<#if !parameters.labelPosition?? && (parameters.form.labelPosition)??>
-<#assign labelPos = parameters.form.labelPosition/>
-<#elseif parameters.labelPosition??>
-<#assign labelpos = parameters.labelPosition/>
+<#if !parameters.labelposition?? && (parameters.form.labelposition)??>
+<#assign labelpos = parameters.form.labelposition/>
+<#elseif parameters.labelposition??>
+<#assign labelpos = parameters.labelposition/>
 </#if>
 <#--
 	if the label position is top,
 	then give the label it's own row in the table
 -->
 <tr>
-<#if (labelPos!"") == 'top'>
+<#if (labelpos!"") == 'top'>
     <td class="tdLabelTop" colspan="2"><#rt/>
 <#else>
     <td class="tdLabel"><#rt/>
@@ -51,7 +51,7 @@
 <#if parameters.label??>
     <label <#t/>
 <#if parameters.id??>
-        for="${parameters.id}" <#t/>
+        for="${parameters.id?html}" <#t/>
 </#if>
 <#if hasFieldErrors>
         class="errorLabel"<#t/>
@@ -62,17 +62,17 @@
 <#if parameters.required!false && parameters.requiredPosition!"right" != 'right'>
         <span class="required">*</span><#t/>
 </#if>
-${parameters.label}<#t/>
+${parameters.label?html}<#t/>
 <#if parameters.required!false && parameters.requiredPosition!"right" == 'right'>
  <span class="required">*</span><#t/>
 </#if>
-${parameters.labelseparator!":"}<#t/>
+${parameters.labelseparator!":"?html}<#t/>
 <#include "/${parameters.templateDir}/${parameters.expandTheme}/tooltip.ftl" />
 </label><#t/>
 </#if>
     </td><#lt/>
 <#-- add the extra row -->
-<#if (labelPos!"") == 'top'>
+<#if (labelpos!"") == 'top'>
 </tr>
 <tr>
 </#if>

apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml

@@ -45,46 +45,66 @@
     </bean>
 
     <bean id="chatLoginAction" class="org.apache.struts2.showcase.chat.ChatLoginAction" scope="prototype">
-        <constructor-arg index="0" ref="chatService"/>
+        <constructor-arg index="0">
+            <ref local="chatService"/>
+        </constructor-arg>
     </bean>
 
     <bean id="chatLogoutAction" class="org.apache.struts2.showcase.chat.ChatLogoutAction" scope="prototype">
-        <constructor-arg index="0" ref="chatService"/>
+        <constructor-arg index="0">
+            <ref local="chatService"/>
+        </constructor-arg>
     </bean>
 
     <bean id="usersAvailableAction" class="org.apache.struts2.showcase.chat.UsersAvailableAction" scope="prototype">
-        <constructor-arg index="0" ref="chatService"/>
+        <constructor-arg index="0">
+            <ref local="chatService"/>
+        </constructor-arg>
     </bean>
 
     <bean id="roomsAvailableAction" class="org.apache.struts2.showcase.chat.RoomsAvailableAction" scope="prototype">
-        <constructor-arg index="0" ref="chatService"/>
+        <constructor-arg index="0">
+            <ref local="chatService"/>
+        </constructor-arg>
     </bean>
 
     <bean id="crudRoomAction" class="org.apache.struts2.showcase.chat.CrudRoomAction" scope="prototype">
-        <constructor-arg index="0" ref="chatService"/>
+        <constructor-arg index="0">
+            <ref local="chatService"/>
+        </constructor-arg>
     </bean>
 
     <bean id="enterRoomAction" class="org.apache.struts2.showcase.chat.EnterRoomAction" scope="prototype">
-        <constructor-arg index="0" ref="chatService"/>
+        <constructor-arg index="0">
+            <ref local="chatService"/>
+        </constructor-arg>
     </bean>
 
     <bean id="messagesAvailableInRoomAction" class="org.apache.struts2.showcase.chat.MessagesAvailableInRoomAction"
           scope="prototype">
-        <constructor-arg index="0" ref="chatService"/>
+        <constructor-arg index="0">
+            <ref local="chatService"/>
+        </constructor-arg>
     </bean>
 
     <bean id="sendMessageToRoomAction" class="org.apache.struts2.showcase.chat.SendMessageToRoomAction"
           scope="prototype">
-        <constructor-arg index="0" ref="chatService"/>
+        <constructor-arg index="0">
+            <ref local="chatService"/>
+        </constructor-arg>
     </bean>
 
     <bean id="usersAvailableInRoomAction" class="org.apache.struts2.showcase.chat.UsersAvailableInRoomAction"
           scope="prototype">
-        <constructor-arg index="0" ref="chatService"/>
+        <constructor-arg index="0">
+            <ref local="chatService"/>
+        </constructor-arg>
     </bean>
 
     <bean id="exitRoomAction" class="org.apache.struts2.showcase.chat.ExitRoomAction" scope="prototype">
-        <constructor-arg index="0" ref="chatService"/>
+        <constructor-arg index="0">
+            <ref local="chatService"/>
+        </constructor-arg>
     </bean>
 
 
@@ -109,7 +129,9 @@
     </bean>
 
     <bean id="startHangmanAction" class="org.apache.struts2.showcase.hangman.StartHangmanAction" scope="prototype">
-        <constructor-arg index="0" ref="hangmanService"/>
+        <constructor-arg index="0">
+            <ref local="hangmanService"/>
+        </constructor-arg>
     </bean>
 
     <bean id="guessCharacterAction" class="org.apache.struts2.showcase.hangman.GuessCharacterAction" scope="prototype"/>

apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp

@@ -63,41 +63,32 @@
 
     <title><decorator:title default="Struts2 Showcase"/></title>
 
-    <s:url var="bootstrapCss" value='/styles/bootstrap.css' encode='false' includeParams='none'/>
-    <s:link href="%{bootstrapCss}" rel="stylesheet" type="text/css" media="all"/>
-    <s:url var="mainCss" value='/styles/main.css' encode='false' includeParams='none'/>
-    <s:link href="%{mainCss}" rel="stylesheet" type="text/css" media="all"/>
+    <link href="<s:url value='/styles/bootstrap.css' encode='false' includeParams='none'/>" rel="stylesheet" type="text/css" media="all">
+    <link href="<s:url value='/styles/main.css' encode='false' includeParams='none'/>" rel="stylesheet" type="text/css" media="all"/>
 
-    <s:url var="jqueryJs" value='/js/jquery-2.1.4.min.js' encode='false' includeParams='none'/>
-    <s:script src="%{jqueryJs}"/>
-    <s:url var="bootstrapJs" value='/js/bootstrap.min.js' encode='false' includeParams='none'/>
-    <s:script src="%{bootstrapJs}"/>
-    <s:script type="text/javascript">
+    <script src="<s:url value='/js/jquery-2.1.4.min.js' encode='false' includeParams='none'/>"></script>
+    <script src="<s:url value='/js/bootstrap.min.js' encode='false' includeParams='none'/>"></script>
+    <script type="text/javascript">
         $(function () {
             var alerts = $('ul.alert').wrap('<div />');
             alerts.prepend('<a class="close" data-dismiss="alert" href="#">&times;</a>');
             alerts.alert();
         });
-    </s:script>
+    </script>
 
     <!-- Prettify -->
-    <s:url var="prettifyCss" value='/styles/prettify.css' encode='false' includeParams='none'/>
-    <s:link href="%{prettifyCss}" rel="stylesheet"/>
-    <s:url var="prettifyJs" value='/js/prettify.js' encode='false' includeParams='none'/>
-    <s:script src="%{prettifyJs}"/>
+    <link href="<s:url value='/styles/prettify.css' encode='false' includeParams='none'/>" rel="stylesheet">
+    <script src="<s:url value='/js/prettify.js' encode='false' includeParams='none'/>"></script>
 
     <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
-    <s:script src="http://html5shim.googlecode.com/svn/trunk/html5.js"/>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
 
-    <s:script>
-        jQuery(document).ready(function() { prettyPrint(); } );
-    </s:script>
     <decorator:head/>
 </head>
 
-<body id="page-home">
+<body id="page-home" onload="prettyPrint();">
 
 <nav class="navbar navbar-default navbar-fixed-top">
     <div class="container-fluid">
@@ -210,7 +201,6 @@
                         <ul class="dropdown-menu" role="menu">
                             <s:url var="quizBasic" namespace="/validation" action="quizBasic" method="input"/>
                             <s:url var="quizClient" namespace="/validation" action="quizClient" method="input"/>
-                            <s:url var="quizDwr" namespace="/validation" action="quizDwr" method="input"/>
                             <s:url var="quizClientCss" namespace="/validation" action="quizClientCss" method="input"/>
                             <s:url var="fieldValidatorUrl" action="showFieldValidatorsExamples" namespace="/validation"/>
                             <s:url var="nonFieldValidatorUrl" action="showNonFieldValidatorsExamples" namespace="/validation"/>
@@ -226,7 +216,6 @@
                             <li><s:a href="%{storeMessageAcrossRequestExample}">Store across request using MessageStoreInterceptor (Example)</s:a></li>
                             <li><s:a href="%{quizBasic}">Validation (basic)</s:a></li>
                             <li><s:a href="%{quizClient}">Validation (client)</s:a></li>
-                            <li><s:a href="%{quizDwr}">Validation (DWR)</s:a></li>
                             <li><s:a href="%{quizClientCss}">Validation (client using css_xhtml theme)</s:a></li>
                             <li><s:a href="%{visitorValidatorUrl}">Visitor Validator</s:a></li>
                             <li><s:a href="%{ajaxFormSubmitUrl}">AJAX Form Submit</s:a></li>
@@ -242,13 +231,10 @@
                             </li>
                             <li><s:a value="/person/index.html">Person Manager</s:a></li>
                             <li><s:a value="/skill/index.html">CRUD</s:a></li>
-                            <li><s:a value="/wait/index">Execute &amp; Wait</s:a></li>
+                            <li><s:a value="/wait/index.html">Execute &amp; Wait</s:a></li>
                             <li><s:a value="/token/index.html">Token</s:a></li>
                             <li><s:url var="url" namespace="/modelDriven" action="modelDriven"/><s:a
                                     href="%{url}">Model Driven</s:a></li>
-                            <li><s:a value="/async/index.html">Async</s:a></li>
-                            <li><s:a value="/dispatcher/dispatch.action">Dispatcher result - dispatch</s:a></li>
-                            <li><s:a value="/dispatcher/forward.action">Dispatcher result - forward</s:a></li>
                         </ul>
                     </li>
                     <li class="dropdown">

apps/showcase/src/main/webapp/WEB-INF/dispatcher/dispatch-result.jsp

@@ -1,42 +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.
-*/
--->
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<html>
-<head>
-    <title>Struts2 Showcase - Dispatcher result Example</title>
-    <s:head theme="xhtml"/>
-</head>
-<body>
-
-<div class="page-header">
-    <h1>Dispatcher Result Example</h1>
-</div>
-
-<div class="container-fluid">
-    <div class="row">
-        <div id="dispatcher-result" class="col-md-12">
-            This page is a result of &quot;dispatching&quot; to it from an action
-        </div>
-    </div>
-</div>
-</body>
-</html>

apps/showcase/src/main/webapp/WEB-INF/filedownload/index.jsp

@@ -39,7 +39,7 @@
 			    </div>
 
 			    <s:url var="url" action="download"/>
-                            <s:a href="%{url}" cssClass="btn btn-large btn-info"><i class="icon-picture"></i> Download image file.</s:a>
+			    <s:a href="%{url}" cssClass="btn btn-large btn-info"><i class="icon-picture"></i> Download image file.</s:a>
 		    </div>
 		    <div class="col-md-6" style="text-align: center;">
 			    <div class="alert alert-info">
@@ -47,7 +47,7 @@
 			    </div>
 
 			    <s:url var="url" action="download2"/>
-                            <s:a href="%{url}" cssClass="btn btn-large btn-info"><i class="icon-download-alt"></i> Download ZIP file.</s:a>
+			    <s:a href="%{url}" cssClass="btn btn-large btn-info"><i class="icon-download-alt"></i> Download ZIP file.</s:a>
 		    </div>
 	    </div>
     </div>

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

@@ -1,65 +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.
-*/
--->
-<%@ page
-	language="java" 
-	contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<html>
-<head>
-	<title>Struts2 Showcase - Fileupload sample - Multiple fileupload</title>
-</head>
-
-<body>
-<div class="page-header">
-	<h1>Fileupload sample - Multiple fileupload</h1>
-</div>
-
-<div class="container-fluid">
-<s:iterator var="counter" begin="1" end="3">
-	<!-- Mechanism for display to work with upload both as an array and list in a single JSP (a bit ugly).
-	     Note: Output "index" doesn't always match if the input is "sparse". --> 
-	<s:if test="%{#counter <= upload.length}">
-		<s:set var="displayContent" value="true" />
-	</s:if>
-	<s:elseif test="%{#counter <= upload.size}">
-		<s:set var="displayContent" value="true" />
-	</s:elseif>
-	<s:else>
-		<s:set var="displayContent" value="false" />
-	</s:else>
-	<s:if test="%{#displayContent == true}">
-	<div class="row">
-		<div class="col-md-12">
-			<b>File (<s:property value="#counter" />):</b>
-			<ul>
-		        <li>ContentType: <s:property value="uploadContentType[#counter - 1]" /></li>
-		        <li>FileName: <s:property value="uploadFileName[#counter -1]" /></li>
-		        <li>File: <s:property value="upload[#counter - 1]" /></li>
-	        </ul>
-		</div>
-	</div>
-	</s:if>
-</s:iterator>
-</div>
-
-</body>
-</html>

apps/showcase/src/main/webapp/WEB-INF/hangman/hangmanNonAjax.ftl

@@ -139,7 +139,6 @@
 
 		      <@s.a href="%{#url}"
 		              id="%{#currentCharacter}"
-
 		              >
 		        <img height="36" alt="" src="<@s.property value="%{#chalkboardImageUrl}" />" width="36" border="0" />
 		      </@s.a>

apps/showcase/src/main/webapp/WEB-INF/person/list-people.ftl

@@ -51,9 +51,9 @@
 				</tr>
 			<#list people as person>
 				<tr>
-					<td>${person.id}</td>
-					<td>${person.name}</td>
-					<td>${person.lastName}</td>
+					<td>${person.id?html}</td>
+					<td>${person.name?html}</td>
+					<td>${person.lastName?html}</td>
 				</tr>
 			</#list>
 			</table>

apps/showcase/src/main/webapp/WEB-INF/showcase.jsp

@@ -39,7 +39,7 @@
 				<div class="hero-unit">
 					<h1>Welcome!</h1>
 					<p>The Struts Showcase demonstrates a variety of use cases and tag usages. Essentially, the application exercises various framework features in isolation. The Showcase is not meant as a "best practices" example.</p>
-					<p>For more "by example" solutions, see the <a href="https://github.com/apache/struts-examples" class="btn btn-primary btn-large">Struts Examples &raquo;</a> pages.</p>
+					<p>For more "by example" solutions, see the <a class="btn btn-primary btn-large">Struts Cookbook &raquo;</a> pages.</p>
 				</div>
 
 			</div>

apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefix.ftl

@@ -33,7 +33,7 @@
 
 			<p>You have come to this page because you used an <strong>action</strong> prefix.<p/>
 
-			<p>The text you've entered is ${text!''}<p/>
+			<p>The text you've entered is ${text!''?html}<p/>
 
 			<@s.a href="javascript:history.back();" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back</@s.a>
 		</div>

apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/methodPrefix.ftl

@@ -32,8 +32,8 @@
 		<div class="col-md-12">
 
 			<p>You have come to this page because you used an <strong>method</strong> prefix.<p/>
-
-			<p>The text you've enter is ${text!''}<p/>
+	
+			<p>The text you've enter is ${text!''?html}<p/>
 
 			<@s.a href="javascript:history.back();" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back</@s.a>
 		</div>

apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/normalSubmit.ftl

@@ -32,7 +32,7 @@
 		<div class="col-md-12">
 
 			<p>You have come to this page because you did a normal submit.<p/>
-
+	
 			<p>The text you've enter is %{text}<p/>
 
 			<@s.a href="javascript:history.back();" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back</@s.a>

apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/redirectActionPrefix.ftl

@@ -32,11 +32,11 @@
 		<div class="col-md-12">
 
 			<p>You have come to this page because you used an 'redirect-action' prefix.<p/>
-
+	
 			<p>Because this is a <strong>redirect-action</strong>, the text will be lost, due to a redirection
 			implies a new request being issued from the client.<p/>
 
-			The text you've enter is ${text!''}<p/>
+			The text you've enter is ${text!''?html}<p/>
 
 			<@s.a href="javascript:history.back();" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back</@s.a>
 		</div>

apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/ifTag/testIf.jsp

@@ -18,7 +18,6 @@
 * under the License.
 */
 -->
-<%@page import="org.apache.struts2.showcase.hangman.HangmanConstants" %>
 <%@taglib prefix="s" uri="/struts-tags" %>
 <html>
 <head>
@@ -636,18 +635,5 @@
 		</div>
 	</div>
 </div>
-<br>
-<br>
-    <p>
-        A secondary test for this JSP visually verifies expression access to a public constant.
-        A direct access to the same public constant via scriptlet provides secondary verification.
-    </p>
-<br>
-<div>
-    Test public static (constant) access (expression).  Value: <s:property default="unavailable" value="@org.apache.struts2.showcase.hangman.HangmanConstants@HANGMAN_SESSION_KEY" />
-</div>
-<div>
-    Test public static (constant) access (scriptlet).  Value: <%=org.apache.struts2.showcase.hangman.HangmanConstants.HANGMAN_SESSION_KEY%>
-</div>
 </body>
 </html>

apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.jsp

@@ -38,7 +38,7 @@
 			<s:fielderror  cssClass="alert alert-error"/>
 
 
-			<s:form action="exampleSubmit" enctype="multipart/form-data" method="POST" javascriptTooltip="true">
+			<s:form action="exampleSubmit" enctype="multipart/form-data" javascriptTooltip="true">
 			    <s:textfield
 			            label="Name"
 			            name="name"
@@ -97,7 +97,7 @@
 			            cssErrorClass="foo" />
 
 			    <s:checkbox
-			            tooltip="Confirm that you are Over 18"
+			            tooltip="Confirmed that your are Over 18"
 			            label="Age 18+"
 			            name="legalAge"/>
 
@@ -114,8 +114,8 @@
 			            emptyOption="true" />
 
 			    <s:doubleselect
-			            tooltip="Choose your Vehicle"
-			            label="Favourite Vehicle"
+			            tooltip="Choose your Vehical"
+			            label="Favourite Vehical"
 			            name="favouriteVehicalType"
 			            list="vehicalTypeList"
 			            listKey="key"
@@ -136,7 +136,7 @@
 
 			    <s:optiontransferselect
 			            tooltip="Select Your Favourite Cartoon Characters"
-			            label="Favourite Cartoon Characters"
+			            label="Favourite Cartoons Characters"
 			            name="leftSideCartoonCharacters"
 			            leftTitle="Left Title"
 			            rightTitle="Right Title"
@@ -153,7 +153,7 @@
 			            doubleMultiple="true" />
 
 			    <s:textarea
-			            label="Your Thoughts"
+			            label="Your Thougths"
 			            name="thoughts"
 			            tooltip="Enter your thoughts here" />
 

apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.vm

@@ -31,20 +31,16 @@
 		<div class="col-md-12">
 
 			#sform ("action=exampleSubmitVelocity" "method=post" "enctype=multipart/form-data")
-			    #stextfield ("label=Name" "name=name" "tooltip=Enter your Name here")
-                            #stextfield ("label=Birthday" "name=birthday" "tooltip=Select Your Birthday")
-                            #stextfield ("label=Wake up time" "name=wakeup" "tooltip=Enter the time you wake up")
-			    #stextarea ("label=Biography" "name=bio" "tooltip=Enter your Biography" "cols=20" "rows=3")
-			    #sselect ("label=Favourite Color" "tooltip=Choose Your Favourite Color" "list={'Red', 'Blue', 'Green'}" "name=favouriteColor" "emptyOption=true" "headerKey=None" "headerValue=None")
-			    #sselect ("label=Favourite Language" "tooltip=Choose Your Favourite Language" "list=favouriteLanguages" "name=favouriteLanguage" "listKey=key" "listValue=description" "emptyOption=true" "headerKey=None" "headerValue=None")
-			    #scheckboxlist ("label=Friends" "tooltip=Choose your Friends" "list={'Wes', 'Patrick', 'Jason', 'Jay', 'Toby', 'Rene'}" "name=friends")
-                            #sradio ("label=Best Friend" "tooltip=Choose your Best Friend" "list={'Wes', 'Patrick', 'Jason', 'Jay', 'Toby', 'Rene'}" "name=bestFriend" "cssErrorClass=foo")
-			    #scheckbox ("label=Age 18+" "name=legalAge" "tooltip=Confirm that you are Over 18")
-			    #sdoubleselect ("label=State" "name=region" "tooltip=Choose Your State" "list={'North', 'South'}" "value='North'" "doubleValue='Florida'" "doubleList=top == 'North' ? {'Oregon', 'Washington'} : {'Texas', 'Florida'}" "doubleName=state" "headerKey=-1" "headerValue=---------- Please Select ----------" "emptyOption=true" )
-			    #sdoubleselect ("label=Favourite Vehicle" "name=favouriteVehicalType" "tooltip=Choose your Vehicle" "list=vehicalTypeList" "listKey=key" "listValue=description" "value='MotorcycleKey'" "doubleValue='YamahaKey'" "doubleList=vehicalSpecificList" "doubleListKey=key" "doubleListValue=description" "doubleName=favouriteVehicalSpecific" "headerKey=-1" "headerValue=---------- Please Select ----------" "emptyOption=true" )
-			    #sfile ("label=Picture" "name=picture" "tooltip=Upload Your Picture")
-			    #soptiontransferselect ("label=Favourite Cartoon Characters" "name=leftSideCartoonCharacters" "tooltip=Select Your Favourite Cartoon Characters" "leftTitle=Left Title" "rightTitle=Right Title" "list={'Popeye', 'He-Man', 'Spiderman'}" "multiple=true" "headerKey=headerKey" "headerValue=--- Please Select ---" "emptyOption=true" "doubleList={'Superman', 'Mickey Mouse', 'Donald Duck'}" "doubleName=rightSideCartoonCharacters" "doubleHeaderKey=doubleHeaderKey" "doubleHeaderValue=--- Please Select ---" "doubleEmptyOption=true" "doubleMultiple=true" )
-                            #stextarea ("label=Your Thoughts" "name=thoughts" "tooltip=Enter your thoughts here" "cols=20" "rows=3")
+			    #stextfield ("label=Name" "name=name")
+			    #stextarea ("label=Biography" "name=bio" "cols=20" "rows=3")
+			    #sselect ("label=Favourite Color" "list={'Red', 'Blue', 'Green'}" "name=favouriteColor" "emptyOption=true" "headerKey=None" "headerValue=None")
+			    #sselect ("label=Favourite Language" "list=favouriteLanguages" "name=favouriteLanguage" "listKey=key" "listValue=description" "emptyOption=true" "headerKey=None" "headerValue=None")
+			    #scheckboxlist ("label=Friends" "list={'Patrick', 'Jason', 'Jay', 'Toby', 'Rene'}" "name=friends")
+			    #scheckbox ("label=Age 18+" "name=legalAge")
+			    #sdoubleselect ("label=State" "name=region" "list={'North', 'South'}" "value='North'" "doubleValue='Florida'" "doubleList=top == 'North' ? {'Oregon', 'Washington'} : {'Texas', 'Florida'}" "doubleName=state" "headerKey=-1" "headerValue=---------- Please Select ----------" "emptyOption=true" )
+			    #sdoubleselect ("label=Favourite Vehical" "name=favouriteVehicalType" "list=vehicalTypeList" "listKey=key" "listValue=description" "value='MotorcycleKey'" "doubleValue='YamahaKey'" "doubleList=vehicalSpecificList" "doubleListKey=key" "doubleListValue=description" "doubleName=favouriteVehicalSpecific" "headerKey=-1" "headerValue=---------- Please Select ----------" "emptyOption=true" )
+			    #sfile ("label=Picture" "name=picture")
+			    #soptiontransferselect ("label=Favourite Cartoons Characters" "name=leftSideCartoonCharacters" "leftTitle=Left Title" "rightTitle=Right Title" "list={'Popeye', 'He-Man', 'Spiderman'}" "multiple=true" "headerKey=headerKey" "headerValue=--- Please Select ---" "emptyOption=true" "doubleList={'Superman', 'Mickey Mouse', 'Donald Duck'}" "doubleName=rightSideCartoonCharacters" "doubleHeaderKey=doubleHeaderKey" "doubleHeaderValue=--- Please Select ---" "doubleEmptyOption=true" "doubleMultiple=true" )
 			    #ssubmit("cssClass=btn btn-primary")
 			    #sreset("cssClass=btn btn-danger")
 			#end