[maven-release-plugin] prepare release STRUTS_2_5_21

Minor follow-up changes to PR #371

.asf.yaml

@@ -1,10 +0,0 @@
-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

.gitignore

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

.mvn/wrapper/MavenWrapperDownloader.java

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

.mvn/wrapper/maven-wrapper.properties

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

.travis.yml

@@ -3,30 +3,27 @@ language: java
 sudo: false
 
 jdk:
+  - openjdk7
+  - oraclejdk8
   - oraclejdk9
   - oraclejdk11
 
 install: true
+script: mvn test -DskipAssembly -B
+
+after_success:
+  # TODO delete following if statement after fix of https://github.com/cobertura/cobertura/issues/271
+  - if [ "$TRAVIS_JDK_VERSION" == "openjdk8" ] || [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]; then
+      mvn cobertura:cobertura org.eluder.coveralls:coveralls-maven-plugin:report com.updateimpact:updateimpact-maven-plugin:submit -Ptravis-coveralls,update-impact -DskipAssembly -B;
+    else
+      echo "Not reporting coverage for $TRAVIS_JDK_VERSION due to incompatibility or to save performance";
+    fi;
 
 env:
-global:
-  - secure: iI7IpfDtS+LUyS2yNuRCR3KelNyvBHuoMQ3gb1UNmR5SSL7jO/p3olQWrQROs28FJ+dpE3lHyIjoHrebKQGJHHAgTG2XWxn+G3fDsf+wSSFSLoDGj0o2SgGXooBbR2dccnNZHCyQaOyE2cIPWaOxrQZFE4No70LQB4mrP/gdkoc=
-matrix:
-    include:
-       - jdk: oraclejdk8
-         env: STRUTS_IT=true # do integration tests and coverage reports when jdk7,9 and 11 tests prospered
-
-script:
-   - if [ "$STRUTS_IT" == "true" ]; then
-      ./mvnw clean verify org.jacoco:jacoco-maven-plugin:report org.jacoco:jacoco-maven-plugin:report-integration org.eluder.coveralls:coveralls-maven-plugin:report -Ptravis-coveralls -DskipAssembly -B;
-    else
-      if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-        ./mvnw test -DskipAssembly -B;
-      else
-        ./mvnw test -DskipAssembly -Dupdate-impact -B;
-      fi;
-    fi;
+  global:
+    secure: DusDFL9cuX+mj64tXQfrYVbUVYnxlXmad4nuIMj0/lgDbwJ6kxYasJmR99bdvwu08gS9D5b7a+m7WJTN0FNATzEiiGDXcM+TiDPlYDh7dcalU4QGiLmMuCCEw1r7hp2XE4BWVgDfFhCsHhStgjE4RXzHIyPowoPXr4ugPf8at6w=
 
 cache:
   directories:
-    - $HOME/.m2
+  - $HOME/.m2
+  

Jenkinsfile

@@ -1,255 +1,28 @@
 #!groovy
-
 pipeline {
-  agent none
+  agent {
+    label 'ubuntu'
+  }
   options {
     buildDiscarder logRotator(daysToKeepStr: '14', numToKeepStr: '10')
     timeout(80)
     disableConcurrentBuilds()
-    skipStagesAfterUnstable()
-    quietPeriod(30)
+  }
+  tools {
+    jdk 'JDK 1.7 (latest)'
+    maven 'Maven 3 (latest)'
   }
   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 'mvn -B clean install -DskipTests -DskipAssembly'
-          }
-        }
-        stage('Test') {
-          steps {
-            sh 'mvn -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 'mvn -B clean install -DskipTests -DskipAssembly'
-          }
-        }
-        stage('Test') {
-          steps {
-            sh 'mvn -B test'
-          }
-          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 'mvn sonar:sonar -DskipAssembly -Dsonar.login=${SONARCLOUD_TOKEN}'
-            }
-          }
-        }
-      }
-      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 'mvn -B clean install -DskipTests -DskipAssembly'
-          }
-        }
-        stage('Test') {
-          steps {
-            sh 'mvn -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 'mvn -B source:jar javadoc:jar -DskipAssembbly'
-          }
-        }
-        stage('Deploy Snapshot') {
-          when {
-            branch 'master'
-          }
-          steps {
-            withCredentials([file(credentialsId: 'lukaszlenart-repository-access-token', variable: 'CUSTOM_SETTINGS')]) {
-              sh 'mvn -s \${CUSTOM_SETTINGS} deploy'
-            }
-          }
-        }
-        stage('Upload nightlies') {
-          when {
-            branch 'master'
-          }
-          steps {
-            sshPublisher(publishers: [
-                sshPublisherDesc(
-                    configName: 'Nightlies',
-                    transfers: [
-                        sshTransfer(
-                            remoteDirectory: '/x1/dist/struts',
-                            removePrefix: 'assembly/target/assembly/out',
-                            sourceFiles: 'assembly/target/assembly/out/struts-*.zip'
-                        )
-                    ],
-                    verbose: true
-                )
-            ])
-          }
-        }
-      }
-      post {
-        always {
-          cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**', type: 'INCLUDE']]
-        }
-      }
-    }
+  environment {
+    MAVEN_OPTS = '-Xmx1024m -XX:MaxPermSize=256m'
   }
