[maven-release-plugin] prepare release STRUTS_2_5_10_1

.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/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.0.8
-        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 != '11'
-        run: mvn -B -V -DskipAssembly test --no-transfer-progress
-      - name: Code coverage on Java ${{ matrix.java }}
-        if: matrix.java == '11'
-        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@99c53751e09b9529366343771cc321ec74e9bd3d    # 2.0.6
-        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@3cea5372237819ed00197afe530f5a7ea3e805c8    # 3.1.0
-        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,41 @@ Servers/
 .java-version
 
 # Maven
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
-.mvn/wrapper/maven-wrapper.jar
-
+core/target
+plugins/convention/target
+plugins/embeddedjsp/target
+plugins/osgi/target
+plugins/cdi/target
+plugins/spring/target
+plugins/jfreechart/target
+apps/rest-showcase/target
+apps/mailreader/target
+apps/portlet/target
+apps/blank/target
+apps/jboss-blank/target
+apps/mailreader/target
+apps/portlet/target
+apps/showcase/target
+apps/target
+bundles/admin/target
+plugins/config-browser/target
+plugins/jasperreports/target
+plugins/json/target
+plugins/portlet-tiles/target
+plugins/portlet/target
+plugins/sitegraph/target
+plugins/sitemesh/target
+plugins/javatemplates/target
+bundles/demo/target
+plugins/rest/target
+plugins/plexus/target
+plugins/testng/target
+plugins/dwr/target
+plugins/gxp/target
+plugins/oval/target
+plugins/junit/target
+plugins/tiles/target
+bundles/target
+plugins/target
+target
 plugins/testng/test-output
-test-output
-
-# Sonar
-/.sonar/
-
-# Tidelift CLI scanner
-.tidelift

.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,117 +0,0 @@
-/*
- * Copyright 2007-present the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    private static final String WRAPPER_VERSION = "0.5.6";
-    /**
-     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
-     */
-    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
-        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
-
-    /**
-     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
-     * use instead of the default one.
-     */
-    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-            ".mvn/wrapper/maven-wrapper.properties";
-
-    /**
-     * Path where the maven-wrapper.jar will be saved to.
-     */
-    private static final String MAVEN_WRAPPER_JAR_PATH =
-            ".mvn/wrapper/maven-wrapper.jar";
-
-    /**
-     * Name of the property which should be used to override the default download url for the wrapper.
-     */
-    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-    public static void main(String args[]) {
-        System.out.println("- Downloader started");
-        File baseDirectory = new File(args[0]);
-        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
-        // If the maven-wrapper.properties exists, read it and check if it contains a custom
-        // wrapperUrl parameter.
-        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
-        String url = DEFAULT_DOWNLOAD_URL;
-        if(mavenWrapperPropertyFile.exists()) {
-            FileInputStream mavenWrapperPropertyFileInputStream = null;
-            try {
-                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
-                Properties mavenWrapperProperties = new Properties();
-                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-            } catch (IOException e) {
-                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-            } finally {
-                try {
-                    if(mavenWrapperPropertyFileInputStream != null) {
-                        mavenWrapperPropertyFileInputStream.close();
-                    }
-                } catch (IOException e) {
-                    // Ignore ...
-                }
-            }
-        }
-        System.out.println("- Downloading from: " + url);
-
-        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if(!outputFile.getParentFile().exists()) {
-            if(!outputFile.getParentFile().mkdirs()) {
-                System.out.println(
-                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
-            }
-        }
-        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
-        try {
-            downloadFileFromURL(url, outputFile);
-            System.out.println("Done");
-            System.exit(0);
-        } catch (Throwable e) {
-            System.out.println("- Error downloading");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
-            String username = System.getenv("MVNW_USERNAME");
-            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
-            Authenticator.setDefault(new Authenticator() {
-                @Override
-                protected PasswordAuthentication getPasswordAuthentication() {
-                    return new PasswordAuthentication(username, password);
-                }
-            });
-        }
-        URL website = new URL(urlString);
-        ReadableByteChannel rbc;
-        rbc = Channels.newChannel(website.openStream());
-        FileOutputStream fos = new FileOutputStream(destination);
-        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-        fos.close();
-        rbc.close();
-    }
-
-}

.mvn/wrapper/maven-wrapper.properties

@@ -1,18 +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.
-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

.travis.yml

@@ -0,0 +1,9 @@
+language: java
+sudo: false
+
+jdk:
+  - openjdk7
+  - oraclejdk8
+
+install: true
+script: mvn test -DskipAssembly

