[maven-release-plugin] copy for tag STRUTS_2_1_7

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_7@786190 13f79535-47bb-0310-9956-ffa450edef68

.gitignore

@@ -1,56 +0,0 @@
-.idea
-*.iml
-*.ipr
-*.iws
-core/target
-xwork-core/target
-archetypes/struts2-archetype-angularjs/target
-archetypes/struts2-archetype-blank/target
-archetypes/struts2-archetype-convention/target
-archetypes/struts2-archetype-dbportlet/target
-archetypes/struts2-archetype-plugin/target
-archetypes/struts2-archetype-portlet/target
-archetypes/struts2-archetype-starter/target
-archetypes/target
-plugins/convention/target
-plugins/embeddedjsp/target
-plugins/dojo/target
-plugins/osgi/target
-plugins/cdi/target
-plugins/codebehind/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/jsf/target
-plugins/json/target
-plugins/portlet-tiles/target
-plugins/portlet/target
-plugins/sitegraph/target
-plugins/sitemesh/target
-plugins/struts1/target
-plugins/tiles3/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

apps/blank/pom.xml

@@ -26,17 +26,17 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.16</version>
+        <version>2.1.7</version>
     </parent>
-
+    <groupId>org.apache.struts</groupId>
     <artifactId>struts2-blank</artifactId>
     <packaging>war</packaging>
     <name>Blank Webapp</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_16/apps/blank</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_16/apps/blank</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_16/apps/blank</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_7/apps/blank</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_7/apps/blank</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_7/apps/blank</url>
     </scm>
 
     <dependencies>