-  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
-"""
-        )
+  stages {
+    stage('Build') {
+      steps {
+        sh 'mvn --version'
+        sh 'mvn clean source:jar javadoc:jar install deploy -DskipWiki -Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2'
       }
     }
   }

README.md

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

SECURITY.md

@@ -1,39 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Please vist the [Releases](https://struts.apache.org/releases.html#prior-releases) page to see full information about each version 
-and what potential vulnerability it can have:
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 2.5.20  | :white_check_mark: |
-| 2.3.37  | :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/pom.xml

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

apps/rest-showcase/pom.xml

@@ -24,12 +24,12 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>2.5.21</version>
     </parent>
 
     <artifactId>struts2-rest-showcase</artifactId>
     <packaging>war</packaging>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>2.5.21</version>
     <name>Struts 2 Rest Showcase Webapp</name>
     <description>Struts 2 Rest Showcase Example</description>
 
@@ -73,32 +73,26 @@
         <dependency>
             <groupId>net.sourceforge.jwebunit</groupId>
             <artifactId>jwebunit-core</artifactId>
-            <version>3.3</version>
+            <version>1.4.1</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
-            <groupId>net.sourceforge.htmlunit</groupId>
-            <artifactId>htmlunit</artifactId>
-            <version>2.39.0</version>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>net.sourceforge.jwebunit</groupId>
             <artifactId>jwebunit-htmlunit-plugin</artifactId>
-            <version>3.3</version>
+            <version>1.4.1</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
                     <groupId>xom</groupId>
                     <artifactId>xom</artifactId>
                 </exclusion>
-                <!-- not necessary to compile and it force dependency convergence issues -->
-                <exclusion>
-                    <groupId>net.sourceforge.htmlunit</groupId>
-                    <artifactId>htmlunit</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
 
@@ -114,6 +108,12 @@
                 <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>

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

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

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

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

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

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

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

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

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

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

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

@@ -19,15 +19,16 @@
  * under the License.
  */
 -->
-<web-app id="starter" version="2.5" xmlns="http://java.sun.com/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://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 
-    <display-name>Struts 2 Rest Example</display-name>
+  <display-name>Struts 2 Rest Example</display-name>
 
 
-    <!-- Filters -->
-    <!-- START SNIPPET: filter -->
+  <!-- Filters -->
+  <!-- START SNIPPET: filter -->
     <filter>
         <filter-name>action2</filter-name>
         <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>

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

@@ -18,16 +18,15 @@
  */
 package it.org.apache.struts2.rest.example;
 
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
 import net.sourceforge.jwebunit.junit.WebTestCase;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.StringRequestEntity;
 
 import java.io.IOException;
 
+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+
 public class PostOrderTest extends WebTestCase {
 
     public void setUp() throws Exception {
@@ -73,50 +72,68 @@ public class PostOrderTest extends WebTestCase {
     }
 
     public void testPostOrderInXml() throws IOException {
-        CloseableHttpClient client = HttpClients.createDefault();
-        HttpPost httpPost = new HttpPost(ParameterUtils.getBaseUrl() + "/orders.xml");
-        httpPost.setEntity(new StringEntity("<org.apache.struts2.rest.example.Order>\n" +
-                "<clientName>Test3</clientName>\n" +
-                "<amount>3342</amount>\n" +
-                "</org.apache.struts2.rest.example.Order>"));
-        CloseableHttpResponse response = client.execute(httpPost);
-        assertEquals(201, response.getStatusLine().getStatusCode());
-        assertTrue(response.getHeaders("Location")[0].getValue().startsWith(ParameterUtils.getBaseUrl() + "/orders/"));
-        client.close();
+        HttpClient client = new HttpClient();
+        PostMethod method = null;
+        try {
+            method = new PostMethod(ParameterUtils.getBaseUrl()+"/orders.xml");
+            method.setRequestEntity(new StringRequestEntity("<org.apache.struts2.rest.example.Order>\n" +
+                    "<clientName>Test3</clientName>\n" +
+                    "<amount>3342</amount>\n" +
+                    "</org.apache.struts2.rest.example.Order>"));
+            client.executeMethod(method);
+            assertEquals(201, method.getStatusCode());
+            assertTrue(method.getResponseHeader("Location").getValue().startsWith(ParameterUtils.getBaseUrl()+"/orders/"));
+        } finally {
+            method.releaseConnection();
+        }
     }
 
     public void testPostOrderInXmlWithBadData() throws IOException {
-        CloseableHttpClient client = HttpClients.createDefault();
-        HttpPost httpPost = new HttpPost(ParameterUtils.getBaseUrl() + "/orders.xml");
-        httpPost.setEntity(new StringEntity("<org.apache.struts2.rest.example.Order>\n" +
-                "<amount>3342</amount>\n" +
-                "</org.apache.struts2.rest.example.Order>"));
-        CloseableHttpResponse response = client.execute(httpPost);
-        assertEquals(400, response.getStatusLine().getStatusCode());
-        assertTrue(response.toString().contains("<string>The client name is empty"));
-        assertNull(response.getHeaders("Location"));
-        client.close();
+        HttpClient client = new HttpClient();
+        PostMethod method = null;
+        try {
+            method = new PostMethod(ParameterUtils.getBaseUrl()+"/orders.xml");
+            method.setRequestEntity(new StringRequestEntity("<org.apache.struts2.rest.example.Order>\n" +
+                    "<amount>3342</amount>\n" +
+                    "</org.apache.struts2.rest.example.Order>"));
+            client.executeMethod(method);
+            assertEquals(400, method.getStatusCode());
+            String response = method.getResponseBodyAsString();
+            assertTrue(response.contains("<string>The client name is empty"));
+            assertNull(method.getResponseHeader("Location"));
+        } finally {
+            method.releaseConnection();
+        }
     }
 
     public void testPostOrderInJson() throws IOException {
-        CloseableHttpClient client = HttpClients.createDefault();
-        HttpPost httpPost = new HttpPost(ParameterUtils.getBaseUrl() + "/orders.json");
-        httpPost.setEntity(new StringEntity("{\"amount\":33,\"clientName\":\"Test4\"}"));
-        CloseableHttpResponse response = client.execute(httpPost);
-        assertEquals(201, response.getStatusLine().getStatusCode());
-        assertTrue(response.getHeaders("Location")[0].getValue().startsWith(ParameterUtils.getBaseUrl() + "/orders/"));
-        client.close();
+        HttpClient client = new HttpClient();
+        PostMethod method = null;
+        try {
+            method = new PostMethod(ParameterUtils.getBaseUrl()+"/orders.json");
+            method.setRequestEntity(new StringRequestEntity("{\"amount\":33,\"clientName\":\"Test4\"}"));
+            client.executeMethod(method);
+            assertEquals(201, method.getStatusCode());
+            assertTrue(method.getResponseHeader("Location").getValue().startsWith(ParameterUtils.getBaseUrl()+"/orders/"));
+        } finally {
+            method.releaseConnection();
+        }
     }
 
     public void testPostOrderInJsonWithBadData() throws IOException {
-        CloseableHttpClient client = HttpClients.createDefault();
-        HttpPost httpPost = new HttpPost(ParameterUtils.getBaseUrl() + "/orders.json");
-        httpPost.setEntity(new StringEntity("{\"amount\":33}"));
-        CloseableHttpResponse response = client.execute(httpPost);
-        assertEquals(400, response.getStatusLine().getStatusCode());
-        assertTrue(response.toString()
-                .contains("{\"actionErrors\":[],\"fieldErrors\":{\"clientName\":[\"The client name is empty\"]}}"));
-        assertNull(response.getHeaders("Location"));
-        client.close();
+        HttpClient client = new HttpClient();
+        PostMethod method = null;
+        try {
+            method = new PostMethod(ParameterUtils.getBaseUrl()+"/orders.json");
+            method.setRequestEntity(new StringRequestEntity("{\"amount\":33}"));
+            client.executeMethod(method);
+            String response = method.getResponseBodyAsString();
+            assertEquals(400, method.getStatusCode());
+
+            assertEquals("{\"actionErrors\":[],\"fieldErrors\":{\"clientName\":[\"The client name is empty\"]}}", response);
+            assertNull(method.getResponseHeader("Location"));
+        } finally {
+            method.releaseConnection();
+        }
     }
 }

apps/showcase/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>2.5.21</version>
     </parent>
 
     <artifactId>struts2-showcase</artifactId>
@@ -89,16 +89,6 @@
             <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>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
@@ -122,12 +112,23 @@
             <version>${log4j2.version}</version>
         </dependency>
 
+        <!-- Velocity -->
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-tools</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>opensymphony</groupId>
             <artifactId>sitemesh</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.directwebremoting</groupId>
+            <groupId>uk.ltd.getahead</groupId>
             <artifactId>dwr</artifactId>
         </dependency>
         <dependency>
@@ -135,24 +136,38 @@
             <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.39.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</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>6.1.2.Final</version>
+            <version>5.1.3.Final</version>
         </dependency>
 
         <!-- The Servlet API mocks in Spring Framework 4.x only supports Servlet 3.0 and higher.
@@ -168,30 +183,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.0.0-M4</version>
-                <configuration>
-                    <includes>
-                        <include>it.org.apache.struts2.showcase.*Test</include>
-                    </includes>
-                </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.mortbay.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
@@ -216,27 +207,6 @@
                         <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>run-forked</goal>
-                        </goals>
-                        <configuration>
-                            <waitForChild>false</waitForChild>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>stop-jetty</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>stop</goal>
-                        </goals>
-                    </execution>
-                </executions>
              </plugin>
 
             <plugin>

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

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

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

@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.struts2.showcase.async;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-
-/**
- * Filters async actions directly to Struts servlet
- */
-public class AsyncFilter implements Filter {
-    @Override
-    public void init(FilterConfig filterConfig) throws ServletException {
-
-    }
-
-    @Override
-    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
-        String requestURI = ((HttpServletRequest) servletRequest).getRequestURI();
-        if (!requestURI.contains("/async/receiveNewMessages")) {
-            filterChain.doFilter(servletRequest, servletResponse); // Just continue chain.
-        } else {
-            servletRequest.getRequestDispatcher("/async/receiveNewMessages").forward(servletRequest, servletResponse);
-        }
-    }
-
-    @Override
-    public void destroy() {
-
-    }
-}

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

@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.struts2.showcase.async;
-
-import com.opensymphony.xwork2.ActionSupport;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Callable;
-
-/**
- * Example to illustrate the <code>async</code> plugin.
- */
-public class ChatRoomAction extends ActionSupport {
-    private String message;
-    private Integer lastIndex;
-    private List<String> newMessages;
-
-    private static final List<String> messages = new ArrayList<>();
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public void setLastIndex(Integer lastIndex) {
-        this.lastIndex = lastIndex;
-    }
-
-    public List<String> getNewMessages() {
-        return newMessages;
-    }
-
-    public Callable<String> receiveNewMessages() throws Exception {
-        return new Callable<String>() {
-            @Override
-            public String call() throws Exception {
-                while (lastIndex >= messages.size()) {
-                    Thread.sleep(3000);
-                }
-                newMessages = messages.subList(lastIndex, messages.size());
-                return SUCCESS;
-            }
-        };
-    }
-
-    public String sendMessage() {
-        synchronized (messages) {
-            messages.add(message);
-        }
-        return SUCCESS;
-    }
-}

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

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

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

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

apps/showcase/src/main/java/org/apache/struts2/showcase/chat/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/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/model/Skill.java

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

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

@@ -23,11 +23,10 @@ package org.apache.struts2.showcase.source;
 import com.opensymphony.xwork2.ActionSupport;
 import com.opensymphony.xwork2.util.ClassLoaderUtil;
 import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.action.ServletContextAware;
+import org.apache.struts2.util.ServletContextAware;
 
 import javax.servlet.ServletContext;
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -89,16 +88,9 @@ public class ViewSourceAction extends ActionSupport implements ServletContextAwa
 			}
 		}
 
-                final String rootPath = ServletActionContext.getServletContext().getRealPath("/");
-                final String rootPathUnix = (rootPath != null ? rootPath.replace(File.separator, "/") : null);  // Make path Unix-like for comparison (e.g. on Windows)
-                final String rootPathFileURI = "file://" + rootPathUnix;
-                final String collapsedRootPathFileURI = rootPathFileURI.replace("//", "/");        // Config string may have been transformed
-                final String rootPathWarFileURI = "war:file://" + rootPathUnix;
-                final String collapsedRootPathWarFileURI = rootPathWarFileURI.replace("//", "/");  // Config string may have been transformed
+		String rootPath = ServletActionContext.getServletContext().getRealPath("/");
 
-		if (config != null && (rootPath == null || config.startsWith(rootPath) ||
-                    config.startsWith(rootPathFileURI) || config.startsWith(collapsedRootPathFileURI) ||
-                    config.startsWith(rootPathWarFileURI) || config.startsWith(collapsedRootPathWarFileURI))) {
+		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("//", "/");
@@ -200,7 +192,7 @@ public class ViewSourceAction extends ActionSupport implements ServletContextAwa
 	}
 
 	/**
-	 * Reads in a stream, optionally only including the target line number
+	 * Reads in a strea, optionally only including the target line number
 	 * and its padding
 	 *
 	 * @param in               The input stream
@@ -235,7 +227,7 @@ public class ViewSourceAction extends ActionSupport implements ServletContextAwa
 		return snippet;
 	}
 
-	public void withServletContext(ServletContext arg0) {
+	public void setServletContext(ServletContext arg0) {
 		this.servletContext = arg0;
 	}
 

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

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

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

@@ -26,7 +26,7 @@
 <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>

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

@@ -71,7 +71,7 @@
 	</field>
 	<field name="regexValidatorField">
 		<field-validator type="regex">
-			<param name="regex"><![CDATA[ .*\.txt ]]></param>
+			<param name="regex"><![CDATA[ [^<>]+ ]]></param>
 			<message><![CDATA[ regexValidatorField must match a regexp (.*\.txt) if specified ]]></message>
 		</field-validator>
 	</field>

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

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

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

@@ -24,7 +24,7 @@
 	"http://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
-    <package name="ui-tags" extends="velocity-default" namespace="/tags/ui">
+    <package name="ui-tags" extends="struts-default" namespace="/tags/ui">
         <action name="example" class="org.apache.struts2.showcase.UITagExample">
             <result>/WEB-INF/tags/ui/example.jsp</result>
             <result name="input">/WEB-INF/tags/ui/example.jsp</result>

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

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

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

@@ -44,8 +44,6 @@
     <constant name="struts.serve.static" value="true" />
     <constant name="struts.serve.static.browserCache" value="false" />
 
-    <constant name="struts.action.excludePattern" value=".*/images/.*\.gif,.*/img/.*\.gif,.*/styles/.*\.css,.*/js/.*\.js"/>
-
     <include file="struts-interactive.xml" />
 
     <include file="struts-hangman.xml" />
@@ -76,8 +74,6 @@
 
     <include file="struts-xslt.xml" />
 
-    <include file="struts-async.xml" />
-
     <package name="default" extends="struts-default">
         <interceptors>
             <interceptor-stack name="crudStack">

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

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

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

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

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

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

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

@@ -63,32 +63,26 @@
 
     <title><decorator:title default="Struts2 Showcase"/></title>
 
-    <s:url var="bootstrapCss" value='/styles/bootstrap.css' encode='false' includeParams='none'/>
-    <s:link href="%{bootstrapCss}" rel="stylesheet" type="text/css" media="all"></s:link>
-    <s:url var="mainCss" value='/styles/main.css' encode='false' includeParams='none'/>
-    <s:link href="%{mainCss}" rel="stylesheet" type="text/css" media="all"></s:link>
+    <link href="<s:url value='/styles/bootstrap.css' encode='false' includeParams='none'/>" rel="stylesheet" type="text/css" media="all">
+    <link href="<s:url value='/styles/main.css' encode='false' includeParams='none'/>" rel="stylesheet" type="text/css" media="all"/>
 
-    <s:url var="jqueryJs" value='/js/jquery-2.1.4.min.js' encode='false' includeParams='none'/>
-    <s:script src="%{jqueryJs}"></s:script>
-    <s:url var="bootstrapJs" value='/js/bootstrap.min.js' encode='false' includeParams='none'/>
-    <s:script src="%{bootstrapJs}"></s:script>
-    <s:script type="text/javascript">
+    <script src="<s:url value='/js/jquery-2.1.4.min.js' encode='false' includeParams='none'/>"></script>
+    <script src="<s:url value='/js/bootstrap.min.js' encode='false' includeParams='none'/>"></script>
+    <script type="text/javascript">
         $(function () {
             var alerts = $('ul.alert').wrap('<div />');
             alerts.prepend('<a class="close" data-dismiss="alert" href="#">&times;</a>');
             alerts.alert();
         });
-    </s:script>
+    </script>
 
     <!-- Prettify -->
-    <s:url var="prettifyCss" value='/styles/prettify.css' encode='false' includeParams='none'/>
-    <s:link href="%{prettifyCss}" rel="stylesheet"></s:link>
-    <s:url var="prettifyJs" value='/js/prettify.js' encode='false' includeParams='none'/>
-    <s:script src="%{prettifyJs}"></s:script>
+    <link href="<s:url value='/styles/prettify.css' encode='false' includeParams='none'/>" rel="stylesheet">
+    <script src="<s:url value='/js/prettify.js' encode='false' includeParams='none'/>"></script>
 
     <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
-    <s:script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></s:script>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
 
     <decorator:head/>
@@ -207,7 +201,6 @@
                         <ul class="dropdown-menu" role="menu">
                             <s:url var="quizBasic" namespace="/validation" action="quizBasic" method="input"/>
                             <s:url var="quizClient" namespace="/validation" action="quizClient" method="input"/>
-                            <s:url var="quizDwr" namespace="/validation" action="quizDwr" method="input"/>
                             <s:url var="quizClientCss" namespace="/validation" action="quizClientCss" method="input"/>
                             <s:url var="fieldValidatorUrl" action="showFieldValidatorsExamples" namespace="/validation"/>
                             <s:url var="nonFieldValidatorUrl" action="showNonFieldValidatorsExamples" namespace="/validation"/>
@@ -223,7 +216,6 @@
                             <li><s:a href="%{storeMessageAcrossRequestExample}">Store across request using MessageStoreInterceptor (Example)</s:a></li>
                             <li><s:a href="%{quizBasic}">Validation (basic)</s:a></li>
                             <li><s:a href="%{quizClient}">Validation (client)</s:a></li>
-                            <li><s:a href="%{quizDwr}">Validation (DWR)</s:a></li>
                             <li><s:a href="%{quizClientCss}">Validation (client using css_xhtml theme)</s:a></li>
                             <li><s:a href="%{visitorValidatorUrl}">Visitor Validator</s:a></li>
                             <li><s:a href="%{ajaxFormSubmitUrl}">AJAX Form Submit</s:a></li>
@@ -243,7 +235,6 @@
                             <li><s:a value="/token/index.html">Token</s:a></li>
                             <li><s:url var="url" namespace="/modelDriven" action="modelDriven"/><s:a
                                     href="%{url}">Model Driven</s:a></li>
-                            <li><s:a value="/async/index.html">Async</s:a></li>
                         </ul>
                     </li>
                     <li class="dropdown">

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -36,8 +36,8 @@
 			    <s:label label="Name" name="name" />
 			    <s:label label="Birthday" name="birthday" />
 			    <tr>
-			        <td class="tdLabel"><label class="label">Wake up time:</label></td>
-			        <td class="tdInput">
+			        <td><label class="label">Wake up time:</label></td>
+			        <td>
 			           <s:date name="wakeup" format="hh:mm aa" />
 			        </td>
 			    </tr>
@@ -50,24 +50,22 @@
 			    <s:label label="State" name="state" />
 			    <s:label label="Picture" name="picture" />
 			    <s:label label="Favourite Language" name="favouriteLanguage" />
-			    <s:label label="Favourite Vehicle Type" name="favouriteVehicalType" />
-			    <s:label label="Favourite Vehicle Specific" name="favouriteVehicalSpecific" />
+			    <s:label label="Favourite Vehical Type" name="favouriteVehicalType" />
+			    <s:label label="Favourite Vehical Specific" name="favouriteVehicalSpecific" />
 			    <tr>
-			        <td class="tdLabel"><label class="label">Favourite Cartoon Characters (Left):</label></td>
-			        <td class="tdInput"><label>
+			        <td><label class="label">Favourite Cartoon Characters (Left):</label></td>
+			        <td>
 			            <s:iterator value="leftSideCartoonCharacters" status="stat">
 			                <s:property value="%{#stat.count}" />.<s:property value="top" />&nbsp;
 			            </s:iterator>
-                                    </label>
 			        </td>
 			    </tr>
 			    <tr>
-			        <td class="tdLabel"><label class="label">Favourite Cartoon Characters (Right):</label></td>
-			        <td class="tdInput"><label>
+			        <td><label class="label">Favourite Cartoon Characters (Right):</label></td>
+			        <td>
 			            <s:iterator value="rightSideCartoonCharacters" status="stat">
 			                <s:property value="%{#stat.count}" />.<s:property value="top" />&nbsp;
 			            </s:iterator>
-                                    </label>
 			        </td>
 			    </tr>
 			    <s:label label="Thoughts" name="thoughts" />

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

@@ -33,45 +33,41 @@
 				#slabel ("label=Name" "name=name")
 				#slabel ("label=Birthday" "name=birthday")
 				<tr>
-			        <td class="tdLabel"><label class="label">Wake up time:</label></td>
-			        <td class="tdInput">
+			        <td><label class="label">Wake up time:</label></td>
+			        <td>
 			           #sdate ("name=wakeup" "format=hh:mm aa")
 			        </td>
 			    </tr>
 				#slabel ("label=Biography" "name=bio")
 				#slabel ("label=Favourite Color" "name=favouriteColor")
 				#slabel ("label=Friends" "name=friends")
-                                #slabel ("label=Best Friend" "name=bestFriend")
 				#slabel ("label=Legal Age" "name=legalAge")
 				#slabel ("label=Region" "name=region")
 				#slabel ("label=State" "name=state")
 				#slabel ("label=Picture" "name=picture")
 				#slabel ("label=Favourite Language" "name=favouriteLanguage")
-				#slabel ("label=Favourite Vehicle Type" "name=favouriteVehicalType")
-				#slabel ("label=Favourite Vehicle Specific" "name=favouriteVehicalSpecific")
+				#slabel ("label=Favourite Vehical Type" "name=favouriteVehicalType")
+				#slabel ("label=Favourite Vehical Specific" "name=favouriteVehicalSpecific")
 				<tr>
-					<td class="tdLabel"><label class="label">Favourite Cartoon Characters (Left):</label></td>
-					<td class="tdInput"><label>
+					<td>Favourite Cartoon Characters (Left):</td>
+					<td>
 			            #set ( $startCount = 1)
 					    #foreach( $item in $leftSideCartoonCharacters)
 							$startCount.${item}&nbsp;
 							#set ( $startCount = $startCount + 1)
 			            #end
-                                          </label>
 					</td>
 				</tr>
 				<tr>
-					<td class="tdLabel"><label class="label">Favourite Cartoon Characters (Right):</label></td>
-					<td class="tdInput"><label>
+					<td>Favourite Cartoon Characters (Right):</td>
+					<td>
 			            #set ( $startCount = 1)
 					    #foreach( $item in $rightSideCartoonCharacters)
 							$startCount.${item}&nbsp;
 							#set ( $startCount = $startCount + 1)
 			            #end
-                                          </label>
 					</td>
 				</tr>
-                                #slabel ("label=Thoughts" "name=thoughts")
 			</table>
 		</div>
 	</div>

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

@@ -110,7 +110,7 @@
 		     <tr>
 		        <td>Non Favourite Sports:</td>
 		        <td>
-		            <s:iterator value="nonFavouriteSports" status="stat">
+		            <s:iterator value="nonfavouriteSports" status="stat">
 		                <s:property value="%{#stat.count}" />.<s:property />&nbsp;
 		            </s:iterator>
 		        </td>

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

@@ -72,7 +72,7 @@
     </div>
 </div>
 
-<s:script type="text/javascript">
+<script type="text/javascript">
 /********************************************************************
  * JS just used on this page.
  * Usually this would be placed in a JS file
@@ -196,6 +196,6 @@ function _handleValidationResult(form, errors) {
 $(window).bind('load', function() {
     $('form').bind('submit', ajaxFormValidation);
 });
-</s:script>
+</script>
 </body>
 </html>

apps/showcase/src/main/webapp/WEB-INF/validation/quiz-dwr.jsp

@@ -1,92 +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.
-*/
--->
-<%@ taglib prefix="s" uri="/struts-tags" %>
-
-<!-- START SNIPPET: dwrValidation -->
-
-<html>
-<head>
-	<title>Struts2 Showcase - Validation - DWR</title>
-	<s:head/>
-	<s:script type='text/javascript' src='../dwr/engine.js'></s:script>
-    <s:script type='text/javascript' src='../dwr/util.js'></s:script>
-	<s:script type='text/javascript' src='../dwr/interface/validator.js'></s:script>
-	<s:script type='text/javascript'>
-        var dwrValidateReply = function(data) {
-            var validationResult = '';
-            for (index = 0; index < data.actionErrors.length; ++index) {
-                validationResult += (data.actionErrors[index] + '. ');
-            }
-            for (index = 0; index < data.actionMessages.length; ++index) {
-                validationResult += (data.actionMessages[index] + '. ');
-            }
-            if (typeof data.fieldErrors.name !== 'undefined') {
-                for (index = 0; index < data.fieldErrors.name.length; ++index) {
-                    validationResult += (data.fieldErrors.name[index] + '. ');
-                }
-            }
-            if (typeof data.fieldErrors.age !== 'undefined') {
-                for (index = 0; index < data.fieldErrors.age.length; ++index) {
-                    validationResult += (data.fieldErrors.age[index] + '. ');
-                }
-            }
-            if (validationResult === '') {
-                $('form').submit();
-            } else {
-                dwr.util.setValue('validationResult', validationResult);
-            }
-        };
-		function dwrFormValidation() {
-            var postData = {};
-            $('form').serializeArray().map(function (x) {
-                postData[x.name] = x.value;
-            });
-            validator.doPost('/validation', 'quizDwr', postData, dwrValidateReply);
-            return false;
-        }
-	</s:script>
-</head>
-
-<body>
-
-<div class="page-header">
-	<h1>DWR validation Example</h1>
-</div>
-
-<div class="container-fluid">
-	<div class="row">
-		<div class="col-md-12">
-
-			<s:form method="post">
-				<s:textfield label="Name" name="name"/>
-				<s:textfield label="Age" name="age"/>
-				<s:textfield label="Favorite color" name="answer"/>
-				<s:submit cssClass="btn btn-primary" onClick="return dwrFormValidation()"/>
-			</s:form>
-			<div id="validationResult" class="errorMessage"></div>
-		</div>
-	</div>
-</div>
-</body>
-</html>
-
-<!-- END SNIPPET: dwrValidation -->
-

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

@@ -64,11 +64,11 @@
 </div>
 
 
-<s:script>
+<script>
 	$('#codeTab a').click(function (e) {
 		e.preventDefault();
 		$(this).tab('show');
 	})
-</s:script>
+</script>
 </body>
 </html>

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

@@ -17,25 +17,13 @@
  * specific language governing permissions and limitations
  * under the License.
 -->
-<web-app id="starter" version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+<web-app id="WebApp_9" version="2.4"
+	xmlns="http://java.sun.com/xml/ns/j2ee" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 
     <display-name>Struts Showcase Application</display-name>
-
-    <context-param>
-        <param-name>org.apache.tiles.definition.DefinitionsFactory.DEFINITIONS_CONFIG</param-name>
-        <param-value>
-            /WEB-INF/tiles.xml
-        </param-value>
-    </context-param>
-
-    <filter>
-        <filter-name>async</filter-name>
-        <filter-class>org.apache.struts2.showcase.async.AsyncFilter</filter-class>
-        <async-supported>true</async-supported>
-    </filter>
-
+	
     <filter>
         <filter-name>struts-prepare</filter-name>
         <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareFilter</filter-class>
@@ -52,11 +40,6 @@
        <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class>
    </filter>
 
-    <filter-mapping>
-        <filter-name>async</filter-name>
-        <url-pattern>/async/*</url-pattern>
-    </filter-mapping>
-
     <filter-mapping>
         <filter-name>struts-prepare</filter-name>
         <url-pattern>/*</url-pattern>
@@ -97,7 +80,7 @@
 
     <servlet>
         <servlet-name>dwr</servlet-name>
-        <servlet-class>org.directwebremoting.servlet.DwrServlet</servlet-class>
+        <servlet-class>uk.ltd.getahead.dwr.DWRServlet</servlet-class>
         <init-param>
             <param-name>debug</param-name>
             <param-value>true</param-value>
@@ -130,13 +113,6 @@
         <load-on-startup>1</load-on-startup>
     </servlet>
 
-    <servlet>
-        <servlet-name>strutsServlet</servlet-name>
-        <servlet-class>org.apache.struts2.dispatcher.servlet.StrutsServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-        <async-supported>true</async-supported>
-    </servlet>
-
     <servlet-mapping>
         <servlet-name>dwr</servlet-name>
         <url-pattern>/dwr/*</url-pattern>
@@ -152,11 +128,6 @@
         <url-pattern>*.vm</url-pattern>
     </servlet-mapping>
 
-    <servlet-mapping>
-        <servlet-name>strutsServlet</servlet-name>
-        <url-pattern>/async/receiveNewMessages</url-pattern>
-    </servlet-mapping>
-
     <!-- END SNIPPET: dwr -->
 
     <!-- SNIPPET START: example.velocity.filter.chain

apps/showcase/src/main/webapp/async/index.html

@@ -1,120 +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.
- */
--->
-<html>
-<head>
-	<title>Struts2 Showcase - Async Example</title>
-	<script>
-        function User () {
-            this.lastIndex = 0;
-            this.sendMessage = function(message) {
-                $.ajax({
-                    async: false,
-                    url: "sendMessage",
-                    data: {
-                        message: message
-                    }
-                });
-            };
-            this.receiveNewMessages = function() {
-                $.ajax({
-                    url: "receiveNewMessages",
-                    context: this,
-                    data: {
-                        lastIndex: this.lastIndex
-                    },
-                    success: function (result) {
-                        if (result != null) {//result is null on timeout
-                            var msgs = $('#msgs');
-                            var messages = msgs.val();
-                            msgs.val(messages + result + '\n');
-                            this.lastIndex += result.length;
-                        }
-                        this.receiveNewMessages();
-                    }
-                });
-            };
-            this.receiveNewMessages();
-        }
-
-        var user;
-        
-        function sendMessage() {
-            var msg = $('#msg');
-            var message = msg.val();
-            if (message.length > 0) {
-                user.sendMessage(message);
-                msg.val('');
-            }
-            return false;
-        }
-
-        $(function() {
-            user = new User();
-        });
-
-	</script>
-</head>
-
-<body>
-<div class="page-header">
-	<h1>Async Example</h1>
-</div>
-
-
-
-<div class="container-fluid">
-	<div class="row">
-		<div class="col-md-12" style="text-align: center;">
-
-			<p>
-				These examples illustrate Struts build in support for async request processing.
-			</p>
-			<p>
-				When you have a process that takes a long time, it can make your app not scalable under heavy load conditions.
-				Scalability limitations include running out of memory or exhausting the pool of container threads.
-				To create scalable web applications, you must ensure that no threads associated with a request
-				are sitting idle, so the container can use them to process new requests.
-				Asynchronous processing refers to assigning these blocking operations to a new thread and returning
-				the thread associated with the request immediately to the container.
-                <br/> Reference: <a href="https://docs.oracle.com/javaee/7/tutorial/servlets012.htm">Asynchronous Processing</a>
-				<br/> An interesting and vital use case for the async request processing is server push.
-				A good solution is to use the Servlet 3.0+ asynchronous feature.
-			</p>
-
-			<br/>
-            <h2>Example: A minimal chat room using server push</h2>
-            <h3>Open current page in different tabs, browsers and computers then send messages.</h3>
-            <h4>This is a minimal chat room which uses server push to retrieve new messages.
-            It doesn't poll the server frequently to check if a new message is available to display.
-            Instead it waits for the server to push back new messages. This approach has two obvious advantages:
-            low-lag communication without requests being sent, and no waste of server resources and network bandwidth.</h4>
-            <h5>Reference: <a href="https://www.javaworld.com/article/2077995/java-concurrency/java-concurrency-asynchronous-processing-support-in-servlet-3-0.html">
-                Asynchronous processing support in Servlet 3.0</a></h5>
-            <textarea id="msgs" cols="40" rows="5" title="messages" readonly></textarea><br/>
-			<form>
-				<input name="msg" id="msg" type="text" title="message" required />
-				<input type="submit" value="Send" onclick="return sendMessage();" />
-			</form>
-		</div>
-	</div>
-</div>
-</body>
-</html>

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

@@ -20,22 +20,11 @@
  */
 package it.org.apache.struts2.showcase;
 
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-
-public class ActionChainingTest {
-    @Test
-    public void test() throws Exception {
-        try (final WebClient webClient = new WebClient()) {
-            final HtmlPage page = webClient.getPage(ParameterUtils.getBaseUrl() + "/actionchaining/actionChain1!input");
-
-            final String pageAsText = page.asText();
-            Assert.assertTrue(pageAsText.contains("Action Chain 1 Property 1: Property Set In Action Chain 1"));
-            Assert.assertTrue(pageAsText.contains("Action Chain 2 Property 1: Property Set in Action Chain 2"));
-            Assert.assertTrue(pageAsText.contains("Action Chain 3 Property 1: Property set in Action Chain 3"));
-        }
+public class ActionChainingTest extends ITBaseTest {
+    public void test() {
+        beginAt("/actionchaining/actionChain1!input");
+        assertTextPresent("Action Chain 1 Property 1: Property Set In Action Chain 1");
+        assertTextPresent("Action Chain 2 Property 1: Property Set in Action Chain 2");
+        assertTextPresent("Action Chain 3 Property 1: Property set in Action Chain 3");
     }
 }

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

@@ -20,20 +20,10 @@
  */
 package it.org.apache.struts2.showcase;
 
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-
-public class ActionTagExampleTest {
-    @Test
-    public void test() throws Exception {
-        try (final WebClient webClient = new WebClient()) {
-            final HtmlPage page = webClient.getPage(ParameterUtils.getBaseUrl() + "/tags/ui/actionTagExample!input.action");
-
-            final String pageAsText = page.asText();
-            Assert.assertTrue(pageAsText.contains("This text is from the called class"));
-        }
+public class ActionTagExampleTest extends ITBaseTest {
+    public void test() {
+        beginAt("/tags/ui/actionTagExample!input.action");
+        assertTextPresent("This text is from the called class");
     }
+
 }

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

@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package it.org.apache.struts2.showcase;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.DomElement;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
-import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
-
-public class AsyncTest {
-    @Test
-    public void testChatRoom() throws Exception {
-        try (final WebClient webClient = new WebClient()) {
-            final HtmlPage page = webClient.getPage(ParameterUtils.getBaseUrl() + "/async/index.html");
-
-            final HtmlForm form = page.getForms().get(0);
-
-            final HtmlTextInput textField = form.getInputByName("msg");
-            textField.type("hello");
-
-            final HtmlSubmitInput button = form.getInputByValue("Send");
-            final HtmlPage page2 = button.click();
-
-            Thread.sleep(4000);
-
-            final DomElement msgs = page2.getElementById("msgs");
-
-            Assert.assertEquals("hello", msgs.asText());
-        }
-    }
-}

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

@@ -20,34 +20,17 @@
  */
 package it.org.apache.struts2.showcase;
 
-import org.junit.Assert;
-import org.junit.Test;
+public class CRUDTest extends ITBaseTest {
+    public void testCreate() {
+        beginAt("/skill/edit.action");
 
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
-import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
+        setTextField("currentSkill.name", "somename1");
+        setTextField("currentSkill.description", "somedescription1");
 
-public class CRUDTest {
-    @Test
-    public void testCreate() throws Exception {
-        try (final WebClient webClient = new WebClient()) {
-            final HtmlPage page = webClient.getPage(ParameterUtils.getBaseUrl() + "/skill/edit.action");
+        submit();
 
-            final HtmlForm form = page.getForms().get(0);
-
-            final HtmlTextInput textField = form.getInputByName("currentSkill.name");
-            textField.type("somename1");
-            final HtmlTextInput textField2 = form.getInputByName("currentSkill.description");
-            textField2.type("somedescription1");
-
-            final HtmlSubmitInput button = form.getInputByValue("Save");
-            final HtmlPage page2 = button.click();
-            final String page2Text = page2.asText();
-
-            Assert.assertTrue(page2Text.contains("somename1"));
-            Assert.assertTrue(page2Text.contains("somedescription1"));
-        }
+        beginAt("/skill/list.action");
+        assertTextPresent("somename1");
+        assertTextPresent("somedescription1");
     }
 }

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

@@ -20,24 +20,12 @@
  */
 package it.org.apache.struts2.showcase;
 
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-
-public class ComponentTagExampleTest {
-    @Test
-    public void test() throws Exception {
-        try (final WebClient webClient = new WebClient()) {
-            final HtmlPage page = webClient
-                    .getPage(ParameterUtils.getBaseUrl() + "/tags/ui/componentTagExample.action");
-
-            final String pageAsText = page.asText();
-            Assert.assertTrue(pageAsText.contains("Freemarker Custom Template - parameter 'paramName' - paramValue1"));
-            Assert.assertTrue(pageAsText.contains("Freemarker Custom Template - parameter 'paramName' - paramValue4"));
-            Assert.assertTrue(pageAsText.contains("JSP Custom Template - parameter 'paramName' - paramValue2"));
-            Assert.assertTrue(pageAsText.contains("JSP Custom Template - parameter 'paramName' - paramValue3"));
-        }
+public class ComponentTagExampleTest extends ITBaseTest {
+    public void test() {
+        beginAt("/tags/ui/componentTagExample.jsp");
+        assertTextPresent("Freemarker Custom Template - parameter 'paramName' - paramValue1");
+        assertTextPresent("Freemarker Custom Template - parameter 'paramName' - paramValue4");
+        assertTextPresent("JSP Custom Template - parameter 'paramName' - paramValue2");
+        assertTextPresent("JSP Custom Template - parameter 'paramName' - paramValue3");
     }
 }

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

@@ -20,82 +20,48 @@
  */
 package it.org.apache.struts2.showcase;
 
-import org.junit.Assert;
-import org.junit.Test;
+public class ConversionTest extends ITBaseTest {
+    public void testList() {
+        beginAt("/conversion/enterPersonsInfo.action");
+        setTextField("persons[0].name", "name0");
+        setTextField("persons[0].age", "0");
+        setTextField("persons[1].name", "name1");
+        setTextField("persons[1].age", "1");
+        setTextField("persons[2].name", "name2");
+        setTextField("persons[2].age", "2");
 
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
+        submit();
 
-public class ConversionTest {
-    @Test
-    public void testList() throws Exception {
-        try (final WebClient webClient = new WebClient()) {
-            final HtmlPage page = webClient
-                    .getPage(ParameterUtils.getBaseUrl() + "/conversion/enterPersonsInfo.action");
-
-            final HtmlForm form = page.getForms().get(0);
-
-            form.getInputByName("persons[0].name").type("name0");
-            form.getInputByName("persons[0].age").type("0");
-            form.getInputByName("persons[1].name").type("name1");
-            form.getInputByName("persons[1].age").type("1");
-            form.getInputByName("persons[2].name").type("name2");
-            form.getInputByName("persons[2].age").type("2");
-
-            final HtmlSubmitInput button = form.getInputByValue("Submit");
-            final HtmlPage page2 = button.click();
-            final String page2Text = page2.asText();
-
-            Assert.assertTrue(page2Text.contains("SET 0 Name: name0"));
-            Assert.assertTrue(page2Text.contains("SET 0 Age: 0"));
-            Assert.assertTrue(page2Text.contains("SET 1 Name: name1"));
-            Assert.assertTrue(page2Text.contains("SET 1 Age: 1"));
-            Assert.assertTrue(page2Text.contains("SET 2 Name: name2"));
-            Assert.assertTrue(page2Text.contains("SET 2 Age: 2"));
-        }
+        assertTextPresent("SET 0 Name: name0");
+        assertTextPresent("SET 0 Age: 0");
+        assertTextPresent("SET 1 Name: name1");
+        assertTextPresent("SET 1 Age: 1");
+        assertTextPresent("SET 2 Name: name2");
+        assertTextPresent("SET 2 Age: 2");
     }
 
-    @Test
-    public void testSet() throws Exception {
-        try (final WebClient webClient = new WebClient()) {
-            final HtmlPage page = webClient
-                    .getPage(ParameterUtils.getBaseUrl() + "/conversion/enterAddressesInfo.action");
+    public void testSet() {
+        beginAt("/conversion/enterAddressesInfo.action");
+        setTextField("addresses('id0').address", "address0");
+        setTextField("addresses('id1').address", "address1");
+        setTextField("addresses('id2').address", "address2");
 
-            final HtmlForm form = page.getForms().get(0);
+        submit();
 
-            form.getInputByName("addresses('id0').address").type("address0");
-            form.getInputByName("addresses('id1').address").type("address1");
-            form.getInputByName("addresses('id2').address").type("address2");
-
-            final HtmlSubmitInput button = form.getInputByValue("Submit");
-            final HtmlPage page2 = button.click();
-            final String page2Text = page2.asText();
-
-            Assert.assertTrue(page2Text.contains("id0 -> address0"));
-            Assert.assertTrue(page2Text.contains("id1 -> address1"));
-            Assert.assertTrue(page2Text.contains("id2 -> address2"));
-        }
+        assertTextPresent("id0 -> address0");
+        assertTextPresent("id1 -> address1");
+        assertTextPresent("id2 -> address2");
     }
 
-    @Test
-    public void testEnum() throws Exception {
-        try (final WebClient webClient = new WebClient()) {
-            final HtmlPage page = webClient
-                    .getPage(ParameterUtils.getBaseUrl() + "/conversion/enterOperationEnumInfo.action");
+    public void testEnum() {
+        beginAt("/conversion/enterOperationEnumInfo.action");
+        checkCheckbox("selectedOperations", "ADD");
+        checkCheckbox("selectedOperations", "MINUS");
 
-            final HtmlForm form = page.getForms().get(0);
+        submit();
 
-            form.getInputByValue("ADD").setChecked(true);
-            form.getInputByValue("MINUS").setChecked(true);
-
-            final HtmlSubmitInput button = form.getInputByValue("Submit");
-            final HtmlPage page2 = button.click();
-            final String page2Text = page2.asText();
-
-            Assert.assertTrue(page2Text.contains("ADD"));
-            Assert.assertTrue(page2Text.contains("MINUS"));
-        }
+        assertTextPresent("ADD");
+        assertTextPresent("MINUS");        
     }
 }
+

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

@@ -20,35 +20,16 @@
  */
 package it.org.apache.struts2.showcase;
 
-import org.junit.Assert;
-import org.junit.Test;
+public class ExecAndWaitTest extends ITBaseTest {
+    public void testNodelay() throws InterruptedException {
+        beginAt("/wait/example1.jsp");
 
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
-import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
+        setTextField("time", "7000");
+        submit();
+        assertTextPresent("We are processing your request. Please wait.");
 
-public class ExecAndWaitTest {
-    @Test
-    public void testNodelay() throws Exception {
-        try (final WebClient webClient = new WebClient()) {
-            final HtmlPage page = webClient.getPage(ParameterUtils.getBaseUrl() + "/wait/example1.action");
-
-            final HtmlForm form = page.getForms().get(0);
-
-            final HtmlTextInput textField = form.getInputByName("time");
-            textField.type("7000");
-
-            final HtmlSubmitInput button = form.getInputByValue("submit");
-            final HtmlPage page2 = button.click();
-
-            Assert.assertTrue(page2.asText().contains("We are processing your request. Please wait."));
-
-            // hit it again
-            final HtmlPage page3 = webClient
-                    .getPage(ParameterUtils.getBaseUrl() + "/wait/longProcess1.action?time=1000");
-            Assert.assertTrue(page3.asText().contains("We are processing your request. Please wait."));
-        }
+        //hit it again
+        beginAt("/wait/longProcess1.action?time=1000");
+        assertTextPresent("We are processing your request. Please wait.");
     }
 }

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

@@ -20,50 +20,21 @@
  */
 package it.org.apache.struts2.showcase;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.net.URL;
+import java.net.MalformedURLException;
 
-import org.junit.Assert;
-import org.junit.Test;
+public class FileDownloadTest extends ITBaseTest {
+    public void testImage() throws InterruptedException, MalformedURLException {
+        beginAt("/filedownload/download.action");
 
-import com.gargoylesoftware.htmlunit.Page;
-import com.gargoylesoftware.htmlunit.WebClient;
-
-public class FileDownloadTest {
-    @Test
-    public void testImage() throws Exception {
-        try (final WebClient webClient = new WebClient()) {
-            final Page page = webClient.getPage(ParameterUtils.getBaseUrl() + "/filedownload/download.action");
-
-            URL url = new URL(
-                    "https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=apps/showcase/src/main/webapp/images/struts.gif;hb=HEAD");
-
-            Assert.assertTrue(areFilesEqual(url.openStream(), page.getWebResponse().getContentAsStream()));
-        }
+        URL url = new URL("http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/showcase/src/main/webapp/images/struts.gif");
+        assertDownloadedFileEquals(url);
     }
 
-    public void testZip() throws Exception {
-        try (final WebClient webClient = new WebClient()) {
-            final Page page = webClient.getPage(ParameterUtils.getBaseUrl() + "/filedownload/download2.action");
+     public void testZip() throws InterruptedException, MalformedURLException {
+        beginAt("/filedownload/download2.action");
 
-            URL url = new URL(
-                    "https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=apps/showcase/src/main/webapp/images/struts-gif.zip;hb=HEAD");
-
-            Assert.assertTrue(areFilesEqual(url.openStream(), page.getWebResponse().getContentAsStream()));
-        }
-    }
-
-    private boolean areFilesEqual(InputStream i1, InputStream i2) throws IOException {
-        // read and compare bytes pair-wise
-        int b1, b2;
-        do {
-            b1 = i1.read();
-            b2 = i2.read();
-        } while (b1 == b2 && b1 != -1 && b2 != -1);
-        i1.close();
-        i2.close();
-        // true only if end of file is reached for both
-        return (b1 == -1) && (b2 == -1);
+        URL url = new URL("http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/showcase/src/main/webapp/images/struts-gif.zip");
+        assertDownloadedFileEquals(url);
     }
 }

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

@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package it.org.apache.struts2.showcase;
-
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.DomElement;
-import com.gargoylesoftware.htmlunit.html.HtmlFileInput;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlInput;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.io.File;
-
-public class FileUploadTest {
-
-    @Test
-    public void testEmptyFile() throws Exception {
-        try (final WebClient webClient = new WebClient()) {
-            final HtmlPage page = webClient.getPage(ParameterUtils.getBaseUrl() + "/fileupload/doUpload.action");
-            final HtmlForm form = page.getFormByName("doUpload");
-            HtmlInput captionInput = form.getInputByName("caption");
-            HtmlFileInput uploadInput = form.getInputByName("upload");
-            captionInput.type("some caption");
-            File tempFile = File.createTempFile("testEmptyFile", ".tmp");
-            tempFile.deleteOnExit();
-            uploadInput.setValueAttribute(tempFile.getAbsolutePath());
-            final HtmlSubmitInput button = form.getInputByValue("Submit");
-            final HtmlPage resultPage = button.click();
-            DomElement errorMessage = resultPage.getFirstByXPath("//span[@class='errorMessage']");
-            Assert.assertNotNull(errorMessage);
-            Assert.assertEquals("File cannot be empty", errorMessage.getVisibleText());
-        }
-    }
-
-}

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

@@ -20,40 +20,25 @@
  */
 package it.org.apache.struts2.showcase;
 
-import org.junit.Assert;
-import org.junit.Test;
+import java.net.MalformedURLException;
+import java.net.URL;
 
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.DomElement;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+public class FreeMarkerManagerTest extends ITBaseTest {
+    public void testCustomManager() {
+        beginAt("/freemarker/customFreemarkerManagerDemo.action");
 
-public class FreeMarkerManagerTest {
-    @Test
-    public void testCustomManager() throws Exception {
-        try (final WebClient webClient = new WebClient()) {
-            final HtmlPage page = webClient
-                    .getPage(ParameterUtils.getBaseUrl() + "/freemarker/customFreemarkerManagerDemo.action");
+        String date = getElementTextByXPath("//*[@id='todaysDate']");
+        assertNotNull(date);
+        assertTrue(date.length() > 0);
 
-            final DomElement date = page.getElementById("todaysDate");
-            Assert.assertNotNull(date);
-            Assert.assertTrue(date.asText().length() > 0);
-
-            final DomElement time = page.getElementById("timeNow");
-            Assert.assertNotNull(time);
-            Assert.assertTrue(time.asText().length() > 0);
-        }
+        String time = getElementTextByXPath("//*[@id='timeNow']");
+        assertNotNull(time);
+        assertTrue(time.length() > 0);
     }
 
-    @Test
-    public void testTags() throws Exception {
-        try (final WebClient webClient = new WebClient()) {
-            final HtmlPage page = webClient.getPage(ParameterUtils.getBaseUrl() + "/freemarker/standardTags.action");
-
-            final DomElement date = page.getElementById("test_name");
-            Assert.assertNotNull(date);
-
-            final DomElement time = page.getElementById("test");
-            Assert.assertNotNull(time);
-        }
+    public void testTags() {
+        beginAt("/freemarker/standardTags.action");
+        assertElementPresent("test_name");
+        assertElementPresent("test_");
     }
 }

apps/showcase/src/test/java/it/org/apache/struts2/showcase/ITBaseTest.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
@@ -16,16 +18,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.action;
+package it.org.apache.struts2.showcase;
 
-import javax.servlet.ServletContext;
+import net.sourceforge.jwebunit.junit.WebTestCase;
 
-/**
- * For components that have a dependence on the Servlet context.
- *
- * @since 2.6
- */
-public interface ServletContextAware {
+public abstract class ITBaseTest extends WebTestCase {
 
-    void withServletContext(ServletContext context);
+    public void setUp() throws Exception {
+        getTestContext().setBaseUrl(ParameterUtils.getBaseUrl());
+    }
 }

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

@@ -20,56 +20,36 @@
  */
 package it.org.apache.struts2.showcase;
 
-import org.junit.Assert;
-import org.junit.Test;
+public class UITagExampleTest extends ITBaseTest {
+    public void testInputForm() {
+        setScriptingEnabled(false);
+        beginAt("/tags/ui/example!input.action");
+        assertFormPresent("exampleSubmit");
+        // text box
+        assertFormElementPresent("name");
+        // textarea
+        assertFormElementPresent("bio");
+        // select
+        assertFormElementPresent("favouriteColor");
+        // checkbox list
+        assertFormElementPresent("friends");
+        // checkbox
+        assertFormElementPresent("legalAge");
 
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlSelect;
-import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
-import com.gargoylesoftware.htmlunit.html.HtmlTextArea;
-import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
+        // set fields
+        setTextField("name", "name");
+        setTextField("bio", "bio");
+        selectOption("favouriteColor", "Red");
+        checkCheckbox("friends", "Patrick");
+        checkCheckbox("friends", "Jason");
+        checkCheckbox("legalAge");
 
-public class UITagExampleTest {
-    @Test
-    public void testInputForm() throws Exception {
-        try (final WebClient webClient = new WebClient()) {
-            final HtmlPage page = webClient.getPage(ParameterUtils.getBaseUrl() + "/tags/ui/example!input.action");
+        submit();
 
-            final HtmlForm form = page.getFormByName("exampleSubmit");
-            Assert.assertNotNull(form);
-
-            final HtmlTextInput textField = form.getInputByName("name");
-            final HtmlTextArea textField2 = form.getTextAreaByName("bio");
-            final HtmlSelect textField3 = form.getSelectByName("favouriteColor");
-            final HtmlCheckBoxInput textField4 = form.getInputByValue("Patrick");
-            final HtmlCheckBoxInput textField41 = form.getInputByValue("Jason");
-            final HtmlCheckBoxInput textField5 = form.getInputByName("legalAge");
-
-            Assert.assertNotNull(textField);
-            Assert.assertNotNull(textField2);
-            Assert.assertNotNull(textField3);
-            Assert.assertNotNull(textField4);
-            Assert.assertNotNull(textField41);
-            Assert.assertNotNull(textField5);
-
-            textField.type("name");
-            textField2.type("bio");
-            textField3.setSelectedAttribute("Red", true);
-            textField4.setChecked(true);
-            textField41.setChecked(true);
-            textField5.setChecked(true);
-
-            final HtmlSubmitInput button = form.getInputByValue("Submit");
-            final HtmlPage page2 = button.click();
-
-            Assert.assertEquals("name", page2.getElementById("name").asText());
-            Assert.assertEquals("bio", page2.getElementById("bio").asText());
-            Assert.assertEquals("Red", page2.getElementById("favouriteColor").asText());
-            Assert.assertEquals("[Patrick, Jason]", page2.getElementById("friends").asText());
-            Assert.assertEquals("true", page2.getElementById("legalAge").asText());
-        }
+        assertTextInElement("name", "name");
+        assertTextInElement("bio", "bio");
+        assertTextInElement("favouriteColor", "Red");
+        assertTextInElement("friends", "[Patrick, Jason]");
+        assertTextInElement("legalAge", "true");
     }
 }

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

@@ -20,44 +20,27 @@
  */
 package it.org.apache.struts2.showcase;
 
-import org.junit.Assert;
-import org.junit.Test;
+public class ValidationTest extends ITBaseTest {
+    public void testFieldValidators() {
+        beginAt("/validation/showFieldValidatorsExamples.action");
 
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
+        setTextField("integerValidatorField", "nonint");
+        setTextField("dateValidatorField", "nondate");
+        setTextField("emailValidatorField", "!@@#%");
+        setTextField("urlValidatorField", "!@@#%");
+        setTextField("stringLengthValidatorField", "a");
+        setTextField("regexValidatorField", "abc");
+        setTextField("fieldExpressionValidatorField", "abc");
 
-public class ValidationTest {
-    @Test
-    public void testFieldValidators() throws Exception {
-        try (final WebClient webClient = new WebClient()) {
-            final HtmlPage page = webClient
-                    .getPage(ParameterUtils.getBaseUrl() + "/validation/showFieldValidatorsExamples.action");
+        submit();
 
-            final HtmlForm form = page.getForms().get(0);
-
-            form.getInputByName("integerValidatorField").type("nonint");
-            form.getInputByName("dateValidatorField").type("nondate");
-            form.getInputByName("emailValidatorField").type("!@@#%");
-            form.getInputByName("urlValidatorField").type("!@@#%");
-            form.getInputByName("stringLengthValidatorField").type("a");
-            form.getInputByName("regexValidatorField").type("abc");
-            form.getInputByName("fieldExpressionValidatorField").type("abc");
-
-            final HtmlSubmitInput button = form.getInputByValue("Submit");
-            final HtmlPage page2 = button.click();
-            final String page2Text = page2.asText();
-
-            Assert.assertTrue(page2Text.contains("Invalid field value for field \"dateValidatorField\""));
-            Assert.assertTrue(page2Text.contains("Invalid field value for field \"integerValidatorField\""));
-            Assert.assertTrue(page2Text.contains("required and must be string"));
-            Assert.assertTrue(page2Text.contains("must be a valid email if supplied"));
-            Assert.assertTrue(page2Text.contains("must be a valid url if supplied"));
-            Assert.assertTrue(
-                    page2Text.contains("must be a String of a specific greater than 1 less than 5 if specified"));
-            Assert.assertTrue(page2Text.contains("regexValidatorField must match a regexp (.*\\.txt) if specified"));
-            Assert.assertTrue(page2Text.contains("must be the same as the Required Validator Field if specified"));
-        }
+        assertTextPresent("Invalid field value for field \"dateValidatorField\"");
+        assertTextPresent("Invalid field value for field \"integerValidatorField\"");
+        assertTextPresent("required and must be string");
+        assertTextPresent("must be a valid email if supplied");
+        assertTextPresent("must be a valid url if supplied ");
+        assertTextPresent("must be a String of a specific greater than 1 less than 5 if specified ");
+        assertTextPresent("regexValidatorField must match a regexp (.*\\.txt) if specified ");
+        assertTextPresent("must be the same as the Required Validator Field if specified ");
     }
 }

apps/showcase/src/test/java/it/org/apache/struts2/showcase/staticcontent/StaticContentTest.java

@@ -16,40 +16,37 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package it.org.apache.struts2.showcase;
+package it.org.apache.struts2.showcase.staticcontent;
 
-import org.junit.Assert;
-import org.junit.Test;
+import it.org.apache.struts2.showcase.ITBaseTest;
 
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-import com.gargoylesoftware.htmlunit.WebClient;
+import java.io.IOException;
 
-public class StaticContentTest {
+import net.sourceforge.jwebunit.exception.TestingEngineResponseException;
 
-    @Test
-    public void testInvalidRersources1() throws Exception {
-        try (final WebClient webClient = new WebClient()) {
-            try {
-                webClient.getPage(ParameterUtils.getBaseUrl() + "/struts..");
-                Assert.fail("Previous request should have failed");
-            } catch (FailingHttpStatusCodeException e) {
-            }
+public class StaticContentTest extends ITBaseTest {
+
+    public void testInvalidRersources1() throws IOException {
+        try {
+            beginAt("/struts..");
+            fail("Previous request should have failed");
+        } catch (TestingEngineResponseException ex) {
+            // ok
         }
     }
 
-    public void testInvalidRersources2() throws Exception {
-        try (final WebClient webClient = new WebClient()) {
-            try {
-                webClient.getPage(ParameterUtils.getBaseUrl() + "/static/..%252f");
-                Assert.fail("Previous request should have failed");
-            } catch (FailingHttpStatusCodeException e) {
-            }
+    public void testInvalidRersources2() throws IOException {
+        try {
+            beginAt("/struts/..%252f");
+            fail("Previous request should have failed");
+        } catch (TestingEngineResponseException ex) {
+            // ok
         }
     }
 
     /*public void testInvalidRersources3() throws IOException {
         try {
-            beginAt("/static/..%252f..%252f..%252fWEB-INF/classes/org/apache/struts2/showcase/action/EmployeeAction.class/");
+            beginAt("/struts/..%252f..%252f..%252fWEB-INF/classes/org/apache/struts2/showcase/action/EmployeeAction.class/");
             fail("Previous request should have failed");
         } catch (TestingEngineResponseException ex) {
             // ok

assembly/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>2.5.21</version>
     </parent>
 
     <artifactId>struts2-assembly</artifactId>
@@ -204,6 +204,11 @@
             <artifactId>struts2-rest-plugin</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-sitegraph-plugin</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-sitemesh-plugin</artifactId>

assembly/src/main/assembly/all.xml

@@ -193,6 +193,10 @@
         <directory>../plugins/rest/target/apidocs</directory>
         <outputDirectory>docs/struts2-plugins/struts2-rest-plugin/apidocs</outputDirectory>
       </fileSet>
+      <fileSet>
+        <directory>../plugins/sitegraph/target/apidocs</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-sitegraph-plugin/apidocs</outputDirectory>
+      </fileSet>
       <fileSet>
         <directory>../plugins/sitemesh/target/apidocs</directory>
         <outputDirectory>docs/struts2-plugins/struts2-sitemesh-plugin/apidocs</outputDirectory>
@@ -209,10 +213,6 @@
         <directory>../plugins/tiles/target/apidocs</directory>
         <outputDirectory>docs/struts2-plugins/struts2-tiles-plugin/apidocs</outputDirectory>
       </fileSet>
-      <fileSet>
-        <directory>../plugins/velocity/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-velocity-plugin/apidocs</outputDirectory>
-      </fileSet>
 
     <!-- bundles -->
     <fileSet>

assembly/src/main/assembly/docs.xml

@@ -128,6 +128,10 @@
             <directory>../plugins/rest/target/apidocs</directory>
             <outputDirectory>docs/struts2-plugins/struts2-rest-plugin/apidocs</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>../plugins/sitegraph/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-sitegraph-plugin/apidocs</outputDirectory>
+        </fileSet>
         <fileSet>
             <directory>../plugins/sitemesh/target/apidocs</directory>
             <outputDirectory>docs/struts2-plugins/struts2-sitemesh-plugin/apidocs</outputDirectory>

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

@@ -38,8 +38,9 @@
         <include>org.apache.commons:commons-lang3</include>
         <include>org.apache.logging.log4j:log4j-api</include>
         <include>ognl:ognl</include>
+        <include>org.javassist:javassist</include>
         <include>commons-fileupload:commons-fileupload</include>
-        <include>org.apache.commons:commons-io</include>
+        <include>commons-io:commons-io</include>
       </includes>
     </dependencySet>
   </dependencySets>

assembly/src/main/resources/NOTICE.txt

@@ -11,6 +11,7 @@ ANTLR (http://www.antlr.org/).
 Classworlds (http://classworlds.codehaus.org/).
 EZMorph (http://ezmorph.sourceforge.net/)
 FreeMarker (http://freemarker.org/).
+JSON-lib (http://json-lib.sourceforge.net/).
 OGNL (http://www.opensymphony.com/ognl/).
 Plexus (http://plexus.codehaus.org/).
 SiteMesh (http://www.opensymphony.com/sitemesh/).

bom/pom.xml

@@ -25,11 +25,12 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts-master</artifactId>
-        <version>14</version>
+        <version>9</version>
+        <relativePath>../struts-master</relativePath>
     </parent>
 
     <artifactId>struts2-bom</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>2.5.21</version>
     <packaging>pom</packaging>
 
     <name>Struts 2 Bill of Materials</name>
@@ -44,7 +45,7 @@
     </licenses>
 
     <properties>
-        <struts-version.version>6.0.0-SNAPSHOT</struts-version.version>
+        <struts-version.version>2.5.21</struts-version.version>
         <maven.site.skip>true</maven.site.skip>
         <maven.site.deploy.skip>true</maven.site.deploy.skip>
     </properties>
@@ -151,6 +152,11 @@
                 <artifactId>struts2-rest-plugin</artifactId>
                 <version>${struts-version.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-sitegraph-plugin</artifactId>
+                <version>${struts-version.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts2-sitemesh-plugin</artifactId>
@@ -175,9 +181,6 @@
     </dependencyManagement>
 
   <scm>
-    <tag>HEAD</tag>
-    <connection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</connection>
-    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</developerConnection>
-    <url>https://github.com/apache/struts/</url>
+    <tag>STRUTS_2_5_21</tag>
   </scm>
 </project>

bundles/admin/pom.xml

@@ -24,12 +24,12 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-osgi-bundles</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>2.5.21</version>
     </parent>
 
     <artifactId>struts2-osgi-admin-bundle</artifactId>
     <packaging>bundle</packaging>
-    <name>DEPRECATED: Struts 2 OSGi Admin Bundle - since 2.6</name>
+    <name>Struts 2 OSGi Admin Bundle</name>
 
     <dependencies>
         <dependency>
@@ -37,7 +37,7 @@
             <artifactId>struts2-osgi-plugin</artifactId>
         </dependency>
     </dependencies>
-
+   
     <build>
         <plugins>
             <plugin>
@@ -48,7 +48,7 @@
                     <instructions>
                         <manifestLocation>META-INF</manifestLocation>
                         <Struts2-Enabled>true</Struts2-Enabled>
-                        <Import-Package>*</Import-Package>
+                        <Import-Package>*,com.opensymphony.xwork2</Import-Package>
                         <Export-Package>org.apache.struts2.osgi.admin*</Export-Package>
                         <Spring-Context>*;create-asynchronously:=false</Spring-Context>
                     </instructions>

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

@@ -28,7 +28,7 @@ import com.opensymphony.xwork2.inject.Inject;
 import org.apache.struts2.osgi.BundleAccessor;
 import org.apache.struts2.osgi.host.OsgiHost;
 import org.apache.struts2.osgi.StrutsOsgiListener;
-import org.apache.struts2.action.ServletContextAware;
+import org.apache.struts2.util.ServletContextAware;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
 
@@ -60,9 +60,6 @@ public class BundlesAction extends ActionSupport implements ServletContextAware
     }
 
     public String start() throws BundleException {
-        clearErrorsAndMessages();
-        addActionMessage("Start - OSGi Host: " + osgiHost + ", ID: " + id);
-
         Bundle bundle = osgiHost.getBundles().get(id);
         try {
             bundle.start();
@@ -72,35 +69,29 @@ public class BundlesAction extends ActionSupport implements ServletContextAware
             //there no easy way/elegant way to know if the bundle was processed already
             Thread.sleep(1000);
         } catch (Exception e) {
-            addActionError("Exception: " + e.toString() + " (" + e.getMessage() + ")");
+            addActionError(e.toString());
         }
 
         return view();
     }
 
     public String stop() throws BundleException {
-        clearErrorsAndMessages();
-        addActionMessage("Stop - OSGi Host: " + osgiHost + ", ID: " + id);
-
         Bundle bundle = osgiHost.getBundles().get(id);
         try {
             bundle.stop();
         } catch (Exception e) {
-            addActionError("Exception: " + e.toString() + " (" + e.getMessage() + ")");
+            addActionError(e.toString());
         }
 
         return view();
     }
 
     public String update() throws BundleException {
-        clearErrorsAndMessages();
-        addActionMessage("Update - OSGi Host: " + osgiHost + ", ID: " + id);
-
         Bundle bundle = osgiHost.getBundles().get(id);
         try {
             bundle.update();
         } catch (Exception e) {
-            addActionError("Exception: " + e.toString() + " (" + e.getMessage() + ")");
+            addActionError(e.toString());
         }
 
         return view();
@@ -123,14 +114,14 @@ public class BundlesAction extends ActionSupport implements ServletContextAware
     }
 
     public List<PackageConfig> getPackages() {
-        List<PackageConfig> pkgs = new ArrayList<>();
+        List<PackageConfig> pkgs = new ArrayList<PackageConfig>();
         Bundle bundle = getBundle();
         if (bundle.getState() == Bundle.ACTIVE) {
-            bundleAccessor.getPackagesByBundle(bundle).stream().map(
-                    name -> configuration.getPackageConfig(name)).filter(
-                            packageConfig -> (packageConfig != null)).forEachOrdered(packageConfig -> {
-                                pkgs.add(packageConfig);
-                            });
+            for (String name : bundleAccessor.getPackagesByBundle(bundle)) {
+                PackageConfig packageConfig = configuration.getPackageConfig(name);
+                if (packageConfig != null)
+                    pkgs.add(packageConfig);
+            }
         }
         return pkgs;
     }
@@ -141,14 +132,16 @@ public class BundlesAction extends ActionSupport implements ServletContextAware
 
     public Collection<Bundle> getBundles() {
         List<Bundle> bundles = new ArrayList(osgiHost.getBundles().values());
-        Collections.sort(bundles, (Bundle bundle1, Bundle bundle2) -> {
-            boolean bundle1StrutsEnabled = isStrutsEnabled(bundle1);
-            boolean bundle2StrutsEnabled = isStrutsEnabled(bundle2);
+        Collections.sort(bundles, new Comparator<Bundle>() {
+            public int compare(Bundle bundle1, Bundle bundle2) {
+                boolean bundle1StrutsEnabled = isStrutsEnabled(bundle1);
+                boolean bundle2StrutsEnabled = isStrutsEnabled(bundle2);
 
-            if ((bundle1StrutsEnabled && bundle2StrutsEnabled) || (!bundle1StrutsEnabled && !bundle2StrutsEnabled)) {
-                return bundle1.getSymbolicName().compareTo(bundle2.getSymbolicName());
-            } else {
-                return bundle1StrutsEnabled ? -1 : 1;
+                if ((bundle1StrutsEnabled && bundle2StrutsEnabled) || (!bundle1StrutsEnabled && !bundle2StrutsEnabled))
+                    return bundle1.getSymbolicName().compareTo(bundle2.getSymbolicName());
+                else {
+                    return bundle1StrutsEnabled ? -1 : 1;
+                }
             }
         });
         return bundles;
@@ -179,21 +172,17 @@ public class BundlesAction extends ActionSupport implements ServletContextAware
         try {
             state = bundle.getState();
         } catch (Exception e) {
-            addActionError("Unable to determine bundle state.  Exception: " + e.toString() + " (" + e.getMessage() + ")");
+            addActionError("Unable to determine bundle state: " + e.getMessage());
             return false;
         }
 
-        if (val != null) {
-            switch (val) {
-                case "start":
-                    return state == Bundle.RESOLVED;
-                case "stop":
-                    return state == Bundle.ACTIVE;
-                case "update":
-                    return state == Bundle.ACTIVE || state == Bundle.INSTALLED || state == Bundle.RESOLVED;
-                default:
-                    break;
-            }
+        if ("start".equals(val)) {
+            return state == Bundle.RESOLVED;
+        } else if ("stop".equals(val)) {
+            return state == Bundle.ACTIVE;
+        } else if ("update".equals(val)) {
+            return state == Bundle.ACTIVE || state == Bundle.INSTALLED
+                    || state == Bundle.RESOLVED;
         }
         throw new IllegalArgumentException("Invalid state");
     }
@@ -208,8 +197,7 @@ public class BundlesAction extends ActionSupport implements ServletContextAware
         this.bundleAccessor = bundleAccessor;
     }
 
-    @Override
-    public void withServletContext(ServletContext servletContext) {
+    public void setServletContext(ServletContext servletContext) {
         osgiHost = (OsgiHost) servletContext.getAttribute(StrutsOsgiListener.OSGI_HOST);
     }
 }

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

@@ -24,29 +24,20 @@ package org.apache.struts2.osgi.admin.actions;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 
-import org.apache.felix.shell.ShellService;
 import org.apache.struts2.osgi.DefaultBundleAccessor;
-import org.apache.struts2.osgi.interceptor.BundleContextAware;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
+import org.apache.felix.shell.ShellService;
 import org.osgi.framework.ServiceReference;
 
 import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.ActionSupport;
 
 /**
- * This action executes commands on the Felix Shell.
- * 
- * The action is BundleContextAware so that if the OSGi interceptor is used the BundleContext
- * can be provided for configurations where the DefaultBundleAccessor is insufficient.
- * 
+ * This action executes commands on the Felix Shell
  */
-public class ShellAction extends ActionSupport implements BundleContextAware {
+public class ShellAction extends ActionSupport {
     private String command;
     private String output;
-    private BundleContext bundleContext;
 
-    @Override
     public String execute() {
         // get service
         ByteArrayOutputStream outByteStream = new ByteArrayOutputStream();
@@ -61,9 +52,7 @@ public class ShellAction extends ActionSupport implements BundleContextAware {
             outString = outByteStream.toString().trim();
             errString = errByteStream.toString().trim();
         } catch (Exception e) {
-            outString = outByteStream.toString().trim();
-            errString = "Exception: " + e.toString() + " (" + e.getMessage() + ").  Output:" + outString +
-                        ".  Error: " + errByteStream.toString().trim();  // Full details for troubleshooting.
+            errString = e.getMessage();
         } finally {
             outStream.close();
             errStream.close();
@@ -86,59 +75,17 @@ public class ShellAction extends ActionSupport implements BundleContextAware {
     }
 
     public void executeCommand(String commandLine, PrintStream out, PrintStream err) throws Exception {
-        ShellService shellService = getShellService(out);
-        if (shellService != null) {
-            out.println("Attempting to execute command: " + commandLine);
+        ShellService shellService = getShellService();
+        if (shellService != null)
             shellService.executeCommand(commandLine, out, err);
-        }
-        else {
+        else
             err.println("Apache Felix Shell service is not installed");
-        }
     }
 
-    private ShellService getShellService(PrintStream out) {
+    private ShellService getShellService() {
         //bundle can be de-activated, so keeping a reference aorund is not a good idea
-        final DefaultBundleAccessor bundleAccessor = DefaultBundleAccessor.getInstance();
-        ServiceReference ref = (bundleAccessor != null ? bundleAccessor.getServiceReference(ShellService.class.getName()) : null);
-        //out.println("DefaultBundleAccessor: "  + bundleAcessor + ", ServiceReference [" + ShellService.class.getName() + "]: " + ref);  // No logger, for debugging only.
-
-        if (ref == null && this.bundleContext != null) {
-            // Depending on OSGi and Felix bundle configurations, the DefaultBundleAccessor may not be able to locate the ShellService.
-            // In such cases, use the bundleContext (if available) to locate the ShellService in a "brute-force" manner.
-            final Bundle[] bundles = this.bundleContext.getBundles();
-            if (bundles != null && bundles.length > 0) {
-                for (Bundle currentBundle : bundles) {
-                    if (currentBundle != null) {
-                        //out.println("Bundle [" + index + "], SymbolicName: " + currentBundle.getSymbolicName() + ", Location: " + currentBundle.getLocation() + ", BundleID: " + currentBundle.getBundleId());  // No logger, for debugging only.
-                        if (currentBundle.getSymbolicName().startsWith("org.apache.felix.shell")) {
-                            BundleContext currentBundleContext = currentBundle.getBundleContext();
-                            Object directShellServiceByClass = (currentBundleContext != null ? currentBundleContext.getServiceReference(org.apache.felix.shell.ShellService.class) : null);
-                            Object directShellServiceByName = (currentBundleContext != null ? currentBundleContext.getServiceReference("org.apache.felix.shell.ShellService") : null);
-                            //out.println("    ShellService reference (via bundle's context) by class: " + directShellServiceByClass);  // No logger, for debugging only.
-                            //out.println("    ShellService reference (via bundle's context) by name: " + directShellServiceByName);    // No logger, for debugging only.
-                            if (ref == null) {
-                                ref = (directShellServiceByClass != null ? (ServiceReference) directShellServiceByClass : (ServiceReference) directShellServiceByName);
-                            }
-                        }
-                    } else {
-                        //out.println("Bundle [" + index + "] is null");  // No logger, for debugging only.
-                    }
-                }
-            } else {
-                //out.println("OSGi Interceptor-provided BundleContext bundle array is null or empty");  // No logger, for debugging only.
-            }
-        }
-
-        if (ref == null) {
-            out.println("ShellService reference cannot be found (null), service lookup will fail.");
-        }
-
-        return (ShellService) (bundleAccessor != null ? bundleAccessor.getService(ref) : null);
-    }
-
-    @Override
-    public void setBundleContext(BundleContext bundleContext) {
-        //System.out.println("ShellAction - setBundleContext called.  BundleContext: " + bundleContext);  // No logger, for debugging only.
-        this.bundleContext = bundleContext;
+        DefaultBundleAccessor bundleAcessor = DefaultBundleAccessor.getInstance();
+        ServiceReference ref = bundleAcessor.getServiceReference(ShellService.class.getName());
+        return (ShellService) bundleAcessor.getService(ref);
     }
 }

bundles/admin/src/main/resources/JQUERY-LICENSE.txt

@@ -1,13 +1,9 @@
-Copyright jQuery Foundation and other contributors, https://jquery.org/
+Copyright (c) 2009 Paul Bakaus, http://jqueryui.com/
 
 This software consists of voluntary contributions made by many
-individuals. For exact contribution history, see the revision history
-available at https://github.com/jquery/jquery-ui
-
-The following license applies to all parts of this software except as
-documented below:
-
-====
+individuals (AUTHORS.txt, http://jqueryui.com/about) For exact
+contribution history, see the revision history and logs, available
+at http://jquery-ui.googlecode.com/svn/
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -27,17 +23,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-====
-
-Copyright and related rights for sample code are waived via CC0. Sample
-code is defined as all source code contained within the demos directory.
-
-CC0: http://creativecommons.org/publicdomain/zero/1.0/
-
-====
-
-All files located in the node_modules and external directories are
-externally maintained libraries used by this software which have their
-own licenses; we recommend you read them, as their terms may differ from
-the terms above.

bundles/admin/src/main/resources/NOTICE.txt

@@ -2,8 +2,7 @@ Apache Struts
 Copyright 2000-2011 The Apache Software Foundation
 
 This product includes software developed by
-The Apache Software Foundation (https://www.apache.org/).
+The Apache Software Foundation (http://www.apache.org/).
 
 The binary distributions includes the following third party software:
-jQuery (https://jquery.com/).
-jQuery UI (https://jqueryui.com/).
+JQuery (http://jquery.com/).

bundles/admin/src/main/resources/osgi/admin/shell.ftl

@@ -22,13 +22,13 @@
     <head>
         <title>OSGi Console</title>
 
-        <link rel="stylesheet" type="text/css" href="<@s.url value="${parameters.staticContentPath}/css/shell.css" />" />
-        <link rel="stylesheet" type="text/css" href="<@s.url value="${parameters.staticContentPath}/css/main.css" />" />
-        <link rel="stylesheet" type="text/css" href="<@s.url value="${parameters.staticContentPath}/css/redmond/jquery-ui-1.12.1.redmond.css" />" />
+        <link rel="stylesheet" type="text/css" href="<@s.url value="/static/css/shell.css" />" />
+        <link rel="stylesheet" type="text/css" href="<@s.url value="/static/css/main.css" />" />
+        <link rel="stylesheet" type="text/css" href="<@s.url value="/static/css/redmond/jquery-ui-1.7.1.custom.css" />" />
 
-        <script src="<@s.url value="${parameters.staticContentPath}/js/shell.js" />"></script>
-        <script src="<@s.url value="${parameters.staticContentPath}/js/jquery-1.12.4.min.js" />"></script>
-        <script src="<@s.url value="${parameters.staticContentPath}/js/jquery-ui-1.12.1.min.js" />"></script>
+        <script src="<@s.url value="/static/js/shell.js" />"></script>
+        <script src="<@s.url value="/static/js/jquery-1.3.2.min.js" />"></script>
+        <script src="<@s.url value="/static/js/jquery-ui-1.7.1.custom.min.js" />"></script>
     </head>
 <body>
 <div class="menu">

bundles/admin/src/main/resources/osgi/admin/viewBundle.ftl

@@ -22,11 +22,11 @@
     <head>
         <title>${bundle.symbolicName!}</title>
 
-        <link rel="stylesheet" type="text/css" href="<@s.url value="${parameters.staticContentPath}/css/main.css" />" />
-        <link rel="stylesheet" type="text/css" href="<@s.url value="${parameters.staticContentPath}/css/redmond/jquery-ui-1.12.1.redmond.css" />" />
+        <link rel="stylesheet" type="text/css" href="<@s.url value="/static/css/main.css" />" />
+        <link rel="stylesheet" type="text/css" href="<@s.url value="/static/css/redmond/jquery-ui-1.7.1.custom.css" />" />
 
-        <script src="<@s.url value="${parameters.staticContentPath}/js/jquery-1.12.4.min.js" />"></script>
-        <script src="<@s.url value="${parameters.staticContentPath}/js/jquery-ui-1.12.1.min.js" />"></script>
+        <script src="<@s.url value="/static/js/jquery-1.3.2.min.js" />"></script>
+        <script src="<@s.url value="/static/js/jquery-ui-1.7.1.custom.min.js" />"></script>
 
         <script type="text/javascript">
             $(function() {
@@ -163,8 +163,5 @@
         </table>
     </div>
 </div>
-
-<@s.actionmessage />
-
 </body>
 </html>

bundles/admin/src/main/resources/osgi/admin/viewBundles.ftl

@@ -22,11 +22,11 @@
     <head>
         <title>OSGi Bundles</title>
 
-        <link rel="stylesheet" type="text/css" href="<@s.url value="${parameters.staticContentPath}/css/main.css" />" />
-        <link rel="stylesheet" type="text/css" href="<@s.url value="${parameters.staticContentPath}/css/redmond/jquery-ui-1.12.1.redmond.css" />" />
+        <link rel="stylesheet" type="text/css" href="<@s.url value="/static/css/main.css" />" />
+        <link rel="stylesheet" type="text/css" href="<@s.url value="/static/css/redmond/jquery-ui-1.7.1.custom.css" />" />
 
-        <script src="<@s.url value="${parameters.staticContentPath}/js/jquery-1.12.4.min.js" />"></script>
-        <script src="<@s.url value="${parameters.staticContentPath}/js/jquery-ui-1.12.1.min.js" />"></script>
+        <script src="<@s.url value="/static/js/jquery-1.3.2.min.js" />"></script>
+        <script src="<@s.url value="/static/js/jquery-ui-1.7.1.custom.min.js" />"></script>
     </head>
 <body>
 
@@ -44,9 +44,6 @@
         </a>
     </div>    
 </div>
-
-<@s.actionerror />
-
 <table class="properties" style="clear:both; width:700px">
     <thead>
         <tr>
@@ -90,8 +87,5 @@
         </#list>
     </tbody>
 </table>
-
-<@s.actionmessage />
-
 </body>
 </html>

bundles/admin/src/main/resources/static/css/redmond/jquery-ui-1.7.1.custom.css

@@ -0,0 +1,404 @@
+/*
+* jQuery UI CSS Framework
+* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+*/
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+/*
+* jQuery UI CSS Framework
+* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Lucida%20Grande,%20Lucida%20Sans,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=5px&bgColorHeader=5c9ccc&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=55&borderColorHeader=4297d7&fcHeader=ffffff&iconColorHeader=d8e7f3&bgColorContent=fcfdfd&bgTextureContent=06_inset_hard.png&bgImgOpacityContent=100&borderColorContent=a6c9e2&fcContent=222222&iconColorContent=469bdd&bgColorDefault=dfeffc&bgTextureDefault=02_glass.png&bgImgOpacityDefault=85&borderColorDefault=c5dbec&fcDefault=2e6e9e&iconColorDefault=6da8d5&bgColorHover=d0e5f5&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=79b7e7&fcHover=1d5987&iconColorHover=217bc0&bgColorActive=f5f8f9&bgTextureActive=06_inset_hard.png&bgImgOpacityActive=100&borderColorActive=79b7e7&fcActive=e17009&iconColorActive=f9bd01&bgColorHighlight=fbec88&bgTextureHighlight=01_flat.png&bgImgOpacityHighlight=55&borderColorHighlight=fad42e&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+*/
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1.1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #a6c9e2; background: #fcfdfd url(images/ui-bg_inset-hard_100_fcfdfd_1x100.png) 50% bottom repeat-x; color: #222222; }
+.ui-widget-content a { color: #222222; }
+.ui-widget-header { border: 1px solid #4297d7; background: #5c9ccc url(images/ui-bg_gloss-wave_55_5c9ccc_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
+.ui-widget-header a { color: #ffffff; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid #c5dbec; background: #dfeffc url(images/ui-bg_glass_85_dfeffc_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #2e6e9e; outline: none; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #2e6e9e; text-decoration: none; outline: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #79b7e7; background: #d0e5f5 url(images/ui-bg_glass_75_d0e5f5_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1d5987; outline: none; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #1d5987; text-decoration: none; outline: none; }
+.ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #79b7e7; background: #f5f8f9 url(images/ui-bg_inset-hard_100_f5f8f9_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #e17009; outline: none; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #e17009; outline: none; text-decoration: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight {border: 1px solid #fad42e; background: #fbec88 url(images/ui-bg_flat_55_fbec88_40x100.png) 50% 50% repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
+.ui-state-error a, .ui-widget-content .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text { color: #cd0a0a; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_469bdd_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_469bdd_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_d8e7f3_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_6da8d5_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_217bc0_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_f9bd01_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-tl { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; }
+.ui-corner-tr { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; }
+.ui-corner-bl { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; }
+.ui-corner-br { -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; }
+.ui-corner-top { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; }
+.ui-corner-bottom { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; }
+.ui-corner-right {  -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; }
+.ui-corner-left { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; }
+.ui-corner-all { -moz-border-radius: 5px; -webkit-border-radius: 5px; }
+
+/* Overlays */
+.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; }/* Accordion
+----------------------------------*/
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em 2.2em; }
+.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; }
+.ui-accordion .ui-accordion-content-active { display: block; }/* Datepicker
+----------------------------------*/
+.ui-datepicker { width: 17em; padding: .2em .2em 0; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { float:left; font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker .ui-datepicker-title select.ui-datepicker-year { float: right; }
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}/* Dialog
+----------------------------------*/
+.ui-dialog { position: relative; padding: .2em; width: 300px; }
+.ui-dialog .ui-dialog-titlebar { padding: .5em .3em .3em 1em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 0 .2em; } 
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+/* Progressbar
+----------------------------------*/
+.ui-progressbar { height:2em; text-align: left; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }/* Resizable
+----------------------------------*/
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;}
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0px; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0px; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0px; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0px; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* Slider
+----------------------------------*/
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/* Tabs
+----------------------------------*/
+.ui-tabs { padding: .2em; zoom: 1; }
+.ui-tabs .ui-tabs-nav { list-style: none; position: relative; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { position: relative; float: left; border-bottom-width: 0 !important; margin: 0 .2em -1px 0; padding: 0; }
+.ui-tabs .ui-tabs-nav li a { float: left; text-decoration: none; padding: .5em 1em; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { padding-bottom: 1px; border-bottom-width: 0; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { padding: 1em 1.4em; display: block; border-width: 0; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }

bundles/admin/src/main/resources/static/js/shell.js

@@ -29,8 +29,8 @@
       result_div.appendChild(document.createElement('br'));
 
       for (var line_index in result_array) {
-          var result_wrap = document.createElement('pre');
-          var line = document.createTextNode(result_array[line_index]);
+          var result_wrap = document.createElement('pre')
+          line = document.createTextNode(result_array[line_index]);
           result_wrap.appendChild(line);
           result_div.appendChild(result_wrap);
           result_div.appendChild(document.createElement('br'));

bundles/admin/src/main/resources/struts.xml

@@ -21,29 +21,28 @@
 -->
 
 <!DOCTYPE struts PUBLIC
-    "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-    "http://struts.apache.org/dtds/struts-2.5.dtd">
+    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+    "http://struts.apache.org/dtds/struts-2.0.dtd">
 
 <struts>
-    <constant name="struts.enable.DynamicMethodInvocation" value="false" />
-    <package name="bundle-admin" namespace="/osgi/admin" extends="osgi-default" strict-method-invocation="true">
+    <package name="bundle-admin" namespace="/osgi/admin" extends="struts-default">
         <default-action-ref name="bundles" />
         
         <action name="bundle_*!*" class="org.apache.struts2.osgi.admin.actions.BundlesAction" method="{2}">
             <param name="id">{1}</param>
             <result type="freemarker">viewBundle.ftl</result>
-            <allowed-methods>index,view,start,stop,update</allowed-methods>
         </action>
 
         <action name="bundles" class="org.apache.struts2.osgi.admin.actions.BundlesAction" method="index">
             <result type="freemarker">viewBundles.ftl</result>
         </action>
 
+
         <action name="execCommand" class="org.apache.struts2.osgi.admin.actions.ShellAction">
             <result type="freemarker">commandResult.ftl</result>
         </action>
 
-        <action name="shell" class="org.apache.struts2.osgi.admin.actions.ShellAction">
+        <action name="shell">
             <result type="freemarker">shell.ftl</result>
         </action>
     </package>

bundles/demo/pom.xml

@@ -24,25 +24,31 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-osgi-bundles</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>2.5.21</version>
     </parent>
 
     <artifactId>struts2-osgi-demo-bundle</artifactId>
     <packaging>bundle</packaging>
-    <name>DEPRECATED: Struts 2 OSGi Demo Bundle - since 2.6</name>
+    <name>Struts 2 OSGi Demo Bundle</name>
 
     <dependencies>
+       
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+        </dependency>
 
         <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-velocity-plugin</artifactId>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-tools</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>commons-digester</groupId>
             <artifactId>commons-digester</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>
@@ -52,7 +58,7 @@
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-osgi-plugin</artifactId>
         </dependency>
-
+        
     </dependencies>
 
     <build>
@@ -61,10 +67,11 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
+                <version>2.1.0</version>
                 <configuration>
                     <instructions>
                         <manifestLocation>META-INF</manifestLocation>
-                        <Import-Package>*</Import-Package>
+                        <Import-Package>*,com.opensymphony.xwork2</Import-Package>
                         <Spring-Context>*;create-asynchronously:=false</Spring-Context>
                         <Struts2-Enabled>true</Struts2-Enabled>
                     </instructions>

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

@@ -22,7 +22,7 @@ package actions.osgi;
 
 import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.convention.annotation.ResultPath;
-import org.apache.struts2.osgi.action.BundleContextAware;
+import org.apache.struts2.osgi.interceptor.BundleContextAware;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 
@@ -33,7 +33,7 @@ import org.osgi.framework.BundleContext;
 public class BundlesAction extends ActionSupport implements BundleContextAware {
     private BundleContext bundleContext;
 
-    public void withBundleContext(BundleContext bundleContext) {
+    public void setBundleContext(BundleContext bundleContext) {
         this.bundleContext = bundleContext;
     }
 

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

@@ -22,21 +22,13 @@ package actions.osgi;
 
 import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.convention.annotation.Action;
-import org.apache.struts2.convention.annotation.Actions;
-import org.apache.struts2.convention.annotation.Namespace;
-import org.apache.struts2.convention.annotation.Result;
 import org.apache.struts2.convention.annotation.ResultPath;
 
-@Namespace("/osgi")
-@ResultPath("/content/osgi")
+@ResultPath("/content")
 public class HelloWorldAction extends ActionSupport {
-    private Message message = new Message("Default non-null message");
+    private Message message;
 
-    @Override
-    @Actions({
-        @Action(value="hello-convention", results={@Result(name="success", type="freemarker", location="/content/osgi/hello-convention.ftl")}),
-        @Action(value="/osgi/hello-convention", results={@Result(name="success", type="freemarker", location="/content/osgi/hello-convention.ftl")})
-    })
+    @Action("hello-convention")
     public String execute() {
         return SUCCESS;
     }
@@ -53,7 +45,6 @@ public class HelloWorldAction extends ActionSupport {
         return "Hello!!!";
     }
 
-    @Override
     public String toString() {
         StringBuilder sb = new StringBuilder("{message:");
         sb.append(message != null ? message.getText() : "null");

bundles/demo/src/main/resources/content/osgi/hello.ftl

@@ -20,7 +20,7 @@
 -->
 <html>
     <head>
-        <title>Action mapped by the XML configuration</title>
+        <title>Action mapped by the XML configurationn</title>
     </head>
     <body>
         This is an action mapped by XML configuration, using a <b>FreeMarker</b> result.

bundles/demo/src/main/resources/content/osgi/hello.vm

@@ -18,7 +18,7 @@
 *# 
 <html>
     <head>
-        <title>Action mapped by the XML configuration</title>
+        <title>Action mapped by the XML configurationn</title>
     </head>
     <body>
         This is an action mapped by XML configuration, using a <b>Velocity</b> result.

bundles/demo/src/main/resources/struts.xml

@@ -20,36 +20,21 @@
  */
 -->
 <!DOCTYPE struts PUBLIC
-    "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-    "http://struts.apache.org/dtds/struts-2.5.dtd">
+    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+    "http://struts.apache.org/dtds/struts-2.0.dtd">
 
 <struts>
-    <!-- Set some Struts 2 constants relevant to the OSGi Plugin. 
-           Note:  The constant definitions specified here (within the demo bundle) may also need to be 
-                  duplicated in the struts.xml configuration of the outer project that packages the demo
-                  bundle JAR file within it.
-    -->
-    <constant name="struts.objectFactory" value="osgi" />
-    <constant name="struts.objectFactory.delegate" value="struts" />
-    <constant name="struts.freemarker.manager.classname" value="org.apache.struts2.osgi.BundleFreemarkerManager" />
-    <constant name="struts.velocity.manager.classname" value="org.apache.struts2.osgi.VelocityBundleResourceLoader" />
-    <constant name="struts.staticContentLoader" value="org.apache.struts2.osgi.loaders.StaticContentBundleResourceLoader" />
-
-    <package name="bundle-demo" namespace="/osgi" extends="osgi-default, velocity-default" strict-method-invocation="true">
-
+    <package name="bundle-demo" namespace="/osgi" extends="osgi-default">
         <default-action-ref name="home" />
-
-        <action name="hello-velocity" class="actions.osgi.HelloWorldAction">
+        <action name="hello-velocity" class="helloWorldAction">
             <result type="velocity">/content/osgi/hello.vm</result>
         </action>
-
-        <action name="hello-freemarker" class="actions.osgi.HelloWorldAction">
+        <action name="hello-freemarker" class="helloWorldAction">
             <result type="freemarker">/content/osgi/hello.ftl</result>
         </action>
 
-        <action name="home" class="actions.osgi.HelloWorldAction">
+        <action name="home">
             <result type="freemarker">/content/osgi/home.ftl</result>
         </action>
-
     </package>
 </struts>