Jenkinsfile

@@ -1,258 +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 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 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 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 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'
-            // step([$class: 'JiraIssueUpdater', issueSelector: [$class: 'DefaultIssueSelector'], scm: scm])
-          }
-          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

@@ -1,110 +1,41 @@
-<!---
- 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.
--->
 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-JDK7-master)](https://builds.apache.org/view/S-Z/view/Struts/job/Struts-JDK7-master/)
+[![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)
 [![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
+Web applications differ from conventional websites in that web applications can create a dynamic response. Many websites deliver only static pages. A web application can interact with databases and business logic engines to customize a response.
 
-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).
+Web applications based on JavaServer Pages sometimes commingle database code, page design code, and control flow code. In practice, we find that unless these concerns are separated, larger applications become difficult to maintain.
 
-## Description
-
-Web applications differ from conventional websites in that web applications can create a dynamic response. Many websites 
-deliver only static pages. A web application can interact with databases and business logic engines to customize a response.
-
-Web applications based on JavaServer Pages sometimes commingle database code, page design code, and control flow code. 
-In practice, we find that unless these concerns are separated, larger applications become difficult to maintain.
-
-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.
+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 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.
+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 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
+-------------------------
 
-## The Apache Struts Project
+The Apache Struts Project is the open source community that creates and maintains the Apache Struts framework. The project consists of a diverse group of volunteers who share common values regarding collaborative, community-based open source development. The Apache Struts Project is proud to share these values with our parent organization: The Apache Software Foundation.
 
-The Apache Struts Project is the open source community that creates and maintains the Apache Struts framework. 
-The project consists of a diverse group of volunteers who share common values regarding collaborative, community-based
-open source development. The Apache Struts Project is proud to share these values with our parent organization: 
-The Apache Software Foundation.
+The project is called “Struts” because the framework is meant to furnish the “invisible underpinnings” that support professional application development. Struts provides the glue that joins the various elements of the standard Java platform into a coherent whole. Our goal is to leverage existing standards by producing the missing pieces we need to create enterprise-grade applications that are easy to maintain over time.
 
-The project is called “Struts” because the framework is meant to furnish the “invisible underpinnings” that support 
-professional application development. Struts provides the glue that joins the various elements of the standard Java 
-platform into a coherent whole. Our goal is to leverage existing standards by producing the missing pieces we need to create 
-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 application to Struts 2. Please do not start new application development using Struts 1.x, as we are no longer issuing security patches.
 
-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 
-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 communities joined forces to create Struts 2. The 2.x framework is the best choice for teams who value elegant solutions to difficult problems.
 
-Struts 2 was originally known as WebWork 2. After working independently for several years, the WebWork and Struts 
-communities joined forces to create Struts 2. The 2.x framework is the best choice for teams who value elegant solutions 
-to difficult problems.
+Why should you use Apache Struts?
+---------------------------------
 
-## Why should you use Apache Struts?
+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 it: you can become a part of the core team too.
 
-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 
-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.
+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. 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 want to use Sitemesh or Tiles. This all is no problem due to Struts elegant and easy to use extension mechanisms.
 
-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. 
-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 
-extension mechanisms.
+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.
 
-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 
-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)
+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 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

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
+ * $Id$
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -24,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>6.3.0-RC1</version>
+        <version>2.5.10.1</version>
     </parent>
     <artifactId>struts2-apps</artifactId>
     <packaging>pom</packaging>
@@ -34,13 +36,6 @@
         <module>rest-showcase</module>
     </modules>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-        <maven.site.skip>true</maven.site.skip>
-        <maven.site.deploy.skip>true</maven.site.deploy.skip>
-    </properties>
-
     <build>
         <plugins>
             <!-- Include source code under WEB-INF/src/java -->
@@ -51,14 +46,14 @@
                         <id>copy-sources</id>
                         <phase>process-sources</phase>
                         <configuration>
-                            <target>
+                            <tasks>
                                 <copy todir="${project.build.directory}/${project.artifactId}/WEB-INF/src/java" failonerror="false">
                                     <fileset dir="${basedir}/src/main/java" />
                                 </copy>
                                 <copy todir="${project.build.directory}/${project.artifactId}/WEB-INF/src/java" failonerror="false">
                                     <fileset dir="${basedir}/src/main/resources" />
                                 </copy>
-                            </target>
+                            </tasks>
                         </configuration>
                         <goals>
                             <goal>run</goal>
@@ -83,6 +78,14 @@
                     <warSourceExcludes>WEB-INF/classes/LICENSE.txt,WEB-INF/classes/NOTICE.txt</warSourceExcludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-site-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                    <skipDeploy>true</skipDeploy>
+                    <generateReports>false</generateReports>
+                </configuration>
+            </plugin>
         </plugins>
 
         <finalName>${project.artifactId}</finalName>
@@ -99,9 +102,12 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${spring.platformVersion}</version>
+            <version>${struts2.springPlatformVersion}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
+    <properties>
+    	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
 </project>

apps/rest-showcase/pom.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
+ * $Id$
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -24,12 +26,12 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>6.3.0-RC1</version>
+        <version>2.5.10.1</version>
     </parent>
 
     <artifactId>struts2-rest-showcase</artifactId>
     <packaging>war</packaging>
-    <version>6.3.0-RC1</version>
+    <version>2.5.10.1</version>
     <name>Struts 2 Rest Showcase Webapp</name>
     <description>Struts 2 Rest Showcase Example</description>
 
@@ -47,11 +49,6 @@
             <artifactId>struts2-config-browser-plugin</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-xml</artifactId>
-        </dependency>
-
         <!-- Logging -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
@@ -73,32 +70,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>
 
@@ -108,12 +99,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>
@@ -125,7 +122,6 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>@{argLine}</argLine>
                     <excludes>
                         <exclude>it/**</exclude>
                         <exclude>**/*$*</exclude>

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

@@ -1,21 +1,3 @@
-/*
- * 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.demo.rest.example;
 
 import org.apache.struts2.convention.annotation.Action;

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

@@ -1,21 +1,3 @@
-/*
- * 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.demo.rest.example;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;

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

@@ -1,21 +1,3 @@
-/*
- * 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.demo.rest.example;
 
 import java.util.Collection;

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

@@ -1,21 +1,3 @@
-/*
- * 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.demo.rest.example;
 
 import java.util.*;

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

@@ -1,24 +1,4 @@
 <?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.
- */
--->
 <Configuration>
     <Appenders>
         <Console name="STDOUT" target="SYSTEM_OUT">

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

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
 /*
+ * $Id: struts-plugin.xml 722219 2008-12-01 20:41:26Z musachy $
+ *
  * 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
@@ -20,8 +22,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>
@@ -32,13 +34,7 @@
 
     <constant name="struts.convention.package.locators" value="example"/>
 
-<!-- Uncomment the lines below to use Jackson XML bindings instead of the XStream library to handle XML serialisations -->
-<!--
-    <bean name="jacksonXml" type="org.apache.struts2.rest.handler.ContentTypeHandler" class="org.apache.struts2.rest.handler.JacksonXmlHandler" />
-    <constant name="struts.rest.handlerOverride.xml" value="jacksonXml"/>
--->
-
     <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/resources/velocity.properties

@@ -1,19 +1 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
 runtime.log.logsystem.class=org.apache.velocity.runtime.log.NullLogChute

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

@@ -1,23 +1,3 @@
-<%--
-/*
-* 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 html>
 <%@taglib prefix="s" uri="/struts-tags" %>
 
@@ -27,16 +7,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

@@ -1,23 +1,3 @@
-<%--
-/*
-* 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 html>
 <%@taglib prefix="s" uri="/struts-tags" %>
 
@@ -27,16 +7,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

@@ -1,23 +1,3 @@
-<%--
-/*
-* 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 html>
 <%@taglib prefix="s" uri="/struts-tags" %>
 
@@ -27,16 +7,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

@@ -1,23 +1,3 @@
-<%--
-/*
-* 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 html>
 <%@taglib prefix="s" uri="/struts-tags" %>
 
@@ -27,16 +7,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

@@ -1,23 +1,3 @@
-<%--
-/*
-* 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 html>
 <%@taglib prefix="s" uri="/struts-tags" %>
 
@@ -27,16 +7,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

@@ -1,34 +1,15 @@
 <?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.
- */
--->
-<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/main/webapp/css/app.css

@@ -1,21 +1,3 @@
-/*
- * 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.
- */
 .form-group .errorMessage {
     list-style: none;
     font-weight: bold;

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

@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 package it.org.apache.struts2.rest.example;
 
 import net.sourceforge.jwebunit.junit.WebTestCase;

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

@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 package it.org.apache.struts2.rest.example;
 
 import net.sourceforge.jwebunit.junit.WebTestCase;

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

@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 package it.org.apache.struts2.rest.example;
 
 public class ParameterUtils {

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

@@ -1,33 +1,14 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 package it.org.apache.struts2.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 +54,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

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
+ * $Id$
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -24,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>6.3.0-RC1</version>
+        <version>2.5.10.1</version>
     </parent>
 
     <artifactId>struts2-showcase</artifactId>
@@ -68,6 +70,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 +91,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>
 
@@ -120,10 +113,16 @@
             <artifactId>log4j-jcl</artifactId>
             <version>${log4j2.version}</version>
         </dependency>
+
+        <!-- Velocity -->
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>${log4j2.version}</version>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-tools</artifactId>
         </dependency>
 
         <dependency>
@@ -131,7 +130,7 @@
             <artifactId>sitemesh</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.directwebremoting</groupId>
+            <groupId>uk.ltd.getahead</groupId>
             <artifactId>dwr</artifactId>
         </dependency>
         <dependency>
@@ -139,24 +138,47 @@
             <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>
@@ -164,48 +186,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>
@@ -213,30 +209,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/action/AbstractCRUDAction.java

@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

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

@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

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

@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

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

@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

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

@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

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

@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

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

@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

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

@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

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/person/package-info.java

@@ -1,21 +1,3 @@
-/*
- * 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.
- */
 @ParentPackage("person")
 @Namespace("/person") package org.apache.struts2.showcase.person;
 

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/tag/nonui/debugtag/DebugTagAction.java

@@ -1,30 +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.tag.nonui.debugtag;
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.dispatcher.PrepareOperations;
-
-public class DebugTagAction extends ActionSupport {
-
-    public String execute() throws Exception {
-        PrepareOperations.overrideDevMode(true); // Just for Showcase, explicitly switch on for this action only
-        return SUCCESS;
-    }
-}

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

@@ -1,21 +1,3 @@
-/*
- * 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.validation;
 
 import java.sql.Date;
@@ -32,6 +14,8 @@ import com.opensymphony.xwork2.validator.annotations.UrlValidator;
 
 /**
  * <!-- START SNIPPET: ajaxFormSubmit -->
+ */
+/**
  * Example Action that shows how forms can be validated and submitted via AJAX
  * only. Form-submit-and-page-reload functionality of browsers is not used for
  * this action.

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

@@ -1,21 +1,3 @@
-/*
- * 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.validation;
 
 public class AjaxFormSubmitSuccessAction {

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/globalMessages.properties

@@ -1,21 +1,3 @@
-#
-# 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.
-#
 format.number = {0,number,#0.0##}
 
 save=Save

apps/showcase/src/main/resources/globalMessages_de.properties

@@ -1,21 +1,3 @@
-#
-# 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.
-#
 save=Speichern
 
 item.edit={0} bearbeiten

apps/showcase/src/main/resources/globalMessages_en.properties

@@ -1,18 +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.
-#

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

@@ -1,35 +1,16 @@
 <?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.
- */
--->
 <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/myTemplateDir/myTheme/myAnotherTemplate.ftl

@@ -1,23 +1,3 @@
-<#--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
 <div style="background-color:yellow;">
 <p>
 Freemarker Custom Template -

apps/showcase/src/main/resources/org/apache/struts2/showcase/DateAction.properties

@@ -1,19 +1 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
 struts.date.format=yyyy/MM/dd hh:mm:ss

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

@@ -1,51 +1,30 @@
-<?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 validators PUBLIC
+<!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/UITagExample-conversion.properties

@@ -1,19 +1 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
 Element_friends = java.lang.String

apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction-conversion.properties

@@ -1,19 +1 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
 Element_selectedSkills=java.lang.String

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

@@ -1,25 +1,5 @@
 <?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 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/EmployeeAction.properties

@@ -1,21 +1,3 @@
-#
-# 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.
-#
 employee=Employee
 employee.firstName=First Name
 employee.lastName=Last Name

apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction_de.properties

@@ -1,27 +1,9 @@
-#
-# 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.
-#
 employee=Mitarbeiter    
 employee.firstName=Vorname
 employee.lastName=Nachname
 employee.description=Beschreibung
 
-employee.id.required=ID muß angegeben werden
-employee.lastName.required=Nachname wird benötigt
-employee.birthDate.required=Geburtsdatum wird benötigt
-employee.backtolist=Zurück zur Mitarbeiterliste
+employee.id.required=ID muß angegeben werden
+employee.lastName.required=Nachname wird benötigt
+employee.birthDate.required=Geburtsdatum wird benötigt
+employee.backtolist=Zurück zur Mitarbeiterliste

apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction_en.properties

@@ -1,18 +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.
-#

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

@@ -1,25 +1,5 @@
 <?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 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/action/SkillAction.properties

@@ -1,21 +1,3 @@
-#
-# 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.
-#
 skill=Skill
 skill.name=Name
 skill.description=Description

apps/showcase/src/main/resources/org/apache/struts2/showcase/action/SkillAction_de.properties

@@ -1,24 +1,6 @@
-#
-# 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.
-#
 skill=Kenntnis
 skill.name=Name
 skill.description=Beschreibung
 
 skill.name.required=Name muss angegeben werden
-skill.backtolist=Zurück zur Kenntnis Liste
+skill.backtolist=Zurück zur Kenntnis Liste

apps/showcase/src/main/resources/org/apache/struts2/showcase/conversion/AddressAction-conversion.properties

@@ -1,21 +1,4 @@
-#
-# 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.
-#
+
 KeyProperty_addresses=id
 Element_addresses=org.apache.struts2.showcase.conversion.Address
 CreateIfNull_addresses=true

apps/showcase/src/main/resources/org/apache/struts2/showcase/conversion/OperationsEnumAction-conversion.properties

@@ -1,21 +1,4 @@
-#
-# 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.
-#
+
 selectedOperations=org.apache.struts2.showcase.conversion.EnumTypeConverter
 Element_selectedOperations=org.apache.struts2.showcase.conversion.OperationsEnum
 

apps/showcase/src/main/resources/org/apache/struts2/showcase/conversion/PersonAction-conversion.properties

@@ -1,20 +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.
-#
 Element_persons=org.apache.struts2.showcase.conversion.Person

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

@@ -1,32 +1,12 @@
 <?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 validators PUBLIC
+<!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 +15,5 @@
 			<message>Caption cannot be empty</message>
 		</field-validator>
 	</field>
-</validators>
+</validators>  		
+  		

apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction-conversion.properties

@@ -1,19 +1 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
 Element_upload=java.io.File

apps/showcase/src/main/resources/org/apache/struts2/showcase/person/EditPersonAction-conversion.properties

@@ -1,21 +1,3 @@
-#
-# 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.
-#
 KeyProperty_persons=id
 Element_persons=org.apache.struts2.showcase.person.Person
 CreateIfNull_persons=true

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

@@ -1,25 +1,4 @@
-<?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 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

@@ -1,25 +1,4 @@
-<?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 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

@@ -1,28 +1,8 @@
 <?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 validators PUBLIC
+<!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 +10,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-conversion.properties

@@ -1,19 +1 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-dateValidatorField=org.apache.struts2.showcase.chat.DateConverter
+dateValidatorField=java.util.Date

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

@@ -1,30 +1,11 @@
-<?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.
- */
--->
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
 <!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

@@ -1,30 +1,11 @@
-<?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 validators PUBLIC
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!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 +52,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/FieldValidatorsExampleAction.properties

@@ -1,19 +1 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
 i18n.requiredstring=Test String for required Strings...

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

@@ -1,31 +1,12 @@
 <?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 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

@@ -1,29 +1,9 @@
-<?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 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

@@ -1,27 +1,7 @@
 <?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 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

@@ -1,35 +1,16 @@
 <?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 validators PUBLIC
-  		"-//Apache Struts//XWork Validator 1.0//EN"
-  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 
+<!DOCTYPE validators PUBLIC 
+  		"-//Apache Struts//XWork Validator 1.0//EN"
+  		"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 +22,6 @@
 			<message>Birthday Required</message>
 		</field-validator>
 	</field>
-</validators>
+</validators>  		
 
 

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

@@ -1,28 +1,9 @@
 <?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 validators PUBLIC
-  		"-//Apache Struts//XWork Validator 1.0//EN"
-  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 
+<!DOCTYPE validators PUBLIC 
+  		"-//Apache Struts//XWork Validator 1.0//EN"
+  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+  		
 <!-- START SNIPPET: visitorValidatorsExample -->
 
 <validators>
@@ -35,5 +16,5 @@
 	</field>
 </validators>
 
-<!--  END SNIPPET: visitorValidatorsExample -->
+<!--  END SNIPPET: visitorValidatorExample -->