[maven-release-plugin] copy for tag STRUTS_2_2_2

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

apps/blank/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-blank</artifactId>
@@ -34,9 +34,9 @@
     <name>Blank Webapp</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/apps/blank</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/apps/blank</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1/apps/blank</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/apps/blank</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/apps/blank</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_2/apps/blank</url>
     </scm>
 
     <dependencies>
@@ -44,27 +44,19 @@
         <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>jboss</groupId>
-            <artifactId>javassist</artifactId>
-            <version>3.7.ga</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -77,10 +69,15 @@
                 <version>6.0.1</version>
                 <configuration>
                     <scanIntervalSeconds>10</scanIntervalSeconds>
+                    <scanTargets>
+                        <scanTarget>src/main/webapp/WEB-INF</scanTarget>
+                        <scanTarget>src/main/webapp/WEB-INF/web.xml</scanTarget>
+                        <scanTarget>src/main/resources/struts.xml</scanTarget>
+                        <scanTarget>src/main/resources/example.xml</scanTarget>
+                    </scanTargets>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
-
 </project>

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

@@ -1,5 +1,5 @@
 Apache Struts
-Copyright 2000-2007 The Apache Software Foundation
+Copyright 2000-2011 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="struts-default">
+    <package name="example" namespace="/example" extends="default">
 
         <action name="HelloWorld" class="example.HelloWorld">
             <result>/example/HelloWorld.jsp</result>

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

@@ -8,12 +8,18 @@
     <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" />
+
+        <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>
@@ -22,6 +28,8 @@
         </action>
     </package>
 
+    <include file="example.xml"/>
+
     <!-- Add packages here -->
 
 </struts>

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

@@ -0,0 +1,15 @@
+<%@ 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/jboss-blank/pom.xml

@@ -1,9 +1,32 @@
+<?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.2.1</version>
+        <version>2.2.2</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-jboss-blank</artifactId>
@@ -11,9 +34,9 @@
     <name>JBoss Blank Webapp</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/apps/jboss-blank</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/apps/jboss-blank</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1/apps/jboss-blank</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/apps/jboss-blank</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/apps/jboss-blank</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_2/apps/jboss-blank</url>
     </scm>
 
     <dependencies>
@@ -32,9 +55,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

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

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

apps/mailreader/pom.xml

@@ -26,7 +26,7 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.2.1</version>
+      <version>2.2.2</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-mailreader</artifactId>
@@ -34,9 +34,9 @@
     <name>Starter Webapp</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/apps/mailreader</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/apps/mailreader</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1/apps/mailreader</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/apps/mailreader</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/apps/mailreader</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_2/apps/mailreader</url>
     </scm>
 
     <dependencies>
@@ -44,22 +44,15 @@
         <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>servlet-api</artifactId>
-           <version>2.4</version>
            <scope>provided</scope>
         </dependency>
 
         <dependency>
-           <groupId>${pom.groupId}</groupId>
+           <groupId>${project.groupId}</groupId>
            <artifactId>struts-mailreader-dao</artifactId>
            <version>1.3.5</version>
         </dependency>
 
-        <dependency>
-            <groupId>jboss</groupId>
-            <artifactId>javassist</artifactId>
-            <version>3.7.ga</version>
-        </dependency>
-
     </dependencies>
 
     <build>

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

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

apps/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-apps</artifactId>
@@ -42,18 +42,11 @@
     </modules>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/apps</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/apps</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1/apps</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/apps</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/apps</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_2/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>
@@ -179,10 +172,10 @@
                         <phase>process-sources</phase>
                         <configuration>
                             <tasks>
-                                <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java" failonerror="false">
+                                <copy todir="${project.build.directory}/${project.artifactId}/WEB-INF/src/java" failonerror="false">
                                     <fileset dir="${basedir}/src/main/java" />
                                 </copy>
-                                <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java" failonerror="false">
+                                <copy todir="${project.build.directory}/${project.artifactId}/WEB-INF/src/java" failonerror="false">
                                     <fileset dir="${basedir}/src/main/resources" />
                                 </copy>
                             </tasks>
@@ -212,7 +205,7 @@
             </plugin>
         </plugins>
 
-        <finalName>${pom.artifactId}</finalName>
+        <finalName>${project.artifactId}</finalName>
 
     </build>
 
@@ -221,7 +214,7 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

apps/portlet/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-portlet</artifactId>
@@ -34,9 +34,9 @@
     <name>Portlet Webapp</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/apps/portlet</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/apps/portlet</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1/apps/portlet</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/apps/portlet</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/apps/portlet</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_2/apps/portlet</url>
     </scm>
 
     <profiles>
@@ -95,34 +95,24 @@
         <dependency>
             <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-core</artifactId>
