[maven-release-plugin] copy for tag STRUTS_2_1_3

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

apps/blank/pom.xml

@@ -21,13 +21,12 @@
  * 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">
+<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.1.1-SNAPSHOT</version>
+        <version>2.1.3</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-blank</artifactId>
@@ -35,9 +34,9 @@
     <name>Blank Webapp</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/blank/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/blank/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/blank/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/apps/blank</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/apps/blank</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/apps/blank</url>
     </scm>
 
     <dependencies>

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

@@ -10,6 +10,18 @@
 
     <include file="example.xml"/>
 
+
+
+    <package name="default" namespace="/" extends="struts-default">
+        <default-action-ref name="index" />
+        <action name="index">
+            <result type="redirectAction">
+                <param name="actionName">HelloWorld</param>
+                <param name="namespace">/example</param>
+            </result>
+        </action>
+    </package>
+
     <!-- Add packages here -->
 
 </struts>

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

@@ -5,7 +5,7 @@
 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
     <filter-mapping>

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

@@ -44,7 +44,7 @@ public class ConfigTest extends StrutsTestCase {
                 ActionSupport.INPUT.equals(result));
     }
 
-    protected Map assertFieldErrors(ActionSupport action) throws Exception {
+    protected Map<String, List<String>> assertFieldErrors(ActionSupport action) throws Exception {
         assertTrue(action.hasFieldErrors());
         return action.getFieldErrors();
     }

apps/mailreader/pom.xml

@@ -21,13 +21,12 @@
  * 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">
+<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.1.1-SNAPSHOT</version>
+      <version>2.1.3</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-mailreader</artifactId>
@@ -35,9 +34,9 @@
     <name>Starter Webapp</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/mailreader/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/mailreader/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/mailreader/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/apps/mailreader</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/apps/mailreader</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/apps/mailreader</url>
     </scm>
 
     <dependencies>

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

@@ -7,7 +7,7 @@
     <filter>
         <filter-name>Struts2</filter-name>
         <filter-class>
-            org.apache.struts2.dispatcher.FilterDispatcher
+            org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter
         </filter-class>
     </filter>
 

apps/pom.xml

@@ -21,14 +21,12 @@
  * 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">
+<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-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.3</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-apps</artifactId>
@@ -43,9 +41,9 @@
     </modules>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/apps</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/apps</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/apps</url>
     </scm>
 
      <distributionManagement>
@@ -109,14 +107,10 @@
                                 </goals>
                                 <configuration>
                                     <tasks>
-                                        <taskdef resource="hostedqatasks" classpathref="maven.plugin.classpath"/>
-                                        <upload file="${project.build.directory}/${project.build.finalName}.war"
-                                                account="struts" email="${email}"
-                                                password="${password}" resourceId="${resourceId}"/>
+                                        <taskdef resource="hostedqatasks" classpathref="maven.plugin.classpath" />
+                                        <upload file="${project.build.directory}/${project.build.finalName}.war" account="struts" email="${email}" password="${password}" resourceId="${resourceId}" />
 
-                                        <playsuite suiteId="${suiteId}" clientConfigs="${clientConfigs}" appConfigs="${appConfigs}" account="struts"
-                                                   email="${email}"
-                                                   password="${password}"/>
+                                        <playsuite suiteId="${suiteId}" clientConfigs="${clientConfigs}" appConfigs="${appConfigs}" account="struts" email="${email}" password="${password}" />
                                     </tasks>
                                 </configuration>
                             </execution>
@@ -142,9 +136,9 @@
             <build>
                 <plugins>
                     <plugin>
+                        <inherited>true</inherited>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>rat-maven-plugin</artifactId>
-                        <version>1.0-alpha-2</version>
                         <executions>
                             <execution>
                                 <phase>verify</phase>
@@ -175,22 +169,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.codehaus.cargo</groupId>
-                <artifactId>cargo-maven2-plugin</artifactId>
-                <version>0.3.1</version>
-                <configuration>
-                    <container>
-                        <containerId>tomcat5x</containerId>
-                        <home>${cargo.tomcat5x.home}</home>
-                        <log>${project.build.directory}/tomcat5x.log</log>
-                        <output>${project.build.directory}/tomcat5x.out</output>
-                    </container>
-                    <configuration>
-                        <home>${project.build.directory}/tomcat5x</home>
-                    </configuration>
-                </configuration>
-            </plugin>
             <!-- Include source code under WEB-INF/src/java -->
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
@@ -200,13 +178,11 @@
                         <phase>process-sources</phase>
                         <configuration>
                             <tasks>
-                                <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java"
-                                      failonerror="false">
-                                    <fileset dir="${basedir}/src/main/java"/>
+                                <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java" failonerror="false">
+                                    <fileset dir="${basedir}/src/main/java" />
                                 </copy>
-                                <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java"
-                                      failonerror="false">
-                                    <fileset dir="${basedir}/src/main/resources"/>
+                                <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java" failonerror="false">
+                                    <fileset dir="${basedir}/src/main/resources" />
                                 </copy>
                             </tasks>
                         </configuration>

apps/portlet/pom.xml

@@ -21,13 +21,12 @@
  * 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">
+<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.1.1-SNAPSHOT</version>
+      <version>2.1.3</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-portlet</artifactId>
@@ -35,9 +34,9 @@
     <name>Portlet Webapp</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/portlet/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/portlet/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/portlet/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/apps/portlet</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/apps/portlet</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/apps/portlet</url>
     </scm>
 
 	<profiles>

apps/rest-showcase/pom.xml

@@ -1,26 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<project>
+<!--
+/*
+ * $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.1.1-SNAPSHOT</version>
+        <version>2.1.3</version>
     </parent>
 
 	<groupId>org.apache.struts</groupId>
 	<artifactId>struts2-rest-showcase</artifactId>
 	<packaging>war</packaging>
-	<version>2.1.1-SNAPSHOT</version>
+	<version>2.1.3</version>
 	<name>Struts 2 Rest Showcase Example</name>
 	<description>Struts 2 Rest Showcase Example</description>
-	
+
 	<dependencies>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-rest-plugin</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-convention-plugin</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -28,9 +54,36 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>net.sourceforge.jwebunit</groupId>
+            <artifactId>jwebunit-core</artifactId>
+            <version>1.4.1</version>
+            <scope>test</scope>
+        </dependency>
+            <dependency>
+                <groupId>commons-httpclient</groupId>
+                <artifactId>commons-httpclient</artifactId>
+                <version>3.1</version>
+                <scope>test</scope>
+            </dependency>
+
+
+        <dependency>
+            <groupId>net.sourceforge.jwebunit</groupId>
+            <artifactId>jwebunit-htmlunit-plugin</artifactId>
+            <version>1.4.1</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>xom</groupId>
+                    <artifactId>xom</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
 
     </dependencies>
-	
+
     <build>
       <finalName>struts2-rest-showcase</finalName>
     	<plugins>
@@ -49,6 +102,43 @@
     				<scanIntervalSeconds>10</scanIntervalSeconds>
     			</configuration>
     		</plugin>
+            <!--
+            <plugin>
+                <groupId>org.twdata.maven</groupId>
+                <artifactId>maven-itblast-plugin</artifactId>
+                <version>0.3</version>
+                <executions>
+                    <execution>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <containers>tomcat5x</containers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            -->
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>it/**</exclude>
+                        <exclude>**/*$*</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
     	</plugins>
     </build>
+
+    <!--
+    <pluginRepositories>
+        <pluginRepository>
+            <id>twdata-m2-repository</id>
+            <name>twdata.org Maven Repository</name>
+            <url>http://twdata-m2-repository.googlecode.com/svn/</url>
+        </pluginRepository>
+    </pluginRepositories>
+    -->
 </project>

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

@@ -2,18 +2,22 @@ package org.apache.struts2.rest.example;
 
 import java.util.Collection;
 
-import org.apache.struts2.config.Result;
-import org.apache.struts2.config.Results;
 import org.apache.struts2.dispatcher.ServletActionRedirectResult;
 import org.apache.struts2.rest.DefaultHttpHeaders;
 import org.apache.struts2.rest.HttpHeaders;
+import org.apache.struts2.convention.annotation.Results;
+import org.apache.struts2.convention.annotation.Result;
+import org.apache.struts2.convention.annotation.ParentPackage;
+import org.apache.struts2.convention.annotation.Namespaces;
+import org.apache.struts2.convention.annotation.Namespace;
+import org.apache.struts2.convention.annotation.InterceptorRef;
 
 import com.opensymphony.xwork2.ModelDriven;
 import com.opensymphony.xwork2.Validateable;
 import com.opensymphony.xwork2.ValidationAwareSupport;
 
 @Results({
-    @Result(name="success", type=ServletActionRedirectResult.class, value="orders") 
+    @Result(name="success", type="redirectAction", params = {"actionName" , "orders"})
 })
 public class OrdersController extends ValidationAwareSupport implements ModelDriven<Object>, Validateable{
     

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

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+/*
+ * $Id: struts-plugin.xml 722219 2008-12-01 20:41:26Z musachy $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+
+<!DOCTYPE struts PUBLIC
+        "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+        "http://struts.apache.org/dtds/struts-2.0.dtd">
+
+<struts>
+    <!--  Overwrite Convention -->
+    <constant name="struts.convention.action.suffix" value="Controller"/>
+    <constant name="struts.convention.action.mapAllMatches" value="true"/>
+    <constant name="struts.convention.default.parent.package" value="rest-default"/>
+
+    <constant name="struts.convention.package.locators" value="example"/>
+</struts>

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

@@ -12,11 +12,7 @@
   <!-- START SNIPPET: filter -->
     <filter>
         <filter-name>action2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
-        <init-param>
-          <param-name>actionPackages</param-name>
-          <param-value>org.apache.struts2.rest.example</param-value>
-        </init-param>
+        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
     <!-- END SNIPPET: filter -->
 

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

@@ -0,0 +1,32 @@
+package it.org.apache.struts2.rest.example;
+
+import net.sourceforge.jwebunit.junit.WebTestCase;
+
+public class GetOrdersTest extends WebTestCase {
+
+    public void setUp() throws Exception {
+        getTestContext().setBaseUrl(ParameterUtils.getBaseUrl());
+    }
+
+
+    public void testGetOrders() {
+        beginAt("/orders/3");
+        assertTextPresent("Bob");
+        assertTextNotPresent("Sarah");
+    }
+
+    public void testGetOrdersInHtml() {
+        beginAt("/orders/3.xhtml");
+        assertTextPresent("Bob");
+    }
+
+    public void testGetOrdersInXml() {
+        beginAt("/orders/3.xml");
+        assertTextPresent("<clientName>Bob");
+    }
+
+    public void testGetOrdersInJson() {
+        beginAt("/orders/3.json");
+        assertTextPresent("\"clientName\":\"Bob\"");
+    }
+}

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

@@ -0,0 +1,39 @@
+package it.org.apache.struts2.rest.example;
+
+import net.sourceforge.jwebunit.junit.WebTestCase;
+
+public class ListOrdersTest extends WebTestCase {
+
+    public void setUp() throws Exception {
+        getTestContext().setBaseUrl(ParameterUtils.getBaseUrl());
+    }
+
+
+    public void testListOrders() {
+        beginAt("/orders");
+        assertTextPresent("Bob");
+        assertTextPresent("Sarah");
+        assertTextPresent("Jim");
+    }
+
+    public void testListOrdersInHtml() {
+        beginAt("/orders.xhtml");
+        assertTextPresent("Bob");
+        assertTextPresent("Sarah");
+        assertTextPresent("Jim");
+    }
+
+    public void testListOrdersInXml() {
+        beginAt("/orders.xml");
+        assertTextPresent("<clientName>Bob");
+        assertTextPresent("<clientName>Sarah");
+        assertTextPresent("<clientName>Jim");
+    }
+
+    public void testListOrdersInJson() {
+        beginAt("/orders.json");
+        assertTextPresent("\"clientName\":\"Bob\"");
+        assertTextPresent("\"clientName\":\"Sarah\"");
+        assertTextPresent("\"clientName\":\"Jim\"");
+    }
+}

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

@@ -0,0 +1,12 @@
+package it.org.apache.struts2.rest.example;
+
+public class ParameterUtils {
+
+    public static String getBaseUrl() {
+        String port = System.getProperty("http.port");
+        if (port == null) {
+            port = "8080";
+        }
+        return "http://localhost:"+port+"/struts2-rest-showcase";
+    }
+}

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

@@ -0,0 +1,121 @@
+package it.org.apache.struts2.rest.example;
+
+import net.sourceforge.jwebunit.junit.WebTestCase;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.StringRequestEntity;
+
+import java.io.IOException;
+
+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+
+public class PostOrderTest extends WebTestCase {
+
+    public void setUp() throws Exception {
+        getTestContext().setBaseUrl(ParameterUtils.getBaseUrl());
+    }
+
+
+    public void testPostOrder() {
+        beginAt("/orders/new");
+        setWorkingForm(0);
+        setTextField("clientName", "Test1");
+        setTextField("amount", "321");
+        submit();
+        assertTextPresent("Test1");
+        assertLinkNotPresentWithText("Back to Orders");
+    }
+
+    public void testPostOrderWithErrors() {
+        beginAt("/orders/new");
+        setWorkingForm(0);
+        setTextField("amount", "321");
+        try {
+            submit();
+        } catch (FailingHttpStatusCodeException ex) {
+            // ignore;
+        }
+        assertTextPresent("client name is empty");
+        assertTextFieldEquals("amount", "321");
+    }
+
+    public void testPostOrderInHtml() {
+        beginAt("/orders/new.xhtml");
+        setWorkingForm(0);
+        setTextField("clientName", "Test2");
+        setTextField("amount", "321");
+        try {
+            submit();
+        } catch (FailingHttpStatusCodeException ex) {
+            // ignore;
+        }
+        assertTextPresent("Test2");
+        assertLinkNotPresentWithText("Back to Orders");
+    }
+
+    public void testPostOrderInXml() throws IOException {
+        HttpClient client = new HttpClient();
+        PostMethod method = null;
+        try {
+            method = new PostMethod(ParameterUtils.getBaseUrl()+"/orders.xml");
+            method.setRequestEntity(new StringRequestEntity("<org.apache.struts2.rest.example.Order>\n" +
+                    "<clientName>Test3</clientName>\n" +
+                    "<amount>3342</amount>\n" +
+                    "</org.apache.struts2.rest.example.Order>"));
+            client.executeMethod(method);
+            assertEquals(201, method.getStatusCode());
+            assertTrue(method.getResponseHeader("Location").getValue().startsWith(ParameterUtils.getBaseUrl()+"/orders/"));
+        } finally {
+            method.releaseConnection();
+        }
+    }
+
+    public void testPostOrderInXmlWithBadData() throws IOException {
+        HttpClient client = new HttpClient();
+        PostMethod method = null;
+        try {
+            method = new PostMethod(ParameterUtils.getBaseUrl()+"/orders.xml");
+            method.setRequestEntity(new StringRequestEntity("<org.apache.struts2.rest.example.Order>\n" +
+                    "<amount>3342</amount>\n" +
+                    "</org.apache.struts2.rest.example.Order>"));
+            client.executeMethod(method);
+            assertEquals(400, method.getStatusCode());
+            String response = method.getResponseBodyAsString();
+            assertTrue(response.contains("<string>The client name is empty"));
+            assertNull(method.getResponseHeader("Location"));
+        } finally {
+            method.releaseConnection();
+        }
+    }
+
+    public void testPostOrderInJson() throws IOException {
+        HttpClient client = new HttpClient();
+        PostMethod method = null;
+        try {
+            method = new PostMethod(ParameterUtils.getBaseUrl()+"/orders.json");
+            method.setRequestEntity(new StringRequestEntity("{\"amount\":33,\"clientName\":\"Test4\"}"));
+            client.executeMethod(method);
+            assertEquals(201, method.getStatusCode());
+            assertTrue(method.getResponseHeader("Location").getValue().startsWith(ParameterUtils.getBaseUrl()+"/orders/"));
+        } finally {
+            method.releaseConnection();
+        }
+    }
+
+    public void testPostOrderInJsonWithBadData() throws IOException {
+        HttpClient client = new HttpClient();
+        PostMethod method = null;
+        try {
+            method = new PostMethod(ParameterUtils.getBaseUrl()+"/orders.json");
+            method.setRequestEntity(new StringRequestEntity("{\"amount\":33}"));
+            client.executeMethod(method);
+            String response = method.getResponseBodyAsString();
+            assertEquals(400, method.getStatusCode());
+
+            assertEquals("{\"actionErrors\":[],\"fieldErrors\":{\"clientName\":[\"The client name is empty\"]}}", response);
+            assertNull(method.getResponseHeader("Location"));
+        } finally {
+            method.releaseConnection();
+        }
+    }
+}

apps/showcase/pom.xml

@@ -21,13 +21,12 @@
  * 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">
+<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.1.1-SNAPSHOT</version>
+        <version>2.1.3</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-showcase</artifactId>
@@ -35,9 +34,9 @@
     <name>Showcase Webapp</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/showcase/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/showcase/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/showcase/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/apps/showcase</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/apps/showcase</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/apps/showcase</url>
     </scm>
 
 
@@ -182,6 +181,32 @@
          <version>1.1.1</version>
      </dependency>
 
+     <dependency>
+         <groupId>net.sourceforge.jwebunit</groupId>
+         <artifactId>jwebunit-core</artifactId>
+         <version>1.4.1</version>
+         <scope>test</scope>
+     </dependency>
+
+     <dependency>
+         <groupId>commons-httpclient</groupId>
+         <artifactId>commons-httpclient</artifactId>
+         <version>3.1</version>
+         <scope>test</scope>
+     </dependency>
+
+     <dependency>
+         <groupId>net.sourceforge.jwebunit</groupId>
+         <artifactId>jwebunit-htmlunit-plugin</artifactId>
+         <version>1.4.1</version>
+         <scope>test</scope>
+         <exclusions>
+             <exclusion>
+                 <groupId>xom</groupId>
+                 <artifactId>xom</artifactId>
+             </exclusion>
+         </exclusions>
+     </dependency>
 
     </dependencies>
 
@@ -212,19 +237,56 @@
                    </dependency>
                 </dependencies>
             </plugin>
+            <!--
+            <plugin>
+                <groupId>org.twdata.maven</groupId>
+                <artifactId>maven-itblast-plugin</artifactId>
+                <version>0.3</version>
+                <executions>
+                    <execution>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <containers>tomcat5x</containers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            -->
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>it/**</exclude>
+                        <exclude>**/*$*</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
-                <resources>
-                    <!-- Include resources under src/main/java in WEB-INF/classes -->
-                    <resource>
-                        <directory>src/main/resources</directory>
-                    </resource>
-                    <resource>
-                        <directory>src/main/java</directory>
-                            <includes>
-                                <include>**/*.java</include>
-                             </includes>
-                     </resource>
-                </resources>
+
+        <resources>
+            <!-- Include resources under src/main/java in WEB-INF/classes -->
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.java</include>
+                </includes>
+            </resource>
+        </resources>
 
     </build>
+    <!--
+    <pluginRepositories>
+        <pluginRepository>
+            <id>twdata-m2-repository</id>
+            <name>twdata.org Maven Repository</name>
+            <url>http://twdata-m2-repository.googlecode.com/svn/</url>
+        </pluginRepository>
+    </pluginRepositories>
+    -->
 </project>

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+// START SNIPPET: entire-file
 package org.apache.struts2.showcase.fileupload;
 
 import java.io.File;
@@ -44,7 +45,6 @@ public class MultipleFileUploadUsingArrayAction extends ActionSupport {
     public String[] getUploadContentType() { return this.uploadContentTypes; }
     public void setUploadContentType(String[] uploadContentType) { this.uploadContentTypes = uploadContentType; }
 
-
     public String upload() throws Exception {
         System.out.println("\n\n upload2");
         System.out.println("files:");
@@ -62,5 +62,5 @@ public class MultipleFileUploadUsingArrayAction extends ActionSupport {
         System.out.println("\n\n");
         return SUCCESS;
     }
-
 }
+// END SNIPPET: entire-file

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+// START SNIPPET: entire-file
 package org.apache.struts2.showcase.fileupload;
 import java.io.File;
 import java.util.ArrayList;
@@ -57,9 +58,6 @@ public class MultipleFileUploadUsingListAction extends ActionSupport {
         this.uploadContentTypes = contentTypes;
     }
 
-
-
-
     public String upload() throws Exception {
 
         System.out.println("\n\n upload1");
@@ -78,6 +76,5 @@ public class MultipleFileUploadUsingListAction extends ActionSupport {
         System.out.println("\n\n");
         return SUCCESS;
     }
-
-
 }
+// END SNIPPET: entire-file

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

@@ -3,7 +3,7 @@
 <!DOCTYPE struts PUBLIC
     "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
     "http://struts.apache.org/dtds/struts-2.0.dtd">
-	
+
 <struts>
     <package name="ui-tags" extends="struts-default" namespace="/tags/ui">
         <action name="example" class="org.apache.struts2.showcase.UITagExample">
@@ -40,26 +40,30 @@
         </action>
 
         <!--  START SNIPPET: treeExampleDynamicXWorkXml -->
-        
+
         <action name="showDynamicTreeAction" class="org.apache.struts2.showcase.ShowDynamicTreeAction">
         	<result>/tags/ui/treeExampleDynamic.jsp</result>
         </action>
-        
+
         <!--  END SNIPPET: treeExampleDynamicXWorkXml -->
-        
+
         <action name="showDynamicAjaxTreeAction">
             <result>/tags/ui/treeExampleAjaxDynamic.jsp</result>
         </action>
-        
+
         <action name="showComponentTagExampleCode">
         	<result type="plainText">/tags/ui/componentTagExample.jsp</result>
         </action>
-        
+
+        <action name="actionTagExample">
+            <result>/tags/ui/actionTagExampleCalled.jsp</result>
+            <result name="input">/tags/ui/actionTagExampleCalling.jsp</result>
+        </action>
 	</package>
-	
+
 	<!--  START SNIPPET: treeExampleXWorkXml -->
-	
-	<package name="ui-tags-ajax" namespace="/tags/ui/ajax" extends="struts-default">        
+
+	<package name="ui-tags-ajax" namespace="/tags/ui/ajax" extends="struts-default">
         <!-- Actions dealing with Tree Example  -->
         <action name="staticTreeSelectAction">
         	<result>/tags/ui/staticTreeSelect.jsp</result>
@@ -68,6 +72,6 @@
         	<result>/tags/ui/dynamicTreeSelect.jsp</result>
         </action>
     </package>
-    
+
     <!--  END SNIPPET: treeExampleXWorkXml -->
 </struts>

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

@@ -49,43 +49,43 @@
             </div><!-- end search -->
 
             <hr/>
+            <div style="clear: both;"></div>
         </div>
     </div><!-- end header -->
 
     <div id="content" class="clearfix">
-
-        <decorator:body/>
-
         <div id="nav">
             <div class="wrapper">
                 <h2 class="accessibility">Navigation</h2>
                 <ul class="clearfix">
-        <li><a href="<s:url value="/showcase.jsp"/>">Home</a></li>
-        <li><a href="<s:url value="/ajax/index.jsp"/>">Ajax</a></li>
-        <li><a href="<s:url value="/chat/index.jsp"/>">Ajax Chat</a></li>
-        <li><a href="<s:url action="actionChain1!input" namespace="/actionchaining"  includeParams="none" />">Action Chaining</a></li>
-        <li><a href="<s:url action="index" namespace="/config-browser" includeParams="none" />">Config Browser</a></li>
-        <li><a href="<s:url value="/conversion/index.jsp"/>">Conversion</a></li>
-        <li><a href="<s:url value="/empmanager/index.jsp"/>">CRUD</a></li>
-        <li><a href="<s:url value="/wait/index.jsp"/>">Execute & Wait</a></li>
-        <li><a href="<s:url value="/filedownload/index.jsp"/>">File Download</a></li>
-        <li><a href="<s:url value="/fileupload" />">File Upload</a></li>
-        <li><a href="<s:url value="/freemarker/index.jsp"/>">Freemarker</a>
-        <li><a href="<s:url action="hangmanMenu" namespace="/hangman"/>">Hangman</a></li>
-        <li><a href="<s:url value="/jsf/index.jsp"/>">JavaServer Faces</a></li>
-        <li><a href="<s:url value="/person/index.jsp"/>">Person Manager</a></li>
-        <li><a href="<s:url value="/tags/index.jsp"/>">Tags</a></li>
-        <li><a href="<s:url value="/tiles/index.action" />">Tiles</a></li>
-        <li><a href="<s:url value="/token/index.jsp"/>">Token</a></li>
-        <li><a href="<s:url value="/validation/index.jsp"/>">Validation</a></li>
-        <li><a href="<s:url value="/interactive/index.jsp"/>">Interactive Demo</a></li>
-        <li class="last"><a href="<s:url value="/help.jsp"/>">Help</a></li>
+                    <li><a href="<s:url value="/showcase.jsp"/>">Home</a></li>
+                    <li><a href="<s:url value="/ajax/index.jsp"/>">Ajax</a></li>
+                    <li><a href="<s:url value="/chat/index.jsp"/>">Ajax Chat</a></li>
+                    <li><a href="<s:url action="actionChain1!input" namespace="/actionchaining"  includeParams="none" />">Action Chaining</a></li>
+                    <li><a href="<s:url action="index" namespace="/config-browser" includeParams="none" />">Config Browser</a></li>
+                    <li><a href="<s:url value="/conversion/index.jsp"/>">Conversion</a></li>
+                    <li><a href="<s:url value="/empmanager/index.jsp"/>">CRUD</a></li>
+                    <li><a href="<s:url value="/wait/index.jsp"/>">Execute & Wait</a></li>
+                    <li><a href="<s:url value="/filedownload/index.jsp"/>">File Download</a></li>
+                    <li><a href="<s:url value="/fileupload/index.jsp" />">File Upload</a></li>
+                    <li><a href="<s:url value="/freemarker/index.jsp"/>">Freemarker</a>
+                    <li><a href="<s:url action="hangmanMenu" namespace="/hangman"/>">Hangman</a></li>
+                    <li><a href="<s:url value="/jsf/index.jsp"/>">JavaServer Faces</a></li>
+                    <li><a href="<s:url value="/tags/index.jsp"/>">Tags</a></li>
+                    <li><a href="<s:url value="/tiles/index.action" />">Tiles</a></li>
+                    <li><a href="<s:url value="/token/index.jsp"/>">Token</a></li>
+                    <li><a href="<s:url value="/validation/index.jsp"/>">Validation</a></li>
+                    <li><a href="<s:url value="/interactive/index.jsp"/>">Interactive Demo</a></li>
+                    <li><a href="<s:url value="/person/index.jsp"/>">Person Manager</a></li>
+                    <li class="last"><a href="<s:url value="/help.jsp"/>">Help</a></li>
                 </ul>
             </div>
             <hr/>
 
         </div><!-- end nav -->
 
+        <decorator:body/>
+        
     </div><!-- end content -->
 
 	<div>

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

@@ -7,26 +7,26 @@
     <display-name>Struts Showcase Application</display-name>
 	
     <filter>
-        <filter-name>struts-cleanup</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ActionContextCleanUp</filter-class>
-    </filter>
-
-    <filter>
-        <filter-name>struts</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
+        <filter-name>struts-prepare</filter-name>
+        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter</filter-class>
         <init-param>
         	<param-name>actionPackages</param-name>
         	<param-value>org.apache.struts2.showcase.person</param-value>
         </init-param>
     </filter>
 
+    <filter>
+        <filter-name>struts-execute</filter-name>
+        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter</filter-class>
+    </filter>
+
     <filter>
         <filter-name>sitemesh</filter-name>
         <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
     </filter>
 
     <filter-mapping>
-        <filter-name>struts-cleanup</filter-name>
+        <filter-name>struts-prepare</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
@@ -36,7 +36,7 @@
     </filter-mapping>
 
     <filter-mapping>
-        <filter-name>struts</filter-name>
+        <filter-name>struts-execute</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 

apps/showcase/src/main/webapp/styles/layout-navtop-localleft.css

@@ -7,7 +7,7 @@
         position: relative;
         width: 98%;
         
-        margin: 5em auto 20px auto;
+        margin: 5px auto 20px auto;
         padding: 0;
         
         text-align: left;
@@ -26,8 +26,6 @@
         display: none;
     }
     div#nav {
-        position: absolute;
-        top: -15px;
         left: 0;
         width: 100%;
         

apps/showcase/src/main/webapp/styles/layout.css

@@ -27,6 +27,7 @@
             background: #818EBD;
             
             text-align: left;
+            height: 70px;
         }
         div#branding {
             float: left;

apps/showcase/src/main/webapp/styles/nav-horizontal.css

@@ -10,7 +10,6 @@
         /* end hide */
     }
     div#nav div.wrapper {
-        position: absolute;
         left: 0;
         bottom: 0;
         width: 100%;

apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalled.jsp

@@ -0,0 +1,2 @@
+<%@taglib prefix="s" uri="/struts-tags" %>
+This text is from the called class

apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalling.jsp

@@ -0,0 +1,14 @@
+<%@taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+<head>
+<title>Showcase - Tags - UI Tags - Action Tag</title>
+</head>
+<body>
+  <b>Example 1:</b>
+  This example calls an action and includes the output on the page
+  <p id="example1" style="background-color:yellow;">
+    <s:action namespace="/tags/ui" name="actionTagExample" executeResult="true"/>
+  </p>
+</body>
+</html>

apps/showcase/src/main/webapp/tags/ui/example.jsp

@@ -16,8 +16,8 @@
 
 
 <s:form action="exampleSubmit" enctype="multipart/form-data" javascriptTooltip="true">
-    <s:textfield 
-            label="Name" 
+    <s:textfield
+            label="Name"
             name="name"
             tooltip="Enter your Name here"/>
 
@@ -25,13 +25,13 @@
             tooltip="Select Your Birthday"
             label="Birthday"
             name="birthday" />
-            
+
     <sx:datetimepicker
             tooltip="Enter the time you wake up"
             label="Wake up time"
-            name="wakeup" 
+            name="wakeup"
             type="time"/>
-            
+
     <s:textarea
             tooltip="Enter your Biography"
             label="Biography"
@@ -76,7 +76,7 @@
             name="region" list="{'North', 'South'}"
             value="'South'"
             doubleValue="'Florida'"
-            doubleList="top == 'North' ? {'Oregon', 'Washington'} : {'Texas', 'Florida'}" 
+            doubleList="top == 'North' ? {'Oregon', 'Washington'} : {'Texas', 'Florida'}"
             doubleName="state"
             headerKey="-1"
             headerValue="---------- Please Select ----------"
@@ -100,35 +100,35 @@
 
     <s:file
             tooltip="Upload Your Picture"
-            label="Picture" 
+            label="Picture"
             name="picture" />
-            
+
     <s:optiontransferselect
             tooltip="Select Your Favourite Cartoon Characters"
             label="Favourite Cartoons Characters"
-            name="leftSideCartoonCharacters" 
+            name="leftSideCartoonCharacters"
             leftTitle="Left Title"
             rightTitle="Right Title"
-            list="{'Popeye', 'He-Man', 'Spiderman'}" 
+            list="{'Popeye', 'He-Man', 'Spiderman'}"
             multiple="true"
             headerKey="headerKey"
             headerValue="--- Please Select ---"
             emptyOption="true"
-            doubleList="{'Superman', 'Mickey Mouse', 'Donald Duck'}" 
+            doubleList="{'Superman', 'Mickey Mouse', 'Donald Duck'}"
             doubleName="rightSideCartoonCharacters"
             doubleHeaderKey="doubleHeaderKey"
-            doubleHeaderValue="--- Please Select ---" 
+            doubleHeaderValue="--- Please Select ---"
             doubleEmptyOption="true"
             doubleMultiple="true" />
-    
+
     <s:textarea
             label="Your Thougths"
-            name="thoughts" 
+            name="thoughts"
             tooltip="Enter your thoughts here" />
-            
-    <s:submit onclick="alert('Custom onclick event triggered before submitting form... Press OK to continue!');" />
+
+    <s:submit />
     <s:reset onclick="alert('Resetting form now... Press OK to continue!');" />
 </s:form>
-    
+
 </body>
 </html>

apps/showcase/src/main/webapp/tags/ui/index.jsp

@@ -6,7 +6,7 @@
 </head>
 <body>
     <h1>UI Tags</h1>
-    
+
     <ul>
         <li><s:url var="url" namespace="/tags/ui" action="example" method="input" /><s:a href="%{url}">UI Example</s:a></li>
         <li><s:url var="url" namespace="/tags/ui" action="exampleVelocity" method="input" /><s:a href="%{url}">UI Example (Velocity)</s:a></li>
@@ -16,8 +16,9 @@
         <li><s:url var="url" namespace="/tags/ui" action="showDynamicTreeAction"/><s:a href="%{url}">Tree Example (dynamic)</s:a>
         <li><s:url var="url" namespace="/tags/ui" action="showDynamicAjaxTreeAction"/><s:a href="%{url}">Tree Example (dynamic ajax loading)</s:a>
         <li><s:url var="url" value="componentTagExample.jsp"/><s:a href="%{#url}">Component Tag Example</s:a>
-        <li><a href="datepicker">DateTime picker tag - Pick a date</a></li>
-        <li><a href="timepicker">DateTime picker tag - Pick a time</a></li>
+        <li><s:url var="url" namespace="/tags/ui" action="actionTagExample" method="input" /><s:a href="%{url}">Action Tag Example</s:a></li>
+        <li><a href="datepicker/index.jsp">DateTime picker tag - Pick a date</a></li>
+        <li><a href="timepicker/index.jsp">DateTime picker tag - Pick a time</a></li>
         <%--li><s:url var="url" namespace="/tags/ui" action="populateUsingIterator" method="input" /><s:a href="%{url}">UI population using iterator tag</s:a></li--%>
     </ul>
 </body>

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

@@ -0,0 +1,29 @@
+/*
+ * $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.
+ */
+package it.org.apache.struts2.showcase;
+
+public class ActionTagExampleTest extends ITBaseTest {
+    public void test() {
+        beginAt("/tags/ui/actionTagExample!input.action");
+        assertTextPresent("This text is from the called class");
+    }
+
+}

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

@@ -0,0 +1,31 @@
+/*
+ * $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.
+ */
+package it.org.apache.struts2.showcase;
+
+public class ComponentTagExampleTest extends ITBaseTest {
+    public void test() {
+        beginAt("/tags/ui/componentTagExample.jsp");
+        assertTextPresent("Freemarker Custom Template - parameter 'paramName' - paramValue1");
+        assertTextPresent("Freemarker Custom Template - parameter 'paramName' - paramValue4");
+        assertTextPresent("JSP Custom Template - parameter 'paramName' - paramValue2");
+        assertTextPresent("JSP Custom Template - parameter 'paramName' - paramValue3");
+    }
+}

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

@@ -0,0 +1,30 @@
+/*
+ * $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.
+ */
+package it.org.apache.struts2.showcase;
+
+import net.sourceforge.jwebunit.junit.WebTestCase;
+
+public abstract class ITBaseTest extends WebTestCase {
+
+    public void setUp() throws Exception {
+        getTestContext().setBaseUrl(ParameterUtils.getBaseUrl());
+    }
+}

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

@@ -0,0 +1,32 @@
+/*
+ * $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.
+ */
+package it.org.apache.struts2.showcase;
+
+public class ParameterUtils {
+
+    public static String getBaseUrl() {
+        String port = System.getProperty("http.port");
+        if (port == null) {
+            port = "8080";
+        }
+        return "http://localhost:"+port+"/struts2-showcase";
+    }
+}

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

@@ -0,0 +1,55 @@
+/*
+ * $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.
+ */
+package it.org.apache.struts2.showcase;
+
+public class UITagExampleTest extends ITBaseTest {
+    public void testInputForm() {
+        setScriptingEnabled(false);
+        beginAt("/tags/ui/example!input.action");
+        assertFormPresent("exampleSubmit");
+        // text box
+        assertFormElementPresent("name");
+        // textarea
+        assertFormElementPresent("bio");
+        // select
+        assertFormElementPresent("favouriteColor");
+        // checkbox list
+        assertFormElementPresent("friends");
+        // checkbox
+        assertFormElementPresent("legalAge");
+
+        // set fields
+        setTextField("name", "name");
+        setTextField("bio", "bio");
+        selectOption("favouriteColor", "Red");
+        checkCheckbox("friends", "Patrick");
+        checkCheckbox("friends", "Jason");
+        checkCheckbox("legalAge");
+
+        submit();
+
+        assertTextInElement("name", "name");
+        assertTextInElement("bio", "bio");
+        assertTextInElement("favouriteColor", "Red");
+        assertTextInElement("friends", "[Patrick, Jason]");
+        assertTextInElement("legalAge", "true");
+    }
+}

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

@@ -0,0 +1,37 @@
+package it.org.apache.struts2.showcase.staticcontent;
+
+import it.org.apache.struts2.showcase.ITBaseTest;
+
+import java.io.IOException;
+
+import net.sourceforge.jwebunit.exception.TestingEngineResponseException;
+
+public class StaticContentTest extends ITBaseTest {
+
+    public void testInvalidRersources1() throws IOException {
+        try {
+            beginAt("/struts..");
+            fail("Previous request should have failed");
+        } catch (TestingEngineResponseException ex) {
+            // ok
+        }
+    }
+
+    public void testInvalidRersources2() throws IOException {
+        try {
+            beginAt("/struts/..%252f");
+            fail("Previous request should have failed");
+        } catch (TestingEngineResponseException ex) {
+            // ok
+        }
+    }
+
+    /*public void testInvalidRersources3() throws IOException {
+        try {
+            beginAt("/struts/..%252f..%252f..%252fWEB-INF/classes/org/apache/struts2/showcase/action/EmployeeAction.class/");
+            fail("Previous request should have failed");
+        } catch (TestingEngineResponseException ex) {
+            // ok
+        }
+    }*/
+}

assembly/pom.xml

@@ -1,26 +1,4 @@
-<?xml version="1.0"?>
-<!--
-/*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Id$
- */
--->
-
-<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">
+<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>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-assembly</artifactId>
@@ -33,16 +11,160 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.3</version>
     </parent>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/assembly</connection>
-        <developerConnection>
-            scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/assembly</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/assembly</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/assembly</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/assembly</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/assembly</url>
     </scm>
+    
+    <profiles>
+        <profile>
+            <id>j4</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>2.2-beta-1</version>
+                        <executions>
+                            <execution>
+                                <id>make-assembly</id>
+                                <phase>package</phase>
+                                <goals>
+                                     <goal>attached</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/all.xml</descriptor>
+                                <descriptor>src/main/assembly/lib.xml</descriptor>
+                                <descriptor>src/main/assembly/lib-jdk14.xml</descriptor>
+                                <descriptor>src/main/assembly/apps.xml</descriptor>
+                                <descriptor>src/main/assembly/src.xml</descriptor>
+                                <descriptor>src/main/assembly/docs.xml</descriptor>
+                            </descriptors>
+                            <finalName>struts-${version}</finalName>
+                            <outputDirectory>target/assembly/out</outputDirectory>
+                            <workDirectory>target/assembly/work</workDirectory>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </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>backport-util-concurrent</groupId>
+                        <artifactId>backport-util-concurrent</artifactId>
+                        <version>3.0</version>
+                        <scope>runtime</scope>
+                    </dependency>
+
+                    <dependency>
+                        <groupId>com.opensymphony</groupId>
+                        <artifactId>xwork</artifactId>
+                        <version>2.1.2</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-config-browser-plugin</artifactId>
+                        <version>${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-jfreechart-plugin</artifactId>
+                        <version>${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-pell-multipart-plugin</artifactId>
+                        <version>${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-sitegraph-plugin</artifactId>
+                        <version>${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-struts1-plugin</artifactId>
+                        <version>${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-rest-plugin</artifactId>
+                        <version>${version}</version>
+                        <classifier>jdk14</classifier>
+                    </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+    
     <build>
         <plugins>
             <plugin>
@@ -109,7 +231,7 @@
                                     <groupId>com.opensymphony</groupId>
                                     <artifactId>xwork</artifactId>
                                     <classifier>javadoc</classifier>
-                                    <version>2.1.1</version>
+                                    <version>2.1.2</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/xwork-apidocs</outputDirectory>
@@ -125,12 +247,9 @@
                         <phase>process-resources</phase>
                         <configuration>
                             <tasks>
-                                <mkdir dir="${project.build.directory}/cwiki"/>
-                                <get src="http://struts.apache.org/2.x/docs.zip"
-                                     dest="${project.build.directory}/docs.zip"
-                                     ignoreerrors="false"/>
-                                <unzip src="${project.build.directory}/docs.zip"
-                                        dest="${project.build.directory}/cwiki"/>
+                                <mkdir dir="${project.build.directory}/cwiki" />
+                                <get src="http://struts.apache.org/2.x/docs.zip" dest="${project.build.directory}/docs.zip" ignoreerrors="false" />
+                                <unzip src="${project.build.directory}/docs.zip" dest="${project.build.directory}/cwiki" />
                             </tasks>
                         </configuration>
                         <goals>
@@ -142,11 +261,19 @@
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>2.2-beta-1</version>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                             <goal>attached</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 <configuration>
                     <descriptors>
                         <descriptor>src/main/assembly/all.xml</descriptor>
                         <descriptor>src/main/assembly/lib.xml</descriptor>
-                        <descriptor>src/main/assembly/lib-jdk14.xml</descriptor>
                         <descriptor>src/main/assembly/apps.xml</descriptor>
                         <descriptor>src/main/assembly/src.xml</descriptor>
                         <descriptor>src/main/assembly/docs.xml</descriptor>
@@ -161,6 +288,23 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-codebehind-plugin</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-convention-plugin</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-javatemplates-plugin</artifactId>
+            <version>${version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
@@ -168,6 +312,18 @@
             <version>${version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-dojo-plugin</artifactId>
+            <version>${version}</version>
+        </dependency>
+ 
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-dwr-plugin</artifactId>
+            <version>${version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-jasperreports-plugin</artifactId>
@@ -186,6 +342,12 @@
             <version>${version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-junit-plugin</artifactId>
+            <version>${version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-pell-multipart-plugin</artifactId>
@@ -200,15 +362,32 @@
 
         <dependency>
             <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-sitegraph-plugin</artifactId>
+            <artifactId>struts2-portlet-plugin</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-rest-plugin</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-sitegraph-plugin</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-sitemesh-plugin</artifactId>
             <version>${version}</version>
         </dependency>
+       <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-spring-plugin</artifactId>
+            <version>${version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
@@ -218,125 +397,16 @@
 
         <dependency>
             <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-tiles-plugin</artifactId>
+            <artifactId>struts2-testng-plugin</artifactId>
             <version>${version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-rest-plugin</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <!-- 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>backport-util-concurrent</groupId>
-            <artifactId>backport-util-concurrent</artifactId>
-            <version>3.0</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.opensymphony</groupId>
-            <artifactId>xwork</artifactId>
-            <version>2.1.1</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-config-browser-plugin</artifactId>
-            <version>${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-jfreechart-plugin</artifactId>
-            <version>${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-pell-multipart-plugin</artifactId>
-            <version>${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-sitegraph-plugin</artifactId>
-            <version>${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-struts1-plugin</artifactId>
-            <version>${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-rest-plugin</artifactId>
-            <version>${version}</version>
-            <classifier>jdk14</classifier>
-        </dependency>
-
-
     </dependencies>
 
-</project>
+</project>

assembly/src/main/assembly/all.xml

@@ -127,6 +127,14 @@
         <directory>../plugins/codebehind/target/site</directory>
         <outputDirectory>docs/struts2-plugins/struts2-codebehind-plugin</outputDirectory>
       </fileSet>
+      <fileSet>
+        <directory>../plugins/codebehind/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-javatemplates-plugin</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../plugins/convention/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-convention-plugin</outputDirectory>
+      </fileSet>
       <fileSet>
         <directory>../plugins/config-browser/target/site</directory>
         <outputDirectory>docs/struts2-plugins/struts2-config-browser-plugin</outputDirectory>
@@ -135,6 +143,10 @@
         <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>
@@ -147,6 +159,10 @@
         <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>
@@ -179,6 +195,10 @@
         <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>

assembly/src/main/assembly/docs.xml

@@ -67,6 +67,10 @@
         <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>
@@ -79,6 +83,10 @@
         <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>
@@ -111,6 +119,10 @@
         <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>

core/pom.xml

@@ -21,13 +21,12 @@
  * 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">
+<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-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.3</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-core</artifactId>
@@ -35,9 +34,9 @@
     <name>Struts 2 Core</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/core/</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/core/</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/core/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/core</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/core</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/core</url>
     </scm>
 
     <build>
@@ -57,7 +56,7 @@
                                 <artifactItem>
                                     <groupId>com.opensymphony</groupId>
                                     <artifactId>xwork</artifactId>
-                                    <version>2.1.1</version>
+                                    <version>2.1.2</version>
                                     <classifier>sources</classifier>
                                 </artifactItem>
                             </artifactItems>
@@ -130,7 +129,6 @@
                     </links>
                 </configuration>
             </plugin>
-            <!--
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>rat-maven-plugin</artifactId>
@@ -145,10 +143,10 @@
                         <exclude>src/main/resources/org/apache/struts2/static/domTT.js</exclude>
                         <exclude>src/test/resources/org/apache/struts2/interceptor/validation/*</exclude>
                         <exclude>src/site/resources/tags/**</exclude>
+                        <exclude>src/main/resources/*LICENSE.txt</exclude>
                     </excludes>
                 </configuration>
             </plugin>
-            -->
         </plugins>
     </reporting>
 
@@ -231,7 +229,7 @@
         <dependency>
             <groupId>com.opensymphony</groupId>
             <artifactId>xwork</artifactId>
-            <version>2.1.1</version>
+            <version>2.1.2</version>
         </dependency>
 
         <!--<dependency>-->
@@ -243,7 +241,7 @@
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
-            <version>2.3.12</version>
+            <version>2.3.13</version>
         </dependency>
 
         <dependency>
@@ -394,7 +392,6 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts-annotations</artifactId>
-            <version>1.0.3</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>

core/src/main/java/org/apache/struts2/RequestUtils.java

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2;
 
 import javax.servlet.http.HttpServletRequest;

core/src/main/java/org/apache/struts2/ServletActionContext.java

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2;
 
 import java.util.Map;

core/src/main/java/org/apache/struts2/StrutsConstants.java

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2;
 
 import org.apache.struts2.dispatcher.mapper.CompositeActionMapper;
@@ -99,7 +100,7 @@ public final class StrutsConstants {
     /** List of Velocity context names */
     public static final String STRUTS_VELOCITY_CONTEXTS = "struts.velocity.contexts";
 
-    /** The directory containing UI templates */
+    /** The directory containing UI templates.  All templates must reside in this directory. */
     public static final String STRUTS_UI_TEMPLATEDIR = "struts.ui.templateDir";
 
     /** The default UI template theme */
@@ -117,9 +118,15 @@ public final class StrutsConstants {
      */
     public static final String STRUTS_MULTIPART_PARSER = "struts.multipart.parser";
 
-    /** Whether Spring should autoWire or not */
+    /** How Spring should autowire.  Valid values are 'name', 'type', 'auto', and 'constructor' */
     public static final String STRUTS_OBJECTFACTORY_SPRING_AUTOWIRE = "struts.objectFactory.spring.autoWire";
 
+    /** Whether the autowire strategy chosen by STRUTS_OBJECTFACTORY_SPRING_AUTOWIRE is always respected.  Defaults
+     * to false, which is the legacy behavior that tries to determine the best strategy for the situation.
+     * @since 2.1.3
+     */
+    public static final String STRUTS_OBJECTFACTORY_SPRING_AUTOWIRE_ALWAYS_RESPECT = "struts.objectFactory.spring.autoWire.alwaysRespect";
+
     /** Whether Spring should use its class cache or not */
     public static final String STRUTS_OBJECTFACTORY_SPRING_USE_CLASS_CACHE = "struts.objectFactory.spring.useClassCache";
 
@@ -183,4 +190,9 @@ public final class StrutsConstants {
     /** The {@link com.opensymphony.xwork2.util.PatternMatcher} implementation class */
     public static final String STRUTS_PATTERNMATCHER = "struts.patternMatcher";
 
+    /** The {@link org.apache.struts2.dispatcher.StaticContentLoader} implementation class */
+    public static final String STRUTS_STATIC_CONTENT_LOADER = "struts.staticContentLoader";
+
+    /** The {@link com.opensymphony.xwork2.UnknownHandlerManager} implementation class */
+    public static final String STRUTS_UNKNOWN_HANDLER_MANAGER = "struts.unknownHandlerManager";
 }

core/src/main/java/org/apache/struts2/StrutsException.java

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2;
 
 import com.opensymphony.xwork2.XWorkException;

core/src/main/java/org/apache/struts2/StrutsStatics.java

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2;
 
 

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.io.IOException;
@@ -44,6 +45,7 @@ import org.apache.struts2.views.jsp.TagUtils;
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionProxy;
 import com.opensymphony.xwork2.ActionProxyFactory;
+import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.util.ValueStackFactory;
@@ -189,7 +191,7 @@ public class ActionComponent extends ContextBean {
         Map application = ctx.getApplication();
 
         Dispatcher du = Dispatcher.getInstance();
-        Map extraContext = du.createContextMap(new RequestMap(req),
+        Map<String, Object> extraContext = du.createContextMap(new RequestMap(req),
                 newParams,
                 session,
                 application,
@@ -278,6 +280,7 @@ public class ActionComponent extends ContextBean {
         // get the old value stack from the request
         ValueStack stack = getStack();
         // execute at this point, after params have been set
+        ActionInvocation inv = ActionContext.getContext().getActionInvocation();
         try {
 
             proxy = actionProxyFactory.createActionProxy(namespace, actionName, methodName, createExtraContext(), executeResult, true);
@@ -291,6 +294,9 @@ public class ActionComponent extends ContextBean {
         } finally {
             // set the old stack back on the request
             req.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, stack);
+            if (inv != null) {
+                ActionContext.getContext().setActionInvocation(inv);
+            }
         }
 
         if ((getVar() != null) && (proxy != null)) {

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import javax.servlet.http.HttpServletRequest;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import javax.servlet.http.HttpServletRequest;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import javax.servlet.http.HttpServletRequest;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.io.Writer;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.io.Writer;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import javax.servlet.http.HttpServletRequest;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import javax.servlet.http.HttpServletRequest;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.io.Writer;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.util.Collection;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.io.IOException;
@@ -242,25 +243,84 @@ public class Component {
             return null;
         }
 
-        if (altSyntax()) {
-            // does the expression start with %{ and end with }? if so, just cut it off!
-            if (expr.startsWith("%{") && expr.endsWith("}")) {
-                expr = expr.substring(2, expr.length() - 1);
-            }
-        }
+        expr = stripExpressionIfAltSyntax(expr);
 
         return getStack().findValue(expr);
     }
 
+    /**
+     * If altsyntax (%{...}) is applied, simply strip the "%{" and "}" off. 
+     * @param expr the expression (must be not null)
+     * @return the stripped expression if altSyntax is enabled. Otherwise
+     * the parameter expression is returned as is.
+     */
+	protected String stripExpressionIfAltSyntax(String expr) {
+		return stripExpressionIfAltSyntax(stack, expr);
+	}
+	
+    /**
+     * If altsyntax (%{...}) is applied, simply strip the "%{" and "}" off.
+     * @param stack the ValueStack where the context value is searched for. 
+     * @param expr the expression (must be not null)
+     * @return the stripped expression if altSyntax is enabled. Otherwise
+     * the parameter expression is returned as is.
+     */
+	public static String stripExpressionIfAltSyntax(ValueStack stack, String expr) {
+		if (altSyntax(stack)) {
+            // does the expression start with %{ and end with }? if so, just cut it off!
+            if (expr.startsWith("%{") && expr.endsWith("}")) {
+                return expr.substring(2, expr.length() - 1);
+            }
+        }
+		return expr;
+	}
+
+    /**
+     * Is the altSyntax enabled? [TRUE]
+     * <p/>
+     * @param stack the ValueStack where the context value is searched for.
+     * @return true if altSyntax is activated. False otherwise. 
+     * See <code>struts.properties</code> where the altSyntax flag is defined.
+     */
+	public static boolean altSyntax(ValueStack stack)  {
+        return ContextUtil.isUseAltSyntax(stack.getContext());
+	}
+
     /**
      * Is the altSyntax enabled? [TRUE]
      * <p/>
      * See <code>struts.properties</code> where the altSyntax flag is defined.
      */
     public boolean altSyntax() {
-        return ContextUtil.isUseAltSyntax(stack.getContext());
+        return altSyntax(stack);
     }
 
+    /**
+     * Adds the sorrounding %{ } to the expression for proper processing.
+     * @param expr the expression.
+     * @return the modified expression if altSyntax is enabled, or the parameter 
+     * expression otherwise.
+     */
+	protected String completeExpressionIfAltSyntax(String expr) {
+		if (altSyntax()) {
+			return "%{" + expr + "}";
+		}
+		return expr;
+	}
+
+    /**
+     * This check is needed for backwards compatibility with 2.1.x
+     * @param expr the expression.
+     * @return the found string if altSyntax is enabled. The parameter
+     * expression otherwise.
+     */
+	protected String findStringIfAltSyntax(String expr) {
+		if (altSyntax()) {
+		    return findString(expr);
+		}
+		return expr;
+	}
+
     /**
      * Evaluates the OGNL stack to find an Object value.
      * <p/>
@@ -308,14 +368,9 @@ public class Component {
      */
     protected Object findValue(String expr, Class toType) {
         if (altSyntax() && toType == String.class) {
-            return TextParseUtil.translateVariables('%', expr, stack);
+        	return TextParseUtil.translateVariables('%', expr, stack);
         } else {
-            if (altSyntax()) {
-                // does the expression start with %{ and end with }? if so, just cut it off!
-                if (expr.startsWith("%{") && expr.endsWith("}")) {
-                    expr = expr.substring(2, expr.length() - 1);
-                }
-            }
+            expr = stripExpressionIfAltSyntax(expr);
 
             return getStack().findValue(expr, toType);
         }

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import org.apache.struts2.views.annotations.StrutsTagAttribute;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.io.IOException;
@@ -218,7 +219,7 @@ public class Date extends ContextBean {
      */
     public String formatTime(TextProvider tp, java.util.Date date) {
         java.util.Date now = new java.util.Date();
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         List args = new ArrayList();
         long secs = Math.abs((now.getTime() - date.getTime()) / 1000);
         long mins = secs / 60;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import com.opensymphony.xwork2.inject.Inject;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import javax.servlet.http.HttpServletRequest;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.util.Map;
@@ -142,13 +143,7 @@ public abstract class DoubleListUIBean extends ListUIBean {
         }
 
         if (doubleListValue != null) {
-            if (altSyntax()) {
-                // the same logic as with findValue(String)
-                // if value start with %{ and end with }, just cut it off!
-                if (doubleListValue.startsWith("%{") && doubleListValue.endsWith("}")) {
-                    doubleListValue = doubleListValue.substring(2, doubleListValue.length() - 1);
-                }
-            }
+        	doubleListValue = stripExpressionIfAltSyntax(doubleListValue);
 
             addParameter("doubleListValue", doubleListValue);
         }else if (tmpDoubleList instanceof Map) {
@@ -185,11 +180,7 @@ public abstract class DoubleListUIBean extends ListUIBean {
         Form form = (Form) findAncestor(Form.class);
         if (doubleId != null) {
             // this check is needed for backwards compatibility with 2.1.x
-            if (altSyntax()) {
-                addParameter("doubleId", findString(doubleId));
-            } else {
-                addParameter("doubleId", doubleId);
-            }
+        	addParameter("doubleId", findStringIfAltSyntax(doubleId));
         } else if (form != null) {
             addParameter("doubleId", form.getParameters().get("id") + "_" +escape(this.doubleName));
         } else {

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import javax.servlet.http.HttpServletRequest;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.io.Writer;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.io.Writer;

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

@@ -18,18 +18,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.components.Param.UnnamedParametric;
+import org.apache.struts2.views.annotations.StrutsTag;
+import org.apache.struts2.views.annotations.StrutsTagAttribute;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts2.views.annotations.StrutsTag;
-import org.apache.struts2.components.Param.UnnamedParametric;
-
-import com.opensymphony.xwork2.util.ValueStack;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <!-- START SNIPPET: javadoc -->
@@ -65,6 +65,10 @@ import com.opensymphony.xwork2.util.ValueStack;
  *       ....
  *    &lt;/s:form&gt;
  *
+ *    OR
+ *
+ *    &lt;s:fielderror fieldName="field1" /&gt;
+ *
  * <!-- END SNIPPET: example -->
  * </pre>
  *
@@ -86,7 +90,7 @@ import com.opensymphony.xwork2.util.ValueStack;
                 "or partial depending on param tag nested)if they exists")
 public class FieldError extends UIBean implements UnnamedParametric {
 
-    private List errorFieldNames = new ArrayList();
+    private List<String> errorFieldNames = new ArrayList<String>();
 
     public FieldError(ValueStack stack, HttpServletRequest request, HttpServletResponse response) {
         super(stack, request, response);
@@ -98,14 +102,27 @@ public class FieldError extends UIBean implements UnnamedParametric {
         return TEMPLATE;
     }
 
+    @Override
+    protected void evaluateExtraParams() {
+        super.evaluateExtraParams();
+
+        if (errorFieldNames != null)
+            addParameter("errorFieldNames", errorFieldNames);               
+    }
+
     public void addParameter(Object value) {
         if (value != null) {
             errorFieldNames.add(value.toString());
         }
     }
 
-    public List getFieldErrorFieldNames() {
+    public List<String> getFieldErrorFieldNames() {
         return errorFieldNames;
     }
+
+    @StrutsTagAttribute(description="Field name for single field attribute usage", type="String")
+    public void setFieldName(String fieldName) {
+        addParameter(fieldName);
+    }
 }
 

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import javax.servlet.http.HttpServletRequest;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import com.opensymphony.xwork2.ObjectFactory;
@@ -92,6 +93,7 @@ public class Form extends ClosingUIBean {
     private int sequence = 0;
 
     protected String onsubmit;
+    protected String onreset;
     protected String action;
     protected String target;
     protected String enctype;
@@ -102,7 +104,7 @@ public class Form extends ClosingUIBean {
     protected String windowState;
     protected String acceptcharset;
     protected String focusElement;
-    
+
     protected Configuration configuration;
     protected ObjectFactory objectFactory;
     protected UrlRenderer urlRenderer;
@@ -133,12 +135,12 @@ public class Form extends ClosingUIBean {
     public void setObjectFactory(ObjectFactory objectFactory) {
         this.objectFactory = objectFactory;
     }
-    
+
     @Inject
     public void setUrlRenderer(UrlRenderer urlRenderer) {
     	this.urlRenderer = urlRenderer;
     }
-    
+
     @Inject
     public void setActionValidatorManager(ActionValidatorManager mgr) {
         this.actionValidatorManager = mgr;
@@ -177,6 +179,10 @@ public class Form extends ClosingUIBean {
             addParameter("onsubmit", findString(onsubmit));
         }
 
+        if (onreset != null) {
+            addParameter("onreset", findString(onreset));
+        }
+
         if (target != null) {
             addParameter("target", findString(target));
         }
@@ -199,7 +205,7 @@ public class Form extends ClosingUIBean {
             // we have this if check so we don't do this twice (on open and close of the template)
             addParameter("tagNames", new ArrayList());
         }
-        
+
         if (focusElement != null) {
             addParameter("focusElement", findString(focusElement));
         }
@@ -294,6 +300,11 @@ public class Form extends ClosingUIBean {
         this.onsubmit = onsubmit;
     }
 
+    @StrutsTagAttribute(description="HTML onreset attribute")
+    public void setOnreset(String onreset) {
+        this.onreset = onreset;
+    }
+
     @StrutsTagAttribute(description="Set action name to submit to, without .action suffix", defaultValue="current action")
     public void setAction(String action) {
         this.action = action;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import javax.servlet.http.HttpServletRequest;
@@ -33,7 +34,7 @@ import com.opensymphony.xwork2.inject.Inject;
 /**
  * FormButton.
  */
-public abstract class FormButton extends UIBean {
+public abstract class FormButton extends ClosingUIBean {
 
     static final String BUTTONTYPE_INPUT = "input";
     static final String BUTTONTYPE_BUTTON = "button";
@@ -110,11 +111,7 @@ public abstract class FormButton extends UIBean {
         String _tmp_id = "";
         if (id != null) {
             // this check is needed for backwards compatibility with 2.1.x
-            if (altSyntax()) {
-                _tmp_id = findString(id);
-            } else {
-                _tmp_id = id;
-            }
+        	_tmp_id = findStringIfAltSyntax(id);
         }
         else {
             if (form != null && form.getParameters().get("id") != null) {

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import javax.servlet.http.HttpServletRequest;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import javax.servlet.http.HttpServletRequest;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import javax.servlet.http.HttpServletRequest;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.io.Writer;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.io.Writer;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.io.IOException;
@@ -123,7 +124,7 @@ public class Include extends Component {
 
     public boolean end(Writer writer, String body) {
         String page = findString(value, "value", "You must specify the URL to include. Example: /foo.jsp");
-        StringBuffer urlBuf = new StringBuffer();
+        StringBuilder urlBuf = new StringBuilder();
 
         // Add URL
         urlBuf.append(page);
@@ -211,7 +212,7 @@ public class Include extends Component {
                 }
             }
 
-            StringBuffer flatPathBuffer = new StringBuffer();
+            StringBuilder flatPathBuffer = new StringBuilder();
 
             for (int i = 0; i < stack.size(); i++) {
                 flatPathBuffer.append("/").append(stack.elementAt(i));

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.util.LinkedHashMap;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.io.Writer;
@@ -33,16 +34,16 @@ import com.opensymphony.xwork2.util.ValueStack;
 /**
  * <!-- START SNIPPET: javadoc -->
  *
- * <p>Iterator will iterate over a value. An iterable value can be either of: java.util.Collection, java.util.Iterator,
- * java.util.Enumeration, java.util.Map, array.</p> <p/> <!-- END SNIPPET: javadoc -->
+ * <p>Iterator will iterate over a value. An iterable value can be any of: java.util.Collection, java.util.Iterator,
+ * java.util.Enumeration, java.util.Map, or an array.</p> <p/> <!-- END SNIPPET: javadoc -->
  *
  * <!-- START SNIPPET: params -->
  *
  * <ul>
  *
- * <li>status (String) - if specified, an instanceof IteratorStatus will be pushed into stack upon each iteration</li>
+ * <li>status (String) - if specified, an instance of IteratorStatus will be pushed into stack upon each iteration</li>
  *
- * <li>value (Object) - the source to iterate over, must be iteratable, else an the object itself will be put into a
+ * <li>value (Object) - the source to iterate over, must be iteratable, else the object itself will be put into a
  * newly created List (see MakeIterator#convert(Object)</li>
  *
  * <li>id (String) - if specified the current iteration object will be place with this id in Struts stack's context
@@ -72,7 +73,7 @@ import com.opensymphony.xwork2.util.ValueStack;
  *
  * <p>The following example uses a {@link Bean} tag and places it into the ActionContext. The iterator tag will retrieve
  * that object from the ActionContext and then calls its getDays() method as above. The status attribute is also used to
- * create a {@link IteratorStatus} object, which in this example, its odd() method is used to alternate row
+ * create an {@link IteratorStatus} object, which in this example, its odd() method is used to alternate row
  * colours:</p>
  *
  * <!-- END SNIPPET: example2description -->
@@ -110,7 +111,7 @@ import com.opensymphony.xwork2.util.ValueStack;
  *
  * <p> The next example will further demonstrate the use of the status attribute, using a DAO obtained from the action
  * class through OGNL, iterating over groups and their users (in a security context). The last() method indicates if the
- * current object is the last available in the iteration, and if not, we need to seperate the users using a comma: </p>
+ * current object is the last available in the iteration, and if not, we need to separate the users using a comma: </p>
  *
  * <!-- END SNIPPET: example3description -->
  *
@@ -174,13 +175,32 @@ import com.opensymphony.xwork2.util.ValueStack;
  *    &lt;s:property value="#stat.index" /&gt;
  *
  *    &lt;!-- grab the top of the stack which should be the --&gt;
- *    &lt;!-- current iteration value (0, 1, ... 5) --&gt;
+ *    &lt;!-- current iteration value (1, ... 5) --&gt;
  *    &lt;s:property value="top" /&gt;
  * &lt;/s:iterator&gt;
  *
  * <!-- END SNIPPET: example5code -->
  * </pre>
  *
+ * <!-- START SNIPPET: example6description -->
+ *
+ * </p>Another way to create a simple loop, similar to JSTL's 
+ * &lt;c:forEach begin="..." end="..." ...&gt; is to use some 
+ * OGNL magic, which provides some under-the-covers magic to 
+ * make 0-n loops trivial. This example also loops five times.
+ *
+ * <!-- END SNIPPET: example6description -->
+ *
+ * <pre>
+ * <!-- START SNIPPET: example6code -->
+ *
+ * &lt;s:iterator status="stat" value="(5).{ #this }" &gt;
+ *    &lt;s:property value="#stat.count" /&gt; &lt;!-- Note that "count" is 1-based, "index" is 0-based. --&gt;
+ * &lt;/s:iterator&gt;
+ *
+ * <!-- END SNIPPET: example6code -->
+ * </pre>
+ *
  */
 @StrutsTag(name="iterator", tldTagClass="org.apache.struts2.views.jsp.IteratorTag", description="Iterate over a iterable value")
 public class IteratorComponent extends ContextBean {

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import javax.servlet.http.HttpServletRequest;
@@ -87,10 +88,7 @@ public class Label extends UIBean {
             String providedLabel = TextProviderHelper.getText(key, key, stack);
             addParameter("nameValue", providedLabel);
         } else if (name != null) {
-            String expr = name;
-            if (altSyntax()) {
-                expr = "%{" + expr + "}";
-            }
+            String expr = completeExpressionIfAltSyntax(name);
             addParameter("nameValue", findString(expr));
         }
     }

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.lang.reflect.Array;
@@ -42,7 +43,7 @@ import com.opensymphony.xwork2.util.ValueStack;
  *
  * Note that the listkey and listvalue attribute will default to "key" and "value"
  * respectively only when the list attribute is evaluated to a Map or its decendant.
- * Other thing else, will result in listkey and listvalue to be null and not used.
+ * Everything else will result in listkey and listvalue to be null and not used.
  *
  * <!-- END SNIPPET: javadoc -->
  *
@@ -102,19 +103,14 @@ public abstract class ListUIBean extends UIBean {
         }
 
         if (listKey != null) {
+        	listKey = stripExpressionIfAltSyntax(listKey);
             addParameter("listKey", listKey);
         } else if (value instanceof Map) {
             addParameter("listKey", "key");
         }
 
         if (listValue != null) {
-            if (altSyntax()) {
-                // the same logic as with findValue(String)
-                // if value start with %{ and end with }, just cut it off!
-                if (listValue.startsWith("%{") && listValue.endsWith("}")) {
-                    listValue = listValue.substring(2, listValue.length() - 1);
-                }
-            }
+        	listValue = stripExpressionIfAltSyntax(listValue);
             addParameter("listValue", listValue);
         } else if (value instanceof Map) {
             addParameter("listValue", "value");

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.io.Writer;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.io.Writer;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.util.LinkedHashMap;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.io.Writer;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import javax.servlet.http.HttpServletRequest;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.io.IOException;
@@ -98,6 +99,7 @@ public class Property extends Component {
     private String defaultValue;
     private String value;
     private boolean escape = true;
+    private boolean escapeJavaScript = false;
 
     @StrutsTagAttribute(description="The default value to be used if <u>value</u> attribute is null")
     public void setDefault(String defaultValue) {
@@ -109,6 +111,11 @@ public class Property extends Component {
         this.escape = escape;
     }
 
+    @StrutsTagAttribute(description="Whether to escape Javascript", type="Boolean", defaultValue="false")
+    public void setEscapeJavaScript(boolean escapeJavaScript) {
+        this.escapeJavaScript = escapeJavaScript;
+    }
+
     @StrutsTagAttribute(description="Value to be displayed", type="Object", defaultValue="&lt;top of stack&gt;")
     public void setValue(String value) {
         this.value = value;
@@ -122,12 +129,8 @@ public class Property extends Component {
         if (value == null) {
             value = "top";
         }
-        else if (altSyntax()) {
-            // the same logic as with findValue(String)
-            // if value start with %{ and end with }, just cut it off!
-            if (value.startsWith("%{") && value.endsWith("}")) {
-                value = value.substring(2, value.length() - 1);
-            }
+        else {
+        	value = stripExpressionIfAltSyntax(value);
         }
 
         // exception: don't call findString(), since we don't want the
@@ -149,10 +152,13 @@ public class Property extends Component {
     }
 
     private String prepare(String value) {
+    	String result = value;
         if (escape) {
-            return TextUtils.htmlEncode(value);
-        } else {
-            return value;
+        	result = TextUtils.htmlEncode(result);
         }
+        if (escapeJavaScript) {
+        	result = TextUtils.escapeJavaScript(result);
+        }
+        return result;
     }
 }

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.io.Writer;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import javax.servlet.http.HttpServletRequest;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import javax.servlet.http.HttpServletRequest;
@@ -73,6 +74,9 @@ public class Reset extends FormButton {
         super(stack, request, response);
     }
 
+    public String getDefaultOpenTemplate() {
+        return "empty";
+    }
     protected String getDefaultTemplate() {
         return Reset.TEMPLATE;
     }

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import javax.servlet.http.HttpServletRequest;

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

@@ -18,10 +18,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.io.IOException;
 import java.io.Writer;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 import org.apache.struts2.StrutsException;
 import org.apache.struts2.dispatcher.mapper.ActionMapping;
@@ -77,7 +82,7 @@ public class ServletUrlRenderer implements UrlRenderer {
 	                result = UrlHelper.buildUrl(_value, urlComponent.req, urlComponent.res, urlComponent.parameters, scheme, urlComponent.includeContext, urlComponent.encode, urlComponent.forceAddSchemeHostAndPort, urlComponent.escapeAmp);
 	        }
 	        if ( urlComponent.anchor != null && urlComponent.anchor.length() > 0 ) {
-	            result += '#' + urlComponent.anchor;
+	        	result += '#' + urlComponent.findString(urlComponent.anchor);
 	        }
 
 	        String var = urlComponent.getVar();
@@ -126,10 +131,10 @@ public class ServletUrlRenderer implements UrlRenderer {
         String actionMethod = nameMapping.getMethod();
 
 		final ActionConfig actionConfig = formComponent.configuration.getRuntimeConfiguration().getActionConfig(
-				namespace, action);
+				namespace, actionName);
 		if (actionConfig != null) {
 
-			ActionMapping mapping = new ActionMapping(action, namespace, actionMethod, formComponent.parameters);
+			ActionMapping mapping = new ActionMapping(actionName, namespace, actionMethod, formComponent.parameters);
 			String result = UrlHelper.buildUrl(formComponent.actionMapper.getUriFromActionMapping(mapping),
 					formComponent.request, formComponent.response, null);
 			formComponent.addParameter("action", result);
@@ -148,14 +153,14 @@ public class ServletUrlRenderer implements UrlRenderer {
 
 			// if the name isn't specified, use the action name
 			if (formComponent.name == null) {
-				formComponent.addParameter("name", action);
+				formComponent.addParameter("name", actionName);
 			}
 
 			// if the id isn't specified, use the action name
-			if (formComponent.getId() == null  && action!=null ) {
-				formComponent.addParameter("id", formComponent.escape(action));
+			if (formComponent.getId() == null  && actionName!=null ) {
+				formComponent.addParameter("id", formComponent.escape(actionName));
 			}
-		} else if (action != null) {
+		} else if (actionName != null) {
 			// Since we can't find an action alias in the configuration, we just
 			// assume the action attribute supplied is the path to be used as
 			// the URI this form is submitting to.
@@ -163,10 +168,10 @@ public class ServletUrlRenderer implements UrlRenderer {
             // Warn user that the specified namespace/action combo
             // was not found in the configuration.
             if (namespace != null) {
-              LOG.warn("No configuration found for the specified action: '" + action + "' in namespace: '" + namespace + "'. Form action defaulting to 'action' attribute's literal value.");
+              LOG.warn("No configuration found for the specified action: '" + actionName + "' in namespace: '" + namespace + "'. Form action defaulting to 'action' attribute's literal value.");
             }
 
-			String result = UrlHelper.buildUrl(action, formComponent.request, formComponent.response, null);
+			String result = UrlHelper.buildUrl(actionName, formComponent.request, formComponent.response, null);
 			formComponent.addParameter("action", result);
 
 			// namespace: cut out anything between the start and the last /
@@ -197,4 +202,126 @@ public class ServletUrlRenderer implements UrlRenderer {
 		// interceptor does allow validation eg. method is not filtered out)
 		formComponent.evaluateClientSideJsEnablement(actionName, namespace, actionMethod);
 	}
+
+
+	public void beforeRenderUrl(URL urlComponent) {
+		if (urlComponent.value != null) {
+            urlComponent.value = urlComponent.findString(urlComponent.value);
+        }
+
+        // no explicit url set so attach params from current url, do
+        // this at start so body params can override any of these they wish.
+        try {
+            // ww-1266
+            String includeParams = (urlComponent.urlIncludeParams != null ? urlComponent.urlIncludeParams.toLowerCase() : URL.GET);
+
+            if (urlComponent.includeParams != null) {
+                includeParams = urlComponent.findString(urlComponent.includeParams);
+            }
+
+            if (URL.NONE.equalsIgnoreCase(includeParams)) {
+                mergeRequestParameters(urlComponent.value, urlComponent.parameters, Collections.EMPTY_MAP);
+            } else if (URL.ALL.equalsIgnoreCase(includeParams)) {
+                mergeRequestParameters(urlComponent.value, urlComponent.parameters, urlComponent.req.getParameterMap());
+
+                // for ALL also include GET parameters
+                includeGetParameters(urlComponent);
+                includeExtraParameters(urlComponent);
+            } else if (URL.GET.equalsIgnoreCase(includeParams) || (includeParams == null && urlComponent.value == null && urlComponent.action == null)) {
+                includeGetParameters(urlComponent);
+                includeExtraParameters(urlComponent);
+            } else if (includeParams != null) {
+                LOG.warn("Unknown value for includeParams parameter to URL tag: " + includeParams);
+            }
+        } catch (Exception e) {
+            LOG.warn("Unable to put request parameters (" + urlComponent.req.getQueryString() + ") into parameter map.", e);
+        }
+
+		
+	}
+	
+    private void includeExtraParameters(URL urlComponent) {
+        if (urlComponent.extraParameterProvider != null) {
+            mergeRequestParameters(urlComponent.value, urlComponent.parameters, urlComponent.extraParameterProvider.getExtraParameters());
+        }
+    }
+    private void includeGetParameters(URL urlComponent) {
+    	String query = extractQueryString(urlComponent);
+    	mergeRequestParameters(urlComponent.value, urlComponent.parameters, UrlHelper.parseQueryString(query));
+    }
+
+    private String extractQueryString(URL urlComponent) {
+        // Parse the query string to make sure that the parameters come from the query, and not some posted data
+        String query = urlComponent.req.getQueryString();
+        if (query == null) {
+            query = (String) urlComponent.req.getAttribute("javax.servlet.forward.query_string");
+        }
+
+        if (query != null) {
+            // Remove possible #foobar suffix
+            int idx = query.lastIndexOf('#');
+
+            if (idx != -1) {
+                query = query.substring(0, idx);
+            }
+        }
+        return query;
+    }
+    
+    /**
+     * Merge request parameters into current parameters. If a parameter is
+     * already present, than the request parameter in the current request and value atrribute
+     * will not override its value.
+     *
+     * The priority is as follows:-
+     * <ul>
+     *  <li>parameter from the current request (least priority)</li>
+     *  <li>parameter form the value attribute (more priority)</li>
+     *  <li>parameter from the param tag (most priority)</li>
+     * </ul>
+     *
+     * @param value the value attribute (url to be generated by this component)
+     * @param parameters component parameters
+     * @param contextParameters request parameters
+     */
+    protected void mergeRequestParameters(String value, Map parameters, Map contextParameters){
+
+        Map mergedParams = new LinkedHashMap(contextParameters);
+
+        // Merge contextParameters (from current request) with parameters specified in value attribute
+        // eg. value="someAction.action?id=someId&venue=someVenue"
+        // where the parameters specified in value attribute takes priority.
+
+        if (value != null && value.trim().length() > 0 && value.indexOf("?") > 0) {
+            mergedParams = new LinkedHashMap();
+
+            String queryString = value.substring(value.indexOf("?")+1);
+
+            mergedParams = UrlHelper.parseQueryString(queryString);
+            for (Iterator iterator = contextParameters.entrySet().iterator(); iterator.hasNext();) {
+                Map.Entry entry = (Map.Entry) iterator.next();
+                Object key = entry.getKey();
+
+                if (!mergedParams.containsKey(key)) {
+                    mergedParams.put(key, entry.getValue());
+                }
+            }
+        }
+
+
+        // Merge parameters specified in value attribute
+        // eg. value="someAction.action?id=someId&venue=someVenue"
+        // with parameters specified though param tag
+        // eg. <param name="id" value="%{'someId'}" />
+        // where parameters specified through param tag takes priority.
+
+        for (Iterator iterator = mergedParams.entrySet().iterator(); iterator.hasNext();) {
+            Map.Entry entry = (Map.Entry) iterator.next();
+            Object key = entry.getKey();
+
+            if (!parameters.containsKey(key)) {
+                parameters.put(key, entry.getValue());
+            }
+        }
+    }
 }

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.io.Writer;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.io.Writer;
@@ -51,15 +52,20 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
     description="Render a submit button",
     allowDynamicAttributes=true)
 public class Submit extends FormButton {
-    
+
     private static final Logger LOG = LoggerFactory.getLogger(Submit.class);
-    final public static String TEMPLATE = "submit";
+    final public static String OPEN_TEMPLATE = "submit";
+    final public static String TEMPLATE = "submit-close";
     protected String src;
 
     public Submit(ValueStack stack, HttpServletRequest request, HttpServletResponse response) {
         super(stack, request, response);
     }
 
+    public String getDefaultOpenTemplate() {
+        return OPEN_TEMPLATE;
+    }
+
     protected String getDefaultTemplate() {
         return TEMPLATE;
     }
@@ -75,10 +81,10 @@ public class Submit extends FormButton {
 
         super.evaluateParams();
     }
-    
+
     public void evaluateExtraParams() {
         super.evaluateExtraParams();
-        
+
         if (src != null)
             addParameter("src", findString(src));
     }
@@ -91,12 +97,18 @@ public class Submit extends FormButton {
     protected boolean supportsImageType() {
         return true;
     }
-    
+
     @StrutsTagAttribute(description="Supply an image src for <i>image</i> type submit button. Will have no effect for types <i>input</i> and <i>button</i>.")
     public void setSrc(String src) {
         this.src = src;
     }
-    
+
+
+    @Override
+    public boolean usesBody() {
+        return true;
+    }
+
     /**
      * Overrides to be able to render body in a template rather than always before the template
      */
@@ -104,7 +116,7 @@ public class Submit extends FormButton {
         evaluateParams();
         try {
             addParameter("body", body);
-            
+
             mergeTemplate(writer, buildTemplateName(template, getDefaultTemplate()));
         } catch (Exception e) {
             LOG.error("error when rendering", e);

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.io.IOException;
@@ -49,8 +50,10 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
  *
  * <p/>
  *
- * If the named message is not found, then the body of the tag will be used as default message.
- * If no body is used, then the name of the message will be used.
+ * If the named message is not found in a property file, then the body of the
+ * tag will be used as default message. If no body is used, then the stack will
+ * be searched, and if a value is returned, it will written to the output.
+ * If no value is found on the stack, the key of the message will be written out.
  *
  * <!-- END SNIPPET: javadoc -->
  *
@@ -122,6 +125,7 @@ public class Text extends ContextBean implements Param.UnnamedParametric {
     protected List values = Collections.EMPTY_LIST;
     protected String actualName;
     protected String name;
+    protected String searchStack;
 
     public Text(ValueStack stack) {
         super(stack);
@@ -132,6 +136,10 @@ public class Text extends ContextBean implements Param.UnnamedParametric {
         this.name = name;
     }
 
+    @StrutsTagAttribute(description="Search the stack if property is not found on resources", type = "Boolean", defaultValue = "true")
+    public void setSearchValueStack(String searchStack) {
+        this.searchStack = searchStack;
+    }
 
     public boolean usesBody() {
         // overriding this to true such that EVAL_BODY_BUFFERED is return and
@@ -149,7 +157,8 @@ public class Text extends ContextBean implements Param.UnnamedParametric {
             defaultMessage = actualName;
         }
 
-        String msg = TextProviderHelper.getText(actualName, defaultMessage, values, getStack());
+        Boolean doSearchStack = searchStack != null ? (Boolean) findValue(searchStack, Boolean.class) : true;
+        String msg = TextProviderHelper.getText(actualName, defaultMessage, values, getStack(), doSearchStack == null || doSearchStack);
 
         if (msg != null) {
             try {

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import javax.servlet.http.HttpServletRequest;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import javax.servlet.http.HttpServletRequest;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.util.Map;

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

@@ -18,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.struts2.components;
 
 import java.io.Writer;
@@ -31,6 +32,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.StrutsException;
 import org.apache.struts2.util.TextProviderHelper;
 import org.apache.struts2.components.template.Template;
 import org.apache.struts2.components.template.TemplateEngine;
@@ -510,7 +512,7 @@ public abstract class UIBean extends Component {
             super.end(writer, body, false);
             mergeTemplate(writer, buildTemplateName(template, getDefaultTemplate()));
         } catch (Exception e) {
-            LOG.error("error when rendering", e);
+            throw new StrutsException(e);
         }
         finally {
             popComponentStack();
@@ -762,10 +764,7 @@ public abstract class UIBean extends Component {
                     if (value != null) {
                         addParameter("nameValue", findValue(value, valueClazz));
                     } else if (name != null) {
-                        String expr = name;
-                        if (altSyntax()) {
-                            expr = "%{" + expr + "}";
-                        }
+                        String expr = completeExpressionIfAltSyntax(name);
 
                         addParameter("nameValue", findValue(expr, valueClazz));
                     }
@@ -857,7 +856,7 @@ public abstract class UIBean extends Component {
         evaluateExtraParams();
     }
 
-    protected String escape(String name) {
+	protected String escape(String name) {
         // escape any possible values that can make the ID painful to work with in JavaScript
         if (name != null) {
             return name.replaceAll("[^a-zA-Z0-9_]", "_");
@@ -964,11 +963,7 @@ public abstract class UIBean extends Component {
         String tryId;
         if (id != null) {
             // this check is needed for backwards compatibility with 2.1.x
-            if (altSyntax()) {
-                tryId = findString(id);
-            } else {
-                tryId = id;
-            }
+            tryId = findStringIfAltSyntax(id);
         } else if (form != null) {
             tryId = form.getParameters().get("id") + "_"
                     + escape(name != null ? findString(name) : null);
@@ -1043,12 +1038,12 @@ public abstract class UIBean extends Component {
         this.disabled = disabled;
     }
 
-    @StrutsTagAttribute(description="Label expression used for rendering a element specific label")
+    @StrutsTagAttribute(description="Label expression used for rendering an element specific label")
     public void setLabel(String label) {
         this.label = label;
     }
 
-    @StrutsTagAttribute(description="String that will be appended to the labe", defaultValue=":")
+    @StrutsTagAttribute(description="String that will be appended to the label", defaultValue=":")
     public void setLabelSeparator(String labelseparator) {
         this.labelSeparator = labelseparator;
     }