[maven-release-plugin] copy for tag STRUTS_2_3_1_1

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

apps/blank/pom.xml

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

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

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

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

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

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

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

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

@@ -8,12 +8,18 @@
     <constant name="struts.enable.DynamicMethodInvocation" value="false" />
     <constant name="struts.devMode" value="false" />
 
-    <include file="example.xml"/>
-
-
-
     <package name="default" namespace="/" extends="struts-default">
+
         <default-action-ref name="index" />
+
+        <global-results>
+            <result name="error">/error.jsp</result>
+        </global-results>
+
+        <global-exception-mappings>
+            <exception-mapping exception="java.lang.Exception" result="error"/>
+        </global-exception-mappings>
+
         <action name="index">
             <result type="redirectAction">
                 <param name="actionName">HelloWorld</param>
@@ -22,6 +28,8 @@
         </action>
     </package>
 
+    <include file="example.xml"/>
+
     <!-- Add packages here -->
 
 </struts>

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

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

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

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

apps/jboss-blank/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.2.1.1</version>
+        <version>2.3.1.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-jboss-blank</artifactId>
@@ -34,9 +34,9 @@
     <name>JBoss Blank Webapp</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/apps/jboss-blank</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/apps/jboss-blank</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1_1/apps/jboss-blank</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/apps/jboss-blank</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/apps/jboss-blank</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1_1/apps/jboss-blank</url>
     </scm>
 
     <dependencies>
@@ -55,9 +55,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

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

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

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

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

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

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

apps/mailreader/pom.xml

@@ -26,17 +26,17 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.2.1.1</version>
+      <version>2.3.1.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-mailreader</artifactId>
     <packaging>war</packaging>
-    <name>Starter Webapp</name>
+    <name>Mail Reader Webapp</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/apps/mailreader</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/apps/mailreader</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1_1/apps/mailreader</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/apps/mailreader</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/apps/mailreader</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1_1/apps/mailreader</url>
     </scm>
 
     <dependencies>
@@ -48,17 +48,11 @@
         </dependency>
 
         <dependency>
-           <groupId>${pom.groupId}</groupId>
+           <groupId>${project.groupId}</groupId>
            <artifactId>struts-mailreader-dao</artifactId>
            <version>1.3.5</version>
         </dependency>
 
-        <dependency>
-            <groupId>jboss</groupId>
-            <artifactId>javassist</artifactId>
-            <version>3.7.ga</version>
-        </dependency>
-
     </dependencies>
 
     <build>

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

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

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

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

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

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

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

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

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

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

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

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

apps/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.2.1.1</version>
+        <version>2.3.1.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-apps</artifactId>
@@ -42,18 +42,11 @@
     </modules>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/apps</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/apps</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1_1/apps</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/apps</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/apps</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1_1/apps</url>
     </scm>
 
-     <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/struts2/apps</url>
-        </site>
-    </distributionManagement>
-
     <profiles>
         <profile>
             <id>hostedqa</id>
@@ -179,10 +172,10 @@
                         <phase>process-sources</phase>
                         <configuration>
                             <tasks>
-                                <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java" failonerror="false">
+                                <copy todir="${project.build.directory}/${project.artifactId}/WEB-INF/src/java" failonerror="false">
                                     <fileset dir="${basedir}/src/main/java" />
                                 </copy>
-                                <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java" failonerror="false">
+                                <copy todir="${project.build.directory}/${project.artifactId}/WEB-INF/src/java" failonerror="false">
                                     <fileset dir="${basedir}/src/main/resources" />
                                 </copy>
                             </tasks>
@@ -212,7 +205,7 @@
             </plugin>
         </plugins>
 
-        <finalName>${pom.artifactId}</finalName>
+        <finalName>${project.artifactId}</finalName>
 
     </build>
 
@@ -221,7 +214,7 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

apps/portlet/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.2.1.1</version>
+        <version>2.3.1.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-portlet</artifactId>
@@ -34,9 +34,9 @@
     <name>Portlet Webapp</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/apps/portlet</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/apps/portlet</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1_1/apps/portlet</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/apps/portlet</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/apps/portlet</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1_1/apps/portlet</url>
     </scm>
 
     <profiles>
@@ -93,36 +93,26 @@
 
     <dependencies>
         <dependency>