@@ -44,28 +44,20 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jsp-api</artifactId>
+            <version>2.0</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
+            <version>${pom.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -74,21 +66,14 @@
         <plugins>
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <version>8.1.7.v20120910</version>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.0.1</version>
                 <configuration>
-                    <stopKey>CTRL+C</stopKey>
-                    <stopPort>8999</stopPort>
                     <scanIntervalSeconds>10</scanIntervalSeconds>
-                    <scanTargets>
-                        <scanTarget>src/main/webapp/WEB-INF/web.xml</scanTarget>
-                    </scanTargets>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
-    <properties>
-    	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+
 </project>

apps/blank/src/main/java/example/Login.java

@@ -21,18 +21,19 @@
 
 package example;
 
-import org.apache.struts2.interceptor.validation.SkipValidation;
-
 public class Login extends ExampleSupport {
 
-    @Override
     public String execute() throws Exception {
+
+        if (isInvalid(getUsername())) return INPUT;
+
+        if (isInvalid(getPassword())) return INPUT;
+
         return SUCCESS;
     }
 
-    @SkipValidation
-    public String form() throws Exception {
-        return INPUT;
+    private boolean isInvalid(String value) {
+        return (value == null || value.length() == 0);
     }
 
     private String username;

apps/blank/src/main/resources/NOTICE.txt

@@ -1,5 +1,5 @@
 Apache Struts
-Copyright 2000-2011 The Apache Software Foundation
+Copyright 2000-2007 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

apps/blank/src/main/resources/example.xml

@@ -5,7 +5,7 @@
 
 <struts>
 
-    <package name="example" namespace="/example" extends="default">
+    <package name="example" namespace="/example" extends="struts-default">
 
         <action name="HelloWorld" class="example.HelloWorld">
             <result>/example/HelloWorld.jsp</result>

apps/blank/src/main/resources/example/Login-validation.xml

@@ -1,6 +1,6 @@
 <!DOCTYPE validators PUBLIC
-        "-//Apache Struts//XWork Validator 1.0.2//EN"
-        "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+        "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+        "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
 
 <validators>
     <field name="username">

apps/blank/src/main/resources/log4j.properties

@@ -1,26 +0,0 @@
-#
-# Log4J Settings for log4j 1.2.x (via jakarta-commons-logging)
-#
-# The five logging levels used by Log are (in order):
-#
-#   1. DEBUG (the least serious)
-#   2. INFO
-#   3. WARN
-#   4. ERROR
-#   5. FATAL (the most serious)
-
-
-# Set root logger level to WARN and append to stdout
-log4j.rootLogger=INFO, stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-
-# Pattern to output the caller's file name and line number.
-log4j.appender.stdout.layout.ConversionPattern=%d %5p (%c:%L) - %m%n
-
-# Print only messages of level ERROR or above in the package noModule.
-log4j.logger.noModule=FATAL
-
-log4j.logger.com.opensymphony.xwork2=DEBUG
-log4j.logger.org.apache.struts2=DEBUG

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

@@ -1,25 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE struts PUBLIC
-	"-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
-	"http://struts.apache.org/dtds/struts-2.3.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" />
-    <constant name="struts.devMode" value="true" />
+    <constant name="struts.devMode" value="false" />
+
+    <include file="example.xml"/>
+
+
 
     <package name="default" namespace="/" extends="struts-default">
-
         <default-action-ref name="index" />
-
-        <global-results>
-            <result name="error">/error.jsp</result>
-        </global-results>
-
-        <global-exception-mappings>
-            <exception-mapping exception="java.lang.Exception" result="error"/>
-        </global-exception-mappings>
-
         <action name="index">
             <result type="redirectAction">
                 <param name="actionName">HelloWorld</param>
@@ -28,8 +22,6 @@
         </action>
     </package>
 
-    <include file="example.xml"/>
-
     <!-- Add packages here -->
 
 </struts>

apps/blank/src/main/webapp/error.jsp

@@ -1,15 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-
-<html>
-<head><title>Simple jsp page</title></head>
-<body>
-    <h3>Exception:</h3>
-    <s:property value="exception"/>
-
-    <h3>Stack trace:</h3>
-    <pre>
-        <s:property value="exceptionStack"/>
-    </pre>
-</body>
-</html>

apps/blank/src/test/java/example/ConfigTest.java

@@ -26,10 +26,11 @@ import com.opensymphony.xwork2.config.RuntimeConfiguration;
 import com.opensymphony.xwork2.config.entities.ActionConfig;
 import com.opensymphony.xwork2.config.entities.ResultConfig;
 import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
-import org.apache.struts2.StrutsTestCase;
 
-import java.util.List;
 import java.util.Map;
+import java.util.List;
+
+import org.apache.struts2.StrutsTestCase;
 
 public class ConfigTest extends StrutsTestCase {
 
@@ -61,7 +62,7 @@ public class ConfigTest extends StrutsTestCase {
     protected void setUp() throws Exception {
         super.setUp();
         XmlConfigurationProvider c = new XmlConfigurationProvider("struts.xml");
-        configurationManager.addContainerProvider(c);
+        configurationManager.addConfigurationProvider(c);
         configurationManager.reload();
     }
 

apps/blank/src/test/java/example/HelloWorldTest.java

@@ -21,9 +21,11 @@
 
 package example;
 
-import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.StrutsTestCase;
 
+import com.opensymphony.xwork2.ActionSupport;
+import junit.framework.TestCase;
+
 public class HelloWorldTest extends StrutsTestCase {
 
     public void testHelloWorld() throws Exception {

apps/jboss-blank/README.txt

@@ -1,10 +0,0 @@
-README.txt - JBoss Blank
-
-This is an "empty" application that you can deploy as the basis of your own 
-application. This specially dedicated to JBoss server as it includes the Javassist library.
-
-For more on getting started with Struts, see 
-
-* http://cwiki.apache.org/WW/home.html
-
-----------------------------------------------------------------------------

apps/jboss-blank/pom.xml

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * 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.
- */
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.struts</groupId>
-        <artifactId>struts2-apps</artifactId>
-        <version>2.3.16</version>
-    </parent>
-
-    <artifactId>struts2-jboss-blank</artifactId>
-    <packaging>war</packaging>
-    <name>JBoss Blank Webapp</name>
-
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_16/apps/jboss-blank</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_16/apps/jboss-blank</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_16/apps/jboss-blank</url>
-    </scm>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jsp-api</artifactId>
-            <version>2.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>struts2-junit-plugin</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <properties>
-    	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-</project>

apps/jboss-blank/src/main/java/example/HelloWorld.java

@@ -1,61 +0,0 @@
-/*
- * $Id: HelloWorld.java 471756 2006-11-06 15:01:43Z husted $
- *
- * 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 example;
-
-/**
- * <code>Set welcome message.</code>
- */
-public class HelloWorld extends ExampleSupport {
-
-    public String execute() throws Exception {
-        setMessage(getText(MESSAGE));
-        return SUCCESS;
-    }
-
-    /**
-     * Provide default valuie for Message property.
-     */
-    public static final String MESSAGE = "HelloWorld.message";
-
-    /**
-     * Field for Message property.
-     */
-    private String message;
-
-    /**
-     * Return Message property.
-     *
-     * @return Message property
-     */
-    public String getMessage() {
-        return message;
-    }
-
-    /**
-     * Set Message property.
-     *
-     * @param message Text to display on HelloWorld page.
-     */
-    public void setMessage(String message) {
-        this.message = message;
-    }
-}

apps/jboss-blank/src/main/java/example/Login.java

@@ -1,59 +0,0 @@
-/*
- * $Id: Login.java 471756 2006-11-06 15:01:43Z husted $
- *
- * 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 example;
-
-public class Login extends ExampleSupport {
-
-    public String execute() throws Exception {
-
-        if (isInvalid(getUsername())) return INPUT;
-
-        if (isInvalid(getPassword())) return INPUT;
-
-        return SUCCESS;
-    }
-
-    private boolean isInvalid(String value) {
-        return (value == null || value.length() == 0);
-    }
-
-    private String username;
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    private String password;
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-}

apps/jboss-blank/src/main/resources/LICENSE.txt

@@ -1,174 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.

apps/jboss-blank/src/main/resources/NOTICE.txt

@@ -1,5 +0,0 @@
-Apache Struts
-Copyright 2000-2011 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).

apps/jboss-blank/src/main/resources/example.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE struts PUBLIC
-        "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-        "http://struts.apache.org/dtds/struts-2.0.dtd">
-
-<struts>
-
-    <package name="example" namespace="/example" extends="struts-default">
-
-        <action name="HelloWorld" class="example.HelloWorld">
-            <result>/example/HelloWorld.jsp</result>
-        </action>
-
-        <action name="Login_*" method="{1}" class="example.Login">
-            <result name="input">/example/Login.jsp</result>
-            <result type="redirectAction">Menu</result>
-        </action>
-
-        <action name="*" class="example.ExampleSupport">
-            <result>/example/{1}.jsp</result>
-        </action>
-
-        <!-- Add actions here -->
-    </package>
-</struts>

apps/jboss-blank/src/main/resources/example/Login-validation.xml

@@ -1,16 +0,0 @@
-<!DOCTYPE validators PUBLIC
-        "-//Apache Struts//XWork Validator 1.0.2//EN"
-        "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-
-<validators>
-    <field name="username">
-        <field-validator type="requiredstring">
-            <message key="requiredstring"/>
-        </field-validator>
-    </field>
-    <field name="password">
-        <field-validator type="requiredstring">
-            <message key="requiredstring"/>
-        </field-validator>
-    </field>
-</validators>

apps/jboss-blank/src/main/resources/example/package.properties

@@ -1,5 +0,0 @@
-HelloWorld.message= Struts is up and running ...
-requiredstring = ${getText(fieldName)} is required.
-password = Password
-username = User Name
-Missing.message =  This feature is under construction. Please try again in the next interation.

apps/jboss-blank/src/main/resources/example/package_es.properties

@@ -1,5 +0,0 @@
-HelloWorld.message= ¡Struts está bien! ...
-requiredstring = ${getText(fieldName)} se requiere.
-password = Contraseña
-username = Nombre de Usuario
-Missing.message =   ¡en obras! ¡seguir intentando!

apps/jboss-blank/src/main/resources/struts.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE struts PUBLIC
-	"-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
-	"http://struts.apache.org/dtds/struts-2.3.dtd">
-
-<struts>
-
-    <constant name="struts.enable.DynamicMethodInvocation" value="false" />
-    <constant name="struts.devMode" value="false" />
-
-    <include file="example.xml"/>
-
-
-
-    <package name="default" namespace="/" extends="struts-default">
-        <default-action-ref name="index" />
-        <action name="index">
-            <result type="redirectAction">
-                <param name="actionName">HelloWorld</param>
-                <param name="namespace">/example</param>
-            </result>
-        </action>
-    </package>
-
-    <!-- Add packages here -->
-
-</struts>

apps/jboss-blank/src/main/webapp/WEB-INF/web.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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 Blank</display-name>
-
-    <filter>
-        <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
-    </filter>
-
-    <filter-mapping>
-        <filter-name>struts2</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-    <welcome-file-list>
-        <welcome-file>index.html</welcome-file>
-    </welcome-file-list>
-
-</web-app>

apps/jboss-blank/src/main/webapp/example/HelloWorld.jsp

@@ -1,28 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<html>
-<head>
-    <title><s:text name="HelloWorld.message"/></title>
-</head>
-
-<body>
-<h2><s:property value="message"/></h2>
-
-<h3>Languages</h3>
-<ul>
-    <li>
-        <s:url id="url" action="HelloWorld">
-            <s:param name="request_locale">en</s:param>
-        </s:url>
-        <s:a href="%{url}">English</s:a>
-    </li>
-    <li>
-        <s:url id="url" action="HelloWorld">
-            <s:param name="request_locale">es</s:param>
-        </s:url>
-        <s:a href="%{url}">Espanol</s:a>
-    </li>
-</ul>
-
-</body>
-</html>

apps/jboss-blank/src/main/webapp/example/Login.jsp

@@ -1,15 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<html>
-<head>
-    <title>Sign On</title>
-</head>
-
-<body>
-<s:form action="Login">
-    <s:textfield key="username"/>
-    <s:password key="password" />
-    <s:submit/>
-</s:form>
-</body>
-</html>

apps/jboss-blank/src/main/webapp/example/Menu.jsp

@@ -1,3 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<s:include value="Missing.jsp"/>

apps/jboss-blank/src/main/webapp/example/Missing.jsp

@@ -1,11 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<html>
-<head><title>Missing Feature</title></head>
-
-<body>
-<p>
-    <s:text name="Missing.message"/>
-</p>
-</body>
-</html>

apps/jboss-blank/src/main/webapp/example/Register.jsp

@@ -1,3 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<s:include value="Missing.jsp"/>

apps/jboss-blank/src/main/webapp/example/Welcome.jsp

@@ -1,18 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<html>
-<head>
-    <title>Welcome</title>
-    <link href="<s:url value="/css/examplecss"/>" rel="stylesheet"
-          type="text/css"/>
-</head>
-
-<body>
-<h3>Commands</h3>
-<ul>
-    <li><a href="<s:url action="Login_input"/>">Sign On</a></li>
-    <li><a href="<s:url action="Register"/>">Register</a></li>
-</ul>
-
-</body>
-</html>

apps/jboss-blank/src/main/webapp/index.html

@@ -1,10 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-    <META HTTP-EQUIV="Refresh" CONTENT="0;URL=example/HelloWorld.action">
-</head>
-
-<body>
-<p>Loading ...</p>
-</body>
-</html>

apps/jboss-blank/src/test/java/example/ConfigTest.java

@@ -1,96 +0,0 @@
-/*
- * $Id: ConfigTest.java 670170 2008-06-21 09:40:34Z hermanns $
- *
- * 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 example;
-
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.config.RuntimeConfiguration;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
-import org.apache.struts2.StrutsTestCase;
-
-import java.util.List;
-import java.util.Map;
-
-public class ConfigTest extends StrutsTestCase {
-
-    protected void assertSuccess(String result) throws Exception {
-        assertTrue("Expected a success result!",
-                ActionSupport.SUCCESS.equals(result));
-    }
-
-    protected void assertInput(String result) throws Exception {
-        assertTrue("Expected an input result!",
-                ActionSupport.INPUT.equals(result));
-    }
-
-    protected Map<String, List<String>> assertFieldErrors(ActionSupport action) throws Exception {
-        assertTrue(action.hasFieldErrors());
-        return action.getFieldErrors();
-    }
-
-    protected void assertFieldError(Map field_errors, String field_name, String error_message) {
-
-        List errors = (List) field_errors.get(field_name);
-        assertNotNull("Expected errors for " + field_name, errors);
-        assertTrue("Expected errors for " + field_name, errors.size()>0);
-        // TODO: Should be a loop
-        assertEquals(error_message,errors.get(0));
-
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        XmlConfigurationProvider c = new XmlConfigurationProvider("struts.xml");
-        configurationManager.addContainerProvider(c);
-        configurationManager.reload();
-    }
-
-    protected ActionConfig assertClass(String namespace, String action_name, String class_name) {
-        RuntimeConfiguration configuration = configurationManager.getConfiguration().getRuntimeConfiguration();
-        ActionConfig config = configuration.getActionConfig(namespace, action_name);
-        assertNotNull("Mssing action", config);
-        assertTrue("Wrong class name: [" + config.getClassName() + "]",
-                class_name.equals(config.getClassName()));
-        return config;
-    }
-
-    protected ActionConfig assertClass(String action_name, String class_name) {
-        return assertClass("", action_name, class_name);
-    }
-
-    protected void assertResult(ActionConfig config, String result_name, String result_value) {
-        Map results = config.getResults();
-        ResultConfig result = (ResultConfig) results.get(result_name);
-        Map params = result.getParams();
-        String value = (String) params.get("actionName");
-        if (value == null)
-            value = (String) params.get("location");
-        assertTrue("Wrong result value: [" + value + "]",
-                result_value.equals(value));
-    }
-
-    public void testConfig() throws Exception {
-        assertNotNull(configurationManager);
-    }
-
-}

apps/jboss-blank/src/test/java/example/HelloWorldTest.java

@@ -1,38 +0,0 @@
-/*
- * $Id: HelloWorldTest.java 577750 2007-09-20 13:54:31Z mrdon $
- *
- * 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 example;
-
-import org.apache.struts2.StrutsTestCase;
-
-import com.opensymphony.xwork2.ActionSupport;
-
-public class HelloWorldTest extends StrutsTestCase {
-
-    public void testHelloWorld() throws Exception {
-        HelloWorld hello_world = new HelloWorld();
-        String result = hello_world.execute();
-        assertTrue("Expected a success result!",
-                ActionSupport.SUCCESS.equals(result));
-        assertTrue("Expected the default message!",
-                hello_world.getText(HelloWorld.MESSAGE).equals(hello_world.getMessage()));
-    }
-}

apps/jboss-blank/src/test/java/example/LoginTest.java

@@ -1,55 +0,0 @@
-/*
- * $Id: LoginTest.java 471756 2006-11-06 15:01:43Z husted $
- *
- * 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 example;
-
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-
-import java.util.Map;
-
-public class LoginTest extends ConfigTest {
-
-    public void FIXME_testLoginConfig() throws Exception {
-        ActionConfig config = assertClass("example", "Login_input", "example.Login");
-        assertResult(config, ActionSupport.SUCCESS, "Menu");
-        assertResult(config, ActionSupport.INPUT, "/example/Login.jsp");
-    }
-
-    public void testLoginSubmit() throws Exception {
-        Login login = new Login();
-        login.setUsername("username");
-        login.setPassword("password");
-        String result = login.execute();
-        assertSuccess(result);
-    }
-
-    // Needs access to an envinronment that includes validators
-    public void FIXME_testLoginSubmitInput() throws Exception {
-        Login login = new Login();
-        String result = login.execute();
-        assertInput(result);
-        Map errors = assertFieldErrors(login);
-        assertFieldError(errors,"username","Username is required.");
-        assertFieldError(errors,"password","Password is required.");
-    }
-
-}

apps/mailreader/pom.xml

@@ -26,17 +26,17 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.3.16</version>
+      <version>2.1.7</version>
     </parent>
-
+    <groupId>org.apache.struts</groupId>
     <artifactId>struts2-mailreader</artifactId>
     <packaging>war</packaging>
-    <name>Mail Reader Webapp</name>
+    <name>Starter Webapp</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_16/apps/mailreader</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_16/apps/mailreader</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_16/apps/mailreader</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_7/apps/mailreader</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_7/apps/mailreader</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_7/apps/mailreader</url>
     </scm>
 
     <dependencies>
@@ -44,15 +44,14 @@
         <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>servlet-api</artifactId>
+           <version>2.4</version>
            <scope>provided</scope>
         </dependency>
-
         <dependency>
-           <groupId>${project.groupId}</groupId>
+           <groupId>${pom.groupId}</groupId>
            <artifactId>struts-mailreader-dao</artifactId>
            <version>1.3.5</version>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -68,39 +67,12 @@
         <plugins>
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <version>8.1.7.v20120910</version>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.0.1</version>
                 <configuration>
-                    <stopKey>CTRL+C</stopKey>
-                    <stopPort>8999</stopPort>
-                    <systemProperties>
-                        <systemProperty>
-                            <name>log4j.configuration</name>
-                            <value>file:${basedir}/src/main/resources/log4j.properties</value>
-                        </systemProperty>
-                        <systemProperty>
-                            <name>slf4j</name>
-                            <value>false</value>
-                        </systemProperty>
-                    </systemProperties>
                     <scanIntervalSeconds>10</scanIntervalSeconds>
-                    <webAppSourceDirectory>${basedir}/src/main/webapp/</webAppSourceDirectory>
-                    <webAppConfig>
-                        <contextPath>/struts2-mailreader</contextPath>
-                        <descriptor>${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
-                    </webAppConfig>
                 </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>log4j</groupId>
-                        <artifactId>log4j</artifactId>
-                        <version>1.2.17</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>
-    <properties>
-    	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
 </project>

apps/mailreader/src/main/java/mailreader2/Login-validation.xml

@@ -1,4 +1,4 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
 
 <validators>
     <field name="username">

apps/mailreader/src/main/java/mailreader2/Registration-Registration_save-validation.xml

@@ -1,4 +1,4 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
 
 <validators>
 

apps/mailreader/src/main/java/mailreader2/Registration-validation.xml

@@ -1,4 +1,4 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
 
 <validators>
 

apps/mailreader/src/main/java/mailreader2/Subscription-Subscription_save-validation.xml

@@ -1,4 +1,4 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
 
 <validators>
 

apps/mailreader/src/main/java/mailreader2/Subscription-validation.xml

@@ -1,4 +1,4 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
 
 <validators>
 

apps/mailreader/src/main/resources/NOTICE.txt

@@ -1,5 +1,5 @@
 Apache Struts
-Copyright 2000-2011 The Apache Software Foundation
+Copyright 2000-2007 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

apps/mailreader/src/main/resources/log4j.properties

@@ -1,36 +0,0 @@
-#
-# Log4J Settings for log4j 1.2.x (via jakarta-commons-logging)
-#
-# The five logging levels used by Log are (in order):
-#
-#   1. DEBUG (the least serious)
-#   2. INFO
-#   3. WARN
-#   4. ERROR
-#   5. FATAL (the most serious)
-
-
-# Set root logger level to WARN and append to stdout
-log4j.rootLogger=INFO, stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-
-# Pattern to output the caller's file name and line number.
-log4j.appender.stdout.layout.ConversionPattern=%d %5p (%c:%L) - %m%n
-
-# Print only messages of level ERROR or above in the package noModule.
-log4j.logger.noModule=FATAL
-
-# OpenSymphony Stuff
-log4j.logger.freemarker=INFO
-log4j.logger.com.opensymphony=INFO
-log4j.logger.com.opensymphony.xwork2.ognl=ERROR
-log4j.logger.org.apache.struts2=WARN
-log4j.logger.org.apache.struts2.components=WARN
-log4j.logger.org.apache.struts2.dispatcher=WARN
-log4j.logger.org.apache.struts2.convention=INFO
-
-# Spring Stuff
-log4j.logger.org.springframework=WARN
-

apps/mailreader/src/main/webapp/WEB-INF/database.xml

@@ -1,9 +1,13 @@
 <?xml version='1.0'?>
 <database>
-  <user username="user" fromAddress="John.User@somewhere.com" fullName="John Q. User" password="pass">
-    <subscription host="mail.yahoo.com" autoConnect="false" password="foo" type="imap" username="jquser">
-    </subscription>
-    <subscription host="mail.hotmail.com" autoConnect="false" password="bar" type="pop3" username="user1234">
-    </subscription>
-  </user>
+    <user username="user" fromAddress="John.User@somewhere.com"
+          fullName="John Q. User" password="pass">
+        <subscription host="mail.hotmail.com" autoConnect="false"
+                      password="bar" type="pop3" username="user1234">
+        </subscription>
+        <subscription host="mail.yahoo.com" autoConnect="false" password="foo"
+                      type="imap" username="jquser">
+        </subscription>
+    </user>
 </database>
+        

apps/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.16</version>
+        <version>2.1.7</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-apps</artifactId>
@@ -34,7 +34,6 @@
     <name>Webapps</name>
     <modules>
         <module>blank</module>
-        <module>jboss-blank</module>
         <module>mailreader</module>
         <module>portlet</module>
         <module>showcase</module>
@@ -42,11 +41,18 @@
     </modules>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_16/apps</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_16/apps</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_16/apps</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_7/apps</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_7/apps</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_7/apps</url>
     </scm>
 
+     <distributionManagement>
+        <site>
+            <id>apache-site</id>
+            <url>scp://people.apache.org/www/struts.apache.org/struts2/apps</url>
+        </site>
+    </distributionManagement>
+
     <profiles>
         <profile>
             <id>hostedqa</id>
@@ -172,10 +178,10 @@
                         <phase>process-sources</phase>
                         <configuration>
                             <tasks>
-                                <copy todir="${project.build.directory}/${project.artifactId}/WEB-INF/src/java" failonerror="false">
+                                <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java" failonerror="false">
                                     <fileset dir="${basedir}/src/main/java" />
                                 </copy>
-                                <copy todir="${project.build.directory}/${project.artifactId}/WEB-INF/src/java" failonerror="false">
+                                <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java" failonerror="false">
                                     <fileset dir="${basedir}/src/main/resources" />
                                 </copy>
                             </tasks>
@@ -205,7 +211,7 @@
             </plugin>
         </plugins>
 
-        <finalName>${project.artifactId}</finalName>
+        <finalName>${pom.artifactId}</finalName>
 
     </build>
 
@@ -214,7 +220,7 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>${project.version}</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
@@ -225,7 +231,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-    	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
 </project>

apps/portlet/pom.xml

@@ -24,48 +24,48 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.struts</groupId>
-        <artifactId>struts2-apps</artifactId>
-        <version>2.3.16</version>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts2-apps</artifactId>
+      <version>2.1.7</version>
     </parent>
-
+    <groupId>org.apache.struts</groupId>
     <artifactId>struts2-portlet</artifactId>
     <packaging>war</packaging>
     <name>Portlet Webapp</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_16/apps/portlet</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_16/apps/portlet</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_16/apps/portlet</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_7/apps/portlet</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_7/apps/portlet</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_7/apps/portlet</url>
     </scm>
 
-    <profiles>
-        <profile>
-            <id>pluto</id>
-            <build>
-                <plugins>
-                    <!-- configure maven-war-plugin to use updated web.xml -->
-                    <plugin>
-                        <artifactId>maven-war-plugin</artifactId>
-                        <configuration>
-                            <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
-                        </configuration>
-                    </plugin>
-                    <!-- bind 'pluto:assemble' goal to 'process-resources' lifecycle -->
-                    <plugin>
-                        <groupId>org.apache.pluto</groupId>
-                        <artifactId>maven-pluto-plugin</artifactId>
-                        <version>1.1.3</version>
-                        <executions>
-                            <execution>
-                                <phase>generate-resources</phase>
-                                <goals>
-                                    <goal>assemble</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
+	<profiles>
+		<profile>
+			<id>pluto</id>
+			<build>
+				<plugins>
+				  <!-- configure maven-war-plugin to use updated web.xml -->
+			      <plugin>
+			        <artifactId>maven-war-plugin</artifactId>
+			        <configuration>
+			          <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+			        </configuration>
+			      </plugin>
+			      <!-- bind 'pluto:assemble' goal to 'process-resources' lifecycle -->
+			      <plugin>
+			        <groupId>org.apache.pluto</groupId>
+			        <artifactId>maven-pluto-plugin</artifactId>
+			        <version>1.1.3</version>
+			        <executions>
+			          <execution>
+			            <phase>generate-resources</phase>
+			            <goals>
+			              <goal>assemble</goal>
+			            </goals>
+			          </execution>
+			        </executions>
+			      </plugin>
+				<plugin>
                         <groupId>org.mortbay.jetty</groupId>
                         <artifactId>maven-jetty-plugin</artifactId>
                         <configuration>
@@ -79,81 +79,102 @@
                             </systemProperties>
                         </configuration>
                     </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.bekk.boss</groupId>
-                    <artifactId>maven-jetty-pluto-embedded</artifactId>
-                    <version>1.0</version>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
+				</plugins>
+			</build>
+			<dependencies>
+				<dependency>
+					<groupId>com.bekk.boss</groupId>
+					<artifactId>maven-jetty-pluto-embedded</artifactId>
+					<version>1.0</version>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
+	
     <dependencies>
         <dependency>
-            <groupId>javax.portlet</groupId>
-             <artifactId>portlet-api</artifactId>
+            <groupId>portlet-api</groupId>
+            <artifactId>portlet-api</artifactId>
+            <version>1.0</version>
             <scope>provided</scope>
+        </dependency>
+         <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-spring-plugin</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-spring-plugin</artifactId>
+            <artifactId>struts2-core</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-portlet-plugin</artifactId>
+            <version>${pom.version}</version>
         </dependency>
-        <dependency>
+         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-dwr-plugin</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-portlet-tiles-plugin</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
+            <version>1.5</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-tools</artifactId>
+            <version>1.3</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.servlet</groupId>
+					<artifactId>servlet-api</artifactId>
+				</exclusion>
+                <exclusion>
+                    <groupId>struts</groupId>
+                    <artifactId>struts</artifactId>
+                </exclusion>
+			</exclusions>
         </dependency>
-
         <dependency>
             <groupId>commons-digester</groupId>
             <artifactId>commons-digester</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>1.8</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.servlet</groupId>
+					<artifactId>servlet-api</artifactId>
+				</exclusion>
+			</exclusions>
         </dependency>
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+      <version>1.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.9</version>
+    </dependency>
+		
+		<dependency>
+			<groupId>org.mortbay.jetty</groupId>
+			<artifactId>jetty</artifactId>
+			<version>6.1.4rc0</version>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
             <groupId>net.sourceforge.jwebunit</groupId>
             <artifactId>jwebunit-htmlunit-plugin</artifactId>
             <version>1.4.1</version>
@@ -165,30 +186,26 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
-        <dependency>
-            <groupId>com.bekk.boss</groupId>
-            <artifactId>maven-jetty-pluto-embedded</artifactId>
-            <version>1.0</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jsp-2.1</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <scope>test</scope>
-        </dependency>
+		
+		<dependency>
+			<groupId>com.bekk.boss</groupId>
+			<artifactId>maven-jetty-pluto-embedded</artifactId>
+			<version>1.0</version>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.mortbay.jetty</groupId>
+			<artifactId>jsp-2.1</artifactId>
+			<version>6.1.4rc0</version>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.1</version>
+		</dependency>
 
     </dependencies>
 
@@ -213,7 +230,4 @@
             </plugin>
         </plugins>
     </reporting>
-    <properties>
-    	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
 </project>

apps/portlet/src/main/java/org/apache/struts2/portlet/example/eventing/ProcessAction.java

@@ -1,61 +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.portlet.example.eventing;
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.portlet.interceptor.PortletRequestAware;
-import org.apache.struts2.portlet.interceptor.PortletResponseAware;
-
-import javax.portlet.EventRequest;
-import javax.portlet.EventResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
-public class ProcessAction extends ActionSupport implements PortletRequestAware, PortletResponseAware {
-
-    private PortletRequest request;
-    private PortletResponse response;
-    private String name;
-
-    public String execute() throws Exception {
-
-        if (request instanceof EventRequest) {
-            EventRequest req = (EventRequest) request;
-            EventResponse res = (EventResponse) response;
-            res.setRenderParameter("eventName", (String) req.getEvent().getValue());
-            return "forward";
-        } else {
-            name = request.getParameter("eventName");
-        }
-
-        return SUCCESS;
-    }
-
-    public void setPortletRequest(PortletRequest request) {
-        this.request = request;
-    }
-
-    public void setPortletResponse(PortletResponse response) {
-        this.response = response;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-}

apps/portlet/src/main/java/org/apache/struts2/portlet/example/eventing/PublishAction.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 org.apache.struts2.portlet.example.eventing;
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.portlet.interceptor.PortletResponseAware;
-
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletResponse;
-import javax.xml.namespace.QName;
-
-public class PublishAction extends ActionSupport implements PortletResponseAware {
-
-    private PortletResponse response;
-    private String name;
-
-    public String execute() throws Exception {
-
-        if (name != null) {
-            ((ActionResponse) response).setEvent(new QName("http://org.apache.struts2.portlets/events", "name"), name);
-
-            addActionMessage("Publishing Event with Parameter name : " + name);
-        }
-
-        return SUCCESS;
-    }
-
-    public void setPortletResponse(PortletResponse response) {
-        this.response = response;
-
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}

apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/SpringAction.java

@@ -22,7 +22,7 @@ package org.apache.struts2.portlet.example.spring;
 
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 
 import com.opensymphony.xwork2.ActionSupport;
 

apps/portlet/src/main/resources/NOTICE.txt

@@ -1,5 +1,5 @@
 Apache Struts
-Copyright 2000-2011 The Apache Software Foundation
+Copyright 2000-2007 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-formExamplePrg-validation.xml

@@ -1,4 +1,4 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
 <validators>
     <field name="firstName">
         <field-validator type="requiredstring">

apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-processTilesFreemarkerExample-validation.xml

@@ -1,13 +0,0 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-<validators>
-    <field name="firstName">
-        <field-validator type="requiredstring">
-            <message>You must enter a first name</message>
-        </field-validator>
-    </field>
-    <field name="lastName">
-        <field-validator type="requiredstring">
-            <message>You must enter a last name</message>
-        </field-validator>
-    </field>
-</validators>

apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-processValidationExample-validation.xml

@@ -1,4 +1,4 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
 <validators>
     <field name="firstName">
         <field-validator type="requiredstring">

apps/portlet/src/main/resources/struts-edit.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE struts PUBLIC
-	"-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
-	"http://struts.apache.org/dtds/struts-2.3.dtd">
+    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+    "http://struts.apache.org/dtds/struts-2.0.dtd">
 
 <struts>	
 	<package name="edit" extends="struts-portlet-default"

apps/portlet/src/main/resources/struts-eventing.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE struts PUBLIC
-	"-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
-	"http://struts.apache.org/dtds/struts-2.3.dtd">
-
-<struts>
-    <package name="eventing" extends="struts-portlet-default" namespace="/eventing">
-
-        <action name="publish" class="org.apache.struts2.portlet.example.eventing.PublishAction">
-            <result name="success">/WEB-INF/eventing/index.jsp</result>
-        </action>
-
-        <action name="process" class="org.apache.struts2.portlet.example.eventing.ProcessAction">
-            <result name="success">/WEB-INF/eventing/process.jsp</result>
-            <result name="forward" type="redirectAction">
-                <param name="actionName">process</param>
-                <param name="namespace">/eventing</param>
-            </result>
-        </action>
-    </package>
-</struts>

apps/portlet/src/main/resources/struts-help.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE struts PUBLIC
-	"-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
-	"http://struts.apache.org/dtds/struts-2.3.dtd">
+    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+    "http://struts.apache.org/dtds/struts-2.0.dtd">
 
 <struts>
 	<package name="help" extends="struts-portlet-default"

apps/portlet/src/main/resources/struts-tiles.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE struts PUBLIC
-	"-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
-	"http://struts.apache.org/dtds/struts-2.3.dtd">
-
-<struts>
-    <package name="tiles" extends="struts-portlet-tiles-default" namespace="/tiles">
-        <default-action-ref name="index"/>
-
-        <action name="index" class="org.apache.struts2.portlet.example.FormExample">
-            <result type="tiles">formExampleTiles.index</result>
-            <result name="success" type="tiles">formExampleTiles.index</result>
-        </action>
-
-        <action name="processTilesFreemarkerExample" class="org.apache.struts2.portlet.example.FormExample" method="input">
-            <result name="success" type="tiles">formExampleTiles.freemarker</result>
-        </action>
-        
-        <action name="processTilesFreemarkerExample" class="org.apache.struts2.portlet.example.FormExample" method="execute">
-            <result name="input" type="tiles">formExampleTiles.freemarker</result>
-            <result name="success" type="tiles">formExampleTiles.freemarkerResult</result>
-        </action>
-        
-    </package>
-</struts>
-
-

apps/portlet/src/main/resources/struts-view.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE struts PUBLIC
-	"-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
-	"http://struts.apache.org/dtds/struts-2.3.dtd">
+    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+    "http://struts.apache.org/dtds/struts-2.0.dtd">
 
 <struts>
 	<package name="view" extends="struts-portlet-default"

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

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE struts PUBLIC
-	"-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
-	"http://struts.apache.org/dtds/struts-2.3.dtd">
+    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+    "http://struts.apache.org/dtds/struts-2.0.dtd">
 
 <struts>
-    <include file="struts-view.xml"/>
-    <include file="struts-edit.xml"/>
-    <include file="struts-help.xml"/>
-    <include file="struts-eventing.xml"/>
-    <include file="struts-tiles.xml"/>
+	<include file="struts-view.xml"/>
+	<include file="struts-edit.xml"/>
+	<include file="struts-help.xml"/>
 </struts>

apps/portlet/src/main/resources/validators.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE validators PUBLIC
-        "-//Apache Struts//XWork Validator Config 1.0//EN"
-        "http://struts.apache.org/dtds/xwork-validator-config-1.0.dtd">
+        "-//OpenSymphony Group//XWork Validator Config 1.0//EN"
+        "http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd">
 <validators>
     <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
     <validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>
     <validator name="int" class="com.opensymphony.xwork2.validator.validators.IntRangeFieldValidator"/>
-    <validator name="short" class="com.opensymphony.xwork2.validator.validators.ShortRangeFieldValidator"/>
     <validator name="double" class="com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator"/>
     <validator name="date" class="com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator"/>
     <validator name="expression" class="com.opensymphony.xwork2.validator.validators.ExpressionValidator"/>

apps/portlet/src/main/webapp/WEB-INF/eventing/index.jsp

@@ -1,11 +0,0 @@
-<%@ taglib prefix="s" uri="/struts-tags" %>
-
-<h2>Input your name</h2>
-
-<s:actionmessage/>
-
-<s:form action="publish" method="POST">
-    <s:textfield label="Please enter your name" name="name" value="%{name}"/>
-    <s:submit value="Submit the form"/>
-</s:form>
-

apps/portlet/src/main/webapp/WEB-INF/eventing/process.jsp

@@ -1,12 +0,0 @@
-<%@ taglib prefix="s" uri="/struts-tags" %>
-
-<s:if test="%{name != null}">
-    <h2>Welcome <s:property value="name"/></h2>
-</s:if>
-<s:else>
-    <h2>Please insert a Name in the Publish Portlet Form</h2>
-</s:else>
-
-<s:actionmessage/>
-
-

apps/portlet/src/main/webapp/WEB-INF/portlet.xml

@@ -1,18 +1,78 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <portlet-app
-        id="struts-portlet"
-        xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        version="2.0"
-        xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
-        >
+    version="1.0"
+    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+    id="struts-portlet">
 
     <portlet id="StrutsPortlet">
         <description xml:lang="EN">Struts Test Portlet</description>
         <portlet-name>StrutsPortlet</portlet-name>
         <display-name xml:lang="EN">Struts Test Portlet</display-name>
+    
+        <portlet-class>org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher</portlet-class>
 
+        <!-- The view mode namespace. Maps to a namespace in the Struts 2 config file. -->
+        <init-param>
+            <name>viewNamespace</name>
+            <value>/view</value>
+        </init-param>
+
+        <!-- The default action to invoke in view mode. -->
+        <init-param>
+            <name>defaultViewAction</name>
+            <value>index</value>
+        </init-param>
+
+        <!-- The edit mode namespace. Maps to a namespace in the Struts 2 config file. -->
+        <init-param>
+            <name>editNamespace</name>
+            <value>/edit</value>
+        </init-param>
+
+        <!-- The default action to invoke in edit mode. -->
+        <init-param>
+            <name>defaultEditAction</name>
+            <value>index</value>
+        </init-param>
+
+        <!-- The help mode namespace. Maps to a namespace in the Struts 2 config file. -->
+        <init-param>
+            <name>helpNamespace</name>
+            <value>/help</value>
+        </init-param>
+
+        <!-- The default action to invoke in help mode. -->
+        <init-param>
+            <name>defaultHelpAction</name>
+            <value>index</value>
+        </init-param>
+    
+        <expiration-cache>0</expiration-cache>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+			<portlet-mode>view</portlet-mode>
+            <portlet-mode>edit</portlet-mode>
+            <portlet-mode>help</portlet-mode>
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+        <portlet-info>
+            <title>My StrutsPortlet portlet</title>
+            <short-title>SP</short-title>
+            <keywords>struts,portlet</keywords>
+        </portlet-info>
+    </portlet>
+  
+    <portlet id="StrutsPortlet2">
+        <description xml:lang="EN">Struts Test Portlet2</description>
+        <portlet-name>StrutsPortlet2</portlet-name>
+        <display-name xml:lang="EN">Struts Test Portlet2</display-name>
+    
         <portlet-class>org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher</portlet-class>
 
         <!-- The view mode namespace. Maps to a namespace in the Struts 2 config file. -->
@@ -55,7 +115,6 @@
 
         <supports>
             <mime-type>text/html</mime-type>
-            <portlet-mode>view</portlet-mode>
             <portlet-mode>edit</portlet-mode>
             <portlet-mode>help</portlet-mode>
         </supports>
@@ -63,152 +122,10 @@
         <supported-locale>en</supported-locale>
 
         <portlet-info>
-            <title>My Struts2 Portlet</title>
+            <title>My StrutsPortlet portlet2</title>
             <short-title>SP2</short-title>
             <keywords>struts,portlet</keywords>
         </portlet-info>
     </portlet>
 
-    <portlet id="StrutsPortlet2">
-        <description xml:lang="EN">Struts Test Portlet with JSR 286 Dispatcher</description>
-        <portlet-name>StrutsPortlet2</portlet-name>
-        <display-name xml:lang="EN">Struts Test Portlet with JSR 286 Dispatcher</display-name>
-
-        <portlet-class>org.apache.struts2.portlet.dispatcher.Jsr286Dispatcher</portlet-class>
-
-        <!-- The view mode namespace. Maps to a namespace in the Struts 2 config file. -->
-        <init-param>
-            <name>viewNamespace</name>
-            <value>/view</value>
-        </init-param>
-
-        <!-- The default action to invoke in view mode. -->
-        <init-param>
-            <name>defaultViewAction</name>
-            <value>index</value>
-        </init-param>
-
-        <!-- The edit mode namespace. Maps to a namespace in the Struts 2 config file. -->
-        <init-param>
-            <name>editNamespace</name>
-            <value>/edit</value>
-        </init-param>
-
-        <!-- The default action to invoke in edit mode. -->
-        <init-param>
-            <name>defaultEditAction</name>
-            <value>index</value>
-        </init-param>
-
-        <!-- The help mode namespace. Maps to a namespace in the Struts 2 config file. -->
-        <init-param>
-            <name>helpNamespace</name>
-            <value>/help</value>
-        </init-param>
-
-        <!-- The default action to invoke in help mode. -->
-        <init-param>
-            <name>defaultHelpAction</name>
-            <value>index</value>
-        </init-param>
-
-        <expiration-cache>0</expiration-cache>
-
-        <supports>
-            <mime-type>text/html</mime-type>
-            <portlet-mode>edit</portlet-mode>
-            <portlet-mode>help</portlet-mode>
-        </supports>
-
-        <supported-locale>en</supported-locale>
-
-        <portlet-info>
-            <title>My Struts2 Portlet with JSR 286 Dispatcher</title>
-            <short-title>SP2JSR286</short-title>
-            <keywords>struts,portlet</keywords>
-        </portlet-info>
-    </portlet>
-
-
-    <portlet id="Struts2PublishPortlet">
-        <description xml:lang="EN">Struts2 Publish Portlet</description>
-        <portlet-name>Struts2PublishPortlet</portlet-name>
-        <display-name xml:lang="EN">Struts2 Publish Portlet</display-name>
-
-        <portlet-class>org.apache.struts2.portlet.dispatcher.Jsr286Dispatcher</portlet-class>
-
-        <!-- The view mode namespace. Maps to a namespace in the Struts 2 config file. -->
-        <init-param>
-            <name>viewNamespace</name>
-            <value>/eventing</value>
-        </init-param>
-
-        <!-- The default action to invoke in view mode. -->
-        <init-param>
-            <name>defaultViewAction</name>
-            <value>publish</value>
-        </init-param>
-
-        <expiration-cache>0</expiration-cache>
-
-        <supports>
-            <mime-type>text/html</mime-type>
-        </supports>
-
-        <supported-locale>en</supported-locale>
-
-        <portlet-info>
-            <title>Struts2 Publish Portlet</title>
-            <short-title>S2PUB</short-title>
-            <keywords>struts,publish,portlet</keywords>
-        </portlet-info>
-
-        <supported-publishing-event xmlns:x="http://org.apache.struts2.portlets/events">
-            <qname>x:name</qname>
-        </supported-publishing-event>
-    </portlet>
-
-    <portlet id="Struts2ProcessPortlet">
-        <description xml:lang="EN">Struts2 Process Portlet</description>
-        <portlet-name>Struts2ProcessPortlet</portlet-name>
-        <display-name xml:lang="EN">Struts2 Process Portlet</display-name>
-
-        <portlet-class>org.apache.struts2.portlet.dispatcher.Jsr286Dispatcher</portlet-class>
-
-        <!-- The view mode namespace. Maps to a namespace in the Struts 2 config file. -->
-        <init-param>
-            <name>viewNamespace</name>
-            <value>/eventing</value>
-        </init-param>
-
-        <!-- The default action to invoke in view mode. -->
-        <init-param>
-            <name>defaultViewAction</name>
-            <value>process</value>
-        </init-param>
-
-        <expiration-cache>0</expiration-cache>
-
-        <supports>
-            <mime-type>text/html</mime-type>
-        </supports>
-
-        <supported-locale>en</supported-locale>
-
-        <portlet-info>
-            <title>Struts2 Process Portlet</title>
-            <short-title>S2PRO</short-title>
-            <keywords>struts,process,portlet</keywords>
-        </portlet-info>
-
-        <supported-processing-event xmlns:x="http://org.apache.struts2.portlets/events">
-            <qname>x:name</qname>
-        </supported-processing-event>
-    </portlet>
-
-    <event-definition>
-        <qname xmlns:x="http://org.apache.struts2.portlets/events">x:name</qname>
-        <value-type>java.lang.String</value-type>
-    </event-definition>
-
 </portlet-app>

apps/portlet/src/main/webapp/WEB-INF/tiles.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-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.
- *
- */
--->
-
-<!DOCTYPE tiles-definitions PUBLIC
-        "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
-        "http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
-
-<tiles-definitions>
-
-    <definition name="formExampleTiles.index" template="/WEB-INF/tiles/layout.jsp">
-        <put-attribute name="title" value="Portlet Tiles FormExample"/>
-        <put-attribute name="header" value="/WEB-INF/tiles/header.jsp"/>
-        <put-attribute name="body" value="/WEB-INF/tiles/index.jsp"/>
-        <put-attribute name="footer" value="/WEB-INF/tiles/footer.jsp"/>
-    </definition>
-    
-    <definition name="formExampleTiles.freemarker" extends="formExampleTiles.index">
-        <put-attribute name="title" value="Portlet Tiles/Freemarker FormExample"/>
-        <put-attribute name="body" value="/WEB-INF/tiles/formExampleInputValidation.jsp"/>
-    </definition>
-    
-     <definition name="formExampleTiles.freemarkerResult" extends="formExampleTiles.freemarker">
-        <put-attribute name="body" value="/WEB-INF/tiles/formExample.jsp"/>
-    </definition>
-
-</tiles-definitions>

apps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExample.ftl

@@ -1,3 +1,3 @@
-<b>Hello from FreeMarker, ${firstName?html} ${lastName?html}!</b>
+<b>Hello from FreeMarker, ${firstName} ${lastName}!</b>
 <p/>
 <a href="<@s.url action="index"/>">Back to front page</a>

apps/portlet/src/main/webapp/WEB-INF/view/index.jsp

@@ -12,7 +12,6 @@ Here you'll find examples of what is possible with the Struts Portlet integratio
 <li><a href="<s:url action="fileUpload" method="input"/>">File upload</li>
 <li><a href="<s:url action="freeMarkerExample"/>">FreeMarker</a></li>
 <li><a href="<s:url action="velocityHelloWorld"/>">Velocity</a></li>
-<li><a href="<s:url action="index" namespace="/tiles"/>">Form Example Validation with Tiles</a></li>
 <li><a href="<s:url action="index" portletMode="edit"/>">Go to edit mode and see what's there</a></li>
 <li><a href="<s:url action="index" portletMode="help"/>">Go to help mode and see what's there</a></li>
 </ul>

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

@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
 <web-app id="StrutsPortlet">
-
-    <context-param>
-        <param-name>org.apache.tiles.factory.TilesContainerFactory</param-name>
-        <param-value>org.apache.struts2.tiles.StrutsTilesContainerFactory</param-value>
-    </context-param>
-    <context-param>
-        <param-name>org.apache.tiles.impl.BasicTilesContainer.DEFINITIONS_CONFIG</param-name>
-        <param-value>/WEB-INF/tiles.xml</param-value>
-    </context-param>
-
 	<!-- Uncomment/comment this if you need/don't need Spring support -->
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
@@ -18,14 +8,11 @@
 			/WEB-INF/applicationContext*.xml
 		</param-value>
 	</context-param>
-    <listener>
-        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-    </listener>
-
-    <!-- Tiles Plugin -->
-    <listener>
-    	<listener-class>org.apache.struts2.tiles.StrutsTilesListener
-    	</listener-class>
-    </listener>
 
+	<!-- Uncomment to use the dispatcher servlet -->
+	<!--<servlet id="Struts2PortletDispatcherServlet">
+		<servlet-name>Struts2PortletDispatcherServlet</servlet-name>
+		<servlet-class>org.apache.struts2.portlet.dispatcher.DispatcherServlet</servlet-class>
+	</servlet>-->
+	
 </web-app>

apps/portlet/src/main/webapp/tiles/footer.ftl

@@ -1,5 +0,0 @@
-<hr/>
-<@s.url id="home" action="index" namespace="/view" />
-<div>
-	<p>Powered by Struts2 Portlet/Tiles Plugin | <@s.a href="${home}">Back to front page</@s.a></p>
-</div>

apps/portlet/src/main/webapp/tiles/footer.jsp

@@ -1,6 +0,0 @@
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<hr/>
-<s:url id="home" action="index" namespace="/view" />
-<div>
-	<p>Powered by Struts2 Portlet/Tiles Plugin | <s:a href="%{home}">Back to front page</s:a></p>
-</div>

apps/portlet/src/main/webapp/tiles/formExample.jsp

@@ -1,5 +0,0 @@
-<%@ taglib prefix="s" uri="/struts-tags" %>
-
-<H2>Hello <s:property value="firstName"/> <s:property value="lastName"/></H2>
-<p/>
-

apps/portlet/src/main/webapp/tiles/formExampleInputValidation.jsp

@@ -1,8 +0,0 @@
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<link rel="stylesheet" type="text/css" href="<s:url value="/styles/styles.css"/>">
-<H2>Input your name</H2>
-<s:form action="processTilesFreemarkerExample" namespace="/tiles" method="POST" >
-    <s:textfield label="First name" name="firstName" value="%{firstName}"/>
-    <s:textfield label="Last name" name="lastName" value="%{lastName}"/>
-    <s:submit value="Submit the form"/>
-</s:form>

apps/portlet/src/main/webapp/tiles/header.jsp

@@ -1,2 +0,0 @@
-<h1>Struts2 Portlet Tiles App Example</h1>
-<hr/>

apps/portlet/src/main/webapp/tiles/index.jsp

@@ -1,13 +0,0 @@
-<%@taglib prefix="s" uri="/struts-tags" %>
-<div>
-    <p>This example illustrates the Struts/Portlet/Tiles Plugin.</p>
-
-    <h4>Features</h4>
-    <ul>
-        <li>
-            <s:url id="freemarker" namespace="/tiles" action="processTilesFreemarkerExample" method="input" />
-    		<s:a href="%{freemarker}">View FreeMarker Example</s:a>
-        </li>
-    </ul>
-
-</div>

apps/portlet/src/main/webapp/tiles/layout.jsp

@@ -1,13 +0,0 @@
-<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<tiles:importAttribute name="title" scope="request"/>
-
-<tiles:insertAttribute name="header"/>
-<h2><tiles:insertAttribute name="title"/></h2>
-<p id="body">
-    <tiles:insertAttribute name="body"/>
-</p>
-
-<p>Notice that this is a layout made in JSP</p>
-
-<tiles:insertAttribute name="footer"/>

apps/rest-showcase/pom.xml

@@ -22,35 +22,35 @@
  */
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+	<modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.16</version>
+        <version>2.1.7</version>
     </parent>
 
-    <artifactId>struts2-rest-showcase</artifactId>
-    <packaging>war</packaging>
-    <version>2.3.16</version>
-    <name>Struts 2 Rest Showcase Example</name>
-    <description>Struts 2 Rest Showcase Example</description>
+	<groupId>org.apache.struts</groupId>
+	<artifactId>struts2-rest-showcase</artifactId>
+	<packaging>war</packaging>
+	<version>2.1.7</version>
+	<name>Struts 2 Rest Showcase Example</name>
+	<description>Struts 2 Rest Showcase Example</description>
 
-    <dependencies>
+	<dependencies>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-rest-plugin</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-config-browser-plugin</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <version>3.8.2</version>
             <scope>test</scope>
         </dependency>
 
@@ -60,12 +60,13 @@
             <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>commons-httpclient</groupId>
+                <artifactId>commons-httpclient</artifactId>
+                <version>3.1</version>
+                <scope>test</scope>
+            </dependency>
+
 
         <dependency>
             <groupId>net.sourceforge.jwebunit</groupId>
@@ -80,53 +81,45 @@
             </exclusions>
         </dependency>
 
+
     </dependencies>
 
     <build>
-        <finalName>struts2-rest-showcase</finalName>
-        <plugins>
-            <plugin>
+      <finalName>struts2-rest-showcase</finalName>
+    	<plugins>
+    		<plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
+                   <source>1.5</source>
+                   <target>1.5</target>
                 </configuration>
             </plugin>
-
+    		<plugin>
+    			<groupId>org.mortbay.jetty</groupId>
+    			<artifactId>maven-jetty-plugin</artifactId>
+    			<version>6.0.1</version>
+    			<configuration>
+    				<scanIntervalSeconds>10</scanIntervalSeconds>
+    			</configuration>
+    		</plugin>
+            <!--
             <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <version>8.1.7.v20120910</version>
-                <configuration>
-                    <stopKey>CTRL+C</stopKey>
-                    <stopPort>8999</stopPort>
-                    <systemProperties>
-                        <systemProperty>
-                            <name>log4j.configuration</name>
-                            <value>file:${basedir}/src/main/resources/log4j.properties</value>
-                        </systemProperty>
-                        <systemProperty>
-                            <name>slf4j</name>
-                            <value>false</value>
-                        </systemProperty>
-                    </systemProperties>
-                    <scanIntervalSeconds>10</scanIntervalSeconds>
-                    <webAppSourceDirectory>${basedir}/src/main/webapp/</webAppSourceDirectory>
-                    <webAppConfig>
-                        <contextPath>/struts2-rest-showcase</contextPath>
-                        <descriptor>${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
-                    </webAppConfig>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>log4j</groupId>
-                        <artifactId>log4j</artifactId>
-                        <version>1.2.17</version>
-                    </dependency>
-                </dependencies>
+                <groupId>org.twdata.maven</groupId>
+                <artifactId>maven-itblast-plugin</artifactId>
+                <version>0.3</version>
+                <executions>
+                    <execution>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <containers>tomcat5x</containers>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
-
-
+            -->
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
@@ -136,9 +129,16 @@
                     </excludes>
                 </configuration>
             </plugin>
-        </plugins>
+    	</plugins>
     </build>
-    <properties>
-    	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+
+    <!--
+    <pluginRepositories>
+        <pluginRepository>
+            <id>twdata-m2-repository</id>
+            <name>twdata.org Maven Repository</name>
+            <url>http://twdata-m2-repository.googlecode.com/svn/</url>
+        </pluginRepository>
+    </pluginRepositories>
+    -->
 </project>

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

@@ -1,4 +1,4 @@
-package org.demo.rest.example;
+package org.apache.struts2.rest.example;
 
 public class Order {
     String id;

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

@@ -1,11 +1,16 @@
-package org.demo.rest.example;
+package org.apache.struts2.rest.example;
 
 import java.util.Collection;
 
+import org.apache.struts2.dispatcher.ServletActionRedirectResult;
 import org.apache.struts2.rest.DefaultHttpHeaders;
 import org.apache.struts2.rest.HttpHeaders;
 import org.apache.struts2.convention.annotation.Results;
 import org.apache.struts2.convention.annotation.Result;
+import org.apache.struts2.convention.annotation.ParentPackage;
+import org.apache.struts2.convention.annotation.Namespaces;
+import org.apache.struts2.convention.annotation.Namespace;
+import org.apache.struts2.convention.annotation.InterceptorRef;
 
 import com.opensymphony.xwork2.ModelDriven;
 import com.opensymphony.xwork2.Validateable;

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

@@ -1,4 +1,4 @@
-package org.demo.rest.example;
+package org.apache.struts2.rest.example;
 
 import java.util.*;
 

apps/rest-showcase/src/main/resources/log4j.properties

@@ -1,29 +0,0 @@
-#
-# Log4J Settings for log4j 1.2.x (via jakarta-commons-logging)
-#
-# The five logging levels used by Log are (in order):
-#
-#   1. DEBUG (the least serious)
-#   2. INFO
-#   3. WARN
-#   4. ERROR
-#   5. FATAL (the most serious)
-
-
-# Set root logger level to WARN and append to stdout
-log4j.rootLogger=WARN, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-
-# Pattern to output the caller's file name and line number.
-log4j.appender.stdout.layout.ConversionPattern=%d %5p (%c:%L) - %m%n
-
-# Print only messages of level ERROR or above in the package noModule.
-log4j.logger.noModule=ERROR
-
-# OpenSymphony Stuff
-log4j.logger.com.opensymphony=INFO
-
-# Struts2 Stuff
-log4j.logger.org.apache.struts2=INFO

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

@@ -23,8 +23,8 @@
 -->
 
 <!DOCTYPE struts PUBLIC
-	"-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
-	"http://struts.apache.org/dtds/struts-2.3.dtd">
+        "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+        "http://struts.apache.org/dtds/struts-2.0.dtd">
 
 <struts>
     <!--  Overwrite Convention -->

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

@@ -1,38 +1,23 @@
-<!DOCTYPE html>
-<%@taglib prefix="s" uri="/struts-tags" %>
+<!DOCTYPE html PUBLIC 
+	"-//W3C//DTD XHTML 1.1 Transitional//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
-<html lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-    <meta charset="utf-8">
-    <title>Order ${id}</title>
-    <link href="${pageContext.request.contextPath}/css/bootstrap.css" rel="stylesheet">
-    <link href="${pageContext.request.contextPath}/css/bootstrap-responsive.css" rel="stylesheet">
+	<title>Order ${id}</title>
 </head>
 <body>
-<div class="container-fluid">
-    <div class="row-fluid">
-        <div class="span12">
-
-	        <div class="page-header">
-		        <h1>Delete Order ${id}</h1>
-	        </div>
-
-	        <form action="../${id}?_method=DELETE" method="post">
-                <p>
-                    Are you sure you want to delete order ${id}?
-                </p>
-                <div class="btn-group">
-                    <input type="submit" value="Delete" class="btn btn-danger" />
-                    <input type="button" value="Cancel" class="btn btn-success" onclick="window.location.href = '../../orders'" />
-                </div>
-               </form>
-            <br />
-            <a href="${pageContext.request.contextPath}/orders" class="btn btn-info">
-	            <i class="icon icon-arrow-left"></i> Back to Orders
-            </a>
-        </div><!--/row-->
-    </div><!--/span-->
-</div><!--/row-->
+    <form action="../${id}?_method=DELETE" method="post">
+        <p>
+            Are you sure you want to delete order ${id}?
+        </p>
+        <div>
+            <input type="submit" value="Delete" />
+            <input type="button" value="Cancel" onclick="window.location.href = '../../orders'" />
+        </div>
+    </form>
+    <br />
+    <a href="../../orders">Back to Orders</a>
 </body>
 </html>
 	

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

@@ -1,55 +1,27 @@
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC 
+	"-//W3C//DTD XHTML 1.1 Transitional//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+	
 <%@taglib prefix="s" uri="/struts-tags" %>
 
-<html lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-    <meta charset="utf-8">
-    <title>Order <s:property value="id" /></title>
-    <link href="${pageContext.request.contextPath}/css/bootstrap.css" rel="stylesheet">
-    <link href="${pageContext.request.contextPath}/css/bootstrap-responsive.css" rel="stylesheet">
+	<title>Order <s:property value="id" /></title>
 </head>
 <body>
-<div class="container-fluid">
-    <div class="row-fluid">
-        <div class="span12">
-
-	        <div class="page-header">
-		        <h1>Order <s:property value="id" /></h1>
-	        </div>
-
-	        <s:fielderror  cssClass="alert alert-error"/>
-
-            <s:form method="post" action="%{#request.contextPath}/orders/%{id}" cssClass="form-horizontal" theme="simple">
-                <s:hidden name="_method" value="put" />
-                <div class="control-group">
-                    <label class="control-label" for="id">ID</label>
-                    <div class="controls">
-                        <s:textfield id="id" name="id" disabled="true"/>
-                    </div>
-                </div>
-                <div class="control-group">
-                    <label class="control-label" for="clientName">Client</label>
-                    <div class="controls">
-                        <s:textfield id="clientName" name="clientName"/>
-                    </div>
-                </div>
-                <div class="control-group">
-                    <label class="control-label" for="amount">Amount</label>
-                    <div class="controls">
-                        <s:textfield id="amount" name="amount" />
-                    </div>
-                </div>
-                <div class="form-actions">
-                    <s:submit cssClass="btn btn-primary"/>
-                </div>
-                <table>
-            </s:form>
-	        <a href="${pageContext.request.contextPath}/orders" class="btn btn-info">
-		        <i class="icon icon-arrow-left"></i> Back to Orders
-	        </a>
-        </div><!--/row-->
-    </div><!--/span-->
-</div><!--/row-->
+    <s:form method="post" action="%{#request.contextPath}/orders/%{id}">
+    <s:hidden name="_method" value="put" />
+    <table>
+        <s:textfield name="id" label="ID" disabled="true"/>
+        <s:textfield name="clientName" label="Client"/>
+        <s:textfield name="amount" label="Amount" />
+        <tr>
+            <td colspan="2">
+                <s:submit />
+            </td>
+    </table>
+    </s:form>    	
+    <a href="<%=request.getContextPath() %>/orders">Back to Orders</a>
 </body>
 </html>
 	

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

@@ -1,47 +1,25 @@
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC 
+	"-//W3C//DTD XHTML 1.1 Transitional//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+	
 <%@taglib prefix="s" uri="/struts-tags" %>
 
-<html lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-    <meta charset="utf-8">
-    <title>New Order</title>
-    <link href="${pageContext.request.contextPath}/css/bootstrap.css" rel="stylesheet">
-    <link href="${pageContext.request.contextPath}/css/bootstrap-responsive.css" rel="stylesheet">
+	<title>New Order</title>
 </head>
 <body>
-<div class="container-fluid">
-    <div class="row-fluid">
-        <div class="span12">
-
-	        <div class="page-header">
-		        <h1>New Order</h1>
-	        </div>
-
-	        <s:fielderror  cssClass="alert alert-error"/>
-
-	        <s:form method="post" action="%{#request.contextPath}/orders" cssClass="form-horizontal" theme="simple">
-                <div class="control-group">
-                    <label class="control-label" for="clientName">Client</label>
-                    <div class="controls">
-                        <s:textfield id="clientName" name="clientName"/>
-                    </div>
-                </div>
-                <div class="control-group">
-                    <label class="control-label" for="amount">Amount</label>
-                    <div class="controls">
-                            <s:textfield id="amount" name="amount" />
-                    </div>
-                </div>
-                <div class="form-actions">
-                    <s:submit cssClass="btn btn-primary"/>
-                </div>
-            </s:form>
-	        <a href="${pageContext.request.contextPath}/orders" class="btn btn-info">
-		        <i class="icon icon-arrow-left"></i> Back to Orders
-	        </a>
-        </div><!--/row-->
-    </div><!--/span-->
-</div><!--/row-->
+    <s:form method="post" action="%{#request.contextPath}/orders">
+    <table>
+        <s:textfield name="clientName" label="Client"/>
+        <s:textfield name="amount" label="Amount" />
+        <tr>
+            <td colspan="2">
+                <s:submit />
+            </td>
+    </table>
+    </s:form>    	
+    <a href="<%=request.getContextPath() %>/orders">Back to Orders</a>
 </body>
 </html>
 	

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

@@ -1,48 +1,34 @@
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC 
+	"-//W3C//DTD XHTML 1.1 Transitional//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
 <%@taglib prefix="s" uri="/struts-tags" %>
 
-<html lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-    <meta charset="utf-8">
-    <title>Orders</title>
-    <link href="${pageContext.request.contextPath}/css/bootstrap.css" rel="stylesheet">
-    <link href="${pageContext.request.contextPath}/css/bootstrap-responsive.css" rel="stylesheet">
+	<title>Orders</title>
 </head>
 <body>
-<div class="container-fluid">
-    <div class="row-fluid">
-        <div class="span12">
-
-	        <div class="page-header">
-	            <h1>Orders</h1>
-		    </div>
-            <s:actionmessage  cssClass="alert alert-error"/>
-            <table class="table table-striped">
-                <tr>
-                    <th>ID</th>
-                    <th>Client</th>
-                    <th>Amount</th>
-                    <th>Actions</th>
-                </tr>
-                <s:iterator value="model">
-                <tr>
-                    <td>${id}</td>
-                    <td><s:property value="clientName"/></td>
-                    <td><s:property value="amount"/></td>
-                    <td>
-                        <div class="btn-group">
-                            <a href="orders/${id}" class="btn"><i class="icon icon-eye-open"></i> View</a>
-                            <a href="orders/${id}/edit" class="btn"><i class="icon icon-edit"></i> Edit</a>
-                            <a href="orders/${id}/deleteConfirm" class="btn btn-danger"><i class="icon icon-trash"></i> Delete</a>
-                        </div>
-                   </td>
-                </tr>
-                </s:iterator>
-            </table>
-            <a href="orders/new" class="btn btn-primary"><i class="icon icon-file"></i> Create a new order</a>
-        </div><!--/row-->
-    </div><!--/span-->
-</div><!--/row-->
+    <s:actionmessage />
+    <table>
+        <tr>
+            <th>ID</th>
+            <th>Client</th>
+            <th>Amount</th>
+            <th>Actions</th>
+        </tr>
+        <s:iterator value="model">
+        <tr>
+            <td>${id}</td>
+            <td>${clientName}</td>
+            <td>${amount}</td>
+            <td><a href="orders/${id}">View</a> |
+                <a href="orders/${id}/edit">Edit</a> |
+                <a href="orders/${id}/deleteConfirm">Delete</a></td>
+        </tr>
+        </s:iterator>
+    </table>    	
+    <a href="orders/new">Create a new order</a>
 </body>
 </html>
 	

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

@@ -1,40 +1,27 @@
-<!DOCTYPE html>
-<%@taglib prefix="s" uri="/struts-tags" %>
-
-<html lang="en">
+<!DOCTYPE html PUBLIC 
+	"-//W3C//DTD XHTML 1.1 Transitional//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+	
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-    <meta charset="utf-8">
-    <title>Order ${id}</title>
-    <link href="${pageContext.request.contextPath}/css/bootstrap.css" rel="stylesheet">
-    <link href="${pageContext.request.contextPath}/css/bootstrap-responsive.css" rel="stylesheet">
+	<title>Order ${id}</title>
 </head>
 <body>
-<div class="container-fluid">
-    <div class="row-fluid">
-        <div class="span12">
-            <div class="page-header">
-                <h1>Order ${id}</h1>
-            </div>
-            <table class="table table-striped">
-                <tr>
-                    <td class="span3">ID</td>
-                    <td class="span9"><s:property value="id"/></td>
-                </tr>
-                <tr>
-                    <td class="span3">Client</td>
-                    <td class="span9"><s:property value="clientName"/></td>
-                </tr>
-                <tr>
-                    <td class="span3">Amount</td>
-                    <td class="span9"><s:property value="amount"/></td>
-                </tr>
-            </table>
-	        <a href="${pageContext.request.contextPath}/orders" class="btn btn-info">
-		        <i class="icon icon-arrow-left"></i> Back to Orders
-	        </a>
-        </div><!--/row-->
-    </div><!--/span-->
-</div><!--/row-->
+    <table>
+        <tr>
+            <th>ID</th>
+            <td>${id}</td>
+        </tr>
+        <tr>
+            <th>Client</th>
+            <td>${clientName}</td>
+        </tr>
+        <tr>
+            <th>Amount</th>
+            <td>${amount}</td>
+        </tr>
+    </table>    	
+    <a href="../orders">Back to Orders</a>
 </body>
 </html>
 	

apps/showcase/pom.xml

@@ -26,19 +26,20 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.16</version>
+        <version>2.1.7</version>
     </parent>
-
+    <groupId>org.apache.struts</groupId>
     <artifactId>struts2-showcase</artifactId>
     <packaging>war</packaging>
     <name>Showcase Webapp</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_16/apps/showcase</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_16/apps/showcase</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_16/apps/showcase</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_7/apps/showcase</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_7/apps/showcase</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_7/apps/showcase</url>
     </scm>
 
+
     <profiles>
         <profile>
             <id>hostedqa</id>
@@ -55,133 +56,157 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-struts1-plugin</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-dojo-plugin</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-jsf-plugin</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-config-browser-plugin</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-sitemesh-plugin</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-tiles-plugin</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-dwr-plugin</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-json-plugin</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tiles</groupId>
             <artifactId>tiles-jsp</artifactId>
+            <version>2.0.5</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-convention-plugin</artifactId>
+            <artifactId>struts2-codebehind-plugin</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-spring-plugin</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
+           <groupId>javax.servlet</groupId>
+           <artifactId>servlet-api</artifactId>
+           <version>2.4</version>
+           <scope>provided</scope>
         </dependency>
 
         <!-- Velocity -->
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
+            <version>1.5</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-tools</artifactId>
+            <version>1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>struts</groupId>
+                    <artifactId>struts</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
+
         <dependency>
             <groupId>opensymphony</groupId>
             <artifactId>sitemesh</artifactId>
+            <version>2.4.2</version>
         </dependency>
         <dependency>
             <groupId>uk.ltd.getahead</groupId>
             <artifactId>dwr</artifactId>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
+            <version>1.2.9</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
-             <artifactId>commons-logging</artifactId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.0.4</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-impl</artifactId>
-            <version>1.1.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
-            <version>1.1.2</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-        </dependency>
+         <groupId>org.apache.myfaces.core</groupId>
+         <artifactId>myfaces-impl</artifactId>
+         <version>1.1.2</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.myfaces.core</groupId>
+         <artifactId>myfaces-api</artifactId>
+         <version>1.1.2</version>
+      </dependency>
+     <dependency>
+         <groupId>commons-fileupload</groupId>
+         <artifactId>commons-fileupload</artifactId>
+         <version>1.1.1</version>
+     </dependency>
 
-        <dependency>
-            <groupId>net.sourceforge.jwebunit</groupId>
-            <artifactId>jwebunit-core</artifactId>
-            <version>1.4.1</version>
-            <scope>test</scope>
-        </dependency>
+     <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>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>
+     <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>
 
     </dependencies>
 
@@ -189,37 +214,47 @@
         <plugins>
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <version>8.1.7.v20120910</version>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.0.1</version>
                 <configuration>
-                    <stopKey>CTRL+C</stopKey>
-                    <stopPort>8999</stopPort>
-                    <systemProperties>
-                        <systemProperty>
-                            <name>log4j.configuration</name>
-                            <value>file:${basedir}/src/main/resources/log4j.properties</value>
-                        </systemProperty>
-                        <systemProperty>
-                            <name>slf4j</name>
-                            <value>false</value>
-                        </systemProperty>
-                    </systemProperties>
                     <scanIntervalSeconds>10</scanIntervalSeconds>
-                    <webAppSourceDirectory>${basedir}/src/main/webapp/</webAppSourceDirectory>
-                    <webAppConfig>
-                        <contextPath>/struts2-showcase</contextPath>
-                        <descriptor>${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
-                    </webAppConfig>
                 </configuration>
                 <dependencies>
                     <dependency>
+                     <groupId>org.apache.myfaces.core</groupId>
+                     <artifactId>myfaces-impl</artifactId>
+                     <version>1.1.2</version>
+                    </dependency>
+                    <dependency>
+                     <groupId>org.apache.myfaces.core</groupId>
+                     <artifactId>myfaces-api</artifactId>
+                     <version>1.1.2</version>
+                   </dependency>
+                   <dependency>
                         <groupId>log4j</groupId>
                         <artifactId>log4j</artifactId>
-                        <version>1.2.17</version>
-                    </dependency>
+                        <version>1.2.9</version>
+                   </dependency>
                 </dependencies>
             </plugin>
-
+            <!--
+            <plugin>
+                <groupId>org.twdata.maven</groupId>
+                <artifactId>maven-itblast-plugin</artifactId>
+                <version>0.3</version>
+                <executions>
+                    <execution>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <containers>tomcat5x</containers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            -->
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
@@ -245,7 +280,13 @@
         </resources>
 
     </build>
-    <properties>
-    	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+    <!--
+    <pluginRepositories>
+        <pluginRepository>
+            <id>twdata-m2-repository</id>
+            <name>twdata.org Maven Repository</name>
+            <url>http://twdata-m2-repository.googlecode.com/svn/</url>
+        </pluginRepository>
+    </pluginRepositories>
+    -->
 </project>

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

@@ -20,84 +20,87 @@
  */
 package org.apache.struts2.showcase;
 
-import com.opensymphony.xwork2.ActionSupport;
-
 import java.text.DateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 
+import com.opensymphony.xwork2.ActionSupport;
+
 /**
  * <code>DateAction</code>
+ *
  */
 public class DateAction extends ActionSupport {
 
-	private static DateFormat DF = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM);
+    private static DateFormat DF = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM);
 
-	private Date now;
-	private Date past;
-	private Date future;
-	private Date after;
-	private Date before;
+    private Date now;
+    private Date past;
+    private Date future;
+    private Date after;
+    private Date before;
 
 
-	public String getDate() {
-		return DF.format(new Date());
-	}
+    public String getDate() {
+        return DF.format(new Date());
+    }
 
 
-	/**
-	 * @return Returns the future.
-	 */
-	public Date getFuture() {
-		return future;
-	}
+    /**
+     * @return Returns the future.
+     */
+    public Date getFuture() {
+        return future;
+    }
 
-	/**
-	 * @return Returns the now.
-	 */
-	public Date getNow() {
-		return now;
-	}
+    /**
+     * @return Returns the now.
+     */
+    public Date getNow() {
+        return now;
+    }
 
-	/**
-	 * @return Returns the past.
-	 */
-	public Date getPast() {
-		return past;
-	}
+    /**
+     * @return Returns the past.
+     */
+    public Date getPast() {
+        return past;
+    }
 
-	/**
-	 * @return Returns the before date.
-	 */
-	public Date getBefore() {
-		return before;
-	}
+    /**
+     *
+     * @return Returns the before date.
+     */
+    public Date getBefore() {
+        return before;
+    }
 
-	/**
-	 * @return Returns the after date.
-	 */
-	public Date getAfter() {
-		return after;
-	}
+    /**
+     *
+     * @return Returns the after date.
+     */
+    public Date getAfter() {
+        return after;
+    }
 
-	/**
-	 */
-	public String browse() throws Exception {
-		Calendar cal = GregorianCalendar.getInstance();
-		now = cal.getTime();
-		cal.roll(Calendar.DATE, -1);
-		cal.roll(Calendar.HOUR, -3);
-		past = cal.getTime();
-		cal.roll(Calendar.DATE, 2);
-		future = cal.getTime();
+    /**
+     */
+    public String browse() throws Exception {
+        Calendar cal = GregorianCalendar.getInstance();
+        now = cal.getTime();
+        cal.roll(Calendar.DATE, -1);
+        cal.roll(Calendar.HOUR, -3);
+        past = cal.getTime();
+        cal.roll(Calendar.DATE, 2);
+        future = cal.getTime();
 
-		cal.roll(Calendar.YEAR, -1);
-		before = cal.getTime();
+        cal.roll(Calendar.YEAR, -1);
+        before = cal.getTime();
 
-		cal.roll(Calendar.YEAR, 2);
-		after = cal.getTime();
-		return SUCCESS;
-	}
+        cal.roll(Calendar.YEAR, 2);
+        after = cal.getTime();
+        return SUCCESS;
+    }
 
 }

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

@@ -20,35 +20,35 @@
  */
 package org.apache.struts2.showcase;
 
-import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.showcase.ajax.tree.Category;
 
+import com.opensymphony.xwork2.ActionSupport;
+
 //START SNIPPET: treeExampleDynamicJavaSelected
 
 public class DynamicTreeSelectAction extends ActionSupport {
 
-	private long nodeId;
-	private Category currentCategory;
+    private long nodeId;
+    private Category currentCategory;
 
 
-	public void setNodeId(long nodeId) {
-		this.nodeId = nodeId;
-	}
-
-	public long getNodeId() {
-		return nodeId;
-	}
+    public void setNodeId(long nodeId) {
+        this.nodeId = nodeId;
+    }
+    public long getNodeId() {
+        return nodeId;
+    }
 
 
-	public String execute() throws Exception {
-		currentCategory = Category.getById(nodeId);
-		return SUCCESS;
-	}
+    public String execute() throws Exception {
+        currentCategory = Category.getById(nodeId);
+        return SUCCESS;
+    }
 
 
-	public String getNodeName() {
-		return currentCategory != null ? currentCategory.getName() : "Node not found";
-	}
+    public String getNodeName() {
+        return currentCategory != null ? currentCategory.getName() : "Node not found";
+    }
 }
 
 //START SNIPPET: treeExampleDynamicJavaSelected

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

@@ -20,261 +20,267 @@
  */
 package org.apache.struts2.showcase;
 
-import com.opensymphony.xwork2.ActionSupport;
-
-import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.ArrayList;
+
+import com.opensymphony.xwork2.ActionSupport;
 
 /**
  */
 public class LotsOfOptiontransferselectAction extends ActionSupport {
 
-	private List _favouriteCartoonCharactersKeys;
-	private List _notFavouriteCartoonCharactersKeys;
+    private List _favouriteCartoonCharactersKeys;
+    private List _notFavouriteCartoonCharactersKeys;
 
-	private List _favouriteCarsKeys;
-	private List _notFavouriteCarsKeys;
+    private List _favouriteCarsKeys;
+    private List _notFavouriteCarsKeys;
 
-	private List _favouriteMotorcyclesKeys;
-	private List _notFavouriteMotorcyclesKeys;
+    private List _favouriteMotorcyclesKeys;
+    private List _notFavouriteMotorcyclesKeys;
 
-	private List _favouriteCountriesKeys;
-	private List _notFavouriteCountriesKeys;
+    private List _favouriteCountriesKeys;
+    private List _notFavouriteCountriesKeys;
 
-	private List _favouriteSportsKeys;
-	private List _nonFavouriteSportsKeys;
+    private List _favouriteSportsKeys;
+    private List _nonFavouriteSportsKeys;
 
-	private List _favouriteCities;
+    private List _favouriteCities;
 
-	private List _prioritisedFavouriteCartoonCharacters;
-	private List _prioritisedFavouriteCars;
-	private List _prioritisedFavouriteCountries;
+    private List _prioritisedFavouriteCartoonCharacters;
+    private List _prioritisedFavouriteCars;
+    private List _prioritisedFavouriteCountries;
 
 
-	// Cartoon Characters
-	public Map getDefaultFavouriteCartoonCharacters() {
-		Map m = new LinkedHashMap();
-		m.put("heMan", "He-Man");
-		m.put("popeye", "Popeye");
-		m.put("mockeyMouse", "Mickey Mouse");
-		return m;
-	}
 
-	public Map getDefaultNotFavouriteCartoonCharacters() {
-		Map m = new LinkedHashMap();
-		m.put("donaldDuck", "Donald Duck");
-		m.put("atomicAnt", "Atomic Ant");
-		m.put("pinkPainter", "Pink Painter");
-		return m;
-	}
+    // Cartoon Characters
+    public Map getDefaultFavouriteCartoonCharacters() {
+        Map m = new LinkedHashMap();
+        m.put("heMan", "He-Man");
+        m.put("popeye", "Popeye");
+        m.put("mockeyMouse", "Mickey Mouse");
+        return m;
+    }
 
-	public List getFavouriteCartoonCharacters() {
-		return _favouriteCartoonCharactersKeys;
-	}
+    public Map getDefaultNotFavouriteCartoonCharacters() {
+        Map m = new LinkedHashMap();
+        m.put("donaldDuck", "Donald Duck");
+        m.put("atomicAnt", "Atomic Ant");
+        m.put("pinkPainter", "Pink Painter");
+        return m;
+    }
 
-	public void setFavouriteCartoonCharacters(List favouriteCartoonCharacters) {
-		_favouriteCartoonCharactersKeys = favouriteCartoonCharacters;
-	}
+    public List getFavouriteCartoonCharacters() {
+        return _favouriteCartoonCharactersKeys;
+    }
 
-	public List getNotFavouriteCartoonCharacters() {
-		return _notFavouriteCartoonCharactersKeys;
-	}
+    public void setFavouriteCartoonCharacters(List favouriteCartoonCharacters) {
+        _favouriteCartoonCharactersKeys = favouriteCartoonCharacters;
+    }
 
-	public void setNotFavouriteCartoonCharacters(List notFavouriteCartoonCharacters) {
-		_notFavouriteCartoonCharactersKeys = notFavouriteCartoonCharacters;
-	}
+    public List getNotFavouriteCartoonCharacters() {
+        return _notFavouriteCartoonCharactersKeys;
+    }
+
+    public void setNotFavouriteCartoonCharacters(List notFavouriteCartoonCharacters) {
+        _notFavouriteCartoonCharactersKeys = notFavouriteCartoonCharacters;
+    }
 
 
-	// Cars
-	public Map getDefaultFavouriteCars() {
-		Map m = new LinkedHashMap();
-		m.put("alfaRomeo", "Alfa Romeo");
-		m.put("Toyota", "Toyota");
-		m.put("Mitsubitshi", "Mitsubitshi");
-		return m;
-	}
-
-	public Map getDefaultNotFavouriteCars() {
-		Map m = new LinkedHashMap();
-		m.put("ford", "Ford");
-		m.put("landRover", "Land Rover");
-		m.put("mercedes", "Mercedes");
-		return m;
-	}
-
-	public List getFavouriteCars() {
-		return _favouriteCarsKeys;
-	}
-
-	public void setFavouriteCars(List favouriteCars) {
-		_favouriteCarsKeys = favouriteCars;
-	}
-
-	public List getNotFavouriteCars() {
-		return _notFavouriteCarsKeys;
-	}
-
-	public void setNotFavouriteCars(List notFavouriteCars) {
-		_notFavouriteCarsKeys = notFavouriteCars;
-	}
 
 
-	// Motorcycles
-	public Map getDefaultFavouriteMotorcycles() {
-		Map m = new LinkedHashMap();
-		m.put("honda", "Honda");
-		m.put("yamaha", "Yamaha");
-		m.put("Aprillia", "Aprillia");
-		return m;
-	}
 
-	public Map getDefaultNotFavouriteMotorcycles() {
-		Map m = new LinkedHashMap();
-		m.put("cagiva", "Cagiva");
-		m.put("harleyDavidson", "Harley Davidson");
-		m.put("suzuki", "Suzuki");
-		return m;
-	}
+    // Cars
+    public Map getDefaultFavouriteCars() {
+        Map m = new LinkedHashMap();
+        m.put("alfaRomeo", "Alfa Romeo");
+        m.put("Toyota", "Toyota");
+        m.put("Mitsubitshi", "Mitsubitshi");
+        return m;
+    }
 
-	public List getFavouriteMotorcycles() {
-		return _favouriteMotorcyclesKeys;
-	}
+    public Map getDefaultNotFavouriteCars() {
+        Map m = new LinkedHashMap();
+        m.put("ford", "Ford");
+        m.put("landRover", "Land Rover");
+        m.put("mercedes", "Mercedes");
+        return m;
+    }
 
-	public void setFavouriteMotorcycles(List favouriteMotorcycles) {
-		_favouriteMotorcyclesKeys = favouriteMotorcycles;
-	}
+    public List getFavouriteCars() {
+        return _favouriteCarsKeys;
+    }
 
-	public List getNotFavouriteMotorcycles() {
-		return _notFavouriteMotorcyclesKeys;
-	}
+    public void setFavouriteCars(List favouriteCars) {
+        _favouriteCarsKeys = favouriteCars;
+    }
 
-	public void setNotFavouriteMotorcycles(List notFavouriteMotorcycles) {
-		_notFavouriteMotorcyclesKeys = notFavouriteMotorcycles;
-	}
+    public List getNotFavouriteCars() {
+        return _notFavouriteCarsKeys;
+    }
+
+    public void setNotFavouriteCars(List notFavouriteCars) {
+        _notFavouriteCarsKeys = notFavouriteCars;
+    }
 
 
-	// Countries
-	public Map getDefaultFavouriteCountries() {
-		Map m = new LinkedHashMap();
-		m.put("england", "England");
-		m.put("america", "America");
-		m.put("brazil", "Brazil");
-		return m;
-	}
 
-	public Map getDefaultNotFavouriteCountries() {
-		Map m = new LinkedHashMap();
-		m.put("germany", "Germany");
-		m.put("china", "China");
-		m.put("russia", "Russia");
-		return m;
-	}
+    // Motorcycles
+    public Map getDefaultFavouriteMotorcycles() {
+        Map m = new LinkedHashMap();
+        m.put("honda", "Honda");
+        m.put("yamaha", "Yamaha");
+        m.put("Aprillia", "Aprillia");
+        return m;
+    }
 
-	public List getFavouriteCountries() {
-		return _favouriteCountriesKeys;
-	}
+    public Map getDefaultNotFavouriteMotorcycles() {
+        Map m = new LinkedHashMap();
+        m.put("cagiva", "Cagiva");
+        m.put("harleyDavidson", "Harley Davidson");
+        m.put("suzuki", "Suzuki");
+        return m;
+    }
 
-	public void setFavouriteCountries(List favouriteCountries) {
-		_favouriteCountriesKeys = favouriteCountries;
-	}
+    public List getFavouriteMotorcycles() {
+        return _favouriteMotorcyclesKeys;
+    }
 
-	public List getNotFavouriteCountries() {
-		return _notFavouriteCountriesKeys;
-	}
+    public void setFavouriteMotorcycles(List favouriteMotorcycles) {
+        _favouriteMotorcyclesKeys = favouriteMotorcycles;
+    }
 
-	public void setNotFavouriteCountries(List notFavouriteCountries) {
-		_notFavouriteCountriesKeys = notFavouriteCountries;
-	}
+    public List getNotFavouriteMotorcycles() {
+        return _notFavouriteMotorcyclesKeys;
+    }
 
-	// Sports
-	public Map getDefaultNonFavoriteSports() {
-		Map m = new LinkedHashMap();
-		m.put("basketball", "Basketball");
-		m.put("football", "Football");
-		m.put("baseball", "Baseball");
-		return m;
-	}
-
-	public Map getDefaultFavoriteSports() {
-		return new LinkedHashMap();
-	}
-
-	public List getFavouriteSports() {
-		return _favouriteSportsKeys;
-	}
-
-	public void setFavouriteSports(List favouriteSportsKeys) {
-		this._favouriteSportsKeys = favouriteSportsKeys;
-	}
-
-	public List getNonFavouriteSports() {
-		return _nonFavouriteSportsKeys;
-	}
-
-	public void setNonFavouriteSports(List notFavouriteSportsKeys) {
-		this._nonFavouriteSportsKeys = notFavouriteSportsKeys;
-	}
+    public void setNotFavouriteMotorcycles(List notFavouriteMotorcycles) {
+        _notFavouriteMotorcyclesKeys = notFavouriteMotorcycles;
+    }
 
 
-	public List getPrioritisedFavouriteCartoonCharacters() {
-		return _prioritisedFavouriteCartoonCharacters;
-	}
 
-	public void setPrioritisedFavouriteCartoonCharacters(List prioritisedFavouriteCartoonCharacters) {
-		_prioritisedFavouriteCartoonCharacters = prioritisedFavouriteCartoonCharacters;
-	}
+    // Countries
+    public Map getDefaultFavouriteCountries() {
+        Map m = new LinkedHashMap();
+        m.put("england", "England");
+        m.put("america", "America");
+        m.put("brazil", "Brazil");
+        return m;
+    }
 
-	public List getPrioritisedFavouriteCars() {
-		return _prioritisedFavouriteCars;
-	}
+    public Map getDefaultNotFavouriteCountries() {
+        Map m = new LinkedHashMap();
+        m.put("germany", "Germany");
+        m.put("china", "China");
+        m.put("russia", "Russia");
+        return m;
+    }
 
-	public void setPrioritisedFavouriteCars(List prioritisedFavouriteCars) {
-		_prioritisedFavouriteCars = prioritisedFavouriteCars;
-	}
+    public List getFavouriteCountries() {
+        return _favouriteCountriesKeys;
+    }
+
+    public void setFavouriteCountries(List favouriteCountries) {
+        _favouriteCountriesKeys = favouriteCountries;
+    }
+
+    public List getNotFavouriteCountries() {
+        return _notFavouriteCountriesKeys;
+    }
+
+    public void setNotFavouriteCountries(List notFavouriteCountries) {
+        _notFavouriteCountriesKeys = notFavouriteCountries;
+    }
+
+    // Sports
+    public Map getDefaultNonFavoriteSports() {
+        Map m = new LinkedHashMap();
+        m.put("basketball", "Basketball");
+        m.put("football", "Football");
+        m.put("baseball", "Baseball");
+        return m;
+    }
+
+    public Map getDefaultFavoriteSports() {
+        return new LinkedHashMap();
+    }
+
+    public List getFavouriteSports() {
+        return _favouriteSportsKeys;
+    }
+
+    public void setFavouriteSports(List favouriteSportsKeys) {
+        this._favouriteSportsKeys = favouriteSportsKeys;
+    }
+
+    public List getNonFavouriteSports() {
+        return _nonFavouriteSportsKeys;
+    }
+
+    public void setNonFavouriteSports(List notFavouriteSportsKeys) {
+        this._nonFavouriteSportsKeys = notFavouriteSportsKeys;
+    }
 
 
-	public List getPrioritisedFavouriteCountries() {
-		return _prioritisedFavouriteCountries;
-	}
+    
 
-	public void setPrioritisedFavouriteCountries(List prioritisedFavouriteCountries) {
-		_prioritisedFavouriteCountries = prioritisedFavouriteCountries;
-	}
+    public List getPrioritisedFavouriteCartoonCharacters() {
+        return _prioritisedFavouriteCartoonCharacters;
+    }
+    public void setPrioritisedFavouriteCartoonCharacters(List prioritisedFavouriteCartoonCharacters) {
+        _prioritisedFavouriteCartoonCharacters = prioritisedFavouriteCartoonCharacters;
+    }
+
+    public List getPrioritisedFavouriteCars() {
+        return _prioritisedFavouriteCars;
+    }
+    public void setPrioritisedFavouriteCars(List prioritisedFavouriteCars) {
+        _prioritisedFavouriteCars = prioritisedFavouriteCars;
+    }
 
 
-	public Map getAvailableCities() {
-		Map map = new LinkedHashMap();
-		map.put("boston", "Boston");
-		map.put("new york", "New York");
-		map.put("london", "London");
-		map.put("rome", "Rome");
-		return map;
-	}
+    public List getPrioritisedFavouriteCountries() {
+        return _prioritisedFavouriteCountries;
+    }
+    public void setPrioritisedFavouriteCountries(List prioritisedFavouriteCountries) {
+        _prioritisedFavouriteCountries = prioritisedFavouriteCountries;
+    }
 
-	public List getDefaultFavouriteCities() {
-		List list = new ArrayList();
-		list.add("boston");
-		list.add("rome");
-		return list;
-	}
 
-	public List getFavouriteCities() {
-		return _favouriteCities;
-	}
 
-	public void setFavouriteCities(List favouriteCities) {
-		this._favouriteCities = favouriteCities;
-	}
+    public Map getAvailableCities() {
+        Map map = new LinkedHashMap();
+        map.put("boston", "Boston");
+        map.put("new york", "New York");
+        map.put("london", "London");
+        map.put("rome", "Rome");
+        return map;
+    }
 
-	// actions
+    public List getDefaultFavouriteCities() {
+        List list = new ArrayList();
+        list.add("boston");
+        list.add("rome");
+        return list;
+    }
 
-	public String input() throws Exception {
-		return SUCCESS;
-	}
+    public List getFavouriteCities() {
+        return _favouriteCities;
+    }
 
-	public String submit() throws Exception {
-		return SUCCESS;
-	}
+    public void setFavouriteCities(List favouriteCities) {
+        this._favouriteCities = favouriteCities;
+    }
+
+    // actions
+
+    public String input() throws Exception {
+        return SUCCESS;
+    }
+
+    public String submit() throws Exception {
+        return SUCCESS;
+    }
 }

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

@@ -27,52 +27,52 @@ import com.opensymphony.xwork2.ActionSupport;
  */
 public class LotsOfRichtexteditorAction extends ActionSupport {
 
-	public String description1;
-	public String description2 = "This is Description 2";
-	public String description3;
-	public String description4 = "This is Description 4";
+    public String description1;
+    public String description2 = "This is Description 2";
+    public String description3;
+    public String description4 = "This is Description 4";
 
-	public String getDescription1() {
-		return this.description1;
-	}
-
-	public void setDescription1(String description1) {
-		this.description1 = description1;
-	}
+    public String getDescription1() {
+        return this.description1;
+    }
+    public void setDescription1(String description1) {
+        this.description1 = description1;
+    }
 
 
-	public String getDescription2() {
-		return this.description2;
-	}
-
-	public void setDescription2(String description2) {
-		this.description2 = description2;
-	}
+    public String getDescription2() {
+        return this.description2;
+    }
+    public void setDescription2(String description2) {
+        this.description2 = description2;
+    }
 
 
-	public String getDescription3() {
-		return this.description3;
-	}
-
-	public void setDescription3(String description3) {
-		this.description3 = description3;
-	}
+    public String getDescription3() {
+        return this.description3;
+    }
+    public void setDescription3(String description3) {
+        this.description3 = description3;
+    }
 
 
-	public String getDescription4() {
-		return this.description4;
-	}
-
-	public void setDescription4(String description4) {
-		this.description4 = description4;
-	}
 
 
-	public String input() throws Exception {
-		return SUCCESS;
-	}
+    public String getDescription4() {
+        return this.description4;
+    }
+    public void setDescription4(String description4) {
+        this.description4 = description4;
+    }
 
-	public String submit() throws Exception {
-		return SUCCESS;
-	}
+
+
+
+    public String input() throws Exception {
+        return SUCCESS;
+    }
+
+    public String submit() throws Exception {
+        return SUCCESS;
+    }
 }

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

@@ -22,115 +22,114 @@ package org.apache.struts2.showcase;
 
 import com.opensymphony.xwork2.ActionSupport;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.LinkedHashMap;
+import java.util.ArrayList;
 
 /**
  */
 public class MoreSelectsAction extends ActionSupport {
 
 
-	private List _prioritisedFavouriteCartoonCharacters;
-	private List _prioritisedFavouriteCars;
-	private List _prioritisedFavouriteCountries;
-	private List favouriteNumbers;
+    private List _prioritisedFavouriteCartoonCharacters;
+    private List _prioritisedFavouriteCars;
+    private List _prioritisedFavouriteCountries;
+    private List favouriteNumbers;
 
 
-	// Cartoon Characters
-	public Map getDefaultFavouriteCartoonCharacters() {
-		Map m = new LinkedHashMap();
-		m.put("heMan", "He-Man");
-		m.put("popeye", "Popeye");
-		m.put("mockeyMouse", "Mickey Mouse");
-		return m;
-	}
+    // Cartoon Characters
+    public Map getDefaultFavouriteCartoonCharacters() {
+        Map m = new LinkedHashMap();
+        m.put("heMan", "He-Man");
+        m.put("popeye", "Popeye");
+        m.put("mockeyMouse", "Mickey Mouse");
+        return m;
+    }
 
 
-	// Cars
-	public Map getDefaultFavouriteCars() {
-		Map m = new LinkedHashMap();
-		m.put("alfaRomeo", "Alfa Romeo");
-		m.put("Toyota", "Toyota");
-		m.put("Mitsubitshi", "Mitsubitshi");
-		return m;
-	}
+    // Cars
+    public Map getDefaultFavouriteCars() {
+        Map m = new LinkedHashMap();
+        m.put("alfaRomeo", "Alfa Romeo");
+        m.put("Toyota", "Toyota");
+        m.put("Mitsubitshi", "Mitsubitshi");
+        return m;
+    }
 
 
-	// Countries
-	public Map getDefaultFavouriteCountries() {
-		Map m = new LinkedHashMap();
-		m.put("england", "England");
-		m.put("america", "America");
-		m.put("brazil", "Brazil");
-		return m;
-	}
 
-	public List getDefaultFavouriteNumbers() {
-		List list = new ArrayList();
-		list.add("Three");
-		list.add("Seven");
-		return list;
-	}
+    // Countries
+    public Map getDefaultFavouriteCountries() {
+        Map m = new LinkedHashMap();
+        m.put("england", "England");
+        m.put("america", "America");
+        m.put("brazil", "Brazil");
+        return m;
+    }
+
+    public List getDefaultFavouriteNumbers() {
+        List list = new ArrayList();
+        list.add("Three");
+        list.add("Seven");
+        return list;
+    }
 
 
-	public List getPrioritisedFavouriteCartoonCharacters() {
-		return _prioritisedFavouriteCartoonCharacters;
-	}
 
-	public void setPrioritisedFavouriteCartoonCharacters(List prioritisedFavouriteCartoonCharacters) {
-		_prioritisedFavouriteCartoonCharacters = prioritisedFavouriteCartoonCharacters;
-	}
+    public List getPrioritisedFavouriteCartoonCharacters() {
+        return _prioritisedFavouriteCartoonCharacters;
+    }
+    public void setPrioritisedFavouriteCartoonCharacters(List prioritisedFavouriteCartoonCharacters) {
+        _prioritisedFavouriteCartoonCharacters = prioritisedFavouriteCartoonCharacters;
+    }
 
-	public List getPrioritisedFavouriteCars() {
-		return _prioritisedFavouriteCars;
-	}
-
-	public void setPrioritisedFavouriteCars(List prioritisedFavouriteCars) {
-		_prioritisedFavouriteCars = prioritisedFavouriteCars;
-	}
+    public List getPrioritisedFavouriteCars() {
+        return _prioritisedFavouriteCars;
+    }
+    public void setPrioritisedFavouriteCars(List prioritisedFavouriteCars) {
+        _prioritisedFavouriteCars = prioritisedFavouriteCars;
+    }
 
 
-	public List getPrioritisedFavouriteCountries() {
-		return _prioritisedFavouriteCountries;
-	}
+    public List getPrioritisedFavouriteCountries() {
+        return _prioritisedFavouriteCountries;
+    }
+    public void setPrioritisedFavouriteCountries(List prioritisedFavouriteCountries) {
+        _prioritisedFavouriteCountries = prioritisedFavouriteCountries;
+    }
 
-	public void setPrioritisedFavouriteCountries(List prioritisedFavouriteCountries) {
-		_prioritisedFavouriteCountries = prioritisedFavouriteCountries;
-	}
+    public List getFavouriteNumbers() {
+        return favouriteNumbers;
+    }
 
-	public List getFavouriteNumbers() {
-		return favouriteNumbers;
-	}
+    public void setFavouriteNumbers(List favouriteNumbers) {
+        this.favouriteNumbers = favouriteNumbers;
+    }
 
-	public void setFavouriteNumbers(List favouriteNumbers) {
-		this.favouriteNumbers = favouriteNumbers;
-	}
+    public Map getAvailableCities() {
+        Map map = new LinkedHashMap();
+        map.put("boston", "Boston");
+        map.put("new york", "New York");
+        map.put("london", "London");
+        map.put("rome", "Rome");
+        return map;
+    }
 
-	public Map getAvailableCities() {
-		Map map = new LinkedHashMap();
-		map.put("boston", "Boston");
-		map.put("new york", "New York");
-		map.put("london", "London");
-		map.put("rome", "Rome");
-		return map;
-	}
+    public List getDefaultFavouriteCities() {
+        List list = new ArrayList();
+        list.add("boston");
+        list.add("rome");
+        return list;
+    }
 
-	public List getDefaultFavouriteCities() {
-		List list = new ArrayList();
-		list.add("boston");
-		list.add("rome");
-		return list;
-	}
+    // actions
 
-	// actions
+    public String input() throws Exception {
+        return SUCCESS;
+    }
 
-	public String input() throws Exception {
-		return SUCCESS;
-	}
-
-	public String submit() throws Exception {
-		return SUCCESS;
-	}
+    public String submit() throws Exception {
+        return SUCCESS;
+    }
 }

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

@@ -20,21 +20,22 @@
  */
 package org.apache.struts2.showcase;
 
-import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.showcase.ajax.tree.Category;
 
+import com.opensymphony.xwork2.ActionSupport;
+
 public class ShowAjaxDynamicTreeAction extends ActionSupport {
-	private int nodeId = 1;
+    private int nodeId = 1;
 
-	public Category getCategory() {
-		return Category.getById(nodeId);
-	}
+    public Category getCategory() {
+        return Category.getById(nodeId);
+    }
 
-	public int getNodeId() {
-		return nodeId;
-	}
+    public int getNodeId() {
+        return nodeId;
+    }
 
-	public void setNodeId(int nodeId) {
-		this.nodeId = nodeId;
-	}
+    public void setNodeId(int nodeId) {
+        this.nodeId = nodeId;
+    }
 }

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

@@ -20,16 +20,17 @@
  */
 package org.apache.struts2.showcase;
 
-import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.showcase.ajax.tree.Category;
 
+import com.opensymphony.xwork2.ActionSupport;
+
 // START SNIPPET: treeExampleDynamicJavaShow
 
 public class ShowDynamicTreeAction extends ActionSupport {
 
-	public Category getTreeRootNode() {
-		return Category.getById(1);
-	}
+    public Category getTreeRootNode() {
+        return Category.getById(1);
+    }
 }
 
 // END SNIPPET: treeExampleDynamicJavaShow

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

@@ -20,330 +20,310 @@
  */
 package org.apache.struts2.showcase;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.struts2.ServletActionContext;
+
 import com.opensymphony.xwork2.ActionSupport;
 import com.opensymphony.xwork2.Validateable;
 import com.opensymphony.xwork2.util.ValueStack;
-import org.apache.struts2.ServletActionContext;
-
-import java.io.File;
-import java.util.*;
 
 /**
  */
 public class UITagExample extends ActionSupport implements Validateable {
 
-	private static final long serialVersionUID = -94044809860988047L;
-
-
-	String name;
-	Date birthday;
-	Date wakeup;
-	String bio;
-	String favouriteColor;
-	List friends;
-	String bestFriend;
-	boolean legalAge;
-	String state;
-	String region;
-	File picture;
-	String pictureContentType;
-	String pictureFileName;
-	String favouriteLanguage;
-	String favouriteVehicalType = "MotorcycleKey";
-	String favouriteVehicalSpecific = "YamahaKey";
-
-	List leftSideCartoonCharacters;
-	List rightSideCartoonCharacters;
-
-	List favouriteLanguages = new ArrayList();
-	List vehicalTypeList = new ArrayList();
-	Map vehicalSpecificMap = new HashMap();
-
-	String thoughts;
-
-	public UITagExample() {
-		favouriteLanguages.add(new Language("EnglishKey", "English Language", "color: blue; font-style: italic;"));
-		favouriteLanguages.add(new Language("FrenchKey", "French Language", "color: grey;"));
-		favouriteLanguages.add(new Language("SpanishKey", "Spanish Language", "color: red; font-wight: bold;"));
-
-		VehicalType car = new VehicalType("CarKey", "Car");
-		VehicalType motorcycle = new VehicalType("MotorcycleKey", "Motorcycle");
-		vehicalTypeList.add(car);
-		vehicalTypeList.add(motorcycle);
-
-		List cars = new ArrayList();
-		cars.add(new VehicalSpecific("MercedesKey", "Mercedes"));
-		cars.add(new VehicalSpecific("HondaKey", "Honda"));
-		cars.add(new VehicalSpecific("FordKey", "Ford"));
-
-		List motorcycles = new ArrayList();
-		motorcycles.add(new VehicalSpecific("SuzukiKey", "Suzuki"));
-		motorcycles.add(new VehicalSpecific("YamahaKey", "Yamaha"));
-
-		vehicalSpecificMap.put(car, cars);
-		vehicalSpecificMap.put(motorcycle, motorcycles);
-	}
-
-
-	public List getLeftSideCartoonCharacters() {
-		return leftSideCartoonCharacters;
-	}
-
-	public void setLeftSideCartoonCharacters(List leftSideCartoonCharacters) {
-		this.leftSideCartoonCharacters = leftSideCartoonCharacters;
-	}
-
-
-	public List getRightSideCartoonCharacters() {
-		return rightSideCartoonCharacters;
-	}
-
-	public void setRightSideCartoonCharacters(List rightSideCartoonCharacters) {
-		this.rightSideCartoonCharacters = rightSideCartoonCharacters;
-	}
-
-
-	public String getFavouriteVehicalType() {
-		return favouriteVehicalType;
-	}
-
-	public void setFavouriteVehicalType(String favouriteVehicalType) {
-		this.favouriteVehicalType = favouriteVehicalType;
-	}
-
-	public String getFavouriteVehicalSpecific() {
-		return favouriteVehicalSpecific;
-	}
-
-	public void setFavouriteVehicalSpecific(String favouriteVehicalSpecific) {
-		this.favouriteVehicalSpecific = favouriteVehicalSpecific;
-	}
-
-	public List getVehicalTypeList() {
-		return vehicalTypeList;
-	}
-
-	public List getVehicalSpecificList() {
-		ValueStack stack = ServletActionContext.getValueStack(ServletActionContext.getRequest());
-		Object vehicalType = stack.findValue("top");
-		if (vehicalType != null && vehicalType instanceof VehicalType) {
-			List l = (List) vehicalSpecificMap.get(vehicalType);
-			return l;
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	public List getFavouriteLanguages() {
-		return favouriteLanguages;
-	}
-
-	public String execute() throws Exception {
-		return SUCCESS;
-	}
-
-	public String getName() {
-		return name;
-	}
+    private static final long serialVersionUID = -94044809860988047L;
+
+
+    String name;
+    Date birthday;
+    Date wakeup;
+    String bio;
+    String favouriteColor;
+    List friends;
+    boolean legalAge;
+    String state;
+    String region;
+    File picture;
+    String pictureContentType;
+    String pictureFileName;
+    String favouriteLanguage;
+    String favouriteVehicalType = "MotorcycleKey";
+    String favouriteVehicalSpecific = "YamahaKey";
+
+    List leftSideCartoonCharacters;
+    List rightSideCartoonCharacters;
+
+    List favouriteLanguages = new ArrayList();
+    List vehicalTypeList = new ArrayList();
+    Map vehicalSpecificMap = new HashMap();
+
+    String thoughts;
+
+    public UITagExample() {
+        favouriteLanguages.add(new Language("EnglishKey", "English Language"));
+        favouriteLanguages.add(new Language("FrenchKey", "French Language"));
+        favouriteLanguages.add(new Language("SpanishKey", "Spanish Language"));
+
+        VehicalType car = new VehicalType("CarKey", "Car");
+        VehicalType motorcycle = new VehicalType("MotorcycleKey", "Motorcycle");
+        vehicalTypeList.add(car);
+        vehicalTypeList.add(motorcycle);
+
+        List cars = new ArrayList();
+        cars.add(new VehicalSpecific("MercedesKey", "Mercedes"));
+        cars.add(new VehicalSpecific("HondaKey", "Honda"));
+        cars.add(new VehicalSpecific("FordKey", "Ford"));
+
+        List motorcycles = new ArrayList();
+        motorcycles.add(new VehicalSpecific("SuzukiKey", "Suzuki"));
+        motorcycles.add(new VehicalSpecific("YamahaKey", "Yamaha"));
+
+        vehicalSpecificMap.put(car, cars);
+        vehicalSpecificMap.put(motorcycle, motorcycles);
+    }
+
+
+
+    public List getLeftSideCartoonCharacters() {
+        return leftSideCartoonCharacters;
+    }
+    public void setLeftSideCartoonCharacters(List leftSideCartoonCharacters) {
+        this.leftSideCartoonCharacters = leftSideCartoonCharacters;
+    }
+
+
+    public List getRightSideCartoonCharacters() {
+        return rightSideCartoonCharacters;
+    }
+    public void setRightSideCartoonCharacters(List rightSideCartoonCharacters) {
+        this.rightSideCartoonCharacters = rightSideCartoonCharacters;
+    }
+
+
+    public String getFavouriteVehicalType() {
+        return favouriteVehicalType;
+    }
+
+    public void setFavouriteVehicalType(String favouriteVehicalType) {
+        this.favouriteVehicalType = favouriteVehicalType;
+    }
+
+    public String getFavouriteVehicalSpecific() {
+        return favouriteVehicalSpecific;
+    }
+
+    public void setFavouriteVehicalSpecific(String favouriteVehicalSpecific) {
+        this.favouriteVehicalSpecific = favouriteVehicalSpecific;
+    }
+
+    public List getVehicalTypeList() {
+        return vehicalTypeList;
+    }
+
+    public List getVehicalSpecificList() {
+        ValueStack stack = ServletActionContext.getValueStack(ServletActionContext.getRequest());
+        Object vehicalType = stack.findValue("top");
+        if (vehicalType != null && vehicalType instanceof VehicalType) {
+            List l = (List) vehicalSpecificMap.get(vehicalType);
+            return l;
+        }
+        return Collections.EMPTY_LIST;
+    }
+
+    public List getFavouriteLanguages() {
+        return favouriteLanguages;
+    }
+
+    public String execute() throws Exception {
+        return SUCCESS;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Date getBirthday() {
+        return birthday;
+    }
 
-	public void setName(String name) {
-		this.name = name;
-	}
+    public void setBirthday(Date birthday) {
+        this.birthday = birthday;
+    }
 
-	public Date getBirthday() {
-		return birthday;
-	}
+    public String getBio() {
+        return bio;
+    }
 
-	public void setBirthday(Date birthday) {
-		this.birthday = birthday;
-	}
+    public void setBio(String bio) {
+        this.bio = bio;
+    }
 
-	public String getBio() {
-		return bio;
-	}
+    public String getFavouriteColor() {
+        return favouriteColor;
+    }
 
-	public void setBio(String bio) {
-		this.bio = bio;
-	}
+    public void setFavouriteColor(String favoriteColor) {
+        this.favouriteColor = favoriteColor;
+    }
 
-	public String getFavouriteColor() {
-		return favouriteColor;
-	}
+    public List getFriends() {
+        return friends;
+    }
 
-	public void setFavouriteColor(String favoriteColor) {
-		this.favouriteColor = favoriteColor;
-	}
+    public void setFriends(List friends) {
+        this.friends = friends;
+    }
 
-	public List getFriends() {
-		return friends;
-	}
+    public boolean isLegalAge() {
+        return legalAge;
+    }
 
-	public void setFriends(List friends) {
-		this.friends = friends;
-	}
-
-	public String getBestFriend() {
-		return bestFriend;
-	}
-
-	public void setBestFriend(String bestFriend) {
-		this.bestFriend = bestFriend;
-	}
-
-	public boolean isLegalAge() {
-		return legalAge;
-	}
-
-	public void setLegalAge(boolean legalAge) {
-		this.legalAge = legalAge;
-	}
-
-	public String getState() {
-		return state;
-	}
-
-	public void setState(String state) {
-		this.state = state;
-	}
-
-	public String getRegion() {
-		return region;
-	}
-
-	public void setRegion(String region) {
-		this.region = region;
-	}
-
-	public void setPicture(File picture) {
-		this.picture = picture;
-	}
-
-	public File getPicture() {
-		return this.picture;
-	}
-
-	public void setPictureContentType(String pictureContentType) {
-		this.pictureContentType = pictureContentType;
-	}
-
-	public void setPictureFileName(String pictureFileName) {
-		this.pictureFileName = pictureFileName;
-	}
-
-	public void setFavouriteLanguage(String favouriteLanguage) {
-		this.favouriteLanguage = favouriteLanguage;
-	}
-
-	public String getFavouriteLanguage() {
-		return favouriteLanguage;
-	}
-
-
-	public void setThoughts(String thoughts) {
-		this.thoughts = thoughts;
-	}
-
-	public String getThoughts() {
-		return this.thoughts;
-	}
-
-	public Date getWakeup() {
-		return wakeup;
-	}
-
-	public void setWakeup(Date wakeup) {
-		this.wakeup = wakeup;
-	}
-
-	public String doSubmit() {
-		return SUCCESS;
-	}
-
-
-	// === inner class
-	public static class Language {
-		String description;
-		String key;
-		String style;
-
-		public Language(String key, String description, String style) {
-			this.key = key;
-			this.description = description;
-			this.style = style;
-		}
-
-		public String getKey() {
-			return key;
-		}
-
-		public String getDescription() {
-			return description;
-		}
-
-		public String getStyle() {
-			return style;
-		}
-
-	}
-
-
-	public static class VehicalType {
-		String key;
-		String description;
-
-		public VehicalType(String key, String description) {
-			this.key = key;
-			this.description = description;
-		}
-
-		public String getKey() {
-			return this.key;
-		}
-
-		public String getDescription() {
-			return this.description;
-		}
-
-		public boolean equals(Object obj) {
-			if (!(obj instanceof VehicalType)) {
-				return false;
-			} else {
-				return key.equals(((VehicalType) obj).getKey());
-			}
-		}
-
-		public int hashCode() {
-			return key.hashCode();
-		}
-	}
-
-
-	public static class VehicalSpecific {
-		String key;
-		String description;
-
-		public VehicalSpecific(String key, String description) {
-			this.key = key;
-			this.description = description;
-		}
-
-		public String getKey() {
-			return this.key;
-		}
-
-		public String getDescription() {
-			return this.description;
-		}
-
-		public boolean equals(Object obj) {
-			if (!(obj instanceof VehicalSpecific)) {
-				return false;
-			} else {
-				return key.equals(((VehicalSpecific) obj).getKey());
-			}
-		}
-
-		public int hashCode() {
-			return key.hashCode();
-		}
-	}
+    public void setLegalAge(boolean legalAge) {
+        this.legalAge = legalAge;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    public void setPicture(File picture) {
+        this.picture = picture;
+    }
+    
+    public File getPicture() {
+        return this.picture;
+    }
+
+    public void setPictureContentType(String pictureContentType) {
+        this.pictureContentType = pictureContentType;
+    }
+
+    public void setPictureFileName(String pictureFileName) {
+        this.pictureFileName = pictureFileName;
+    }
+
+    public void setFavouriteLanguage(String favouriteLanguage) {
+        this.favouriteLanguage = favouriteLanguage;
+    }
+
+    public String getFavouriteLanguage() {
+        return favouriteLanguage;
+    }
+
+
+    public void setThoughts(String thoughts) {
+        this.thoughts = thoughts;
+    }
+
+    public String getThoughts() {
+        return this.thoughts;
+    }
+
+    public Date getWakeup() {
+        return wakeup;
+    }
+
+    public void setWakeup(Date wakeup) {
+        this.wakeup = wakeup;
+    }
+
+    public String doSubmit() {
+        return SUCCESS;
+    }
+
+
+
+    // === inner class
+    public static class Language {
+        String description;
+        String key;
+
+        public Language(String key, String description) {
+            this.key = key;
+            this.description = description;
+        }
+
+        public String getKey() {
+            return key;
+        }
+        public String getDescription() {
+            return description;
+        }
+
+    }
+
+
+    public static class VehicalType {
+        String key;
+        String description;
+        public VehicalType(String key, String description) {
+            this.key = key;
+            this.description = description;
+        }
+
+        public String getKey() { return this.key; }
+        public String getDescription() { return this.description; }
+
+        public boolean equals(Object obj) {
+            if (! (obj instanceof VehicalType)) {
+                return false;
+            }
+            else {
+                return key.equals(((VehicalType)obj).getKey());
+            }
+        }
+
+        public int hashCode() {
+            return key.hashCode();
+        }
+    }
+
+
+    public static class VehicalSpecific {
+        String key;
+        String description;
+        public VehicalSpecific(String key, String description) {
+            this.key = key;
+            this.description = description;
+        }
+
+        public String getKey() { return this.key; }
+        public String getDescription() { return this.description; }
+
+        public boolean equals(Object obj) {
+            if (! (obj instanceof VehicalSpecific)) {
+                return false;
+            }
+            else {
+                return key.equals(((VehicalSpecific)obj).getKey());
+            }
+        }
+
+        public int hashCode() {
+            return key.hashCode();
+        }
+    }
 }

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

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

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

@@ -20,19 +20,19 @@
  */
 package org.apache.struts2.showcase.action;
 
-import com.opensymphony.xwork2.Preparable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
 import org.apache.log4j.Logger;
 import org.apache.struts2.showcase.application.TestDataProvider;
 import org.apache.struts2.showcase.dao.Dao;
 import org.apache.struts2.showcase.dao.EmployeeDao;
 import org.apache.struts2.showcase.model.Employee;
 import org.apache.struts2.showcase.model.Skill;
-import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
+import com.opensymphony.xwork2.Preparable;
 
 /**
  * JsfEmployeeAction.
@@ -40,82 +40,87 @@ import java.util.List;
 
 public class EmployeeAction extends AbstractCRUDAction implements Preparable {
 
-	private static final long serialVersionUID = 7047317819789938957L;
+    private static final long serialVersionUID = 7047317819789938957L;
 
-	private static final Logger log = Logger.getLogger(EmployeeAction.class);
+    private static final Logger log = Logger.getLogger(EmployeeAction.class);
 
-	@Autowired
-	private EmployeeDao employeeDao;
+    private Long empId;
+    protected EmployeeDao employeeDao;
+    private Employee currentEmployee;
+    private List selectedSkills;
 
-	private Long empId;
-	private Employee currentEmployee;
-	private List<String> selectedSkills;
+    public Long getEmpId() {
+        return empId;
+    }
 
-	public String execute() throws Exception {
-		if (getCurrentEmployee() != null && getCurrentEmployee().getOtherSkills() != null) {
-			setSelectedSkills(new ArrayList<String>());
-			Iterator it = getCurrentEmployee().getOtherSkills().iterator();
-			while (it.hasNext()) {
-				getSelectedSkills().add(((Skill) it.next()).getName());
-			}
-		}
-		return super.execute();
-	}
+    public void setEmpId(Long empId) {
+        this.empId = empId;
+    }
 
-	public String save() throws Exception {
-		if (getCurrentEmployee() != null) {
-			setEmpId((Long) employeeDao.merge(getCurrentEmployee()));
-			employeeDao.setSkills(getEmpId(), getSelectedSkills());
-		}
-		return SUCCESS;
-	}
+    public Employee getCurrentEmployee() {
+        return currentEmployee;
+    }
 
-	public Long getEmpId() {
-		return empId;
-	}
+    public void setCurrentEmployee(Employee currentEmployee) {
+        this.currentEmployee = currentEmployee;
+    }
 
-	public void setEmpId(Long empId) {
-		this.empId = empId;
-	}
+    public String[] getAvailablePositions() {
+        return TestDataProvider.POSITIONS;
+    }
 
-	public Employee getCurrentEmployee() {
-		return currentEmployee;
-	}
+    public List getAvailableLevels() {
+        return Arrays.asList(TestDataProvider.LEVELS);
+    }
 
-	public void setCurrentEmployee(Employee currentEmployee) {
-		this.currentEmployee = currentEmployee;
-	}
+    public List getSelectedSkills() {
+        return selectedSkills;
+    }
 
-	public String[] getAvailablePositions() {
-		return TestDataProvider.POSITIONS;
-	}
+    public void setSelectedSkills(List selectedSkills) {
+        this.selectedSkills = selectedSkills;
+    }
 
-	public List getAvailableLevels() {
-		return Arrays.asList(TestDataProvider.LEVELS);
-	}
+    protected Dao getDao() {
+        return employeeDao;
+    }
 
-	public List<String> getSelectedSkills() {
-		return selectedSkills;
-	}
+    public void setEmployeeDao(EmployeeDao employeeDao) {
+        if (log.isDebugEnabled()) {
+            log.debug("JsfEmployeeAction - [setEmployeeDao]: employeeDao injected.");
+        }
+        this.employeeDao = employeeDao;
+    }
 
-	public void setSelectedSkills(List<String> selectedSkills) {
-		this.selectedSkills = selectedSkills;
-	}
+    /**
+     * This method is called to allow the action to prepare itself.
+     *
+     * @throws Exception thrown if a system level exception occurs.
+     */
+    public void prepare() throws Exception {
+        Employee preFetched = (Employee) fetch(getEmpId(), getCurrentEmployee());
+        if (preFetched != null) {
+            setCurrentEmployee(preFetched);
+        }
+    }
 
-	protected Dao getDao() {
-		return employeeDao;
-	}
+    public String execute() throws Exception {
+        if (getCurrentEmployee() != null && getCurrentEmployee().getOtherSkills() != null) {
+            setSelectedSkills(new ArrayList());
+            Iterator it = getCurrentEmployee().getOtherSkills().iterator();
+            while (it.hasNext()) {
+                getSelectedSkills().add(((Skill) it.next()).getName());
+            }
+        }
+        return super.execute();
+    }
 
-	/**
-	 * This method is called to allow the action to prepare itself.
-	 *
-	 * @throws Exception thrown if a system level exception occurs.
-	 */
-	public void prepare() throws Exception {
-		Employee preFetched = (Employee) fetch(getEmpId(), getCurrentEmployee());
-		if (preFetched != null) {
-			setCurrentEmployee(preFetched);
-		}
-	}
+    public String save() throws Exception {
+        if (getCurrentEmployee() != null) {
+            setEmpId((Long) employeeDao.merge(getCurrentEmployee()));
+            employeeDao.setSkills(getEmpId(), getSelectedSkills());
+        }
+        return SUCCESS;
+    }
 
 }