-            <version>${pom.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-portlet-plugin</artifactId>
-            <version>${pom.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-dwr-plugin</artifactId>
-            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.6.3</version>
         </dependency>
 
         <dependency>
@@ -147,7 +137,6 @@
         <dependency>
             <groupId>commons-digester</groupId>
             <artifactId>commons-digester</artifactId>
-            <version>1.8</version>
             <exclusions>
                 <exclusion>
                     <groupId>javax.servlet</groupId>
@@ -158,23 +147,19 @@
         <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>
 
@@ -201,22 +186,14 @@
         <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>
 
-        <dependency>
-            <groupId>jboss</groupId>
-            <artifactId>javassist</artifactId>
-            <version>3.7.ga</version>
-        </dependency>
-        
     </dependencies>
 
     <reporting>

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

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

apps/rest-showcase/pom.xml

@@ -26,13 +26,13 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
 
 	<groupId>org.apache.struts</groupId>
 	<artifactId>struts2-rest-showcase</artifactId>
 	<packaging>war</packaging>
-	<version>2.2.1</version>
+	<version>2.2.2</version>
 	<name>Struts 2 Rest Showcase Example</name>
 	<description>Struts 2 Rest Showcase Example</description>
 
@@ -40,17 +40,16 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-rest-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.2</version>
             <scope>test</scope>
         </dependency>
 
@@ -81,12 +80,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>jboss</groupId>
-            <artifactId>javassist</artifactId>
-            <version>3.7.ga</version>
-        </dependency>
-        
     </dependencies>
 
     <build>

apps/showcase/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-showcase</artifactId>
@@ -34,9 +34,9 @@
     <name>Showcase Webapp</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/apps/showcase</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/apps/showcase</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1/apps/showcase</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/apps/showcase</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/apps/showcase</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_2/apps/showcase</url>
     </scm>
 
 
@@ -56,68 +56,66 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-struts1-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-dojo-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-jsf-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-config-browser-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-sitemesh-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-tiles-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-dwr-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.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-codebehind-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-spring-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
             <scope>provided</scope>
         </dependency>
 
@@ -125,13 +123,11 @@
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.6.3</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-tools</artifactId>
-            <version>1.3</version>
             <exclusions>
                 <exclusion>
                     <groupId>velocity</groupId>
@@ -162,12 +158,10 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.9</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.0.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
@@ -182,7 +176,6 @@
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
-            <version>1.1.1</version>
         </dependency>
 
         <dependency>
@@ -212,12 +205,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>jboss</groupId>
-            <artifactId>javassist</artifactId>
-            <version>3.7.ga</version>
-        </dependency>
-
     </dependencies>
 
     <build>

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

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

archetypes/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-archetypes</artifactId>
@@ -34,9 +34,9 @@
     <name>Struts 2 Maven Archetypes</name>
 
    <scm>
-     <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/archetypes</connection>
-     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/archetypes</developerConnection>
-     <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/archetypes</url>
+     <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/archetypes</connection>
+     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/archetypes</developerConnection>
+     <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/archetypes</url>
    </scm>
 
     <modules>

archetypes/struts2-archetype-blank/pom.xml

@@ -3,18 +3,18 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>struts2-archetype-blank</artifactId>
-    <version>2.2.1</version>
+    <version>2.2.2</version>
     <name>Struts 2 Archetypes - Blank</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/archetypes/struts2-archetype-blank</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/archetypes/struts2-archetype-blank</developerConnection>
-        <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/archetypes/struts2-archetype-blank</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/archetypes/struts2-archetype-blank</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/archetypes/struts2-archetype-blank</developerConnection>
+        <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/archetypes/struts2-archetype-blank</url>
     </scm>
     
     <properties>

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/NOTICE.txt

@@ -1,6 +1,6 @@
 Apache Struts
 
-Copyright 2006 The Apache Software Foundation
+Copyright 2006-2011 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml

@@ -4,12 +4,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
-    <version>${version}</version>
+    <version>${project.version}</version>
     <packaging>war</packaging>
     <name>Struts 2 Blank Webapp</name>
 
     <properties>
-        <struts2.version>2.1.8.1</struts2.version>
+        <struts2.version>${project.version}</struts2.version>
     </properties>
 
     <dependencies>
@@ -84,6 +84,12 @@
                 <version>6.1.21</version>
                 <configuration>
                     <scanIntervalSeconds>10</scanIntervalSeconds>
+                    <scanTargets>
+                        <scanTarget>src/main/webapp/WEB-INF</scanTarget>
+                        <scanTarget>src/main/webapp/WEB-INF/web.xml</scanTarget>
+                        <scanTarget>src/main/resources/struts.xml</scanTarget>
+                        <scanTarget>src/main/resources/example.xml</scanTarget>
+                    </scanTargets>
                 </configuration>
             </plugin>
         </plugins>

archetypes/struts2-archetype-convention/pom.xml

@@ -2,18 +2,18 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>struts2-archetype-convention</artifactId>
-    <version>2.2.1</version>
+    <version>2.2.2</version>
     <name>Struts 2 Archetypes - Blank Convention</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/archetypes/struts2-archetype-convention</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/archetypes/struts2-archetype-convention</developerConnection>
-        <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/archetypes/struts2-archetype-convention</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/archetypes/struts2-archetype-convention</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/archetypes/struts2-archetype-convention</developerConnection>
+        <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/archetypes/struts2-archetype-convention</url>
     </scm>
 
     <properties>

archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/NOTICE.txt

@@ -1,6 +1,6 @@
 Apache Struts
 
-Copyright 2006 The Apache Software Foundation
+Copyright 2006-2011 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/

archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml

@@ -4,12 +4,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
-    <version>${version}</version>
+    <version>${project.version}</version>
     <packaging>war</packaging>
     <name>Struts 2 Blank Convention Webapp</name>
 
     <properties>
-        <struts2.version>2.1.8.1</struts2.version>
+        <struts2.version>${project.version}</struts2.version>
     </properties>
 
     <dependencies>
@@ -84,6 +84,11 @@
                 <version>6.1.21</version>
                 <configuration>
                     <scanIntervalSeconds>10</scanIntervalSeconds>
+                    <scanTargets>
+                        <scanTarget>src/main/webapp/WEB-INF</scanTarget>
+                        <scanTarget>src/main/webapp/WEB-INF/web.xml</scanTarget>
+                        <scanTarget>src/main/resources/struts.xml</scanTarget>
+                    </scanTargets>
                 </configuration>
             </plugin>
         </plugins>

archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/resources/struts.xml

@@ -0,0 +1,10 @@
+<?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>
+
+  <constant name="struts.enable.DynamicMethodInvocation" value="false"/>
+  <constant name="struts.devMode" value="true"/>
+
+</struts>

archetypes/struts2-archetype-dbportlet/pom.xml

@@ -2,18 +2,18 @@
   <parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-archetypes</artifactId>
-    <version>2.2.1</version>
+    <version>2.2.2</version>
   </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>struts2-archetype-dbportlet</artifactId>
-    <version>2.2.1</version>
+    <version>2.2.2</version>
     <name>Struts 2 Archetypes - Database Portlet</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/archetypes/struts2-archetype-dbportlet</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/archetypes/struts2-archetype-dbportlet</developerConnection>
-        <url>svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/archetypes/struts2-archetype-dbportlet</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/archetypes/struts2-archetype-dbportlet</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/archetypes/struts2-archetype-dbportlet</developerConnection>
+        <url>svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/archetypes/struts2-archetype-dbportlet</url>
     </scm>
 
     <properties>

archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml

@@ -5,13 +5,13 @@
 	<groupId>${groupId}</groupId>
 	<artifactId>${artifactId}</artifactId>
 	<packaging>war</packaging>
-	<version>${version}</version>
+	<version>${project.version}</version>
 	<name>Struts 2 Database Portlet</name>
 	<url>http://www.myComp.com</url>
 	<description>Struts 2 Database Portlet</description>
 
     <properties>
-        <struts2.version>2.1.8.1</struts2.version>
+        <struts2.version>${project.version}</struts2.version>
     </properties>    
 
 	<dependencies>
@@ -107,9 +107,14 @@
     			<groupId>org.mortbay.jetty</groupId>
     			<artifactId>maven-jetty-plugin</artifactId>
     			<version>6.1.21</version>
-    			<configuration>
-    				<scanIntervalSeconds>10</scanIntervalSeconds>
-    			</configuration>
+                <configuration>
+                    <scanIntervalSeconds>10</scanIntervalSeconds>
+                    <scanTargets>
+                        <scanTarget>src/main/webapp/WEB-INF</scanTarget>
+                        <scanTarget>src/main/webapp/WEB-INF/web.xml</scanTarget>
+                        <scanTarget>src/main/resources/struts.xml</scanTarget>
+                    </scanTargets>
+                </configuration>
                 <dependencies>
                     <dependency>
                         <groupId>portlet-api</groupId>

archetypes/struts2-archetype-plugin/pom.xml

@@ -2,19 +2,19 @@
   <parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-archetypes</artifactId>
-    <version>2.2.1</version>
+    <version>2.2.2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>struts2-archetype-plugin</artifactId>
-  <version>2.2.1</version>
+  <version>2.2.2</version>
   <packaging>jar</packaging>
   <name>Struts 2 Archetypes - Plugin</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/archetypes/struts2-archetype-plugin</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/archetypes/struts2-archetype-plugin</developerConnection>
-       <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/archetypes/struts2-archetype-plugin</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/archetypes/struts2-archetype-plugin</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/archetypes/struts2-archetype-plugin</developerConnection>
+       <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/archetypes/struts2-archetype-plugin</url>
     </scm>
 
     <properties>

archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/NOTICE.txt

@@ -1,6 +1,6 @@
 Apache Struts
 
-Copyright 2006 The Apache Software Foundation
+Copyright 2006-2011 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/

archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml

@@ -5,7 +5,7 @@
 
    <groupId>${groupId}</groupId>
    <artifactId>${artifactId}</artifactId>
-   <version>${version}</version>
+   <version>${project.version}</version>
    <name>Struts 2 Plugin</name>
 
     <dependencies>
@@ -13,7 +13,7 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>2.1.8.1</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

archetypes/struts2-archetype-portlet/pom.xml

@@ -2,19 +2,19 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>struts2-archetype-portlet</artifactId>
-    <version>2.2.1</version>
+    <version>2.2.2</version>
     <packaging>jar</packaging>
     <name>Struts 2 Archetypes - Portlet</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/archetypes/struts2-archetype-portlet</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/archetypes/struts2-archetype-portlet</developerConnection>
-        <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/archetypes/struts2-archetype-portlet</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/archetypes/struts2-archetype-portlet</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/archetypes/struts2-archetype-portlet</developerConnection>
+        <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/archetypes/struts2-archetype-portlet</url>
     </scm>
 
     <properties>

archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml

@@ -7,10 +7,10 @@
     <artifactId>${artifactId}</artifactId>
     <packaging>war</packaging>
     <name>My Portlet Application</name>
-    <version>${version}</version>
+    <version>${project.version}</version>
 
     <properties>
-        <struts2.version>2.1.8.1</struts2.version>
+        <struts2.version>${project.version}</struts2.version>
     </properties>
 
     <dependencies>
@@ -110,6 +110,12 @@
                                     <value>HelloPortlet</value>
                                 </systemProperty>
                             </systemProperties>
+                            <scanIntervalSeconds>10</scanIntervalSeconds>
+                            <scanTargets>
+                                <scanTarget>src/main/webapp/WEB-INF</scanTarget>
+                                <scanTarget>src/main/webapp/WEB-INF/web.xml</scanTarget>
+                                <scanTarget>src/main/resources/struts.xml</scanTarget>
+                            </scanTargets>
                         </configuration>
                         <dependencies>
                             <dependency>

archetypes/struts2-archetype-starter/pom.xml

@@ -4,19 +4,19 @@
   <parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-archetypes</artifactId>
-    <version>2.2.1</version>
+    <version>2.2.2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>struts2-archetype-starter</artifactId>
-  <version>2.2.1</version>
+  <version>2.2.2</version>
   <packaging>jar</packaging>
   <name>Struts 2 Archetypes - Starter</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/archetypes/struts2-archetype-starter</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/archetypes/struts2-archetype-starter</developerConnection>
-       <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/archetypes/struts2-archetype-starter</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/archetypes/struts2-archetype-starter</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/archetypes/struts2-archetype-starter</developerConnection>
+       <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/archetypes/struts2-archetype-starter</url>
     </scm>
 
     <properties>

archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml

@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>${groupId}</groupId>
 	<artifactId>${artifactId}</artifactId>
 	<packaging>war</packaging>
-	<version>${version}</version>
+	<version>${project.version}</version>
 	<name>Struts 2 Starter</name>
 	<url>http://www.myComp.com</url>
 	<description>Struts 2 Starter</description>
 
     <properties>
-        <struts2.version>2.1.8.1</struts2.version>
+        <struts2.version>${project.version}</struts2.version>
     </properties>
 
 	<dependencies>
@@ -92,9 +92,15 @@
     			<groupId>org.mortbay.jetty</groupId>
     			<artifactId>maven-jetty-plugin</artifactId>
     			<version>6.1.21</version>
-    			<configuration>
-    				<scanIntervalSeconds>10</scanIntervalSeconds>
-    			</configuration>
+                <configuration>
+                    <scanIntervalSeconds>10</scanIntervalSeconds>
+                    <scanTargets>
+                        <scanTarget>src/main/webapp/WEB-INF</scanTarget>
+                        <scanTarget>src/main/webapp/WEB-INF/web.xml</scanTarget>
+                        <scanTarget>src/main/resources/struts.xml</scanTarget>
+                        <scanTarget>src/main/resources/applicationContext.xml</scanTarget>
+                    </scanTargets>
+                </configuration>
     		</plugin>
     	</plugins>
     </build>

archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml

@@ -5,6 +5,9 @@
     "http://struts.apache.org/dtds/struts-2.0.dtd">
 
 <struts>
+
+    <constant name="struts.enable.DynamicMethodInvocation" value="false"/>
+
 	<package name="myPackage" extends="struts-default">
 		<action name="index" class="${package}.IndexAction">
 			<result>/jsp/index.jsp</result>

assembly/pom.xml

@@ -11,15 +11,15 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/assembly</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/assembly</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1/assembly</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/assembly</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/assembly</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_2/assembly</url>
     </scm>
-    
+
     <profiles>
         <profile>
             <id>j4</id>
@@ -27,13 +27,13 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-assembly-plugin</artifactId>
-                        <version>2.2-beta-5</version>
+                        <version>2.2</version>
                         <executions>
                             <execution>
                                 <id>make-assembly</id>
                                 <phase>package</phase>
                                 <goals>
-                                     <goal>attached</goal>
+                                    <goal>attached</goal>
                                 </goals>
                             </execution>
                         </executions>
@@ -46,7 +46,7 @@
                                 <descriptor>src/main/assembly/src.xml</descriptor>
                                 <descriptor>src/main/assembly/docs.xml</descriptor>
                             </descriptors>
-                            <finalName>struts-${version}</finalName>
+                            <finalName>struts-${project.version}</finalName>
                             <outputDirectory>target/assembly/out</outputDirectory>
                             <workDirectory>target/assembly/work</workDirectory>
                         </configuration>
@@ -55,149 +55,157 @@
             </build>
             <dependencies>
                 <!-- Backported JDK 1.4 jars -->
-                    <dependency>
-                        <groupId>net.sf.retrotranslator</groupId>
-                        <artifactId>retrotranslator-runtime</artifactId>
-                        <version>1.2.1</version>
-                        <scope>runtime</scope>
-                    </dependency>
+                <dependency>
+                    <groupId>net.sf.retrotranslator</groupId>
+                    <artifactId>retrotranslator-runtime</artifactId>
+                    <version>1.2.1</version>
+                    <scope>runtime</scope>
+                </dependency>
 
-                    <dependency>
-                        <groupId>backport-util-concurrent</groupId>
-                        <artifactId>backport-util-concurrent</artifactId>
-                        <version>3.0</version>
-                        <scope>runtime</scope>
-                    </dependency>
+                <dependency>
+                    <groupId>backport-util-concurrent</groupId>
+                    <artifactId>backport-util-concurrent</artifactId>
+                    <version>3.0</version>
+                    <scope>runtime</scope>
+                </dependency>
 
-                    <dependency>
-                        <groupId>org.apache.struts.xwork</groupId>
-                        <artifactId>xwork-core</artifactId>
-                        <version>${version}</version>
-                        <type>jar</type>
-                        <classifier>jdk14</classifier>
-                        <scope>runtime</scope>
-                    </dependency>
+                <dependency>
+                    <groupId>org.apache.struts.xwork</groupId>
+                    <artifactId>xwork-core</artifactId>
+                    <version>${project.version}</version>
+                    <type>jar</type>
+                    <classifier>jdk14</classifier>
+                    <scope>runtime</scope>
+                </dependency>
 
-                    <dependency>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-core</artifactId>
-                        <version>${version}</version>
-                        <classifier>jdk14</classifier>
-                    </dependency>
+                <dependency>
+                    <groupId>org.apache.struts</groupId>
+                    <artifactId>struts2-core</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>jdk14</classifier>
+                </dependency>
 
-                    <dependency>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-config-browser-plugin</artifactId>
-                        <version>${version}</version>
-                        <classifier>jdk14</classifier>
-                    </dependency>
+                <dependency>
+                    <groupId>org.apache.struts</groupId>
+                    <artifactId>struts2-config-browser-plugin</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>jdk14</classifier>
+                </dependency>
 
-                    <dependency>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-jasperreports-plugin</artifactId>
-                        <version>${version}</version>
-                        <classifier>jdk14</classifier>
-                    </dependency>
+                <dependency>
+                    <groupId>org.apache.struts</groupId>
+                    <artifactId>struts2-jasperreports-plugin</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>jdk14</classifier>
+                </dependency>
 
-                    <dependency>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-jfreechart-plugin</artifactId>
-                        <version>${version}</version>
-                        <classifier>jdk14</classifier>
-                    </dependency>
+                <dependency>
+                    <groupId>org.apache.struts</groupId>
+                    <artifactId>struts2-jfreechart-plugin</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>jdk14</classifier>
+                </dependency>
 
-                    <dependency>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-jsf-plugin</artifactId>
-                        <version>${version}</version>
-                        <classifier>jdk14</classifier>
-                    </dependency>
+                <dependency>
+                    <groupId>org.apache.struts</groupId>
+                    <artifactId>struts2-jsf-plugin</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>jdk14</classifier>
+                </dependency>
 
-                    <dependency>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-pell-multipart-plugin</artifactId>
-                        <version>${version}</version>
-                        <classifier>jdk14</classifier>
-                    </dependency>
+                <dependency>
+                    <groupId>org.apache.struts</groupId>
+                    <artifactId>struts2-pell-multipart-plugin</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>jdk14</classifier>
+                </dependency>
 
-                    <dependency>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-plexus-plugin</artifactId>
-                        <version>${version}</version>
-                        <classifier>jdk14</classifier>
-                    </dependency>
+                <dependency>
+                    <groupId>org.apache.struts</groupId>
+                    <artifactId>struts2-plexus-plugin</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>jdk14</classifier>
+                </dependency>
 
-                    <dependency>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-sitegraph-plugin</artifactId>
-                        <version>${version}</version>
-                        <classifier>jdk14</classifier>
-                    </dependency>
+                <dependency>
+                    <groupId>org.apache.struts</groupId>
+                    <artifactId>struts2-sitegraph-plugin</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>jdk14</classifier>
+                </dependency>
 
-                    <dependency>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-sitemesh-plugin</artifactId>
-                        <version>${version}</version>
-                        <classifier>jdk14</classifier>
-                    </dependency>
+                <dependency>
+                    <groupId>org.apache.struts</groupId>
+                    <artifactId>struts2-sitemesh-plugin</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>jdk14</classifier>
+                </dependency>
 
-                    <dependency>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-struts1-plugin</artifactId>
-                        <version>${version}</version>
-                        <classifier>jdk14</classifier>
-                    </dependency>
+                <dependency>
+                    <groupId>org.apache.struts</groupId>
+                    <artifactId>struts2-struts1-plugin</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>jdk14</classifier>
+                </dependency>
 
-                    <dependency>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-tiles-plugin</artifactId>
-                        <version>${version}</version>
-                        <classifier>jdk14</classifier>
-                    </dependency>
+                <dependency>
+                    <groupId>org.apache.struts</groupId>
+                    <artifactId>struts2-tiles-plugin</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>jdk14</classifier>
+                </dependency>
 
-                    <dependency>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-rest-plugin</artifactId>
-                        <version>${version}</version>
-                        <classifier>jdk14</classifier>
-                    </dependency>
-                    
-                    <dependency>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-oval-plugin</artifactId>
-                        <version>${version}</version>
-                        <classifier>jdk14</classifier>
-                    </dependency>
-                    
-                    <dependency>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-osgi-plugin</artifactId>
-                        <version>${version}</version>
-                        <classifier>jdk14</classifier>
-                    </dependency>
-                    
-                    <dependency>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-json-plugin</artifactId>
-                        <version>${version}</version>
-                        <classifier>jdk14</classifier>
-                    </dependency>
-                    
-                    <dependency>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-embeddedjsp-plugin</artifactId>
-                        <version>${version}</version>
-                        <classifier>jdk14</classifier>
-                    </dependency>
+                <dependency>
+                    <groupId>org.apache.struts</groupId>
+                    <artifactId>struts2-rest-plugin</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>jdk14</classifier>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.struts</groupId>
+                    <artifactId>struts2-oval-plugin</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>jdk14</classifier>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.struts</groupId>
+                    <artifactId>struts2-osgi-plugin</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>jdk14</classifier>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.struts</groupId>
+                    <artifactId>struts2-json-plugin</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>jdk14</classifier>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.struts</groupId>
+                    <artifactId>struts2-embeddedjsp-plugin</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>jdk14</classifier>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.struts</groupId>
+                    <artifactId>struts2-gxp-plugin</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>jdk14</classifier>
+                </dependency>
             </dependencies>
         </profile>
     </profiles>
-    
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>dependency-maven-plugin</artifactId>
+                <version>1.0</version>
                 <executions>
                     <execution>
                         <id>copy-war</id>
@@ -210,37 +218,37 @@
                                 <artifactItem>
                                     <groupId>org.apache.struts</groupId>
                                     <artifactId>struts2-blank</artifactId>
-                                    <version>${version}</version>
+                                    <version>${project.version}</version>
                                     <type>war</type>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.struts</groupId>
                                     <artifactId>struts2-mailreader</artifactId>
-                                    <version>${version}</version>
+                                    <version>${project.version}</version>
                                     <type>war</type>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.struts</groupId>
                                     <artifactId>struts2-portlet</artifactId>
-                                    <version>${version}</version>
+                                    <version>${project.version}</version>
                                     <type>war</type>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.struts</groupId>
                                     <artifactId>struts2-showcase</artifactId>
-                                    <version>${version}</version>
+                                    <version>${project.version}</version>
                                     <type>war</type>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.struts</groupId>
                                     <artifactId>struts2-rest-showcase</artifactId>
-                                    <version>${version}</version>
+                                    <version>${project.version}</version>
                                     <type>war</type>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.struts</groupId>
                                     <artifactId>struts2-mailreader</artifactId>
-                                    <version>${version}</version>
+                                    <version>${project.version}</version>
                                     <type>war</type>
                                 </artifactItem>
                             </artifactItems>
@@ -255,16 +263,13 @@
                 <executions>
                     <execution>
                         <id>cwiki-docs</id>
-                        <phase>process-resources</phase>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
                         <configuration>
                             <tasks>
                                 <mkdir dir="${project.build.directory}/cwiki" />
-<!--
-                                <exec executable="ssh" failonerror="true" >
-                                    <arg line="${username}@people.apache.org /www/struts.apache.org/2.x/docs-zip2.sh" />
-                                </exec>
-                                <unzip src="${project.build.directory}/docs.zip" dest="${project.build.directory}/cwiki" />
--->
                                 <exec executable="wget">
                                     <arg value="-erobots=off" />
                                     <arg value="-nH" />
@@ -278,22 +283,19 @@
                                 </exec>
                             </tasks>
                         </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
                     </execution>
                 </executions>
             </plugin>
 
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2-beta-5</version>
+                <version>2.2</version>
                 <executions>
                     <execution>
                         <id>make-assembly</id>
                         <phase>package</phase>
                         <goals>
-                             <goal>attached</goal>
+                            <goal>attached</goal>
                         </goals>
                     </execution>
                 </executions>
@@ -305,7 +307,7 @@
                         <descriptor>src/main/assembly/src.xml</descriptor>
                         <descriptor>src/main/assembly/docs.xml</descriptor>
                     </descriptors>
-                    <finalName>struts-${version}</finalName>
+                    <finalName>struts-${project.version}</finalName>
                     <outputDirectory>target/assembly/out</outputDirectory>
                     <workDirectory>target/assembly/work</workDirectory>
                 </configuration>
@@ -318,158 +320,164 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-codebehind-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-javatemplates-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-config-browser-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-dojo-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
- 
+
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-dwr-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-jasperreports-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-jfreechart-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-jsf-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-pell-multipart-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-plexus-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-portlet-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-rest-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-sitegraph-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
-         <dependency>
+        <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-sitemesh-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
-       <dependency>
+        <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-spring-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-struts1-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-testng-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-tiles-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-oval-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-json-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-embeddedjsp-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
-        
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-gxp-plugin</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-osgi-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-osgi-admin-bundle</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-osgi-demo-bundle</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
-        
+
 
     </dependencies>
 

assembly/src/main/assembly/all.xml

@@ -226,7 +226,11 @@
         <directory>../plugins/embeddedjsp/target/site</directory>
         <outputDirectory>docs/struts2-plugins/struts2-embeddedjsp-plugin</outputDirectory>
       </fileSet>
-      
+      <fileSet>
+        <directory>../plugins/gxp/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-gxp-plugin</outputDirectory>
+      </fileSet>
+
     <!-- bundles -->
     <fileSet>
        <directory>../bundles/admin/target/site</directory>

assembly/src/main/assembly/docs.xml

@@ -22,127 +22,132 @@
 -->
 
 <assembly>
-  <id>docs</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <fileSets>
 
-    <!-- Include the XWork Javadoc in the assembly -->
-    <fileSet>
-      <directory>../xwork-core/target/site/apidocs</directory>
-      <outputDirectory>docs/xwork-apidocs</outputDirectory>
-    </fileSet>
+    <id>docs</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <fileSets>
 
-      <!-- Include the website in the assembly -->
-      <fileSet>
-        <directory>../target/site</directory>
-        <outputDirectory>docs</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../api/target/site</directory>
-        <outputDirectory>docs/struts2-api</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../core/target/site</directory>
-        <outputDirectory>docs/struts2-core</outputDirectory>
-      </fileSet>
+        <!-- Include the XWork Javadoc in the assembly -->
+        <fileSet>
+            <directory>../xwork-core/target/apidocs</directory>
+            <outputDirectory>docs/xwork-core/apidocs</outputDirectory>
+        </fileSet>
 
-      <!-- Include the Confluence docs in the assembly -->
-      <fileSet>
-        <directory>target/cwiki/WW</directory>
-        <outputDirectory>docs</outputDirectory>
-      </fileSet>
+        <!-- Include the website in the assembly -->
+        <fileSet>
+            <directory>../target/site</directory>
+            <outputDirectory>docs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../core/target/apidocs</directory>
+            <outputDirectory>docs/struts2-core/apidocs</outputDirectory>
+        </fileSet>
 
-      <!-- Plugins -->
-      <fileSet>
-        <directory>../plugins/codebehind/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-codebehind-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/config-browser/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-config-browser-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/dojo/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-dojo-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/dojo/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-dwr-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/jasperreports/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-jasperreports-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/jfreechart/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-jfreechart-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/jsf/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-jsf-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/junit/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-junit-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/pell-multipart/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-pell-multipart-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/plexus/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-plexus-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/portlet/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-portlet-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/rest/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-rest-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/struts1/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-struts1-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/sitegraph/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-sitegraph-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/spring/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-spring-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/sitemesh/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-sitemesh-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/testng/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-testng-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/tiles/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-tiles-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/oval/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-oval-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/osgi/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-osgi-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/json/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-json-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/embeddedjsp/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-embeddedjsp-plugin</outputDirectory>
-      </fileSet>
+        <!-- Include the Confluence docs in the assembly -->
+        <fileSet>
+            <directory>target/cwiki/WW</directory>
+            <outputDirectory>docs/docs</outputDirectory>
+        </fileSet>
 
-  </fileSets>
+        <!-- Plugins -->
+        <fileSet>
+            <directory>../plugins/codebehind/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-codebehind-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/config-browser/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-config-browser-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/convention/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-convention-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/dwr/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-dwr-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/dojo/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-dojo-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/embeddedjsp/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-embeddedjsp-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/gxp/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-gxp-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/jasperreports/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-jasperreports-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/jfreechart/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-jfreechart-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/jsf/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-jsf-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/json/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-json-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/junit/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-junit-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/osgi/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-osgi-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/oval/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-oval-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/pell-multipart/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-pell-multipart-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/plexus/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-plexus-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/portlet/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-portlet-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/rest/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-rest-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/sitegraph/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-sitegraph-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/sitemesh/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-sitemesh-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/spring/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-spring-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/struts1/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-struts1-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/testng/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-testng-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/tiles/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-tiles-plugin/apidocs</outputDirectory>
+        </fileSet>
+
+    </fileSets>
 </assembly>

assembly/src/main/resources/NOTICE.txt

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

assembly/src/main/resources/backport/NOTICE.txt

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

bundles/admin/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-osgi-bundles</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-osgi-admin-bundle</artifactId>    
@@ -12,16 +12,16 @@
     <name>Struts 2 OSGi Admin Bundle</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/bundles/admin</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/bundles/admin</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1/bundles/admin</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/bundles/admin</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/bundles/admin</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_2/bundles/admin</url>
     </scm>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-osgi-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>       
     </dependencies>
    

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

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

bundles/demo/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-osgi-bundles</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-osgi-demo-bundle</artifactId>
@@ -12,9 +12,9 @@
     <name>Struts 2 OSGi Demo Bundle</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/bundles/demo</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/bundles/demo</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1/bundles/demo</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/bundles/demo</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/bundles/demo</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_2/bundles/demo</url>
     </scm>
     
     <dependencies>
@@ -22,13 +22,12 @@
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.6.3</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-tools</artifactId>
-            <version>1.3</version>
+            <optional>true</optional>
             <exclusions>
                 <exclusion>
                     <groupId>velocity</groupId>
@@ -40,25 +39,24 @@
         <dependency>
             <groupId>commons-digester</groupId>
             <artifactId>commons-digester</artifactId>
-            <version>1.8</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
          <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-osgi-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         
     </dependencies>

bundles/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-osgi-bundles</artifactId>
@@ -34,9 +34,9 @@
     <name>Struts OSGi Bundles</name>
 
    <scm>
-     <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/bundles</connection>
-     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/bundles</developerConnection>
-     <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/bundles</url>
+     <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/bundles</connection>
+     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/bundles</developerConnection>
+     <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/bundles</url>
    </scm>
 
     <modules>
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- Test dependencies -->
@@ -57,7 +57,6 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>compile</scope>
-            <version>3.8.2</version>
         </dependency>
 
 

core/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-core</artifactId>
@@ -34,14 +34,13 @@
     <name>Struts 2 Core</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/core</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/core</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1/core</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/core</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/core</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_2/core</url>
     </scm>
 
     <properties>
         <tlib.version>2.2</tlib.version>
-        <ognl.version>3.0</ognl.version>
     </properties>
 
     <build>
@@ -52,13 +51,13 @@
                 <version>1.0.15</version>
                 <configuration>
                     <A>uri=/struts-tags,tlibVersion=${tlib.version},jspVersion=2.0,shortName=s,displayName="Struts Tags",
-                    outFile=${basedir}/target/classes/META-INF/struts-tags.tld,
-                    description="To make it easier to access dynamic data;
-                    the Apache Struts framework includes a library of custom tags.
-                    The tags interact with the framework's validation and internationalization features;
-                    to ensure that input is correct and output is localized.
-                    The Struts Tags can be used with JSP FreeMarker or Velocity.",
-                    outTemplatesDir=${basedir}/src/site/resources/tags
+                        outFile=${basedir}/target/classes/META-INF/struts-tags.tld,
+                        description="To make it easier to access dynamic data;
+                        the Apache Struts framework includes a library of custom tags.
+                        The tags interact with the framework's validation and internationalization features;
+                        to ensure that input is correct and output is localized.
+                        The Struts Tags can be used with JSP FreeMarker or Velocity.",
+                        outTemplatesDir=${basedir}/src/site/resources/tags
                     </A>
                     <resourceTargetPath>target</resourceTargetPath>
                     <fork>false</fork>
@@ -77,7 +76,7 @@
                         <goals>
                             <goal>execute</goal>
                         </goals>
-                </execution>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>
@@ -85,31 +84,6 @@
 
     <reporting>
         <plugins>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.2</version>
-                <configuration>
-                    <sourcepath>${basedir}/src/main/java;${basedir}/../xwork-core/src/main/java</sourcepath>
-                    <encoding>UTF-8</encoding>
-                    <groups>
-                        <group>
-                            <title>Struts Packages</title>
-                            <packages>org.apache.struts2*</packages>
-                        </group>
-                        <group>
-                            <title>XWork Packages</title>
-                            <packages>com.opensymphony.xwork2*</packages>
-                        </group>
-                    </groups>
-                    <show>private</show>
-                    <links>
-                        <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-                        <link>http://java.sun.com/javaee/5/docs/api/</link>
-                        <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
-                        <link>http://logging.apache.org/log4j/docs/api/</link>
-                    </links>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>rat-maven-plugin</artifactId>
@@ -210,163 +184,113 @@
         <dependency>
             <groupId>org.apache.struts.xwork</groupId>
             <artifactId>xwork-core</artifactId>
-            <version>${version}</version>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.struts</groupId>-->
-            <!--<artifactId>struts2-api</artifactId>-->
-            <!--<version>${pom.version}</version>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
-            <version>2.3.16</version>
         </dependency>
 
         <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>ognl</groupId>
             <artifactId>ognl</artifactId>
-            <version>${ognl.version}</version>
         </dependency>
 
         <!-- Velocity -->
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.6.3</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-tools</artifactId>
-            <version>1.3</version>
             <optional>true</optional>
-            <exclusions>
-                <exclusion>
-                    <groupId>struts</groupId>
-                    <artifactId>struts</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>velocity</groupId>
-                    <artifactId>velocity</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <!-- File upload -->
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
-            <version>1.2.1</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>1.3.2</version>
         </dependency>
-        
+
         <!-- Mocks for unit testing (by Spring) -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
             <scope>test</scope>
         </dependency>
 
-
-
-
         <!-- Test dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-              <scope>compile</scope>
+            <scope>compile</scope>
             <optional>true</optional>
-          <version>3.8.2</version>
         </dependency>
 
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
-            <version>2.4</version>
             <scope>test</scope>
         </dependency>
-        <!--dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <version>1.1</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.easymock</groupId>
-                    <artifactId>easymock</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency-->
 
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-core</artifactId>
-            <version>0.09</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-jdk1.3</artifactId>
-            <version>0.09</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-alt-jdk1.3</artifactId>
-            <version>0.09</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-alt-jdk1.3-j2ee1.3</artifactId>
-            <version>0.09</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-jdk1.3-j2ee1.3</artifactId>
-            <version>0.09</version>
             <scope>test</scope>
         </dependency>
 
-    <dependency>
+        <dependency>
             <groupId>jmock</groupId>
             <artifactId>jmock</artifactId>
-            <version>1.0.1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.9</version>
             <scope>test</scope>
         </dependency>
 
@@ -384,16 +308,14 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>5.1</version>
-             <scope>compile</scope>
+            <scope>compile</scope>
             <optional>true</optional>
-           <classifier>jdk15</classifier>
+            <classifier>jdk15</classifier>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>

core/src/main/java/org/apache/struts2/components/ActionError.java

@@ -21,15 +21,13 @@
 
 package org.apache.struts2.components;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.commons.lang.StringUtils;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import org.apache.commons.lang.xwork.StringUtils;
-
-import com.opensymphony.xwork2.util.ValueStack;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Collection;
 import java.util.List;
 

core/src/main/java/org/apache/struts2/components/ActionMessage.java

@@ -21,17 +21,15 @@
 
 package org.apache.struts2.components;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.commons.lang.StringUtils;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import org.apache.commons.lang.xwork.StringUtils;
 
-import com.opensymphony.xwork2.util.ValueStack;
-
-import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Collection;
+import java.util.List;
 
 /**
  * <!-- START SNIPPET: javadoc -->

core/src/main/java/org/apache/struts2/components/Anchor.java

@@ -28,7 +28,7 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
 import org.apache.struts2.StrutsConstants;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import org.apache.commons.lang.xwork.StringUtils;
+import org.apache.commons.lang.StringUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

core/src/main/java/org/apache/struts2/components/DoubleSelect.java

@@ -21,13 +21,12 @@
 
 package org.apache.struts2.components;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang.xwork.StringUtils;
+import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.commons.lang.StringUtils;
 import org.apache.struts2.views.annotations.StrutsTag;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * <!-- START SNIPPET: javadoc -->
@@ -61,7 +60,7 @@ public class DoubleSelect extends DoubleListUIBean {
     public void evaluateExtraParams() {
         super.evaluateExtraParams();
         StringBuilder onchangeParam = new StringBuilder();
-        onchangeParam.append(getParameters().get("id")).append("Redirect(this.options.selectedIndex)");
+        onchangeParam.append(getParameters().get("id")).append("Redirect(this.selectedIndex)");
         if(StringUtils.isNotEmpty(this.onchange)) {
         	onchangeParam.append(";").append(this.onchange);
         }

core/src/main/java/org/apache/struts2/components/Form.java

@@ -36,7 +36,7 @@ import com.opensymphony.xwork2.validator.Validator;
 import org.apache.struts2.StrutsConstants;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import org.apache.commons.lang.xwork.StringUtils;
+import org.apache.commons.lang.StringUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

core/src/main/java/org/apache/struts2/components/Hidden.java

@@ -40,7 +40,7 @@ import com.opensymphony.xwork2.util.ValueStack;
  * <-- example one -->
  * <s:hidden name="foo" />
  * <-- example two -->
- * <s:hidden name="foo" value="bar" />
+ * <s:hidden name="foo" value="%{bar}" />
  *
  * Example One Resulting HTML (if foo evaluates to bar):
  * <input type="hidden" name="foo" value="bar" />

core/src/main/java/org/apache/struts2/components/Property.java

@@ -21,18 +21,15 @@
 
 package org.apache.struts2.components;
 
-import java.io.IOException;
-import java.io.Writer;
-
-import org.apache.struts2.views.annotations.StrutsTag;
-import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import org.apache.struts2.StrutsConstants;
-import org.apache.commons.lang.xwork.StringEscapeUtils;
-
 import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import com.opensymphony.xwork2.inject.Inject;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.struts2.views.annotations.StrutsTag;
+import org.apache.struts2.views.annotations.StrutsTagAttribute;
+
+import java.io.IOException;
+import java.io.Writer;
 
 /**
  * <!-- START SNIPPET: javadoc -->

core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java

@@ -31,7 +31,7 @@ import org.apache.struts2.StrutsException;
 import org.apache.struts2.dispatcher.mapper.ActionMapper;
 import org.apache.struts2.dispatcher.mapper.ActionMapping;
 import org.apache.struts2.views.util.UrlHelper;
-import org.apache.commons.lang.xwork.StringUtils;
+import org.apache.commons.lang.StringUtils;
 
 import java.io.IOException;
 import java.io.Writer;

core/src/main/java/org/apache/struts2/components/Text.java

@@ -21,21 +21,20 @@
 
 package org.apache.struts2.components;
 
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.commons.lang.StringUtils;
+import org.apache.struts2.util.TextProviderHelper;
+import org.apache.struts2.views.annotations.StrutsTag;
+import org.apache.struts2.views.annotations.StrutsTagAttribute;
+
 import java.io.IOException;
 import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.struts2.views.annotations.StrutsTag;
-import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import org.apache.struts2.util.TextProviderHelper;
-import org.apache.commons.lang.xwork.StringUtils;
-
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
 /**
  * <!-- START SNIPPET: javadoc -->
  * Render a I18n text message.

core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java

@@ -80,6 +80,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.Enumeration;
 
 /**
  * A utility class the actual dispatcher delegates most of its tasks to. Each instance
@@ -320,9 +321,9 @@ public class Dispatcher {
         for (String file : files) {
             if (file.endsWith(".xml")) {
                 if ("xwork.xml".equals(file)) {
-                    configurationManager.addConfigurationProvider(new XmlConfigurationProvider(file, false));
+                    configurationManager.addConfigurationProvider(createXmlConfigurationProvider(file, false));
                 } else {
-                    configurationManager.addConfigurationProvider(new StrutsXmlConfigurationProvider(file, false, servletContext));
+                    configurationManager.addConfigurationProvider(createStrutsXmlConfigurationProvider(file, false, servletContext));
                 }
             } else {
                 throw new IllegalArgumentException("Invalid configuration file name");
@@ -330,6 +331,14 @@ public class Dispatcher {
         }
     }
 
+    protected XmlConfigurationProvider createXmlConfigurationProvider(String filename, boolean errorIfMissing) {
+        return new XmlConfigurationProvider(filename, errorIfMissing);
+    }
+
+    protected XmlConfigurationProvider createStrutsXmlConfigurationProvider(String filename, boolean errorIfMissing, ServletContext ctx) {
+        return new StrutsXmlConfigurationProvider(filename, errorIfMissing, ctx);
+    }
+
     private void init_CustomConfigurationProviders() {
         String configProvs = initParams.get("configProviders");
         if (configProvs != null) {
@@ -401,7 +410,7 @@ public class Dispatcher {
     public void init() {
 
     	if (configurationManager == null) {
-    		configurationManager = new ConfigurationManager(BeanSelectionProvider.DEFAULT_BEAN_NAME);
+    		configurationManager = createConfigurationManager(BeanSelectionProvider.DEFAULT_BEAN_NAME);
     	}
 
         try {
@@ -429,6 +438,10 @@ public class Dispatcher {
         }
     }
 
+    protected ConfigurationManager createConfigurationManager(String name) {
+        return new ConfigurationManager(name);
+    }
+
     /**
      * Load Action class for mapping and invoke the appropriate Action method, or go directly to the Result.
      * <p/>
@@ -714,6 +727,40 @@ public class Dispatcher {
         return request;
     }
 
+    /**
+     * Removes all the files created by MultiPartRequestWrapper.
+     *
+     * @param request the HttpServletRequest object.
+     * @see org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper
+     * @throws java.io.IOException on any error.
+     */
+    public void cleanUpRequest(HttpServletRequest request) throws IOException {
+        if (!(request instanceof MultiPartRequestWrapper)) {
+            return;
+        }
+
+        MultiPartRequestWrapper multiWrapper = (MultiPartRequestWrapper) request;
+
+        Enumeration fileParameterNames = multiWrapper.getFileParameterNames();
+        while (fileParameterNames != null && fileParameterNames.hasMoreElements()) {
+            String inputValue = (String) fileParameterNames.nextElement();
+            File[] files = multiWrapper.getFiles(inputValue);
+
+            for (File currentFile : files) {
+                if (LOG.isInfoEnabled()) {
+                    String msg = LocalizedTextUtil.findText(this.getClass(), "struts.messages.removing.file", Locale.ENGLISH, "no.message.found", new Object[]{inputValue, currentFile});
+                    LOG.info(msg);
+                }
+
+                if ((currentFile != null) && currentFile.isFile()) {
+                    if (!currentFile.delete()) {
+                        LOG.warn("Resource Leaking:  Could not remove uploaded file '" + currentFile.getCanonicalPath() + "'.");
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * Send an HTTP error response code.
      *
@@ -725,7 +772,8 @@ public class Dispatcher {
      */
     public void sendError(HttpServletRequest request, HttpServletResponse response,
             ServletContext ctx, int code, Exception e) {
-        if (devMode) {
+        Boolean devModeOverride = FilterDispatcher.getDevModeOverride();
+        if (devModeOverride != null ? devModeOverride.booleanValue() : devMode) {
             response.setContentType("text/html");
 
             try {

core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java

@@ -170,10 +170,15 @@ public class FilterDispatcher implements StrutsStatics, Filter {
     protected Dispatcher dispatcher;
 
     /**
-     * Loads stattic resources, set by injection
+     * Loads static resources, set by injection.
      */
     protected StaticContentLoader staticResourceLoader;
 
+    /**
+     * Maintains per-request override of devMode configuration.
+     */
+    private static ThreadLocal<Boolean> devModeOverride = new InheritableThreadLocal<Boolean>();
+
     /**
      * Initializes the filter by creating a default dispatcher
      * and setting the default packages for static resources.
@@ -237,6 +242,27 @@ public class FilterDispatcher implements StrutsStatics, Filter {
         }
     }
 
+    /**
+     * Set an override of the static devMode value.  Do not set this via a
+     * request parameter or any other unprotected method.  Using a signed
+     * cookie is one safe way to turn it on per request.
+     * 
+     * @param devMode   the override value
+     */
+    public static void overrideDevMode(
+        boolean devMode)
+    {
+        devModeOverride.set(Boolean.valueOf(devMode));
+    }
+
+    /**
+     * @return Boolean override value, or null if no override
+     */
+    public static Boolean getDevModeOverride()
+    {
+        return devModeOverride.get();
+    }
+
     /**
      * Create a default {@link Dispatcher} that subclasses can override
      * with a custom Dispatcher, if needed.
@@ -251,7 +277,20 @@ public class FilterDispatcher implements StrutsStatics, Filter {
             String value = filterConfig.getInitParameter(name);
             params.put(name, value);
         }
-        return new Dispatcher(filterConfig.getServletContext(), params);
+        return createDispatcher(filterConfig.getServletContext(), params);
+    }
+
+    /**
+     * Create a default {@link Dispatcher} that subclasses can override
+     * with a custom Dispatcher, if needed.  Called by
+     * createDispatcher(FilterConfig).
+     *
+     * @param ctx ServletContext
+     * @param params parameters from FilterConfig
+     * @return Initialized Dispatcher
+     */
+    protected Dispatcher createDispatcher(ServletContext ctx, Map<String, String> params) {
+        return new Dispatcher(ctx, params);
     }
 
     /**
@@ -395,11 +434,13 @@ public class FilterDispatcher implements StrutsStatics, Filter {
             dispatcher.serviceAction(request, response, servletContext, mapping);
 
         } finally {
+            dispatcher.cleanUpRequest(request);
             try {
                 ActionContextCleanUp.cleanUp(req);
             } finally {
                 UtilTimerStack.pop(timerKey);
             }
+            devModeOverride.remove();
         }
     }
 }

core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java

@@ -21,21 +21,19 @@
 
 package org.apache.struts2.dispatcher;
 
-import java.util.Map;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsStatics;
+import org.apache.struts2.views.util.UrlHelper;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.jsp.PageContext;
-
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsStatics;
-import org.apache.struts2.views.util.UrlHelper;
-import org.apache.commons.lang.xwork.ObjectUtils;
-
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import java.util.Map;
 
 
 /**

core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java

@@ -198,9 +198,6 @@ public class ServletRedirectResult extends StrutsResultSupport implements Reflec
                     Map.Entry e = (Map.Entry) i.next();
 
                     if (!getProhibitedResultParams().contains(e.getKey())) {
-                        requestParameters.put(e.getKey().toString(),
-                                e.getValue() == null ? "" :
-                                        conditionalParse(e.getValue().toString(), invocation));
                         String potentialValue = e.getValue() == null ? "" : conditionalParse(e.getValue().toString(), invocation);
                         if (!supressEmptyParameters || ((potentialValue != null) && (potentialValue.length() > 0))) {
                             requestParameters.put(e.getKey().toString(), potentialValue);

core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java

@@ -21,16 +21,12 @@
 
 package org.apache.struts2.dispatcher;
 
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspFactory;
-import javax.servlet.jsp.PageContext;
-
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.StrutsConstants;
 import org.apache.struts2.views.JspSupportServlet;
@@ -39,12 +35,14 @@ import org.apache.velocity.Template;
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.context.Context;
 
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import javax.servlet.Servlet;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.JspFactory;
+import javax.servlet.jsp.PageContext;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
 
 
 /**
@@ -91,6 +89,7 @@ public class VelocityResult extends StrutsResultSupport {
     
     private String defaultEncoding;
     private VelocityManager velocityManager;
+    private JspFactory jspFactory = JspFactory.getDefaultFactory();
 
     public VelocityResult() {
         super();
@@ -124,7 +123,6 @@ public class VelocityResult extends StrutsResultSupport {
 
         HttpServletRequest request = ServletActionContext.getRequest();
         HttpServletResponse response = ServletActionContext.getResponse();
-        JspFactory jspFactory = null;
         ServletContext servletContext = ServletActionContext.getServletContext();
         Servlet servlet = JspSupportServlet.jspSupportServlet;
 
@@ -134,7 +132,6 @@ public class VelocityResult extends StrutsResultSupport {
         PageContext pageContext = (PageContext) ActionContext.getContext().get(ServletActionContext.PAGE_CONTEXT);
 
         if (pageContext == null && servlet != null) {
-            jspFactory = JspFactory.getDefaultFactory();
             pageContext = jspFactory.getPageContext(servlet, request, response, null, true, 8192, true);
             ActionContext.getContext().put(ServletActionContext.PAGE_CONTEXT, pageContext);
             usedJspFactory = true;

core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java

@@ -192,7 +192,17 @@ public class JakartaMultiPartRequest implements MultiPartRequest {
 
         List<File> fileList = new ArrayList<File>(items.size());
         for (FileItem fileItem : items) {
-            fileList.add(((DiskFileItem) fileItem).getStoreLocation());
+            File storeLocation = ((DiskFileItem) fileItem).getStoreLocation();
+            if(fileItem.isInMemory() && storeLocation!=null && !storeLocation.exists()) {
+                try {
+                    storeLocation.createNewFile();
+                } catch (IOException e) {
+                    if(LOG.isErrorEnabled()){
+                        LOG.error("Cannot write uploaded empty file to disk: " + storeLocation.getAbsolutePath(),e);
+                    }
+                }
+            }
+            fileList.add(storeLocation);
         }
 
         return fileList.toArray(new File[fileList.size()]);

core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java

@@ -311,28 +311,7 @@ public class FileUploadInterceptor extends AbstractInterceptor {
         }
 
         // invoke action
-        String result = invocation.invoke();
-
-        // cleanup
-        fileParameterNames = multiWrapper.getFileParameterNames();
-        while (fileParameterNames != null && fileParameterNames.hasMoreElements()) {
-            String inputValue = (String) fileParameterNames.nextElement();
-            File[] files = multiWrapper.getFiles(inputValue);
-
-            for (File currentFile : files) {
-                if (LOG.isInfoEnabled()) {
-                    LOG.info(getTextMessage(action, "struts.messages.removing.file", new Object[]{inputValue, currentFile}, ac.getLocale()));
-                }
-
-                if ((currentFile != null) && currentFile.isFile()) {
-                    if (currentFile.delete() == false) {
-                        LOG.warn("Resource Leaking:  Could not remove uploaded file '" + currentFile.getCanonicalPath() + "'.");
-                    }
-                }
-            }
-        }
-
-        return result;
+        return invocation.invoke();
     }
 
     /**

core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java

@@ -93,8 +93,7 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
  *
  * <li>end - means that session scoped properties are removed from session after action is run</li>
  *
- * <li>any other value or no value means that it's in-the-middle action that is set with session properties before it's
- * executed, and it's properties are put back to session after execution</li>
+ * <li>any other value throws IllegalArgumentException</li>
  *
  * </ul>
  *

core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java

@@ -21,16 +21,12 @@
 
 package org.apache.struts2.interceptor;
 
-import java.util.Map;
-
-import org.apache.struts2.util.TokenHelper;
-import org.apache.struts2.ServletActionContext;
-
-import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.ValidationAware;
 import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor;
 import com.opensymphony.xwork2.util.LocalizedTextUtil;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.util.TokenHelper;
 
 import javax.servlet.http.HttpSession;
 
@@ -140,9 +136,8 @@ public class TokenInterceptor extends MethodFilterInterceptor {
             if (!TokenHelper.validToken()) {
                 return handleInvalidToken(invocation);
             }
-
-            return handleValidToken(invocation);
         }
+        return handleValidToken(invocation);
     }
 
     /**

core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java

@@ -40,6 +40,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.dispatcher.FilterDispatcher;
 import org.apache.struts2.views.freemarker.FreemarkerManager;
 import org.apache.struts2.views.freemarker.FreemarkerResult;
 
@@ -157,6 +158,8 @@ public class DebuggingInterceptor implements Interceptor {
     public String intercept(ActionInvocation inv) throws Exception {
         boolean actionOnly = false;
         boolean cont = true;
+        Boolean devModeOverride = FilterDispatcher.getDevModeOverride();
+        boolean devMode = devModeOverride != null ? devModeOverride.booleanValue() : this.devMode;
         if (devMode) {
             final ActionContext ctx = ActionContext.getContext();
             String type = getParameter(DEBUG_PARAM);

core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java

@@ -28,7 +28,7 @@ import com.opensymphony.xwork2.ValidationAware;
 import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor;
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import org.apache.commons.lang.xwork.StringEscapeUtils;
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.struts2.ServletActionContext;
 
 import javax.servlet.http.HttpServletRequest;

core/src/main/java/org/apache/struts2/util/RegexPatternMatcher.java

@@ -20,15 +20,14 @@
  */
 package org.apache.struts2.util;
 
+import com.opensymphony.xwork2.util.PatternMatcher;
+import org.apache.commons.lang.StringUtils;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang.xwork.StringUtils;
-
-import com.opensymphony.xwork2.util.PatternMatcher;
-
 /**
  * Allows regular expressions to be used in action names. The regular expressions
  * can be in the form {FIELD_NAME} or {FIELD_NAME:REGULAR_EXPRESSION}. For example:

core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java

@@ -21,25 +21,11 @@
 
 package org.apache.struts2.views.freemarker;
 
-import java.io.CharArrayWriter;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Locale;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.dispatcher.StrutsResultSupport;
-import org.apache.struts2.views.util.ResourceUtil;
-
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.LocaleProvider;
 import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.util.ValueStack;
-
 import freemarker.template.Configuration;
 import freemarker.template.ObjectWrapper;
 import freemarker.template.Template;
@@ -47,6 +33,19 @@ import freemarker.template.TemplateException;
 import freemarker.template.TemplateExceptionHandler;
 import freemarker.template.TemplateModel;
 import freemarker.template.TemplateModelException;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsStatics;
+import org.apache.struts2.dispatcher.StrutsResultSupport;
+import org.apache.struts2.views.util.ResourceUtil;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.CharArrayWriter;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Locale;
 
 
 /**
@@ -330,11 +329,19 @@ public class FreemarkerResult extends StrutsResultSupport {
 
                 response.setContentType(contentType);
             }
+        } else if(isInsideActionTag()){
+             //trigger com.opensymphony.module.sitemesh.filter.PageResponseWrapper.deactivateSiteMesh()
+            response.setContentType(response.getContentType());
         }
 
         return true;
     }
 
+    private boolean isInsideActionTag() {
+        Object attribute = ServletActionContext.getRequest().getAttribute(StrutsStatics.STRUTS_ACTION_TAG_INVOCATION);
+        return (Boolean) ObjectUtils.defaultIfNull(attribute, Boolean.FALSE);
+    }
+
     /**
      * @return true write to the stream only when template processing completed successfully (false by default)
      */

core/src/main/java/org/apache/struts2/views/util/UrlHelper.java

@@ -21,6 +21,18 @@
 
 package org.apache.struts2.views.util;
 
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.util.TextParseUtil;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.commons.lang.StringUtils;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsConstants;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
@@ -31,20 +43,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsConstants;
-import org.apache.commons.lang.xwork.StringUtils;
-
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.util.TextParseUtil;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
 
 /**
  * UrlHelper

core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java

@@ -21,23 +21,13 @@
 
 package org.apache.struts2.views.velocity;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.commons.lang.StringUtils;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.StrutsConstants;
 import org.apache.struts2.StrutsException;
@@ -52,14 +42,22 @@ import org.apache.velocity.context.Context;
 import org.apache.velocity.tools.view.ToolboxManager;
 import org.apache.velocity.tools.view.context.ChainedContext;
 import org.apache.velocity.tools.view.servlet.ServletToolboxManager;
-import org.apache.commons.lang.xwork.StringUtils;
 
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
 
 
 /**

core/src/main/resources/NOTICE.txt

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

core/src/main/resources/org/apache/struts2/static/utils.js

@@ -24,7 +24,7 @@ var StrutsUtils = {};
 // gets an object with validation errors from string returned by 
 // the ajaxValidation interceptor
 StrutsUtils.getValidationErrors = function(data) {
-  if(data.indexOf("/* {") == 0) {
+  if(data.indexOf("/* {") === 0) {
     return eval("( " + data.substring(2, data.length - 2) + " )");
   } else {
     return null;
@@ -32,33 +32,62 @@ StrutsUtils.getValidationErrors = function(data) {
 };
 
 StrutsUtils.clearValidationErrors = function(form) {
-  var firstNode = StrutsUtils.firstElement(form);
-  var xhtml = firstNode.tagName.toLowerCase() == "table";
-  
-  if(xhtml) {
-    clearErrorMessagesXHTML(form);
-    clearErrorLabelsXHTML(form);
-  } else {
-    clearErrorMessagesCSS(form);
-    clearErrorLabelsCSS(form);
-  }
-};  
+    var firstNode = StrutsUtils.firstElement(form);
+    var xhtml = firstNode.tagName.toLowerCase() === "table";
+
+    if(xhtml) {
+        clearErrorMessagesXHTML(form);
+        clearErrorLabelsXHTML(form);
+    } else {
+        clearErrorMessagesCSS(form);
+        clearErrorLabelsCSS(form);
+    }
+
+    //clear previous global error messages
+	if(StrutsUtils.errorLists[form] && StrutsUtils.errorLists[form] !== null) {
+		form.parentNode.removeChild(StrutsUtils.errorLists[form]);
+		StrutsUtils.errorLists[form] = null;
+	}
+
+};
+
+StrutsUtils.errorLists = [];
 
 // shows validation errors using functions from xhtml/validation.js
 // or css_xhtml/validation.js
 StrutsUtils.showValidationErrors = function(form, errors) {
-  StrutsUtils.clearValidationErrors(form, errors);
+    StrutsUtils.clearValidationErrors(form, errors);
 
-  var firstNode = StrutsUtils.firstElement(form);
-  var xhtml = firstNode.tagName.toLowerCase() == "table";  
+	if (errors.errors) {
+		var l, errorList = document.createElement("ul");
+
+		errorList.setAttribute("class", "errorMessage");
+		errorList.setAttribute("className", "errorMessage"); // ie hack cause ie does not support setAttribute
+
+		for ( l = 0; l < errors.errors.length; l++) {
+			var item = document.createElement("li");
+			var itemText = document.createTextNode(errors.errors[l]);
+			item.appendChild(itemText);
+
+			errorList.appendChild(item);
+		}
+		
+		form.parentNode.insertBefore(errorList, form);
+		StrutsUtils.errorLists[form] = errorList;
+	}
+
+  var i, fieldName, firstNode = StrutsUtils.firstElement(form);
+  var xhtml = firstNode.tagName.toLowerCase() === "table";
   if(errors.fieldErrors) {
-    for(var fieldName in errors.fieldErrors) {
-      for(var i = 0; i < errors.fieldErrors[fieldName].length; i++) {
-        if(xhtml) {
-          addErrorXHTML(form.elements[fieldName], errors.fieldErrors[fieldName][i]);
-        } else {
-          addErrorCSS(form.elements[fieldName], errors.fieldErrors[fieldName][i]);
-        }  
+    for(fieldName in errors.fieldErrors) {
+      if(errors.fieldErrors.hasOwnProperty(fieldName)) {
+        for(i = 0; i < errors.fieldErrors[fieldName].length; i++) {
+          if(xhtml) {
+            addErrorXHTML(form.elements[fieldName], errors.fieldErrors[fieldName][i]);
+          } else {
+            addErrorCSS(form.elements[fieldName], errors.fieldErrors[fieldName][i]);
+          }
+        }
       }
     }
   }
@@ -66,10 +95,10 @@ StrutsUtils.showValidationErrors = function(form, errors) {
 
 StrutsUtils.firstElement  = function(parentNode, tagName) {
   var node = parentNode.firstChild;
-  while(node && node.nodeType != 1){
+  while(node && node.nodeType !== 1){
     node = node.nextSibling;
   }
-  if(tagName && node && node.tagName && node.tagName.toLowerCase() != tagName.toLowerCase()) {
+  if(tagName && node && node.tagName && node.tagName.toLowerCase() !== tagName.toLowerCase()) {
     node = StrutsUtils.nextElement(node, tagName);
   }
   return node;  
@@ -79,9 +108,9 @@ StrutsUtils.nextElement = function(node, tagName) {
   if(!node) { return null; }
   do {
     node = node.nextSibling;
-  } while(node && node.nodeType != 1);
+  } while(node && node.nodeType !== 1);
 
-  if(node && tagName && tagName.toLowerCase() != node.tagName.toLowerCase()) {
+  if(node && tagName && tagName.toLowerCase() !== node.tagName.toLowerCase()) {
     return StrutsUtils.nextElement(node, tagName);
   }
   return node;  
@@ -92,9 +121,9 @@ StrutsUtils.previousElement = function(node, tagName) {
   if(tagName) { tagName = tagName.toLowerCase(); }
   do {
     node = node.previousSibling;
-  } while(node && node.nodeType != 1);
+  } while(node && node.nodeType !== 1);
   
-  if(node && tagName && tagName.toLowerCase() != node.tagName.toLowerCase()) {
+  if(node && tagName && tagName.toLowerCase() !== node.tagName.toLowerCase()) {
     return StrutsUtils.previousElement(node, tagName);
   }
   return node;  
@@ -102,13 +131,13 @@ StrutsUtils.previousElement = function(node, tagName) {
 
 StrutsUtils.addOnLoad = function(func) {
   var oldonload = window.onload;
-  if (typeof window.onload != 'function') {
+  if (typeof window.onload !== 'function') {
     window.onload = func;
   } else {
     window.onload = function() {
       oldonload();
       func();
-    }
+    };
   }
 };
 

core/src/main/resources/struts-default.xml

@@ -129,7 +129,6 @@
             <interceptor name="clearSession" class="org.apache.struts2.interceptor.ClearSessionInterceptor" />
             <interceptor name="createSession" class="org.apache.struts2.interceptor.CreateSessionInterceptor" />
             <interceptor name="debugging" class="org.apache.struts2.interceptor.debugging.DebuggingInterceptor" />
-            <interceptor name="externalRef" class="com.opensymphony.xwork2.interceptor.ExternalReferencesInterceptor"/>
             <interceptor name="execAndWait" class="org.apache.struts2.interceptor.ExecuteAndWaitInterceptor"/>
             <interceptor name="exception" class="com.opensymphony.xwork2.interceptor.ExceptionMappingInterceptor"/>
             <interceptor name="fileUpload" class="org.apache.struts2.interceptor.FileUploadInterceptor"/>
@@ -143,7 +142,6 @@
             <interceptor name="staticParams" class="com.opensymphony.xwork2.interceptor.StaticParametersInterceptor"/>
             <interceptor name="scope" class="org.apache.struts2.interceptor.ScopeInterceptor"/>
             <interceptor name="servletConfig" class="org.apache.struts2.interceptor.ServletConfigInterceptor"/>
-            <interceptor name="sessionAutowiring" class="org.apache.struts2.spring.interceptor.SessionContextAutowiringInterceptor"/>
             <interceptor name="timer" class="com.opensymphony.xwork2.interceptor.TimerInterceptor"/>
             <interceptor name="token" class="org.apache.struts2.interceptor.TokenInterceptor"/>
             <interceptor name="tokenSession" class="org.apache.struts2.interceptor.TokenSessionStoreInterceptor"/>

core/src/main/resources/template/archive/simple/doubleselect.vm

@@ -96,7 +96,7 @@ var $!struts.htmlEncode($parameters.name)Temp = document.$!struts.htmlEncode(${p
 $!{struts.htmlEncode($parameters.name)}Redirect($redirectTo);
 function $!{struts.htmlEncode($parameters.name)}Redirect(x) {
     for (m = $!{struts.htmlEncode($parameters.name)}Temp.options.length - 1; m >= 0; m--)
-        $!{struts.htmlEncode($parameters.name)}Temp.options[m] = null;
+        $!{struts.htmlEncode($parameters.name)}Temp.remove(m);
 
     for (i = 0; i < $!{parameters.name}Group[x].length; i++) {
         $!{struts.htmlEncode($parameters.name)}Temp.options[i] = new Option($!{struts.htmlEncode($parameters.name)}Group[x][i].text, $!{struts.htmlEncode($parameters.name)}Group[x][i].value);

core/src/main/resources/template/css_xhtml/validation.js

@@ -19,17 +19,16 @@
  * under the License.
  */
 
-function clearErrorMessages(form) {
-    clearErrorMessagesCSS(form);
-}
+var firstFieldErrorPosition = null;
 
 function clearErrorMessagesCSS(form) {
     firstFieldErrorPosition = null;
     // clear out any rows with an "errorFor" attribute
-    var divs = form.getElementsByTagName("div");
-    var paragraphsToDelete = new Array();
+    var i,
+        divs = form.getElementsByTagName("div"),
+        paragraphsToDelete = [];
 
-    for(var i = 0; i < divs.length; i++) {
+    for(i = 0; i < divs.length; i++) {
         var p = divs[i];
         if (p.getAttribute("errorFor")) {
             paragraphsToDelete.push(p);
@@ -37,24 +36,25 @@ function clearErrorMessagesCSS(form) {
     }
 
     // now delete the paragraphsToDelete
-    for (var i = 0; i < paragraphsToDelete.length; i++) {
+    for (i = 0; i < paragraphsToDelete.length; i++) {
         var r = paragraphsToDelete[i];
         var parent = r.parentNode;
         parent.removeChild(r);
     }
 }
 
-function clearErrorLabels(form) {
-    clearErrorLabelsCSS(form);
+function clearErrorMessages(form) {
+    clearErrorMessagesCSS(form);
 }
 
 function clearErrorLabelsCSS(form) {
     // set all labels back to the normal class
-    var labels = form.getElementsByTagName("label");
-    for (var i = 0; i < labels.length; i++) {
+    var i,
+        labels = form.getElementsByTagName("label");
+    for (i = 0; i < labels.length; i++) {
         var label = labels[i];
         if (label) {
-            if(label.getAttribute("class") == "errorLabel"){
+            if(label.getAttribute("class") === "errorLabel"){
                 label.setAttribute("class", "label");//standard way.. works for ie mozilla
                 label.setAttribute("className", "label"); //ie hack cause ie does not support setAttribute
             }
@@ -62,60 +62,17 @@ function clearErrorLabelsCSS(form) {
     }
 }
 
-function addError(e, errorText) {
-    addErrorCSS(e, errorText);
-}
-
-var firstFieldErrorPosition = null;
-function addErrorCSS(e, errorText) {
-    try {
-        if (!e)
-            return; //ignore errors for fields that are not in the form
-        var elem = (e.type ? e : e[0]); //certain input types return node list, while we single first node. I.e. set of radio buttons.
-        var enclosingDiv = findWWGrpNode(elem); // find wwgrp div/span
-
-        //try to focus on first field
-        var fieldPos = findFieldPosition(elem);
-        if (fieldPos != null && (firstFieldErrorPosition == null || firstFieldErrorPosition > fieldPos)) {
-            firstFieldErrorPosition = fieldPos;
-        }
-
-        if (!enclosingDiv) {
-            alert("Could not validate: " + e.id);
-            return;
-        }
-        
-        var label = enclosingDiv.getElementsByTagName("label")[0];
-        if (label) {
-            label.setAttribute("class", "errorLabel"); //standard way.. works for ie mozilla
-            label.setAttribute("className", "errorLabel"); //ie hack cause ie does not support setAttribute
-        }
-
-        var firstCtrNode = findWWCtrlNode(enclosingDiv); // either wwctrl_ or wwlbl_
-        
-        var error = document.createTextNode(errorText);
-        var errorDiv = document.createElement("div");
-
-        errorDiv.setAttribute("class", "errorMessage");//standard way.. works for ie mozilla
-        errorDiv.setAttribute("className", "errorMessage");//ie hack cause ie does not support setAttribute
-        errorDiv.setAttribute("errorFor", elem.id);
-        errorDiv.appendChild(error);
-        if(!firstCtrNode && navigator.appName == 'Microsoft Internet Explorer') {
-          enclosingDiv.insertBefore(errorDiv);
-        } else {
-          enclosingDiv.insertBefore(errorDiv, firstCtrNode);
-        }
-    } catch (err) {
-        alert("An exception occurred: " + err.name + ". Error message: " + err.message);
-    }
+function clearErrorLabels(form) {
+    clearErrorLabelsCSS(form);
 }
 
 function findWWGrpNode(elem) {
     while (elem.parentNode) {
         elem = elem.parentNode;
 
-        if (elem.className && elem.className.match(/wwgrp/))
+        if (elem.className && elem.className.match(/wwgrp/)) {
             return elem;
+        }
     }
     return null;
 }
@@ -123,14 +80,16 @@ function findWWGrpNode(elem) {
 function findWWCtrlNode(enclosingDiv) {
    var elems = enclosingDiv.getElementsByTagName("div");
    for(i = 0; i < elems.length; ++i ) {
-       if (elems[i].className && elems[i].className.match(/(wwlbl|wwctrl)/))
+       if (elems[i].className && elems[i].className.match(/(wwlbl|wwctrl)/)) {
            return elems[i];
+       }
    }
 
    elems = enclosingDiv.getElementsByTagName("span");
    for(i = 0; i < elems.length; ++i ) {
-       if (elems[i].className && elems[i].className.match(/(wwlbl|wwctrl)/))
+       if (elems[i].className && elems[i].className.match(/(wwlbl|wwctrl)/)) {
            return elems[i];
+       }
    }
    return enclosingDiv.getElementsByTagName("span")[0];
 }
@@ -140,21 +99,69 @@ function findFieldPosition(elem) {
     if (!elem.form) {
         alert("no form for " + elem);
     }
-    
+
     var form = elem.form;
-    for (i = 0; i < form.elements.length; i++) { 
-        if (form.elements[i].name == elem.name) {
+    for (i = 0; i < form.elements.length; i++) {
+        if (form.elements[i].name === elem.name) {
             return i;
         }
     }
     return null;
 }
 
+function addErrorCSS(e, errorText) {
+    try {
+        if (!e) {
+            return; //ignore errors for fields that are not in the form
+        }
+        var elem = (e.type ? e : e[0]); //certain input types return node list, while we single first node. I.e. set of radio buttons.
+        var enclosingDiv = findWWGrpNode(elem); // find wwgrp div/span
+
+        //try to focus on first field
+        var fieldPos = findFieldPosition(elem);
+        if (fieldPos !== null && (firstFieldErrorPosition === null || firstFieldErrorPosition > fieldPos)) {
+            firstFieldErrorPosition = fieldPos;
+        }
+
+        if (!enclosingDiv) {
+            alert("Could not validate: " + e.id);
+            return;
+        }
+
+        var label = enclosingDiv.getElementsByTagName("label")[0];
+        if (label) {
+            label.setAttribute("class", "errorLabel"); //standard way.. works for ie mozilla
+            label.setAttribute("className", "errorLabel"); //ie hack cause ie does not support setAttribute
+        }
+
+        var firstCtrNode = findWWCtrlNode(enclosingDiv); // either wwctrl_ or wwlbl_
+
+        var error = document.createTextNode(errorText);
+        var errorDiv = document.createElement("div");
+
+        errorDiv.setAttribute("class", "errorMessage");//standard way.. works for ie mozilla
+        errorDiv.setAttribute("className", "errorMessage");//ie hack cause ie does not support setAttribute
+        errorDiv.setAttribute("errorFor", elem.id);
+        errorDiv.appendChild(error);
+        if(!firstCtrNode && navigator.appName === 'Microsoft Internet Explorer') {
+          enclosingDiv.insertBefore(errorDiv);
+        } else {
+          enclosingDiv.insertBefore(errorDiv, firstCtrNode);
+        }
+    } catch (err) {
+        alert("An exception occurred: " + err.name + ". Error message: " + err.message);
+    }
+}
+
+function addError(e, errorText) {
+    addErrorCSS(e, errorText);
+}
+
 //focus first element
 var StrutsUtils_showValidationErrors = StrutsUtils.showValidationErrors;
 StrutsUtils.showValidationErrors = function(form, errors) {
     StrutsUtils_showValidationErrors(form, errors);
-    if (firstFieldErrorPosition != null && form.elements[firstFieldErrorPosition].focus) {
+    if (firstFieldErrorPosition !== null && form.elements[firstFieldErrorPosition].focus) {
         form.elements[firstFieldErrorPosition].focus();
     }
-}
+};

core/src/main/resources/template/simple/doubleselect.ftl

@@ -126,7 +126,7 @@
     function ${parameters.id}Redirect(x) {
     	var selected = false;
         for (m = ${parameters.id}Temp.options.length - 1; m >= 0; m--) {
-            ${parameters.id}Temp.options[m] = null;
+            ${parameters.id}Temp.remove(m);
         }
 
         for (i = 0; i < ${parameters.id}Group[x].length; i++) {

core/src/main/resources/template/simple/submit.ftl

@@ -52,7 +52,6 @@
 >
 <#else>
 <#if parameters.type?? && parameters.type=="image">
-<@s.property value="parameters.body"/>
 <input type="image"<#rt/>
 <#if parameters.label??>
  alt="${parameters.label?html}"<#rt/>

core/src/main/resources/template/xhtml/validation.js

@@ -19,64 +19,60 @@
  * under the License.
  */
 
-function clearErrorMessages(form) {
-    clearErrorMessagesXHTML(form);
-}
-
 function clearErrorMessagesXHTML(form) {
 
     // get field table
-    var table;
-    for (var i = 0; i < form.childNodes.length; i++) {
-        if (form.childNodes[i].tagName != null && form.childNodes[i].tagName.toLowerCase() == 'table') {
+    var table, i, r;
+    for (i = 0; i < form.childNodes.length; i++) {
+        if (form.childNodes[i].tagName !== undefined && form.childNodes[i].tagName.toLowerCase() === 'table') {
             table = form.childNodes[i];
             break;
         }
     }
 
-    if (table == null) {
+    if (table === null) {
         return;
     }
 
     // clear out any rows with an "errorFor" attribute
     var rows = table.rows;
-    if (rows == null){
+    if (rows === null){
         return;
     }
 
-    var rowsToDelete = new Array();
-    for(var i = 0; i < rows.length; i++) {
-        var r = rows[i];
+    var rowsToDelete = [];
+    for(i = 0; i < rows.length; i++) {
+        r = rows[i];
         // allow blank errorFor values on dojo markup
-        if (r.getAttribute("errorFor") != null) {
+        if (r.getAttribute("errorFor") !== null) {
             rowsToDelete.push(r);
         }
     }
 
     // now delete the rows
-    for (var i = 0; i < rowsToDelete.length; i++) {
-        var r = rowsToDelete[i];
+    for (i = 0; i < rowsToDelete.length; i++) {
+        r = rowsToDelete[i];
         table.deleteRow(r.rowIndex);
-        //table.removeChild(rowsToDelete[i]); 
+        //table.removeChild(rowsToDelete[i]);
     }
 }
 
-function clearErrorLabels(form) {
-    clearErrorLabelsXHTML(form);
+function clearErrorMessages(form) {
+    clearErrorMessagesXHTML(form);
 }
 
 function clearErrorLabelsXHTML(form) {
     // set all labels back to the normal class
-    var elements = form.elements;
-    for (var i = 0; i < elements.length; i++) {
+    var i, elements = form.elements;
+    for (i = 0; i < elements.length; i++) {
 
         var parentEl = elements[i];
         // search for the parent table row, abort if the form is reached
         // the form may contain "non-wrapped" inputs inserted by Dojo
-        while (parentEl.nodeName.toUpperCase() != "TR" && parentEl.nodeName.toUpperCase() != "FORM") {
+        while (parentEl.nodeName.toUpperCase() !== "TR" && parentEl.nodeName.toUpperCase() !== "FORM") {
             parentEl = parentEl.parentNode;
         }
-        if (parentEl.nodeName.toUpperCase() == "FORM") {
+        if (parentEl.nodeName.toUpperCase() === "FORM") {
             parentEl = null;
         }
 
@@ -98,14 +94,14 @@ function clearErrorLabelsXHTML(form) {
 
 }
 
-function addError(e, errorText) {
-    addErrorXHTML(e, errorText);
+function clearErrorLabels(form) {
+    clearErrorLabelsXHTML(form);
 }
 
 function addErrorXHTML(e, errorText) {
     try {
         var row = (e.type ? e : e[0]);
-        while(row.nodeName.toUpperCase() != "TR") {
+        while(row.nodeName.toUpperCase() !== "TR") {
             row = row.parentNode;
         }
         var table = row.parentNode;
@@ -132,7 +128,12 @@ function addErrorXHTML(e, errorText) {
             label.setAttribute("class", "errorLabel");
             label.setAttribute("className", "errorLabel"); //ie hack cause ie does not support setAttribute
         }
-    } catch (e) {
-        alert(e);
+    } catch (err) {
+        alert(err);
     }
 }
+
+function addError(e, errorText) {
+    addErrorXHTML(e, errorText);
+}
+

core/src/site/site.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+/*
+ * $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 name="Struts 2">
+    <bannerLeft>
+        <name>Apache Software Foundation</name>
+        <src>http://www.apache.org/images/asf-logo.gif</src>
+        <href>http://www.apache.org/</href>
+    </bannerLeft>
+    <bannerRight>
+        <name>Apache Struts</name>
+        <src>images/struts2.png</src>
+        <href>http://struts.apache.org/2.x/index.html</href>
+    </bannerRight>
+    <body>
+        <links>
+            <item name="Apache"
+                  href="http://www.apache.org/"/>
+            <item name="Struts"
+                  href="http://struts.apache.org/index.html"/>
+        </links>
+
+        <menu ref="reports"/>
+
+    </body>
+</project>

core/src/test/java/org/apache/struts2/TestAction.java

@@ -73,7 +73,7 @@ public class TestAction extends ActionSupport {
 
     /** This is the method invoked by the {@link org.apache.struts2.util.TextProviderHelper}.
      * Returns the test value if defined otherwise delegates to the default TextProvider */
-    public String getText(String key, String defaultValue, List args, ValueStack stack) {
+    public String getText(String key, String defaultValue, List<?> args, ValueStack stack) {
         if (this.texts.containsKey(key)) {
             return this.texts.get(key);
         } else {

core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java

@@ -253,7 +253,7 @@ public class FileUploadInterceptorTest extends StrutsTestCase {
         mai.setInvocationContext(ActionContext.getContext());
         Map<String, Object> param = new HashMap<String, Object>();
         ActionContext.getContext().setParameters(param);
-        ActionContext.getContext().put(ServletActionContext.HTTP_REQUEST, createMultipartRequest((HttpServletRequest) req, 2000));
+        ActionContext.getContext().put(ServletActionContext.HTTP_REQUEST, createMultipartRequest(req, 2000));
 
         interceptor.intercept(mai);
 

core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java

@@ -21,14 +21,17 @@
 
 package org.apache.struts2.views.jsp.ui;
 
-import java.util.*;
-
-import org.apache.struts2.views.jsp.AbstractUITagTest;
-import org.apache.struts2.TestAction;
-import org.apache.commons.lang.xwork.StringUtils;
-
 import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.ActionSupport;
+import org.apache.commons.lang.StringUtils;
+import org.apache.struts2.TestAction;
+import org.apache.struts2.views.jsp.AbstractUITagTest;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * ActionErrorTag test case.

core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java

@@ -21,14 +21,17 @@
 
 package org.apache.struts2.views.jsp.ui;
 
-import java.util.*;
-
-import org.apache.struts2.views.jsp.AbstractUITagTest;
-import org.apache.struts2.TestAction;
-import org.apache.commons.lang.xwork.StringUtils;
-
 import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.ActionSupport;
+import org.apache.commons.lang.StringUtils;
+import org.apache.struts2.TestAction;
+import org.apache.struts2.views.jsp.AbstractUITagTest;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * ActionMessageTag test case.

core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt

@@ -1,7 +1,7 @@
 <tr>
     <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
     <td>
-<select name="foo" id="foo" class="c1" style="s1" onmousedown="window.status='onmousedown';" onmouseup="window.status='onmouseup';" onmouseover="window.status='onmouseover';" onmousemove="window.status='onmousemove';" onmouseout="window.status='onmouseout';" onchange="fooRedirect(this.options.selectedIndex)">
+<select name="foo" id="foo" class="c1" style="s1" onmousedown="window.status='onmousedown';" onmouseup="window.status='onmouseup';" onmouseover="window.status='onmouseover';" onmousemove="window.status='onmousemove';" onmouseout="window.status='onmouseout';" onchange="fooRedirect(this.selectedIndex)">
     <option value="BE">Belgium</option>
     <option value="FR">France</option>
 </select>
@@ -25,7 +25,7 @@
     function fooRedirect(x) {
     	var selected = false;
         for (m = fooTemp.options.length - 1; m >= 0; m--) {
-            fooTemp.options[m] = null;
+            fooTemp.remove(m);
         }
 
         for (i = 0; i < fooGroup[x].length; i++) {

core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt

@@ -1,7 +1,7 @@
 <tr>
     <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
     <td>
-<select name="foo" id="foo" onmousedown="window.status='onmousedown';" onmouseup="window.status='onmouseup';" onmouseover="window.status='onmouseover';" onmousemove="window.status='onmousemove';" onmouseout="window.status='onmouseout';" onchange="fooRedirect(this.options.selectedIndex)">
+<select name="foo" id="foo" onmousedown="window.status='onmousedown';" onmouseup="window.status='onmouseup';" onmouseover="window.status='onmouseover';" onmousemove="window.status='onmousemove';" onmouseout="window.status='onmouseout';" onchange="fooRedirect(this.selectedIndex)">
     <option value="BE">Belgium</option>
     <option value="FR" selected="selected">France</option>
 </select>
@@ -25,7 +25,7 @@
     function fooRedirect(x) {
     	var selected = false;
         for (m = fooTemp.options.length - 1; m >= 0; m--) {
-            fooTemp.options[m] = null;
+            fooTemp.remove(m);
         }
 
         for (i = 0; i < fooGroup[x].length; i++) {

core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt

@@ -1,7 +1,7 @@
 <tr>
     <td class="tdLabel"><label for="foo_bar" class="label">mylabel:</label></td>
     <td>
-<select name="foo.bar" id="foo_bar" onmousedown="window.status='onmousedown';" onmouseup="window.status='onmouseup';" onmouseover="window.status='onmouseover';" onmousemove="window.status='onmousemove';" onmouseout="window.status='onmouseout';" onchange="foo_barRedirect(this.options.selectedIndex)">
+<select name="foo.bar" id="foo_bar" onmousedown="window.status='onmousedown';" onmouseup="window.status='onmouseup';" onmouseover="window.status='onmouseover';" onmousemove="window.status='onmousemove';" onmouseout="window.status='onmouseout';" onchange="foo_barRedirect(this.selectedIndex)">
     <option value="BE">Belgium</option>
     <option value="FR">France</option>
 </select>
@@ -25,7 +25,7 @@
     function foo_barRedirect(x) {
     	var selected = false;
         for (m = foo_barTemp.options.length - 1; m >= 0; m--) {
-            foo_barTemp.options[m] = null;
+            foo_barTemp.remove(m);
         }
 
         for (i = 0; i < foo_barGroup[x].length; i++) {

core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt

@@ -1,7 +1,7 @@
 <tr>
     <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
     <td>
-<select name="foo" id="foo" class="c1" style="s1" onmousedown="window.status='onmousedown';" onmouseup="window.status='onmouseup';" onmouseover="window.status='onmouseover';" onmousemove="window.status='onmousemove';" onmouseout="window.status='onmouseout';" onchange="fooRedirect(this.options.selectedIndex);window.status='onchange';">
+<select name="foo" id="foo" class="c1" style="s1" onmousedown="window.status='onmousedown';" onmouseup="window.status='onmouseup';" onmouseover="window.status='onmouseover';" onmousemove="window.status='onmousemove';" onmouseout="window.status='onmouseout';" onchange="fooRedirect(this.selectedIndex);window.status='onchange';">
     <option value="BE">Belgium</option>
     <option value="FR">France</option>
 </select>
@@ -25,7 +25,7 @@
     function fooRedirect(x) {
     	var selected = false;
         for (m = fooTemp.options.length - 1; m >= 0; m--) {
-            fooTemp.options[m] = null;
+            fooTemp.remove(m);
         }
 
         for (i = 0; i < fooGroup[x].length; i++) {

plugins/codebehind/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-codebehind-plugin</artifactId>
@@ -34,59 +34,53 @@
     <name>Struts 2 Codebehind Plugin</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/plugins/codebehind</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/plugins/codebehind</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1/plugins/codebehind</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/plugins/codebehind</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/plugins/codebehind</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_2/plugins/codebehind</url>
     </scm>
 
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
-            <version>3.8.2</version>
         </dependency>
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-core</artifactId>
-            <version>0.09</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
             <scope>test</scope>
         </dependency>
         <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>
 
-
-
-
-
    </dependencies>
 </project>

plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java

@@ -35,15 +35,22 @@ import com.opensymphony.xwork2.util.ResolverUtil;
 import com.opensymphony.xwork2.util.ResolverUtil.ClassTest;
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.commons.lang.StringUtils;
 
 import javax.servlet.ServletContext;
-import java.lang.annotation.Annotation;
 import java.lang.reflect.Modifier;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.*;
-
-import org.apache.commons.lang.xwork.StringUtils;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * ClasspathPackageProvider loads the configuration

plugins/codebehind/src/main/resources/NOTICE.txt

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

plugins/config-browser/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-config-browser-plugin</artifactId>
@@ -34,9 +34,9 @@
     <name>Struts 2 Configuration Browser Plugin</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/plugins/config-browser</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/plugins/config-browser</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1/plugins/config-browser</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/plugins/config-browser</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/plugins/config-browser</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_2/plugins/config-browser</url>
     </scm>
 
 </project>

plugins/config-browser/src/main/resources/NOTICE.txt

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

plugins/convention/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-convention-plugin</artifactId>
@@ -11,9 +11,9 @@
     <name>Struts 2 Convention Plugin</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_2_1</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_2_1</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_2_1</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_2_2</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_2_2</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_2_2</url>
     </scm>
 
     <build>
@@ -46,34 +46,33 @@
 
     </build>
     <dependencies>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
-            <version>3.8.1</version>
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
-            <version>2.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymockclassextension</artifactId>
-            <version>2.4</version>
             <scope>test</scope>
         </dependency>
         <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>
     </dependencies>

plugins/convention/src/main/java/org/apache/struts2/convention/DefaultActionNameBuilder.java

@@ -21,7 +21,7 @@
 package org.apache.struts2.convention;
 
 import com.opensymphony.xwork2.inject.Inject;
-import org.apache.commons.lang.xwork.StringUtils;
+import org.apache.commons.lang.StringUtils;
 
 /**
  * <p>

plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java

@@ -20,6 +20,26 @@
  */
 package org.apache.struts2.convention;
 
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.config.entities.PackageConfig;
+import com.opensymphony.xwork2.config.entities.ResultConfig;
+import com.opensymphony.xwork2.config.entities.ResultTypeConfig;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.finder.ClassLoaderInterface;
+import com.opensymphony.xwork2.util.finder.ClassLoaderInterfaceDelegate;
+import com.opensymphony.xwork2.util.finder.ResourceFinder;
+import com.opensymphony.xwork2.util.finder.Test;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.struts2.convention.annotation.Result;
+import org.apache.struts2.convention.annotation.Results;
+
+import javax.servlet.ServletContext;
 import java.io.IOException;
 import java.net.URL;
 import java.util.Arrays;
@@ -28,28 +48,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.ServletContext;
-
-import org.apache.struts2.convention.annotation.Result;
-import org.apache.struts2.convention.annotation.Results;
-import org.apache.commons.lang.xwork.StringUtils;
-import org.apache.commons.lang.xwork.ObjectUtils;
-
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.config.entities.ResultTypeConfig;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.util.finder.ResourceFinder;
-import com.opensymphony.xwork2.util.finder.Test;
-import com.opensymphony.xwork2.util.finder.ClassLoaderInterface;
-import com.opensymphony.xwork2.util.finder.ClassLoaderInterfaceDelegate;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
 /**
  * <p>
  * This class implements the ResultMapBuilder and traverses the web

plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java

@@ -20,8 +20,8 @@
  */
 package org.apache.struts2.convention;
 
-import com.opensymphony.xwork2.ObjectFactory;
 import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ObjectFactory;
 import com.opensymphony.xwork2.config.Configuration;
 import com.opensymphony.xwork2.config.ConfigurationException;
 import com.opensymphony.xwork2.config.entities.ActionConfig;
@@ -35,16 +35,15 @@ import com.opensymphony.xwork2.util.FileManager;
 import com.opensymphony.xwork2.util.TextParseUtil;
 import com.opensymphony.xwork2.util.classloader.ReloadingClassLoader;
 import com.opensymphony.xwork2.util.finder.ClassFinder;
-import com.opensymphony.xwork2.util.finder.Test;
-import com.opensymphony.xwork2.util.finder.UrlSet;
+import com.opensymphony.xwork2.util.finder.ClassFinder.ClassInfo;
 import com.opensymphony.xwork2.util.finder.ClassLoaderInterface;
 import com.opensymphony.xwork2.util.finder.ClassLoaderInterfaceDelegate;
-import com.opensymphony.xwork2.util.finder.ClassFinder.ClassInfo;
+import com.opensymphony.xwork2.util.finder.Test;
+import com.opensymphony.xwork2.util.finder.UrlSet;
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import com.opensymphony.xwork2.util.logging.LoggerUtils;
-import org.apache.commons.lang.xwork.StringUtils;
-import org.apache.commons.lang.xwork.ObjectUtils;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.struts2.StrutsConstants;
 import org.apache.struts2.StrutsException;
 import org.apache.struts2.convention.annotation.Action;

plugins/convention/src/main/java/org/apache/struts2/convention/SEOActionNameBuilder.java

@@ -23,7 +23,7 @@ package org.apache.struts2.convention;
 import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import org.apache.commons.lang.xwork.StringUtils;
+import org.apache.commons.lang.StringUtils;
 
 /**
  * <p>

plugins/convention/src/main/java/org/apache/struts2/convention/StringTools.java

@@ -20,12 +20,11 @@
  */
 package org.apache.struts2.convention;
 
+import com.opensymphony.xwork2.config.ConfigurationException;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import com.opensymphony.xwork2.config.ConfigurationException;
-import org.apache.commons.lang.xwork.StringUtils;
-
 /**
  * <p>
  * This class is a String helper.

plugins/convention/src/main/resources/NOTICE.txt

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

plugins/dojo/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <artifactId>struts2-plugins</artifactId>
         <groupId>org.apache.struts</groupId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.struts</groupId>
@@ -33,9 +33,9 @@
     <name>Struts 2 Dojo Plugin</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/plugins/dojo</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1/plugins/dojo</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1/plugins/dojo</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/plugins/dojo</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_2/plugins/dojo</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_2/plugins/dojo</url>
     </scm>
     <profiles>
         <profile>
@@ -128,14 +128,13 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- JSP API -->
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jsp-api</artifactId>
-            <version>2.0</version>
             <scope>provided</scope>
         </dependency>
 
@@ -143,7 +142,6 @@
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.6.3</version>
             <optional>true</optional>
         </dependency>
 
@@ -152,78 +150,57 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
-            <version>3.8.2</version>
         </dependency>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>jmock</groupId>
             <artifactId>jmock</artifactId>
-            <version>1.0.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
-            <version>2.4</version>
             <scope>test</scope>
         </dependency>
-        <!--dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <version>1.1</version>
-            <scope>test</scope>
-            <exclusions>
-            <exclusion>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            </exclusion>
-            </exclusions>
-            </dependency-->
 
         <dependency>
             <groupId>jmock</groupId>
             <artifactId>jmock-cglib</artifactId>
-            <version>1.0.1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-core</artifactId>
-            <version>0.09</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-jdk1.3</artifactId>
-            <version>0.09</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-alt-jdk1.3</artifactId>
-            <version>0.09</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-alt-jdk1.3-j2ee1.3</artifactId>
-            <version>0.09</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-jdk1.3-j2ee1.3</artifactId>
-            <version>0.09</version>
             <scope>test</scope>
         </dependency>
 
@@ -232,14 +209,12 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>${struts2.springPlatformVersion}</version>
             <scope>test</scope>
         </dependency>
 
@@ -249,6 +224,7 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts-annotations</artifactId>
+            <scope>compile</scope>
             <optional>true</optional>
         </dependency>
     </dependencies>

plugins/dojo/src/main/resources/NOTICE.txt

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

plugins/dojo/src/main/resources/template/ajax/submit.ftl

@@ -50,6 +50,9 @@
   <#if parameters.label?if_exists != "">
      value="${parameters.label?html}"<#rt/>
   </#if>
+  <#if parameters.disabled?default(false)>
+    disabled="disabled"<#rt/>
+  </#if>
  />
 <#else>
   <#if parameters.type?exists && parameters.type=="image">
@@ -66,6 +69,9 @@
     <#if parameters.nameValue?if_exists != "">
      value="${parameters.nameValue?html}"<#rt/>
     </#if>
+    <#if parameters.disabled?default(false)>
+     disabled="disabled"<#rt/>
+    </#if>
     <#if parameters.value?if_exists != "">
      value="${parameters.value?html}"<#rt/>
     </#if>
@@ -96,4 +102,4 @@
 </#if>
 <#if parameters.pushId>
 <script language="JavaScript" type="text/javascript">djConfig.searchIds.push("${parameters.id?html}");</script>
-</#if>
+</#if>

plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java

@@ -36,6 +36,7 @@ public class SubmitAjaxTest extends AbstractUITagTest {
 
         tag.setId("a");
         tag.setHref("b");
+        tag.setDisabled("true");
         tag.setLoadingText("c");
         tag.setErrorText("d");
         tag.setListenTopics("e");
@@ -70,6 +71,7 @@ public class SubmitAjaxTest extends AbstractUITagTest {
         tag.setPageContext(pageContext);
 
         tag.setId("a");
+        tag.setDisabled("true");
         tag.setTheme("ajax");
         tag.setHref("b");
         tag.setLoadingText("c");
@@ -100,6 +102,7 @@ public class SubmitAjaxTest extends AbstractUITagTest {
         tag.setPageContext(pageContext);
 
         tag.setId("a");
+        tag.setDisabled("true");
         tag.setTheme("ajax");
         tag.setHref("b");
         tag.setLoadingText("c");