-            <groupId>portlet-api</groupId>
-            <artifactId>portlet-api</artifactId>
-            <version>1.0</version>
+            <groupId>javax.portlet</groupId>
+             <artifactId>portlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-spring-plugin</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-core</artifactId>
-            <version>${pom.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-portlet-plugin</artifactId>
-            <version>${pom.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-dwr-plugin</artifactId>
-            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.6.3</version>
         </dependency>
 
         <dependency>
@@ -147,7 +137,6 @@
         <dependency>
             <groupId>commons-digester</groupId>
             <artifactId>commons-digester</artifactId>
-            <version>1.8</version>
             <exclusions>
                 <exclusion>
                     <groupId>javax.servlet</groupId>
@@ -158,23 +147,19 @@
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
-            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
-            <version>3.1</version>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.9</version>
         </dependency>
 
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
-            <version>6.1.4rc0</version>
             <scope>test</scope>
         </dependency>
 
@@ -201,22 +186,14 @@
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jsp-2.1</artifactId>
-            <version>6.1.4rc0</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-            <version>2.1</version>
         </dependency>
 
-        <dependency>
-            <groupId>jboss</groupId>
-            <artifactId>javassist</artifactId>
-            <version>3.7.ga</version>
-        </dependency>
-        
     </dependencies>
 
     <reporting>

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

@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.struts2.portlet.example.eventing;
+
+import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.portlet.interceptor.PortletRequestAware;
+import org.apache.struts2.portlet.interceptor.PortletResponseAware;
+
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+
+public class ProcessAction extends ActionSupport implements PortletRequestAware, PortletResponseAware {
+
+    private PortletRequest request;
+    private PortletResponse response;
+    private String name;
+
+    public String execute() throws Exception {
+
+        if (request instanceof EventRequest) {
+            EventRequest req = (EventRequest) request;
+            EventResponse res = (EventResponse) response;
+            res.setRenderParameter("eventName", (String) req.getEvent().getValue());
+            return "forward";
+        } else {
+            name = request.getParameter("eventName");
+        }
+
+        return SUCCESS;
+    }
+
+    public void setPortletRequest(PortletRequest request) {
+        this.request = request;
+    }
+
+    public void setPortletResponse(PortletResponse response) {
+        this.response = response;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+}

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

@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.struts2.portlet.example.eventing;
+
+import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.portlet.interceptor.PortletResponseAware;
+
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletResponse;
+import javax.xml.namespace.QName;
+
+public class PublishAction extends ActionSupport implements PortletResponseAware {
+
+    private PortletResponse response;
+    private String name;
+
+    public String execute() throws Exception {
+
+        if (name != null) {
+            ((ActionResponse) response).setEvent(new QName("http://org.apache.struts2.portlets/events", "name"), name);
+
+            addActionMessage("Publishing Event with Parameter name : " + name);
+        }
+
+        return SUCCESS;
+    }
+
+    public void setPortletResponse(PortletResponse response) {
+        this.response = response;
+
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE validators PUBLIC
-        "-//OpenSymphony Group//XWork Validator Config 1.0//EN"
-        "http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd">
+        "-//Apache Struts//XWork Validator Config 1.0//EN"
+        "http://struts.apache.org/dtds/xwork-validator-config-1.0.dtd">
 <validators>
     <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
     <validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>

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

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

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

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

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

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

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

@@ -8,11 +8,8 @@
 			/WEB-INF/applicationContext*.xml
 		</param-value>
 	</context-param>
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
 
-	<!-- Uncomment to use the dispatcher servlet -->
-	<!--<servlet id="Struts2PortletDispatcherServlet">
-		<servlet-name>Struts2PortletDispatcherServlet</servlet-name>
-		<servlet-class>org.apache.struts2.portlet.dispatcher.DispatcherServlet</servlet-class>
-	</servlet>-->
-	
 </web-app>

apps/rest-showcase/pom.xml

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

apps/showcase/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.2.1.1</version>
+        <version>2.3.1.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-showcase</artifactId>
@@ -34,9 +34,9 @@
     <name>Showcase Webapp</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/apps/showcase</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/apps/showcase</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1_1/apps/showcase</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/apps/showcase</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/apps/showcase</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1_1/apps/showcase</url>
     </scm>
 
 
@@ -56,68 +56,72 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-struts1-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-dojo-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-jsf-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-config-browser-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-sitemesh-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-tiles-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-dwr-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-json-plugin</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tiles</groupId>
             <artifactId>tiles-jsp</artifactId>
-            <version>2.0.5</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-codebehind-plugin</artifactId>
-            <version>${pom.version}</version>
+            <artifactId>struts2-convention-plugin</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-spring-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
             <scope>provided</scope>
         </dependency>
 
@@ -125,13 +129,11 @@
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.6.3</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-tools</artifactId>
-            <version>1.3</version>
             <exclusions>
                 <exclusion>
                     <groupId>velocity</groupId>
@@ -162,12 +164,10 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.9</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.0.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
@@ -182,7 +182,6 @@
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
-            <version>1.1.1</version>
         </dependency>
 
         <dependency>
@@ -212,12 +211,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>jboss</groupId>
-            <artifactId>javassist</artifactId>
-            <version>3.7.ga</version>
-        </dependency>
-
     </dependencies>
 
     <build>

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

@@ -20,6 +20,11 @@
  */
 package org.apache.struts2.showcase;
 
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Validateable;
+import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.ServletActionContext;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -28,12 +33,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.struts2.ServletActionContext;
-
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.Validateable;
-import com.opensymphony.xwork2.util.ValueStack;
-
 /**
  */
 public class UITagExample extends ActionSupport implements Validateable {
@@ -47,6 +46,7 @@ public class UITagExample extends ActionSupport implements Validateable {
     String bio;
     String favouriteColor;
     List friends;
+    String bestFriend;
     boolean legalAge;
     String state;
     String region;
@@ -185,6 +185,14 @@ public class UITagExample extends ActionSupport implements Validateable {
         this.friends = friends;
     }
 
+    public String getBestFriend() {
+        return bestFriend;
+    }
+
+    public void setBestFriend(String bestFriend) {
+        this.bestFriend = bestFriend;
+    }
+
     public boolean isLegalAge() {
         return legalAge;
     }

apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java

@@ -24,17 +24,20 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.struts2.config.Result;
-import org.apache.struts2.config.Results;
-import org.apache.struts2.dispatcher.ServletRedirectResult;
+import org.apache.struts2.convention.annotation.ParentPackage;
+import org.apache.struts2.convention.annotation.Result;
 
 import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.convention.annotation.Results;
 
 /**
  * <code>EditPerson</code>
  *
  */
-@Result(name="list", value="listPeople.action", type=ServletRedirectResult.class)
+@Results({
+    @Result(name="list", location="list-people.action", type="redirect"),
+    @Result(name="input", location="new-person.ftl", type="freemarker")
+})
 public class EditPersonAction extends ActionSupport {
 
     private static final long serialVersionUID = 7699491775215130850L;

apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java

@@ -23,11 +23,11 @@ package org.apache.struts2.showcase.person;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.struts2.config.Result;
-import org.apache.struts2.views.freemarker.FreemarkerResult;
-
 import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.convention.annotation.ParentPackage;
+import org.apache.struts2.convention.annotation.Result;
 
+@Result(location="list-people.ftl", type="freemarker")
 public class ListPeopleAction extends ActionSupport {
 
     private static final long serialVersionUID = 3608017189783645371L;

apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java

@@ -20,16 +20,13 @@
  */
 package org.apache.struts2.showcase.person;
 
-import org.apache.struts2.config.ParentPackage;
-import org.apache.struts2.config.Result;
-import org.apache.struts2.config.Results;
+import org.apache.struts2.convention.annotation.ParentPackage;
+import org.apache.struts2.convention.annotation.Result;
 import org.apache.struts2.views.freemarker.FreemarkerResult;
 
 import com.opensymphony.xwork2.ActionSupport;
 
-/**
- */
-@ParentPackage("person")
+@Result(name="input", location="new-person.ftl", type="freemarker")
 public class NewPersonAction extends ActionSupport {
 
     private static final long serialVersionUID = 200410824352645515L;

apps/showcase/src/main/java/org/apache/struts2/showcase/person/package-info.java

@@ -0,0 +1,7 @@
+@ParentPackage("person")
+@Namespace("/person")
+package org.apache.struts2.showcase.person;
+
+import org.apache.struts2.convention.annotation.Namespace;
+import org.apache.struts2.convention.annotation.ParentPackage;
+

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

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

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

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

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <!-- Field-Validator Syntax -->
     <field name="currentEmployee.empId">

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <!-- Field-Validator Syntax -->
     <field name="currentSkill.name">

apps/showcase/src/main/resources/org/apache/struts2/showcase/ajax/Example5Action-validation.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE validators PUBLIC
-  		"-//OpenSymphony Group//XWork Validator 1.0//EN" 
-  		"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+  		"-//Apache Struts//XWork Validator 1.0//EN"
+  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
   		
 <validators>
 	<field name="name">

apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/ChatLoginAction-chatLogin-validation.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE validators PUBLIC 
-  		"-//OpenSymphony Group//XWork Validator 1.0.2//EN" 
-  		"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+  		"-//Apache Struts//XWork Validator 1.0.2//EN"
+  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
   		
 <validators>
 	<field name="name">

apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/CrudRoomAction-createRoom-validation.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE validators PUBLIC 
-  		"-//OpenSymphony Group//XWork Validator 1.0.2//EN" 
-  		"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+  		"-//Apache Struts//XWork Validator 1.0.2//EN"
+  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 
 <validators>
 	<field name="name">

apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/SendMessageToRoomAction-sendMessageToRoom-validation.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE validators PUBLIC 
-  		"-//OpenSymphony Group//XWork Validator 1.0.2//EN" 
-  		"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+  		"-//Apache Struts//XWork Validator 1.0.2//EN"
+  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 
 <validators>
 	<field name="message">

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE validators PUBLIC 
-  		"-//OpenSymphony Group//XWork Validator 1.0.2//EN" 
-  		"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+  		"-//Apache Struts//XWork Validator 1.0.2//EN"
+  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 
 <validators>
 	<field name="upload">

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

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

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

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

apps/showcase/src/main/resources/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE validators PUBLIC 
-	"-//OpenSymphony Group//XWork Validator 1.0.2//EN" 
-	"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+	"-//Apache Struts//XWork Validator 1.0.2//EN"
+	"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 	
 <validators>
 	<field name="value">

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!DOCTYPE validators PUBLIC
-  		"-//OpenSymphony Group//XWork Validator 1.0//EN" 
-  		"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+  		"-//Apache Struts//XWork Validator 1.0//EN"
+  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
   		
 <!-- START SNIPPET: fieldValidatorsExample -->  		
   		

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!DOCTYPE validators PUBLIC 
-  		"-//OpenSymphony Group//XWork Validator 1.0//EN" 
-  		"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+  		"-//Apache Struts//XWork Validator 1.0//EN"
+  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
   		
 <!-- START SNIPPET: fieldValidatorsExample -->  		
   		

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE validators PUBLIC 
-  		"-//OpenSymphony Group//XWork Validator 1.0//EN" 
-  		"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+  		"-//Apache Struts//XWork Validator 1.0//EN"
+  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
   		
   		
 <!-- START SNIPPET: nonFieldValidatorsExample -->  		

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

@@ -1,9 +1,9 @@
-<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 
 <!--  START SNIPPET: quizValidators -->
 <!--
     Add the following DOCTYPE declaration as first line of your XXX-validation.xml file:
-    <!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+    <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 -->
 <validators>
     <field name="name">

apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/SubmitApplication-submitApplication-validation.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE validators PUBLIC
-  		"-//OpenSymphony Group//XWork Validator 1.0//EN" 
-  		"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+  		"-//Apache Struts//XWork Validator 1.0//EN"
+  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 
 <validators>
 	<field name="name">

apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/User-userContext-validation.xml

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

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE validators PUBLIC 
-  		"-//OpenSymphony Group//XWork Validator 1.0//EN" 
-  		"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+  		"-//Apache Struts//XWork Validator 1.0//EN"
+  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
   		
 <!-- START SNIPPET: visitorValidatorsExample -->
 

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

@@ -54,7 +54,7 @@
         </action>
     </package>
 
-    <package name="ajaxNoDecorate" namespace="/nodecorate" extends="struts-default">
+    <package name="ajaxNoDecorate" namespace="/nodecorate" extends="json-default">
     	<!--  example 4 -->
         <action name="panel1" class="org.apache.struts2.showcase.ajax.Example4ShowPanelAction" method="panel1">
     		<result type="freemarker">/ajax/tabbedpanel/nodecorate/panel1.ftl</result>

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

@@ -3,7 +3,7 @@
     "http://struts.apache.org/dtds/struts-2.0.dtd">
 	
 <struts>
-	<package name="validation" extends="struts-default" namespace="/validation">
+	<package name="validation" extends="json-default" namespace="/validation">
 	    <action name="quizBasic" class="org.apache.struts2.showcase.validation.QuizAction">
             <result name="input">quiz-basic.jsp</result>
             <result>quiz-success.jsp</result>

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

@@ -14,13 +14,13 @@
     <constant name="struts.custom.i18n.resources" value="globalMessages" />
     <constant name="struts.action.extension" value="action,," />
 
-    <constant name="struts.codebehind.defaultPackage" value="person" />
+    <constant name="struts.convention.package.locators.basePackage" value="org.apache.struts2.showcase.person" />
+    <constant name="struts.convention.result.path" value="/" />
+
     <constant name="struts.freemarker.manager.classname" value="customFreemarkerManager" />
     <constant name="struts.serve.static" value="true" />
     <constant name="struts.serve.static.browserCache" value="false" />
 
-    <constant name="actionPackages" value="org.apache.struts2.showcase.person"/>
-
     <include file="struts-chat.xml" />
     
     <include file="struts-interactive.xml" />

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

@@ -9,10 +9,6 @@
     <filter>
         <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>

apps/showcase/src/main/webapp/person/edit-person.jsp

@@ -6,7 +6,7 @@
 </head>
 
 <body>
-<s:form action="editPerson" theme="simple" validate="false">
+<s:form action="edit-person" theme="simple" validate="false">
 
     <table>
         <tr>
@@ -33,8 +33,10 @@
 </s:form>
 
 <ul>
-    <li><a href="newPerson!input.action">Create</a> a new person</li>
-    <li><a href="listPeople.action">List</a> all people</li>
+    <s:url id="newpersonurl" action="new-person" method="input" />
+    <li><s:a href="%{newpersonurl}">Create</s:a> a new person</li>
+    <s:url id="listpeopleurl" action="list-people" />
+    <li><s:a href="%{listpeopleurl}">List</s:a> all people</li>
 </ul>
 
 </body>

apps/showcase/src/main/webapp/person/index.jsp

@@ -1,3 +1,5 @@
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
 <html>
 <head>
     <title>Acme Corp</title>
@@ -5,8 +7,10 @@
 
 <body>
 <ul>
-    <li><a href="newPerson!input.action">Create</a> a new person</li>
-    <li><a href="listPeople.action">List</a> all people</li>
+    <s:url id="newpersonurl" action="new-person" method="input" />
+    <li><s:a href="%{newpersonurl}">Create</s:a> a new person</li>
+    <s:url id="listpeopleurl" action="list-people" />
+    <li><s:a href="%{listpeopleurl}">List</s:a> all people</li>
 </ul>
 </body>
 </html>

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

@@ -21,8 +21,10 @@ There are ${peopleCount} people...
 </table>
 
 <ul>
-    <li><a href="editPerson.action">Edit people</a></li>
-    <li><a href="newPerson!input.action">Create</a> a new person</li>
+    <@s.url id="editpersonurl" action="edit-person" />
+    <li><@s.a href="%{editpersonurl}">Edit people</@s.a></li>
+    <@s.url id="newpersonurl" action="new-person" method="input" />
+    <li><@s.a href="%{newpersonurl}">Create</@s.a> a new person</li>
 </ul>
 </body>
 </html>

apps/showcase/src/main/webapp/person/new-person.ftl

@@ -0,0 +1,21 @@
+<html>
+<head>
+    <title>New Person</title>
+</head>
+
+<body>
+<@s.form action="new-person">
+    <@s.textfield label="First Name" name="person.name"/>
+    <@s.textfield label="Last Name" name="person.lastName"/>
+    <@s.submit value="Create person"/>
+</@s.form>
+
+<ul>
+    <@s.url id="editpersonurl" action="edit-person" />
+    <li><@s.a href="%{editpersonurl}">Edit people</@s.a></li>
+    <@s.url id="listpeopleurl" action="list-people" />
+    <li><@s.a href="%{listpeopleurl}">List</@s.a> all people</li>
+</ul>
+
+</body>
+</html>

apps/showcase/src/main/webapp/person/newPerson.ftl

@@ -1,19 +0,0 @@
-<html>
-<head>
-    <title>New Person</title>
-</head>
-
-<body>
-<@s.form action="newPerson">
-    <@s.textfield label="First Name" name="person.name"/>
-    <@s.textfield label="Last Name" name="person.lastName"/>
-    <@s.submit value="Create person"/>
-</@s.form>
-
-<ul>
-    <li><a href="editPerson.action">Edit people</a></li>
-    <li><a href="listPeople.action">List</a> all people</li>
-</ul>
-
-</body>
-</html>

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

@@ -62,9 +62,16 @@
     <s:checkboxlist
             tooltip="Choose your Friends"
             label="Friends"
-            list="{'Patrick', 'Jason', 'Jay', 'Toby', 'Rene'}"
+            list="{'Wes', 'Patrick', 'Jason', 'Jay', 'Toby', 'Rene'}"
             name="friends"/>
 
+    <s:radio
+            tooltip="Choose your Best Friend"
+            label="Best Friend"
+            list="{'Wes', 'Patrick', 'Jason', 'Jay', 'Toby', 'Rene'}"
+            name="bestFriend"
+            cssErrorClass="foo" />
+
     <s:checkbox
             tooltip="Confirmed that your are Over 18"
             label="Age 18+"

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

@@ -18,7 +18,8 @@
     </tr>
     <s:label label="Biography" name="bio" /> 
     <s:label label="Favourite Color" name="favouriteColor" /> 
-    <s:label label="Friends" name="friends" /> 
+    <s:label label="Friends" name="friends" />
+    <s:label label="Best Friend" name="bestFriend" />
     <s:label label="Legal Age" name="legalAge" /> 
     <s:label label="Region" name="region" /> 
     <s:label label="State" name="state" /> 

archetypes/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.2.1.1</version>
+        <version>2.3.1.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-archetypes</artifactId>
@@ -34,9 +34,9 @@
     <name>Struts 2 Maven Archetypes</name>
 
    <scm>
-     <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/archetypes</connection>
-     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/archetypes</developerConnection>
-     <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1_1/archetypes</url>
+     <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/archetypes</connection>
+     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/archetypes</developerConnection>
+     <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/archetypes</url>
    </scm>
 
     <modules>

archetypes/struts2-archetype-blank/pom.xml

@@ -3,23 +3,36 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.2.1.1</version>
+        <version>2.3.1.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>struts2-archetype-blank</artifactId>
+    <version>2.3.1.1</version>
     <name>Struts 2 Archetypes - Blank</name>
 
     <scm>
-        <connection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/archetypes/struts2-archetype-blank</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/archetypes/struts2-archetype-blank</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1_1/archetypes/struts2-archetype-blank</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/archetypes/struts2-archetype-blank</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/archetypes/struts2-archetype-blank</developerConnection>
+        <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/archetypes/struts2-archetype-blank</url>
     </scm>
     
     <properties>
         <maven.test.skip>true</maven.test.skip>
     </properties>
 
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/pom.xml</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+
     <profiles>
         <profile>
             <id>release</id>

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

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

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

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

archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/Login-validation.xml

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

archetypes/struts2-archetype-convention/pom.xml

@@ -2,23 +2,36 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.2.1.1</version>
+        <version>2.3.1.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>struts2-archetype-convention</artifactId>
+    <version>2.3.1.1</version>
     <name>Struts 2 Archetypes - Blank Convention</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/archetypes/struts2-archetype-convention</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/archetypes/struts2-archetype-convention</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1_1/archetypes/struts2-archetype-convention</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/archetypes/struts2-archetype-convention</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/archetypes/struts2-archetype-convention</developerConnection>
+        <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/archetypes/struts2-archetype-convention</url>
     </scm>
 
     <properties>
-       <maven.test.skip>true</maven.test.skip>
+        <maven.test.skip>true</maven.test.skip>
     </properties>
 
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/pom.xml</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+
     <profiles>
         <profile>
             <id>release</id>

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

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

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

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

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE struts PUBLIC
+          "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+          "http://struts.apache.org/dtds/struts-2.0.dtd">
+<struts>
+
+  <constant name="struts.enable.DynamicMethodInvocation" value="false"/>
+  <constant name="struts.devMode" value="true"/>
+
+</struts>

archetypes/struts2-archetype-dbportlet/pom.xml

@@ -1,24 +1,37 @@
 <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">
-  <parent>
-    <groupId>org.apache.struts</groupId>
-    <artifactId>struts2-archetypes</artifactId>
-    <version>2.2.1.1</version>
-  </parent>
+    <parent>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts2-archetypes</artifactId>
+        <version>2.3.1.1</version>
+    </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>struts2-archetype-dbportlet</artifactId>
+    <version>2.3.1.1</version>
     <name>Struts 2 Archetypes - Database Portlet</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/archetypes/struts2-archetype-dbportlet</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/archetypes/struts2-archetype-dbportlet</developerConnection>
-        <url>svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/archetypes/struts2-archetype-dbportlet</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/archetypes/struts2-archetype-dbportlet</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/archetypes/struts2-archetype-dbportlet</developerConnection>
+        <url>svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/archetypes/struts2-archetype-dbportlet</url>
     </scm>
 
     <properties>
         <maven.test.skip>true</maven.test.skip>
     </properties>
 
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/pom.xml</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+
     <profiles>
         <profile>
             <id>release</id>

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

@@ -5,13 +5,13 @@
 	<groupId>${groupId}</groupId>
 	<artifactId>${artifactId}</artifactId>
 	<packaging>war</packaging>
-	<version>${version}</version>
+	<version>${project.version}</version>
 	<name>Struts 2 Database Portlet</name>
 	<url>http://www.myComp.com</url>
 	<description>Struts 2 Database Portlet</description>
 
     <properties>
-        <struts2.version>2.1.8.1</struts2.version>
+        <struts2.version>${project.version}</struts2.version>
     </properties>    
 
 	<dependencies>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
-            <version>2.5.6</version>
+            <version>3.0.5.RELEASE</version>
         </dependency>
 
         <!-- Database driver (change for your specific database) -->
@@ -85,9 +85,9 @@
 		</dependency>
 
         <dependency>
-            <groupId>portlet-api</groupId>
+            <groupId>javax.portlet</groupId>
             <artifactId>portlet-api</artifactId>
-            <version>1.0</version>
+            <version>2.0</version>
             <scope>provided</scope>
         </dependency>
 
@@ -107,14 +107,19 @@
     			<groupId>org.mortbay.jetty</groupId>
     			<artifactId>maven-jetty-plugin</artifactId>
     			<version>6.1.21</version>
-    			<configuration>
-    				<scanIntervalSeconds>10</scanIntervalSeconds>
-    			</configuration>
+                <configuration>
+                    <scanIntervalSeconds>10</scanIntervalSeconds>
+                    <scanTargets>
+                        <scanTarget>src/main/webapp/WEB-INF</scanTarget>
+                        <scanTarget>src/main/webapp/WEB-INF/web.xml</scanTarget>
+                        <scanTarget>src/main/resources/struts.xml</scanTarget>
+                    </scanTargets>
+                </configuration>
                 <dependencies>
                     <dependency>
-                        <groupId>portlet-api</groupId>
+                        <groupId>javax.portlet</groupId>
                         <artifactId>portlet-api</artifactId>
-                        <version>1.0</version>
+                        <version>2.0</version>
                     </dependency>
                 </dependencies>
     		</plugin>

archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml

@@ -6,7 +6,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http:
     <portlet-name>StrutsDBPortlet</portlet-name>
     <display-name xml:lang="EN">Struts Database Portlet</display-name>
     
-    <portlet-class>org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher</portlet-class>
+    <portlet-class>org.apache.struts2.portlet.dispatcher.Jsr286Dispatcher</portlet-class>
 
     <init-param>
         <name>actionPackages</name>

archetypes/struts2-archetype-plugin/pom.xml

@@ -1,45 +1,58 @@
 <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">
-  <parent>
-    <groupId>org.apache.struts</groupId>
-    <artifactId>struts2-archetypes</artifactId>
-    <version>2.2.1.1</version>
-  </parent>
+    <parent>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts2-archetypes</artifactId>
+        <version>2.3.1.1</version>
+    </parent>
 
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>struts2-archetype-plugin</artifactId>
-  <packaging>jar</packaging>
-  <name>Struts 2 Archetypes - Plugin</name>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>struts2-archetype-plugin</artifactId>
+    <version>2.3.1.1</version>
+    <packaging>jar</packaging>
+    <name>Struts 2 Archetypes - Plugin</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/archetypes/struts2-archetype-plugin</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/archetypes/struts2-archetype-plugin</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1_1/archetypes/struts2-archetype-plugin</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/archetypes/struts2-archetype-plugin</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/archetypes/struts2-archetype-plugin</developerConnection>
+        <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/archetypes/struts2-archetype-plugin</url>
     </scm>
 
     <properties>
         <maven.test.skip>true</maven.test.skip>
     </properties>
 
-  <profiles>
-  <profile>
-   <id>release</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/pom.xml</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

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

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

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

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

archetypes/struts2-archetype-portlet/pom.xml

@@ -2,24 +2,37 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.2.1.1</version>
+        <version>2.3.1.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>struts2-archetype-portlet</artifactId>
+    <version>2.3.1.1</version>
     <packaging>jar</packaging>
     <name>Struts 2 Archetypes - Portlet</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/archetypes/struts2-archetype-portlet</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/archetypes/struts2-archetype-portlet</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1_1/archetypes/struts2-archetype-portlet</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/archetypes/struts2-archetype-portlet</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/archetypes/struts2-archetype-portlet</developerConnection>
+        <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/archetypes/struts2-archetype-portlet</url>
     </scm>
 
     <properties>
         <maven.test.skip>true</maven.test.skip>
     </properties>
 
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/pom.xml</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+
     <profiles>
         <profile>
             <id>release</id>

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

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

archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml

@@ -12,7 +12,7 @@
         <portlet-name>HelloPortlet</portlet-name>
         <display-name xml:lang="EN">${artifactId}</display-name>
     
-        <portlet-class>org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher</portlet-class>
+        <portlet-class>org.apache.struts2.portlet.dispatcher.Jsr286Dispatcher</portlet-class>
 
 		<!-- The namespace for the actions configured for view mode -->
 		<init-param>

archetypes/struts2-archetype-starter/pom.xml

@@ -1,48 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <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">
-  <parent>
-    <groupId>org.apache.struts</groupId>
-    <artifactId>struts2-archetypes</artifactId>
-    <version>2.2.1.1</version>
-  </parent>
+    <parent>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts2-archetypes</artifactId>
+        <version>2.3.1.1</version>
+    </parent>
 
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>struts2-archetype-starter</artifactId>
-  <packaging>jar</packaging>
-  <name>Struts 2 Archetypes - Starter</name>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>struts2-archetype-starter</artifactId>
+    <version>2.3.1.1</version>
+    <packaging>jar</packaging>
+    <name>Struts 2 Archetypes - Starter</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/archetypes/struts2-archetype-starter</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/archetypes/struts2-archetype-starter</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1_1/archetypes/struts2-archetype-starter</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/archetypes/struts2-archetype-starter</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/archetypes/struts2-archetype-starter</developerConnection>
+        <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/archetypes/struts2-archetype-starter</url>
     </scm>
 
     <properties>
         <maven.test.skip>true</maven.test.skip>
     </properties>
 
-  <profiles>
-  <profile>
-   <id>release</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/pom.xml</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>

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

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

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

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

assembly/pom.xml

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

assembly/src/main/assembly/all.xml

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

assembly/src/main/assembly/docs.xml

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

assembly/src/main/resources/NOTICE.txt

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

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

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

bundles/admin/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-osgi-bundles</artifactId>
-        <version>2.2.1.1</version>
+        <version>2.3.1.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-osgi-admin-bundle</artifactId>    
@@ -12,16 +12,16 @@
     <name>Struts 2 OSGi Admin Bundle</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/bundles/admin</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/bundles/admin</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1_1/bundles/admin</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/bundles/admin</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/bundles/admin</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1_1/bundles/admin</url>
     </scm>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-osgi-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>       
     </dependencies>
    
@@ -31,6 +31,7 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
+                <version>2.1.0</version>
                 <configuration>
                     <instructions>
                         <manifestLocation>META-INF</manifestLocation>

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

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

bundles/demo/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-osgi-bundles</artifactId>
-        <version>2.2.1.1</version>
+        <version>2.3.1.1</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-osgi-demo-bundle</artifactId>
@@ -12,9 +12,9 @@
     <name>Struts 2 OSGi Demo Bundle</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/bundles/demo</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_2_1_1/bundles/demo</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_2_1_1/bundles/demo</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/bundles/demo</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1_1/bundles/demo</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1_1/bundles/demo</url>
     </scm>
     
     <dependencies>
@@ -22,13 +22,12 @@
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.6.3</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-tools</artifactId>
-            <version>1.3</version>
+            <optional>true</optional>
             <exclusions>
                 <exclusion>
                     <groupId>velocity</groupId>
@@ -40,25 +39,24 @@
         <dependency>
             <groupId>commons-digester</groupId>
             <artifactId>commons-digester</artifactId>
-            <version>1.8</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
          <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-osgi-plugin</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         
     </dependencies>
@@ -69,6 +67,7 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
+                <version>2.1.0</version>
                 <configuration>
                     <instructions>
                         <manifestLocation>META-INF</manifestLocation>

bundles/pom.xml

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

core/pom.xml

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